2024-10-17 15:48:48 UTC

author: Repository mirror & CI <repomirrorci@gentoo.org> 2024-10-17 15:48:48 +0000
committer: Repository mirror & CI <repomirrorci@gentoo.org> 2024-10-17 15:48:48 +0000
commit: 6a60730da32cf9dcacb04609d08890dc88bfe1af (patch)
tree: e2f4e4472227670146a42ff2db77555595434844 /metadata/md5-cache/dev-java
parent: Merge updates from master (diff)
download: gentoo-6a60730da32cf9dcacb04609d08890dc88bfe1af.tar.gz
gentoo-6a60730da32cf9dcacb04609d08890dc88bfe1af.tar.bz2
gentoo-6a60730da32cf9dcacb04609d08890dc88bfe1af.zip
394 files changed, 788 insertions, 788 deletions
diff --git a/metadata/md5-cache/dev-java/angus-activation-1.0.0-r1 b/metadata/md5-cache/dev-java/angus-activation-1.0.0-r1
index 2f9777e706b1..8d5f7b9602d3 100644
--- a/metadata/md5-cache/dev-java/angus-activation-1.0.0-r1
+++ b/metadata/md5-cache/dev-java/angus-activation-1.0.0-r1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/eclipse-ee4j/angus-activation
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/eclipse-ee4j/angus-activation/archive/1.0.0.tar.gz -> angus-activation-1.0.0.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=046f664de32126389b3f0c77a29d40dd
+_md5_=d080e32f0ca0c13b8f937353a57c9508
diff --git a/metadata/md5-cache/dev-java/animal-sniffer-annotations-1.15-r1 b/metadata/md5-cache/dev-java/animal-sniffer-annotations-1.15-r1
index df055441f721..8a70e47a0e8c 100644
--- a/metadata/md5-cache/dev-java/animal-sniffer-annotations-1.15-r1
+++ b/metadata/md5-cache/dev-java/animal-sniffer-annotations-1.15-r1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=http://www.mojohaus.org/animal-sniffer/animal-sniffer-annotations/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/mojohaus/animal-sniffer/archive/animal-sniffer-parent-1.15.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=292691d9cd3182218d3767856d6a427c
+_md5_=522c02b216212156d861dbc7c3cb42cc
diff --git a/metadata/md5-cache/dev-java/ant-1.10.14-r3 b/metadata/md5-cache/dev-java/ant-1.10.14-r3
index 75d67a744da4..4f302c9b6f95 100644
--- a/metadata/md5-cache/dev-java/ant-1.10.14-r3
+++ b/metadata/md5-cache/dev-java/ant-1.10.14-r3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://ant.apache.org/
 INHERIT=java-pkg-2 java-pkg-simple verify-sig prefix
 IUSE=antlr bcel bsf commonslogging commonsnet imageio jai jakartamail javamail jdepend jmf jsch junit junit4 junitlauncher log4j oro regexp resolver swing testutil xalan xz doc source test verify-sig
-KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=Apache-2.0
 PROPERTIES=test_network
 RDEPEND=!dev-java/ant-apache-regexp !dev-java/ant-apache-log4j !dev-java/ant-apache-xalan2 !dev-java/ant-commons-logging !<dev-java/ant-core-1.10.14 !dev-java/ant-swing !dev-java/ant-junit4 !dev-java/ant-testutil !dev-java/ant-junitlauncher !dev-java/ant-jai !dev-java/ant-commons-net !dev-java/ant-apache-bsf !dev-java/ant-jmf !dev-java/ant-apache-oro !dev-java/ant-javamail !dev-java/ant-junit !dev-java/ant-jdepend !dev-java/ant-antlr !dev-java/ant-apache-bcel !dev-java/ant-apache-resolver !dev-java/ant-jsch !dev-java/ant-xz >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
@@ -15,4 +15,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.14-src.tar.xz verify-sig? ( https://downloads.apache.org/ant/source/apache-ant-1.10.14-src.tar.xz.asc )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	verify-sig	745dccb7d4656514f1e966cce314d7db	prefix	c3c4c93ebda319c0fa7ed6f942ba1010
-_md5_=3efcf4ae28aeb2a3bd1a2ca12d979410
+_md5_=fd65ee2d486f76c1de1e6c26d25cbe10
diff --git a/metadata/md5-cache/dev-java/ant-contrib-1.0_beta6_pre20201123-r3 b/metadata/md5-cache/dev-java/ant-contrib-1.0_beta6_pre20201123-r3
index 93987ce4612e..80fec489743e 100644
--- a/metadata/md5-cache/dev-java/ant-contrib-1.0_beta6_pre20201123-r3
+++ b/metadata/md5-cache/dev-java/ant-contrib-1.0_beta6_pre20201123-r3
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://ant-contrib.sourceforge.net/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 ppc64 x86
+KEYWORDS=amd64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=dev-java/ant-1.10.14-r3:0 dev-java/ant-ivy:0 dev-java/bcel:0 dev-java/commons-httpclient:3 dev-java/xerces:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cniweb/ant-contrib/archive/0228412be2ef648cfabc1d74416d3188755aff9b.tar.gz -> ant-contrib-1.0_beta6_pre20201123.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=62764cc3497b0f9407e6902a792ddbb9
+_md5_=a4706faa787ac922b050bf8a9fd07e50
diff --git a/metadata/md5-cache/dev-java/ant-core-1.10.14 b/metadata/md5-cache/dev-java/ant-core-1.10.14
index 8f0b1fdb9a05..e5f6d6d33b91 100644
--- a/metadata/md5-cache/dev-java/ant-core-1.10.14
+++ b/metadata/md5-cache/dev-java/ant-core-1.10.14
@@ -4,9 +4,9 @@ DESCRIPTION=Compatibility link to ant-core for >=dev-java/ant-1.10.14
 EAPI=8
 HOMEPAGE=https://ant.apache.org/
 INHERIT=java-pkg-2
-KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=0
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9
-_md5_=a8807ff53439e696def8641d5e73f8b0
+_md5_=b8c4b90be5495c3e0d312da80a10180f
diff --git a/metadata/md5-cache/dev-java/ant-ivy-2.5.0-r4 b/metadata/md5-cache/dev-java/ant-ivy-2.5.0-r4
index 532a0a0dc2c3..a33300c17bcc 100644
--- a/metadata/md5-cache/dev-java/ant-ivy-2.5.0-r4
+++ b/metadata/md5-cache/dev-java/ant-ivy-2.5.0-r4
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://ant.apache.org/ivy/
 INHERIT=java-pkg-2 java-pkg-simple java-osgi
 IUSE=doc source test
-KEYWORDS=amd64 ppc64 x86
+KEYWORDS=amd64 ppc64
 LICENSE=Apache-2.0
 PROPERTIES=test_network
 RDEPEND=>=dev-java/ant-1.10.14-r3:0 dev-java/bcpg:0 dev-java/bcprov:0 dev-java/httpcomponents-client:4 dev-java/commons-vfs:2 dev-java/httpcore:0 dev-java/jakarta-oro:2.0 dev-java/jsch:0 dev-java/jsch-agent-proxy:0 test? ( >=dev-java/ant-1.10.14-r3:0[junit,junit4,junitlauncher,testutil] dev-java/hamcrest-core:1.3 dev-java/hamcrest-library:1.3 dev-java/xmlunit:1 ) virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
@@ -13,4 +13,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://archive.apache.org/dist/ant/ivy/2.5.0/apache-ivy-2.5.0-src.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	java-osgi	b1d0d0f01a98e464d86fd1ed8eddf07b
-_md5_=b0cc0f53860bd23777a8ad110176ffa9
+_md5_=ba18e9063af9d0c9769c2f95670baa23
diff --git a/metadata/md5-cache/dev-java/antlr-2.7.7-r9 b/metadata/md5-cache/dev-java/antlr-2.7.7-r9
index a06983beecf2..260bcb94cf3b 100644
--- a/metadata/md5-cache/dev-java/antlr-2.7.7-r9
+++ b/metadata/md5-cache/dev-java/antlr-2.7.7-r9
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://www.antlr2.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=examples doc source
-KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://www.antlr2.org/download/antlr-2.7.7.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=5fea25da4fd079cccd7406bfaf980651
+_md5_=b0271c394e1391c6f0891a32dbf663dc
diff --git a/metadata/md5-cache/dev-java/antlr-3.2-r2 b/metadata/md5-cache/dev-java/antlr-3.2-r2
index 90c19431bd52..c94cd835872b 100644
--- a/metadata/md5-cache/dev-java/antlr-3.2-r2
+++ b/metadata/md5-cache/dev-java/antlr-3.2-r2
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.antlr3.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc test
-KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=BSD
 RDEPEND=>=dev-java/antlr-2.7.7-r7:0 dev-java/stringtemplate:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://www.antlr3.org/download/antlr-3.2.tar.gz https://www.antlr3.org/download/antlr-3.2.jar
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=20079d9efe3a6ddb9a387735fddd7666
+_md5_=72d6920602a262cc89920fdd644464b6
diff --git a/metadata/md5-cache/dev-java/antlr-3.5.3 b/metadata/md5-cache/dev-java/antlr-3.5.3
index c90c940a5302..40711468f7ac 100644
--- a/metadata/md5-cache/dev-java/antlr-3.5.3
+++ b/metadata/md5-cache/dev-java/antlr-3.5.3
@@ -4,10 +4,10 @@ DESCRIPTION=A parser generator for many languages
 EAPI=8
 HOMEPAGE=https://www.antlr3.org/
 INHERIT=java-pkg-2
-KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* ~dev-java/antlr-runtime-3.5.3:3.5 ~dev-java/antlr-tool-3.5.3:3.5 >=dev-java/java-config-2.2.0-r3
 SLOT=3.5
 SRC_URI=https://github.com/antlr/antlr3/archive/3.5.3.tar.gz -> antlr-3.5.3.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9
-_md5_=596794782691bc8416a71a1829de74a3
+_md5_=260b57047592637ca9b0afad2f928336
diff --git a/metadata/md5-cache/dev-java/antlr-4.9.3 b/metadata/md5-cache/dev-java/antlr-4.9.3
index 3032863cdaf6..fcae9e2302dd 100644
--- a/metadata/md5-cache/dev-java/antlr-4.9.3
+++ b/metadata/md5-cache/dev-java/antlr-4.9.3
@@ -4,10 +4,10 @@ DESCRIPTION=A parser generator for many languages
 EAPI=8
 HOMEPAGE=https://www.antlr.org/
 INHERIT=java-pkg-2
-KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* ~dev-java/antlr-runtime-4.9.3:4 ~dev-java/antlr-tool-4.9.3:4 >=dev-java/java-config-2.2.0-r3
 SLOT=4
 SRC_URI=https://github.com/antlr/antlr4/archive/4.9.3.tar.gz -> antlr-4.9.3.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9
-_md5_=9dd29401d7b9015421901125dfe365c2
+_md5_=9bfa35d473547fb794cc7c50463e4f2c
diff --git a/metadata/md5-cache/dev-java/antlr-runtime-3.5.3 b/metadata/md5-cache/dev-java/antlr-runtime-3.5.3
index 120f7e8f8139..8d6e00c29357 100644
--- a/metadata/md5-cache/dev-java/antlr-runtime-3.5.3
+++ b/metadata/md5-cache/dev-java/antlr-runtime-3.5.3
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.antlr3.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=BSD
 RDEPEND=>=dev-java/stringtemplate-3.2.1:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.5
 SRC_URI=https://repo1.maven.org/maven2/org/antlr/antlr-runtime/3.5.3/antlr-runtime-3.5.3-sources.jar
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=bb84958c688d758d27d45734b62b6763
+_md5_=7d547fedfe566df0393310922ea8df73
diff --git a/metadata/md5-cache/dev-java/antlr-runtime-4.9.3 b/metadata/md5-cache/dev-java/antlr-runtime-4.9.3
index d910d16937e3..08633f42c70e 100644
--- a/metadata/md5-cache/dev-java/antlr-runtime-4.9.3
+++ b/metadata/md5-cache/dev-java/antlr-runtime-4.9.3
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.antlr.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=https://github.com/antlr/antlr4/archive/4.9.3.tar.gz -> antlr-4.9.3.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=566cd02c8004894f123ac0995b7fca5d
+_md5_=79b2c116017e50870ff26fcbc4860bcf
diff --git a/metadata/md5-cache/dev-java/antlr-tool-3.5.3-r1 b/metadata/md5-cache/dev-java/antlr-tool-3.5.3-r1
index 380d8caaa18c..b8dcbff435df 100644
--- a/metadata/md5-cache/dev-java/antlr-tool-3.5.3-r1
+++ b/metadata/md5-cache/dev-java/antlr-tool-3.5.3-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.antlr3.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* ~dev-java/antlr-runtime-3.5.3:3.5 dev-java/stringtemplate:4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=3.5
 SRC_URI=https://repo1.maven.org/maven2/org/antlr/antlr/3.5.3/antlr-3.5.3-sources.jar -> antlr-tool-3.5.3-sources.jar https://github.com/antlr/antlr3/archive/3.5.3.tar.gz -> antlr-3.5.3.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=553087da2b5e405d6b715ee59dff64c9
+_md5_=660cd3f9184a16bc91efad83bcf09fa6
diff --git a/metadata/md5-cache/dev-java/antlr-tool-4.9.3-r3 b/metadata/md5-cache/dev-java/antlr-tool-4.9.3-r3
index 200dff3debe8..ec9e3ed820af 100644
--- a/metadata/md5-cache/dev-java/antlr-tool-4.9.3-r3
+++ b/metadata/md5-cache/dev-java/antlr-tool-4.9.3-r3
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.antlr.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* ~dev-java/antlr-runtime-4.9.3:4 dev-java/antlr-runtime:3.5 dev-java/jakarta-json-api:1 >=dev-java/icu4j-74.2-r1:0 dev-java/stringtemplate:4 dev-java/treelayout:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=https://github.com/antlr/antlr4/archive/4.9.3.tar.gz -> antlr-4.9.3.tar.gz https://repo1.maven.org/maven2/org/antlr/antlr4/4.9.3/antlr4-4.9.3-sources.jar -> antlr-tool-4.9.3-sources.jar
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=b7bf3bd0ddc73ff1569be03c813bb787
+_md5_=e00ed8219eb630d4ea14e976b3128660
diff --git a/metadata/md5-cache/dev-java/antunit-1.4.1-r1 b/metadata/md5-cache/dev-java/antunit-1.4.1-r1
index d857841c602b..e5647e6b13a5 100644
--- a/metadata/md5-cache/dev-java/antunit-1.4.1-r1
+++ b/metadata/md5-cache/dev-java/antunit-1.4.1-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://ant.apache.org/antlibs/antunit/
 INHERIT=java-pkg-2 java-pkg-simple verify-sig
 IUSE=doc source test verify-sig
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=dev-java/ant-1.10.14:0 dev-java/junit:4 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/ant/antlibs/antunit/source/apache-ant-antunit-1.4.1-src.tar.bz2 verify-sig? ( https://downloads.apache.org/ant/antlibs/antunit/source/apache-ant-antunit-1.4.1-src.tar.bz2.asc )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	verify-sig	745dccb7d4656514f1e966cce314d7db
-_md5_=43cfb75a77655c96d415216e95283fa5
+_md5_=a6338ff0112fa63a383d326b6bef6f75
diff --git a/metadata/md5-cache/dev-java/aopalliance-1.0-r3 b/metadata/md5-cache/dev-java/aopalliance-1.0-r3
index 822b64ca0c69..71ba70fcdc3d 100644
--- a/metadata/md5-cache/dev-java/aopalliance-1.0-r3
+++ b/metadata/md5-cache/dev-java/aopalliance-1.0-r3
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=http://aopalliance.sourceforge.net/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux
+KEYWORDS=amd64 arm64 ppc64 ~amd64-linux
 LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://gentoo/aopalliance-1.0-gentoo.tar.bz2
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=bd77ffea5feafa456d6d2ca07451a55b
+_md5_=9e15bdfdb059324d4690cfdcf3bc1113
diff --git a/metadata/md5-cache/dev-java/apache-rat-0.15-r2 b/metadata/md5-cache/dev-java/apache-rat-0.15-r2
index c72737984e4c..7e88be38b3e5 100644
--- a/metadata/md5-cache/dev-java/apache-rat-0.15-r2
+++ b/metadata/md5-cache/dev-java/apache-rat-0.15-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://creadur.apache.org/rat/
 INHERIT=java-pkg-2 java-pkg-simple verify-sig
 IUSE=doc source test verify-sig
-KEYWORDS=amd64 x86
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 RDEPEND=>=dev-java/ant-1.10.14:0 dev-java/commons-cli:0 dev-java/commons-collections:4 dev-java/commons-compress:0 dev-java/commons-io:1 dev-java/commons-lang:3.6 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://archive.apache.org/dist/creadur/apache-rat-0.15/apache-rat-0.15-src.tar.bz2 verify-sig? ( https://archive.apache.org/dist/creadur/apache-rat-0.15/apache-rat-0.15-src.tar.bz2.asc )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	verify-sig	745dccb7d4656514f1e966cce314d7db
-_md5_=7f64f6fe96efaaba337c56a0d3c4fdf5
+_md5_=e53d0dfc3499ce92bf42ff7230b4bf88
diff --git a/metadata/md5-cache/dev-java/apiguardian-api-1.1.2-r1 b/metadata/md5-cache/dev-java/apiguardian-api-1.1.2-r1
index 1691c61d8530..be3b0a320b8c 100644
--- a/metadata/md5-cache/dev-java/apiguardian-api-1.1.2-r1
+++ b/metadata/md5-cache/dev-java/apiguardian-api-1.1.2-r1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/apiguardian-team/apiguardian
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/apiguardian-team/apiguardian/archive/r1.1.2.tar.gz -> apiguardian-api-1.1.2.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=a8d704845f5be079bcb99534d03657f6
+_md5_=77dc3b5cd2c799aee871617d53bad5a1
diff --git a/metadata/md5-cache/dev-java/asm-9.7 b/metadata/md5-cache/dev-java/asm-9.7
index 1b4d0f35db64..12ecf4d9c363 100644
--- a/metadata/md5-cache/dev-java/asm-9.7
+++ b/metadata/md5-cache/dev-java/asm-9.7
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://asm.ow2.io
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86 ~x64-macos
+KEYWORDS=amd64 arm64 ppc64 ~x64-macos
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=9
 SRC_URI=https://gitlab.ow2.org/asm/asm/-/archive/ASM_9_7/asm-ASM_9_7.tar.bz2
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=95e0db27af27c61811c0ef479b8fe86e
+_md5_=0bbddf5b944a2b991ca6c82bcb4a514e
diff --git a/metadata/md5-cache/dev-java/asm-9.7.1 b/metadata/md5-cache/dev-java/asm-9.7.1
index 75222308829e..0c4ccfc732e3 100644
--- a/metadata/md5-cache/dev-java/asm-9.7.1
+++ b/metadata/md5-cache/dev-java/asm-9.7.1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://asm.ow2.io
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~x64-macos
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x64-macos
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=9
 SRC_URI=https://gitlab.ow2.org/asm/asm/-/archive/ASM_9_7_1/asm-ASM_9_7_1.tar.bz2
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=c2939cef07e8744aee608caa73fd00e6
+_md5_=817a574ade02567818301049500d50ed
diff --git a/metadata/md5-cache/dev-java/aspectj-1.9.7-r1 b/metadata/md5-cache/dev-java/aspectj-1.9.7-r1
index 566106c2cac3..c5beeb30d031 100644
--- a/metadata/md5-cache/dev-java/aspectj-1.9.7-r1
+++ b/metadata/md5-cache/dev-java/aspectj-1.9.7-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://eclipse.org/aspectj/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 x86
+KEYWORDS=amd64
 LICENSE=EPL-1.0
 RDEPEND=dev-java/asm:9 dev-java/commons-logging:0 dev-java/jakarta-regexp:1.4 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/eclipse-aspectj/aspectj/archive/V1_9_7.tar.gz -> aspectj-1.9.7.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=29854c29fb0b36371ed71b08eba72a51
+_md5_=cb6de8d123d67e13dff4fda82c303499
diff --git a/metadata/md5-cache/dev-java/assertj-core-3.10.0 b/metadata/md5-cache/dev-java/assertj-core-3.10.0
index 54921a2a1d4a..6a1c2c711e26 100644
--- a/metadata/md5-cache/dev-java/assertj-core-3.10.0
+++ b/metadata/md5-cache/dev-java/assertj-core-3.10.0
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://assertj.github.io/doc/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/byte-buddy-1.12.12:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://github.com/assertj/assertj-core/archive/assertj-core-3.10.0.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=5bb7e052cf48b91833aad44c83c14bc9
+_md5_=cda9add43b55f714ff66b9f26a9504d1
diff --git a/metadata/md5-cache/dev-java/auto-service-annotations-1.1.1 b/metadata/md5-cache/dev-java/auto-service-annotations-1.1.1
index 3308b9c5effc..ff1378cf9e71 100644
--- a/metadata/md5-cache/dev-java/auto-service-annotations-1.1.1
+++ b/metadata/md5-cache/dev-java/auto-service-annotations-1.1.1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/google/auto/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/google/auto/archive/auto-service-1.1.1.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=e86da587bf7b97502405c09750bfe723
+_md5_=d00d8076d7bf55d032f9033e241276d6
diff --git a/metadata/md5-cache/dev-java/batik-1.17-r1 b/metadata/md5-cache/dev-java/batik-1.17-r1
index 9b80d4d026ce..026bc451f99a 100644
--- a/metadata/md5-cache/dev-java/batik-1.17-r1
+++ b/metadata/md5-cache/dev-java/batik-1.17-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://xmlgraphics.apache.org/batik/
 INHERIT=desktop java-pkg-2 java-pkg-simple xdg-utils verify-sig
 IUSE=doc source test verify-sig
-KEYWORDS=amd64 ~arm64 ppc64 x86
+KEYWORDS=amd64 ~arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=dev-java/jacl:0 dev-java/rhino:1.6 dev-java/xalan:0 dev-java/xml-commons-external:1.4 dev-java/xmlgraphics-commons:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=1.16
 SRC_URI=mirror://apache/xmlgraphics/batik/source/batik-src-1.17.tar.gz verify-sig? ( https://downloads.apache.org/xmlgraphics/batik/source/batik-src-1.17.tar.gz.asc )
 _eclasses_=desktop	3a72ffe0d8e1dd73af3a1c8c15a59fed	java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	xdg-utils	42869b3c8d86a70ef3cf75165a395e09	verify-sig	745dccb7d4656514f1e966cce314d7db
-_md5_=ec63b044daf82c13d3a5d3585dd0d4e3
+_md5_=b838bf923c4ae5c65a6503565a5168d9
diff --git a/metadata/md5-cache/dev-java/bcel-6.10.0-r1 b/metadata/md5-cache/dev-java/bcel-6.10.0-r1
index 2e3159a7ae88..5e39acf57740 100644
--- a/metadata/md5-cache/dev-java/bcel-6.10.0-r1
+++ b/metadata/md5-cache/dev-java/bcel-6.10.0-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://commons.apache.org/proper/commons-bcel/
 INHERIT=java-pkg-2 java-pkg-simple verify-sig
 IUSE=doc source verify-sig
-KEYWORDS=amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=amd64 ~arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=dev-java/commons-lang:3.6 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://downloads.apache.org/commons/bcel/source/bcel-6.10.0-src.tar.gz verify-sig? ( https://downloads.apache.org/commons/bcel/source/bcel-6.10.0-src.tar.gz.asc )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	verify-sig	745dccb7d4656514f1e966cce314d7db
-_md5_=7e068214185892a65f88853938e5ee3e
+_md5_=ad68a1b68ef25bd32d20bdd10a24c1d5
diff --git a/metadata/md5-cache/dev-java/bcel-6.6.0 b/metadata/md5-cache/dev-java/bcel-6.6.0
index ca306ea76f42..a58d1fcf666f 100644
--- a/metadata/md5-cache/dev-java/bcel-6.6.0
+++ b/metadata/md5-cache/dev-java/bcel-6.6.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://commons.apache.org/proper/commons-bcel/
 INHERIT=java-pkg-2 java-pkg-simple verify-sig
 IUSE=doc source verify-sig
-KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/commons-lang:3.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://archive.apache.org/dist/commons/bcel/source/bcel-6.6.0-src.tar.gz verify-sig? ( https://downloads.apache.org/commons/bcel/source/bcel-6.6.0-src.tar.gz.asc )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	verify-sig	745dccb7d4656514f1e966cce314d7db
-_md5_=a7f164ac9648b7ff71927a365ff282c2
+_md5_=cf845a3bd05fea8e37764acc6b39301d
diff --git a/metadata/md5-cache/dev-java/bcmail-1.77-r1 b/metadata/md5-cache/dev-java/bcmail-1.77-r1
index 5ffe55c57555..099a4b29855a 100644
--- a/metadata/md5-cache/dev-java/bcmail-1.77-r1
+++ b/metadata/md5-cache/dev-java/bcmail-1.77-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.bouncycastle.org/java.html
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=BSD
 RDEPEND=~dev-java/bcpkix-1.77:0 ~dev-java/bcprov-1.77:0 ~dev-java/bcutil-1.77:0 dev-java/javax-mail:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bcgit/bc-java/archive/r1rv77.tar.gz -> bc-java-r1rv77.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=645f49e2fe428dd1be62b2ba9dad3b27
+_md5_=bd52e723d4252b97a54d85be4eec5884
diff --git a/metadata/md5-cache/dev-java/bcmail-1.78.1 b/metadata/md5-cache/dev-java/bcmail-1.78.1
index c1c75f91a6b7..a6bd37df9f22 100644
--- a/metadata/md5-cache/dev-java/bcmail-1.78.1
+++ b/metadata/md5-cache/dev-java/bcmail-1.78.1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.bouncycastle.org/java.html
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64
 LICENSE=BSD
 RDEPEND=~dev-java/bcpkix-1.78.1:0 ~dev-java/bcprov-1.78.1:0 ~dev-java/bcutil-1.78.1:0 dev-java/javax-mail:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bcgit/bc-java/archive/r1rv78v1.tar.gz -> bc-java-r1rv78v1.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=b76c0a37db5dd3bdc12ff6d4ddf1c3b3
+_md5_=943d5847544062038abe6ac19f39cd36
diff --git a/metadata/md5-cache/dev-java/bcpg-1.77 b/metadata/md5-cache/dev-java/bcpg-1.77
index 1de26ef35ab1..94be0979097f 100644
--- a/metadata/md5-cache/dev-java/bcpg-1.77
+++ b/metadata/md5-cache/dev-java/bcpg-1.77
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.bouncycastle.org/java.html
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=BSD
 RDEPEND=~dev-java/bcprov-1.77:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bcgit/bc-java/archive/r1rv77.tar.gz -> bc-java-r1rv77.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=82b3ee49eeced55207fa3e9a381e7397
+_md5_=94e5a0f17d2349b12e7bc2b8ef5137c6
diff --git a/metadata/md5-cache/dev-java/bcpg-1.78.1 b/metadata/md5-cache/dev-java/bcpg-1.78.1
index 52674d4d7b02..08cd5d2ad001 100644
--- a/metadata/md5-cache/dev-java/bcpg-1.78.1
+++ b/metadata/md5-cache/dev-java/bcpg-1.78.1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.bouncycastle.org/java.html
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64
 LICENSE=BSD
 RDEPEND=~dev-java/bcprov-1.78.1:0 ~dev-java/bcutil-1.78.1:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bcgit/bc-java/archive/r1rv78v1.tar.gz -> bc-java-r1rv78v1.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=59cdbb2aa00341666d122571ef3659fd
+_md5_=e6fa42e569fc6dfe1e47bfe541d3702c
diff --git a/metadata/md5-cache/dev-java/bcpkix-1.77 b/metadata/md5-cache/dev-java/bcpkix-1.77
index 11be0294c1cc..cc4d4ceb5c89 100644
--- a/metadata/md5-cache/dev-java/bcpkix-1.77
+++ b/metadata/md5-cache/dev-java/bcpkix-1.77
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.bouncycastle.org/java.html
 INHERIT=java-pkg-2 java-pkg-simple check-reqs
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=BSD
 PROPERTIES=test_network
 RDEPEND=~dev-java/bcprov-1.77:0 ~dev-java/bcutil-1.77:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
@@ -13,4 +13,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bcgit/bc-java/archive/r1rv77.tar.gz -> bc-java-r1rv77.tar.gz test? ( https://github.com/bcgit/bc-test-data/archive/r1rv77.tar.gz -> bc-test-data-r1rv77.tar.gz )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	check-reqs	2a9731073c152554078a9a8df8fc0f1b
-_md5_=4e106bf83f16269fa24d6cc38f83ca18
+_md5_=81d93f3eb4840f2177d166a93f5fba30
diff --git a/metadata/md5-cache/dev-java/bcpkix-1.78.1 b/metadata/md5-cache/dev-java/bcpkix-1.78.1
index 82e6278bdcc9..deb2a86b6c3f 100644
--- a/metadata/md5-cache/dev-java/bcpkix-1.78.1
+++ b/metadata/md5-cache/dev-java/bcpkix-1.78.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.bouncycastle.org/java.html
 INHERIT=java-pkg-2 java-pkg-simple check-reqs
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64
 LICENSE=BSD
 PROPERTIES=test_network
 RDEPEND=~dev-java/bcprov-1.78.1:0 ~dev-java/bcutil-1.78.1:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
@@ -13,4 +13,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bcgit/bc-java/archive/r1rv78v1.tar.gz -> bc-java-r1rv78v1.tar.gz test? ( https://github.com/bcgit/bc-test-data/archive/r1rv78v1.tar.gz -> bc-test-data-r1rv78v1.tar.gz )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	check-reqs	2a9731073c152554078a9a8df8fc0f1b
-_md5_=203b9f097f70d7010542f49477a4074b
+_md5_=3e56c7830c62dab154ee448bb4a3eafc
diff --git a/metadata/md5-cache/dev-java/bcprov-1.77 b/metadata/md5-cache/dev-java/bcprov-1.77
index c33afe03b9b2..bae340039222 100644
--- a/metadata/md5-cache/dev-java/bcprov-1.77
+++ b/metadata/md5-cache/dev-java/bcprov-1.77
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.bouncycastle.org/java.html
 INHERIT=java-pkg-2 java-pkg-simple check-reqs
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bcgit/bc-java/archive/r1rv77.tar.gz -> bc-java-r1rv77.tar.gz test? ( https://github.com/bcgit/bc-test-data/archive/r1rv77.tar.gz -> bc-test-data-r1rv77.tar.gz )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	check-reqs	2a9731073c152554078a9a8df8fc0f1b
-_md5_=57330d6ab8cb6f87fa4ac5facc7afb52
+_md5_=7aeaf8750bcccd6028e4096af89c0eea
diff --git a/metadata/md5-cache/dev-java/bcprov-1.78.1 b/metadata/md5-cache/dev-java/bcprov-1.78.1
index e3496271ba5b..8b90782e027c 100644
--- a/metadata/md5-cache/dev-java/bcprov-1.78.1
+++ b/metadata/md5-cache/dev-java/bcprov-1.78.1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.bouncycastle.org/java.html
 INHERIT=java-pkg-2 java-pkg-simple check-reqs
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bcgit/bc-java/archive/r1rv78v1.tar.gz -> bc-java-r1rv78v1.tar.gz test? ( https://github.com/bcgit/bc-test-data/archive/r1rv78v1.tar.gz -> bc-test-data-r1rv78v1.tar.gz )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	check-reqs	2a9731073c152554078a9a8df8fc0f1b
-_md5_=70ec898ea09dbfa4dee0a1c2e5a26ea5
+_md5_=45e69802969964844650bd78aa696f87
diff --git a/metadata/md5-cache/dev-java/bcutil-1.77 b/metadata/md5-cache/dev-java/bcutil-1.77
index 0e47c1a815d7..b120dae28df2 100644
--- a/metadata/md5-cache/dev-java/bcutil-1.77
+++ b/metadata/md5-cache/dev-java/bcutil-1.77
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.bouncycastle.org/java.html
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=BSD
 RDEPEND=~dev-java/bcprov-1.77:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bcgit/bc-java/archive/r1rv77.tar.gz -> bc-java-r1rv77.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=bd49aa22c37ff90fddf7042b915f3ee2
+_md5_=69ea8805e79662e503bdf75bece31e84
diff --git a/metadata/md5-cache/dev-java/bcutil-1.78.1 b/metadata/md5-cache/dev-java/bcutil-1.78.1
index 55708029a1d0..a47c6a54875c 100644
--- a/metadata/md5-cache/dev-java/bcutil-1.78.1
+++ b/metadata/md5-cache/dev-java/bcutil-1.78.1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.bouncycastle.org/java.html
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64
 LICENSE=BSD
 RDEPEND=~dev-java/bcprov-1.78.1:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bcgit/bc-java/archive/r1rv78v1.tar.gz -> bc-java-r1rv78v1.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=643013ea140f4245067a7599b4db2f70
+_md5_=b0d39dba4a3443c744612231455ba24e
diff --git a/metadata/md5-cache/dev-java/bnd-7.0.0 b/metadata/md5-cache/dev-java/bnd-7.0.0
index 3b1ca96522da..91a35068b053 100644
--- a/metadata/md5-cache/dev-java/bnd-7.0.0
+++ b/metadata/md5-cache/dev-java/bnd-7.0.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://bnd.bndtools.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0 EPL-2.0
 RDEPEND=~dev-java/bndlib-7.0.0:0 dev-java/felix-resolver:0 dev-java/guava:0 dev-java/javaparser-core:0 dev-java/jline:2 dev-java/jtwig-core:0 dev-java/osgi-annotation:0 dev-java/osgi-cmpn:8 dev-java/osgi-core:0 dev-java/slf4j-simple:0 dev-java/snakeyaml:0 dev-java/xz-java:0 >=virtual/jre-17:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/bndtools/bnd/archive/7.0.0.tar.gz -> aQute.bnd-7.0.0.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=88fe3a7f5a4730af83fb8308c9f6254a
+_md5_=2bd316c261326407e0bbdab64fc10893
diff --git a/metadata/md5-cache/dev-java/bnd-annotation-6.3.1 b/metadata/md5-cache/dev-java/bnd-annotation-6.3.1
index ef6188da2251..5065050deeb7 100644
--- a/metadata/md5-cache/dev-java/bnd-annotation-6.3.1
+++ b/metadata/md5-cache/dev-java/bnd-annotation-6.3.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://bnd.bndtools.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0 EPL-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/osgi-annotation:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.annotation/6.3.1/biz.aQute.bnd.annotation-6.3.1-sources.jar
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=7a1f136c8533fe659b7253359e6aeb97
+_md5_=3211b953ef7ad60ff97f3a70b3250d5c
diff --git a/metadata/md5-cache/dev-java/bnd-annotation-7.0.0 b/metadata/md5-cache/dev-java/bnd-annotation-7.0.0
index bd46bfb95ded..2e1425b4629a 100644
--- a/metadata/md5-cache/dev-java/bnd-annotation-7.0.0
+++ b/metadata/md5-cache/dev-java/bnd-annotation-7.0.0
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://bnd.bndtools.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0 EPL-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/bndtools/bnd/archive/7.0.0.tar.gz -> aQute.bnd-7.0.0.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=7ebb9392d222c4f260e81733ea2ecdcf
+_md5_=0605c97ed6e0b2ff91ca324597d75ff5
diff --git a/metadata/md5-cache/dev-java/bnd-ant-7.0.0 b/metadata/md5-cache/dev-java/bnd-ant-7.0.0
index e8fcc4a432b2..7aab4053a96d 100644
--- a/metadata/md5-cache/dev-java/bnd-ant-7.0.0
+++ b/metadata/md5-cache/dev-java/bnd-ant-7.0.0
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://bnd.bndtools.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0 EPL-2.0
 RDEPEND=>=virtual/jre-17:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/bndtools/bnd/archive/7.0.0.tar.gz -> aQute.bnd-7.0.0.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=648fb8d1f743723cc659f4a4442773d9
+_md5_=c529f18a32f740a52e6152c0fd92a36c
diff --git a/metadata/md5-cache/dev-java/bnd-util-7.0.0 b/metadata/md5-cache/dev-java/bnd-util-7.0.0
index 60fe50bf4b40..16100fcebbba 100644
--- a/metadata/md5-cache/dev-java/bnd-util-7.0.0
+++ b/metadata/md5-cache/dev-java/bnd-util-7.0.0
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://bnd.bndtools.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0 EPL-2.0
 RDEPEND=dev-java/osgi-annotation:0 >=virtual/jre-17:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/bndtools/bnd/archive/7.0.0.tar.gz -> aQute.bnd-7.0.0.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=0efba0062a86bd71b68b0f045c05c746
+_md5_=c80b804977d39ce2603fe1904542e484
diff --git a/metadata/md5-cache/dev-java/bndlib-7.0.0 b/metadata/md5-cache/dev-java/bndlib-7.0.0
index 5a979d7bad4f..d15fce177a9c 100644
--- a/metadata/md5-cache/dev-java/bndlib-7.0.0
+++ b/metadata/md5-cache/dev-java/bndlib-7.0.0
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://bnd.bndtools.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0 EPL-2.0
 RDEPEND=~dev-java/bnd-annotation-7.0.0:0 ~dev-java/bnd-util-7.0.0:0 ~dev-java/libg-7.0.0:0 dev-java/osgi-annotation:0 dev-java/osgi-cmpn:8 dev-java/osgi-core:0 dev-java/slf4j-api:0 >=virtual/jre-17:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/bndtools/bnd/archive/7.0.0.tar.gz -> aQute.bnd-7.0.0.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=dc7b42352c5471505989e84f03bc1bd9
+_md5_=167a0ba5c0706e1de730c702d91eb605
diff --git a/metadata/md5-cache/dev-java/brotli-dec-0.1.2 b/metadata/md5-cache/dev-java/brotli-dec-0.1.2
index c4dca60b53ef..79f11303d38d 100644
--- a/metadata/md5-cache/dev-java/brotli-dec-0.1.2
+++ b/metadata/md5-cache/dev-java/brotli-dec-0.1.2
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://brotli.org/ https://github.com/google/brotli
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/org/brotli/dec/0.1.2/dec-0.1.2-sources.jar -> brotli-dec-0.1.2-sources.jar
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=26ab5dd73fc8e239a7169b9be69a1107
+_md5_=c5023cf379dd00361a8c96b9a9518b18
diff --git a/metadata/md5-cache/dev-java/browserlauncher2-1.3-r3 b/metadata/md5-cache/dev-java/browserlauncher2-1.3-r3
index 4f97ab221652..4e532a2cd098 100644
--- a/metadata/md5-cache/dev-java/browserlauncher2-1.3-r3
+++ b/metadata/md5-cache/dev-java/browserlauncher2-1.3-r3
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://browserlaunch2.sourceforge.net/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 ppc64 x86
+KEYWORDS=amd64 ppc64
 LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=https://downloads.sourceforge.net/project/browserlaunch2/browserlauncher2/1.3/BrowserLauncher2-all-1_3.jar
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=6980f4df76aae52005da887f43702c95
+_md5_=57137e4ccb6e7ef29faac15431ab0d58
diff --git a/metadata/md5-cache/dev-java/bsf-2.4.0-r5 b/metadata/md5-cache/dev-java/bsf-2.4.0-r5
index f4e26437ca11..515d35517dc0 100644
--- a/metadata/md5-cache/dev-java/bsf-2.4.0-r5
+++ b/metadata/md5-cache/dev-java/bsf-2.4.0-r5
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://commons.apache.org/proper/commons-bsf/
 INHERIT=java-pkg-2 java-pkg-simple verify-sig
 IUSE=javascript tcl doc source verify-sig
-KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=dev-java/commons-logging:0 dev-java/xalan:0 javascript? ( dev-java/rhino:1.6 ) tcl? ( dev-java/jacl:0 ) >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.3
 SRC_URI=mirror://apache/commons/bsf/source/bsf-src-2.4.0.tar.gz verify-sig? ( https://downloads.apache.org/commons/bsf/source/bsf-src-2.4.0.tar.gz.asc )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	verify-sig	745dccb7d4656514f1e966cce314d7db
-_md5_=26523e24052c40a3a4bb30a8b191323c
+_md5_=ac8116af40d51cb4c325c4f100356298
diff --git a/metadata/md5-cache/dev-java/bsh-2.1.1 b/metadata/md5-cache/dev-java/bsh-2.1.1
index ef22efc1beff..3b50a4f9838a 100644
--- a/metadata/md5-cache/dev-java/bsh-2.1.1
+++ b/metadata/md5-cache/dev-java/bsh-2.1.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/beanshell/beanshell
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm64 ppc64 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 PROPERTIES=test_network
 RDEPEND=dev-java/bsf:2.3 dev-java/jakarta-servlet-api:4 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
@@ -13,4 +13,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/beanshell/beanshell/archive/2.1.1.tar.gz -> bsh-2.1.1.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=aa80ca9957085f4b4ff3ecfff3d9c34d
+_md5_=7bd7e214ba74b688ec491504188c7a28
diff --git a/metadata/md5-cache/dev-java/byaccj-1.15-r3 b/metadata/md5-cache/dev-java/byaccj-1.15-r3
index 15c8eba0ac34..ceb5c497e955 100644
--- a/metadata/md5-cache/dev-java/byaccj-1.15-r3
+++ b/metadata/md5-cache/dev-java/byaccj-1.15-r3
@@ -3,9 +3,9 @@ DESCRIPTION=A Java extension of BSD YACC-compatible parser generator
 EAPI=8
 HOMEPAGE=https://byaccj.sourceforge.net/
 INHERIT=toolchain-funcs
-KEYWORDS=amd64 arm64 ppc64 x86 ~ppc-macos ~x64-macos
+KEYWORDS=amd64 arm64 ppc64 ~ppc-macos ~x64-macos
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/byaccj/byaccj1.15_src.tar.gz
 _eclasses_=toolchain-funcs	d3d42b22a610ce81c267b644bcec9b87	multilib	b2a329026f2e404e9e371097dda47f96
-_md5_=0f67f265dd44191c4e708126dbeb8e94
+_md5_=888f9b2953ec38cc69b508f06e1c398a
diff --git a/metadata/md5-cache/dev-java/byte-buddy-1.14.0 b/metadata/md5-cache/dev-java/byte-buddy-1.14.0
index de2a0aee512c..7e59c97c8d96 100644
--- a/metadata/md5-cache/dev-java/byte-buddy-1.14.0
+++ b/metadata/md5-cache/dev-java/byte-buddy-1.14.0
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://bytebuddy.net
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/raphw/byte-buddy/archive/byte-buddy-1.14.0.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=f77dcdc1d1ca0e07f9f32526fc2d1eb4
+_md5_=2db681d949e0ed385205a436989ee4e4
diff --git a/metadata/md5-cache/dev-java/c3p0-0.9.5.5-r2 b/metadata/md5-cache/dev-java/c3p0-0.9.5.5-r2
index 3c3f5959a71c..b00dbfc91251 100644
--- a/metadata/md5-cache/dev-java/c3p0-0.9.5.5-r2
+++ b/metadata/md5-cache/dev-java/c3p0-0.9.5.5-r2
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://www.mchange.com/projects/c3p0/
 INHERIT=java-pkg-2
 IUSE=doc examples source
-KEYWORDS=amd64 ~ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc64 ~amd64-linux ~x86-linux
 LICENSE=|| ( EPL-1.0 LGPL-2.1 )
 RDEPEND=>=virtual/jre-1.8:* dev-java/log4j-12-api:2 dev-java/mchange-commons:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/c3p0/c3p0-src/c3p0-0.9.5.5/c3p0-0.9.5.5.src.tgz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9
-_md5_=878e497d6abfd6ad5f11f4d6a526dfe5
+_md5_=71dccf64bdb0dfd4fa10ada8c690d54f
diff --git a/metadata/md5-cache/dev-java/cache2k-api-0.23.1 b/metadata/md5-cache/dev-java/cache2k-api-0.23.1
index 3463c3c1bacd..2f99fab62442 100644
--- a/metadata/md5-cache/dev-java/cache2k-api-0.23.1
+++ b/metadata/md5-cache/dev-java/cache2k-api-0.23.1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://cache2k.org
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/cache2k/cache2k/archive/v0.23.1.tar.gz -> cache2k-0.23.1.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=aa0044f3eccdf19cc70509073aeff27f
+_md5_=097989450cfbea2fe5bb54b4815a709f
diff --git a/metadata/md5-cache/dev-java/caffeine-2.6.2-r1 b/metadata/md5-cache/dev-java/caffeine-2.6.2-r1
index 1b7627c61ded..fb91835d4c5c 100644
--- a/metadata/md5-cache/dev-java/caffeine-2.6.2-r1
+++ b/metadata/md5-cache/dev-java/caffeine-2.6.2-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/ben-manes/caffeine
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 ppc64 x86
+KEYWORDS=amd64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=dev-java/jsr305:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/com/github/ben-manes/caffeine/caffeine/2.6.2/caffeine-2.6.2-sources.jar
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=57e91096dd5bff9c71dc16ed29177e6c
+_md5_=75f3354566ff522cd31f03cdc0ef1d11
diff --git a/metadata/md5-cache/dev-java/cal10n-0.8.1 b/metadata/md5-cache/dev-java/cal10n-0.8.1
index 8bcb7c96c41b..c5cc5dd0f701 100644
--- a/metadata/md5-cache/dev-java/cal10n-0.8.1
+++ b/metadata/md5-cache/dev-java/cal10n-0.8.1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=http://cal10n.qos.ch/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/qos-ch/cal10n/archive/v_0.8.1.tar.gz -> cal10n-0.8.1.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=1ff5cc2a7d31ec3b790cfbb01756dd0a
+_md5_=a60ca16633b154f0bae7197f20518399
diff --git a/metadata/md5-cache/dev-java/cdi-api-4.0.1-r2 b/metadata/md5-cache/dev-java/cdi-api-4.0.1-r2
index 06c06f6c979e..839700c6535f 100644
--- a/metadata/md5-cache/dev-java/cdi-api-4.0.1-r2
+++ b/metadata/md5-cache/dev-java/cdi-api-4.0.1-r2
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://projects.eclipse.org/projects/ee4j.cdi
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jakartaee/cdi/archive/4.0.1.tar.gz -> cdi-api-4.0.1.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=c84d6008e65a1d617a8cae6d2cd01961
+_md5_=17b8a2c17a9f745c9dfd4d179105ad69
diff --git a/metadata/md5-cache/dev-java/cdi-api-4.0.1-r3 b/metadata/md5-cache/dev-java/cdi-api-4.0.1-r3
index 203230c0cd7d..cabae5da9318 100644
--- a/metadata/md5-cache/dev-java/cdi-api-4.0.1-r3
+++ b/metadata/md5-cache/dev-java/cdi-api-4.0.1-r3
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://projects.eclipse.org/projects/ee4j.cdi
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jakartaee/cdi/archive/4.0.1.tar.gz -> cdi-api-4.0.1.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=933df1439e76ed83a4d980c3b5631aec
+_md5_=01144f305fa3d233fd344c66add0bcef
diff --git a/metadata/md5-cache/dev-java/cglib-3.3.0-r2 b/metadata/md5-cache/dev-java/cglib-3.3.0-r2
index a7bf9200c854..20d2714398db 100644
--- a/metadata/md5-cache/dev-java/cglib-3.3.0-r2
+++ b/metadata/md5-cache/dev-java/cglib-3.3.0-r2
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/cglib/cglib
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=examples source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/ant-1.10.14-r3:0 dev-java/asm:9 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://github.com/cglib/cglib/archive//RELEASE_3_3_0.tar.gz -> cglib-RELEASE_3_3_0.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=2be91c4a1eaad423c65c822a4a44f633
+_md5_=c5b8f223898c15e72d3471af28a5fd9e
diff --git a/metadata/md5-cache/dev-java/checker-framework-qual-3.43.0 b/metadata/md5-cache/dev-java/checker-framework-qual-3.43.0
index 2ef50a6ac41e..b2235881817b 100644
--- a/metadata/md5-cache/dev-java/checker-framework-qual-3.43.0
+++ b/metadata/md5-cache/dev-java/checker-framework-qual-3.43.0
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://checkerframework.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/typetools/checker-framework/archive/checker-framework-3.43.0.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=8a69c608cf6b316e621af3fb3160acc7
+_md5_=9597c10aefd47b5c058390f8cd5bc4a9
diff --git a/metadata/md5-cache/dev-java/checker-framework-qual-3.47.0 b/metadata/md5-cache/dev-java/checker-framework-qual-3.47.0
index 31efe308cd8b..5743f813d02e 100644
--- a/metadata/md5-cache/dev-java/checker-framework-qual-3.47.0
+++ b/metadata/md5-cache/dev-java/checker-framework-qual-3.47.0
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://checkerframework.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/typetools/checker-framework/archive/checker-framework-3.47.0.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=224d35e462aeee752e85f9e228094e7f
+_md5_=4fece4157d7a630a0864401bb6724fac
diff --git a/metadata/md5-cache/dev-java/commons-beanutils-1.9.4-r2 b/metadata/md5-cache/dev-java/commons-beanutils-1.9.4-r2
index 398d9fd67159..3ef4af2d75e6 100644
--- a/metadata/md5-cache/dev-java/commons-beanutils-1.9.4-r2
+++ b/metadata/md5-cache/dev-java/commons-beanutils-1.9.4-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://commons.apache.org/proper/commons-beanutils/
 INHERIT=java-pkg-2 java-pkg-simple verify-sig
 IUSE=doc source test verify-sig
-KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=dev-java/commons-collections:0 dev-java/commons-logging:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=1.7
 SRC_URI=mirror://apache/commons/beanutils/source/commons-beanutils-1.9.4-src.tar.gz test? ( https://archive.apache.org/dist/commons/collections/source/commons-collections-3.2.2-src.tar.gz ) verify-sig? ( https://downloads.apache.org/commons/beanutils/source/commons-beanutils-1.9.4-src.tar.gz.asc )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	verify-sig	745dccb7d4656514f1e966cce314d7db
-_md5_=210a6131458c83d56472a4281c650a81
+_md5_=42b9332d2fad3f67937fac3506cdc65f
diff --git a/metadata/md5-cache/dev-java/commons-cli-1.9.0 b/metadata/md5-cache/dev-java/commons-cli-1.9.0
index d72cc0a90c8f..d364ead455ba 100644
--- a/metadata/md5-cache/dev-java/commons-cli-1.9.0
+++ b/metadata/md5-cache/dev-java/commons-cli-1.9.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://commons.apache.org/proper/commons-cli/
 INHERIT=java-pkg-2 java-pkg-simple verify-sig
 IUSE=doc source verify-sig
-KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/cli/source/commons-cli-1.9.0-src.tar.gz verify-sig? ( https://downloads.apache.org/commons/cli/source/commons-cli-1.9.0-src.tar.gz.asc )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	verify-sig	745dccb7d4656514f1e966cce314d7db
-_md5_=9573d7ccd57e02f6792f03aeec4a3628
+_md5_=8e72869021389cbc4654e808756605dc
diff --git a/metadata/md5-cache/dev-java/commons-codec-1.16.1 b/metadata/md5-cache/dev-java/commons-codec-1.16.1
index 65641cdd6aae..05beb23fd820 100644
--- a/metadata/md5-cache/dev-java/commons-codec-1.16.1
+++ b/metadata/md5-cache/dev-java/commons-codec-1.16.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://commons.apache.org/proper/commons-codec/
 INHERIT=java-pkg-2 java-pkg-simple verify-sig
 IUSE=doc source test verify-sig
-KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm64 ppc64 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/commons/codec/source/commons-codec-1.16.1-src.tar.gz verify-sig? ( https://downloads.apache.org/commons/codec/source/commons-codec-1.16.1-src.tar.gz.asc )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	verify-sig	745dccb7d4656514f1e966cce314d7db
-_md5_=581841edc922e96c9d518706aba7e838
+_md5_=85ef6efe1449e7daca2c0724a0b1c7a2
diff --git a/metadata/md5-cache/dev-java/commons-codec-1.17.1-r1 b/metadata/md5-cache/dev-java/commons-codec-1.17.1-r1
index da643b17ba61..f2054d29a7f9 100644
--- a/metadata/md5-cache/dev-java/commons-codec-1.17.1-r1
+++ b/metadata/md5-cache/dev-java/commons-codec-1.17.1-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://commons.apache.org/proper/commons-codec/
 INHERIT=java-pkg-2 java-pkg-simple verify-sig
 IUSE=doc source test verify-sig
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/commons/codec/source/commons-codec-1.17.1-src.tar.gz verify-sig? ( https://downloads.apache.org/commons/codec/source/commons-codec-1.17.1-src.tar.gz.asc )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	verify-sig	745dccb7d4656514f1e966cce314d7db
-_md5_=31ba212d2f7b47d1de7f84753bf57cdd
+_md5_=6691bf579d1745fdb1a9932847cba569
diff --git a/metadata/md5-cache/dev-java/commons-collections-3.2.2-r2 b/metadata/md5-cache/dev-java/commons-collections-3.2.2-r2
index 6d0a1014347a..05b40d0c3d03 100644
--- a/metadata/md5-cache/dev-java/commons-collections-3.2.2-r2
+++ b/metadata/md5-cache/dev-java/commons-collections-3.2.2-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://commons.apache.org/collections/
 INHERIT=java-pkg-2 java-pkg-simple verify-sig
 IUSE=doc source test verify-sig
-KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://archive.apache.org/dist/commons/collections/source/commons-collections-3.2.2-src.tar.gz verify-sig? ( https://archive.apache.org/dist/commons/collections/source/commons-collections-3.2.2-src.tar.gz.asc )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	verify-sig	745dccb7d4656514f1e966cce314d7db
-_md5_=7e320c62e51baf3edd26d4314a735960
+_md5_=4c21a9fdc53f4d58d0f32ba83cf76bd9
diff --git a/metadata/md5-cache/dev-java/commons-collections-4.4-r2 b/metadata/md5-cache/dev-java/commons-collections-4.4-r2
index 8f98c1d35ebd..8f15864fa512 100644
--- a/metadata/md5-cache/dev-java/commons-collections-4.4-r2
+++ b/metadata/md5-cache/dev-java/commons-collections-4.4-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://commons.apache.org/proper/commons-collections/
 INHERIT=java-pkg-2 java-pkg-simple verify-sig
 IUSE=doc source test verify-sig
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=mirror://apache/commons/collections/source/commons-collections4-4.4-src.tar.gz verify-sig? ( https://downloads.apache.org/commons/collections/source/commons-collections4-4.4-src.tar.gz.asc )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	verify-sig	745dccb7d4656514f1e966cce314d7db
-_md5_=be74ebd2d505aa8a1460d31bc511becb
+_md5_=87734b2d2d3a402742a5f6a62635cfe0
diff --git a/metadata/md5-cache/dev-java/commons-compress-1.26.1 b/metadata/md5-cache/dev-java/commons-compress-1.26.1
index 48d9bf2fb6ac..3a3e0e75f1b6 100644
--- a/metadata/md5-cache/dev-java/commons-compress-1.26.1
+++ b/metadata/md5-cache/dev-java/commons-compress-1.26.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://commons.apache.org/proper/commons-compress/
 INHERIT=java-pkg-2 java-pkg-simple verify-sig
 IUSE=doc source verify-sig
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=dev-java/asm:9 dev-java/brotli-dec:0 dev-java/commons-codec:0 >=dev-java/commons-io-2.15.1:1 dev-java/commons-lang:3.6 dev-java/xz-java:0 dev-java/zstd-jni:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/compress/source/commons-compress-1.26.1-src.tar.gz verify-sig? ( https://downloads.apache.org/commons/compress/source/commons-compress-1.26.1-src.tar.gz.asc )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	verify-sig	745dccb7d4656514f1e966cce314d7db
-_md5_=b33ba7d06c1d3a53bdcc208674369814
+_md5_=734127c097bdbd6adffd1595e27cab73
diff --git a/metadata/md5-cache/dev-java/commons-compress-1.27.1 b/metadata/md5-cache/dev-java/commons-compress-1.27.1
index 8c7baf9a6f0c..3a901c755ca0 100644
--- a/metadata/md5-cache/dev-java/commons-compress-1.27.1
+++ b/metadata/md5-cache/dev-java/commons-compress-1.27.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://commons.apache.org/proper/commons-compress/
 INHERIT=java-pkg-2 java-pkg-simple verify-sig
 IUSE=doc source verify-sig
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64
 LICENSE=Apache-2.0
 RDEPEND=dev-java/asm:9 dev-java/brotli-dec:0 dev-java/commons-codec:0 >=dev-java/commons-io-2.17.0:1 dev-java/commons-lang:3.6 dev-java/xz-java:0 dev-java/zstd-jni:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/compress/source/commons-compress-1.27.1-src.tar.gz verify-sig? ( https://downloads.apache.org/commons/compress/source/commons-compress-1.27.1-src.tar.gz.asc )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	verify-sig	745dccb7d4656514f1e966cce314d7db
-_md5_=ef9e8ca85e2b7bb61c05ca2982a875f5
+_md5_=17ee5b9da22f1d72c038e98d10efeb64
diff --git a/metadata/md5-cache/dev-java/commons-csv-1.9.0 b/metadata/md5-cache/dev-java/commons-csv-1.9.0
index 581d8b068c5e..547a7c9ce728 100644
--- a/metadata/md5-cache/dev-java/commons-csv-1.9.0
+++ b/metadata/md5-cache/dev-java/commons-csv-1.9.0
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://commons.apache.org/proper/commons-csv/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/commons/csv/source/commons-csv-1.9.0-src.tar.gz -> commons-csv-1.9.0-sources.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=1f64c3bd348d6bd6611cb44836d0e84f
+_md5_=12002477d7ab0f7acb3f61700e40865b
diff --git a/metadata/md5-cache/dev-java/commons-daemon-1.4.0 b/metadata/md5-cache/dev-java/commons-daemon-1.4.0
index 4714d508d5ce..118e4437a013 100644
--- a/metadata/md5-cache/dev-java/commons-daemon-1.4.0
+++ b/metadata/md5-cache/dev-java/commons-daemon-1.4.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://commons.apache.org/proper/commons-daemon/
 INHERIT=java-pkg-2 java-pkg-simple toolchain-funcs verify-sig
 IUSE=doc source verify-sig
-KEYWORDS=amd64 ppc64 x86
+KEYWORDS=amd64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/daemon/source/commons-daemon-1.4.0-src.tar.gz verify-sig? ( https://downloads.apache.org/commons/daemon/source/commons-daemon-1.4.0-src.tar.gz.asc )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	toolchain-funcs	d3d42b22a610ce81c267b644bcec9b87	multilib	b2a329026f2e404e9e371097dda47f96	verify-sig	745dccb7d4656514f1e966cce314d7db
-_md5_=ed2d7b0404d2049bc8b28ab733e60ca1
+_md5_=2b88655f8d3e178ecfdb34083734fa0a
diff --git a/metadata/md5-cache/dev-java/commons-digester-2.1-r2 b/metadata/md5-cache/dev-java/commons-digester-2.1-r2
index 6eeb51811b9b..11695e726ac2 100644
--- a/metadata/md5-cache/dev-java/commons-digester-2.1-r2
+++ b/metadata/md5-cache/dev-java/commons-digester-2.1-r2
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://commons.apache.org/digester/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 ppc64 x86
+KEYWORDS=amd64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=dev-java/commons-beanutils-1.9.4:1.7 >=dev-java/commons-logging-1.2:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=2.1
 SRC_URI=mirror://apache/commons/digester/source/commons-digester-2.1-src.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=d9a856c9a26947e6aff0cc6a26b497a4
+_md5_=74e12cb4f9b972906056c66388f46296
diff --git a/metadata/md5-cache/dev-java/commons-digester-3.2-r3 b/metadata/md5-cache/dev-java/commons-digester-3.2-r3
index 45352b34d6a5..51d94d0686ad 100644
--- a/metadata/md5-cache/dev-java/commons-digester-3.2-r3
+++ b/metadata/md5-cache/dev-java/commons-digester-3.2-r3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://commons.apache.org/digester/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 ppc64 x86
+KEYWORDS=amd64 ppc64
 LICENSE=Apache-2.0
 PROPERTIES=test_network
 RDEPEND=>=dev-java/cglib-3.3.0:3 >=dev-java/commons-beanutils-1.9.4:1.7 >=dev-java/commons-logging-1.2:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
@@ -13,4 +13,4 @@ RESTRICT=test !test? ( test )
 SLOT=3.2
 SRC_URI=mirror://apache/commons/digester/source/commons-digester3-3.2-src.tar.gz -> commons-digester-3.2.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=32cba32ff0bd4c3adba31f8ed800b86a
+_md5_=48dc2ef78f0f45edf8fe665a61e7259d
diff --git a/metadata/md5-cache/dev-java/commons-httpclient-3.1-r3 b/metadata/md5-cache/dev-java/commons-httpclient-3.1-r3
index a2e7eadecb53..d0d68d835276 100644
--- a/metadata/md5-cache/dev-java/commons-httpclient-3.1-r3
+++ b/metadata/md5-cache/dev-java/commons-httpclient-3.1-r3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://hc.apache.org/httpclient-legacy/
 INHERIT=java-pkg-2 java-pkg-simple verify-sig
 IUSE=doc source test verify-sig
-KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm64 ppc64 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test !test? ( test )
 SLOT=3
 SRC_URI=mirror://apache/httpcomponents/commons-httpclient/source/commons-httpclient-3.1-src.tar.gz verify-sig? ( https://downloads.apache.org/httpcomponents/commons-httpclient/source/commons-httpclient-3.1-src.tar.gz.asc )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	verify-sig	745dccb7d4656514f1e966cce314d7db
-_md5_=ae8a83bd56bc8ca27a3c7fbe090c32a5
+_md5_=f9af4315a5f9ac5da49326cf6dc4ea36
diff --git a/metadata/md5-cache/dev-java/commons-imaging-0.97 b/metadata/md5-cache/dev-java/commons-imaging-0.97
index c3b11c95676a..96f3de87f13a 100644
--- a/metadata/md5-cache/dev-java/commons-imaging-0.97
+++ b/metadata/md5-cache/dev-java/commons-imaging-0.97
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://commons.apache.org/proper/commons-imaging/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://archive.apache.org/dist/commons/sanselan/source/apache-sanselan-incubating-0.97-src.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=32319862b1dde70b6027b924fcdfa582
+_md5_=e880e7cb08d6e4097ccf090b8c57286f
diff --git a/metadata/md5-cache/dev-java/commons-imaging-1.0_alpha3-r2 b/metadata/md5-cache/dev-java/commons-imaging-1.0_alpha3-r2
index d7875a2dee19..b3477f7a2baf 100644
--- a/metadata/md5-cache/dev-java/commons-imaging-1.0_alpha3-r2
+++ b/metadata/md5-cache/dev-java/commons-imaging-1.0_alpha3-r2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://commons.apache.org/proper/commons-imaging/
 INHERIT=java-pkg-2 java-pkg-simple verify-sig
 IUSE=doc source verify-sig
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://apache/commons/imaging/source/commons-imaging-1.0-alpha3-src.tar.gz verify-sig? ( https://downloads.apache.org/commons/imaging/source/commons-imaging-1.0-alpha3-src.tar.gz.asc )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	verify-sig	745dccb7d4656514f1e966cce314d7db
-_md5_=00beb751257cfe0c790fd93fde06b022
+_md5_=3b7ade8e339a4b4e017928170a2ebc2f
diff --git a/metadata/md5-cache/dev-java/commons-io-2.16.1 b/metadata/md5-cache/dev-java/commons-io-2.16.1
index c8bf1ee7b8b6..a38eeafb2bd7 100644
--- a/metadata/md5-cache/dev-java/commons-io-2.16.1
+++ b/metadata/md5-cache/dev-java/commons-io-2.16.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://commons.apache.org/proper/commons-io/
 INHERIT=java-pkg-2 java-pkg-simple verify-sig
 IUSE=doc source verify-sig
-KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://apache/commons/io/source/commons-io-2.16.1-src.tar.gz verify-sig? ( https://archive.apache.org/dist/commons/io/source/commons-io-2.16.1-src.tar.gz.asc )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	verify-sig	745dccb7d4656514f1e966cce314d7db
-_md5_=70cc29184a1b9dca1b658f56fcbe03b6
+_md5_=bf8e89124cbe1529e8d57fbb561360d3
diff --git a/metadata/md5-cache/dev-java/commons-io-2.17.0 b/metadata/md5-cache/dev-java/commons-io-2.17.0
index a971801d8732..175420f1f95d 100644
--- a/metadata/md5-cache/dev-java/commons-io-2.17.0
+++ b/metadata/md5-cache/dev-java/commons-io-2.17.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://commons.apache.org/proper/commons-io/
 INHERIT=java-pkg-2 java-pkg-simple verify-sig
 IUSE=doc source verify-sig
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://apache/commons/io/source/commons-io-2.17.0-src.tar.gz verify-sig? ( https://archive.apache.org/dist/commons/io/source/commons-io-2.17.0-src.tar.gz.asc )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	verify-sig	745dccb7d4656514f1e966cce314d7db
-_md5_=08d208aba685390ed8f8669586466b88
+_md5_=79b02f7730eeb41523dd7c098edbfcee
diff --git a/metadata/md5-cache/dev-java/commons-junit4-1.2.17 b/metadata/md5-cache/dev-java/commons-junit4-1.2.17
index f9f6486789e4..031d8d4fa68d 100644
--- a/metadata/md5-cache/dev-java/commons-junit4-1.2.17
+++ b/metadata/md5-cache/dev-java/commons-junit4-1.2.17
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://unkrig.de/w/Commons.unkrig.de
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* ~dev-java/commons-nullanalysis-1.2.17:0 dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aunkrig/commons/archive/V1.2.17.tar.gz -> unkrig-commons1.2.17.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=17ff7e56a4b2a38973dea354072160a5
+_md5_=170f90355cad3ee2ff4e4a2bd707f9fa
diff --git a/metadata/md5-cache/dev-java/commons-lang-3.17.0 b/metadata/md5-cache/dev-java/commons-lang-3.17.0
index f7286f9b3d78..8bbaa20907fd 100644
--- a/metadata/md5-cache/dev-java/commons-lang-3.17.0
+++ b/metadata/md5-cache/dev-java/commons-lang-3.17.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://commons.apache.org/proper/commons-lang/
 INHERIT=java-pkg-2 java-pkg-simple verify-sig
 IUSE=doc source verify-sig
-KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris
+KEYWORDS=amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.6
 SRC_URI=https://archive.apache.org/dist/commons/lang/source/commons-lang3-3.17.0-src.tar.gz -> commons-lang-3.17.0-src.tar.gz verify-sig? ( https://downloads.apache.org/commons/lang/source/commons-lang3-3.17.0-src.tar.gz.asc -> commons-lang-3.17.0-src.tar.gz.asc )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	verify-sig	745dccb7d4656514f1e966cce314d7db
-_md5_=9cea700a6df1b8893a8b41623bf533da
+_md5_=d14c76435f787f7b70049b6d9296d9fb
diff --git a/metadata/md5-cache/dev-java/commons-logging-1.3.1 b/metadata/md5-cache/dev-java/commons-logging-1.3.1
index 0aca3c4c9ae5..3cd969216c50 100644
--- a/metadata/md5-cache/dev-java/commons-logging-1.3.1
+++ b/metadata/md5-cache/dev-java/commons-logging-1.3.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://commons.apache.org/proper/commons-logging/
 INHERIT=java-pkg-2 java-pkg-simple verify-sig
 IUSE=log4j doc source test verify-sig
-KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=dev-java/jakarta-servlet-api:4 dev-java/slf4j-api:0 log4j? ( dev-java/log4j-12-api:2 dev-java/log4j-api:2 ) >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/commons/logging/source/commons-logging-1.3.1-src.tar.gz verify-sig? ( https://downloads.apache.org/commons/logging/source/commons-logging-1.3.1-src.tar.gz.asc )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	verify-sig	745dccb7d4656514f1e966cce314d7db
-_md5_=2ae02286781472d9ef55c32092e39d97
+_md5_=727c7c2e0486fc708b1cbf388b0ec22d
diff --git a/metadata/md5-cache/dev-java/commons-logging-1.3.4-r1 b/metadata/md5-cache/dev-java/commons-logging-1.3.4-r1
index f439269ec493..b6c192fb337d 100644
--- a/metadata/md5-cache/dev-java/commons-logging-1.3.4-r1
+++ b/metadata/md5-cache/dev-java/commons-logging-1.3.4-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://commons.apache.org/proper/commons-logging/
 INHERIT=java-pkg-2 java-pkg-simple verify-sig
 IUSE=log4j doc source test verify-sig
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=dev-java/jakarta-servlet-api:4 dev-java/slf4j-api:0 log4j? ( dev-java/log4j-12-api:2 dev-java/log4j-api:2 ) >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 REQUIRED_USE=test? ( log4j )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/commons/logging/source/commons-logging-1.3.4-src.tar.gz verify-sig? ( https://downloads.apache.org/commons/logging/source/commons-logging-1.3.4-src.tar.gz.asc )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	verify-sig	745dccb7d4656514f1e966cce314d7db
-_md5_=ae19fd29bb2aa7cc7ce9dbdf613f78b4
+_md5_=b7b1dcfd6425b1bae7e688bdcaf299da
diff --git a/metadata/md5-cache/dev-java/commons-math-3.6.1-r2 b/metadata/md5-cache/dev-java/commons-math-3.6.1-r2
index a721684ad262..7200f8c57f82 100644
--- a/metadata/md5-cache/dev-java/commons-math-3.6.1-r2
+++ b/metadata/md5-cache/dev-java/commons-math-3.6.1-r2
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://commons.apache.org/math/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc examples source
-KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3
 SRC_URI=https://repo1.maven.org/maven2/org/apache/commons/commons-math3/3.6.1/commons-math3-3.6.1-sources.jar
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=8f30bf96062ebf4972f8038c9497c169
+_md5_=df88ad1d043618b082a45f7857a2012f
diff --git a/metadata/md5-cache/dev-java/commons-net-3.11.1 b/metadata/md5-cache/dev-java/commons-net-3.11.1
index a25cbac8ed96..ca6edf00d3b5 100644
--- a/metadata/md5-cache/dev-java/commons-net-3.11.1
+++ b/metadata/md5-cache/dev-java/commons-net-3.11.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://commons.apache.org/proper/commons-net/
 INHERIT=java-pkg-2 java-pkg-simple verify-sig
 IUSE=doc examples source verify-sig
-KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/net/source/commons-net-3.11.1-src.tar.gz verify-sig? ( https://downloads.apache.org/commons/net/source/commons-net-3.11.1-src.tar.gz.asc )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	verify-sig	745dccb7d4656514f1e966cce314d7db
-_md5_=8d787af9a3791835fdae477b43b95854
+_md5_=adc1f598acaa4571efabc1f3ff7d1eda
diff --git a/metadata/md5-cache/dev-java/commons-nullanalysis-1.2.17 b/metadata/md5-cache/dev-java/commons-nullanalysis-1.2.17
index 5247a430d5ff..a6bdff2ec2ff 100644
--- a/metadata/md5-cache/dev-java/commons-nullanalysis-1.2.17
+++ b/metadata/md5-cache/dev-java/commons-nullanalysis-1.2.17
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://unkrig.de/w/Commons.unkrig.de
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/aunkrig/commons/archive/V1.2.17.tar.gz -> unkrig-commons1.2.17.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=51cbce2d740ba1d8d65294dcd94778db
+_md5_=36bdbcf2e571eee7205630d214dab93c
diff --git a/metadata/md5-cache/dev-java/commons-validator-1.8.0 b/metadata/md5-cache/dev-java/commons-validator-1.8.0
index ae146fce389d..5a4a521d66b0 100644
--- a/metadata/md5-cache/dev-java/commons-validator-1.8.0
+++ b/metadata/md5-cache/dev-java/commons-validator-1.8.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://commons.apache.org/proper/commons-validator/
 INHERIT=java-pkg-2 java-pkg-simple verify-sig
 IUSE=doc source test verify-sig
-KEYWORDS=amd64 ppc64 x86
+KEYWORDS=amd64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=dev-java/commons-beanutils:1.7 dev-java/commons-digester:2.1 dev-java/commons-logging:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/commons/validator/source/commons-validator-1.8.0-src.tar.gz verify-sig? ( https://downloads.apache.org/commons/validator/source/commons-validator-1.8.0-src.tar.gz.asc )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	verify-sig	745dccb7d4656514f1e966cce314d7db
-_md5_=8893176cdb5451e0b1a12936fdeddbdb
+_md5_=614ffa91601edb27f78eab2d03cac6ff
diff --git a/metadata/md5-cache/dev-java/commons-vfs-2.0-r4 b/metadata/md5-cache/dev-java/commons-vfs-2.0-r4
index c27881241d73..e9f7bf2d4e95 100644
--- a/metadata/md5-cache/dev-java/commons-vfs-2.0-r4
+++ b/metadata/md5-cache/dev-java/commons-vfs-2.0-r4
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://commons.apache.org/vfs/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm64 ppc64 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-java/ant-1.10.14-r3:0 dev-java/commons-collections:0 dev-java/commons-logging:0 dev-java/commons-net:0 dev-java/commons-httpclient:3 dev-java/jackrabbit-webdav:0 dev-java/jsch:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://archive.apache.org/dist/commons/vfs/source/commons-vfs-2.0-src.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=4ddf5e28b34066054bb78d41271ff4f4
+_md5_=8174d1eac0ed386ecfd17b1a91e37847
diff --git a/metadata/md5-cache/dev-java/concurrentlinkedhashmap-lru-1.4.2 b/metadata/md5-cache/dev-java/concurrentlinkedhashmap-lru-1.4.2
index 67f95322371c..3a35114b021f 100644
--- a/metadata/md5-cache/dev-java/concurrentlinkedhashmap-lru-1.4.2
+++ b/metadata/md5-cache/dev-java/concurrentlinkedhashmap-lru-1.4.2
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/ben-manes/concurrentlinkedhashmap
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/jsr305:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/ben-manes/concurrentlinkedhashmap/archive/concurrentlinkedhashmap-lru-1.4.2.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=fc7f7b2361ca916dc82c4e62b89f0857
+_md5_=c6f5cb1bbd022c5fbb14c58f8722590d
diff --git a/metadata/md5-cache/dev-java/conversant-disruptor-1.2.20 b/metadata/md5-cache/dev-java/conversant-disruptor-1.2.20
index e926b3a66196..6f071d818c2e 100644
--- a/metadata/md5-cache/dev-java/conversant-disruptor-1.2.20
+++ b/metadata/md5-cache/dev-java/conversant-disruptor-1.2.20
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/conversant/disruptor
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/conversant/disruptor/archive/1.2.20.tar.gz -> conversant-disruptor-1.2.20.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=9c670738178a06ed14fd4b6a15c6e0e3
+_md5_=db32a1ce6ab4dff3f187ec0907a59206
diff --git a/metadata/md5-cache/dev-java/cortado-0.6.0-r3 b/metadata/md5-cache/dev-java/cortado-0.6.0-r3
index 1ba987a8b164..1dd28f66c562 100644
--- a/metadata/md5-cache/dev-java/cortado-0.6.0-r3
+++ b/metadata/md5-cache/dev-java/cortado-0.6.0-r3
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://www.theora.org/cortado/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 ppc64 x86
+KEYWORDS=amd64 ppc64
 LICENSE=GPL-2 LGPL-2
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://downloads.xiph.org/releases/cortado/cortado-0.6.0.tar.gz https://sources.debian.org/data/main/c/cortado/0.6.0-5/debian/patches/sun.audio-Java-9.patch -> cortado-sun.audio-Java-9.patch
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=539feca8d7f19bea516120a4d1d1a814
+_md5_=4bd3162710e2ecfcf0434916db1fcfe4
diff --git a/metadata/md5-cache/dev-java/cpptasks-1.0_beta5-r3 b/metadata/md5-cache/dev-java/cpptasks-1.0_beta5-r3
index ee26aa52267a..2695ffd1d392 100644
--- a/metadata/md5-cache/dev-java/cpptasks-1.0_beta5-r3
+++ b/metadata/md5-cache/dev-java/cpptasks-1.0_beta5-r3
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://ant-contrib.sourceforge.net
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc examples source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=dev-java/ant-1.10.14:0 dev-java/xerces:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/ant-contrib/ant-contrib/cpptasks-1.0-beta5/cpptasks-1.0b5.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=9daf0f474c46ea94f0b04c4211df6e02
+_md5_=8890aa4f54f8aa66cdfe64d97e67058c
diff --git a/metadata/md5-cache/dev-java/dom4j-2.1.4 b/metadata/md5-cache/dev-java/dom4j-2.1.4
index 6b8fcb0423e0..924ed5234d4d 100644
--- a/metadata/md5-cache/dev-java/dom4j-2.1.4
+++ b/metadata/md5-cache/dev-java/dom4j-2.1.4
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://dom4j.github.io/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=jaxen doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=dom4j
 RDEPEND=dev-java/jaxb-api:2 dev-java/xpp2:0 dev-java/xpp3:0 dev-java/xsdlib:0 >=virtual/jre-1.8:* jaxen? ( dev-java/jaxen:1.2[dom4j] ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://github.com/dom4j/dom4j/archive/version-2.1.4.tar.gz -> dom4j-2.1.4.tar.gz https://repo1.maven.org/maven2/jaxen/jaxen/1.2.0/jaxen-1.2.0.jar
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=f928a0f7572ee48176fbfaf2c0167a66
+_md5_=5b39f1a5ba4228e2c2b7d2ca3ff3aa8c
diff --git a/metadata/md5-cache/dev-java/easymock-2.5.2 b/metadata/md5-cache/dev-java/easymock-2.5.2
index cb383170a59d..8185ace71315 100644
--- a/metadata/md5-cache/dev-java/easymock-2.5.2
+++ b/metadata/md5-cache/dev-java/easymock-2.5.2
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://easymock.org
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=2.5
 SRC_URI=https://github.com/easymock/easymock/archive/easymock-2.5.2.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=7423d3d7f12ef70ca1fa476795043192
+_md5_=45a58871b65092df13b3795a4cbaf49a
diff --git a/metadata/md5-cache/dev-java/easymock-3.3.1-r1 b/metadata/md5-cache/dev-java/easymock-3.3.1-r1
index abe7ae9d0d45..563252213e7c 100644
--- a/metadata/md5-cache/dev-java/easymock-3.3.1-r1
+++ b/metadata/md5-cache/dev-java/easymock-3.3.1-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://easymock.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/cglib:3 dev-java/junit:4 dev-java/objenesis:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=3.2
 SRC_URI=https://github.com/easymock/easymock/archive/refs/tags/easymock-3.3.1.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=ba849cc9a376dc1ad8bf97c38286aa9e
+_md5_=db5cae766b05e1cfc6608493739dd866
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-4.20 b/metadata/md5-cache/dev-java/eclipse-ecj-4.20
index d7bbf259d6b8..1b54c80d9b3e 100644
--- a/metadata/md5-cache/dev-java/eclipse-ecj-4.20
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-4.20
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://projects.eclipse.org/projects/eclipse.jdt
 INHERIT=java-pkg-2 java-pkg-simple prefix
 IUSE=doc source
-KEYWORDS=amd64 ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm64 ~ppc64
 LICENSE=EPL-1.0
 RDEPEND=app-eselect/eselect-java >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.20
 SRC_URI=https://archive.eclipse.org/eclipse/downloads/drops4/R-4.20-202106111600/ecjsrc-4.20.jar
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	prefix	c3c4c93ebda319c0fa7ed6f942ba1010
-_md5_=af143b5ad594b447a75dfc5b1064f506
+_md5_=b9a3f84ba5b2fde2bc6b465f7d322f62
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-4.26-r2 b/metadata/md5-cache/dev-java/eclipse-ecj-4.26-r2
index 050625d4ea85..d74583ec7882 100644
--- a/metadata/md5-cache/dev-java/eclipse-ecj-4.26-r2
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-4.26-r2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://projects.eclipse.org/projects/eclipse.jdt
 INHERIT=java-pkg-2 java-pkg-simple prefix
 IUSE=doc source
-KEYWORDS=amd64 ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm64 ~ppc64
 LICENSE=EPL-1.0
 RDEPEND=app-eselect/eselect-java !dev-java/ant-eclipse-ecj:4.26 >=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.26
 SRC_URI=https://archive.eclipse.org/eclipse/downloads/drops4/R-4.26-202211231800/ecjsrc-4.26.jar
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	prefix	c3c4c93ebda319c0fa7ed6f942ba1010
-_md5_=e9463673ae896d938a6d3f4c53d8cc73
+_md5_=16602a2863c858d29783e44b29f38251
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-4.27-r1 b/metadata/md5-cache/dev-java/eclipse-ecj-4.27-r1
index ef9721dd6d5e..4dab25e46159 100644
--- a/metadata/md5-cache/dev-java/eclipse-ecj-4.27-r1
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-4.27-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://projects.eclipse.org/projects/eclipse.jdt
 INHERIT=java-pkg-2 java-pkg-simple prefix
 IUSE=doc source
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64
 LICENSE=EPL-1.0
 RDEPEND=app-eselect/eselect-java >=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.27
 SRC_URI=https://archive.eclipse.org/eclipse/downloads/drops4/R-4.27-202303020300/ecjsrc-4.27.jar
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	prefix	c3c4c93ebda319c0fa7ed6f942ba1010
-_md5_=197b20cdd2487c3503b54f8fe22cfe12
+_md5_=d2dc7a87b33b2086049bcf4281287e7c
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-4.30-r1 b/metadata/md5-cache/dev-java/eclipse-ecj-4.30-r1
index 5e01cbb571f3..4703d211ca7f 100644
--- a/metadata/md5-cache/dev-java/eclipse-ecj-4.30-r1
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-4.30-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://projects.eclipse.org/projects/eclipse.jdt
 INHERIT=java-pkg-2 java-pkg-simple prefix
 IUSE=doc source
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64
 LICENSE=EPL-1.0
 RDEPEND=app-eselect/eselect-java >=virtual/jre-17:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.30
 SRC_URI=https://archive.eclipse.org/eclipse/downloads/drops4/R-4.30-202312010110/ecjsrc-4.30.jar
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	prefix	c3c4c93ebda319c0fa7ed6f942ba1010
-_md5_=0158993166f299b30084a153d6386805
+_md5_=2e5e83d0bdf48ff587930bd45c8cc2ca
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-4.31 b/metadata/md5-cache/dev-java/eclipse-ecj-4.31
index 24ac90a4a725..c87fceab27b9 100644
--- a/metadata/md5-cache/dev-java/eclipse-ecj-4.31
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-4.31
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://projects.eclipse.org/projects/eclipse.jdt
 INHERIT=java-pkg-2 java-pkg-simple prefix
 IUSE=doc source
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64
 LICENSE=EPL-1.0
 RDEPEND=app-eselect/eselect-java >=virtual/jre-17:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.31
 SRC_URI=https://download.eclipse.org/eclipse/downloads/drops4/R-4.31-202402290520/ecjsrc-4.31.jar
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	prefix	c3c4c93ebda319c0fa7ed6f942ba1010
-_md5_=15d3cee219cfffb32a17b15f3157eb5d
+_md5_=72b4b8f56c49b555ccb6dd73caed80a5
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-4.32 b/metadata/md5-cache/dev-java/eclipse-ecj-4.32
index 99e81f932c0d..94c80569d796 100644
--- a/metadata/md5-cache/dev-java/eclipse-ecj-4.32
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-4.32
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://projects.eclipse.org/projects/eclipse.jdt
 INHERIT=java-pkg-2 java-pkg-simple prefix
 IUSE=doc source
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64
 LICENSE=EPL-1.0
 RDEPEND=app-eselect/eselect-java >=virtual/jre-17:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.32
 SRC_URI=https://download.eclipse.org/eclipse/downloads/drops4/R-4.32-202406010610/ecjsrc-4.32.jar
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	prefix	c3c4c93ebda319c0fa7ed6f942ba1010
-_md5_=475509686cc504fa59979a5ed890ddf2
+_md5_=3c8885e7e2bf779348dd515b514f52be
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-4.33 b/metadata/md5-cache/dev-java/eclipse-ecj-4.33
index 7ae4249d77fc..fbb81e8600fc 100644
--- a/metadata/md5-cache/dev-java/eclipse-ecj-4.33
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-4.33
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://projects.eclipse.org/projects/eclipse.jdt
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64
 LICENSE=EPL-1.0
 RDEPEND=app-eselect/eselect-java >=virtual/jre-17:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.33
 SRC_URI=https://download.eclipse.org/eclipse/downloads/drops4/R-4.33-202409030240/ecjsrc-4.33.jar
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=361b9107ac67507b549e12c69129e209
+_md5_=50acbfc04305ea309c4c2d35c13b182a
diff --git a/metadata/md5-cache/dev-java/eclipse-jdt-annotation-4.30 b/metadata/md5-cache/dev-java/eclipse-jdt-annotation-4.30
index 0ae3624252c2..0b1e0962c64a 100644
--- a/metadata/md5-cache/dev-java/eclipse-jdt-annotation-4.30
+++ b/metadata/md5-cache/dev-java/eclipse-jdt-annotation-4.30
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://projects.eclipse.org/projects/eclipse.jdt
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64
 LICENSE=EPL-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/eclipse-jdt/eclipse.jdt.core/archive//R4_30.tar.gz -> eclipse.jdt.core-4.30.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=4018e6ba9c5c85283bd2878258330112
+_md5_=426cd0503038ae4ca95a9debfa5dd9ee
diff --git a/metadata/md5-cache/dev-java/emma-2.0.5312-r6 b/metadata/md5-cache/dev-java/emma-2.0.5312-r6
index 202052d15bfd..a77834639915 100644
--- a/metadata/md5-cache/dev-java/emma-2.0.5312-r6
+++ b/metadata/md5-cache/dev-java/emma-2.0.5312-r6
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://emma.sourceforge.net/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=+launcher doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=CPL-1.0
 RDEPEND=>=dev-java/ant-1.10.14:0 >=virtual/jre-1.8:* launcher? ( !sci-biology/emboss:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/emma/emma-release/2.0.5312/emma-2.0.5312-src.zip
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=e5ac32cef93d6bd3c65ef4aefff81722
+_md5_=1ebf5e6b175dd83d4f728de51c828200
diff --git a/metadata/md5-cache/dev-java/error-prone-annotations-2.27.1-r1 b/metadata/md5-cache/dev-java/error-prone-annotations-2.27.1-r1
index 872f894dd7e0..9aa87fb7a931 100644
--- a/metadata/md5-cache/dev-java/error-prone-annotations-2.27.1-r1
+++ b/metadata/md5-cache/dev-java/error-prone-annotations-2.27.1-r1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://errorprone.info
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/google/error-prone/archive/v2.27.1.tar.gz -> error-prone-2.27.1.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=9ea8bbe380d5986d86b8d470912722ce
+_md5_=2ea1b7bb39d246860d441defe9dfefc0
diff --git a/metadata/md5-cache/dev-java/error-prone-annotations-2.32.0 b/metadata/md5-cache/dev-java/error-prone-annotations-2.32.0
index 7e4fa84d2599..2d184d93bba0 100644
--- a/metadata/md5-cache/dev-java/error-prone-annotations-2.32.0
+++ b/metadata/md5-cache/dev-java/error-prone-annotations-2.32.0
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://errorprone.info
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/google/error-prone/archive/v2.32.0.tar.gz -> error-prone-2.32.0.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=52cddd11c0f9142044a2c17412d83a05
+_md5_=17ac9db7dfc851b7c258bb1949bea24c
diff --git a/metadata/md5-cache/dev-java/fastinfoset-2.1.0-r1 b/metadata/md5-cache/dev-java/fastinfoset-2.1.0-r1
index 2710fcb993ff..7f501f53a783 100644
--- a/metadata/md5-cache/dev-java/fastinfoset-2.1.0-r1
+++ b/metadata/md5-cache/dev-java/fastinfoset-2.1.0-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://projects.eclipse.org/projects/ee4j.jaxb-impl/FastInfoset
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0 EPL-1.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/eclipse-ee4j/jaxb-fi/archive/2.1.0.tar.gz -> fastinfoset-2.1.0.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=ce98ab76b017e6f530771cbaa4c2e6ed
+_md5_=da680644e6db96d2e111a220aba17bda
diff --git a/metadata/md5-cache/dev-java/fec-1.0.4-r5 b/metadata/md5-cache/dev-java/fec-1.0.4-r5
index 90142287e3ae..b3240e3d2dad 100644
--- a/metadata/md5-cache/dev-java/fec-1.0.4-r5
+++ b/metadata/md5-cache/dev-java/fec-1.0.4-r5
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/hyphanet/contrib/blob/master/README
 INHERIT=flag-o-matic toolchain-funcs java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 ~arm64
 LICENSE=BSD-2
 RDEPEND=dev-java/log4j-12-api:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~monsieurp/packages/fec-1.0.4.tar.gz
 _eclasses_=toolchain-funcs	d3d42b22a610ce81c267b644bcec9b87	multilib	b2a329026f2e404e9e371097dda47f96	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=2b068715ef45f6356b97cb618a1ea265
+_md5_=f9801f230055bf2b90fc7007b424b573
diff --git a/metadata/md5-cache/dev-java/felix-framework-7.0.5-r2 b/metadata/md5-cache/dev-java/felix-framework-7.0.5-r2
index 3e18b95eddc1..d0267f29554a 100644
--- a/metadata/md5-cache/dev-java/felix-framework-7.0.5-r2
+++ b/metadata/md5-cache/dev-java/felix-framework-7.0.5-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://felix.apache.org/documentation/subprojects/apache-felix-framework.html
 INHERIT=java-pkg-2 java-pkg-simple verify-sig
 IUSE=doc source test verify-sig
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=dev-java/animal-sniffer-annotations:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/felix/org.apache.felix.framework-7.0.5-source-release.tar.gz verify-sig? ( https://downloads.apache.org/felix/org.apache.felix.framework-7.0.5-source-release.tar.gz.asc )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	verify-sig	745dccb7d4656514f1e966cce314d7db
-_md5_=3a0fdce8247d58818fa000fdfa52dae4
+_md5_=f8da37088e3b3192ddf71da7b5a4faf2
diff --git a/metadata/md5-cache/dev-java/felix-gogo-runtime-1.1.6 b/metadata/md5-cache/dev-java/felix-gogo-runtime-1.1.6
index fe05fe02faa1..30dfee59c7b2 100644
--- a/metadata/md5-cache/dev-java/felix-gogo-runtime-1.1.6
+++ b/metadata/md5-cache/dev-java/felix-gogo-runtime-1.1.6
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://felix.apache.org/documentation/subprojects/apache-felix-gogo.html
 INHERIT=java-pkg-2 java-pkg-simple verify-sig
 IUSE=doc source test verify-sig
-KEYWORDS=amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=dev-java/osgi-annotation:0 dev-java/osgi-cmpn:8 dev-java/osgi-core:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/felix/org.apache.felix.gogo.runtime-1.1.6-source-release.tar.gz -> felix-gogo-runtime-1.1.6.tar.gz verify-sig? ( https://dlcdn.apache.org/felix/org.apache.felix.gogo.runtime-1.1.6-source-release.tar.gz.asc -> felix-gogo-runtime-1.1.6.tar.gz.asc )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	verify-sig	745dccb7d4656514f1e966cce314d7db
-_md5_=6d8a5eb78221e1bab7c65559f560c146
+_md5_=6a5621b561dac6eb047b4a1e0891b372
diff --git a/metadata/md5-cache/dev-java/felix-main-7.0.5-r2 b/metadata/md5-cache/dev-java/felix-main-7.0.5-r2
index 27e593765e72..acafeb0f9431 100644
--- a/metadata/md5-cache/dev-java/felix-main-7.0.5-r2
+++ b/metadata/md5-cache/dev-java/felix-main-7.0.5-r2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://felix.apache.org/documentation/index.html
 INHERIT=java-pkg-2 java-pkg-simple verify-sig
 IUSE=doc source verify-sig
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* ~dev-java/felix-framework-7.0.5:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/felix/org.apache.felix.main-7.0.5-source-release.tar.gz verify-sig? ( https://downloads.apache.org/felix/org.apache.felix.main-7.0.5-source-release.tar.gz.asc )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	verify-sig	745dccb7d4656514f1e966cce314d7db
-_md5_=485e5536098fa007808c1b64d9466b8c
+_md5_=5a5c5eed9bc0bd3118818dc5894243f4
diff --git a/metadata/md5-cache/dev-java/felix-resolver-2.0.4-r1 b/metadata/md5-cache/dev-java/felix-resolver-2.0.4-r1
index af00c6df2882..00bc3dcef877 100644
--- a/metadata/md5-cache/dev-java/felix-resolver-2.0.4-r1
+++ b/metadata/md5-cache/dev-java/felix-resolver-2.0.4-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://felix.apache.org/documentation/index.html
 INHERIT=java-pkg-2 java-pkg-simple verify-sig
 IUSE=doc source test verify-sig
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/osgi-annotation:0 dev-java/osgi-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/felix/org.apache.felix.resolver-2.0.4-source-release.tar.gz verify-sig? ( https://downloads.apache.org/felix/org.apache.felix.resolver-2.0.4-source-release.tar.gz.asc )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	verify-sig	745dccb7d4656514f1e966cce314d7db
-_md5_=c9840a6573aec683dc1a275d8d0b60b8
+_md5_=d4cdd75d5094e2da9f3f1dcaadb56ac0
diff --git a/metadata/md5-cache/dev-java/felix-utils-1.11.8-r1 b/metadata/md5-cache/dev-java/felix-utils-1.11.8-r1
index 581599162bac..8e5f06a07128 100644
--- a/metadata/md5-cache/dev-java/felix-utils-1.11.8-r1
+++ b/metadata/md5-cache/dev-java/felix-utils-1.11.8-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://felix.apache.org/documentation/index.html
 INHERIT=java-pkg-2 java-pkg-simple verify-sig
 IUSE=doc source test verify-sig
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/felix/org.apache.felix.utils-1.11.8-source-release.tar.gz verify-sig? ( https://downloads.apache.org/felix/org.apache.felix.utils-1.11.8-source-release.tar.gz.asc )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	verify-sig	745dccb7d4656514f1e966cce314d7db
-_md5_=70638b52ebfac120443d684e9a3f793b
+_md5_=50a30f8e5d3e222d9925af5d57c686ad
diff --git a/metadata/md5-cache/dev-java/findbugs-annotations-3.0.1 b/metadata/md5-cache/dev-java/findbugs-annotations-3.0.1
index eced629cc174..406f9d98ce54 100644
--- a/metadata/md5-cache/dev-java/findbugs-annotations-3.0.1
+++ b/metadata/md5-cache/dev-java/findbugs-annotations-3.0.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://findbugs.sourceforge.net/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=LGPL-3
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/jsr305-3.0.2:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/com/google/code/findbugs/findbugs-annotations/3.0.1/findbugs-annotations-3.0.1-sources.jar
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=7a52cb68ad210464aed141d4a2f3aa84
+_md5_=adb9f62993a771a399fec933660e8bb3
diff --git a/metadata/md5-cache/dev-java/fishbowl-1.4.1 b/metadata/md5-cache/dev-java/fishbowl-1.4.1
index 8d8ff52e46d1..acc7405be42a 100644
--- a/metadata/md5-cache/dev-java/fishbowl-1.4.1
+++ b/metadata/md5-cache/dev-java/fishbowl-1.4.1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/stefanbirkner/fishbowl/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm64 ~ppc64
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/stefanbirkner/fishbowl/archive/fishbowl-1.4.1.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=7926431a9c1ad7f82f68dfb45fabc973
+_md5_=099085953abb45414a477d0fb86cdf8d
diff --git a/metadata/md5-cache/dev-java/fontbox-2.0.27 b/metadata/md5-cache/dev-java/fontbox-2.0.27
index 8b32ee2787fa..82d0629277bd 100644
--- a/metadata/md5-cache/dev-java/fontbox-2.0.27
+++ b/metadata/md5-cache/dev-java/fontbox-2.0.27
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://pdfbox.apache.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=dev-java/commons-logging:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/pdfbox/2.0.27/pdfbox-2.0.27-src.zip test? ( https://issues.apache.org/jira/secure/attachment/12684264/SourceSansProBold.otf https://issues.apache.org/jira/secure/attachment/12896461/NotoEmoji-Regular.ttf https://issues.apache.org/jira/secure/attachment/12809395/DejaVuSansMono.ttf https://issues.apache.org/jira/secure/attachment/13036376/NotoSansSC-Regular.otf https://mirrors.ctan.org/fonts/opensans/type1/OpenSans-Regular.pfb )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=beabd835debe0df66cdc641ad9f639b3
+_md5_=f1678e2feceb55eea0a0b1ba802c07e1
diff --git a/metadata/md5-cache/dev-java/fop-2.9-r1 b/metadata/md5-cache/dev-java/fop-2.9-r1
index f5add10f6eec..b82b96053d5e 100644
--- a/metadata/md5-cache/dev-java/fop-2.9-r1
+++ b/metadata/md5-cache/dev-java/fop-2.9-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://xmlgraphics.apache.org/fop/
 INHERIT=java-pkg-2 java-pkg-simple verify-sig
 IUSE=doc source test verify-sig
-KEYWORDS=amd64 ~arm64 ppc64 x86
+KEYWORDS=amd64 ~arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=dev-java/ant-1.10.14-r3:0 dev-java/batik:1.16 dev-java/commons-io:1 dev-java/commons-logging:0 dev-java/fontbox:0 dev-java/javax-servlet-api:2.2 dev-java/qdox:1.12 dev-java/sun-jai-bin:0 dev-java/xmlgraphics-commons:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=2.8
 SRC_URI=mirror://apache/xmlgraphics/fop/source/fop-2.9-src.tar.gz https://dev.gentoo.org/~flow/distfiles/fop/fop-2.7-jars.tar.xz verify-sig? ( https://downloads.apache.org/xmlgraphics/fop/source/fop-2.9-src.tar.gz.asc ) test? ( https://repo1.maven.org/maven2/net/sf/offo/fop-hyph/2.0/fop-hyph-2.0.jar )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	verify-sig	745dccb7d4656514f1e966cce314d7db
-_md5_=2002e2646a69d0109099db1a8d5adf21
+_md5_=58af02dc2f94d0894cb0347eeba660ce
diff --git a/metadata/md5-cache/dev-java/freenet-ext-29-r1 b/metadata/md5-cache/dev-java/freenet-ext-29-r1
index eb59cd8f662e..0c3d5802f20d 100644
--- a/metadata/md5-cache/dev-java/freenet-ext-29-r1
+++ b/metadata/md5-cache/dev-java/freenet-ext-29-r1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/hyphanet/contrib/
 INHERIT=java-pkg-2 java-pkg-simple toolchain-funcs
 IUSE=doc source
-KEYWORDS=amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64
 LICENSE=public-domain
 RDEPEND=dev-libs/gmp >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=29
 SRC_URI=https://github.com/hyphanet/contrib/archive/v29.tar.gz -> freenet-ext-29.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	toolchain-funcs	d3d42b22a610ce81c267b644bcec9b87	multilib	b2a329026f2e404e9e371097dda47f96
-_md5_=6b1626b43219063a775219455bbefdfd
+_md5_=00e01df0adf32bd157cdd104fbedeaa5
diff --git a/metadata/md5-cache/dev-java/gnu-regexp-1.1.4-r4 b/metadata/md5-cache/dev-java/gnu-regexp-1.1.4-r4
index cda18b7878fa..23c490665db9 100644
--- a/metadata/md5-cache/dev-java/gnu-regexp-1.1.4-r4
+++ b/metadata/md5-cache/dev-java/gnu-regexp-1.1.4-r4
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://savannah.gnu.org/projects/gnu-regexp
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=amd64 ~arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=LGPL-2.1
 RDEPEND=dev-java/java-getopt:1 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://gentoo/gnu-regexp-1.1.4.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=87b4072c98e6e1fb5dc32a56ad7d43f6
+_md5_=8cea0c4bb3b417245de1c5f2fa72ae5d
diff --git a/metadata/md5-cache/dev-java/gradle-bin-8.10 b/metadata/md5-cache/dev-java/gradle-bin-8.10
index 1aa8bacc632d..dbb0778f3b5f 100644
--- a/metadata/md5-cache/dev-java/gradle-bin-8.10
+++ b/metadata/md5-cache/dev-java/gradle-bin-8.10
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://gradle.org
 INHERIT=java-pkg-2
 IUSE=doc source
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 RDEPEND=app-eselect/eselect-gradle >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=8.10
 SRC_URI=https://services.gradle.org/distributions/gradle-8.10-all.zip -> gradle-bin-8.10.zip
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9
-_md5_=5044332bc9036b130d0a86c9d4a929d6
+_md5_=a03ea9f8a8944442757de26fda689a44
diff --git a/metadata/md5-cache/dev-java/gradle-bin-8.10.2 b/metadata/md5-cache/dev-java/gradle-bin-8.10.2
index 88b88fba58ab..31da63023351 100644
--- a/metadata/md5-cache/dev-java/gradle-bin-8.10.2
+++ b/metadata/md5-cache/dev-java/gradle-bin-8.10.2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://gradle.org
 INHERIT=java-pkg-2
 IUSE=doc source
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RDEPEND=app-eselect/eselect-gradle >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=8.10.2
 SRC_URI=https://services.gradle.org/distributions/gradle-8.10.2-all.zip -> gradle-bin-8.10.2.zip
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9
-_md5_=86a16ab1b2351656d84bed8ff99a1dbb
+_md5_=f35078941602f96d3fb29abac18afaf0
diff --git a/metadata/md5-cache/dev-java/gradle-bin-8.4 b/metadata/md5-cache/dev-java/gradle-bin-8.4
index 214ae0029916..6ff293d06ca2 100644
--- a/metadata/md5-cache/dev-java/gradle-bin-8.4
+++ b/metadata/md5-cache/dev-java/gradle-bin-8.4
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.gradle.org/
 INHERIT=java-pkg-2
 IUSE=doc source
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 RDEPEND=app-eselect/eselect-gradle >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=8.4
 SRC_URI=https://services.gradle.org/distributions/gradle-8.4-all.zip -> gradle-bin-8.4.zip
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9
-_md5_=1ba35d3f4f459ed1fdf821e693c0178a
+_md5_=618882812a389b0ebd84fe158d440cd3
diff --git a/metadata/md5-cache/dev-java/gradle-bin-8.5 b/metadata/md5-cache/dev-java/gradle-bin-8.5
index d5f14dcd0e4e..365629af5432 100644
--- a/metadata/md5-cache/dev-java/gradle-bin-8.5
+++ b/metadata/md5-cache/dev-java/gradle-bin-8.5
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.gradle.org/
 INHERIT=java-pkg-2
 IUSE=doc source
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 RDEPEND=app-eselect/eselect-gradle >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=8.5
 SRC_URI=https://services.gradle.org/distributions/gradle-8.5-all.zip -> gradle-bin-8.5.zip
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9
-_md5_=1ba35d3f4f459ed1fdf821e693c0178a
+_md5_=618882812a389b0ebd84fe158d440cd3
diff --git a/metadata/md5-cache/dev-java/gradle-bin-8.7 b/metadata/md5-cache/dev-java/gradle-bin-8.7
index 96cfb0d62e33..fbe6da801092 100644
--- a/metadata/md5-cache/dev-java/gradle-bin-8.7
+++ b/metadata/md5-cache/dev-java/gradle-bin-8.7
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.gradle.org/
 INHERIT=java-pkg-2
 IUSE=doc source
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 RDEPEND=app-eselect/eselect-gradle >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=8.7
 SRC_URI=https://services.gradle.org/distributions/gradle-8.7-all.zip -> gradle-bin-8.7.zip
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9
-_md5_=1ba35d3f4f459ed1fdf821e693c0178a
+_md5_=618882812a389b0ebd84fe158d440cd3
diff --git a/metadata/md5-cache/dev-java/greenmail-2.0.0_alpha2 b/metadata/md5-cache/dev-java/greenmail-2.0.0_alpha2
index 8da328b4483f..f925daaec49b 100644
--- a/metadata/md5-cache/dev-java/greenmail-2.0.0_alpha2
+++ b/metadata/md5-cache/dev-java/greenmail-2.0.0_alpha2
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://greenmail-mail-test.github.io/greenmail/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/jakarta-activation-api:2 dev-java/jakarta-mail:0 dev-java/junit:4 dev-java/slf4j-api:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/greenmail-mail-test/greenmail/archive/release-2.0.0-alpha-2.tar.gz -> greenmail-2.0.0_alpha2.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=867410e835a2cdceaf8f969a02872808
+_md5_=3cdd3151f6e38aa0c49ffe90a1d1f852
diff --git a/metadata/md5-cache/dev-java/gson-2.11.0-r2 b/metadata/md5-cache/dev-java/gson-2.11.0-r2
index 7254b317620f..c15657fe7fdf 100644
--- a/metadata/md5-cache/dev-java/gson-2.11.0-r2
+++ b/metadata/md5-cache/dev-java/gson-2.11.0-r2
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/google/gson
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/gson/archive/gson-parent-2.11.0.tar.gz test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=fdf4b0f41b10c7bbd2cb336be90a2195
+_md5_=3c5794361ee4afbc89f486e21a0fc342
diff --git a/metadata/md5-cache/dev-java/guava-33.2.0 b/metadata/md5-cache/dev-java/guava-33.2.0
index ab735457683d..acf5adab41e3 100644
--- a/metadata/md5-cache/dev-java/guava-33.2.0
+++ b/metadata/md5-cache/dev-java/guava-33.2.0
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/google/guava
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=dev-java/error-prone-annotations-2.27.1:0 dev-java/j2objc-annotations:0 dev-java/jsr305:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/google/guava/archive/v33.2.0.tar.gz -> guava-33.2.0.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=9b2343df06fb94edbbb7fe89d8257b9b
+_md5_=2c26ef5962496d455a4f814d5ae28df7
diff --git a/metadata/md5-cache/dev-java/guava-33.3.0 b/metadata/md5-cache/dev-java/guava-33.3.0
index 181ee6df3104..79cfc0290453 100644
--- a/metadata/md5-cache/dev-java/guava-33.3.0
+++ b/metadata/md5-cache/dev-java/guava-33.3.0
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/google/guava
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=dev-java/error-prone-annotations-2.32.0:0 dev-java/j2objc-annotations:0 dev-java/jsr305:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/google/guava/archive/v33.3.0.tar.gz -> guava-33.3.0.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=9cd1a3fc54de14c908156f34296bbde0
+_md5_=c60193b84ae610b665a826cb408436df
diff --git a/metadata/md5-cache/dev-java/guava-testlib-33.2.0 b/metadata/md5-cache/dev-java/guava-testlib-33.2.0
index 802a7ad44b4e..51fd99b1a6ad 100644
--- a/metadata/md5-cache/dev-java/guava-testlib-33.2.0
+++ b/metadata/md5-cache/dev-java/guava-testlib-33.2.0
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/google/guava
 INHERIT=java-pkg-2 java-pkg-simple check-reqs
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=dev-java/error-prone-annotations-2.27.1:0 ~dev-java/guava-33.2.0:0 dev-java/jsr305:0 dev-java/junit:4 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/guava/archive/v33.2.0.tar.gz -> guava-33.2.0.tar.gz test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.4.2/truth-1.4.2.jar )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	check-reqs	2a9731073c152554078a9a8df8fc0f1b
-_md5_=0a4711dd621c310fadc5071c8bec1693
+_md5_=7a1944a958ee5c255f5320bc20a35c6b
diff --git a/metadata/md5-cache/dev-java/guava-testlib-33.3.0 b/metadata/md5-cache/dev-java/guava-testlib-33.3.0
index 443a6d312d3d..cb40a3a92c2f 100644
--- a/metadata/md5-cache/dev-java/guava-testlib-33.3.0
+++ b/metadata/md5-cache/dev-java/guava-testlib-33.3.0
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/google/guava
 INHERIT=java-pkg-2 java-pkg-simple check-reqs
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=dev-java/error-prone-annotations-2.32.0:0 ~dev-java/guava-33.3.0:0 dev-java/jsr305:0 dev-java/junit:4 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/guava/archive/v33.3.0.tar.gz -> guava-33.3.0.tar.gz test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.4.2/truth-1.4.2.jar )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	check-reqs	2a9731073c152554078a9a8df8fc0f1b
-_md5_=107832d961cb2cdebf7f5378dc669b20
+_md5_=20e7ca8d1f43c8b8b1d1fec5ff10b9a7
diff --git a/metadata/md5-cache/dev-java/guice-5.1.0-r1 b/metadata/md5-cache/dev-java/guice-5.1.0-r1
index a7435454baf2..bea0a86371c3 100644
--- a/metadata/md5-cache/dev-java/guice-5.1.0-r1
+++ b/metadata/md5-cache/dev-java/guice-5.1.0-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/google/guice
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/aopalliance:1 dev-java/asm:9 dev-java/error-prone-annotations:0 dev-java/guava:0 dev-java/javax-inject:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/google/guice/archive/5.1.0.tar.gz -> guice-5.1.0.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=42933ac507480df6d1b8a946782f876b
+_md5_=143d7165de793e04c6e8530f5f9e3f68
diff --git a/metadata/md5-cache/dev-java/hamcrest-3.0 b/metadata/md5-cache/dev-java/hamcrest-3.0
index 4562866100a0..660b724cc730 100644
--- a/metadata/md5-cache/dev-java/hamcrest-3.0
+++ b/metadata/md5-cache/dev-java/hamcrest-3.0
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://hamcrest.org/JavaHamcrest/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hamcrest/JavaHamcrest/archive/v3.0.tar.gz -> hamcrest-3.0.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=c1609bb80ead69e64c7439a5e73a681c
+_md5_=1a359d6eaa722a2d85b33dbb296e5ac1
diff --git a/metadata/md5-cache/dev-java/hamcrest-core-1.1-r4 b/metadata/md5-cache/dev-java/hamcrest-core-1.1-r4
index e24ff62faee2..ad4cf3b36090 100644
--- a/metadata/md5-cache/dev-java/hamcrest-core-1.1-r4
+++ b/metadata/md5-cache/dev-java/hamcrest-core-1.1-r4
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://hamcrest.org/JavaHamcrest/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~x64-solaris
+KEYWORDS=amd64 arm64 ppc64 ~amd64-linux ~x64-solaris
 LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/hamcrest/JavaHamcrest/archive/hamcrest-java-1.1.tar.gz -> hamcrest-core-1.1.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=3075f101ed7a763dc2155e2af68bf6e0
+_md5_=46ff7e70f06265830da4c994036f5d65
diff --git a/metadata/md5-cache/dev-java/hamcrest-core-1.3-r3 b/metadata/md5-cache/dev-java/hamcrest-core-1.3-r3
index 7d0885cfea02..75dc79185119 100644
--- a/metadata/md5-cache/dev-java/hamcrest-core-1.3-r3
+++ b/metadata/md5-cache/dev-java/hamcrest-core-1.3-r3
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://hamcrest.org/JavaHamcrest/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=amd64 arm64 ppc64 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.3
 SRC_URI=https://github.com/hamcrest/JavaHamcrest/archive/hamcrest-java-1.3.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=c686358cc5a013c497413ccc00ae76a8
+_md5_=88a73c0738f322b12721695a14e38839
diff --git a/metadata/md5-cache/dev-java/hamcrest-generator-1.3-r4 b/metadata/md5-cache/dev-java/hamcrest-generator-1.3-r4
index 0e24f1267560..149cf5434637 100644
--- a/metadata/md5-cache/dev-java/hamcrest-generator-1.3-r4
+++ b/metadata/md5-cache/dev-java/hamcrest-generator-1.3-r4
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://hamcrest.org/JavaHamcrest/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86 ~ppc-macos ~x64-macos
+KEYWORDS=amd64 arm64 ppc64 ~ppc-macos ~x64-macos
 LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.8:* dev-java/qdox:1.12 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.3
 SRC_URI=https://github.com/hamcrest/JavaHamcrest/archive/hamcrest-java-1.3.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=7cb79fe948e31869af2bcd96ab12f2bf
+_md5_=f344bdfa3b6c362844a1dd52917c1099
diff --git a/metadata/md5-cache/dev-java/hamcrest-library-1.3-r3 b/metadata/md5-cache/dev-java/hamcrest-library-1.3-r3
index 9fde935a6967..c8e8c8b82714 100644
--- a/metadata/md5-cache/dev-java/hamcrest-library-1.3-r3
+++ b/metadata/md5-cache/dev-java/hamcrest-library-1.3-r3
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://hamcrest.org/JavaHamcrest/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=BSD-2
 RDEPEND=dev-java/hamcrest-core:1.3 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.3
 SRC_URI=https://github.com/hamcrest/JavaHamcrest/archive/hamcrest-java-1.3.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=1d391f076fe31e2d4b1665535051aa07
+_md5_=8aac7be0bc97988ac242bd6bdb2edc61
diff --git a/metadata/md5-cache/dev-java/hashcash-1.1 b/metadata/md5-cache/dev-java/hashcash-1.1
index 595827d1062a..e1ab67bc8a09 100644
--- a/metadata/md5-cache/dev-java/hashcash-1.1
+++ b/metadata/md5-cache/dev-java/hashcash-1.1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://www.nettgryppa.com/code
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64
 LICENSE=GregoryRubin
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=https://www.nettgryppa.com/code/HashCash.java
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=1c1937e25dac66dd82cf023cf2073a87
+_md5_=352b4e05e8d0691f9c7a9252ae8368cd
diff --git a/metadata/md5-cache/dev-java/hawtjni-runtime-1.18 b/metadata/md5-cache/dev-java/hawtjni-runtime-1.18
index f0f00f52139d..a6aa9df65aea 100644
--- a/metadata/md5-cache/dev-java/hawtjni-runtime-1.18
+++ b/metadata/md5-cache/dev-java/hawtjni-runtime-1.18
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/fusesource/hawtjni
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/fusesource/hawtjni/archive/hawtjni-project-1.18.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=a6d89f204b779846ee06e3fc3d979b1a
+_md5_=71a16a27373e4c98ee8ba49a7ac70e39
diff --git a/metadata/md5-cache/dev-java/htmlcleaner-2.29-r1 b/metadata/md5-cache/dev-java/htmlcleaner-2.29-r1
index 735f7c26a64f..5cb3336c7f30 100644
--- a/metadata/md5-cache/dev-java/htmlcleaner-2.29-r1
+++ b/metadata/md5-cache/dev-java/htmlcleaner-2.29-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://htmlcleaner.sourceforge.net/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 x86
+KEYWORDS=amd64
 LICENSE=BSD
 RDEPEND=dev-java/jdom:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/htmlcleaner/htmlcleaner/htmlcleaner%20v2.29/htmlcleaner-src-2.29.zip
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=8cdb507a8962485dcc12599678f89d9d
+_md5_=4cedf57cd47eab387697c6565edd6f7b
diff --git a/metadata/md5-cache/dev-java/httpcomponents-client-4.5.13-r2 b/metadata/md5-cache/dev-java/httpcomponents-client-4.5.13-r2
index c3add1fffd39..b8f89b4bf0de 100644
--- a/metadata/md5-cache/dev-java/httpcomponents-client-4.5.13-r2
+++ b/metadata/md5-cache/dev-java/httpcomponents-client-4.5.13-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://hc.apache.org/httpcomponents-client-5.2.x/
 INHERIT=java-pkg-2 java-pkg-simple verify-sig
 IUSE=doc source test verify-sig
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=dev-java/commons-codec:0 dev-java/commons-logging:0 dev-java/httpcore:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=mirror://apache/httpcomponents/httpclient/source/httpcomponents-client-4.5.13-src.tar.gz verify-sig? ( https://downloads.apache.org/httpcomponents/httpclient/source/httpcomponents-client-4.5.13-src.tar.gz.asc )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	verify-sig	745dccb7d4656514f1e966cce314d7db
-_md5_=fc7fe88ef24dab8ebf1a626436bc72a6
+_md5_=fec5b4bcf0e7c9fd029e1318bb51806a
diff --git a/metadata/md5-cache/dev-java/httpcore-4.4.14-r1 b/metadata/md5-cache/dev-java/httpcore-4.4.14-r1
index 966306242f97..d46cbeed7daf 100644
--- a/metadata/md5-cache/dev-java/httpcore-4.4.14-r1
+++ b/metadata/md5-cache/dev-java/httpcore-4.4.14-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://hc.apache.org/httpcomponents-core-5.2.x/
 INHERIT=java-pkg-2 java-pkg-simple verify-sig
 IUSE=doc source test verify-sig
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://archive.apache.org/dist/httpcomponents/httpcore/source/httpcomponents-core-4.4.14-src.tar.gz verify-sig? ( https://archive.apache.org/dist/httpcomponents/httpcore/source/httpcomponents-core-4.4.14-src.tar.gz.asc )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	verify-sig	745dccb7d4656514f1e966cce314d7db
-_md5_=d1420dcb04e9e3634f648b15262477d8
+_md5_=951f418ec44b65cd604a62a5d37806a3
diff --git a/metadata/md5-cache/dev-java/icedtea-sound-1.0.1-r1 b/metadata/md5-cache/dev-java/icedtea-sound-1.0.1-r1
index 68c4de3da1d3..6722a20a2c7e 100644
--- a/metadata/md5-cache/dev-java/icedtea-sound-1.0.1-r1
+++ b/metadata/md5-cache/dev-java/icedtea-sound-1.0.1-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://icedtea.classpath.org
 INHERIT=java-pkg-2
 IUSE=+doc
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=GPL-2-with-linking-exception
 RDEPEND=virtual/jdk:1.8 >=media-sound/pulseaudio-0.9.11 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://icedtea.classpath.org/download/source/icedtea-sound-1.0.1.tar.xz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9
-_md5_=d944b114590d80da82eba1313b067ed0
+_md5_=a025f65ccf29e6cd485fee3cf6ec25bc
diff --git a/metadata/md5-cache/dev-java/icedtea-web-1.8.8-r1 b/metadata/md5-cache/dev-java/icedtea-web-1.8.8-r1
index 6a47bb2206a1..021c3d084ea7 100644
--- a/metadata/md5-cache/dev-java/icedtea-web-1.8.8-r1
+++ b/metadata/md5-cache/dev-java/icedtea-web-1.8.8-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/AdoptOpenJDK/IcedTea-Web
 INHERIT=autotools bash-completion-r1 cargo java-pkg-2 readme.gentoo-r1 xdg-utils
 IUSE=doc debug
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=GPL-2 GPL-2-with-linking-exception LGPL-2
 RDEPEND=>=app-eselect/eselect-java-0.2.0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/AdoptOpenJDK/icedtea-web/archive/icedtea-web-1.8.8.tar.gz https://crates.io/api/v1/crates/dunce/0.1.1/download -> dunce-0.1.1.crate
 _eclasses_=gnuconfig	ddeb9f8caff1b5f71a09c75b7534df79	toolchain-funcs	d3d42b22a610ce81c267b644bcec9b87	multilib	b2a329026f2e404e9e371097dda47f96	libtool	6b28392a775f807c8be5fc7ec9a605b9	autotools	7d91cc798a8afd8f4e0c6e9587296ebe	bash-completion-r1	767861f3744f589ee5291c1698b1c082	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multiprocessing	1e32df7deee68372153dca65f4a7c21f	rust-toolchain	3f822985d9297438ed2443aa1fbdf33e	cargo	aed68000b8e49b4c4dd13a256149971f	java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	readme.gentoo-r1	b045f3acf546393ab6b3170781875358	xdg-utils	42869b3c8d86a70ef3cf75165a395e09
-_md5_=2552f7cc6c69a27db6c20d28b6d99381
+_md5_=9bfaf4f584144d9c1dc48079ffb8599a
diff --git a/metadata/md5-cache/dev-java/icu4j-75.1 b/metadata/md5-cache/dev-java/icu4j-75.1
index 642fe57e5a18..573d62f47ceb 100644
--- a/metadata/md5-cache/dev-java/icu4j-75.1
+++ b/metadata/md5-cache/dev-java/icu4j-75.1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://icu.unicode.org
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=icu
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/unicode-org/icu/archive/release-75-1.tar.gz -> icu4j-75.1.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=ce488d308a6a855ef35b7f147330c5f3
+_md5_=471572fced7efe4ab2a2ffc49ad2c747
diff --git a/metadata/md5-cache/dev-java/identicon-1.0 b/metadata/md5-cache/dev-java/identicon-1.0
index 8116d6657504..ae87a4e35cbf 100644
--- a/metadata/md5-cache/dev-java/identicon-1.0
+++ b/metadata/md5-cache/dev-java/identicon-1.0
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/PauloMigAlmeida/identicon
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64
 LICENSE=MIT
 RDEPEND=dev-java/cache2k-api:0 dev-java/commons-logging:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=https://github.com/PauloMigAlmeida/identicon/archive/96902d3c7c9733d9da4cce9c5ed424557fc2ec3c.tar.gz -> identicon-1.0.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=67bcd20b824c98ecdb248424b050a48e
+_md5_=a4f2713dcfce86e62830f1f7f7e85759
diff --git a/metadata/md5-cache/dev-java/injection-api-2.0.1 b/metadata/md5-cache/dev-java/injection-api-2.0.1
index 9332932d82f7..56ef2139e523 100644
--- a/metadata/md5-cache/dev-java/injection-api-2.0.1
+++ b/metadata/md5-cache/dev-java/injection-api-2.0.1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://jakarta.ee/specifications/dependency-injection/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/jakartaee/inject/archive/2.0.1.tar.gz -> injection-api-2.0.1.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=842620a19c3ef7c8add9c6cdd73a8343
+_md5_=49ae63fa0902f2cd16a3b69787777e3e
diff --git a/metadata/md5-cache/dev-java/iso-relax-20050331-r7 b/metadata/md5-cache/dev-java/iso-relax-20050331-r7
index 2cc445959952..a33310f8772a 100644
--- a/metadata/md5-cache/dev-java/iso-relax-20050331-r7
+++ b/metadata/md5-cache/dev-java/iso-relax-20050331-r7
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=http://www.xml.gr.jp/relax/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris
+KEYWORDS=amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris
 LICENSE=MIT
 RDEPEND=>=dev-java/ant-1.10.14-r3:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/iso-relax-20050331.tar.bz2
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=60c114f39a690db5d5b424c672277add
+_md5_=c3603914a05ca17d03fcd45332f9693c
diff --git a/metadata/md5-cache/dev-java/istack-commons-runtime-3.0.12 b/metadata/md5-cache/dev-java/istack-commons-runtime-3.0.12
index a16b0999fc84..d2ecef2e18d4 100644
--- a/metadata/md5-cache/dev-java/istack-commons-runtime-3.0.12
+++ b/metadata/md5-cache/dev-java/istack-commons-runtime-3.0.12
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://projects.eclipse.org/projects/ee4j/istack-commons/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://github.com/eclipse-ee4j/jaxb-istack-commons/archive/3.0.12.tar.gz -> jaxb-istack-commons-3.0.12.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=3bedaf86ffafa8bb4f3a9fa5fb3c58e3
+_md5_=dbf8a6e72de3703043e32d11efff1de2
diff --git a/metadata/md5-cache/dev-java/istack-commons-runtime-4.1.1-r1 b/metadata/md5-cache/dev-java/istack-commons-runtime-4.1.1-r1
index 4fdd01af0c03..47512265b95e 100644
--- a/metadata/md5-cache/dev-java/istack-commons-runtime-4.1.1-r1
+++ b/metadata/md5-cache/dev-java/istack-commons-runtime-4.1.1-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://projects.eclipse.org/projects/ee4j/istack-commons/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/eclipse-ee4j/jaxb-istack-commons/archive/4.1.1.tar.gz -> jaxb-istack-commons-istack-commons-runtime-4.1.1.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=fd1531e78f0d839276f7b355799a2282
+_md5_=df7741d496c249c22bf5bdb8d51289bf
diff --git a/metadata/md5-cache/dev-java/j2objc-annotations-3.0.0-r1 b/metadata/md5-cache/dev-java/j2objc-annotations-3.0.0-r1
index d0b48b5d2276..0ea8cc27a862 100644
--- a/metadata/md5-cache/dev-java/j2objc-annotations-3.0.0-r1
+++ b/metadata/md5-cache/dev-java/j2objc-annotations-3.0.0-r1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://developers.google.com/j2objc/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/google/j2objc/archive/3.0.0.tar.gz -> j2objc-3.0.0.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=8e47e282a92e58ce5c660e350f735fb6
+_md5_=c9aa249c66764343c3926c74015f86ab
diff --git a/metadata/md5-cache/dev-java/jackcess-4.0.0 b/metadata/md5-cache/dev-java/jackcess-4.0.0
index ca91c58c9f74..fa3a0a23f56f 100644
--- a/metadata/md5-cache/dev-java/jackcess-4.0.0
+++ b/metadata/md5-cache/dev-java/jackcess-4.0.0
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://jackcess.sourceforge.io
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/commons-lang-3.11:3.6 >=dev-java/commons-logging-1.2:0 >=dev-java/poi-5.0.0:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://github.com/jahlborn/jackcess/archive/refs/tags/jackcess-4.0.0.tar.gz -> jackcess-4.0.0-sources.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=b78a9229c9043d5a06de8394620bee80
+_md5_=4687a9151e906ba8cdd8616a516b6901
diff --git a/metadata/md5-cache/dev-java/jackrabbit-webdav-2.10.1-r3 b/metadata/md5-cache/dev-java/jackrabbit-webdav-2.10.1-r3
index e44294b4dcb7..72819fcc2af2 100644
--- a/metadata/md5-cache/dev-java/jackrabbit-webdav-2.10.1-r3
+++ b/metadata/md5-cache/dev-java/jackrabbit-webdav-2.10.1-r3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://jackrabbit.apache.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/bndlib:0 dev-java/slf4j-api:0 dev-java/slf4j-nop:0 dev-java/commons-httpclient:3 dev-java/tomcat-servlet-api:2.3 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/jackrabbit/2.10.1/jackrabbit-2.10.1-src.zip
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=1264771a0b9d9a3e6b493321b481863c
+_md5_=0d5c8942355e34b76bc1f8f620aaec97
diff --git a/metadata/md5-cache/dev-java/jackson-annotations-2.13.4 b/metadata/md5-cache/dev-java/jackson-annotations-2.13.4
index 3eb99dcb9987..ce222f19c2e1 100644
--- a/metadata/md5-cache/dev-java/jackson-annotations-2.13.4
+++ b/metadata/md5-cache/dev-java/jackson-annotations-2.13.4
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/FasterXML/jackson-annotations
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://github.com/FasterXML/jackson-annotations/archive/jackson-annotations-2.13.4.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=d63387dec88207f9b507723ff75a7979
+_md5_=29ef228d083147a2e725d28acf112ee3
diff --git a/metadata/md5-cache/dev-java/jackson-core-2.13.4 b/metadata/md5-cache/dev-java/jackson-core-2.13.4
index 97bbecdf136d..fceb0543e188 100644
--- a/metadata/md5-cache/dev-java/jackson-core-2.13.4
+++ b/metadata/md5-cache/dev-java/jackson-core-2.13.4
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/FasterXML/jackson-core
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FasterXML/jackson-core/archive/jackson-core-2.13.4.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=76358b37970cbbd5996002a282d355c3
+_md5_=fd488165d99ccc7c36fca9adbbf3963e
diff --git a/metadata/md5-cache/dev-java/jackson-databind-2.13.4.1 b/metadata/md5-cache/dev-java/jackson-databind-2.13.4.1
index 65aebf9cb8aa..26ad3a75ffcf 100644
--- a/metadata/md5-cache/dev-java/jackson-databind-2.13.4.1
+++ b/metadata/md5-cache/dev-java/jackson-databind-2.13.4.1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/FasterXML/jackson-databind
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* ~dev-java/jackson-annotations-2.13.4:2 ~dev-java/jackson-core-2.13.4:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/FasterXML/jackson-databind/archive/jackson-databind-2.13.4.1.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=ebc5bdb958bfaa3a6326298bea95f1dd
+_md5_=8f1c855faea594e5a9e6088517fd1c03
diff --git a/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.4-r1 b/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.4-r1
index 60686fbc477c..4c882f584ef2 100644
--- a/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.4-r1
+++ b/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.4-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/FasterXML/jackson-dataformat-xml
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* ~dev-java/jackson-annotations-2.13.4:2 ~dev-java/jackson-core-2.13.4:0 ~dev-java/jackson-databind-2.13.4.1:0 >=dev-java/stax2-api-4.2.1-r1:0 dev-java/woodstox-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FasterXML/jackson-dataformat-xml/archive/jackson-dataformat-xml-2.13.4.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=3c31f2f9059d4c2a01e121d602feb19d
+_md5_=5b0a4325e91d817fc8930ec7a3968b3a
diff --git a/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.4-r1 b/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.4-r1
index 00d5bb2871c2..24788c465637 100644
--- a/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.4-r1
+++ b/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.4-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/FasterXML/jackson-dataformats-text
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FasterXML/jackson-dataformats-text/archive/jackson-dataformats-text-2.13.4.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=aa992055cd4e31ee3d21c6879b333d02
+_md5_=528a6fdf8cc63ed243e5111483d82189
diff --git a/metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.4-r1 b/metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.4-r1
index 80a473582de8..1251103cc857 100644
--- a/metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.4-r1
+++ b/metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.4-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/FasterXML/jackson-modules-base
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* ~dev-java/jackson-annotations-2.13.4:2 ~dev-java/jackson-core-2.13.4:0 ~dev-java/jackson-databind-2.13.4.1:0 dev-java/jakarta-activation:1 dev-java/jaxb-api:4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FasterXML/jackson-modules-base/archive/jackson-modules-base-2.13.4.tar.gz -> jackson-module-jakarta-xmlbind-2.13.4.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=e095dd74bb0ba624a38d7930897766c6
+_md5_=50a6fdd41d9dfaf0d39c1ae7af50869c
diff --git a/metadata/md5-cache/dev-java/jacl-1.4.1-r2 b/metadata/md5-cache/dev-java/jacl-1.4.1-r2
index fb615d54ed66..387f6e192ede 100644
--- a/metadata/md5-cache/dev-java/jacl-1.4.1-r2
+++ b/metadata/md5-cache/dev-java/jacl-1.4.1-r2
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=http://tcljava.sourceforge.net
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=BSD
 RDEPEND=>=dev-lang/tcl-8.4.5:* >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/tcljava/jacl/1.4.1/jacl1.4.1.tar.gz -> jacl-1.4.1.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=bebd471e7b8ee998d51d0136e05ada6c
+_md5_=ff614bad9fbe89beb9d2d7188efcd243
diff --git a/metadata/md5-cache/dev-java/jai-imageio-core-1.4.0 b/metadata/md5-cache/dev-java/jai-imageio-core-1.4.0
index a75c5c8e1d2c..869cfb1cdbc8 100644
--- a/metadata/md5-cache/dev-java/jai-imageio-core-1.4.0
+++ b/metadata/md5-cache/dev-java/jai-imageio-core-1.4.0
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://github.com/jai-imageio/jai-imageio-core
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Sun-BSD-no-nuclear-2005
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jai-imageio/jai-imageio-core/archive/refs/tags/jai-imageio-core-1.4.0.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=e5cd2fcf459b16f769f8d218ff456f1e
+_md5_=57a0d8695b35a028b53271bee5bbb75c
diff --git a/metadata/md5-cache/dev-java/jai-imageio-jpeg2000-1.4.0 b/metadata/md5-cache/dev-java/jai-imageio-jpeg2000-1.4.0
index 8cfe70405c6b..21c62efcec75 100644
--- a/metadata/md5-cache/dev-java/jai-imageio-jpeg2000-1.4.0
+++ b/metadata/md5-cache/dev-java/jai-imageio-jpeg2000-1.4.0
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://github.com/jai-imageio/jai-imageio-jpeg2000
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Sun-BSD-no-nuclear-2005
 RDEPEND=dev-java/jai-imageio-core:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jai-imageio/jai-imageio-jpeg2000/archive/refs/tags/jai-imageio-jpeg2000-1.4.0.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=29d1ba28d03d99db56ce402c2535dff7
+_md5_=d25cc979e7a4b02de80a8a98f9f92eab
diff --git a/metadata/md5-cache/dev-java/jakarta-activation-1.2.2-r1 b/metadata/md5-cache/dev-java/jakarta-activation-1.2.2-r1
index d7ae61c1a980..0af84c35bb39 100644
--- a/metadata/md5-cache/dev-java/jakarta-activation-1.2.2-r1
+++ b/metadata/md5-cache/dev-java/jakarta-activation-1.2.2-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://jakartaee.github.io/jaf-api/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=EPL-1.0
 RDEPEND=dev-java/jakarta-activation-api:1 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=https://github.com/jakartaee/jaf-api/archive/1.2.2.tar.gz -> jakarta-activation-1.2.2.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=bfb91e1d5b53117e593debc3c3019d13
+_md5_=2d2308a63adb63d4d00366013942ffb5
diff --git a/metadata/md5-cache/dev-java/jakarta-activation-2.0.1-r1 b/metadata/md5-cache/dev-java/jakarta-activation-2.0.1-r1
index 1a6da3bb9e18..ff3530d90ae4 100644
--- a/metadata/md5-cache/dev-java/jakarta-activation-2.0.1-r1
+++ b/metadata/md5-cache/dev-java/jakarta-activation-2.0.1-r1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://jakartaee.github.io/jaf-api/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/jakartaee/jaf-api/archive/2.0.1.tar.gz -> jakarta-activation-2.0.1.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=114f38a7f41d52bdbd6e317fd6026ef2
+_md5_=adf3c51bedf3e49f6b153faa52331cb2
diff --git a/metadata/md5-cache/dev-java/jakarta-activation-api-1.2.2-r1 b/metadata/md5-cache/dev-java/jakarta-activation-api-1.2.2-r1
index c3a34e2c9024..350fdd90ece3 100644
--- a/metadata/md5-cache/dev-java/jakarta-activation-api-1.2.2-r1
+++ b/metadata/md5-cache/dev-java/jakarta-activation-api-1.2.2-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://jakartaee.github.io/jaf-api/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=https://github.com/jakartaee/jaf-api/archive/1.2.2.tar.gz -> jakarta-activation-1.2.2.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=e6131bf12ff696ac77e84ec3317d10ef
+_md5_=0b3387a26b158de13aec7e4572598130
diff --git a/metadata/md5-cache/dev-java/jakarta-activation-api-2.1.1 b/metadata/md5-cache/dev-java/jakarta-activation-api-2.1.1
index 1d2e97298159..3969d269693b 100644
--- a/metadata/md5-cache/dev-java/jakarta-activation-api-2.1.1
+++ b/metadata/md5-cache/dev-java/jakarta-activation-api-2.1.1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://jakartaee.github.io/jaf-api/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/jakartaee/jaf-api/archive/2.1.1.tar.gz -> jakarta-activation-api-2.1.1.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=60e720408d43ac263d6dca23a5a2757a
+_md5_=fad7f4ca7b05024c648f39b92e672d7c
diff --git a/metadata/md5-cache/dev-java/jakarta-annotations-api-2.1.1 b/metadata/md5-cache/dev-java/jakarta-annotations-api-2.1.1
index 1942b0f03c23..ef4e2425a485 100644
--- a/metadata/md5-cache/dev-java/jakarta-annotations-api-2.1.1
+++ b/metadata/md5-cache/dev-java/jakarta-annotations-api-2.1.1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://projects.eclipse.org/projects/ee4j.ca
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=EPL-2.0 GPL-2-with-classpath-exception
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/eclipse-ee4j/common-annotations-api/archive/2.1.1.tar.gz -> jakarta-annotations-api-2.1.1.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=28d6261a7c892c19f6528e796c0a288e
+_md5_=5f1af163ec9ff6012cdc5b3fb9bcdf1c
diff --git a/metadata/md5-cache/dev-java/jakarta-el-api-5.0.1-r1 b/metadata/md5-cache/dev-java/jakarta-el-api-5.0.1-r1
index 26a1d63ce0c4..0c7afc253860 100644
--- a/metadata/md5-cache/dev-java/jakarta-el-api-5.0.1-r1
+++ b/metadata/md5-cache/dev-java/jakarta-el-api-5.0.1-r1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://projects.eclipse.org/projects/ee4j.el
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=EPL-2.0 GPL-2-with-classpath-exception
 RDEPEND=>=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=5.0
 SRC_URI=https://github.com/jakartaee/expression-language/archive/5.0.1-RELEASE-api.tar.gz -> jakarta-el-api-5.0.1.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=5d796a7856dce901f58ee8b366da561a
+_md5_=e458babd939aafc1f6a86e29e784ffcb
diff --git a/metadata/md5-cache/dev-java/jakarta-interceptors-2.1.0 b/metadata/md5-cache/dev-java/jakarta-interceptors-2.1.0
index a63c3e541c3a..14de1cdfd848 100644
--- a/metadata/md5-cache/dev-java/jakarta-interceptors-2.1.0
+++ b/metadata/md5-cache/dev-java/jakarta-interceptors-2.1.0
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://projects.eclipse.org/projects/ee4j.interceptors
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=EPL-2.0 GPL-2-with-classpath-exception
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/jakartaee/interceptors/archive/2.1.0-RELEASE.tar.gz -> jakarta-interceptors-2.1.0.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=bcbe141ac0409a955a84e32ef8ccd97e
+_md5_=a88c34acc85684bc23f9e651aa3251ed
diff --git a/metadata/md5-cache/dev-java/jakarta-json-api-1.1.6-r1 b/metadata/md5-cache/dev-java/jakarta-json-api-1.1.6-r1
index c25ec5e47fce..72c14f8bffb9 100644
--- a/metadata/md5-cache/dev-java/jakarta-json-api-1.1.6-r1
+++ b/metadata/md5-cache/dev-java/jakarta-json-api-1.1.6-r1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://projects.eclipse.org/projects/ee4j.jsonp
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=|| ( EPL-2.0 GPL-2-with-classpath-exception )
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=https://github.com/eclipse-ee4j/jsonp/archive/1.1-1.1.6-RELEASE.tar.gz -> jakarta-json-api-1.1.6.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=78a1dff341c3e9b7f34c7419b143dd29
+_md5_=958fa79d10a8bde94995537200369662
diff --git a/metadata/md5-cache/dev-java/jakarta-mail-2.0.1 b/metadata/md5-cache/dev-java/jakarta-mail-2.0.1
index 9643f17312b6..71e81a1db231 100644
--- a/metadata/md5-cache/dev-java/jakarta-mail-2.0.1
+++ b/metadata/md5-cache/dev-java/jakarta-mail-2.0.1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/jakartaee/mail-api
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=EPL-1.0 EPL-2.0 GPL-2-with-classpath-exception
 RDEPEND=dev-java/jakarta-activation:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jakartaee/mail-api/archive/2.0.1.tar.gz -> jakarta-mail-2.0.1.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=96c378de38a2b4b584e7e3a2ea453919
+_md5_=51b68df89d78dc3aa508ee772fbb551e
diff --git a/metadata/md5-cache/dev-java/jakarta-mail-api-2.1.3 b/metadata/md5-cache/dev-java/jakarta-mail-api-2.1.3
index 7d6ea38df9a4..2835dda8bdfc 100644
--- a/metadata/md5-cache/dev-java/jakarta-mail-api-2.1.3
+++ b/metadata/md5-cache/dev-java/jakarta-mail-api-2.1.3
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://jakartaee.github.io/mail-api/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=EPL-1.0 EPL-2.0 GPL-2-with-classpath-exception
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jakartaee/mail-api/archive/2.1.3.tar.gz -> jakarta-mail-api-2.1.3.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=d0311c4150096170e30d3f3901f5e710
+_md5_=4b50f47ae1afe6a4f9bccf93836ca5a4
diff --git a/metadata/md5-cache/dev-java/jakarta-oro-2.0.8-r5 b/metadata/md5-cache/dev-java/jakarta-oro-2.0.8-r5
index b47e336f6c95..c2f412b84c19 100644
--- a/metadata/md5-cache/dev-java/jakarta-oro-2.0.8-r5
+++ b/metadata/md5-cache/dev-java/jakarta-oro-2.0.8-r5
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://jakarta.apache.org/oro/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source examples
-KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.0
 SRC_URI=https://archive.apache.org/dist/jakarta/oro/jakarta-oro-2.0.8.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=cbc00c293dd95acef40df9fcae165a21
+_md5_=ba8eb78b857f5496ef294a8b03c9182c
diff --git a/metadata/md5-cache/dev-java/jakarta-regexp-1.4-r3 b/metadata/md5-cache/dev-java/jakarta-regexp-1.4-r3
index b837607b209a..42f2d72c3da1 100644
--- a/metadata/md5-cache/dev-java/jakarta-regexp-1.4-r3
+++ b/metadata/md5-cache/dev-java/jakarta-regexp-1.4-r3
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://jakarta.apache.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.4
 SRC_URI=mirror://apache/jakarta/regexp/source/jakarta-regexp-1.4.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=1039c906360ec850702deb7c52fb03b9
+_md5_=714b467d626d29e43de7a3e5d1ef2f4f
diff --git a/metadata/md5-cache/dev-java/jakarta-servlet-api-4.0.4 b/metadata/md5-cache/dev-java/jakarta-servlet-api-4.0.4
index 2203c9e4ee04..39ef9661749e 100644
--- a/metadata/md5-cache/dev-java/jakarta-servlet-api-4.0.4
+++ b/metadata/md5-cache/dev-java/jakarta-servlet-api-4.0.4
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://projects.eclipse.org/projects/ee4j.servlet
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=|| ( GPL-2 GPL-2-with-classpath-exception )
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4
 SRC_URI=https://github.com/jakartaee/servlet/archive/4.0.4-RELEASE.tar.gz -> jakarta-servlet-api-4.0.4-RELEASE.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=45069c15252fac67b0f359b199279297
+_md5_=7d73181017ace470555c584fadb12b22
diff --git a/metadata/md5-cache/dev-java/jakarta-servlet-api-6.0.0 b/metadata/md5-cache/dev-java/jakarta-servlet-api-6.0.0
index 5cfaa7c125ad..c91dea2fb1c9 100644
--- a/metadata/md5-cache/dev-java/jakarta-servlet-api-6.0.0
+++ b/metadata/md5-cache/dev-java/jakarta-servlet-api-6.0.0
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://projects.eclipse.org/projects/ee4j.servlet
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=EPL-2.0 GPL-2-with-classpath-exception
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=6
 SRC_URI=https://github.com/jakartaee/servlet/archive/6.0.0-RELEASE.tar.gz -> jakarta-servlet-api-6.0.0-RELEASE.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=16f0cc3b2ddd8549680c6327167f075a
+_md5_=48ce69c6f122fdfb0c9bf8985eb16938
diff --git a/metadata/md5-cache/dev-java/jakarta-xml-soap-api-1.4.2-r2 b/metadata/md5-cache/dev-java/jakarta-xml-soap-api-1.4.2-r2
index 688fec96d18e..9d2db5d4edbe 100644
--- a/metadata/md5-cache/dev-java/jakarta-xml-soap-api-1.4.2-r2
+++ b/metadata/md5-cache/dev-java/jakarta-xml-soap-api-1.4.2-r2
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://projects.eclipse.org/projects/ee4j.jaxws
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/jakarta-activation-api-1.2.2-r1:1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://github.com/jakartaee/saaj-api/archive/1.4.2.tar.gz -> jakarta-xml-soap-api-1.4.2.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=f73dfb63b2d970eff900c55dfce1aecc
+_md5_=e60a71d15372738b736dffe4f986676c
diff --git a/metadata/md5-cache/dev-java/jal-20031117-r7 b/metadata/md5-cache/dev-java/jal-20031117-r7
index 6ace3af2e37e..90a7a3be0558 100644
--- a/metadata/md5-cache/dev-java/jal-20031117-r7
+++ b/metadata/md5-cache/dev-java/jal-20031117-r7
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 x86
+KEYWORDS=amd64
 LICENSE=HPND
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~monsieurp/packages/jal-20031117.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=48421c3551f54bb15d5849edc9b0c8f4
+_md5_=c90cb9c2db7faa68d85b438c062c4d38
diff --git a/metadata/md5-cache/dev-java/jansi-1.13 b/metadata/md5-cache/dev-java/jansi-1.13
index 76a0070341d3..be0f5b497694 100644
--- a/metadata/md5-cache/dev-java/jansi-1.13
+++ b/metadata/md5-cache/dev-java/jansi-1.13
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://fusesource.github.io/jansi/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=dev-java/jansi-native:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fusesource/jansi/archive/jansi-project-1.13.tar.gz -> jansi-1.13.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=5afea4fcb8b188ae326a211191c4212c
+_md5_=81a5fc7c5bd097fc700c054cadfcf245
diff --git a/metadata/md5-cache/dev-java/jansi-2.4.0-r1 b/metadata/md5-cache/dev-java/jansi-2.4.0-r1
index 90deccf32e21..99e22e1f68e7 100644
--- a/metadata/md5-cache/dev-java/jansi-2.4.0-r1
+++ b/metadata/md5-cache/dev-java/jansi-2.4.0-r1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=http://fusesource.github.io/jansi
 INHERIT=java-pkg-2 java-pkg-simple toolchain-funcs
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/fusesource/jansi/archive/refs/tags/jansi-2.4.0.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	toolchain-funcs	d3d42b22a610ce81c267b644bcec9b87	multilib	b2a329026f2e404e9e371097dda47f96
-_md5_=3b4d90514e3d2e3c15a86aae22917539
+_md5_=b451cb3a55921e9aa03bb3e721268ffe
diff --git a/metadata/md5-cache/dev-java/jansi-native-1.8 b/metadata/md5-cache/dev-java/jansi-native-1.8
index 5503d5b60f05..8138871bff0f 100644
--- a/metadata/md5-cache/dev-java/jansi-native-1.8
+++ b/metadata/md5-cache/dev-java/jansi-native-1.8
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=http://fusesource.github.io/jansi/
 INHERIT=vcs-snapshot java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=dev-java/hawtjni-runtime:0 >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/fusesource/jansi-native/archive/jansi-native-1.8.tar.gz
 _eclasses_=vcs-snapshot	bd69bf57fd2c34e99964a03b1d968177	java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=36ede834342f4bec19887bdea8bcf73c
+_md5_=6745b91f1852ed8a5b250791c3b92c67
diff --git a/metadata/md5-cache/dev-java/java-dep-check-0.5-r4 b/metadata/md5-cache/dev-java/java-dep-check-0.5-r4
index 5523ef236ff2..a3839ef1cbe3 100644
--- a/metadata/md5-cache/dev-java/java-dep-check-0.5-r4
+++ b/metadata/md5-cache/dev-java/java-dep-check-0.5-r4
@@ -4,10 +4,10 @@ DESCRIPTION=Java Dependency checker
 EAPI=8
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Java
 INHERIT=java-pkg-2 java-pkg-simple
-KEYWORDS=amd64 x86
+KEYWORDS=amd64
 LICENSE=GPL-2
 PDEPEND=dev-java/javatoolkit:0
 RDEPEND=>=virtual/jre-1.8:* dev-java/commons-cli:0 dev-java/asm:9 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=c473c0b3b208805562dc2b001f387fa7
+_md5_=71d5607bb182c5441567b20b560015bd
diff --git a/metadata/md5-cache/dev-java/java-diff-utils-1.3.0 b/metadata/md5-cache/dev-java/java-diff-utils-1.3.0
index efdb9b6d5cc3..42862fdfefc9 100644
--- a/metadata/md5-cache/dev-java/java-diff-utils-1.3.0
+++ b/metadata/md5-cache/dev-java/java-diff-utils-1.3.0
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=http://code.google.com/p/java-diff-utils/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/com/googlecode/java-diff-utils/diffutils/1.3.0/diffutils-1.3.0-sources.jar -> java-diff-utils-1.3.0-sources.jar
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=8a28218570abaa15bfa2f5a82611068b
+_md5_=f4f0d9a7c26bb9d717753c00bcaca467
diff --git a/metadata/md5-cache/dev-java/java-diff-utils-4.12 b/metadata/md5-cache/dev-java/java-diff-utils-4.12
index 216b96b9163e..a45e8028a0fb 100644
--- a/metadata/md5-cache/dev-java/java-diff-utils-4.12
+++ b/metadata/md5-cache/dev-java/java-diff-utils-4.12
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://java-diff-utils.github.io/java-diff-utils/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/java-diff-utils/java-diff-utils/archive/java-diff-utils-parent-4.12.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=d2d8e2b481643d5d0de6cf64dcfeebd4
+_md5_=833d5d993f2d8e1517bccd55c7901487
diff --git a/metadata/md5-cache/dev-java/java-getopt-1.0.14-r2 b/metadata/md5-cache/dev-java/java-getopt-1.0.14-r2
index bbc4ed366159..4241a64bcb63 100644
--- a/metadata/md5-cache/dev-java/java-getopt-1.0.14-r2
+++ b/metadata/md5-cache/dev-java/java-getopt-1.0.14-r2
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://www.urbanophile.com/arenn/hacking/download.html
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=amd64 ~arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=https://www.urbanophile.com/arenn/hacking/getopt/java-getopt-1.0.14.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=a6a540a1723d018cb867a2de481665bc
+_md5_=c0698f678daa0695d1c1632604b179c7
diff --git a/metadata/md5-cache/dev-java/java-service-wrapper-3.5.50-r2 b/metadata/md5-cache/dev-java/java-service-wrapper-3.5.50-r2
index 7c426b1739c1..5f1e40e6a184 100644
--- a/metadata/md5-cache/dev-java/java-service-wrapper-3.5.50-r2
+++ b/metadata/md5-cache/dev-java/java-service-wrapper-3.5.50-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://wrapper.tanukisoftware.com
 INHERIT=java-pkg-2 java-pkg-simple toolchain-funcs
 IUSE=doc source test
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 ~arm64
 LICENSE=tanuki-community
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://download.tanukisoftware.com/wrapper/3.5.50/wrapper_3.5.50_src.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	toolchain-funcs	d3d42b22a610ce81c267b644bcec9b87	multilib	b2a329026f2e404e9e371097dda47f96
-_md5_=3f53b57365947a46e0d2c2dacdaf27dc
+_md5_=1bfca67230e8f773965612bc703640b6
diff --git a/metadata/md5-cache/dev-java/javacc-4.1-r1 b/metadata/md5-cache/dev-java/javacc-4.1-r1
index 70669fe5fe2e..08dcea9814f8 100644
--- a/metadata/md5-cache/dev-java/javacc-4.1-r1
+++ b/metadata/md5-cache/dev-java/javacc-4.1-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://javacc.github.io/javacc/
 INHERIT=java-pkg-2
 IUSE=doc examples source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/javacc/javacc/archive/release_41.tar.gz -> javacc-4.1.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9
-_md5_=09d01c0ac88e729af17ef4673e6d6d59
+_md5_=d54bffcf1d3e692c3955276ef5f7db3d
diff --git a/metadata/md5-cache/dev-java/javacc-7.0.13-r1 b/metadata/md5-cache/dev-java/javacc-7.0.13-r1
index d12def39dc99..dbbc61c35896 100644
--- a/metadata/md5-cache/dev-java/javacc-7.0.13-r1
+++ b/metadata/md5-cache/dev-java/javacc-7.0.13-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://javacc.github.io/javacc/
 INHERIT=java-pkg-2
 IUSE=doc examples source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=7.0.13
 SRC_URI=https://github.com/javacc/javacc/archive/javacc-7.0.13.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9
-_md5_=240ead494ef9a0685941d04ccbfa3d99
+_md5_=189e4f78d6832ccdfeaa9dbb3a29493c
diff --git a/metadata/md5-cache/dev-java/javacc-7.0.4-r1 b/metadata/md5-cache/dev-java/javacc-7.0.4-r1
index ed6d714237cf..6ee5a1b07e48 100644
--- a/metadata/md5-cache/dev-java/javacc-7.0.4-r1
+++ b/metadata/md5-cache/dev-java/javacc-7.0.4-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://javacc.github.io/javacc/
 INHERIT=java-pkg-2
 IUSE=doc examples source test
-KEYWORDS=amd64 arm64 x86
+KEYWORDS=amd64 arm64
 LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=7.0.4
 SRC_URI=https://github.com/javacc/javacc/archive/7.0.4.tar.gz -> javacc-7.0.4.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9
-_md5_=4d8f845ba1453cb9b47d838a5082a103
+_md5_=becc9e6b93824063cf082ab2d1909fec
diff --git a/metadata/md5-cache/dev-java/javahelp-2.0.05_p20170719-r4 b/metadata/md5-cache/dev-java/javahelp-2.0.05_p20170719-r4
index b1e50cb91228..3729b9d34c03 100644
--- a/metadata/md5-cache/dev-java/javahelp-2.0.05_p20170719-r4
+++ b/metadata/md5-cache/dev-java/javahelp-2.0.05_p20170719-r4
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://javaee.github.io/javahelp/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc examples source
-KEYWORDS=amd64 x86
+KEYWORDS=amd64
 LICENSE=GPL-2-with-linking-exception
 RDEPEND=dev-java/javax-jsp-api:2.0 dev-java/javax-servlet-api:2.5 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/javaee/javahelp/archive/3ca862d8626096770598a3a256886d205246f4a4.tar.gz -> javahelp-2.0.05_p20170719.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=8f04d7089423097b2cf632a8a606324b
+_md5_=c48fc3f5fbef84a19fa226f1f18df090
diff --git a/metadata/md5-cache/dev-java/javaparser-core-3.13.10 b/metadata/md5-cache/dev-java/javaparser-core-3.13.10
index 3912c227ad2c..2e19ea6ed6ad 100644
--- a/metadata/md5-cache/dev-java/javaparser-core-3.13.10
+++ b/metadata/md5-cache/dev-java/javaparser-core-3.13.10
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://javaparser.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0 LGPL-3
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/javaparser/javaparser/archive/v3.13.10.tar.gz -> javaparser-3.13.10.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=34b5969467dd0b3afda21edeafaf8cb1
+_md5_=f6f8270996c9dee78435cccbea1795f6
diff --git a/metadata/md5-cache/dev-java/javassist-3.29.2 b/metadata/md5-cache/dev-java/javassist-3.29.2
index dfb7f30dba8e..b8dc7e6c920d 100644
--- a/metadata/md5-cache/dev-java/javassist-3.29.2
+++ b/metadata/md5-cache/dev-java/javassist-3.29.2
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.javassist.org
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm64 ppc64 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0 LGPL-2.1 MPL-1.1
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://github.com/jboss-javassist/javassist/archive/rel_3_29_2_ga.tar.gz -> javassist-3.29.2.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=9e9773d7361a415bceca07cfd7cc0f41
+_md5_=dc73e7a85e11481854043ce2b41610ce
diff --git a/metadata/md5-cache/dev-java/javatoolkit-0.6.7-r1 b/metadata/md5-cache/dev-java/javatoolkit-0.6.7-r1
index 9c564a7cbe35..abfa58eca08d 100644
--- a/metadata/md5-cache/dev-java/javatoolkit-0.6.7-r1
+++ b/metadata/md5-cache/dev-java/javatoolkit-0.6.7-r1
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Java
 INHERIT=distutils-r1 prefix
 IUSE=python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=amd64 arm64 ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=amd64 arm64 ppc64 sparc ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10[xml(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[xml(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[xml(+)] )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/javatoolkit.git/snapshot/javatoolkit-0.6.7.tar.bz2
 _eclasses_=toolchain-funcs	d3d42b22a610ce81c267b644bcec9b87	multilib	b2a329026f2e404e9e371097dda47f96	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	out-of-source-utils	dbf9e34ee8964084651e25907fa8f52c	multibuild	4650a65187015567b4e041bb9bfdb364	multiprocessing	1e32df7deee68372153dca65f4a7c21f	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	python-utils-r1	2fee95c11e5f883024588d4837db6802	python-r1	2def7a4ce233dfa344f613025c619a23	distutils-r1	bcc61b7696f06db333c2f2db1606ed76	prefix	c3c4c93ebda319c0fa7ed6f942ba1010
-_md5_=66ecb8de020bcf8feb4f48d4ce36febf
+_md5_=1d7f194834d3778bc3e71cfbd95f1b16
diff --git a/metadata/md5-cache/dev-java/javax-el-api-2.2 b/metadata/md5-cache/dev-java/javax-el-api-2.2
index 694c54d01bc2..5cf98cf8e328 100644
--- a/metadata/md5-cache/dev-java/javax-el-api-2.2
+++ b/metadata/md5-cache/dev-java/javax-el-api-2.2
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64
 LICENSE=CDDL GPL-2
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.2
 SRC_URI=https://repo1.maven.org/maven2/javax/el/el-api/2.2/el-api-2.2-sources.jar
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=4b9899882f4f312ffe399bab695581b9
+_md5_=818a0d94c08f62d9a4f51a60b284cb54
diff --git a/metadata/md5-cache/dev-java/javax-inject-1-r4 b/metadata/md5-cache/dev-java/javax-inject-1-r4
index 5e5977546146..54a8cdccddde 100644
--- a/metadata/md5-cache/dev-java/javax-inject-1-r4
+++ b/metadata/md5-cache/dev-java/javax-inject-1-r4
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/javax-inject/javax-inject
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux
+KEYWORDS=amd64 arm64 ppc64 ~amd64-linux
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://central.maven.org/maven2/javax/inject/javax.inject/1/javax.inject-1-sources.jar -> javax-inject-1.jar
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=21bfbaa7144550f4f62d8307dae20a73
+_md5_=fc6c22574e649180405eda7f076e6a79
diff --git a/metadata/md5-cache/dev-java/javax-jms-api-2.0.3 b/metadata/md5-cache/dev-java/javax-jms-api-2.0.3
index 281276787136..3ff2186fee07 100644
--- a/metadata/md5-cache/dev-java/javax-jms-api-2.0.3
+++ b/metadata/md5-cache/dev-java/javax-jms-api-2.0.3
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://projects.eclipse.org/projects/ee4j.jms
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=EPL-2.0 GPL-2-with-classpath-exception
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/jakartaee/messaging/archive/2.0.3-RELEASE.tar.gz -> javax-jms-api-2.0.3-RELEASE.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=ea94bed8385965a61e488661510b736d
+_md5_=b40288cba9e9f838b9f5a0f6f84a01d8
diff --git a/metadata/md5-cache/dev-java/javax-jsp-api-2.0 b/metadata/md5-cache/dev-java/javax-jsp-api-2.0
index 9830dd17eb84..0f85f20be7df 100644
--- a/metadata/md5-cache/dev-java/javax-jsp-api-2.0
+++ b/metadata/md5-cache/dev-java/javax-jsp-api-2.0
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://jcp.org/aboutJava/communityprocess/final/jsr152/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 ~arm64
 LICENSE=CDDL GPL-2-with-classpath-exception
 RDEPEND=dev-java/javax-servlet-api:2.5 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.0
 SRC_URI=https://repo1.maven.org/maven2/javax/servlet/jsp/jsp-api/2.0/jsp-api-2.0-sources.jar
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=30ce7d86f6eb17dba94bf6b8e87c8e02
+_md5_=65f8ab21d39f377fe8b64f8ea2e5d4f1
diff --git a/metadata/md5-cache/dev-java/javax-jsp-api-2.2 b/metadata/md5-cache/dev-java/javax-jsp-api-2.2
index 1811ebfa0201..23f3081c90a0 100644
--- a/metadata/md5-cache/dev-java/javax-jsp-api-2.2
+++ b/metadata/md5-cache/dev-java/javax-jsp-api-2.2
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64
 LICENSE=CDDL GPL-2-with-classpath-exception
 RDEPEND=>=virtual/jre-1.8:* dev-java/javax-el-api:2.2 dev-java/javax-servlet-api:2.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.2
 SRC_URI=https://repo1.maven.org/maven2/javax/servlet/jsp/jsp-api/2.2/jsp-api-2.2-sources.jar
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=ff2242c9cfc70eb503be864de6b8b54f
+_md5_=5b4cdc34e1ac3bb86601e31ec8f344c6
diff --git a/metadata/md5-cache/dev-java/javax-mail-1.6.7-r2 b/metadata/md5-cache/dev-java/javax-mail-1.6.7-r2
index 270a009e88b8..4750fb7f97d7 100644
--- a/metadata/md5-cache/dev-java/javax-mail-1.6.7-r2
+++ b/metadata/md5-cache/dev-java/javax-mail-1.6.7-r2
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://jakartaee.github.io/mail-api/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=EPL-1.0 EPL-2.0 GPL-2-with-classpath-exception
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jakartaee/mail-api/archive/1.6.7.tar.gz -> javax-mail-1.6.7.tar.gz https://github.com/jakartaee/mail-api/commit/86ee859eb1.patch -> javax-mail-1.6.7-java21.patch
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=68bff40d73df063d98eab935dfd0b93a
+_md5_=76d582b5a6bcf381e851743823d99608
diff --git a/metadata/md5-cache/dev-java/javax-persistence-api-2.2-r1 b/metadata/md5-cache/dev-java/javax-persistence-api-2.2-r1
index da4c70668cad..1529c1cbcd45 100644
--- a/metadata/md5-cache/dev-java/javax-persistence-api-2.2-r1
+++ b/metadata/md5-cache/dev-java/javax-persistence-api-2.2-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.jcp.org/en/jsr/detail?id=220
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=EPL-1.0 BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/javax/persistence/javax.persistence-api/2.2/javax.persistence-api-2.2-sources.jar
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=a4481d38fdd6c897b7cb8fb993bf0b2d
+_md5_=45c60a322bec7ad1ddac2b90ce13b447
diff --git a/metadata/md5-cache/dev-java/javax-servlet-api-2.2 b/metadata/md5-cache/dev-java/javax-servlet-api-2.2
index 7c80e6aa6619..e4d5eba6e3e6 100644
--- a/metadata/md5-cache/dev-java/javax-servlet-api-2.2
+++ b/metadata/md5-cache/dev-java/javax-servlet-api-2.2
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://javaee.github.io/servlet-spec/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 ~arm64 ppc64 x86
+KEYWORDS=amd64 ~arm64 ppc64
 LICENSE=CDDL GPL-2
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.2
 SRC_URI=https://repo1.maven.org/maven2/javax/servlet/servlet-api/2.2/servlet-api-2.2-sources.jar
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=24694796a376f114296c59b09d445131
+_md5_=34a8331161dce3eb37ddf3c931602833
diff --git a/metadata/md5-cache/dev-java/javax-servlet-api-2.5 b/metadata/md5-cache/dev-java/javax-servlet-api-2.5
index 7be262bb39f5..894ec300d89a 100644
--- a/metadata/md5-cache/dev-java/javax-servlet-api-2.5
+++ b/metadata/md5-cache/dev-java/javax-servlet-api-2.5
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://javaee.github.io/servlet-spec/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=CDDL GPL-2
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.5
 SRC_URI=https://repo1.maven.org/maven2/javax/servlet/servlet-api/2.5/servlet-api-2.5-sources.jar
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=aa013cedce6f9cfe541f3cc76dcbc6ab
+_md5_=b632e4a790b24002573ca98503d7c239
diff --git a/metadata/md5-cache/dev-java/javax-servlet-api-3.0.1 b/metadata/md5-cache/dev-java/javax-servlet-api-3.0.1
index 8b7fd7ba5c4a..d61f0b4168c1 100644
--- a/metadata/md5-cache/dev-java/javax-servlet-api-3.0.1
+++ b/metadata/md5-cache/dev-java/javax-servlet-api-3.0.1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://javaee.github.io/servlet-spec/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm64 ~ppc64
 LICENSE=CDDL GPL-2
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=https://repo1.maven.org/maven2/javax/servlet/javax.servlet-api/3.0.1/javax.servlet-api-3.0.1-sources.jar
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=17f3789e7468ea6e6292f46bc7f1d419
+_md5_=c0a3bfa8cecddea1f69b11e5639e4d2f
diff --git a/metadata/md5-cache/dev-java/javax-servlet-api-3.1.0 b/metadata/md5-cache/dev-java/javax-servlet-api-3.1.0
index dafa3678b338..50b15c5b9b48 100644
--- a/metadata/md5-cache/dev-java/javax-servlet-api-3.1.0
+++ b/metadata/md5-cache/dev-java/javax-servlet-api-3.1.0
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://javaee.github.io/servlet-spec/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=CDDL GPL-2
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.1
 SRC_URI=https://repo1.maven.org/maven2/javax/servlet/javax.servlet-api/3.1.0/javax.servlet-api-3.1.0-sources.jar
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=32ddb3e835b506973e388023b1692ade
+_md5_=09237f0db4efe32db263a35fcc5d45b4
diff --git a/metadata/md5-cache/dev-java/jax-rpc-api-1.1.4 b/metadata/md5-cache/dev-java/jax-rpc-api-1.1.4
index 725b69e9514e..ce5fb051e86d 100644
--- a/metadata/md5-cache/dev-java/jax-rpc-api-1.1.4
+++ b/metadata/md5-cache/dev-java/jax-rpc-api-1.1.4
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/eclipse-ee4j/jax-rpc-api
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64
 LICENSE=EPL-2.0 GPL-2-with-classpath-exception
 RDEPEND=>=virtual/jre-1.8:* dev-java/jakarta-servlet-api:4 dev-java/jakarta-xml-soap-api:1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/eclipse-ee4j/jax-rpc-api/archive/1.1.4.tar.gz -> jax-rpc-api-1.1.4.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=f3e6794d43c5cdd750f35b70ff1a26e3
+_md5_=2ec9b0340c31eb8b828c6032d6e966d7
diff --git a/metadata/md5-cache/dev-java/jaxb-api-2.3.3-r2 b/metadata/md5-cache/dev-java/jaxb-api-2.3.3-r2
index 7902586f81d5..d2b8c371eac3 100644
--- a/metadata/md5-cache/dev-java/jaxb-api-2.3.3-r2
+++ b/metadata/md5-cache/dev-java/jaxb-api-2.3.3-r2
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/jakartaee/jaxb-api
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=EPL-1.0
 RDEPEND=dev-java/jakarta-activation-api:1 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://github.com/jakartaee/jaxb-api/archive/2.3.3.tar.gz -> jaxb-api-2.3.3.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=eb4b8d36d052b27726f7ecd2c727c931
+_md5_=fb78c4b3c45f30849ed2179e7ca6afe1
diff --git a/metadata/md5-cache/dev-java/jaxb-api-3.0.1-r1 b/metadata/md5-cache/dev-java/jaxb-api-3.0.1-r1
index 7624b1690edb..a29ae228ac74 100644
--- a/metadata/md5-cache/dev-java/jaxb-api-3.0.1-r1
+++ b/metadata/md5-cache/dev-java/jaxb-api-3.0.1-r1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/eclipse-ee4j/jaxb-api
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=EPL-1.0
 RDEPEND=dev-java/jakarta-activation:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3
 SRC_URI=https://github.com/eclipse-ee4j/jaxb-api/archive/3.0.1.tar.gz -> jaxb-api-3.0.1.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=2c6128585d09e4439bf8de8a41455433
+_md5_=a5aefb53098bee69ccf8260ed3100e23
diff --git a/metadata/md5-cache/dev-java/jaxb-api-4.0.2 b/metadata/md5-cache/dev-java/jaxb-api-4.0.2
index bbf35d56a869..deee7d26ecd7 100644
--- a/metadata/md5-cache/dev-java/jaxb-api-4.0.2
+++ b/metadata/md5-cache/dev-java/jaxb-api-4.0.2
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/jakartaee/jaxb-api
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=EPL-1.0
 RDEPEND=dev-java/jakarta-activation:2 >=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=https://github.com/jakartaee/jaxb-api/archive/4.0.2.tar.gz -> jaxb-api-4.0.2.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=d72e0e872126f850179f64de627fab5e
+_md5_=0e1fcf22270940a4c8a88c312630bb95
diff --git a/metadata/md5-cache/dev-java/jaxb-runtime-2.3.8 b/metadata/md5-cache/dev-java/jaxb-runtime-2.3.8
index a9aeb00ca6cf..8af09a44c97e 100644
--- a/metadata/md5-cache/dev-java/jaxb-runtime-2.3.8
+++ b/metadata/md5-cache/dev-java/jaxb-runtime-2.3.8
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://eclipse-ee4j.github.io/jaxb-ri/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/fastinfoset:0 dev-java/istack-commons-runtime:3 dev-java/jaxb-api:2 dev-java/jaxb-stax-ex:1 ~dev-java/txw2-2.3.8:2 >=dev-java/jakarta-activation-1.2.2:1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://github.com/eclipse-ee4j/jaxb-ri/archive/2.3.8-RI.tar.gz -> jaxb-ri-2.3.8.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=5e027917dfbf846d2712f1c766e3c8c4
+_md5_=4b8e744e3ccfa7d0ccee43678694b594
diff --git a/metadata/md5-cache/dev-java/jaxb-runtime-4.0.0-r1 b/metadata/md5-cache/dev-java/jaxb-runtime-4.0.0-r1
index 0e5642402f9c..9d87f88ffedf 100644
--- a/metadata/md5-cache/dev-java/jaxb-runtime-4.0.0-r1
+++ b/metadata/md5-cache/dev-java/jaxb-runtime-4.0.0-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://eclipse-ee4j.github.io/jaxb-ri/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=https://github.com/eclipse-ee4j/jaxb-ri/archive/4.0.0-RI.tar.gz -> jaxb-ri-4.0.0.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=91ae5f3b22724e323649a581bc33a36f
+_md5_=20c4b065a5a1bb2f5f77ce448bf3f341
diff --git a/metadata/md5-cache/dev-java/jaxb-stax-ex-1.8.3 b/metadata/md5-cache/dev-java/jaxb-stax-ex-1.8.3
index ddf148b0d57f..236ce42eea04 100644
--- a/metadata/md5-cache/dev-java/jaxb-stax-ex-1.8.3
+++ b/metadata/md5-cache/dev-java/jaxb-stax-ex-1.8.3
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://projects.eclipse.org/projects/ee4j/stax-ex
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://github.com/eclipse-ee4j/jaxb-stax-ex/archive/1.8.3.tar.gz -> jaxb-stax-ex-1.8.3.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=4c20a05d3eeec2f31f870ece64f1457a
+_md5_=748f2fcd0cfb3b1ebf5e53634ddb20ba
diff --git a/metadata/md5-cache/dev-java/jaxb-stax-ex-2.1.0-r1 b/metadata/md5-cache/dev-java/jaxb-stax-ex-2.1.0-r1
index b881d030bfe0..87c98a91d202 100644
--- a/metadata/md5-cache/dev-java/jaxb-stax-ex-2.1.0-r1
+++ b/metadata/md5-cache/dev-java/jaxb-stax-ex-2.1.0-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://projects.eclipse.org/projects/ee4j/stax-ex
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/eclipse-ee4j/jaxb-stax-ex/archive/2.1.0.tar.gz -> jaxb-stax-ex-2.1.0.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=48fe76791440c78f0b0923a1175ec211
+_md5_=2339a1d2042855b77e32a970bf55bbe0
diff --git a/metadata/md5-cache/dev-java/jaxen-2.0.0 b/metadata/md5-cache/dev-java/jaxen-2.0.0
index 3e17659a0752..23b6254b5194 100644
--- a/metadata/md5-cache/dev-java/jaxen-2.0.0
+++ b/metadata/md5-cache/dev-java/jaxen-2.0.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=http://www.cafeconleche.org/jaxen/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=dom4j jdom xom doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=BSD-2
 RDEPEND=dom4j? ( dev-java/dom4j:1 ) jdom? ( dev-java/jdom:0 ) xom? ( dev-java/xom:0 ) >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 REQUIRED_USE=test? ( dom4j jdom xom )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=1.2
 SRC_URI=https://github.com/jaxen-xpath/jaxen/archive/v2.0.0.tar.gz -> jaxen-2.0.0.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=208a7ea21c2ee36faf3cae21d09aa4f7
+_md5_=c56c22ee1844e07cfb4f8da18dcff041
diff --git a/metadata/md5-cache/dev-java/jaxrs-api-2.1.6-r1 b/metadata/md5-cache/dev-java/jaxrs-api-2.1.6-r1
index 838de88f549b..c29cd9bb5577 100644
--- a/metadata/md5-cache/dev-java/jaxrs-api-2.1.6-r1
+++ b/metadata/md5-cache/dev-java/jaxrs-api-2.1.6-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/jakartaee/rest
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=EPL-2.0 GPL-2-with-classpath-exception
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jakartaee/rest/archive/2.1.6.tar.gz -> jaxrs-api-2.1.6.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=ae314343efb9029298f24da55ef0db2c
+_md5_=54023cdb3e25ab4f0235d000366b4a87
diff --git a/metadata/md5-cache/dev-java/jaxws-api-2.3.3 b/metadata/md5-cache/dev-java/jaxws-api-2.3.3
index c836b8f78024..b88c37d825ec 100644
--- a/metadata/md5-cache/dev-java/jaxws-api-2.3.3
+++ b/metadata/md5-cache/dev-java/jaxws-api-2.3.3
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/eclipse-ee4j/jax-ws-api
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/eclipse-ee4j/jax-ws-api/archive/2.3.3.tar.gz -> jaxws-api-2.3.3.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=7a004012976ad504aa2d1f9690c91b95
+_md5_=ea7375371b749155de746f36ac6a0722
diff --git a/metadata/md5-cache/dev-java/jbcrypt-0.4 b/metadata/md5-cache/dev-java/jbcrypt-0.4
index 28269855d740..8428f4a1e356 100644
--- a/metadata/md5-cache/dev-java/jbcrypt-0.4
+++ b/metadata/md5-cache/dev-java/jbcrypt-0.4
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.mindrot.org/projects/jBCrypt
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.mindrot.org/files/jBCrypt/jBCrypt-0.4.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=cf3f6cc744a42bad3393d1737abce0e0
+_md5_=39e9c560bd21ede8926784dffe57bf55
diff --git a/metadata/md5-cache/dev-java/jbig2-imageio-3.0.3 b/metadata/md5-cache/dev-java/jbig2-imageio-3.0.3
index 80d988d7e470..737a94ef9154 100644
--- a/metadata/md5-cache/dev-java/jbig2-imageio-3.0.3
+++ b/metadata/md5-cache/dev-java/jbig2-imageio-3.0.3
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://pdfbox.apache.org
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.apache.org/pdfbox/jbig2-imageio/3.0.3/jbig2-imageio-3.0.3-src.zip
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=3ed85986046b86bfe4923b43b92aa74a
+_md5_=0c74aeb50ead0fa6dad899c057c95f28
diff --git a/metadata/md5-cache/dev-java/jbitcollider-core-0.8-r2 b/metadata/md5-cache/dev-java/jbitcollider-core-0.8-r2
index 9690ae6bdac9..c1f712b97021 100644
--- a/metadata/md5-cache/dev-java/jbitcollider-core-0.8-r2
+++ b/metadata/md5-cache/dev-java/jbitcollider-core-0.8-r2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://bitcollider.sourceforge.net
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 ~arm64
 LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/bitcollider/jBitcollider%20%28Java%29/0.8/jBitcollider-0.8.zip
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=4975d76b61f5859cb7413a1d0148a359
+_md5_=7717f3e08a1008b22b03a502bbf51adc
diff --git a/metadata/md5-cache/dev-java/jboss-jms-api-1.0.1 b/metadata/md5-cache/dev-java/jboss-jms-api-1.0.1
index 9d3222ac129e..055b483d24e9 100644
--- a/metadata/md5-cache/dev-java/jboss-jms-api-1.0.1
+++ b/metadata/md5-cache/dev-java/jboss-jms-api-1.0.1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/jboss/jboss-jms-api_spec
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=CDDL GPL-2-with-classpath-exception
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.1
 SRC_URI=https://github.com/jboss/jboss-jms-api_spec/archive/jboss-jms-api_1.1_spec-1.0.1.Final.tar.gz -> jboss-jms-api-1.0.1.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=b6dd9d80edb609748e89fe3afa6c58bd
+_md5_=8ae44257eba8b1417a5a39ef815998a9
diff --git a/metadata/md5-cache/dev-java/jcalendar-1.4-r2 b/metadata/md5-cache/dev-java/jcalendar-1.4-r2
index 8752b2b45eaf..e3d8f054925d 100644
--- a/metadata/md5-cache/dev-java/jcalendar-1.4-r2
+++ b/metadata/md5-cache/dev-java/jcalendar-1.4-r2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://toedter.com/jcalendar/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 x86
+KEYWORDS=amd64
 LICENSE=LGPL-2.1
 RDEPEND=dev-java/jgoodies-looks:2.6 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.2
 SRC_URI=https://www.toedter.com/download/jcalendar-1.4.zip
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=29f78af321f7ea51d952ba849f700f39
+_md5_=1c0512a93664584bc93b197f02f5e01b
diff --git a/metadata/md5-cache/dev-java/jchart2d-3.2.2-r1 b/metadata/md5-cache/dev-java/jchart2d-3.2.2-r1
index 44fe64e374ca..359550ac5eee 100644
--- a/metadata/md5-cache/dev-java/jchart2d-3.2.2-r1
+++ b/metadata/md5-cache/dev-java/jchart2d-3.2.2-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=http://jchart2d.sourceforge.net
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64
 LICENSE=LGPL-2.1+
 RDEPEND=>=virtual/jre-1.8:* dev-java/jide-oss:0 dev-java/xmlgraphics-commons:2 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/jchart2d/jchart2d/sources/jchart2d-eclipse-project-3.2.2.zip
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=b51d10b2a3029c51021c771ebde13e6e
+_md5_=e954f892cd1029d79378e71a31539328
diff --git a/metadata/md5-cache/dev-java/jcifs-1.3.19-r2 b/metadata/md5-cache/dev-java/jcifs-1.3.19-r2
index 6197dab382c9..d728f5b4bd19 100644
--- a/metadata/md5-cache/dev-java/jcifs-1.3.19-r2
+++ b/metadata/md5-cache/dev-java/jcifs-1.3.19-r2
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://jcifs.samba.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc examples source
-KEYWORDS=amd64 ppc64 x86
+KEYWORDS=amd64 ppc64
 LICENSE=LGPL-2.1
 RDEPEND=dev-java/jakarta-servlet-api:4 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.1
 SRC_URI=https://jcifs.samba.org/src/jcifs-1.3.19.tgz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=5b01b6a6bbfe690746c94dc81353e15d
+_md5_=0374c7b83fd9351c32af703fb5d6dd17
diff --git a/metadata/md5-cache/dev-java/jclasslib-4.3.1 b/metadata/md5-cache/dev-java/jclasslib-4.3.1
index f62d982da231..0e95bc77b96b 100644
--- a/metadata/md5-cache/dev-java/jclasslib-4.3.1
+++ b/metadata/md5-cache/dev-java/jclasslib-4.3.1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/ingokegel/jclasslib
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 ~arm64
 LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/ingokegel/jclasslib/archive/4.3.1.tar.gz -> jclasslib-4.3.1.tar.gz https://repo1.maven.org/maven2/org/jetbrains/annotations/24.1.0/annotations-24.1.0.jar
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=deffcf4013502d74ae8cb391bf64601f
+_md5_=f2e675d2e4c89f80b7d8decbe8e7e240
diff --git a/metadata/md5-cache/dev-java/jcommander-1.64-r1 b/metadata/md5-cache/dev-java/jcommander-1.64-r1
index 8b85cb87993e..7b5327f08988 100644
--- a/metadata/md5-cache/dev-java/jcommander-1.64-r1
+++ b/metadata/md5-cache/dev-java/jcommander-1.64-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://jcommander.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=1.64
 SRC_URI=https://github.com/cbeust/jcommander/archive/1.64.tar.gz -> jcommander-1.64.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=77cba71f310fb82f483b1449e0c629ca
+_md5_=038b91b5784f663a68f226b7c746c948
diff --git a/metadata/md5-cache/dev-java/jcommander-1.82 b/metadata/md5-cache/dev-java/jcommander-1.82
index bb0b696e0955..15c07941d463 100644
--- a/metadata/md5-cache/dev-java/jcommander-1.82
+++ b/metadata/md5-cache/dev-java/jcommander-1.82
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/cbeust/jcommander
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cbeust/jcommander/archive/1.82.tar.gz -> jcommander-1.82.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=01af9f770df0c84019925b0fcfd63b5f
+_md5_=1f06407f83ce26785e0db5e43e4d6c22
diff --git a/metadata/md5-cache/dev-java/jctools-core-4.0.3-r1 b/metadata/md5-cache/dev-java/jctools-core-4.0.3-r1
index 03844fa6b6b8..a68137bfa88c 100644
--- a/metadata/md5-cache/dev-java/jctools-core-4.0.3-r1
+++ b/metadata/md5-cache/dev-java/jctools-core-4.0.3-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://jctools.github.io/JCTools/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/JCTools/JCTools/archive/v4.0.3.tar.gz -> jctools-4.0.3.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=9e1f58d7417c23be63c618762f13fbaa
+_md5_=ff39886e71e25ad921c04b58e159966a
diff --git a/metadata/md5-cache/dev-java/jctools-core-4.0.5-r1 b/metadata/md5-cache/dev-java/jctools-core-4.0.5-r1
index 15a323aff35e..921ced741055 100644
--- a/metadata/md5-cache/dev-java/jctools-core-4.0.5-r1
+++ b/metadata/md5-cache/dev-java/jctools-core-4.0.5-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://jctools.github.io/JCTools/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 ~arm64 ppc64 x86
+KEYWORDS=amd64 ~arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/JCTools/JCTools/archive/v4.0.5.tar.gz -> jctools-4.0.5.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=cdb227b19e8282a2047a15b6cb49993f
+_md5_=2f40a5fa9ec155cae37539eaebc3e06c
diff --git a/metadata/md5-cache/dev-java/jdbc-mysql-9.0.0 b/metadata/md5-cache/dev-java/jdbc-mysql-9.0.0
index 2e9c1fef5ae9..11be7c4c3a88 100644
--- a/metadata/md5-cache/dev-java/jdbc-mysql-9.0.0
+++ b/metadata/md5-cache/dev-java/jdbc-mysql-9.0.0
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://dev.mysql.com/doc/connector-j/en/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc64
 LICENSE=GPL-2-with-MySQL-FLOSS-exception
 RDEPEND=dev-java/c3p0:0 >=dev-java/protobuf-java-4.27.2:0 dev-java/slf4j-api:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-j-9.0.0.tar.gz https://repo1.maven.org/maven2/com/oracle/oci/sdk/oci-java-sdk-common/3.29.0/oci-java-sdk-common-3.29.0.jar https://repo1.maven.org/maven2/io/opentelemetry/opentelemetry-context/1.40.0/opentelemetry-context-1.40.0.jar https://repo1.maven.org/maven2/io/opentelemetry/opentelemetry-api/1.40.0/opentelemetry-api-1.40.0.jar
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=cc8e16aa871d23e7b5365daf49181f82
+_md5_=612ab8f0efb60dbf16288047daa743b6
diff --git a/metadata/md5-cache/dev-java/jdbc-postgresql-42.7.3 b/metadata/md5-cache/dev-java/jdbc-postgresql-42.7.3
index c39841267b29..42835a08fbda 100644
--- a/metadata/md5-cache/dev-java/jdbc-postgresql-42.7.3
+++ b/metadata/md5-cache/dev-java/jdbc-postgresql-42.7.3
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://jdbc.postgresql.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 ppc64 x86
+KEYWORDS=amd64 ppc64
 LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://jdbc.postgresql.org/download/postgresql-jdbc-42.7.3.src.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=22a244145bf92e3fba24a37ead327df1
+_md5_=2111b427558edd903471c9ed4b8c19e0
diff --git a/metadata/md5-cache/dev-java/jdepend-2.10-r1 b/metadata/md5-cache/dev-java/jdepend-2.10-r1
index b88eceff2ebe..da4cc7518374 100644
--- a/metadata/md5-cache/dev-java/jdepend-2.10-r1
+++ b/metadata/md5-cache/dev-java/jdepend-2.10-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/clarkware/jdepend
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/clarkware/jdepend/archive/2.10.tar.gz -> jdepend-2.10.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=46a660c160947ea63d8ed8f66105b2ce
+_md5_=9e5a3f6f9ebda21792322b3bc23c2515
diff --git a/metadata/md5-cache/dev-java/jdisasm-1.0.6 b/metadata/md5-cache/dev-java/jdisasm-1.0.6
index c3a0e9775acd..307c1b607bfc 100644
--- a/metadata/md5-cache/dev-java/jdisasm-1.0.6
+++ b/metadata/md5-cache/dev-java/jdisasm-1.0.6
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/aunkrig/jdisasm
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* dev-java/commons-nullanalysis:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aunkrig/jdisasm/archive/5e354d659e4320d154b3f1fbff24c89c1ba48987.tar.gz -> jdisasm-1.0.6.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=e9a13c0572add6f30dfe94f1ed687af8
+_md5_=bd833d6857ec8707aeda6cfc8253b7f3
diff --git a/metadata/md5-cache/dev-java/jdom-1.1.3-r2 b/metadata/md5-cache/dev-java/jdom-1.1.3-r2
index df93ad2256dd..ec159e2f1b02 100644
--- a/metadata/md5-cache/dev-java/jdom-1.1.3-r2
+++ b/metadata/md5-cache/dev-java/jdom-1.1.3-r2
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=http://jdom.org
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc examples source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=JDOM
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://jdom.org/dist/binary/archive/jdom-1.1.3.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=eecb89e57c6a652983ae926638f7ba58
+_md5_=c916194c28c83ff83c26efaeece23476
diff --git a/metadata/md5-cache/dev-java/jdom-2.0.6.1 b/metadata/md5-cache/dev-java/jdom-2.0.6.1
index 5ebe7ea56dcb..185c288b137e 100644
--- a/metadata/md5-cache/dev-java/jdom-2.0.6.1
+++ b/metadata/md5-cache/dev-java/jdom-2.0.6.1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=http://www.jdom.org
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.8:* dev-java/iso-relax:0 dev-java/jaxen:1.2 dev-java/xalan:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://github.com/hunterhacker/jdom/archive/JDOM-2.0.6.1.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=5deede14ea4349826d96ec44e5061ede
+_md5_=b233847804b1363f7db3fa1951c89417
diff --git a/metadata/md5-cache/dev-java/jeromq-0.5.2 b/metadata/md5-cache/dev-java/jeromq-0.5.2
index cb862242ee45..0b48f916c552 100644
--- a/metadata/md5-cache/dev-java/jeromq-0.5.2
+++ b/metadata/md5-cache/dev-java/jeromq-0.5.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/zeromq/jeromq
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=MPL-2.0
 PROPERTIES=test_network
 RDEPEND=dev-java/jnacl:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
@@ -13,4 +13,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/zeromq/jeromq/archive/v0.5.2.tar.gz -> jeromq-0.5.2.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=ccf66d1ea52cada3dea12fac5fd9e7c1
+_md5_=30c56b143a8ad6b5ee774c9928997952
diff --git a/metadata/md5-cache/dev-java/jeromq-0.6.0-r1 b/metadata/md5-cache/dev-java/jeromq-0.6.0-r1
index d22b0be951e0..0f52d84a21cc 100644
--- a/metadata/md5-cache/dev-java/jeromq-0.6.0-r1
+++ b/metadata/md5-cache/dev-java/jeromq-0.6.0-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/zeromq/jeromq
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64
 LICENSE=MPL-2.0
 PROPERTIES=test_network
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
@@ -13,4 +13,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/zeromq/jeromq/archive/v0.6.0.tar.gz -> jeromq-0.6.0.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=8a43061ec8ef474cb05415de5662d2db
+_md5_=d0fd32975b74085dd911a6ec3c25a4b1
diff --git a/metadata/md5-cache/dev-java/jffi-1.3.10 b/metadata/md5-cache/dev-java/jffi-1.3.10
index f2eac15c97ad..7c4a22990059 100644
--- a/metadata/md5-cache/dev-java/jffi-1.3.10
+++ b/metadata/md5-cache/dev-java/jffi-1.3.10
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/jnr/jffi
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-libs/libffi-3.4.2-r2:= >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=1.3
 SRC_URI=https://github.com/jnr/jffi/archive/jffi-1.3.10.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=45c6b65c77e3e1a0f5fd3225024f981f
+_md5_=8dadcb2ffd1157bd28a2bf5af25f937c
diff --git a/metadata/md5-cache/dev-java/jgoodies-common-1.8.0-r1 b/metadata/md5-cache/dev-java/jgoodies-common-1.8.0-r1
index cd4b2508eee2..3f2012b21574 100644
--- a/metadata/md5-cache/dev-java/jgoodies-common-1.8.0-r1
+++ b/metadata/md5-cache/dev-java/jgoodies-common-1.8.0-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=http://www.jgoodies.com/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 ~ppc64 x86
+KEYWORDS=amd64 ~ppc64
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=1.8
 SRC_URI=http://www.jgoodies.com/download/libraries/common/jgoodies-common-1_8_0.zip
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=d52a14c07ec78008e65c2d3c455d6c4a
+_md5_=0b5c560f4189799777937e579d9316a4
diff --git a/metadata/md5-cache/dev-java/jgoodies-looks-2.6.0-r1 b/metadata/md5-cache/dev-java/jgoodies-looks-2.6.0-r1
index 585cc7e0f95e..73eb6bfdb66a 100644
--- a/metadata/md5-cache/dev-java/jgoodies-looks-2.6.0-r1
+++ b/metadata/md5-cache/dev-java/jgoodies-looks-2.6.0-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=http://www.jgoodies.com/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 x86
+KEYWORDS=amd64
 LICENSE=BSD
 RDEPEND=dev-java/jgoodies-common:1.8 virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.6
 SRC_URI=http://www.jgoodies.com/download/libraries/looks/jgoodies-looks-2_6_0.zip
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=10aea06f77390c986abddf2e4041a2ee
+_md5_=ba0a3d2b6d7dcc482225d343d5ceb67b
diff --git a/metadata/md5-cache/dev-java/jide-oss-3.7.12-r1 b/metadata/md5-cache/dev-java/jide-oss-3.7.12-r1
index b5da859c4665..2158ed098912 100644
--- a/metadata/md5-cache/dev-java/jide-oss-3.7.12-r1
+++ b/metadata/md5-cache/dev-java/jide-oss-3.7.12-r1
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://github.com/jidesoft/jide-oss
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64
 LICENSE=GPL-2-with-classpath-exception
 RDEPEND=virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jidesoft/jide-oss/archive/19083238ce00ecbd7370f856cb64ea69dae669a5.tar.gz -> jide-oss-3.7.12.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=ff4d5599283956a0f5d44df50646c34e
+_md5_=d8af1ad95f1284a333064cee8e385506
diff --git a/metadata/md5-cache/dev-java/jimfs-1.3.0 b/metadata/md5-cache/dev-java/jimfs-1.3.0
index 1cc8634ead10..331e303e6ce5 100644
--- a/metadata/md5-cache/dev-java/jimfs-1.3.0
+++ b/metadata/md5-cache/dev-java/jimfs-1.3.0
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/google/jimfs
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=dev-java/auto-service-annotations:0 dev-java/error-prone-annotations:0 dev-java/guava:0 >=dev-java/icu4j-74.2-r1:0 dev-java/jsr305:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/jimfs/archive/v1.3.0.tar.gz -> jimfs-1.3.0.tar.gz test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=c579fa56addb0ba64f57445741c00790
+_md5_=9ac010dfb4a44cb0927cf2c04ea8defa
diff --git a/metadata/md5-cache/dev-java/jline-2.14.6 b/metadata/md5-cache/dev-java/jline-2.14.6
index e655b733e477..b51e0bc51ff3 100644
--- a/metadata/md5-cache/dev-java/jline-2.14.6
+++ b/metadata/md5-cache/dev-java/jline-2.14.6
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://github.com/jline/jline2
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=test doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=BSD
 RDEPEND=dev-java/jansi:0 dev-java/jansi-native:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test ) test
 SLOT=2
 SRC_URI=https://github.com/jline/jline2/archive/jline-2.14.6.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=539e242a27755e4db7fa2dab49eecbbd
+_md5_=5760dedf502e5c32b38cdf8dc3389d94
diff --git a/metadata/md5-cache/dev-java/jmh-core-1.37 b/metadata/md5-cache/dev-java/jmh-core-1.37
index 21eed98d34b9..afce859e86e9 100644
--- a/metadata/md5-cache/dev-java/jmh-core-1.37
+++ b/metadata/md5-cache/dev-java/jmh-core-1.37
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://openjdk.org/projects/code-tools/jmh/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=dev-java/commons-math:3 dev-java/jopt-simple:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/openjdk/jmh/archive/1.37.tar.gz -> jmh-1.37.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=89730d4d411b202c810c710d6241c1a4
+_md5_=1163faa60fd06ebdd21bab30c66abd35
diff --git a/metadata/md5-cache/dev-java/jmh-generator-annprocess-1.37 b/metadata/md5-cache/dev-java/jmh-generator-annprocess-1.37
index 7d3124ac9218..5f5714487d7a 100644
--- a/metadata/md5-cache/dev-java/jmh-generator-annprocess-1.37
+++ b/metadata/md5-cache/dev-java/jmh-generator-annprocess-1.37
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://openjdk.org/projects/code-tools/jmh/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/openjdk/jmh/archive/1.37.tar.gz -> jmh-1.37.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=b7d7acc100d223c42544ee3e6353a6bd
+_md5_=72200d415232b9f33c89a9f668e83f7a
diff --git a/metadata/md5-cache/dev-java/jmock-1.2.0-r2 b/metadata/md5-cache/dev-java/jmock-1.2.0-r2
index c3936d025dcd..52b0b9e9c36f 100644
--- a/metadata/md5-cache/dev-java/jmock-1.2.0-r2
+++ b/metadata/md5-cache/dev-java/jmock-1.2.0-r2
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=http://jmock.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* dev-java/junit:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=http://jmock.org/downloads/jmock-1.2.0-jars.zip
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=f3eccd83488fb65c872dd79d4efb62fc
+_md5_=9729f514a6bba36eaf6917910d6d297e
diff --git a/metadata/md5-cache/dev-java/jmock-2.12.0 b/metadata/md5-cache/dev-java/jmock-2.12.0
index 5d44c2953c25..84fea9ddd8f9 100644
--- a/metadata/md5-cache/dev-java/jmock-2.12.0
+++ b/metadata/md5-cache/dev-java/jmock-2.12.0
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=http://jmock.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://github.com/jmock-developers/jmock-library/archive/2.12.0.tar.gz -> jmock-2.12.0.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=b355062f5a14208b9dffdab99cc4d338
+_md5_=5d3f73af1b23eb104f56afc34ee9399c
diff --git a/metadata/md5-cache/dev-java/jna-5.13.0-r1 b/metadata/md5-cache/dev-java/jna-5.13.0-r1
index 56b2eb3f3197..d0f2cd30c9d6 100644
--- a/metadata/md5-cache/dev-java/jna-5.13.0-r1
+++ b/metadata/md5-cache/dev-java/jna-5.13.0-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/java-native-access/jna
 INHERIT=java-pkg-2 java-pkg-simple toolchain-funcs
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=|| ( Apache-2.0 LGPL-2.1+ )
 RDEPEND=>=virtual/jre-1.8:* >=dev-libs/libffi-3.4:= >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=https://github.com/java-native-access/jna/archive/5.13.0.tar.gz -> jna-5.13.0.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	toolchain-funcs	d3d42b22a610ce81c267b644bcec9b87	multilib	b2a329026f2e404e9e371097dda47f96
-_md5_=51919da26f330c9e64532570daf63962
+_md5_=6a887ba4c2346c7652acb44c3340a40f
diff --git a/metadata/md5-cache/dev-java/jna-5.14.0-r1 b/metadata/md5-cache/dev-java/jna-5.14.0-r1
index a86655abea77..49913e8ff430 100644
--- a/metadata/md5-cache/dev-java/jna-5.14.0-r1
+++ b/metadata/md5-cache/dev-java/jna-5.14.0-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/java-native-access/jna
 INHERIT=java-pkg-2 java-pkg-simple toolchain-funcs
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ~ppc64 x86
+KEYWORDS=amd64 arm64 ~ppc64
 LICENSE=|| ( Apache-2.0 LGPL-2.1+ )
 RDEPEND=>=virtual/jre-1.8:* >=dev-libs/libffi-3.4:= >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=https://github.com/java-native-access/jna/archive/5.14.0.tar.gz -> jna-5.14.0.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	toolchain-funcs	d3d42b22a610ce81c267b644bcec9b87	multilib	b2a329026f2e404e9e371097dda47f96
-_md5_=0851a6476a79a0bf24f368599067f270
+_md5_=3c055f5881cd35124c091f822a265ce7
diff --git a/metadata/md5-cache/dev-java/jnacl-1.0 b/metadata/md5-cache/dev-java/jnacl-1.0
index 78e6867e5106..7319ca0f04a2 100644
--- a/metadata/md5-cache/dev-java/jnacl-1.0
+++ b/metadata/md5-cache/dev-java/jnacl-1.0
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/neilalexander/jnacl
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/neilalexander/jnacl/archive/v1.0.tar.gz -> jnacl-1.0.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=e1f2b61efc53eb44923dcfbf6cd41680
+_md5_=9a87f6b97e78f6b2598729491e27a1ec
diff --git a/metadata/md5-cache/dev-java/jnacl-1.0-r1 b/metadata/md5-cache/dev-java/jnacl-1.0-r1
index 468e90546eff..7360ba9e8a01 100644
--- a/metadata/md5-cache/dev-java/jnacl-1.0-r1
+++ b/metadata/md5-cache/dev-java/jnacl-1.0-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/neilalexander/jnacl
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64
 LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/neilalexander/jnacl/archive/v1.0.tar.gz -> jnacl-1.0.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=35df55b9e18446320a219536efa0b423
+_md5_=d2ceee27183aa22c80df5ab5fc7d2a6d
diff --git a/metadata/md5-cache/dev-java/jnr-a64asm-1.0.0 b/metadata/md5-cache/dev-java/jnr-a64asm-1.0.0
index 0cc004bbbf6d..f1ff3d1e842c 100644
--- a/metadata/md5-cache/dev-java/jnr-a64asm-1.0.0
+++ b/metadata/md5-cache/dev-java/jnr-a64asm-1.0.0
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=http://nexus.sonatype.org/oss-repository-hosting.html/jnr-a64asm
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/jnr/jnr-a64asm/archive/refs/tags/jnr-a64asm-1.0.0.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=b7c234398b58838decb8379f4858e543
+_md5_=faf063d48b26c6eb0bf9ae7e176f2b58
diff --git a/metadata/md5-cache/dev-java/jnr-constants-0.10.4 b/metadata/md5-cache/dev-java/jnr-constants-0.10.4
index 6d008512daa3..d14a24fd724a 100644
--- a/metadata/md5-cache/dev-java/jnr-constants-0.10.4
+++ b/metadata/md5-cache/dev-java/jnr-constants-0.10.4
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/jnr/jnr-constants
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jnr/jnr-constants/archive/jnr-constants-0.10.4.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=8fa1fdbd5491ef1847055ab9b4b9d752
+_md5_=ec7babd0267a79caa465dba7b0c3f088
diff --git a/metadata/md5-cache/dev-java/jnr-ffi-2.2.12 b/metadata/md5-cache/dev-java/jnr-ffi-2.2.12
index 12e02572a2e2..4d26d999470b 100644
--- a/metadata/md5-cache/dev-java/jnr-ffi-2.2.12
+++ b/metadata/md5-cache/dev-java/jnr-ffi-2.2.12
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/jnr/jnr-ffi
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=dev-java/asm:9 >=dev-java/jffi-1.3.8:1.3 dev-java/jnr-a64asm:2 dev-java/jnr-x86asm:1.0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/jnr/jnr-ffi/archive/jnr-ffi-2.2.12.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=5478383eff25ab76af8bba5f66190ce2
+_md5_=6ad3728ad60ada26d76ddc11c2f1965c
diff --git a/metadata/md5-cache/dev-java/jnr-netdb-1.2.0 b/metadata/md5-cache/dev-java/jnr-netdb-1.2.0
index 2af0eb9af89d..ccd19d032fc2 100644
--- a/metadata/md5-cache/dev-java/jnr-netdb-1.2.0
+++ b/metadata/md5-cache/dev-java/jnr-netdb-1.2.0
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/jnr/jnr-netdb
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=dev-java/jnr-ffi:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=1.0
 SRC_URI=https://github.com/jnr/jnr-netdb/archive/jnr-netdb-1.2.0.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=66fca45130657bacce1ebeafbf5c049f
+_md5_=5f9b64f035f69fd632f0dcca85247b75
diff --git a/metadata/md5-cache/dev-java/jnr-posix-3.1.16 b/metadata/md5-cache/dev-java/jnr-posix-3.1.16
index 4df1c9bfa9b7..bc605d3d0dab 100644
--- a/metadata/md5-cache/dev-java/jnr-posix-3.1.16
+++ b/metadata/md5-cache/dev-java/jnr-posix-3.1.16
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/jnr/jnr-posix
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=EPL-2.0 GPL-2 LGPL-2.1
 RDEPEND=>=dev-java/jnr-ffi-2.2.12:2 dev-java/jnr-constants:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=3.0
 SRC_URI=https://github.com/jnr/jnr-posix/archive/jnr-posix-3.1.16.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=c9660f94d31b85709fce8a7e89241a93
+_md5_=57eddf37606d9787fd0c05485a533729
diff --git a/metadata/md5-cache/dev-java/jnr-x86asm-1.0.2-r2 b/metadata/md5-cache/dev-java/jnr-x86asm-1.0.2-r2
index ad0172446b2f..53f24713ab37 100644
--- a/metadata/md5-cache/dev-java/jnr-x86asm-1.0.2-r2
+++ b/metadata/md5-cache/dev-java/jnr-x86asm-1.0.2-r2
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://github.com/jnr/jnr-x86asm
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=https://github.com/jnr/jnr-x86asm/archive/refs/tags/1.0.2.tar.gz -> jnr-x86asm-1.0.2.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=55c052045c8707115ea65ddc62435768
+_md5_=8cd3f3123a91ceaac864c62102407c25
diff --git a/metadata/md5-cache/dev-java/joda-convert-2.2.2-r2 b/metadata/md5-cache/dev-java/joda-convert-2.2.2-r2
index 4b3d4bfc2216..2bf8d2265452 100644
--- a/metadata/md5-cache/dev-java/joda-convert-2.2.2-r2
+++ b/metadata/md5-cache/dev-java/joda-convert-2.2.2-r2
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.joda.org/joda-convert/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/JodaOrg/joda-convert/archive/v2.2.2.tar.gz -> joda-convert-2.2.2.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=be670b2a9721cbd8d66122193ece0d1b
+_md5_=81b8e01e3c7c96c98604315382ee1522
diff --git a/metadata/md5-cache/dev-java/joda-time-2.11.2 b/metadata/md5-cache/dev-java/joda-time-2.11.2
index 70c61d1fea67..fc4f6f4ad2b0 100644
--- a/metadata/md5-cache/dev-java/joda-time-2.11.2
+++ b/metadata/md5-cache/dev-java/joda-time-2.11.2
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.joda.org/joda-time/
 INHERIT=edo java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/joda-convert:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/JodaOrg/joda-time/archive/v2.11.2.tar.gz -> joda-time-2.11.2.tar.gz
 _eclasses_=edo	367e103a74bf77e6a8da7894d999fa3c	java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=4886f359a28940d4e76f8c6729f5a44b
+_md5_=e3b8b8ca154415788f5a9f23e1d4d06f
diff --git a/metadata/md5-cache/dev-java/jol-core-0.16-r1 b/metadata/md5-cache/dev-java/jol-core-0.16-r1
index eeff40c35f7d..6f881f113baf 100644
--- a/metadata/md5-cache/dev-java/jol-core-0.16-r1
+++ b/metadata/md5-cache/dev-java/jol-core-0.16-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://openjdk.org/projects/code-tools/jol/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=GPL-2-with-classpath-exception
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/openjdk/jol/archive/0.16.tar.gz -> jol-0.16.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=42a81b84e741c7f16712636d8ba8a0c4
+_md5_=9691e0887fd3e260cf8459542c814efc
diff --git a/metadata/md5-cache/dev-java/jopt-simple-5.0.4 b/metadata/md5-cache/dev-java/jopt-simple-5.0.4
index b5937f2c1d66..cb675923b17e 100644
--- a/metadata/md5-cache/dev-java/jopt-simple-5.0.4
+++ b/metadata/md5-cache/dev-java/jopt-simple-5.0.4
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://jopt-simple.github.io/jopt-simple/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/jopt-simple/jopt-simple/archive/jopt-simple-5.0.4.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=11db03c0f4093a5d81e2cf182d84d240
+_md5_=6e221da180749e6352e26813e6e3016f
diff --git a/metadata/md5-cache/dev-java/jrobin-1.6.0-r2 b/metadata/md5-cache/dev-java/jrobin-1.6.0-r2
index 6e97c2cc784f..dbe6a69ed60c 100644
--- a/metadata/md5-cache/dev-java/jrobin-1.6.0-r2
+++ b/metadata/md5-cache/dev-java/jrobin-1.6.0-r2
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/OpenNMS/jrobin
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 x86
+KEYWORDS=amd64
 LICENSE=LGPL-3
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/OpenNMS/jrobin/archive/jrobin-1.6.0-1.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=c518f3b0782e0d8a81457374013abe21
+_md5_=09a6fd05e95bbb0125eb82b58f99e5e4
diff --git a/metadata/md5-cache/dev-java/jsch-0.1.55 b/metadata/md5-cache/dev-java/jsch-0.1.55
index 1330c74586a9..7c813e819402 100644
--- a/metadata/md5-cache/dev-java/jsch-0.1.55
+++ b/metadata/md5-cache/dev-java/jsch-0.1.55
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=http://www.jcraft.com/jsch/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=BSD
 RDEPEND=>=dev-java/jzlib-1.1.3:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/jsch/jsch-0.1.55.zip
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=7edcdbe7e1f73dd56b55a20f4d2e8972
+_md5_=be8e9fdbc7a5d83d967789290853d1da
diff --git a/metadata/md5-cache/dev-java/jsch-agent-proxy-0.0.9 b/metadata/md5-cache/dev-java/jsch-agent-proxy-0.0.9
index d81a6108a3d7..90640722ca6d 100644
--- a/metadata/md5-cache/dev-java/jsch-agent-proxy-0.0.9
+++ b/metadata/md5-cache/dev-java/jsch-agent-proxy-0.0.9
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=http://www.jcraft.com/jsch-agent-proxy/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 ppc64 x86
+KEYWORDS=amd64 ppc64
 LICENSE=BSD
 RDEPEND=dev-java/jna:4 dev-java/jsch:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/ymnk/jsch-agent-proxy/archive/12c3d64fc2b0a4fd37659369edfdee26e48954e2.tar.gz -> jsch-agent-proxy-0.0.9.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=b0513dc0ddcd13800094eca3f9561436
+_md5_=937e6f3a224114a914d998269d941d79
diff --git a/metadata/md5-cache/dev-java/json-simple-2.3.1 b/metadata/md5-cache/dev-java/json-simple-2.3.1
index f7ad826488b6..f7160a3f67af 100644
--- a/metadata/md5-cache/dev-java/json-simple-2.3.1
+++ b/metadata/md5-cache/dev-java/json-simple-2.3.1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.json.org
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=source doc test
-KEYWORDS=amd64 ~arm64 ppc64 x86
+KEYWORDS=amd64 ~arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=2.3
 SRC_URI=https://github.com/cliftonlabs/json-simple/archive/json-simple-2.3.1.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=c2bcfd7b3347d11e3a88c0730f6810e1
+_md5_=7010f19b6fda8cbff914c512a5759d34
diff --git a/metadata/md5-cache/dev-java/json-smart-1.3.3 b/metadata/md5-cache/dev-java/json-smart-1.3.3
index 687c63ab980c..a6fdfefd7b92 100644
--- a/metadata/md5-cache/dev-java/json-smart-1.3.3
+++ b/metadata/md5-cache/dev-java/json-smart-1.3.3
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://urielch.github.io
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://github.com/netplex/json-smart-v1/archive/1.3.3.tar.gz -> json-smart-1.3.3.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=28b2c71e6f682497d5d0cf602096388e
+_md5_=f21163631ffda2276419a0245f0185fc
diff --git a/metadata/md5-cache/dev-java/json-smart-2.5.0 b/metadata/md5-cache/dev-java/json-smart-2.5.0
index 394be1e0171b..1d37f05cee1d 100644
--- a/metadata/md5-cache/dev-java/json-smart-2.5.0
+++ b/metadata/md5-cache/dev-java/json-smart-2.5.0
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://urielch.github.io
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/netplex/json-smart-v2/archive/2.5.0.tar.gz -> json-smart-2.5.0.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=3a6b4f0dd4ad2f4cb6b1d6538d32ae44
+_md5_=762a68343641580054dd05934190e933
diff --git a/metadata/md5-cache/dev-java/jsonrpc2-base-1.38.2 b/metadata/md5-cache/dev-java/jsonrpc2-base-1.38.2
index 5dee56e83a04..ca2f73685941 100644
--- a/metadata/md5-cache/dev-java/jsonrpc2-base-1.38.2
+++ b/metadata/md5-cache/dev-java/jsonrpc2-base-1.38.2
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://software.dzhuvinov.com/json-rpc-2.0-base.html
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=dev-java/json-smart:1 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://bitbucket.org/thetransactioncompany/json-rpc-2.0-base/get/1.38.2.tar.bz2 -> jsonrpc2-base-1.38.2.tar.bz2
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=27af264ba4c9f44e8876c8d82074a8ff
+_md5_=8b7f21e3143f6086f573b11f8660ea33
diff --git a/metadata/md5-cache/dev-java/jsonrpc2-server-1.11.1 b/metadata/md5-cache/dev-java/jsonrpc2-server-1.11.1
index 36b6b248b437..a6ccbd4f6807 100644
--- a/metadata/md5-cache/dev-java/jsonrpc2-server-1.11.1
+++ b/metadata/md5-cache/dev-java/jsonrpc2-server-1.11.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://software.dzhuvinov.com/json-rpc-2.0-server.html
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 PROPERTIES=test_network
 RDEPEND=dev-java/jsonrpc2-base:1 dev-java/json-smart:1 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
@@ -13,4 +13,4 @@ RESTRICT=test !test? ( test )
 SLOT=1
 SRC_URI=https://bitbucket.org/thetransactioncompany/json-rpc-2.0-server/get/1.11.1.tar.bz2 -> jsonrpc2-server-1.11.1.tar.bz2
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=c16415dde40213d4999b975a5a7eede2
+_md5_=e635830e44577f7c9750fb6e9178d3c9
diff --git a/metadata/md5-cache/dev-java/jsr305-3.0.2-r1 b/metadata/md5-cache/dev-java/jsr305-3.0.2-r1
index adff418a0042..c088740a327c 100644
--- a/metadata/md5-cache/dev-java/jsr305-3.0.2-r1
+++ b/metadata/md5-cache/dev-java/jsr305-3.0.2-r1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://jcp.org/en/jsr/detail?id=305
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=source doc
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2-sources.jar
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=918ac2b76b66b682e7c30dff2920b08a
+_md5_=9e5a518c6fca37d878048fc9a2ed2281
diff --git a/metadata/md5-cache/dev-java/jstl-1.2.7 b/metadata/md5-cache/dev-java/jstl-1.2.7
index 434522f4490e..e2908c57adf3 100644
--- a/metadata/md5-cache/dev-java/jstl-1.2.7
+++ b/metadata/md5-cache/dev-java/jstl-1.2.7
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://projects.eclipse.org/projects/ee4j.jstl
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64
 LICENSE=EPL-2.0 GPL-2-with-classpath-exception
 RDEPEND=dev-java/javax-el-api:2.2 dev-java/javax-jsp-api:2.2 dev-java/javax-servlet-api:2.5 dev-java/jstl-api:0 dev-java/xalan:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/jakartaee/tags/archive/1.2.7-RELEASE.tar.gz -> jstl-1.2.7.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=9d33564a543d0ac24bf234632a03e7d3
+_md5_=29b65b6a870b12222ec0dcd45d23ea50
diff --git a/metadata/md5-cache/dev-java/jstl-api-1.2.7 b/metadata/md5-cache/dev-java/jstl-api-1.2.7
index 6b98d16708a9..466791b46ce5 100644
--- a/metadata/md5-cache/dev-java/jstl-api-1.2.7
+++ b/metadata/md5-cache/dev-java/jstl-api-1.2.7
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://projects.eclipse.org/projects/ee4j.jstl
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64
 LICENSE=EPL-2.0 GPL-2-with-classpath-exception
 RDEPEND=dev-java/javax-el-api:2.2 dev-java/javax-jsp-api:2.2 dev-java/javax-servlet-api:2.5 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/jakartaee/tags/archive/1.2.7-RELEASE.tar.gz -> jstl-1.2.7.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=030d7dda34b23f981b8990360a48f465
+_md5_=0c34916390cd5e65652321b717e87569
diff --git a/metadata/md5-cache/dev-java/jtds-1.3.1-r1 b/metadata/md5-cache/dev-java/jtds-1.3.1-r1
index 6fbcaabe2783..992e976dc4c9 100644
--- a/metadata/md5-cache/dev-java/jtds-1.3.1-r1
+++ b/metadata/md5-cache/dev-java/jtds-1.3.1-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=http://jtds.sourceforge.net
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 x86
+KEYWORDS=amd64
 LICENSE=LGPL-2.1
 RDEPEND=dev-java/jcifs:1.1 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=1.3
 SRC_URI=https://downloads.sourceforge.net/project/jtds/jtds/1.3.1/jtds-1.3.1-src.zip
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=320e5cdb78d00480a01b1bfe1d6781af
+_md5_=307116f8dcc72e2eccad16960c097f5c
diff --git a/metadata/md5-cache/dev-java/jtidy-1.0-r2 b/metadata/md5-cache/dev-java/jtidy-1.0-r2
index 53c835eaa692..8cb82b878e8c 100644
--- a/metadata/md5-cache/dev-java/jtidy-1.0-r2
+++ b/metadata/md5-cache/dev-java/jtidy-1.0-r2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://sourceforge.net/projects/jtidy/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 ppc64 x86
+KEYWORDS=amd64 ppc64
 LICENSE=HTML-Tidy W3C
 RDEPEND=>=dev-java/ant-1.10.14-r3:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/jtidy/JTidy/r938/jtidy-r938-sources.zip -> jtidy-1.0.zip
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=181131b30b305581762c4390eb4b27f6
+_md5_=dedd20ef8ff48a73fc0724555afd58e1
diff --git a/metadata/md5-cache/dev-java/jtwig-core-5.87.0 b/metadata/md5-cache/dev-java/jtwig-core-5.87.0
index 418cc45d41c5..18b9118356fa 100644
--- a/metadata/md5-cache/dev-java/jtwig-core-5.87.0
+++ b/metadata/md5-cache/dev-java/jtwig-core-5.87.0
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/jtwig/jtwig-core
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jtwig/jtwig-core/archive/5.87.0.RELEASE.tar.gz -> jtwig-core-5.87.0.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=1c4cd232b5415f226629aca02acf8234
+_md5_=0e543b536197061b1579678a136de6dd
diff --git a/metadata/md5-cache/dev-java/jtwig-reflection-5.87.0 b/metadata/md5-cache/dev-java/jtwig-reflection-5.87.0
index be809129d4ec..bd3b370297fe 100644
--- a/metadata/md5-cache/dev-java/jtwig-reflection-5.87.0
+++ b/metadata/md5-cache/dev-java/jtwig-reflection-5.87.0
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/jtwig/jtwig-reflection
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jtwig/jtwig-reflection/archive/5.87.0.RELEASE.tar.gz -> jtwig-reflection-5.87.0.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=d651903577b6638edda9c8defd2e828c
+_md5_=3636e550f6f6bcc2f588d04d74721bb0
diff --git a/metadata/md5-cache/dev-java/jul-to-slf4j-2.0.3 b/metadata/md5-cache/dev-java/jul-to-slf4j-2.0.3
index 001dd6527e2f..47f57fe2dc45 100644
--- a/metadata/md5-cache/dev-java/jul-to-slf4j-2.0.3
+++ b/metadata/md5-cache/dev-java/jul-to-slf4j-2.0.3
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.slf4j.org
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* ~dev-java/slf4j-api-2.0.3:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qos-ch/slf4j/archive/v_2.0.3.tar.gz -> slf4j-2.0.3.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=a330d16337d34132c074f6367947cc5b
+_md5_=ad3bbf87eae99f74d1e9a8588bce97c5
diff --git a/metadata/md5-cache/dev-java/junit-3.8.2-r2 b/metadata/md5-cache/dev-java/junit-3.8.2-r2
index 34d1a88ebdea..090f24df8828 100644
--- a/metadata/md5-cache/dev-java/junit-3.8.2-r2
+++ b/metadata/md5-cache/dev-java/junit-3.8.2-r2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://junit.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=CPL-1.0
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/junit/junit/3.8.2/junit3.8.2.zip
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=3fe50fcb52ec9e53d1612a6f9bf9cb14
+_md5_=cee609e4d0818eb861f94cf19898a3a9
diff --git a/metadata/md5-cache/dev-java/junit-4.13.2_p20240222 b/metadata/md5-cache/dev-java/junit-4.13.2_p20240222
index 43baaa0b6cac..8607cdf87337 100644
--- a/metadata/md5-cache/dev-java/junit-4.13.2_p20240222
+++ b/metadata/md5-cache/dev-java/junit-4.13.2_p20240222
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://junit.org/junit4/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=EPL-1.0
 RDEPEND=dev-java/hamcrest-core:1.3 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=https://github.com/junit-team/junit4/archive/28fa2cae48b365c949935b28967ffb3f388e77ef.tar.gz -> junit-4.13.2_p20240222.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=ac356433a28506828c09253df2c81027
+_md5_=aeaac1653bb977156cc2c7bda1b409bb
diff --git a/metadata/md5-cache/dev-java/junit-5.10.3 b/metadata/md5-cache/dev-java/junit-5.10.3
index 31857fb5483a..51a1ae9807f2 100644
--- a/metadata/md5-cache/dev-java/junit-5.10.3
+++ b/metadata/md5-cache/dev-java/junit-5.10.3
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://junit.org/junit5/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc migration-support suite vintage source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=EPL-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/apiguardian-api:0 dev-java/opentest4j:0 dev-java/open-test-reporting-events:0 dev-java/picocli:0 dev-java/univocity-parsers:0 migration-support? ( dev-java/junit:4 ) vintage? ( dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=https://github.com/junit-team/junit5/archive/r5.10.3.tar.gz -> junit-5.10.3.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=fb41db2141ca054401de99b9b4e36dc9
+_md5_=55e0c1f81d728dad35242a63c76a1b33
diff --git a/metadata/md5-cache/dev-java/junit-clptr-1.2.2 b/metadata/md5-cache/dev-java/junit-clptr-1.2.2
index 87e721dcc64e..154b11440b60 100644
--- a/metadata/md5-cache/dev-java/junit-clptr-1.2.2
+++ b/metadata/md5-cache/dev-java/junit-clptr-1.2.2
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=http://nexus.sonatype.org/oss-repository-hosting.html/junit-clptr
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 ppc64 x86
+KEYWORDS=amd64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/bitstrings/junit-clptr/archive/refs/tags/1.2.2.tar.gz -> junit-clptr-1.2.2-sources.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=cf422be6a5523815b02e67c5e3ea8ca8
+_md5_=94cefba96ce36c913ad35bdf6c74beab
diff --git a/metadata/md5-cache/dev-java/junit-dataprovider-2.9 b/metadata/md5-cache/dev-java/junit-dataprovider-2.9
index 39a0c669a84b..6759529ddd2e 100644
--- a/metadata/md5-cache/dev-java/junit-dataprovider-2.9
+++ b/metadata/md5-cache/dev-java/junit-dataprovider-2.9
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/TNG/junit-dataprovider
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/findbugs-annotations:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/TNG/junit-dataprovider/archive/v2.9.tar.gz -> junit-dataprovider-2.9.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=958218739e4ace1d09c8d1471459269f
+_md5_=107e5ec890dc72e5e55d8255561beb72
diff --git a/metadata/md5-cache/dev-java/junitparams-1.1.1-r1 b/metadata/md5-cache/dev-java/junitparams-1.1.1-r1
index 59cc20084db1..d7a656d3682b 100644
--- a/metadata/md5-cache/dev-java/junitparams-1.1.1-r1
+++ b/metadata/md5-cache/dev-java/junitparams-1.1.1-r1
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://github.com/Pragmatists/JUnitParams
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Pragmatists/JUnitParams/archive/refs/tags/JUnitParams-1.1.1.tar.gz -> junitparams-1.1.1.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=da8232838bf6a959ac803d8a3b0011fe
+_md5_=0b3d7bfeb5616a1456104d626c644e49
diff --git a/metadata/md5-cache/dev-java/jzlib-1.1.3-r2 b/metadata/md5-cache/dev-java/jzlib-1.1.3-r2
index 457e6633517f..b8a35ffbbb94 100644
--- a/metadata/md5-cache/dev-java/jzlib-1.1.3-r2
+++ b/metadata/md5-cache/dev-java/jzlib-1.1.3-r2
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=http://www.jcraft.com/jzlib/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=examples source test
-KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ymnk/jzlib/archive/1.1.3.tar.gz -> jzlib-1.1.3.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=2fae2f19bd8ee504d36cec85450afbe5
+_md5_=9ce2738c56e3b77bab42ca48748568dd
diff --git a/metadata/md5-cache/dev-java/kafka-clients-1.1.1-r2 b/metadata/md5-cache/dev-java/kafka-clients-1.1.1-r2
index 61a7a30c1dd4..141b0778fbf3 100644
--- a/metadata/md5-cache/dev-java/kafka-clients-1.1.1-r2
+++ b/metadata/md5-cache/dev-java/kafka-clients-1.1.1-r2
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://kafka.apache.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/lz4-java-1.4.1:0 >=dev-java/slf4j-api-1.7.25:0 >=dev-java/snappy-java-1.1.10.5-r2:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://archive.apache.org/dist/kafka/1.1.1/kafka-1.1.1-src.tgz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=2cf1d6a636265af0c7023075046c0cbc
+_md5_=5e97938d78fc38d25ffe7438480cf12e
diff --git a/metadata/md5-cache/dev-java/leiningen-bin-2.11.2 b/metadata/md5-cache/dev-java/leiningen-bin-2.11.2
index 525a944d3821..bab8da1efd31 100644
--- a/metadata/md5-cache/dev-java/leiningen-bin-2.11.2
+++ b/metadata/md5-cache/dev-java/leiningen-bin-2.11.2
@@ -4,11 +4,11 @@ DESCRIPTION=Automate Clojure projects without setting your hair on fire
 EAPI=8
 HOMEPAGE=https://leiningen.org/
 INHERIT=java-pkg-2
-KEYWORDS=amd64 arm64 ~x86 ~x64-macos
+KEYWORDS=amd64 arm64 ~x64-macos
 LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/technomancy/leiningen/releases/download/2.11.2/leiningen-2.11.2-standalone.jar https://raw.githubusercontent.com/technomancy/leiningen/2.11.2/bin/lein-pkg -> leiningen-2.11.2.sh
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9
-_md5_=59e8a91e8728f065e6d02fd3dae2c85d
+_md5_=3d4482cac5768d2ed684852c7e10074d
diff --git a/metadata/md5-cache/dev-java/libg-7.0.0 b/metadata/md5-cache/dev-java/libg-7.0.0
index 2f8a26dbef63..01f7897db002 100644
--- a/metadata/md5-cache/dev-java/libg-7.0.0
+++ b/metadata/md5-cache/dev-java/libg-7.0.0
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://bnd.bndtools.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0 EPL-2.0
 RDEPEND=dev-java/slf4j-api:0 >=virtual/jre-17:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bndtools/bnd/archive/7.0.0.tar.gz -> aQute.bnd-7.0.0.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=1b5c162a6aa59b8058ba9ff72b597460
+_md5_=7a597d13a1ed3a51ac33177649879abe
diff --git a/metadata/md5-cache/dev-java/lmax-disruptor-3.4.4 b/metadata/md5-cache/dev-java/lmax-disruptor-3.4.4
index 1f21d260561b..79b62204c5c1 100644
--- a/metadata/md5-cache/dev-java/lmax-disruptor-3.4.4
+++ b/metadata/md5-cache/dev-java/lmax-disruptor-3.4.4
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://lmax-exchange.github.io/disruptor/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/LMAX-Exchange/disruptor/archive/3.4.4.tar.gz -> lmax-disruptor-3.4.4.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=32f7f604a6aae2327e7272d3aed8354d
+_md5_=053bf92ec8d96bf6d00fd240a20f1100
diff --git a/metadata/md5-cache/dev-java/log4j-12-api-2.19.0 b/metadata/md5-cache/dev-java/log4j-12-api-2.19.0
index 431219ba7eb2..e8fe8d6ecefa 100644
--- a/metadata/md5-cache/dev-java/log4j-12-api-2.19.0
+++ b/metadata/md5-cache/dev-java/log4j-12-api-2.19.0
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://logging.apache.org/log4j/2.x/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=~dev-java/log4j-api-2.19.0:2 ~dev-java/log4j-core-2.19.0:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test !test? ( test )
 SLOT=2
 SRC_URI=mirror://apache/logging/log4j/2.19.0/apache-log4j-2.19.0-src.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=90427d52a1ba71d677462761d008f4d7
+_md5_=f41ee0089eafce1452852d314d21b980
diff --git a/metadata/md5-cache/dev-java/log4j-api-2.19.0 b/metadata/md5-cache/dev-java/log4j-api-2.19.0
index ace48c9eab51..117b02af067f 100644
--- a/metadata/md5-cache/dev-java/log4j-api-2.19.0
+++ b/metadata/md5-cache/dev-java/log4j-api-2.19.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://logging.apache.org/log4j/2.x/
 INHERIT=java-pkg-2 java-pkg-simple verify-sig
 IUSE=doc source test verify-sig
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test !test? ( test )
 SLOT=2
 SRC_URI=mirror://apache/logging/log4j/2.19.0/apache-log4j-2.19.0-src.tar.gz verify-sig? ( https://www.apache.org/dist/logging/log4j/2.19.0/apache-log4j-2.19.0-src.tar.gz.asc )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	verify-sig	745dccb7d4656514f1e966cce314d7db
-_md5_=0213194e8b9f20b4cfd1e501bad2f34e
+_md5_=55f245817b467f6f74b9e738aba45626
diff --git a/metadata/md5-cache/dev-java/log4j-core-2.19.0-r1 b/metadata/md5-cache/dev-java/log4j-core-2.19.0-r1
index 0c0c4f8b0b1c..d9a8a485a4be 100644
--- a/metadata/md5-cache/dev-java/log4j-core-2.19.0-r1
+++ b/metadata/md5-cache/dev-java/log4j-core-2.19.0-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://logging.apache.org/log4j/2.x/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/commons-compress:0 dev-java/commons-csv:0 dev-java/conversant-disruptor:0 dev-java/jackson-core:0 dev-java/jackson-databind:0 dev-java/jackson-dataformat-xml:0 dev-java/jackson-dataformat-yaml:0 dev-java/jansi:2 dev-java/javax-mail:0 >=dev-java/jctools-core-4.0.3-r1:0 dev-java/jeromq:0 dev-java/kafka-clients:0 dev-java/lmax-disruptor:0 ~dev-java/log4j-api-2.19.0:2 dev-java/slf4j-api:0 dev-java/woodstox-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test !test? ( test )
 SLOT=2
 SRC_URI=mirror://apache/logging/log4j/2.19.0/apache-log4j-2.19.0-src.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=8cc2c26dbbbf2f9f5490332683f70eb4
+_md5_=0a9c842e13dd8ca65f6e10b43fe13845
diff --git a/metadata/md5-cache/dev-java/log4j-over-slf4j-2.0.3 b/metadata/md5-cache/dev-java/log4j-over-slf4j-2.0.3
index adb6abc35a4b..5b91e8cbc4fc 100644
--- a/metadata/md5-cache/dev-java/log4j-over-slf4j-2.0.3
+++ b/metadata/md5-cache/dev-java/log4j-over-slf4j-2.0.3
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.slf4j.org
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* ~dev-java/slf4j-api-2.0.3:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qos-ch/slf4j/archive/v_2.0.3.tar.gz -> slf4j-2.0.3.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=71d2196c87a31f121a8fe9580d2e7328
+_md5_=d300821b4b63ce154cf7baaee5a77587
diff --git a/metadata/md5-cache/dev-java/lucene-2.4.1-r5 b/metadata/md5-cache/dev-java/lucene-2.4.1-r5
index 5748fefcaab4..199f73c5f0a7 100644
--- a/metadata/md5-cache/dev-java/lucene-2.4.1-r5
+++ b/metadata/md5-cache/dev-java/lucene-2.4.1-r5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://lucene.apache.org
 INHERIT=java-pkg-2 verify-sig
 IUSE=doc source test verify-sig
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=2.4
 SRC_URI=https://archive.apache.org/dist/lucene/java/lucene-2.4.1-src.tar.gz verify-sig? ( https://archive.apache.org/dist/lucene/java/lucene-2.4.1-src.tar.gz.asc )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	verify-sig	745dccb7d4656514f1e966cce314d7db
-_md5_=878516b8b15d2cb33dcbf2956da4ec83
+_md5_=88618d858a243428dadd1ae626fe7ab0
diff --git a/metadata/md5-cache/dev-java/lz4-java-1.8.0-r6 b/metadata/md5-cache/dev-java/lz4-java-1.8.0-r6
index 4bd433461a00..091b743e9ffe 100644
--- a/metadata/md5-cache/dev-java/lz4-java-1.8.0-r6
+++ b/metadata/md5-cache/dev-java/lz4-java-1.8.0-r6
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/lz4/lz4-java
 INHERIT=java-pkg-2 java-pkg-simple toolchain-funcs
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=app-arch/lz4:= >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lz4/lz4-java/archive/1.8.0.tar.gz -> lz4-java-1.8.0.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	toolchain-funcs	d3d42b22a610ce81c267b644bcec9b87	multilib	b2a329026f2e404e9e371097dda47f96
-_md5_=7df4257cf0038c36149493f131d460a1
+_md5_=a241cff247ae67c50ee8e9f83ce2ad1c
diff --git a/metadata/md5-cache/dev-java/lzma-22.01 b/metadata/md5-cache/dev-java/lzma-22.01
index 8d68840d3e3b..88edc47f6c7d 100644
--- a/metadata/md5-cache/dev-java/lzma-22.01
+++ b/metadata/md5-cache/dev-java/lzma-22.01
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://7-zip.org/
 INHERIT=java-pkg-2 java-pkg-simple unpacker
 IUSE=doc source
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 ~arm64
 LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://7-zip.org/a/lzma2201.7z -> lzma-22.01.7z
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	multiprocessing	1e32df7deee68372153dca65f4a7c21f	toolchain-funcs	d3d42b22a610ce81c267b644bcec9b87	multilib	b2a329026f2e404e9e371097dda47f96	unpacker	fb4b84181244b3b9990fa0bf40232dd2
-_md5_=3907deb1a6c8c9a4919f7226d70dd07a
+_md5_=2500ab380be4707de027a710616c47bf
diff --git a/metadata/md5-cache/dev-java/lzmajio-0.95-r3 b/metadata/md5-cache/dev-java/lzmajio-0.95-r3
index 3425b8d40b6a..875a9d1d345c 100644
--- a/metadata/md5-cache/dev-java/lzmajio-0.95-r3
+++ b/metadata/md5-cache/dev-java/lzmajio-0.95-r3
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://contrapunctus.net/league/haques/lzmajio/ https://github.com/league/lzmajio
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 ~arm64
 LICENSE=LGPL-2.1
 RDEPEND=dev-java/lzma:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/league/lzmajio-0.95/archive/0.95.tar.gz -> lzmajio-0.95.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=7190ee1e5cc502df9b205f827d243eb7
+_md5_=f81e9fb94f2f23153de975e4e91e4ce5
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.8.8-r1 b/metadata/md5-cache/dev-java/maven-bin-3.8.8-r1
index e190953c6f02..934aa31759d7 100644
--- a/metadata/md5-cache/dev-java/maven-bin-3.8.8-r1
+++ b/metadata/md5-cache/dev-java/maven-bin-3.8.8-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Project Management and Comprehension Tool for Java
 EAPI=8
 HOMEPAGE=https://maven.apache.org/
 INHERIT=java-pkg-2
-KEYWORDS=amd64 x86
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=3.8
 SRC_URI=mirror://apache/maven/maven-3/3.8.8/binaries/apache-maven-3.8.8-bin.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9
-_md5_=610db5f480ac3cfbc6d9b24488004669
+_md5_=208fedf22e5492da5d2c166385af8726
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.9.9 b/metadata/md5-cache/dev-java/maven-bin-3.9.9
index 3a9f021b3d75..95c966506add 100644
--- a/metadata/md5-cache/dev-java/maven-bin-3.9.9
+++ b/metadata/md5-cache/dev-java/maven-bin-3.9.9
@@ -4,10 +4,10 @@ DESCRIPTION=Project Management and Comprehension Tool for Java
 EAPI=8
 HOMEPAGE=https://maven.apache.org/
 INHERIT=java-pkg-2
-KEYWORDS=amd64 x86
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=3.9
 SRC_URI=mirror://apache/maven/maven-3/3.9.9/binaries/apache-maven-3.9.9-bin.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9
-_md5_=683104cbc57d7ab40808b33cb4c20306
+_md5_=36a5996b80e514c6a5f7f135ac944511
diff --git a/metadata/md5-cache/dev-java/mchange-commons-0.2.20 b/metadata/md5-cache/dev-java/mchange-commons-0.2.20
index 022911b007d6..51383f8597b9 100644
--- a/metadata/md5-cache/dev-java/mchange-commons-0.2.20
+++ b/metadata/md5-cache/dev-java/mchange-commons-0.2.20
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/swaldman/mchange-commons-java
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 ppc64 x86
+KEYWORDS=amd64 ppc64
 LICENSE=EPL-1.0 LGPL-2.1
 RDEPEND=dev-java/log4j-api:2 dev-java/log4j-12-api:2 dev-java/log4j-core:2 dev-java/slf4j-api:0 dev-java/typesafe-config:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/swaldman/mchange-commons-java/archive/refs/tags/v0.2.20.tar.gz -> mchange-commons-0.2.20.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=8ebed4da60f3daa69ceb2c883b13c2b6
+_md5_=5616586979ebce455dc6f6d992d6aef3
diff --git a/metadata/md5-cache/dev-java/memoryfilesystem-2.3.0 b/metadata/md5-cache/dev-java/memoryfilesystem-2.3.0
index 839e25989576..b08ebc323bcd 100644
--- a/metadata/md5-cache/dev-java/memoryfilesystem-2.3.0
+++ b/metadata/md5-cache/dev-java/memoryfilesystem-2.3.0
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/marschall/memoryfilesystem
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* dev-java/jakarta-annotations-api:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/marschall/memoryfilesystem/archive/2.3.0.tar.gz -> memoryfilesystem-2.3.0.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=5170c4869851b6d22e336b9e28a17023
+_md5_=3aecece8ab5db52c360c5965b147117c
diff --git a/metadata/md5-cache/dev-java/mersennetwister-0_pre23765-r2 b/metadata/md5-cache/dev-java/mersennetwister-0_pre23765-r2
index d31460eb0c50..a4a41c7f9c6a 100644
--- a/metadata/md5-cache/dev-java/mersennetwister-0_pre23765-r2
+++ b/metadata/md5-cache/dev-java/mersennetwister-0_pre23765-r2
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/emt.html
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 ~arm64
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/mersennetwister-0_pre23765.tar.bz2
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=ad2dc687ec4adec795f7c266e34e3eb8
+_md5_=f0f4d409cef26d2e4f4506c60c7b90bc
diff --git a/metadata/md5-cache/dev-java/metainf-services-1.11 b/metadata/md5-cache/dev-java/metainf-services-1.11
index 626ad88cefac..7fe6b1337ba8 100644
--- a/metadata/md5-cache/dev-java/metainf-services-1.11
+++ b/metadata/md5-cache/dev-java/metainf-services-1.11
@@ -4,10 +4,10 @@ DESCRIPTION=Generates META-INF/services files automatically
 EAPI=8
 HOMEPAGE=https://metainf-services.kohsuke.org/
 INHERIT=java-pkg-2 java-pkg-simple
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/kohsuke/metainf-services/archive/metainf-services-1.11.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=b79f6bd026c648c79c14ea26a8675a03
+_md5_=30a8f8ff8572541724cac08f25955d28
diff --git a/metadata/md5-cache/dev-java/metainf-services-1.9 b/metadata/md5-cache/dev-java/metainf-services-1.9
index 6bcd66a73a33..a07817e3e1f5 100644
--- a/metadata/md5-cache/dev-java/metainf-services-1.9
+++ b/metadata/md5-cache/dev-java/metainf-services-1.9
@@ -4,10 +4,10 @@ DESCRIPTION=Generates META-INF/services files automatically
 EAPI=8
 HOMEPAGE=https://metainf-services.kohsuke.org/
 INHERIT=java-pkg-2 java-pkg-simple
-KEYWORDS=amd64 x86
+KEYWORDS=amd64
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/kohsuke/metainf-services/archive/metainf-services-1.9.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=a863b6624348b4e4434b9b84a7a7c4cf
+_md5_=afe206ed74af12e70624cd8f27b84757
diff --git a/metadata/md5-cache/dev-java/miglayout-5.3 b/metadata/md5-cache/dev-java/miglayout-5.3
index 407cb6397373..732a684523b7 100644
--- a/metadata/md5-cache/dev-java/miglayout-5.3
+++ b/metadata/md5-cache/dev-java/miglayout-5.3
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://miglayout.com/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=https://github.com/mikaelgrev/miglayout/archive/V5.3.tar.gz -> miglayout-5.3.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=e1f79f15f08d8c704b46734c7c47df83
+_md5_=0e6b59fcae82dc0b066770ed79aa60a2
diff --git a/metadata/md5-cache/dev-java/mill-bin-0.11.12 b/metadata/md5-cache/dev-java/mill-bin-0.11.12
index e21e3ab7cefd..5c122e0023d4 100644
--- a/metadata/md5-cache/dev-java/mill-bin-0.11.12
+++ b/metadata/md5-cache/dev-java/mill-bin-0.11.12
@@ -2,9 +2,9 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=A Java/Scala build tool
 EAPI=8
 HOMEPAGE=https://mill-build.org/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:*
 SLOT=0
 SRC_URI=https://github.com/com-lihaoyi/mill/releases/download/0.11.12/0.11.12-assembly -> mill-bin-0.11.12
-_md5_=6881d97907197fa18ed60870dd01468b
+_md5_=e159b7571ede3f2378e68143e94749e2
diff --git a/metadata/md5-cache/dev-java/mill-bin-0.11.6 b/metadata/md5-cache/dev-java/mill-bin-0.11.6
index 05e2008d4bb1..9d8b996dc062 100644
--- a/metadata/md5-cache/dev-java/mill-bin-0.11.6
+++ b/metadata/md5-cache/dev-java/mill-bin-0.11.6
@@ -2,9 +2,9 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=A Java/Scala build tool
 EAPI=8
 HOMEPAGE=https://com-lihaoyi.github.io/mill/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:*
 SLOT=0
 SRC_URI=https://github.com/com-lihaoyi/mill/releases/download/0.11.6/0.11.6-assembly -> mill-bin-0.11.6
-_md5_=0d3916a385acc776e4589c304fc50d5a
+_md5_=64d8f38a06867438626b7ac834639da2
diff --git a/metadata/md5-cache/dev-java/mill-bin-0.11.7 b/metadata/md5-cache/dev-java/mill-bin-0.11.7
index 1df5e83e8212..770bca43b521 100644
--- a/metadata/md5-cache/dev-java/mill-bin-0.11.7
+++ b/metadata/md5-cache/dev-java/mill-bin-0.11.7
@@ -2,9 +2,9 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=A Java/Scala build tool
 EAPI=8
 HOMEPAGE=https://com-lihaoyi.github.io/mill/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:*
 SLOT=0
 SRC_URI=https://github.com/com-lihaoyi/mill/releases/download/0.11.7/0.11.7-assembly -> mill-bin-0.11.7
-_md5_=0d3916a385acc776e4589c304fc50d5a
+_md5_=64d8f38a06867438626b7ac834639da2
diff --git a/metadata/md5-cache/dev-java/minidns-core-1.0.4 b/metadata/md5-cache/dev-java/minidns-core-1.0.4
index c1e3a3f8687b..b096b23ed71b 100644
--- a/metadata/md5-cache/dev-java/minidns-core-1.0.4
+++ b/metadata/md5-cache/dev-java/minidns-core-1.0.4
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/minidns/minidns
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=https://github.com/MiniDNS/minidns/archive/1.0.4.tar.gz -> minidns-core-1.0.4.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=2a9b4083b42e92f2541e72d2880dcf72
+_md5_=26a4c92f68f204850e838f4aaa99e513
diff --git a/metadata/md5-cache/dev-java/mockito-1.9.5-r4 b/metadata/md5-cache/dev-java/mockito-1.9.5-r4
index f66cce0ed1c6..d2ab0f57915d 100644
--- a/metadata/md5-cache/dev-java/mockito-1.9.5-r4
+++ b/metadata/md5-cache/dev-java/mockito-1.9.5-r4
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/mockito/mockito
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/ant-1.10.14-r3:0 dev-java/hamcrest-core:0 dev-java/junit:4 dev-java/objenesis:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/org/mockito/mockito-core/1.9.5/mockito-core-1.9.5-sources.jar
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=81393eb9c02412e9b8c3d074a09bb9b5
+_md5_=a2a5c04eca2800cdc93b0ecc934bb59d
diff --git a/metadata/md5-cache/dev-java/mockito-2.28.2 b/metadata/md5-cache/dev-java/mockito-2.28.2
index d4a99f16d328..0b9c3c771d87 100644
--- a/metadata/md5-cache/dev-java/mockito-2.28.2
+++ b/metadata/md5-cache/dev-java/mockito-2.28.2
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/mockito/mockito
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 ~arm64 ppc64 x86
+KEYWORDS=amd64 ~arm64 ppc64
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* dev-java/asm:9 dev-java/byte-buddy:0 dev-java/objenesis:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://github.com/mockito/mockito/archive/v2.28.2.tar.gz -> mockito-2.28.2.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=0855207a22dea7c3245bbdff2f6c3ed6
+_md5_=c1f0726f36f7f696b3011eb7ccff83b1
diff --git a/metadata/md5-cache/dev-java/mockito-4.11.0 b/metadata/md5-cache/dev-java/mockito-4.11.0
index ad7066c8ceb9..6429526d1319 100644
--- a/metadata/md5-cache/dev-java/mockito-4.11.0
+++ b/metadata/md5-cache/dev-java/mockito-4.11.0
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/mockito/mockito
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* dev-java/asm:9 dev-java/byte-buddy:0 dev-java/objenesis:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4
 SRC_URI=https://github.com/mockito/mockito/archive/v4.11.0.tar.gz -> mockito-4.11.0.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=c09d6ea03387c753f11318f582e2c832
+_md5_=6c2614cf9cc6a1571037bae1bc55e451
diff --git a/metadata/md5-cache/dev-java/msv-2022.7 b/metadata/md5-cache/dev-java/msv-2022.7
index 0d86cd497b15..7cf7b19e8f8c 100644
--- a/metadata/md5-cache/dev-java/msv-2022.7
+++ b/metadata/md5-cache/dev-java/msv-2022.7
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://xmlark.github.io/msv/core/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=BSD-1
 RDEPEND=>=virtual/jre-1.8:* dev-java/iso-relax:0 dev-java/relaxng-datatype:0 dev-java/xerces:2 dev-java/xml-commons-external:1.4 dev-java/xml-commons-resolver:0 dev-java/xsdlib:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xmlark/msv/archive/msv-2022.7.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=6bb3e63a3e9e2fd95eb6d3d9dca6cd95
+_md5_=ca71821777788f2d12d5ea19914b0646
diff --git a/metadata/md5-cache/dev-java/mvel-2.5.0-r1 b/metadata/md5-cache/dev-java/mvel-2.5.0-r1
index 0484382a44ba..f83eb5a6042d 100644
--- a/metadata/md5-cache/dev-java/mvel-2.5.0-r1
+++ b/metadata/md5-cache/dev-java/mvel-2.5.0-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/mvel/mvel
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mvel/mvel/archive/mvel2-2.5.0.Final.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=453f414e78184cff878d859184ed0d98
+_md5_=bbda95c4e847af4e891c07d58d63842f
diff --git a/metadata/md5-cache/dev-java/mvel-2.5.2 b/metadata/md5-cache/dev-java/mvel-2.5.2
index fb3e0da12d66..5a268dc683df 100644
--- a/metadata/md5-cache/dev-java/mvel-2.5.2
+++ b/metadata/md5-cache/dev-java/mvel-2.5.2
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/mvel/mvel
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mvel/mvel/archive/mvel2-2.5.2.Final.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=efa0f48f417a12e3f2a97103979507e0
+_md5_=a9087b8602133ceba986aa9f1c605926
diff --git a/metadata/md5-cache/dev-java/objenesis-3.3 b/metadata/md5-cache/dev-java/objenesis-3.3
index 29d61dee53c8..7e4d92f85559 100644
--- a/metadata/md5-cache/dev-java/objenesis-3.3
+++ b/metadata/md5-cache/dev-java/objenesis-3.3
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=http://objenesis.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/easymock/objenesis/archive/3.3.tar.gz -> objenesis-3.3.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=b1dafcac5dc04e9cbba50826819a5c27
+_md5_=79b5a92804859295d750fcaaf8a1d983
diff --git a/metadata/md5-cache/dev-java/open-test-reporting-events-0.1.0_pre1 b/metadata/md5-cache/dev-java/open-test-reporting-events-0.1.0_pre1
index d86b36fc7ab8..683aeba314f4 100644
--- a/metadata/md5-cache/dev-java/open-test-reporting-events-0.1.0_pre1
+++ b/metadata/md5-cache/dev-java/open-test-reporting-events-0.1.0_pre1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/ota4j-team/open-test-reporting
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* ~dev-java/open-test-reporting-schema-0.1.0_pre1:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/ota4j-team/open-test-reporting/archive/r0.1.0-M1.tar.gz -> open-test-reporting-0.1.0-M1.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=58ae44382aa13fc1c8a6f2ec73e008ec
+_md5_=68959c5be8ca4fccd5c2a755f837f22f
diff --git a/metadata/md5-cache/dev-java/open-test-reporting-schema-0.1.0_pre1 b/metadata/md5-cache/dev-java/open-test-reporting-schema-0.1.0_pre1
index e2205247eb41..b36e11672509 100644
--- a/metadata/md5-cache/dev-java/open-test-reporting-schema-0.1.0_pre1
+++ b/metadata/md5-cache/dev-java/open-test-reporting-schema-0.1.0_pre1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/ota4j-team/open-test-reporting
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/ota4j-team/open-test-reporting/archive/r0.1.0-M1.tar.gz -> open-test-reporting-0.1.0-M1.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=64c84ab9293dc49bca10240572d59395
+_md5_=58ffcc7e560d6460e854f5ca30506fc5
diff --git a/metadata/md5-cache/dev-java/opentest4j-1.2.0-r1 b/metadata/md5-cache/dev-java/opentest4j-1.2.0-r1
index bdf18c6b9e88..1718b38f8710 100644
--- a/metadata/md5-cache/dev-java/opentest4j-1.2.0-r1
+++ b/metadata/md5-cache/dev-java/opentest4j-1.2.0-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/ota4j-team/opentest4j
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ota4j-team/opentest4j/archive/r1.2.0.tar.gz -> opentest4j-1.2.0.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=96a9657a2e6c1f7deb0eefc67126c01c
+_md5_=6433d8d6c9f91678c62905f36356dcd7
diff --git a/metadata/md5-cache/dev-java/opentest4j-1.3.0-r1 b/metadata/md5-cache/dev-java/opentest4j-1.3.0-r1
index 0f65865b4d52..4028edab47a5 100644
--- a/metadata/md5-cache/dev-java/opentest4j-1.3.0-r1
+++ b/metadata/md5-cache/dev-java/opentest4j-1.3.0-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/ota4j-team/opentest4j
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 ~arm64 ppc64 x86
+KEYWORDS=amd64 ~arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ota4j-team/opentest4j/archive/r1.3.0.tar.gz -> opentest4j-1.3.0.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=742aed79a2a9faa3f278fddcfc6f0623
+_md5_=e6938f9ce8a17b715a7ece087ef3f33c
diff --git a/metadata/md5-cache/dev-java/osgi-annotation-8.1.0 b/metadata/md5-cache/dev-java/osgi-annotation-8.1.0
index 21268bbe234b..b637ab502383 100644
--- a/metadata/md5-cache/dev-java/osgi-annotation-8.1.0
+++ b/metadata/md5-cache/dev-java/osgi-annotation-8.1.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.osgi.org
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://docs.osgi.org/download/r8/osgi.annotation-8.1.0.jar -> osgi-annotation-8.1.0.jar
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=30a1ddc6eb07ce7b0b51c27a4959b11f
+_md5_=9f43cf08ddbfcf471229354b5e958a74
diff --git a/metadata/md5-cache/dev-java/osgi-cmpn-8.0.0-r1 b/metadata/md5-cache/dev-java/osgi-cmpn-8.0.0-r1
index 4291624e7123..6e4a0bcb3b37 100644
--- a/metadata/md5-cache/dev-java/osgi-cmpn-8.0.0-r1
+++ b/metadata/md5-cache/dev-java/osgi-cmpn-8.0.0-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://docs.osgi.org
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0 OSGi-Specification-2.0
 RDEPEND=dev-java/cdi-api:0 dev-java/javax-persistence-api:0 dev-java/jakarta-servlet-api:4 dev-java/javax-inject:0 dev-java/jaxrs-api:0 dev-java/osgi-annotation:0 dev-java/osgi-core:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=8
 SRC_URI=https://docs.osgi.org/download/r8/osgi.cmpn-8.0.0.jar -> osgi-cmpn-8.0.0.jar
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=27b13c3e2c1155fb3bf72a3cb4affe0c
+_md5_=3386b7a42dc6f2efa879988144966e13
diff --git a/metadata/md5-cache/dev-java/osgi-core-8.0.0 b/metadata/md5-cache/dev-java/osgi-core-8.0.0
index 94cf8f81de09..0dd51e397e82 100644
--- a/metadata/md5-cache/dev-java/osgi-core-8.0.0
+++ b/metadata/md5-cache/dev-java/osgi-core-8.0.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.osgi.org
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://docs.osgi.org/download/r8/osgi.core-8.0.0.jar -> osgi-core-8.0.0.jar
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=3cf1c1f3fa45cd34be940c28804c94b3
+_md5_=51d7f6e01dee3ceea55b600979d448b9
diff --git a/metadata/md5-cache/dev-java/osgi-service-log-1.3.0 b/metadata/md5-cache/dev-java/osgi-service-log-1.3.0
index 8f43f04bd5e7..60fa928547c7 100644
--- a/metadata/md5-cache/dev-java/osgi-service-log-1.3.0
+++ b/metadata/md5-cache/dev-java/osgi-service-log-1.3.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.osgi.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=dev-java/osgi-core:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/org/osgi/org.osgi.service.log/1.3.0/org.osgi.service.log-1.3.0-sources.jar
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=890939b85995e368df20290c73bf727d
+_md5_=801f88c9da165a1d4f59fff6e3ad60bc
diff --git a/metadata/md5-cache/dev-java/osgi-service-subsystem-1.1.0 b/metadata/md5-cache/dev-java/osgi-service-subsystem-1.1.0
index 205da11b482f..b69f98df47b3 100644
--- a/metadata/md5-cache/dev-java/osgi-service-subsystem-1.1.0
+++ b/metadata/md5-cache/dev-java/osgi-service-subsystem-1.1.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.osgi.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=dev-java/osgi-annotation:0 dev-java/osgi-core:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/org/osgi/org.osgi.service.subsystem/1.1.0/org.osgi.service.subsystem-1.1.0-sources.jar -> osgi-service-subsystem-1.1.0-sources.jar
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=b34f01d0cd1a0b089321bced8aadb856
+_md5_=547388135e624bd0f3a6c5fe610d9ae7
diff --git a/metadata/md5-cache/dev-java/parboiled-1.4.1 b/metadata/md5-cache/dev-java/parboiled-1.4.1
index e036461085a5..d24c4d37974c 100644
--- a/metadata/md5-cache/dev-java/parboiled-1.4.1
+++ b/metadata/md5-cache/dev-java/parboiled-1.4.1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/sirthias/parboiled
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=dev-java/asm:9 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/sirthias/parboiled/archive/1.4.1.tar.gz -> parboiled-1.4.1.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=a29ef618d973bfec8de3cb1d49f4b88d
+_md5_=632d894103fcbb314814946798742ecb
diff --git a/metadata/md5-cache/dev-java/pdfbox-2.0.27 b/metadata/md5-cache/dev-java/pdfbox-2.0.27
index fe285028ee48..d389b075bbf8 100644
--- a/metadata/md5-cache/dev-java/pdfbox-2.0.27
+++ b/metadata/md5-cache/dev-java/pdfbox-2.0.27
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://pdfbox.apache.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=+tools doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 PROPERTIES=test_network
 RDEPEND=dev-java/bcmail:0 dev-java/bcprov:0 dev-java/commons-logging:0 ~dev-java/fontbox-2.0.27:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
@@ -14,4 +14,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/pdfbox/2.0.27/pdfbox-2.0.27-src.zip test? ( https://issues.apache.org/jira/secure/attachment/12481683/1.pdf -> PDFBOX-1031-1.pdf https://issues.apache.org/jira/secure/attachment/12481684/2.pdf -> PDFBOX-1031-2.pdf https://issues.apache.org/jira/secure/attachment/12486525/1_testfile1.pdf -> PDFBOX-1065-1.pdf https://issues.apache.org/jira/secure/attachment/12486526/2_testfile1.pdf -> PDFBOX-1065-2.pdf https://issues.apache.org/jira/secure/attachment/12490774/a.pdf -> PDFBOX-1100-1.pdf https://issues.apache.org/jira/secure/attachment/12490775/b.pdf -> PDFBOX-1100-2.pdf https://issues.apache.org/jira/secure/attachment/12848122/SF1199AEG%20%28Complete%29.pdf -> PDFBOX-3656.pdf https://issues.apache.org/jira/secure/attachment/12852207/test.pdf -> PDFBOX-3682.pdf https://issues.apache.org/jira/secure/attachment/12888957/079977.pdf -> PDFBOX-3940-079977.pdf https://issues.apache.org/jira/secure/attachment/12867113/202097.pdf -> PDFBOX-3785-202097.pdf https://issues.apache.org/jira/secure/attachment/12890031/670064.pdf -> PDFBOX-3947-670064.pdf https://issues.apache.org/jira/secure/attachment/12890034/EUWO6SQS5TM4VGOMRD3FLXZHU35V2CP2.pdf -> PDFBOX-3948-EUWO6SQS5TM4VGOMRD3FLXZHU35V2CP2.pdf https://issues.apache.org/jira/secure/attachment/12890037/MKFYUGZWS3OPXLLVU2Z4LWCTVA5WNOGF.pdf -> PDFBOX-3949-MKFYUGZWS3OPXLLVU2Z4LWCTVA5WNOGF.pdf https://issues.apache.org/jira/secure/attachment/12890042/23EGDHXSBBYQLKYOKGZUOVYVNE675PRD.pdf -> PDFBOX-3950-23EGDHXSBBYQLKYOKGZUOVYVNE675PRD.pdf https://issues.apache.org/jira/secure/attachment/12890047/FIHUZWDDL2VGPOE34N6YHWSIGSH5LVGZ.pdf -> PDFBOX-3951-FIHUZWDDL2VGPOE34N6YHWSIGSH5LVGZ.pdf https://issues.apache.org/jira/secure/attachment/12892097/c687766d68ac766be3f02aaec5e0d713_2.pdf -> PDFBOX-3964-c687766d68ac766be3f02aaec5e0d713_2.pdf https://issues.apache.org/jira/secure/attachment/12893582/63NGFQRI44HQNPIPEJH5W2TBM6DJZWMI.pdf -> PDFBOX-3977-63NGFQRI44HQNPIPEJH5W2TBM6DJZWMI.pdf https://issues.apache.org/jira/secure/attachment/12896905/GeneralForbearance.pdf -> PDFBOX-3999-GeneralForbearance.pdf https://issues.apache.org/jira/secure/attachment/12919726/sample.pdf -> PDFBOX-4197.pdf https://issues.apache.org/jira/secure/attachment/12938094/Quelldatei.pdf -> PDFBOX-4308.pdf https://issues.apache.org/jira/secure/attachment/12952086/form.pdf -> PDFBOX-4408.pdf https://issues.apache.org/jira/secure/attachment/12953423/000314.pdf -> PDFBOX-4418-000314.pdf https://issues.apache.org/jira/secure/attachment/12953421/000671.pdf -> PDFBOX-4418-000671.pdf https://issues.apache.org/jira/secure/attachment/12953866/000746.pdf -> PDFBOX-4423-000746.pdf https://issues.apache.org/jira/secure/attachment/12966453/cryptfilter.pdf -> PDFBOX-4517-cryptfilter.pdf https://issues.apache.org/jira/secure/attachment/12991833/PDFBOX-4750-test.pdf -> PDFBOX-4750.pdf https://issues.apache.org/jira/secure/attachment/12914331/WXMDXCYRWFDCMOSFQJ5OAJIAFXYRZ5OA.pdf -> PDFBOX-4153-WXMDXCYRWFDCMOSFQJ5OAJIAFXYRZ5OA.pdf https://issues.apache.org/jira/secure/attachment/12962991/NeS1078.pdf -> PDFBOX-4490.pdf https://issues.apache.org/jira/secure/attachment/12784025/PDFBOX-3208-L33MUTT2SVCWGCS6UIYL5TH3PNPXHIS6.pdf https://issues.apache.org/jira/secure/attachment/12867102/PDFBOX-3783-72GLBIGUC6LB46ELZFBARRJTLN4RBSQM.pdf https://issues.apache.org/jira/secure/attachment/12929821/16bit.png -> PDFBOX-4184-16bit.png https://issues.apache.org/jira/secure/attachment/12943502/ArrayIndexOutOfBoundsException%20COSParser -> PDFBOX-4338.pdf https://issues.apache.org/jira/secure/attachment/12943503/NullPointerException%20COSParser -> PDFBOX-4339.pdf https://issues.apache.org/jira/secure/attachment/12867433/genko_oc_shiryo1.pdf https://moji.or.jp/wp-content/ipafont/IPAfont/ipag00303.zip https://moji.or.jp/wp-content/ipafont/IPAfont/ipagp00303.zip https://issues.apache.org/jira/secure/attachment/12911053/n019003l.pfb https://issues.apache.org/jira/secure/attachment/12949710/032163.jpg -> PDFBOX-4184-032163.jpg https://issues.apache.org/jira/secure/attachment/13025718/lotus.jpg -> PDFBOX-5196-lotus.jpg https://issues.apache.org/jira/secure/attachment/13002695/13._Korona_szallo_vegzes_13.09.26.eredeti.pdf -> PDFBOX-4831.pdf )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=24274850be687a530ffdbff6cb6971a6
+_md5_=bf37246b146a86a9c48966388643c7dc
diff --git a/metadata/md5-cache/dev-java/picocli-4.6.3-r1 b/metadata/md5-cache/dev-java/picocli-4.6.3-r1
index a5b3937d2292..3bae83d8f856 100644
--- a/metadata/md5-cache/dev-java/picocli-4.6.3-r1
+++ b/metadata/md5-cache/dev-java/picocli-4.6.3-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://picocli.info
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/remkop/picocli/archive/v4.6.3.tar.gz -> picocli-4.6.3-sources.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=a33f099a327f7f56922721f375ca5840
+_md5_=fe53b432e7ba24dff5ecba6a7e03ac6d
diff --git a/metadata/md5-cache/dev-java/plexus-classworlds-2.7.0-r1 b/metadata/md5-cache/dev-java/plexus-classworlds-2.7.0-r1
index ce746d19b56c..bc08eda6a000 100644
--- a/metadata/md5-cache/dev-java/plexus-classworlds-2.7.0-r1
+++ b/metadata/md5-cache/dev-java/plexus-classworlds-2.7.0-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://codehaus-plexus.github.io/plexus-classworlds/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/codehaus-plexus/plexus-classworlds/archive/plexus-classworlds-2.7.0.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=0cc863dd4ec933073087559a01258f9d
+_md5_=65856f8167b03c39c0e18b4896df5f6d
diff --git a/metadata/md5-cache/dev-java/poi-5.2.5 b/metadata/md5-cache/dev-java/poi-5.2.5
index ce3517d4e71b..8352ba5259fa 100644
--- a/metadata/md5-cache/dev-java/poi-5.2.5
+++ b/metadata/md5-cache/dev-java/poi-5.2.5
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://poi.apache.org/
 INHERIT=java-pkg-2 java-pkg-simple verify-sig
 IUSE=doc source verify-sig
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://archive.apache.org/dist/poi/release/src/poi-src-5.2.5-20231118.tgz verify-sig? ( https://archive.apache.org/dist/poi/release/src/poi-src-5.2.5-20231118.tgz.asc )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	verify-sig	745dccb7d4656514f1e966cce314d7db
-_md5_=53215e22155bea8b797f8cc74d1e1a57
+_md5_=ee084d7925038333c43f0e08b524a87b
diff --git a/metadata/md5-cache/dev-java/protobuf-java-4.27.2 b/metadata/md5-cache/dev-java/protobuf-java-4.27.2
index 8ef6bdb7597e..c3325c7ff824 100644
--- a/metadata/md5-cache/dev-java/protobuf-java-4.27.2
+++ b/metadata/md5-cache/dev-java/protobuf-java-4.27.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://protobuf.dev
 INHERIT=java-pkg-2 java-pkg-simple cmake
 IUSE=system-protoc doc source test
-KEYWORDS=amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=amd64 ~arm64 ~ppc64 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v27.2.tar.gz -> protobuf-27.2.tar.gz test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	toolchain-funcs	d3d42b22a610ce81c267b644bcec9b87	multilib	b2a329026f2e404e9e371097dda47f96	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multiprocessing	1e32df7deee68372153dca65f4a7c21f	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	42869b3c8d86a70ef3cf75165a395e09	cmake	10a50dfaf728b802fcfd37f8d0da9056
-_md5_=50f552cdda2ea04fb161330058d88d4f
+_md5_=4965ab38f5e2aa47e29f2e6877f9fdf5
diff --git a/metadata/md5-cache/dev-java/protobuf-java-4.28.1 b/metadata/md5-cache/dev-java/protobuf-java-4.28.1
index 13ca301cbcb5..06e0b062ac22 100644
--- a/metadata/md5-cache/dev-java/protobuf-java-4.28.1
+++ b/metadata/md5-cache/dev-java/protobuf-java-4.28.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://protobuf.dev
 INHERIT=java-pkg-2 java-pkg-simple cmake
 IUSE=system-protoc doc source test
-KEYWORDS=amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=amd64 ~arm64 ~ppc64 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/protocolbuffers/protobuf/releases/download/v28.1/protobuf-28.1.tar.gz test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	toolchain-funcs	d3d42b22a610ce81c267b644bcec9b87	multilib	b2a329026f2e404e9e371097dda47f96	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multiprocessing	1e32df7deee68372153dca65f4a7c21f	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	42869b3c8d86a70ef3cf75165a395e09	cmake	10a50dfaf728b802fcfd37f8d0da9056
-_md5_=be08c649ae725316cdca69124d95e075
+_md5_=ee4031f433f528d3e836022ff18fdffd
diff --git a/metadata/md5-cache/dev-java/qdox-1.12.1-r6 b/metadata/md5-cache/dev-java/qdox-1.12.1-r6
index 325b8e4ba490..88875eb1cd0a 100644
--- a/metadata/md5-cache/dev-java/qdox-1.12.1-r6
+++ b/metadata/md5-cache/dev-java/qdox-1.12.1-r6
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/codehaus/qdox
 INHERIT=java-pkg-2
 IUSE=ant-task doc source test
-KEYWORDS=amd64 arm64 ppc64 x86 ~ppc-macos ~x64-macos
+KEYWORDS=amd64 arm64 ppc64 ~ppc-macos ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* ant-task? ( >=dev-java/ant-1.10.14-r3:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 REQUIRED_USE=test? ( ant-task )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=1.12
 SRC_URI=https://github.com/codehaus/qdox/archive/qdox-1.12.1.tar.gz x86? ( https://repo1.maven.org/maven2/de/jflex/jflex/1.6.1/jflex-1.6.1.jar )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9
-_md5_=bdf8e689dcdf9e898b10def75dec2eab
+_md5_=0bac8ac8f3acb4834fcd60b20e73ae92
diff --git a/metadata/md5-cache/dev-java/randomized-runner-2.8.0 b/metadata/md5-cache/dev-java/randomized-runner-2.8.0
index cbdf4e8fd8ed..26bef3a95781 100644
--- a/metadata/md5-cache/dev-java/randomized-runner-2.8.0
+++ b/metadata/md5-cache/dev-java/randomized-runner-2.8.0
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://labs.carrotsearch.com/randomizedtesting.html
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/randomizedtesting/randomizedtesting/archive/release/2.8.0.tar.gz -> randomized-runner-2.8.0.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=e2b8f3e803b425c232babdc4f19c54fc
+_md5_=bf112d048f42f73e39f352402a589381
diff --git a/metadata/md5-cache/dev-java/reflections-0.9.12-r6 b/metadata/md5-cache/dev-java/reflections-0.9.12-r6
index 247b310d5abb..79b62b873f95 100644
--- a/metadata/md5-cache/dev-java/reflections-0.9.12-r6
+++ b/metadata/md5-cache/dev-java/reflections-0.9.12-r6
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/ronmamo/reflections
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=WTFPL-2 BSD-2
 RDEPEND=>=virtual/jre-1.8:* dev-java/dom4j:1 dev-java/gson:0 dev-java/javassist:3 dev-java/slf4j-api:0 dev-java/slf4j-simple:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ronmamo/reflections/archive/0.9.12.tar.gz -> reflections-0.9.12.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=c4f3af477415b6d295e033e11c6d8d1d
+_md5_=aa0c7bca3854df77459735e48e9223a0
diff --git a/metadata/md5-cache/dev-java/relaxng-datatype-20020414 b/metadata/md5-cache/dev-java/relaxng-datatype-20020414
index a6285d849a35..1318202e765c 100644
--- a/metadata/md5-cache/dev-java/relaxng-datatype-20020414
+++ b/metadata/md5-cache/dev-java/relaxng-datatype-20020414
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://relaxng.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/relaxngDatatype/relaxngDatatype/20020414/relaxngDatatype-20020414-sources.jar
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=109776b3da9bb1e84c10940ebe83e2df
+_md5_=ef9ba958666539cfaa230c1dece30d34
diff --git a/metadata/md5-cache/dev-java/reload4j-1.2.22 b/metadata/md5-cache/dev-java/reload4j-1.2.22
index b8bb836e5c1e..bd9838484ae1 100644
--- a/metadata/md5-cache/dev-java/reload4j-1.2.22
+++ b/metadata/md5-cache/dev-java/reload4j-1.2.22
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://reload4j.qos.ch
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/javax-mail:0 dev-java/jboss-jms-api:1.1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qos-ch/reload4j/archive/v_1.2.22.tar.gz -> reload4j-1.2.22.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=3c43cf0ae5936f553224753e980bb96a
+_md5_=ea223b2e709cd3fd5ba11adcbb84bc30
diff --git a/metadata/md5-cache/dev-java/rhino-1.7.14-r1 b/metadata/md5-cache/dev-java/rhino-1.7.14-r1
index 15b659bb7d68..6c7e64270616 100644
--- a/metadata/md5-cache/dev-java/rhino-1.7.14-r1
+++ b/metadata/md5-cache/dev-java/rhino-1.7.14-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/mozilla/rhino
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=MPL-1.1 GPL-2
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test !test? ( test )
 SLOT=1.6
 SRC_URI=https://github.com/mozilla/rhino/archive/Rhino1_7_14_Release.tar.gz -> rhino-1.7.14.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=39f73c097617ec85b8c2ead44cd96bad
+_md5_=c2394b26ea8cb77907b2b8321e578359
diff --git a/metadata/md5-cache/dev-java/rome-0.9-r4 b/metadata/md5-cache/dev-java/rome-0.9-r4
index bd24ce11d266..fea2436a0561 100644
--- a/metadata/md5-cache/dev-java/rome-0.9-r4
+++ b/metadata/md5-cache/dev-java/rome-0.9-r4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://rometools.github.io/rome/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 x86
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 RDEPEND=dev-java/jdom:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gentoo/rome-0.9.zip
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=213f0e66eb276ced3a6c501f727e5592
+_md5_=e0b737547b43b024c9183290e15efb1f
diff --git a/metadata/md5-cache/dev-java/rxtx-2.2_pre2-r2 b/metadata/md5-cache/dev-java/rxtx-2.2_pre2-r2
index b9474e07dd90..b88b03483aa8 100644
--- a/metadata/md5-cache/dev-java/rxtx-2.2_pre2-r2
+++ b/metadata/md5-cache/dev-java/rxtx-2.2_pre2-r2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=http://rxtx.qbang.org/
 INHERIT=toolchain-funcs autotools java-pkg-2
 IUSE=lfd doc source
-KEYWORDS=amd64 ~ppc64 x86
+KEYWORDS=amd64 ~ppc64
 LICENSE=LGPL-2.1+
 RDEPEND=>=virtual/jre-1.8:* lfd? ( sys-apps/xinetd ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=ftp://ftp.qbang.org/pub/rxtx/rxtx-2.2pre2.zip
 _eclasses_=toolchain-funcs	d3d42b22a610ce81c267b644bcec9b87	multilib	b2a329026f2e404e9e371097dda47f96	gnuconfig	ddeb9f8caff1b5f71a09c75b7534df79	libtool	6b28392a775f807c8be5fc7ec9a605b9	autotools	7d91cc798a8afd8f4e0c6e9587296ebe	java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9
-_md5_=2b7f657ed5c3e15429e10bf7521dcfef
+_md5_=1bda5e8a56c8308d68c0ce0b926e4eef
diff --git a/metadata/md5-cache/dev-java/saslprep-1.1-r1 b/metadata/md5-cache/dev-java/saslprep-1.1-r1
index 28663478e541..b7883ee846ca 100644
--- a/metadata/md5-cache/dev-java/saslprep-1.1-r1
+++ b/metadata/md5-cache/dev-java/saslprep-1.1-r1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://gitlab.com/ongresinc/stringprep
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 ppc64 x86
+KEYWORDS=amd64 ppc64
 LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.8:* dev-java/stringprep:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/com/ongres/stringprep/saslprep/1.1/saslprep-1.1-sources.jar
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=8479af41ff6c2a238ee56ac3abafdaa4
+_md5_=ce1db77f61fd9ba5199ed568f35a70b2
diff --git a/metadata/md5-cache/dev-java/sax-2.2.1-r5 b/metadata/md5-cache/dev-java/sax-2.2.1-r5
index 042b77650dff..6eb7a680f865 100644
--- a/metadata/md5-cache/dev-java/sax-2.2.1-r5
+++ b/metadata/md5-cache/dev-java/sax-2.2.1-r5
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=http://sax.sourceforge.net/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/sax/sax2r3.zip -> sax-2.2.1.zip
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=9ea870d78ad0ecfd98e3fe721dd31778
+_md5_=14d4d55186339ad828d420758afd781f
diff --git a/metadata/md5-cache/dev-java/saxon-9.2.0.6-r5 b/metadata/md5-cache/dev-java/saxon-9.2.0.6-r5
index 784723980be7..ecc976bcb08b 100644
--- a/metadata/md5-cache/dev-java/saxon-9.2.0.6-r5
+++ b/metadata/md5-cache/dev-java/saxon-9.2.0.6-r5
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.saxonica.com/index.html https://saxon.sourceforge.net/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=ant-task doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=MPL-1.0
 RDEPEND=dev-java/dom4j:1 dev-java/jdom:0 dev-java/xom:0 >=virtual/jre-1.8:* ant-task? ( >=dev-java/ant-1.10.14-r3:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=9
 SRC_URI=https://downloads.sourceforge.net/saxon/Saxon-HE/9.2/saxonhe9-2-0-6source.zip
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=e1d00546ccfbc651afcabaa36194f1d4
+_md5_=d7f9a8850bd469386b76fc7c9ff6c16c
diff --git a/metadata/md5-cache/dev-java/sbt-0.13.18-r1 b/metadata/md5-cache/dev-java/sbt-0.13.18-r1
index 6af12b849d38..13ee483d7203 100644
--- a/metadata/md5-cache/dev-java/sbt-0.13.18-r1
+++ b/metadata/md5-cache/dev-java/sbt-0.13.18-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.scala-sbt.org/
 INHERIT=java-pkg-2
 IUSE=binary
-KEYWORDS=amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 RESTRICT=test
 SLOT=0
 SRC_URI=!binary? ( https://github.com/sbt/sbt/archive/v0.13.18.tar.gz -> sbt-0.13.18.tar.gz https://dev.gentoo.org/~gienah/snapshots/sbt-0.13.18-ivy2-deps.tar.xz https://dev.gentoo.org/~gienah/snapshots/sbt-0.13.18-sbt-deps.tar.xz https://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/0.13.18/sbt-launch.jar -> sbt-launch-0.13.18.jar ) binary? ( https://dev.gentoo.org/~gienah/distfiles/sbt-0.13.18-gentoo-binary.tar.xz )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9
-_md5_=a286ed1f9d2e96d8c695f0fb33a66249
+_md5_=e82e61a080186ec479df867da1ac3e20
diff --git a/metadata/md5-cache/dev-java/scram-2.1 b/metadata/md5-cache/dev-java/scram-2.1
index 232646c1fb38..487cbd95d3b3 100644
--- a/metadata/md5-cache/dev-java/scram-2.1
+++ b/metadata/md5-cache/dev-java/scram-2.1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://gitlab.com/ongresinc/scram
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 ppc64 x86
+KEYWORDS=amd64 ppc64
 LICENSE=BSD
 RDEPEND=dev-java/saslprep:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.com/ongresinc/scram/-/archive/2.1/scram-2.1.tar.bz2
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=d515c8505c886eddc801c5214d141d47
+_md5_=28e6ad24c07ad241c71799b4316ed03f
diff --git a/metadata/md5-cache/dev-java/shrinkwrap-api-1.2.6 b/metadata/md5-cache/dev-java/shrinkwrap-api-1.2.6
index 6130a4e9cd25..f368bea9d6ad 100644
--- a/metadata/md5-cache/dev-java/shrinkwrap-api-1.2.6
+++ b/metadata/md5-cache/dev-java/shrinkwrap-api-1.2.6
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://arquillian.org/modules/shrinkwrap-shrinkwrap/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/shrinkwrap/shrinkwrap/archive/1.2.6.tar.gz -> shrinkwrap-1.2.6.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=e95faa9c2ecffd51339aea6f953031e6
+_md5_=1bb1f1d3b4dcedc2e6ec13b444b24240
diff --git a/metadata/md5-cache/dev-java/shrinkwrap-impl-base-1.2.6 b/metadata/md5-cache/dev-java/shrinkwrap-impl-base-1.2.6
index cfa24669aa7e..389d8fba13f6 100644
--- a/metadata/md5-cache/dev-java/shrinkwrap-impl-base-1.2.6
+++ b/metadata/md5-cache/dev-java/shrinkwrap-impl-base-1.2.6
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://arquillian.org/modules/shrinkwrap-shrinkwrap/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=dev-java/jakarta-activation:1 ~dev-java/shrinkwrap-api-1.2.6:0 ~dev-java/shrinkwrap-spi-1.2.6:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/shrinkwrap/shrinkwrap/archive/1.2.6.tar.gz -> shrinkwrap-1.2.6.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=819d4b3f081b90206d45f80bdd7ca4d0
+_md5_=af5c7fa66b8f11574dc4411329b2a62f
diff --git a/metadata/md5-cache/dev-java/shrinkwrap-spi-1.2.6-r1 b/metadata/md5-cache/dev-java/shrinkwrap-spi-1.2.6-r1
index c0a7d7e10536..3cb69afce9b0 100644
--- a/metadata/md5-cache/dev-java/shrinkwrap-spi-1.2.6-r1
+++ b/metadata/md5-cache/dev-java/shrinkwrap-spi-1.2.6-r1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://arquillian.org/modules/shrinkwrap-shrinkwrap/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=~dev-java/shrinkwrap-api-1.2.6:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/shrinkwrap/shrinkwrap/archive/1.2.6.tar.gz -> shrinkwrap-1.2.6.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=96707e3d2b355f95cfce930591063659
+_md5_=6fc1a3e925eb61f86d4fc85f0f570537
diff --git a/metadata/md5-cache/dev-java/sjsxp-1.0.2 b/metadata/md5-cache/dev-java/sjsxp-1.0.2
index b5377cbc26da..770834d9e6c5 100644
--- a/metadata/md5-cache/dev-java/sjsxp-1.0.2
+++ b/metadata/md5-cache/dev-java/sjsxp-1.0.2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://sjsxp.java.net/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=GPL-2
 RDEPEND=dev-java/xpp3:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/com/sun/xml/stream/sjsxp/1.0.2/sjsxp-1.0.2-sources.jar
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=adb503927bc7ae8197c6c5f7ed8dcefb
+_md5_=5992d910dc11e9e496655e75bb7e9b80
diff --git a/metadata/md5-cache/dev-java/slf4j-api-2.0.3 b/metadata/md5-cache/dev-java/slf4j-api-2.0.3
index bc8f11ad1006..76119fa0434d 100644
--- a/metadata/md5-cache/dev-java/slf4j-api-2.0.3
+++ b/metadata/md5-cache/dev-java/slf4j-api-2.0.3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.slf4j.org
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qos-ch/slf4j/archive/v_2.0.3.tar.gz -> slf4j-2.0.3.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=d594fc6b4d7be98d4fc9f838cafbe01d
+_md5_=5674abb53501999c42ce5844a2649a13
diff --git a/metadata/md5-cache/dev-java/slf4j-ext-2.0.3 b/metadata/md5-cache/dev-java/slf4j-ext-2.0.3
index 850971ba3b87..abfabe4c77b8 100644
--- a/metadata/md5-cache/dev-java/slf4j-ext-2.0.3
+++ b/metadata/md5-cache/dev-java/slf4j-ext-2.0.3
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.slf4j.org
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* dev-java/cal10n:0 dev-java/javassist:3 ~dev-java/slf4j-api-2.0.3:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qos-ch/slf4j/archive/v_2.0.3.tar.gz -> slf4j-2.0.3.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=8702484f934f8bf08aa81c630af242b0
+_md5_=9b367f207556d85a345216ec94601037
diff --git a/metadata/md5-cache/dev-java/slf4j-nop-2.0.3 b/metadata/md5-cache/dev-java/slf4j-nop-2.0.3
index ccfe9d41f95a..ebc762d98b75 100644
--- a/metadata/md5-cache/dev-java/slf4j-nop-2.0.3
+++ b/metadata/md5-cache/dev-java/slf4j-nop-2.0.3
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.slf4j.org
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* ~dev-java/slf4j-api-2.0.3:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qos-ch/slf4j/archive/v_2.0.3.tar.gz -> slf4j-2.0.3.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=fd1f2c8b2da59676d06da185cff06219
+_md5_=5d020161411bea62dbf624c686b0ded5
diff --git a/metadata/md5-cache/dev-java/slf4j-reload4j-2.0.3 b/metadata/md5-cache/dev-java/slf4j-reload4j-2.0.3
index 0a0ccf2d83cf..07985477283d 100644
--- a/metadata/md5-cache/dev-java/slf4j-reload4j-2.0.3
+++ b/metadata/md5-cache/dev-java/slf4j-reload4j-2.0.3
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.slf4j.org
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* dev-java/reload4j:0 ~dev-java/slf4j-api-2.0.3:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qos-ch/slf4j/archive/v_2.0.3.tar.gz -> slf4j-2.0.3.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=c42fb61166600337c37a5b380382bd8a
+_md5_=7f46a16d38f2e61a235a2337bd16573c
diff --git a/metadata/md5-cache/dev-java/slf4j-simple-2.0.3 b/metadata/md5-cache/dev-java/slf4j-simple-2.0.3
index eca20a7161f5..5419757801c0 100644
--- a/metadata/md5-cache/dev-java/slf4j-simple-2.0.3
+++ b/metadata/md5-cache/dev-java/slf4j-simple-2.0.3
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.slf4j.org
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* ~dev-java/slf4j-api-2.0.3:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qos-ch/slf4j/archive/v_2.0.3.tar.gz -> slf4j-2.0.3.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=907c200b7a501f2d7c96b58b8a1386c0
+_md5_=2ae3614e6c9850b4588f422fd957049d
diff --git a/metadata/md5-cache/dev-java/snakeyaml-1.33 b/metadata/md5-cache/dev-java/snakeyaml-1.33
index 001b77a3607f..f5af582a0443 100644
--- a/metadata/md5-cache/dev-java/snakeyaml-1.33
+++ b/metadata/md5-cache/dev-java/snakeyaml-1.33
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://bitbucket.org/snakeyaml/snakeyaml
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://bitbucket.org/snakeyaml/snakeyaml/get/snakeyaml-1.33.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=da8fe6af525583a6f5ad5282fb610655
+_md5_=efaa60378cc07be872c0576c9f9dff8a
diff --git a/metadata/md5-cache/dev-java/snakeyaml-2.0 b/metadata/md5-cache/dev-java/snakeyaml-2.0
index 932be1e75439..c3ba455dd7a3 100644
--- a/metadata/md5-cache/dev-java/snakeyaml-2.0
+++ b/metadata/md5-cache/dev-java/snakeyaml-2.0
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://bitbucket.org/snakeyaml/snakeyaml
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://bitbucket.org/snakeyaml/snakeyaml/get/snakeyaml-2.0.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=6711af88f19f487ec8ec75d75e93b9dd
+_md5_=eed8bf68de3c0c037f99d833e5ff541b
diff --git a/metadata/md5-cache/dev-java/snappy-java-1.1.10.5-r2 b/metadata/md5-cache/dev-java/snappy-java-1.1.10.5-r2
index a65d07e2f6c2..eebea24e46db 100644
--- a/metadata/md5-cache/dev-java/snappy-java-1.1.10.5-r2
+++ b/metadata/md5-cache/dev-java/snappy-java-1.1.10.5-r2
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/xerial/snappy-java/
 INHERIT=java-pkg-2 java-pkg-simple toolchain-funcs check-reqs
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/osgi-core:0 app-arch/snappy >=dev-libs/bitshuffle-0.3.5-r1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xerial/snappy-java/archive/v1.1.10.5.tar.gz -> snappy-java-1.1.10.5.tar.gz test? ( https://repo1.maven.org/maven2/org/apache/hadoop/hadoop-common/3.3.5/hadoop-common-3.3.5.jar )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	toolchain-funcs	d3d42b22a610ce81c267b644bcec9b87	multilib	b2a329026f2e404e9e371097dda47f96	check-reqs	2a9731073c152554078a9a8df8fc0f1b
-_md5_=6c554ef95de64167fbccb229a6d879f0
+_md5_=e3a82075a11550b2e27dba306625773d
diff --git a/metadata/md5-cache/dev-java/snappy-java-1.1.10.7 b/metadata/md5-cache/dev-java/snappy-java-1.1.10.7
index 32d1f5bf02bf..e51957659a1e 100644
--- a/metadata/md5-cache/dev-java/snappy-java-1.1.10.7
+++ b/metadata/md5-cache/dev-java/snappy-java-1.1.10.7
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/xerial/snappy-java/
 INHERIT=java-pkg-2 java-pkg-simple toolchain-funcs check-reqs
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/osgi-core:0 app-arch/snappy >=dev-libs/bitshuffle-0.3.5-r1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xerial/snappy-java/archive/v1.1.10.7.tar.gz -> snappy-java-1.1.10.7.tar.gz test? ( https://repo1.maven.org/maven2/org/apache/hadoop/hadoop-common/3.3.5/hadoop-common-3.3.5.jar )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	toolchain-funcs	d3d42b22a610ce81c267b644bcec9b87	multilib	b2a329026f2e404e9e371097dda47f96	check-reqs	2a9731073c152554078a9a8df8fc0f1b
-_md5_=ae0ca11a59596af4d731d9532db2d90f
+_md5_=69c8ed9885ecf3dc30c34271991e17b3
diff --git a/metadata/md5-cache/dev-java/sparsebitset-1.3 b/metadata/md5-cache/dev-java/sparsebitset-1.3
index f6f9af1e2313..392ca0493eea 100644
--- a/metadata/md5-cache/dev-java/sparsebitset-1.3
+++ b/metadata/md5-cache/dev-java/sparsebitset-1.3
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/brettwooldridge/SparseBitSet
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/brettwooldridge/SparseBitSet/archive/SparseBitSet-1.3.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=15f1abb1f0f2eec7b7a769615b1d33e8
+_md5_=62abd381cfd385abf89574030afd391c
diff --git a/metadata/md5-cache/dev-java/stax2-api-4.2.1-r1 b/metadata/md5-cache/dev-java/stax2-api-4.2.1-r1
index 89f0ea1ed9f2..bea5c0c303b5 100644
--- a/metadata/md5-cache/dev-java/stax2-api-4.2.1-r1
+++ b/metadata/md5-cache/dev-java/stax2-api-4.2.1-r1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/FasterXML/stax2-api
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/FasterXML/stax2-api/archive/refs/tags/stax2-api-4.2.1.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=53f1a519842b70a9e134c49c1863e263
+_md5_=75b5e1b3b41f6ca798594c27bb2894be
diff --git a/metadata/md5-cache/dev-java/stringprep-1.1 b/metadata/md5-cache/dev-java/stringprep-1.1
index d15834133f32..43cc5733a1db 100644
--- a/metadata/md5-cache/dev-java/stringprep-1.1
+++ b/metadata/md5-cache/dev-java/stringprep-1.1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://gitlab.com/ongresinc/stringprep
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 ppc64 x86
+KEYWORDS=amd64 ppc64
 LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/com/ongres/stringprep/stringprep/1.1/stringprep-1.1-sources.jar
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=60be8cc441cc9801b4844c531d85b0ca
+_md5_=059dad7740df909ab5045fbc60602d0d
diff --git a/metadata/md5-cache/dev-java/stringtemplate-3.2.1-r3 b/metadata/md5-cache/dev-java/stringtemplate-3.2.1-r3
index cea5bca329fc..a81f113ce5a9 100644
--- a/metadata/md5-cache/dev-java/stringtemplate-3.2.1-r3
+++ b/metadata/md5-cache/dev-java/stringtemplate-3.2.1-r3
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.stringtemplate.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris
+KEYWORDS=amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-solaris
 LICENSE=BSD-1
 RDEPEND=dev-java/antlr:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/antlr/stringtemplate3/archive/68f2a42e8038f8e716e9666909ea485ee8aff45a.tar.gz -> stringtemplate-3.2.1.tar.gz https://sources.debian.org/data/main/s/stringtemplate/3.2.1-4/debian/patches/java21-compatibility.patch -> stringtemplate-3.2.1-4-java21-compatibility.patch
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=8fa4cf5b6d784b372c2d957ac7bc1f49
+_md5_=7d21f3434b33558a818c8d18a7950bab
diff --git a/metadata/md5-cache/dev-java/stringtemplate-4.3.4 b/metadata/md5-cache/dev-java/stringtemplate-4.3.4
index 8ce895552c23..fa02501df236 100644
--- a/metadata/md5-cache/dev-java/stringtemplate-4.3.4
+++ b/metadata/md5-cache/dev-java/stringtemplate-4.3.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.stringtemplate.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris
+KEYWORDS=amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-solaris
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* dev-java/antlr-runtime:3.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=https://repo1.maven.org/maven2/org/antlr/ST4/4.3.4/ST4-4.3.4-sources.jar https://github.com/antlr/stringtemplate4/archive/ST4-4.3.4.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=3ddd075674b6e36d56871443169b1beb
+_md5_=11b3e4f07d4140026144485674a9f17a
diff --git a/metadata/md5-cache/dev-java/sun-jai-bin-1.1.3-r2 b/metadata/md5-cache/dev-java/sun-jai-bin-1.1.3-r2
index 4e42cab35d1c..7a3f2d7b0227 100644
--- a/metadata/md5-cache/dev-java/sun-jai-bin-1.1.3-r2
+++ b/metadata/md5-cache/dev-java/sun-jai-bin-1.1.3-r2
@@ -4,11 +4,11 @@ DESCRIPTION=JAI is a class library for managing images
 EAPI=7
 HOMEPAGE=https://jai.dev.java.net/
 INHERIT=java-pkg-2
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=sun-bcla-jai
 RDEPEND=virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=!amd64? ( https://download.java.net/media/jai/builds/release/1_1_3/jai-1_1_3-lib-linux-i586.tar.gz ) amd64? ( https://download.java.net/media/jai/builds/release/1_1_3/jai-1_1_3-lib-linux-amd64.tar.gz )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9
-_md5_=19a4fd7856bb41243d02268982996722
+_md5_=f20257958ad579764e2a7db1a264eef0
diff --git a/metadata/md5-cache/dev-java/swing-layout-1.0.4-r2 b/metadata/md5-cache/dev-java/swing-layout-1.0.4-r2
index 5a7c739512aa..1552750e3e0c 100644
--- a/metadata/md5-cache/dev-java/swing-layout-1.0.4-r2
+++ b/metadata/md5-cache/dev-java/swing-layout-1.0.4-r2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://swing-layout.dev.java.net/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 x86
+KEYWORDS=amd64
 LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://gentoo/swing-layout-1.0.4-src.zip
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=2676b345338fb20e84e5cddcba153511
+_md5_=da6714aff5b2ffc1bbba0f0e0d6c36fb
diff --git a/metadata/md5-cache/dev-java/swingx-1.6.4-r1 b/metadata/md5-cache/dev-java/swingx-1.6.4-r1
index f93be32dd897..08445dfbe91f 100644
--- a/metadata/md5-cache/dev-java/swingx-1.6.4-r1
+++ b/metadata/md5-cache/dev-java/swingx-1.6.4-r1
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://java.net/projects/swingx/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64
 LICENSE=LGPL-2.1
 RDEPEND=virtual/jre:1.8 dev-java/metainf-services:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.6
 SRC_URI=https://maven.java.net/service/local/repositories/releases/content/org/swinglabs/swingx/swingx-all/1.6.4/swingx-all-1.6.4-sources.jar https://java.net/projects/swingx/downloads/download/releases/swingx-mavensupport-1.6.4-sources.jar
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=8b75665f7ccbc2320259e96eef6cebf2
+_md5_=1eb2e5a39e8e427a5f072ad28a1be8b2
diff --git a/metadata/md5-cache/dev-java/swingx-beaninfo-1.6.4-r1 b/metadata/md5-cache/dev-java/swingx-beaninfo-1.6.4-r1
index 2a1cf02c20c1..1e7cdc6b2199 100644
--- a/metadata/md5-cache/dev-java/swingx-beaninfo-1.6.4-r1
+++ b/metadata/md5-cache/dev-java/swingx-beaninfo-1.6.4-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://java.net/projects/swingx/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64
 LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.8:* dev-java/swingx:1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://java.net/downloads/swingx/releases/swingx-beaninfo-1.6.4-sources.jar
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=f12e43df4ba1e563f1b2e5f55c8df20c
+_md5_=e4818d685692711ecc264e8bfd236fe3
diff --git a/metadata/md5-cache/dev-java/swt-3.7.2-r4 b/metadata/md5-cache/dev-java/swt-3.7.2-r4
index c8706b897c13..898b5dedf439 100644
--- a/metadata/md5-cache/dev-java/swt-3.7.2-r4
+++ b/metadata/md5-cache/dev-java/swt-3.7.2-r4
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.eclipse.org/swt/
 INHERIT=java-pkg-2 java-pkg-simple java-osgi toolchain-funcs
 IUSE=cairo opengl doc source
-KEYWORDS=amd64 ppc64 x86
+KEYWORDS=amd64 ppc64
 LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
 RDEPEND=app-accessibility/at-spi2-core:2 dev-libs/glib >=x11-libs/gtk+-2.6.8:2 x11-libs/libXtst cairo? ( x11-libs/cairo ) opengl? ( virtual/glu virtual/opengl ) >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.7
 SRC_URI=amd64? ( https://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86_64.zip ) ppc? ( https://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86.zip ) ppc64? ( https://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-ppc64.zip ) x86? ( https://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86.zip )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	java-osgi	b1d0d0f01a98e464d86fd1ed8eddf07b	toolchain-funcs	d3d42b22a610ce81c267b644bcec9b87	multilib	b2a329026f2e404e9e371097dda47f96
-_md5_=642d6491e4ed26e054d616204e3cd9a5
+_md5_=956bbd47d4117999ee654ae6da24cbff
diff --git a/metadata/md5-cache/dev-java/system-rules-1.19.0 b/metadata/md5-cache/dev-java/system-rules-1.19.0
index b6ab05bc011e..ba99185342af 100644
--- a/metadata/md5-cache/dev-java/system-rules-1.19.0
+++ b/metadata/md5-cache/dev-java/system-rules-1.19.0
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://stefanbirkner.github.io/system-rules/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm64 ~ppc64
 LICENSE=CPL-1.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/stefanbirkner/system-rules/archive/system-rules-1.19.0.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=99c09d7bec18b6cb525588968c5568bf
+_md5_=664eaab163ea67d48275d4a5d509dcd5
diff --git a/metadata/md5-cache/dev-java/testng-6.11-r1 b/metadata/md5-cache/dev-java/testng-6.11-r1
index eeb26534a3ff..164de3ab2aeb 100644
--- a/metadata/md5-cache/dev-java/testng-6.11-r1
+++ b/metadata/md5-cache/dev-java/testng-6.11-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://testng.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=dev-java/ant-1.10.14-r3:0 dev-java/bsh:0 dev-java/guice:4 dev-java/jcommander:1.64 dev-java/junit:4 dev-java/snakeyaml:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/testng-team/testng/archive/6.11.tar.gz -> testng-6.11.tar.gz https://repo1.maven.org/maven2/org/webjars/jquery/3.5.1/jquery-3.5.1.jar test? ( https://repo1.maven.org/maven2/org/spockframework/spock-core/1.0-groovy-2.4/spock-core-1.0-groovy-2.4.jar https://repo1.maven.org/maven2/org/codehaus/groovy/groovy-all/2.4.7/groovy-all-2.4.7.jar https://downloads.apache.org/groovy/2.4.21/distribution/apache-groovy-binary-2.4.21.zip )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=0d14e21776e1758d579c002cc88530b7
+_md5_=70496b6b63de22018cbf24b1ebff1272
diff --git a/metadata/md5-cache/dev-java/tomcat-native-1.3.1 b/metadata/md5-cache/dev-java/tomcat-native-1.3.1
index 305af4eef379..c1e60ebd2daf 100644
--- a/metadata/md5-cache/dev-java/tomcat-native-1.3.1
+++ b/metadata/md5-cache/dev-java/tomcat-native-1.3.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://tomcat.apache.org/native-doc/
 INHERIT=java-pkg-2 java-pkg-simple verify-sig
 IUSE=static-libs doc source test verify-sig
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/apr:1= dev-libs/openssl:0/3 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/tomcat/tomcat-connectors/native/1.3.1/source/tomcat-native-1.3.1-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-connectors/native/1.3.1/source/tomcat-native-1.3.1-src.tar.gz.asc )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	verify-sig	745dccb7d4656514f1e966cce314d7db
-_md5_=a2cddaa2d7dd7755afefa2ea11b09309
+_md5_=05cd8c4689b86565494297e2b18ae0d7
diff --git a/metadata/md5-cache/dev-java/tomcat-native-2.0.8 b/metadata/md5-cache/dev-java/tomcat-native-2.0.8
index c3c62125c433..8b10591e55ce 100644
--- a/metadata/md5-cache/dev-java/tomcat-native-2.0.8
+++ b/metadata/md5-cache/dev-java/tomcat-native-2.0.8
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://tomcat.apache.org/native-doc/
 INHERIT=java-pkg-2 java-pkg-simple verify-sig
 IUSE=static-libs doc source test verify-sig
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/apr:1= dev-libs/openssl:0/3 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://apache/tomcat/tomcat-connectors/native/2.0.8/source/tomcat-native-2.0.8-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-connectors/native/2.0.8/source/tomcat-native-2.0.8-src.tar.gz.asc )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	verify-sig	745dccb7d4656514f1e966cce314d7db
-_md5_=426e67c600106da0276444e9d5201971
+_md5_=edf8526045e0487b8be15ad2e12efc79
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-4.1.40-r1 b/metadata/md5-cache/dev-java/tomcat-servlet-api-4.1.40-r1
index c22f659f73f0..a9b9596eafd1 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-4.1.40-r1
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-4.1.40-r1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://tomcat.apache.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.3
 SRC_URI=https://archive.apache.org/dist/tomcat/tomcat-4/v4.1.40/src/apache-tomcat-4.1.40-src.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=676c6edeb3c68e500fea0aa1e194f2e5
+_md5_=f66c1fb4a1fed5729f48b14d39eade51
diff --git a/metadata/md5-cache/dev-java/treelayout-1.0.3-r1 b/metadata/md5-cache/dev-java/treelayout-1.0.3-r1
index 029b6d51b1e1..b2c8a8d0d852 100644
--- a/metadata/md5-cache/dev-java/treelayout-1.0.3-r1
+++ b/metadata/md5-cache/dev-java/treelayout-1.0.3-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/abego/treelayout
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/abego/treelayout/archive/v1.0.3.tar.gz -> treelayout-1.0.3.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=eb666d9e87ea11293ad83dfebea1f360
+_md5_=3f0703402fe817cb830ccc0599b8542a
diff --git a/metadata/md5-cache/dev-java/txw2-2.3.8-r1 b/metadata/md5-cache/dev-java/txw2-2.3.8-r1
index 7938661ffd88..f8f8b7257346 100644
--- a/metadata/md5-cache/dev-java/txw2-2.3.8-r1
+++ b/metadata/md5-cache/dev-java/txw2-2.3.8-r1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://eclipse-ee4j.github.io/jaxb-ri/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/eclipse-ee4j/jaxb-ri/archive/2.3.8-RI.tar.gz -> jaxb-ri-2.3.8.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=cfb4d36b0140a5e7f9a0879fc3b77423
+_md5_=da6306a3b29a8e3339c955eadb1166ab
diff --git a/metadata/md5-cache/dev-java/typesafe-config-1.4.2 b/metadata/md5-cache/dev-java/typesafe-config-1.4.2
index 9769d84150a6..d2eed4729bd9 100644
--- a/metadata/md5-cache/dev-java/typesafe-config-1.4.2
+++ b/metadata/md5-cache/dev-java/typesafe-config-1.4.2
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://lightbend.github.io/config/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source doc source
-KEYWORDS=amd64 ppc64 x86
+KEYWORDS=amd64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/lightbend/config/archive/v1.4.2.tar.gz -> typesafe-config-1.4.2.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=908813cab4fcc930cc4aecdd557ee93d
+_md5_=1344c6284a67c60cbdc49721dc0a7230
diff --git a/metadata/md5-cache/dev-java/unbescape-1.1.6 b/metadata/md5-cache/dev-java/unbescape-1.1.6
index 0087e36083d0..cffaaff79213 100644
--- a/metadata/md5-cache/dev-java/unbescape-1.1.6
+++ b/metadata/md5-cache/dev-java/unbescape-1.1.6
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://www.unbescape.org
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/unbescape/unbescape/archive/unbescape-1.1.6.RELEASE.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=0f7498a43b2aa94536997f832d2d820b
+_md5_=4911ef336b87231fcfc2e4f5ce6b5f2c
diff --git a/metadata/md5-cache/dev-java/univocity-parsers-2.9.1 b/metadata/md5-cache/dev-java/univocity-parsers-2.9.1
index fc1495ff488b..1bb6f69d31c8 100644
--- a/metadata/md5-cache/dev-java/univocity-parsers-2.9.1
+++ b/metadata/md5-cache/dev-java/univocity-parsers-2.9.1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://www.univocity.com/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/uniVocity/univocity-parsers/archive/refs/tags/v2.9.1.tar.gz -> univocity-parsers-2.9.1.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=a5012de676f1f0b289275a0f6e5b5498
+_md5_=5186cfe17febd7a2a79217854ebaf5b3
diff --git a/metadata/md5-cache/dev-java/velocity-2.3_p20240314 b/metadata/md5-cache/dev-java/velocity-2.3_p20240314
index 9784820d6585..23ce8ca40ff1 100644
--- a/metadata/md5-cache/dev-java/velocity-2.3_p20240314
+++ b/metadata/md5-cache/dev-java/velocity-2.3_p20240314
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://velocity.apache.org
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/commons-io-2.8.0:1 >=dev-java/commons-lang-3.11:3.6 >=dev-java/slf4j-api-1.7.30:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/apache/velocity-engine/archive/86cfcf41105f8a25db11ca6483e33c20fc0804d9.tar.gz -> velocity-2.3_p20240314.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=114c78ea70d65829da046dfcb27b9b67
+_md5_=1aa5b8a36f58bff1537629895e474f95
diff --git a/metadata/md5-cache/dev-java/waffle-jna-3.3.0 b/metadata/md5-cache/dev-java/waffle-jna-3.3.0
index 8cf88f3b8518..3e008ca2b859 100644
--- a/metadata/md5-cache/dev-java/waffle-jna-3.3.0
+++ b/metadata/md5-cache/dev-java/waffle-jna-3.3.0
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://waffle.github.io/waffle/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 ppc64 x86
+KEYWORDS=amd64 ppc64
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Waffle/waffle/archive/waffle-parent-3.3.0.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=efbaa76b80d90d437d76b339eaf20b22
+_md5_=de6459c8bc2eac2c5ad963fd33562871
diff --git a/metadata/md5-cache/dev-java/woodstox-core-6.4.0-r1 b/metadata/md5-cache/dev-java/woodstox-core-6.4.0-r1
index c05b85d19008..05854d5d7292 100644
--- a/metadata/md5-cache/dev-java/woodstox-core-6.4.0-r1
+++ b/metadata/md5-cache/dev-java/woodstox-core-6.4.0-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/FasterXML/woodstox
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=dev-java/msv:0 dev-java/relaxng-datatype:0 dev-java/stax2-api:0 dev-java/xsdlib:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FasterXML/woodstox/archive/woodstox-core-6.4.0.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=abba47e06da08d6647fa359f53c1b6ec
+_md5_=d0e649bcdc97a0458e9c37507ed1012b
diff --git a/metadata/md5-cache/dev-java/wsdl4j-1.6.3 b/metadata/md5-cache/dev-java/wsdl4j-1.6.3
index bfd79fed17ce..fce61ecaef22 100644
--- a/metadata/md5-cache/dev-java/wsdl4j-1.6.3
+++ b/metadata/md5-cache/dev-java/wsdl4j-1.6.3
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://wsdl4j.sourceforge.net
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm64 ~ppc64
 LICENSE=CPL-1.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/wsdl4j/WSDL4J/1.6.3/wsdl4j-src-1.6.3.zip
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=4cf58690ac13c315328b78b384b5138c
+_md5_=f7b9b07bcf530c4a2ed7e18967bce476
diff --git a/metadata/md5-cache/dev-java/xalan-2.7.3-r2 b/metadata/md5-cache/dev-java/xalan-2.7.3-r2
index dd636bf92947..32f5cb6f2323 100644
--- a/metadata/md5-cache/dev-java/xalan-2.7.3-r2
+++ b/metadata/md5-cache/dev-java/xalan-2.7.3-r2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://xalan.apache.org/
 INHERIT=java-pkg-2 java-pkg-simple verify-sig
 IUSE=doc source verify-sig
-KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=!x86? ( dev-java/javacup:0 ) dev-java/bcel:0 ~dev-java/xalan-serializer-2.7.3:0 dev-java/xerces:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/xalan/xalan-j/source/xalan-j_2_7_3-src.tar.gz verify-sig? ( https://downloads.apache.org/xalan/xalan-j/source/xalan-j_2_7_3-src.tar.gz.asc ) x86? ( https://www2.cs.tum.edu/projects/cup/releases/java-cup-bin-11b-20160615.tar.gz )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	verify-sig	745dccb7d4656514f1e966cce314d7db
-_md5_=408a10b8a630acda1683a505a35afc58
+_md5_=e1533d2fd416b8787a71f8fc84aa86e0
diff --git a/metadata/md5-cache/dev-java/xalan-serializer-2.7.3-r1 b/metadata/md5-cache/dev-java/xalan-serializer-2.7.3-r1
index 2ac143d578d6..21dbe5f4937b 100644
--- a/metadata/md5-cache/dev-java/xalan-serializer-2.7.3-r1
+++ b/metadata/md5-cache/dev-java/xalan-serializer-2.7.3-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://xalan.apache.org/
 INHERIT=java-pkg-2 java-pkg-simple verify-sig
 IUSE=doc source verify-sig
-KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/xalan/xalan-j/source/xalan-j_2_7_3-src.tar.gz verify-sig? ( https://downloads.apache.org/xalan/xalan-j/source/xalan-j_2_7_3-src.tar.gz.asc )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	verify-sig	745dccb7d4656514f1e966cce314d7db
-_md5_=b90477a679d335540cff01c9d3197fda
+_md5_=2e8811b00a6526f68d519dab292a518a
diff --git a/metadata/md5-cache/dev-java/xerces-2.12.2-r2 b/metadata/md5-cache/dev-java/xerces-2.12.2-r2
index 9c80d0afad6a..20719be46c94 100644
--- a/metadata/md5-cache/dev-java/xerces-2.12.2-r2
+++ b/metadata/md5-cache/dev-java/xerces-2.12.2-r2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://xerces.apache.org/xerces2-j/index.html
 INHERIT=java-pkg-2 java-pkg-simple verify-sig
 IUSE=doc source verify-sig
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=dev-java/xml-commons-external:1.4 dev-java/xml-commons-resolver:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=mirror://apache/xerces/j/source/Xerces-J-src.2.12.2.tar.gz verify-sig? ( https://downloads.apache.org/xerces/j/source/Xerces-J-src.2.12.2.tar.gz.asc )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	verify-sig	745dccb7d4656514f1e966cce314d7db
-_md5_=4a07012aee10b09d26f5a3f845025b0a
+_md5_=192dc713179fd1a701d93733dc388875
diff --git a/metadata/md5-cache/dev-java/xerial-core-2.1 b/metadata/md5-cache/dev-java/xerial-core-2.1
index 48688b518403..b88c3982d640 100644
--- a/metadata/md5-cache/dev-java/xerial-core-2.1
+++ b/metadata/md5-cache/dev-java/xerial-core-2.1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://xerial.org
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xerial/xerial-java/archive/2.1.tar.gz -> xerial-core-2.1.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=da88814649c483e10431c22edc958a42
+_md5_=5ddf1822c69445ef381d38d97a5ff8cb
diff --git a/metadata/md5-cache/dev-java/xml-commons-external-1.4.01-r2 b/metadata/md5-cache/dev-java/xml-commons-external-1.4.01-r2
index fdd32c1e9aa3..15b96d485ae8 100644
--- a/metadata/md5-cache/dev-java/xml-commons-external-1.4.01-r2
+++ b/metadata/md5-cache/dev-java/xml-commons-external-1.4.01-r2
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://xerces.apache.org/xml-commons/components/external/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.4
 SRC_URI=https://repo1.maven.org/maven2/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01-sources.jar -> xml-commons-external-1.4.01.jar
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=d21a91c85ed7896e2e0b06b9557f4052
+_md5_=135fe379b0b8fc6d1311935a92c12e26
diff --git a/metadata/md5-cache/dev-java/xml-commons-resolver-1.2-r3 b/metadata/md5-cache/dev-java/xml-commons-resolver-1.2-r3
index 551848642b77..7098ba09820f 100644
--- a/metadata/md5-cache/dev-java/xml-commons-resolver-1.2-r3
+++ b/metadata/md5-cache/dev-java/xml-commons-resolver-1.2-r3
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://xerces.apache.org/xml-commons/components/resolver/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/xerces/xml-commons/xml-commons-resolver-1.2.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=b0ece3bf73c9b4b97a705a26dfb98699
+_md5_=d95fa5c6b01981d5a06c419f410ee8ce
diff --git a/metadata/md5-cache/dev-java/xmlgraphics-commons-2.9 b/metadata/md5-cache/dev-java/xmlgraphics-commons-2.9
index 58185f62ce62..a04d0d217aa1 100644
--- a/metadata/md5-cache/dev-java/xmlgraphics-commons-2.9
+++ b/metadata/md5-cache/dev-java/xmlgraphics-commons-2.9
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://xmlgraphics.apache.org/commons/
 INHERIT=java-pkg-2 java-pkg-simple verify-sig
 IUSE=doc source test verify-sig
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=dev-java/commons-io:1 dev-java/commons-logging:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://apache/xmlgraphics/commons/source/xmlgraphics-commons-2.9-src.tar.gz verify-sig? ( https://downloads.apache.org/xmlgraphics/commons/source/xmlgraphics-commons-2.9-src.tar.gz.asc )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	verify-sig	745dccb7d4656514f1e966cce314d7db
-_md5_=bbed9ac1564ccd2c50e57fe79cf0d70b
+_md5_=be37c43f5ff68dc07ee2369eecb9d496
diff --git a/metadata/md5-cache/dev-java/xmlunit-1.6-r2 b/metadata/md5-cache/dev-java/xmlunit-1.6-r2
index c0ab331376d0..5c9827352bc6 100644
--- a/metadata/md5-cache/dev-java/xmlunit-1.6-r2
+++ b/metadata/md5-cache/dev-java/xmlunit-1.6-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://sourceforge.net/projects/xmlunit/ https://www.xmlunit.org
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 ~arm64 ppc64 x86
+KEYWORDS=amd64 ~arm64 ppc64
 LICENSE=BSD
 RDEPEND=dev-java/junit:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://downloads.sourceforge.net/project/xmlunit/xmlunit%20for%20Java/XMLUnit%20for%20Java%201.6/xmlunit-1.6-src.zip
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=f2917499d2bedfb3b8dba739206ea9e6
+_md5_=29876a29eb7a42d2b19fd5a102acda46
diff --git a/metadata/md5-cache/dev-java/xmlunit-assertj-2.9.1 b/metadata/md5-cache/dev-java/xmlunit-assertj-2.9.1
index 9169446e8fe7..d9420df0cc0d 100644
--- a/metadata/md5-cache/dev-java/xmlunit-assertj-2.9.1
+++ b/metadata/md5-cache/dev-java/xmlunit-assertj-2.9.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.xmlunit.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64
 LICENSE=Apache-2.0
 PROPERTIES=test_network
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
@@ -13,4 +13,4 @@ RESTRICT=test !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/xmlunit/xmlunit/releases/download/v2.9.1/xmlunit-2.9.1-src.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=d34d18ff190b654ce94a97fe6e7a99e7
+_md5_=c4f46ceeacd33773f2c97992279a95fe
diff --git a/metadata/md5-cache/dev-java/xmlunit-core-2.9.1 b/metadata/md5-cache/dev-java/xmlunit-core-2.9.1
index e4921c90859b..dce8ed888eb0 100644
--- a/metadata/md5-cache/dev-java/xmlunit-core-2.9.1
+++ b/metadata/md5-cache/dev-java/xmlunit-core-2.9.1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.xmlunit.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/jaxb-api:2 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://github.com/xmlunit/xmlunit/releases/download/v2.9.1/xmlunit-2.9.1-src.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=902039299593398e6dc4bc1d8ecd64ca
+_md5_=a6a3a079a4a9797e160d078b6c8371a5
diff --git a/metadata/md5-cache/dev-java/xmlunit-matchers-2.9.1 b/metadata/md5-cache/dev-java/xmlunit-matchers-2.9.1
index 8e7ba6c66ddd..cf1f20084e97 100644
--- a/metadata/md5-cache/dev-java/xmlunit-matchers-2.9.1
+++ b/metadata/md5-cache/dev-java/xmlunit-matchers-2.9.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.xmlunit.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 PROPERTIES=test_network
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
@@ -13,4 +13,4 @@ RESTRICT=test !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/xmlunit/xmlunit/releases/download/v2.9.1/xmlunit-2.9.1-src.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=fdcf49a0bfdb93759b7eb5f003e6cea9
+_md5_=13708988ef03b08dd1c48c98714a5e57
diff --git a/metadata/md5-cache/dev-java/xmpbox-2.0.27 b/metadata/md5-cache/dev-java/xmpbox-2.0.27
index b0b82bbd5e8b..9422e2ce9304 100644
--- a/metadata/md5-cache/dev-java/xmpbox-2.0.27
+++ b/metadata/md5-cache/dev-java/xmpbox-2.0.27
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://pdfbox.apache.org
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=dev-java/jaxb-api:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/pdfbox/2.0.27/pdfbox-2.0.27-src.zip
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=62031f511db190b6effb65117fcb0f55
+_md5_=5f8ef7cd587b1240d5d29adf4fd64d89
diff --git a/metadata/md5-cache/dev-java/xom-1.3.8-r1 b/metadata/md5-cache/dev-java/xom-1.3.8-r1
index 8fb81ca2add8..db6ed023fb28 100644
--- a/metadata/md5-cache/dev-java/xom-1.3.8-r1
+++ b/metadata/md5-cache/dev-java/xom-1.3.8-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://xom.nu
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=LGPL-2
 PROPERTIES=test_network
 RDEPEND=dev-java/jaxen:1.2 dev-java/xerces:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
@@ -13,4 +13,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/elharo/xom/releases/download/v1.3.8/xom-1.3.8-src.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=0d1f0b535e392af40e684083f879969e
+_md5_=5c216d800b7c421ed23daea05f9367c3
diff --git a/metadata/md5-cache/dev-java/xpp2-2.1.10-r4 b/metadata/md5-cache/dev-java/xpp2-2.1.10-r4
index bf4ae05e92ac..ab1de3bf194d 100644
--- a/metadata/md5-cache/dev-java/xpp2-2.1.10-r4
+++ b/metadata/md5-cache/dev-java/xpp2-2.1.10-r4
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://web.archive.org/web/20130904163229/http://www.extreme.indiana.edu/xgws/xsoap/xpp/xpp2/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=Apache-1.1 IBM
 RDEPEND=dev-java/xerces:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://web.archive.org/web/20130904173708/http://www.extreme.indiana.edu/xgws/xsoap/xpp/download/PullParser2/PullParser2.1.10.tgz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=0e141c23933fe850d88a1bfb5b8066ed
+_md5_=7620b0d2d8251214a956411c01e1eb3d
diff --git a/metadata/md5-cache/dev-java/xpp3-1.1.4c-r6 b/metadata/md5-cache/dev-java/xpp3-1.1.4c-r6
index 46ea02ab31c9..37e2d9ace589 100644
--- a/metadata/md5-cache/dev-java/xpp3-1.1.4c-r6
+++ b/metadata/md5-cache/dev-java/xpp3-1.1.4c-r6
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=Apache-1.1 IBM JDOM LGPL-2.1+
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/xpp3/xpp3/1.1.4c/xpp3-1.1.4c-sources.jar -> xpp3-1.1.4c.jar
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=005fe142fafe91fa03ccd2b11c508a28
+_md5_=2d14cd41cc9fea2f9db4052f6e6bf9d2
diff --git a/metadata/md5-cache/dev-java/xsdlib-2022.7 b/metadata/md5-cache/dev-java/xsdlib-2022.7
index 7f9ca2a4517d..96be7473e063 100644
--- a/metadata/md5-cache/dev-java/xsdlib-2022.7
+++ b/metadata/md5-cache/dev-java/xsdlib-2022.7
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/xmlark/msv/tree/main/xsdlib
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=BSD-1
 RDEPEND=>=virtual/jre-1.8:* dev-java/relaxng-datatype:0 dev-java/xerces:2 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xmlark/msv/archive/msv-2022.7.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=cdc25de0cc71cfa573a49944ab8d5ab8
+_md5_=5cb6b2b1b4a897d311bce266ec078f2b
diff --git a/metadata/md5-cache/dev-java/xz-java-1.10 b/metadata/md5-cache/dev-java/xz-java-1.10
index a9e31f3617df..e632817e65bf 100644
--- a/metadata/md5-cache/dev-java/xz-java-1.10
+++ b/metadata/md5-cache/dev-java/xz-java-1.10
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://tukaani.org/xz/java.html
 INHERIT=java-pkg-2 java-pkg-simple verify-sig
 IUSE=doc examples source verify-sig
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64
 LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://tukaani.org/xz/xz-java-1.10.zip verify-sig? ( https://tukaani.org/xz/xz-java-1.10.zip.sig )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	verify-sig	745dccb7d4656514f1e966cce314d7db
-_md5_=5c2cf7a9fa85eeaf3964e526a5b4cc18
+_md5_=72841c706e7fd30db04a46a5183523fc
diff --git a/metadata/md5-cache/dev-java/xz-java-1.9-r2 b/metadata/md5-cache/dev-java/xz-java-1.9-r2
index c5a7c23ab191..88d3a973b19a 100644
--- a/metadata/md5-cache/dev-java/xz-java-1.9-r2
+++ b/metadata/md5-cache/dev-java/xz-java-1.9-r2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://tukaani.org/xz/java.html
 INHERIT=java-pkg-2 java-pkg-simple verify-sig
 IUSE=doc examples source verify-sig
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://tukaani.org/xz/xz-java-1.9.zip verify-sig? ( https://tukaani.org/xz/xz-java-1.9.zip.sig )
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	verify-sig	745dccb7d4656514f1e966cce314d7db
-_md5_=f1b36cbabce7d4bfc1b424a1a85d0691
+_md5_=b83ca14400adca6bc6a627a5f391d031
diff --git a/metadata/md5-cache/dev-java/zstd-jni-1.5.2.5 b/metadata/md5-cache/dev-java/zstd-jni-1.5.2.5
index 4252f3fbc0bf..0ef7dd851e7f 100644
--- a/metadata/md5-cache/dev-java/zstd-jni-1.5.2.5
+++ b/metadata/md5-cache/dev-java/zstd-jni-1.5.2.5
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/luben/zstd-jni
 INHERIT=java-pkg-2 java-pkg-simple cmake
 IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/luben/zstd-jni/archive/c1.5.2-5.tar.gz -> zstd-jni-1.5.2.5.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4	toolchain-funcs	d3d42b22a610ce81c267b644bcec9b87	multilib	b2a329026f2e404e9e371097dda47f96	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multiprocessing	1e32df7deee68372153dca65f4a7c21f	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	42869b3c8d86a70ef3cf75165a395e09	cmake	10a50dfaf728b802fcfd37f8d0da9056
-_md5_=f01713b385cbcf23b6ffbfc16e4be6d6
+_md5_=d8aad61c965c61f73c28e5b898a46d5d
diff --git a/metadata/md5-cache/dev-java/zxing-core-3.5.1 b/metadata/md5-cache/dev-java/zxing-core-3.5.1
index 1902a09cff49..b9db60511753 100644
--- a/metadata/md5-cache/dev-java/zxing-core-3.5.1
+++ b/metadata/md5-cache/dev-java/zxing-core-3.5.1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/zxing/zxing/core
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://github.com/zxing/zxing/archive/zxing-3.5.1.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=85109b7ef69d77fec587cde600e4b534
+_md5_=13e6fac16cddef960423fe08ff3970f3
diff --git a/metadata/md5-cache/dev-java/zxing-javase-3.5.1 b/metadata/md5-cache/dev-java/zxing-javase-3.5.1
index a4508e89a562..5e5a5fbc1923 100644
--- a/metadata/md5-cache/dev-java/zxing-javase-3.5.1
+++ b/metadata/md5-cache/dev-java/zxing-javase-3.5.1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/zxing/zxing
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=dev-java/jcommander:0 dev-java/zxing-core:3 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://github.com/zxing/zxing/archive/zxing-3.5.1.tar.gz
 _eclasses_=java-utils-2	4b88d12e899778ff681b67d7bcbb54f0	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=537242bda8b1efc80f0143f3cef929b2
+_md5_=d51e85f5ae6ed3ed7cf516bdb382592a
author	Repository mirror & CI <repomirrorci@gentoo.org>	2024-10-17 15:48:48 +0000
committer	Repository mirror & CI <repomirrorci@gentoo.org>	2024-10-17 15:48:48 +0000
commit	6a60730da32cf9dcacb04609d08890dc88bfe1af (patch)
tree	e2f4e4472227670146a42ff2db77555595434844 /metadata/md5-cache/dev-java
parent	Merge updates from master (diff)
download	gentoo-6a60730da32cf9dcacb04609d08890dc88bfe1af.tar.gz gentoo-6a60730da32cf9dcacb04609d08890dc88bfe1af.tar.bz2 gentoo-6a60730da32cf9dcacb04609d08890dc88bfe1af.zip