summaryrefslogtreecommitdiff
path: root/dev-java
diff options
context:
space:
mode:
authorLiguros - Gitlab CI/CD [develop] <gitlab@liguros.net>2024-10-17 19:33:10 +0000
committerLiguros - Gitlab CI/CD [develop] <gitlab@liguros.net>2024-10-17 19:33:10 +0000
commit795962701b57871f55d56b037c5d282800ced5b1 (patch)
tree8fe7513a747dc152c726e29ace3bf6d317e18e1e /dev-java
parent52c4dac4ff4335778d998dd2e3195434d295224a (diff)
downloadbaldeagleos-repo-795962701b57871f55d56b037c5d282800ced5b1.tar.gz
baldeagleos-repo-795962701b57871f55d56b037c5d282800ced5b1.tar.xz
baldeagleos-repo-795962701b57871f55d56b037c5d282800ced5b1.zip
Adding metadata
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/angus-activation/angus-activation-1.0.0-r1.ebuild2
-rw-r--r--dev-java/animal-sniffer-annotations/animal-sniffer-annotations-1.15-r1.ebuild2
-rw-r--r--dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r3.ebuild2
-rw-r--r--dev-java/ant-core/ant-core-1.10.14.ebuild2
-rw-r--r--dev-java/ant-ivy/ant-ivy-2.5.0-r4.ebuild2
-rw-r--r--dev-java/ant/ant-1.10.14-r3.ebuild2
-rw-r--r--dev-java/antlr-runtime/antlr-runtime-3.5.3.ebuild2
-rw-r--r--dev-java/antlr-runtime/antlr-runtime-4.9.3.ebuild2
-rw-r--r--dev-java/antlr-tool/antlr-tool-3.5.3-r1.ebuild2
-rw-r--r--dev-java/antlr-tool/antlr-tool-4.9.3-r3.ebuild2
-rw-r--r--dev-java/antlr/antlr-2.7.7-r9.ebuild2
-rw-r--r--dev-java/antlr/antlr-3.2-r2.ebuild2
-rw-r--r--dev-java/antlr/antlr-3.5.3.ebuild2
-rw-r--r--dev-java/antlr/antlr-4.9.3.ebuild2
-rw-r--r--dev-java/antunit/antunit-1.4.1-r1.ebuild2
-rw-r--r--dev-java/aopalliance/aopalliance-1.0-r3.ebuild2
-rw-r--r--dev-java/apache-rat/apache-rat-0.15-r2.ebuild2
-rw-r--r--dev-java/apiguardian-api/apiguardian-api-1.1.2-r1.ebuild2
-rw-r--r--dev-java/asm/asm-9.7.1.ebuild2
-rw-r--r--dev-java/asm/asm-9.7.ebuild2
-rw-r--r--dev-java/aspectj/aspectj-1.9.7-r1.ebuild2
-rw-r--r--dev-java/assertj-core/assertj-core-3.10.0.ebuild2
-rw-r--r--dev-java/auto-service-annotations/auto-service-annotations-1.1.1.ebuild2
-rw-r--r--dev-java/batik/batik-1.17-r1.ebuild2
-rw-r--r--dev-java/bcel/bcel-6.10.0-r1.ebuild2
-rw-r--r--dev-java/bcel/bcel-6.6.0.ebuild2
-rw-r--r--dev-java/bcmail/bcmail-1.77-r1.ebuild2
-rw-r--r--dev-java/bcmail/bcmail-1.78.1.ebuild2
-rw-r--r--dev-java/bcpg/bcpg-1.77.ebuild2
-rw-r--r--dev-java/bcpg/bcpg-1.78.1.ebuild2
-rw-r--r--dev-java/bcpkix/bcpkix-1.77.ebuild2
-rw-r--r--dev-java/bcpkix/bcpkix-1.78.1.ebuild2
-rw-r--r--dev-java/bcprov/bcprov-1.77.ebuild2
-rw-r--r--dev-java/bcprov/bcprov-1.78.1.ebuild2
-rw-r--r--dev-java/bcutil/bcutil-1.77.ebuild2
-rw-r--r--dev-java/bcutil/bcutil-1.78.1.ebuild2
-rw-r--r--dev-java/bnd-annotation/bnd-annotation-6.3.1.ebuild2
-rw-r--r--dev-java/bnd-annotation/bnd-annotation-7.0.0.ebuild2
-rw-r--r--dev-java/bnd-ant/bnd-ant-7.0.0.ebuild2
-rw-r--r--dev-java/bnd-util/bnd-util-7.0.0.ebuild2
-rw-r--r--dev-java/bnd/bnd-7.0.0.ebuild2
-rw-r--r--dev-java/bndlib/bndlib-7.0.0.ebuild2
-rw-r--r--dev-java/brotli-dec/brotli-dec-0.1.2.ebuild2
-rw-r--r--dev-java/browserlauncher2/browserlauncher2-1.3-r3.ebuild4
-rw-r--r--dev-java/bsf/bsf-2.4.0-r5.ebuild2
-rw-r--r--dev-java/bsh/bsh-2.1.1.ebuild2
-rw-r--r--dev-java/byaccj/byaccj-1.15-r3.ebuild2
-rw-r--r--dev-java/byte-buddy/byte-buddy-1.14.0.ebuild2
-rw-r--r--dev-java/c3p0/c3p0-0.9.5.5-r2.ebuild2
-rw-r--r--dev-java/cache2k-api/cache2k-api-0.23.1.ebuild2
-rw-r--r--dev-java/caffeine/caffeine-2.6.2-r1.ebuild2
-rw-r--r--dev-java/cal10n/cal10n-0.8.1.ebuild2
-rw-r--r--dev-java/cdi-api/cdi-api-4.0.1-r2.ebuild2
-rw-r--r--dev-java/cdi-api/cdi-api-4.0.1-r3.ebuild2
-rw-r--r--dev-java/cglib/cglib-3.3.0-r2.ebuild2
-rw-r--r--dev-java/checker-framework-qual/checker-framework-qual-3.43.0.ebuild2
-rw-r--r--dev-java/checker-framework-qual/checker-framework-qual-3.47.0.ebuild2
-rw-r--r--dev-java/commons-beanutils/commons-beanutils-1.9.4-r2.ebuild2
-rw-r--r--dev-java/commons-cli/commons-cli-1.9.0.ebuild2
-rw-r--r--dev-java/commons-codec/commons-codec-1.16.1.ebuild2
-rw-r--r--dev-java/commons-codec/commons-codec-1.17.1-r1.ebuild2
-rw-r--r--dev-java/commons-collections/commons-collections-3.2.2-r2.ebuild2
-rw-r--r--dev-java/commons-collections/commons-collections-4.4-r2.ebuild2
-rw-r--r--dev-java/commons-compress/commons-compress-1.26.1.ebuild2
-rw-r--r--dev-java/commons-compress/commons-compress-1.27.1.ebuild2
-rw-r--r--dev-java/commons-csv/commons-csv-1.9.0.ebuild2
-rw-r--r--dev-java/commons-daemon/commons-daemon-1.4.0.ebuild2
-rw-r--r--dev-java/commons-digester/commons-digester-2.1-r2.ebuild4
-rw-r--r--dev-java/commons-digester/commons-digester-3.2-r3.ebuild4
-rw-r--r--dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild2
-rw-r--r--dev-java/commons-imaging/commons-imaging-0.97.ebuild2
-rw-r--r--dev-java/commons-imaging/commons-imaging-1.0_alpha3-r2.ebuild2
-rw-r--r--dev-java/commons-io/commons-io-2.16.1.ebuild2
-rw-r--r--dev-java/commons-io/commons-io-2.17.0.ebuild2
-rw-r--r--dev-java/commons-junit4/commons-junit4-1.2.17.ebuild2
-rw-r--r--dev-java/commons-lang/commons-lang-3.17.0.ebuild2
-rw-r--r--dev-java/commons-logging/Manifest2
-rw-r--r--dev-java/commons-logging/commons-logging-1.3.1.ebuild2
-rw-r--r--dev-java/commons-logging/commons-logging-1.3.4-r1.ebuild193
-rw-r--r--dev-java/commons-math/commons-math-3.6.1-r2.ebuild2
-rw-r--r--dev-java/commons-net/commons-net-3.11.1.ebuild2
-rw-r--r--dev-java/commons-nullanalysis/commons-nullanalysis-1.2.17.ebuild2
-rw-r--r--dev-java/commons-validator/commons-validator-1.8.0.ebuild2
-rw-r--r--dev-java/commons-vfs/commons-vfs-2.0-r4.ebuild2
-rw-r--r--dev-java/concurrentlinkedhashmap-lru/concurrentlinkedhashmap-lru-1.4.2.ebuild2
-rw-r--r--dev-java/conversant-disruptor/conversant-disruptor-1.2.20.ebuild2
-rw-r--r--dev-java/cortado/cortado-0.6.0-r3.ebuild2
-rw-r--r--dev-java/cpptasks/cpptasks-1.0_beta5-r3.ebuild2
-rw-r--r--dev-java/dom4j/dom4j-2.1.4.ebuild2
-rw-r--r--dev-java/easymock/easymock-2.5.2.ebuild2
-rw-r--r--dev-java/easymock/easymock-3.3.1-r1.ebuild2
-rw-r--r--dev-java/eclipse-ecj/eclipse-ecj-4.20.ebuild2
-rw-r--r--dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.ebuild2
-rw-r--r--dev-java/eclipse-ecj/eclipse-ecj-4.27-r1.ebuild2
-rw-r--r--dev-java/eclipse-ecj/eclipse-ecj-4.30-r1.ebuild2
-rw-r--r--dev-java/eclipse-ecj/eclipse-ecj-4.31.ebuild2
-rw-r--r--dev-java/eclipse-ecj/eclipse-ecj-4.32.ebuild2
-rw-r--r--dev-java/eclipse-ecj/eclipse-ecj-4.33.ebuild2
-rw-r--r--dev-java/eclipse-jdt-annotation/eclipse-jdt-annotation-4.30.ebuild2
-rw-r--r--dev-java/emma/emma-2.0.5312-r6.ebuild2
-rw-r--r--dev-java/error-prone-annotations/error-prone-annotations-2.27.1-r1.ebuild2
-rw-r--r--dev-java/error-prone-annotations/error-prone-annotations-2.32.0.ebuild2
-rw-r--r--dev-java/fastinfoset/fastinfoset-2.1.0-r1.ebuild2
-rw-r--r--dev-java/fec/fec-1.0.4-r5.ebuild2
-rw-r--r--dev-java/felix-framework/felix-framework-7.0.5-r2.ebuild2
-rw-r--r--dev-java/felix-gogo-runtime/felix-gogo-runtime-1.1.6.ebuild2
-rw-r--r--dev-java/felix-main/felix-main-7.0.5-r2.ebuild2
-rw-r--r--dev-java/felix-resolver/felix-resolver-2.0.4-r1.ebuild2
-rw-r--r--dev-java/felix-utils/felix-utils-1.11.8-r1.ebuild2
-rw-r--r--dev-java/findbugs-annotations/findbugs-annotations-3.0.1.ebuild2
-rw-r--r--dev-java/fishbowl/fishbowl-1.4.1.ebuild4
-rw-r--r--dev-java/fontbox/fontbox-2.0.27.ebuild4
-rw-r--r--dev-java/fop/fop-2.9-r1.ebuild2
-rw-r--r--dev-java/freenet-ext/freenet-ext-29-r1.ebuild2
-rw-r--r--dev-java/gnu-regexp/gnu-regexp-1.1.4-r4.ebuild2
-rw-r--r--dev-java/gradle-bin/gradle-bin-8.10.2.ebuild2
-rw-r--r--dev-java/gradle-bin/gradle-bin-8.10.ebuild2
-rw-r--r--dev-java/gradle-bin/gradle-bin-8.4.ebuild2
-rw-r--r--dev-java/gradle-bin/gradle-bin-8.5.ebuild2
-rw-r--r--dev-java/gradle-bin/gradle-bin-8.7.ebuild2
-rw-r--r--dev-java/greenmail/greenmail-2.0.0_alpha2.ebuild2
-rw-r--r--dev-java/gson/gson-2.11.0-r2.ebuild2
-rw-r--r--dev-java/guava-testlib/guava-testlib-33.2.0.ebuild2
-rw-r--r--dev-java/guava-testlib/guava-testlib-33.3.0.ebuild2
-rw-r--r--dev-java/guava/guava-33.2.0.ebuild2
-rw-r--r--dev-java/guava/guava-33.3.0.ebuild2
-rw-r--r--dev-java/guice/guice-5.1.0-r1.ebuild2
-rw-r--r--dev-java/hamcrest-core/hamcrest-core-1.1-r4.ebuild2
-rw-r--r--dev-java/hamcrest-core/hamcrest-core-1.3-r3.ebuild2
-rw-r--r--dev-java/hamcrest-generator/hamcrest-generator-1.3-r4.ebuild2
-rw-r--r--dev-java/hamcrest-library/hamcrest-library-1.3-r3.ebuild2
-rw-r--r--dev-java/hamcrest/hamcrest-3.0.ebuild2
-rw-r--r--dev-java/hashcash/hashcash-1.1.ebuild2
-rw-r--r--dev-java/hawtjni-runtime/hawtjni-runtime-1.18.ebuild2
-rw-r--r--dev-java/htmlcleaner/htmlcleaner-2.29-r1.ebuild2
-rw-r--r--dev-java/httpcomponents-client/httpcomponents-client-4.5.13-r2.ebuild2
-rw-r--r--dev-java/httpcore/httpcore-4.4.14-r1.ebuild2
-rw-r--r--dev-java/icedtea-sound/icedtea-sound-1.0.1-r1.ebuild2
-rw-r--r--dev-java/icedtea-web/icedtea-web-1.8.8-r1.ebuild2
-rw-r--r--dev-java/icu4j/icu4j-75.1.ebuild2
-rw-r--r--dev-java/identicon/identicon-1.0.ebuild2
-rw-r--r--dev-java/injection-api/injection-api-2.0.1.ebuild2
-rw-r--r--dev-java/iso-relax/iso-relax-20050331-r7.ebuild2
-rw-r--r--dev-java/istack-commons-runtime/istack-commons-runtime-3.0.12.ebuild2
-rw-r--r--dev-java/istack-commons-runtime/istack-commons-runtime-4.1.1-r1.ebuild2
-rw-r--r--dev-java/j2objc-annotations/j2objc-annotations-3.0.0-r1.ebuild2
-rw-r--r--dev-java/jackcess/jackcess-4.0.0.ebuild2
-rw-r--r--dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1-r3.ebuild2
-rw-r--r--dev-java/jackson-annotations/jackson-annotations-2.13.4.ebuild2
-rw-r--r--dev-java/jackson-core/jackson-core-2.13.4.ebuild2
-rw-r--r--dev-java/jackson-databind/jackson-databind-2.13.4.1.ebuild2
-rw-r--r--dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.4-r1.ebuild2
-rw-r--r--dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.4-r1.ebuild2
-rw-r--r--dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.4-r1.ebuild2
-rw-r--r--dev-java/jacl/jacl-1.4.1-r2.ebuild2
-rw-r--r--dev-java/jai-imageio-core/jai-imageio-core-1.4.0.ebuild4
-rw-r--r--dev-java/jai-imageio-jpeg2000/jai-imageio-jpeg2000-1.4.0.ebuild4
-rw-r--r--dev-java/jakarta-activation-api/jakarta-activation-api-1.2.2-r1.ebuild2
-rw-r--r--dev-java/jakarta-activation-api/jakarta-activation-api-2.1.1.ebuild2
-rw-r--r--dev-java/jakarta-activation/jakarta-activation-1.2.2-r1.ebuild2
-rw-r--r--dev-java/jakarta-activation/jakarta-activation-2.0.1-r1.ebuild2
-rw-r--r--dev-java/jakarta-annotations-api/jakarta-annotations-api-2.1.1.ebuild2
-rw-r--r--dev-java/jakarta-el-api/jakarta-el-api-5.0.1-r1.ebuild2
-rw-r--r--dev-java/jakarta-interceptors/jakarta-interceptors-2.1.0.ebuild2
-rw-r--r--dev-java/jakarta-json-api/jakarta-json-api-1.1.6-r1.ebuild2
-rw-r--r--dev-java/jakarta-mail-api/jakarta-mail-api-2.1.3.ebuild2
-rw-r--r--dev-java/jakarta-mail/jakarta-mail-2.0.1.ebuild2
-rw-r--r--dev-java/jakarta-oro/jakarta-oro-2.0.8-r5.ebuild2
-rw-r--r--dev-java/jakarta-regexp/jakarta-regexp-1.4-r3.ebuild2
-rw-r--r--dev-java/jakarta-servlet-api/jakarta-servlet-api-4.0.4.ebuild2
-rw-r--r--dev-java/jakarta-servlet-api/jakarta-servlet-api-6.0.0.ebuild2
-rw-r--r--dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2-r2.ebuild2
-rw-r--r--dev-java/jal/jal-20031117-r7.ebuild2
-rw-r--r--dev-java/jansi-native/jansi-native-1.8.ebuild2
-rw-r--r--dev-java/jansi/jansi-1.13.ebuild2
-rw-r--r--dev-java/jansi/jansi-2.4.0-r1.ebuild2
-rw-r--r--dev-java/java-dep-check/java-dep-check-0.5-r4.ebuild2
-rw-r--r--dev-java/java-diff-utils/java-diff-utils-1.3.0.ebuild4
-rw-r--r--dev-java/java-diff-utils/java-diff-utils-4.12.ebuild4
-rw-r--r--dev-java/java-getopt/java-getopt-1.0.14-r2.ebuild2
-rw-r--r--dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r2.ebuild2
-rw-r--r--dev-java/javacc/javacc-4.1-r1.ebuild2
-rw-r--r--dev-java/javacc/javacc-7.0.13-r1.ebuild2
-rw-r--r--dev-java/javacc/javacc-7.0.4-r1.ebuild2
-rw-r--r--dev-java/javahelp/javahelp-2.0.05_p20170719-r4.ebuild2
-rw-r--r--dev-java/javaparser-core/javaparser-core-3.13.10.ebuild2
-rw-r--r--dev-java/javassist/javassist-3.29.2.ebuild2
-rw-r--r--dev-java/javatoolkit/javatoolkit-0.6.7-r1.ebuild2
-rw-r--r--dev-java/javax-el-api/javax-el-api-2.2.ebuild2
-rw-r--r--dev-java/javax-inject/javax-inject-1-r4.ebuild2
-rw-r--r--dev-java/javax-jms-api/javax-jms-api-2.0.3.ebuild2
-rw-r--r--dev-java/javax-jsp-api/javax-jsp-api-2.0.ebuild2
-rw-r--r--dev-java/javax-jsp-api/javax-jsp-api-2.2.ebuild2
-rw-r--r--dev-java/javax-mail/javax-mail-1.6.7-r2.ebuild2
-rw-r--r--dev-java/javax-persistence-api/javax-persistence-api-2.2-r1.ebuild2
-rw-r--r--dev-java/javax-servlet-api/javax-servlet-api-2.2.ebuild2
-rw-r--r--dev-java/javax-servlet-api/javax-servlet-api-2.5.ebuild2
-rw-r--r--dev-java/javax-servlet-api/javax-servlet-api-3.0.1.ebuild2
-rw-r--r--dev-java/javax-servlet-api/javax-servlet-api-3.1.0.ebuild2
-rw-r--r--dev-java/jax-rpc-api/jax-rpc-api-1.1.4.ebuild2
-rw-r--r--dev-java/jaxb-api/jaxb-api-2.3.3-r2.ebuild2
-rw-r--r--dev-java/jaxb-api/jaxb-api-3.0.1-r1.ebuild2
-rw-r--r--dev-java/jaxb-api/jaxb-api-4.0.2.ebuild2
-rw-r--r--dev-java/jaxb-runtime/jaxb-runtime-2.3.8.ebuild2
-rw-r--r--dev-java/jaxb-runtime/jaxb-runtime-4.0.0-r1.ebuild2
-rw-r--r--dev-java/jaxb-stax-ex/jaxb-stax-ex-1.8.3.ebuild2
-rw-r--r--dev-java/jaxb-stax-ex/jaxb-stax-ex-2.1.0-r1.ebuild2
-rw-r--r--dev-java/jaxen/jaxen-2.0.0.ebuild2
-rw-r--r--dev-java/jaxrs-api/jaxrs-api-2.1.6-r1.ebuild2
-rw-r--r--dev-java/jaxws-api/jaxws-api-2.3.3.ebuild2
-rw-r--r--dev-java/jbcrypt/jbcrypt-0.4.ebuild2
-rw-r--r--dev-java/jbig2-imageio/jbig2-imageio-3.0.3.ebuild4
-rw-r--r--dev-java/jbitcollider-core/jbitcollider-core-0.8-r2.ebuild2
-rw-r--r--dev-java/jboss-jms-api/jboss-jms-api-1.0.1.ebuild2
-rw-r--r--dev-java/jcalendar/jcalendar-1.4-r2.ebuild2
-rw-r--r--dev-java/jchart2d/jchart2d-3.2.2-r1.ebuild2
-rw-r--r--dev-java/jcifs/jcifs-1.3.19-r2.ebuild4
-rw-r--r--dev-java/jclasslib/jclasslib-4.3.1.ebuild2
-rw-r--r--dev-java/jcommander/jcommander-1.64-r1.ebuild2
-rw-r--r--dev-java/jcommander/jcommander-1.82.ebuild2
-rw-r--r--dev-java/jctools-core/jctools-core-4.0.3-r1.ebuild2
-rw-r--r--dev-java/jctools-core/jctools-core-4.0.5-r1.ebuild2
-rw-r--r--dev-java/jdbc-mysql/Manifest1
-rw-r--r--dev-java/jdbc-mysql/jdbc-mysql-8.3.0.ebuild55
-rw-r--r--dev-java/jdbc-mysql/jdbc-mysql-9.0.0.ebuild2
-rw-r--r--dev-java/jdbc-postgresql/jdbc-postgresql-42.7.3.ebuild2
-rw-r--r--dev-java/jdepend/jdepend-2.10-r1.ebuild2
-rw-r--r--dev-java/jdisasm/jdisasm-1.0.6.ebuild2
-rw-r--r--dev-java/jdom/jdom-1.1.3-r2.ebuild2
-rw-r--r--dev-java/jdom/jdom-2.0.6.1.ebuild2
-rw-r--r--dev-java/jeromq/jeromq-0.5.2.ebuild2
-rw-r--r--dev-java/jeromq/jeromq-0.6.0-r1.ebuild2
-rw-r--r--dev-java/jetbrains-annotations/Manifest2
-rw-r--r--dev-java/jetbrains-annotations/jetbrains-annotations-26.0.1.ebuild (renamed from dev-java/jetbrains-annotations/jetbrains-annotations-24.1.0.ebuild)2
-rw-r--r--dev-java/jffi/jffi-1.3.10.ebuild2
-rw-r--r--dev-java/jgoodies-common/jgoodies-common-1.8.0-r1.ebuild4
-rw-r--r--dev-java/jgoodies-looks/jgoodies-looks-2.6.0-r1.ebuild4
-rw-r--r--dev-java/jide-oss/jide-oss-3.7.12-r1.ebuild2
-rw-r--r--dev-java/jimfs/jimfs-1.3.0.ebuild2
-rw-r--r--dev-java/jline/jline-2.14.6.ebuild2
-rw-r--r--dev-java/jmh-core/jmh-core-1.37.ebuild2
-rw-r--r--dev-java/jmh-generator-annprocess/jmh-generator-annprocess-1.37.ebuild2
-rw-r--r--dev-java/jmock/jmock-1.2.0-r2.ebuild2
-rw-r--r--dev-java/jmock/jmock-2.12.0.ebuild2
-rw-r--r--dev-java/jna/jna-5.13.0-r1.ebuild2
-rw-r--r--dev-java/jna/jna-5.14.0-r1.ebuild2
-rw-r--r--dev-java/jnacl/jnacl-1.0-r1.ebuild2
-rw-r--r--dev-java/jnacl/jnacl-1.0.ebuild2
-rw-r--r--dev-java/jnr-a64asm/jnr-a64asm-1.0.0.ebuild2
-rw-r--r--dev-java/jnr-constants/jnr-constants-0.10.4.ebuild2
-rw-r--r--dev-java/jnr-ffi/jnr-ffi-2.2.12.ebuild2
-rw-r--r--dev-java/jnr-netdb/jnr-netdb-1.2.0.ebuild2
-rw-r--r--dev-java/jnr-posix/jnr-posix-3.1.16.ebuild2
-rw-r--r--dev-java/jnr-x86asm/jnr-x86asm-1.0.2-r2.ebuild2
-rw-r--r--dev-java/joda-convert/joda-convert-2.2.2-r2.ebuild2
-rw-r--r--dev-java/joda-time/joda-time-2.11.2.ebuild2
-rw-r--r--dev-java/jol-core/jol-core-0.16-r1.ebuild2
-rw-r--r--dev-java/jopt-simple/jopt-simple-5.0.4.ebuild2
-rw-r--r--dev-java/jrobin/jrobin-1.6.0-r2.ebuild4
-rw-r--r--dev-java/jsch-agent-proxy/jsch-agent-proxy-0.0.9.ebuild4
-rw-r--r--dev-java/jsch/jsch-0.1.55.ebuild2
-rw-r--r--dev-java/json-simple/json-simple-2.3.1.ebuild2
-rw-r--r--dev-java/json-smart/json-smart-1.3.3.ebuild2
-rw-r--r--dev-java/json-smart/json-smart-2.5.0.ebuild2
-rw-r--r--dev-java/jsonrpc2-base/jsonrpc2-base-1.38.2.ebuild2
-rw-r--r--dev-java/jsonrpc2-server/jsonrpc2-server-1.11.1.ebuild2
-rw-r--r--dev-java/jsr305/jsr305-3.0.2-r1.ebuild2
-rw-r--r--dev-java/jstl-api/jstl-api-1.2.7.ebuild2
-rw-r--r--dev-java/jstl/jstl-1.2.7.ebuild2
-rw-r--r--dev-java/jtds/jtds-1.3.1-r1.ebuild2
-rw-r--r--dev-java/jtidy/jtidy-1.0-r2.ebuild2
-rw-r--r--dev-java/jtwig-core/jtwig-core-5.87.0.ebuild2
-rw-r--r--dev-java/jtwig-reflection/jtwig-reflection-5.87.0.ebuild2
-rw-r--r--dev-java/jul-to-slf4j/jul-to-slf4j-2.0.3.ebuild2
-rw-r--r--dev-java/junit-clptr/junit-clptr-1.2.2.ebuild4
-rw-r--r--dev-java/junit-dataprovider/junit-dataprovider-2.9.ebuild2
-rw-r--r--dev-java/junit/junit-3.8.2-r2.ebuild2
-rw-r--r--dev-java/junit/junit-4.13.2_p20240222.ebuild2
-rw-r--r--dev-java/junit/junit-5.10.3.ebuild2
-rw-r--r--dev-java/junitparams/junitparams-1.1.1-r1.ebuild2
-rw-r--r--dev-java/jzlib/jzlib-1.1.3-r2.ebuild2
-rw-r--r--dev-java/kafka-clients/kafka-clients-1.1.1-r2.ebuild2
-rw-r--r--dev-java/leiningen-bin/leiningen-bin-2.11.2.ebuild2
-rw-r--r--dev-java/libg/libg-7.0.0.ebuild2
-rw-r--r--dev-java/lmax-disruptor/lmax-disruptor-3.4.4.ebuild2
-rw-r--r--dev-java/log4j-12-api/log4j-12-api-2.19.0.ebuild2
-rw-r--r--dev-java/log4j-api/log4j-api-2.19.0.ebuild2
-rw-r--r--dev-java/log4j-core/log4j-core-2.19.0-r1.ebuild2
-rw-r--r--dev-java/log4j-over-slf4j/log4j-over-slf4j-2.0.3.ebuild2
-rw-r--r--dev-java/lucene/lucene-2.4.1-r5.ebuild2
-rw-r--r--dev-java/lz4-java/lz4-java-1.8.0-r6.ebuild2
-rw-r--r--dev-java/lzma/lzma-22.01.ebuild2
-rw-r--r--dev-java/lzmajio/lzmajio-0.95-r3.ebuild2
-rw-r--r--dev-java/maven-bin/maven-bin-3.8.8-r1.ebuild4
-rw-r--r--dev-java/maven-bin/maven-bin-3.9.9.ebuild2
-rw-r--r--dev-java/mchange-commons/mchange-commons-0.2.20.ebuild4
-rw-r--r--dev-java/memoryfilesystem/memoryfilesystem-2.3.0.ebuild2
-rw-r--r--dev-java/mersennetwister/mersennetwister-0_pre23765-r2.ebuild2
-rw-r--r--dev-java/metainf-services/metainf-services-1.11.ebuild2
-rw-r--r--dev-java/metainf-services/metainf-services-1.9.ebuild4
-rw-r--r--dev-java/miglayout/miglayout-5.3.ebuild4
-rw-r--r--dev-java/mill-bin/mill-bin-0.11.12.ebuild2
-rw-r--r--dev-java/mill-bin/mill-bin-0.11.6.ebuild2
-rw-r--r--dev-java/mill-bin/mill-bin-0.11.7.ebuild2
-rw-r--r--dev-java/minidns-core/minidns-core-1.0.4.ebuild2
-rw-r--r--dev-java/mockito/mockito-1.9.5-r4.ebuild2
-rw-r--r--dev-java/mockito/mockito-2.28.2.ebuild2
-rw-r--r--dev-java/mockito/mockito-4.11.0.ebuild2
-rw-r--r--dev-java/msv/msv-2022.7.ebuild2
-rw-r--r--dev-java/mvel/mvel-2.5.0-r1.ebuild2
-rw-r--r--dev-java/mvel/mvel-2.5.2.ebuild2
-rw-r--r--dev-java/objenesis/objenesis-3.3.ebuild2
-rw-r--r--dev-java/open-test-reporting-events/open-test-reporting-events-0.1.0_pre1.ebuild2
-rw-r--r--dev-java/open-test-reporting-schema/open-test-reporting-schema-0.1.0_pre1.ebuild2
-rw-r--r--dev-java/openjdk/Manifest7
-rw-r--r--dev-java/openjdk/openjdk-11.0.25_p9.ebuild316
-rw-r--r--dev-java/openjdk/openjdk-17.0.13_p11.ebuild325
-rw-r--r--dev-java/openjdk/openjdk-21.0.5_p11.ebuild (renamed from dev-java/openjdk/openjdk-21.0.4_p7.ebuild)0
-rw-r--r--dev-java/openjdk/openjdk-23.0.1_p11.ebuild (renamed from dev-java/openjdk/openjdk-23_p37.ebuild)3
-rw-r--r--dev-java/openjdk/openjdk-8.432_p06.ebuild283
-rw-r--r--dev-java/opentest4j/opentest4j-1.2.0-r1.ebuild2
-rw-r--r--dev-java/opentest4j/opentest4j-1.3.0-r1.ebuild2
-rw-r--r--dev-java/osgi-annotation/osgi-annotation-8.1.0.ebuild2
-rw-r--r--dev-java/osgi-cmpn/osgi-cmpn-8.0.0-r1.ebuild2
-rw-r--r--dev-java/osgi-core/osgi-core-8.0.0.ebuild2
-rw-r--r--dev-java/osgi-service-log/osgi-service-log-1.3.0.ebuild2
-rw-r--r--dev-java/osgi-service-subsystem/osgi-service-subsystem-1.1.0.ebuild2
-rw-r--r--dev-java/parboiled/parboiled-1.4.1.ebuild2
-rw-r--r--dev-java/pdfbox/pdfbox-2.0.27.ebuild4
-rw-r--r--dev-java/picocli/picocli-4.6.3-r1.ebuild2
-rw-r--r--dev-java/plexus-classworlds/plexus-classworlds-2.7.0-r1.ebuild2
-rw-r--r--dev-java/poi/poi-5.2.5.ebuild2
-rw-r--r--dev-java/protobuf-java/Manifest1
-rw-r--r--dev-java/protobuf-java/files/protobuf-java-3.23.0-unittest_retention.proto.patch35
-rw-r--r--dev-java/protobuf-java/protobuf-java-3.25.3.ebuild166
-rw-r--r--dev-java/protobuf-java/protobuf-java-4.27.2.ebuild2
-rw-r--r--dev-java/protobuf-java/protobuf-java-4.28.1.ebuild2
-rw-r--r--dev-java/qdox/qdox-1.12.1-r6.ebuild2
-rw-r--r--dev-java/randomized-runner/randomized-runner-2.8.0.ebuild2
-rw-r--r--dev-java/reflections/reflections-0.9.12-r6.ebuild2
-rw-r--r--dev-java/relaxng-datatype/relaxng-datatype-20020414.ebuild2
-rw-r--r--dev-java/reload4j/reload4j-1.2.22.ebuild2
-rw-r--r--dev-java/rhino/rhino-1.7.14-r1.ebuild2
-rw-r--r--dev-java/rome/rome-0.9-r4.ebuild4
-rw-r--r--dev-java/rxtx/rxtx-2.2_pre2-r2.ebuild2
-rw-r--r--dev-java/saslprep/saslprep-1.1-r1.ebuild4
-rw-r--r--dev-java/sax/sax-2.2.1-r5.ebuild2
-rw-r--r--dev-java/saxon/saxon-9.2.0.6-r5.ebuild2
-rw-r--r--dev-java/sbt/sbt-0.13.18-r1.ebuild4
-rw-r--r--dev-java/scala-cli-bin/Manifest9
-rw-r--r--dev-java/scala-cli-bin/scala-cli-bin-1.2.2.ebuild78
-rw-r--r--dev-java/scala-cli-bin/scala-cli-bin-1.4.3.ebuild78
-rw-r--r--dev-java/scala-cli-bin/scala-cli-bin-1.5.0.ebuild78
-rw-r--r--dev-java/scala-cli-bin/scala-cli-bin-1.5.1.ebuild2
-rw-r--r--dev-java/scram/scram-2.1.ebuild2
-rw-r--r--dev-java/shrinkwrap-api/shrinkwrap-api-1.2.6.ebuild2
-rw-r--r--dev-java/shrinkwrap-impl-base/shrinkwrap-impl-base-1.2.6.ebuild2
-rw-r--r--dev-java/shrinkwrap-spi/shrinkwrap-spi-1.2.6-r1.ebuild2
-rw-r--r--dev-java/sjsxp/sjsxp-1.0.2.ebuild2
-rw-r--r--dev-java/slf4j-api/slf4j-api-2.0.3.ebuild2
-rw-r--r--dev-java/slf4j-ext/slf4j-ext-2.0.3.ebuild2
-rw-r--r--dev-java/slf4j-nop/slf4j-nop-2.0.3.ebuild2
-rw-r--r--dev-java/slf4j-reload4j/slf4j-reload4j-2.0.3.ebuild2
-rw-r--r--dev-java/slf4j-simple/slf4j-simple-2.0.3.ebuild2
-rw-r--r--dev-java/snakeyaml/snakeyaml-1.33.ebuild2
-rw-r--r--dev-java/snakeyaml/snakeyaml-2.0.ebuild2
-rw-r--r--dev-java/snappy-java/snappy-java-1.1.10.5-r2.ebuild2
-rw-r--r--dev-java/snappy-java/snappy-java-1.1.10.7.ebuild2
-rw-r--r--dev-java/sparsebitset/sparsebitset-1.3.ebuild2
-rw-r--r--dev-java/stax2-api/stax2-api-4.2.1-r1.ebuild2
-rw-r--r--dev-java/stringprep/stringprep-1.1.ebuild4
-rw-r--r--dev-java/stringtemplate/stringtemplate-3.2.1-r3.ebuild2
-rw-r--r--dev-java/stringtemplate/stringtemplate-4.3.4.ebuild2
-rw-r--r--dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r2.ebuild2
-rw-r--r--dev-java/swing-layout/swing-layout-1.0.4-r2.ebuild4
-rw-r--r--dev-java/swingx-beaninfo/swingx-beaninfo-1.6.4-r1.ebuild4
-rw-r--r--dev-java/swingx/swingx-1.6.4-r1.ebuild4
-rw-r--r--dev-java/swt/swt-3.7.2-r4.ebuild2
-rw-r--r--dev-java/system-rules/system-rules-1.19.0.ebuild4
-rw-r--r--dev-java/testng/testng-6.11-r1.ebuild2
-rw-r--r--dev-java/tomcat-native/tomcat-native-1.3.1.ebuild2
-rw-r--r--dev-java/tomcat-native/tomcat-native-2.0.8.ebuild2
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.40-r1.ebuild2
-rw-r--r--dev-java/treelayout/treelayout-1.0.3-r1.ebuild2
-rw-r--r--dev-java/txw2/txw2-2.3.8-r1.ebuild2
-rw-r--r--dev-java/typesafe-config/typesafe-config-1.4.2.ebuild4
-rw-r--r--dev-java/unbescape/unbescape-1.1.6.ebuild2
-rw-r--r--dev-java/univocity-parsers/univocity-parsers-2.9.1.ebuild2
-rw-r--r--dev-java/velocity/velocity-2.3_p20240314.ebuild2
-rw-r--r--dev-java/waffle-jna/waffle-jna-3.3.0.ebuild2
-rw-r--r--dev-java/woodstox-core/woodstox-core-6.4.0-r1.ebuild2
-rw-r--r--dev-java/wsdl4j/wsdl4j-1.6.3.ebuild2
-rw-r--r--dev-java/xalan-serializer/xalan-serializer-2.7.3-r1.ebuild2
-rw-r--r--dev-java/xalan/xalan-2.7.3-r2.ebuild2
-rw-r--r--dev-java/xerces/xerces-2.12.2-r2.ebuild2
-rw-r--r--dev-java/xerial-core/xerial-core-2.1.ebuild2
-rw-r--r--dev-java/xml-commons-external/xml-commons-external-1.4.01-r2.ebuild2
-rw-r--r--dev-java/xml-commons-resolver/xml-commons-resolver-1.2-r3.ebuild2
-rw-r--r--dev-java/xmlgraphics-commons/xmlgraphics-commons-2.9.ebuild4
-rw-r--r--dev-java/xmlunit-assertj/xmlunit-assertj-2.9.1.ebuild2
-rw-r--r--dev-java/xmlunit-core/xmlunit-core-2.9.1.ebuild2
-rw-r--r--dev-java/xmlunit-matchers/xmlunit-matchers-2.9.1.ebuild2
-rw-r--r--dev-java/xmlunit/xmlunit-1.6-r2.ebuild2
-rw-r--r--dev-java/xmpbox/xmpbox-2.0.27.ebuild4
-rw-r--r--dev-java/xom/xom-1.3.8-r1.ebuild2
-rw-r--r--dev-java/xpp2/xpp2-2.1.10-r4.ebuild2
-rw-r--r--dev-java/xpp3/xpp3-1.1.4c-r6.ebuild2
-rw-r--r--dev-java/xsdlib/xsdlib-2022.7.ebuild2
-rw-r--r--dev-java/xz-java/xz-java-1.10.ebuild2
-rw-r--r--dev-java/xz-java/xz-java-1.9-r2.ebuild2
-rw-r--r--dev-java/zstd-jni/zstd-jni-1.5.2.5.ebuild2
-rw-r--r--dev-java/zxing-core/zxing-core-3.5.1.ebuild2
-rw-r--r--dev-java/zxing-javase/zxing-javase-3.5.1.ebuild2
413 files changed, 1553 insertions, 933 deletions
diff --git a/dev-java/angus-activation/angus-activation-1.0.0-r1.ebuild b/dev-java/angus-activation/angus-activation-1.0.0-r1.ebuild
index f1bad5472460..378f8eb8372f 100644
--- a/dev-java/angus-activation/angus-activation-1.0.0-r1.ebuild
+++ b/dev-java/angus-activation/angus-activation-1.0.0-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/eclipse-ee4j/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
LICENSE="EPL-1.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND="
dev-java/jakarta-activation-api:2
diff --git a/dev-java/animal-sniffer-annotations/animal-sniffer-annotations-1.15-r1.ebuild b/dev-java/animal-sniffer-annotations/animal-sniffer-annotations-1.15-r1.ebuild
index 5256f5d4e642..b54e117c75c4 100644
--- a/dev-java/animal-sniffer-annotations/animal-sniffer-annotations-1.15-r1.ebuild
+++ b/dev-java/animal-sniffer-annotations/animal-sniffer-annotations-1.15-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.mojohaus.org/animal-sniffer/animal-sniffer-annotations/"
SRC_URI="https://github.com/mojohaus/${MY_PN}/archive/${MY_PN}-parent-${PV}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r3.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r3.ebuild
index 120a631bc481..fe75a3cfb79f 100644
--- a/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r3.ebuild
+++ b/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r3.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${MY_COMMIT}/${PN}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="amd64 ppc64"
# Too many tests fail
RESTRICT="test"
diff --git a/dev-java/ant-core/ant-core-1.10.14.ebuild b/dev-java/ant-core/ant-core-1.10.14.ebuild
index 7dd855badd0a..d5273521eb19 100644
--- a/dev-java/ant-core/ant-core-1.10.14.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.14.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"
LICENSE="Apache-2.0"
SLOT="0"
-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"
DEPEND="
~dev-java/ant-${PV}:0
diff --git a/dev-java/ant-ivy/ant-ivy-2.5.0-r4.ebuild b/dev-java/ant-ivy/ant-ivy-2.5.0-r4.ebuild
index 32e0a711eb11..da472003c39b 100644
--- a/dev-java/ant-ivy/ant-ivy-2.5.0-r4.ebuild
+++ b/dev-java/ant-ivy/ant-ivy-2.5.0-r4.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/apache-ivy-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="amd64 ppc64"
PROPERTIES="test_network"
RESTRICT="test"
diff --git a/dev-java/ant/ant-1.10.14-r3.ebuild b/dev-java/ant/ant-1.10.14-r3.ebuild
index 33bf5d2dd89d..a14381eb9ef6 100644
--- a/dev-java/ant/ant-1.10.14-r3.ebuild
+++ b/dev-java/ant/ant-1.10.14-r3.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/apache-${P}"
LICENSE="Apache-2.0"
SLOT="0"
-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"
IUSE="antlr bcel bsf commonslogging commonsnet imageio jai jakartamail javamail jdepend
jmf jsch junit junit4 junitlauncher log4j oro regexp resolver swing testutil xalan xz"
diff --git a/dev-java/antlr-runtime/antlr-runtime-3.5.3.ebuild b/dev-java/antlr-runtime/antlr-runtime-3.5.3.ebuild
index 9c818cf6088c..5b764b32461f 100644
--- a/dev-java/antlr-runtime/antlr-runtime-3.5.3.ebuild
+++ b/dev-java/antlr-runtime/antlr-runtime-3.5.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://repo1.maven.org/maven2/org/antlr/${PN}/${PV}/${P}-sources.jar"
LICENSE="BSD"
SLOT="3.5"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
# Common dependencies
# POM: ${P}.pom
diff --git a/dev-java/antlr-runtime/antlr-runtime-4.9.3.ebuild b/dev-java/antlr-runtime/antlr-runtime-4.9.3.ebuild
index f9eadcf7e618..99f84e8023e7 100644
--- a/dev-java/antlr-runtime/antlr-runtime-4.9.3.ebuild
+++ b/dev-java/antlr-runtime/antlr-runtime-4.9.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/antlr/antlr4/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="4"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND="
>=virtual/jdk-1.8:*
diff --git a/dev-java/antlr-tool/antlr-tool-3.5.3-r1.ebuild b/dev-java/antlr-tool/antlr-tool-3.5.3-r1.ebuild
index b750b82eee90..a8fd495c7da5 100644
--- a/dev-java/antlr-tool/antlr-tool-3.5.3-r1.ebuild
+++ b/dev-java/antlr-tool/antlr-tool-3.5.3-r1.ebuild
@@ -27,7 +27,7 @@ SRC_URI="
LICENSE="BSD"
SLOT="3.5"
-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"
CP_DEPEND="
~dev-java/antlr-runtime-${PV}:${SLOT}
diff --git a/dev-java/antlr-tool/antlr-tool-4.9.3-r3.ebuild b/dev-java/antlr-tool/antlr-tool-4.9.3-r3.ebuild
index fecba3c81023..df91be0dfc6b 100644
--- a/dev-java/antlr-tool/antlr-tool-4.9.3-r3.ebuild
+++ b/dev-java/antlr-tool/antlr-tool-4.9.3-r3.ebuild
@@ -27,7 +27,7 @@ S="${WORKDIR}/${MY_PN}4-${PV}"
LICENSE="BSD"
SLOT="4"
-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"
CP_DEPEND="
~dev-java/antlr-runtime-${PV}:${SLOT}
diff --git a/dev-java/antlr/antlr-2.7.7-r9.ebuild b/dev-java/antlr/antlr-2.7.7-r9.ebuild
index 7559cb8e6c03..a82c35657a74 100644
--- a/dev-java/antlr/antlr-2.7.7-r9.ebuild
+++ b/dev-java/antlr/antlr-2.7.7-r9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.antlr2.org/download/${P}.tar.gz"
LICENSE="public-domain"
SLOT="0"
-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"
IUSE="examples"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/antlr/antlr-3.2-r2.ebuild b/dev-java/antlr/antlr-3.2-r2.ebuild
index 7c18afcd7a69..cea7aa105420 100644
--- a/dev-java/antlr/antlr-3.2-r2.ebuild
+++ b/dev-java/antlr/antlr-3.2-r2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P}"
LICENSE="BSD"
SLOT="3"
-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"
RESTRICT="!test? ( test )"
CP_DEPEND=">=dev-java/antlr-2.7.7-r7:0
diff --git a/dev-java/antlr/antlr-3.5.3.ebuild b/dev-java/antlr/antlr-3.5.3.ebuild
index ecac2716d35c..d0a32d44e244 100644
--- a/dev-java/antlr/antlr-3.5.3.ebuild
+++ b/dev-java/antlr/antlr-3.5.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}3/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="3.5"
-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"
CP_DEPEND="
~dev-java/antlr-runtime-${PV}:${SLOT}
diff --git a/dev-java/antlr/antlr-4.9.3.ebuild b/dev-java/antlr/antlr-4.9.3.ebuild
index d538451e09b7..50b53bbba0b2 100644
--- a/dev-java/antlr/antlr-4.9.3.ebuild
+++ b/dev-java/antlr/antlr-4.9.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="4"
-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"
CP_DEPEND="
~dev-java/antlr-runtime-${PV}:${SLOT}
diff --git a/dev-java/antunit/antunit-1.4.1-r1.ebuild b/dev-java/antunit/antunit-1.4.1-r1.ebuild
index 44caf62ceb6c..ab1d74554301 100644
--- a/dev-java/antunit/antunit-1.4.1-r1.ebuild
+++ b/dev-java/antunit/antunit-1.4.1-r1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/apache-ant-${P}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/ant.apache.org.asc"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-ant )"
diff --git a/dev-java/aopalliance/aopalliance-1.0-r3.ebuild b/dev-java/aopalliance/aopalliance-1.0-r3.ebuild
index a17bc0fa0632..8cd8ff2e5ac9 100644
--- a/dev-java/aopalliance/aopalliance-1.0-r3.ebuild
+++ b/dev-java/aopalliance/aopalliance-1.0-r3.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="http://aopalliance.sourceforge.net/"
LICENSE="public-domain"
SLOT="1"
-KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux"
+KEYWORDS="amd64 arm64 ppc64 ~amd64-linux"
IUSE=""
diff --git a/dev-java/apache-rat/apache-rat-0.15-r2.ebuild b/dev-java/apache-rat/apache-rat-0.15-r2.ebuild
index 57fff834a4f4..628754f463cb 100644
--- a/dev-java/apache-rat/apache-rat-0.15-r2.ebuild
+++ b/dev-java/apache-rat/apache-rat-0.15-r2.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/${P}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64"
CP_DEPEND="
>=dev-java/ant-1.10.14:0
diff --git a/dev-java/apiguardian-api/apiguardian-api-1.1.2-r1.ebuild b/dev-java/apiguardian-api/apiguardian-api-1.1.2-r1.ebuild
index f3022d5e5601..5192f2886ea1 100644
--- a/dev-java/apiguardian-api/apiguardian-api-1.1.2-r1.ebuild
+++ b/dev-java/apiguardian-api/apiguardian-api-1.1.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/apiguardian-team/apiguardian/archive/r${PV}.tar.gz -
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND=">=virtual/jdk-11:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/asm/asm-9.7.1.ebuild b/dev-java/asm/asm-9.7.1.ebuild
index c4a395c336dc..60801aa85963 100644
--- a/dev-java/asm/asm-9.7.1.ebuild
+++ b/dev-java/asm/asm-9.7.1.ebuild
@@ -24,7 +24,7 @@ S="${WORKDIR}/asm-${MY_P}"
LICENSE="BSD"
SLOT="9"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x64-macos"
DEPEND=">=virtual/jdk-11:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/asm/asm-9.7.ebuild b/dev-java/asm/asm-9.7.ebuild
index a48b10c979f3..a4632a9dad61 100644
--- a/dev-java/asm/asm-9.7.ebuild
+++ b/dev-java/asm/asm-9.7.ebuild
@@ -24,7 +24,7 @@ S="${WORKDIR}/asm-${MY_P}"
LICENSE="BSD"
SLOT="9"
-KEYWORDS="amd64 arm64 ppc64 x86 ~x64-macos"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos"
DEPEND=">=virtual/jdk-11:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/aspectj/aspectj-1.9.7-r1.ebuild b/dev-java/aspectj/aspectj-1.9.7-r1.ebuild
index e3b7c408c182..98bc968b3072 100644
--- a/dev-java/aspectj/aspectj-1.9.7-r1.ebuild
+++ b/dev-java/aspectj/aspectj-1.9.7-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/eclipse-aspectj/aspectj/archive/V${PV//./_}.tar.gz -
LICENSE="EPL-1.0"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64"
CDEPEND="dev-java/asm:9
dev-java/commons-logging:0
diff --git a/dev-java/assertj-core/assertj-core-3.10.0.ebuild b/dev-java/assertj-core/assertj-core-3.10.0.ebuild
index 1ef7799fc7ba..712160fe8cce 100644
--- a/dev-java/assertj-core/assertj-core-3.10.0.ebuild
+++ b/dev-java/assertj-core/assertj-core-3.10.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/assertj/${PN}/archive/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="3"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
CP_DEPEND="
>=dev-java/byte-buddy-1.12.12:0
diff --git a/dev-java/auto-service-annotations/auto-service-annotations-1.1.1.ebuild b/dev-java/auto-service-annotations/auto-service-annotations-1.1.1.ebuild
index ffcee6c4e4cd..d295c654b0d2 100644
--- a/dev-java/auto-service-annotations/auto-service-annotations-1.1.1.ebuild
+++ b/dev-java/auto-service-annotations/auto-service-annotations-1.1.1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/auto-auto-service-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/batik/batik-1.17-r1.ebuild b/dev-java/batik/batik-1.17-r1.ebuild
index b389f8994bd7..e7ed17559e98 100644
--- a/dev-java/batik/batik-1.17-r1.ebuild
+++ b/dev-java/batik/batik-1.17-r1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/batik-${PV}"
LICENSE="Apache-2.0"
SLOT="1.16"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc64"
CP_DEPEND="
dev-java/jacl:0
diff --git a/dev-java/bcel/bcel-6.10.0-r1.ebuild b/dev-java/bcel/bcel-6.10.0-r1.ebuild
index 904cfdf6478f..d6be8e9e7490 100644
--- a/dev-java/bcel/bcel-6.10.0-r1.ebuild
+++ b/dev-java/bcel/bcel-6.10.0-r1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src"
LICENSE="Apache-2.0"
SLOT="0"
-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"
VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
diff --git a/dev-java/bcel/bcel-6.6.0.ebuild b/dev-java/bcel/bcel-6.6.0.ebuild
index 29decd4f65f3..8ff1a7eb6dde 100644
--- a/dev-java/bcel/bcel-6.6.0.ebuild
+++ b/dev-java/bcel/bcel-6.6.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://archive.apache.org/dist/commons/bcel/source/bcel-${PV}-src.tar.
LICENSE="Apache-2.0"
SLOT="0"
-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"
# Common dependencies
# POM: pom.xml
diff --git a/dev-java/bcmail/bcmail-1.77-r1.ebuild b/dev-java/bcmail/bcmail-1.77-r1.ebuild
index fc5a0ce57369..f45590868d1c 100644
--- a/dev-java/bcmail/bcmail-1.77-r1.ebuild
+++ b/dev-java/bcmail/bcmail-1.77-r1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/bc-java-${MY_PV}/mail"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
CP_DEPEND="
~dev-java/bcpkix-${PV}:0
diff --git a/dev-java/bcmail/bcmail-1.78.1.ebuild b/dev-java/bcmail/bcmail-1.78.1.ebuild
index 98998b58cd38..24f9e19773c5 100644
--- a/dev-java/bcmail/bcmail-1.78.1.ebuild
+++ b/dev-java/bcmail/bcmail-1.78.1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/bc-java-${MY_PV}/mail"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
CP_DEPEND="
~dev-java/bcpkix-${PV}:0
diff --git a/dev-java/bcpg/bcpg-1.77.ebuild b/dev-java/bcpg/bcpg-1.77.ebuild
index cc3e0343f4be..37b677eed2f3 100644
--- a/dev-java/bcpg/bcpg-1.77.ebuild
+++ b/dev-java/bcpg/bcpg-1.77.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/bc-java-${MY_PV}/pg"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
CP_DEPEND="~dev-java/bcprov-${PV}:0"
DEPEND="${CP_DEPEND}
diff --git a/dev-java/bcpg/bcpg-1.78.1.ebuild b/dev-java/bcpg/bcpg-1.78.1.ebuild
index 982f3b13e17e..757092168ce3 100644
--- a/dev-java/bcpg/bcpg-1.78.1.ebuild
+++ b/dev-java/bcpg/bcpg-1.78.1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/bc-java-${MY_PV}/pg"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
CP_DEPEND="
~dev-java/bcprov-${PV}:0
diff --git a/dev-java/bcpkix/bcpkix-1.77.ebuild b/dev-java/bcpkix/bcpkix-1.77.ebuild
index c4e5b0c09115..9330aa3ed7f6 100644
--- a/dev-java/bcpkix/bcpkix-1.77.ebuild
+++ b/dev-java/bcpkix/bcpkix-1.77.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/bc-java-${MY_PV}/pkix"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
# 1) testSANMismatchIP(org.bouncycastle.est.test.TestHostNameAuthorizer)
# org.bouncycastle.est.ESTException: localhost.me: Temporary failure in name resolution HTTP Status Code: 0
diff --git a/dev-java/bcpkix/bcpkix-1.78.1.ebuild b/dev-java/bcpkix/bcpkix-1.78.1.ebuild
index 3f035f67cbb8..0cb42f7e34bf 100644
--- a/dev-java/bcpkix/bcpkix-1.78.1.ebuild
+++ b/dev-java/bcpkix/bcpkix-1.78.1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/bc-java-${MY_PV}/pkix"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
# 1) testSANMismatchIP(org.bouncycastle.est.test.TestHostNameAuthorizer)
# org.bouncycastle.est.ESTException: localhost.me: Temporary failure in name resolution HTTP Status Code: 0
diff --git a/dev-java/bcprov/bcprov-1.77.ebuild b/dev-java/bcprov/bcprov-1.77.ebuild
index f630703c880c..8e3dc1486d63 100644
--- a/dev-java/bcprov/bcprov-1.77.ebuild
+++ b/dev-java/bcprov/bcprov-1.77.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/bc-java-${MY_PV}"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND=">=virtual/jdk-11:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/bcprov/bcprov-1.78.1.ebuild b/dev-java/bcprov/bcprov-1.78.1.ebuild
index a9ad9f6abea6..8eedb146a281 100644
--- a/dev-java/bcprov/bcprov-1.78.1.ebuild
+++ b/dev-java/bcprov/bcprov-1.78.1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/bc-java-${MY_PV}"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
DEPEND=">=virtual/jdk-11:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/bcutil/bcutil-1.77.ebuild b/dev-java/bcutil/bcutil-1.77.ebuild
index 03c870ae5331..ba24ca10e630 100644
--- a/dev-java/bcutil/bcutil-1.77.ebuild
+++ b/dev-java/bcutil/bcutil-1.77.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/bc-java-${MY_PV}/util"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
CDEPEND="~dev-java/bcprov-${PV}:0"
DEPEND="${CDEPEND}
diff --git a/dev-java/bcutil/bcutil-1.78.1.ebuild b/dev-java/bcutil/bcutil-1.78.1.ebuild
index da54f4b38484..10aa78040652 100644
--- a/dev-java/bcutil/bcutil-1.78.1.ebuild
+++ b/dev-java/bcutil/bcutil-1.78.1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/bc-java-${MY_PV}/util"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
CDEPEND="~dev-java/bcprov-${PV}:0"
diff --git a/dev-java/bnd-annotation/bnd-annotation-6.3.1.ebuild b/dev-java/bnd-annotation/bnd-annotation-6.3.1.ebuild
index bc78852048d3..70550ab55d21 100644
--- a/dev-java/bnd-annotation/bnd-annotation-6.3.1.ebuild
+++ b/dev-java/bnd-annotation/bnd-annotation-6.3.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.annotation/$
LICENSE="Apache-2.0 EPL-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
# Common dependencies
# POM: biz.aQute.bnd.annotation-${PV}.pom
diff --git a/dev-java/bnd-annotation/bnd-annotation-7.0.0.ebuild b/dev-java/bnd-annotation/bnd-annotation-7.0.0.ebuild
index 8de9bb677828..d34e0f32ba5a 100644
--- a/dev-java/bnd-annotation/bnd-annotation-7.0.0.ebuild
+++ b/dev-java/bnd-annotation/bnd-annotation-7.0.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/bnd-${PV}"
LICENSE="Apache-2.0 EPL-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND="
dev-java/osgi-cmpn:8
diff --git a/dev-java/bnd-ant/bnd-ant-7.0.0.ebuild b/dev-java/bnd-ant/bnd-ant-7.0.0.ebuild
index d3987855d584..5a039feb28ae 100644
--- a/dev-java/bnd-ant/bnd-ant-7.0.0.ebuild
+++ b/dev-java/bnd-ant/bnd-ant-7.0.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/bnd-${PV}"
LICENSE="Apache-2.0 EPL-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64"
DEPEND="
dev-java/ant:0
diff --git a/dev-java/bnd-util/bnd-util-7.0.0.ebuild b/dev-java/bnd-util/bnd-util-7.0.0.ebuild
index 99b8e77f2184..e1ac2c5f0308 100644
--- a/dev-java/bnd-util/bnd-util-7.0.0.ebuild
+++ b/dev-java/bnd-util/bnd-util-7.0.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/bnd-${PV}"
LICENSE="Apache-2.0 EPL-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
CP_DEPEND="dev-java/osgi-annotation:0"
diff --git a/dev-java/bnd/bnd-7.0.0.ebuild b/dev-java/bnd/bnd-7.0.0.ebuild
index e95ccf923e85..fa2a82a1e3f0 100644
--- a/dev-java/bnd/bnd-7.0.0.ebuild
+++ b/dev-java/bnd/bnd-7.0.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P}"
LICENSE="Apache-2.0 EPL-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64"
BDEPEND="app-arch/zip"
diff --git a/dev-java/bndlib/bndlib-7.0.0.ebuild b/dev-java/bndlib/bndlib-7.0.0.ebuild
index 23e730031b62..e699671229c9 100644
--- a/dev-java/bndlib/bndlib-7.0.0.ebuild
+++ b/dev-java/bndlib/bndlib-7.0.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/bnd-${PV}"
LICENSE="Apache-2.0 EPL-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
CP_DEPEND="
~dev-java/bnd-annotation-${PV}:0
diff --git a/dev-java/brotli-dec/brotli-dec-0.1.2.ebuild b/dev-java/brotli-dec/brotli-dec-0.1.2.ebuild
index 9ae93d4e45db..b13aaba8aa9b 100644
--- a/dev-java/brotli-dec/brotli-dec-0.1.2.ebuild
+++ b/dev-java/brotli-dec/brotli-dec-0.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://repo1.maven.org/maven2/org/brotli/dec/${PV}/dec-${PV}-sources.j
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
BDEPEND="app-arch/unzip"
DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/browserlauncher2/browserlauncher2-1.3-r3.ebuild b/dev-java/browserlauncher2/browserlauncher2-1.3-r3.ebuild
index 6e0be61baf7e..daae13174e47 100644
--- a/dev-java/browserlauncher2/browserlauncher2-1.3-r3.ebuild
+++ b/dev-java/browserlauncher2/browserlauncher2-1.3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.sourceforge.net/project/browserlaunch2/browserlaunche
LICENSE="LGPL-2.1"
SLOT="1.0"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="amd64 ppc64"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/bsf/bsf-2.4.0-r5.ebuild b/dev-java/bsf/bsf-2.4.0-r5.ebuild
index 4a943322b7b8..6df55fdf25fd 100644
--- a/dev-java/bsf/bsf-2.4.0-r5.ebuild
+++ b/dev-java/bsf/bsf-2.4.0-r5.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P}"
LICENSE="Apache-2.0"
SLOT="2.3"
-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"
# If you add new ones, add them to ant-apache-bsf too for use dependencies
IUSE="javascript tcl"
diff --git a/dev-java/bsh/bsh-2.1.1.ebuild b/dev-java/bsh/bsh-2.1.1.ebuild
index 91979b823a05..11a9caad1ce4 100644
--- a/dev-java/bsh/bsh-2.1.1.ebuild
+++ b/dev-java/bsh/bsh-2.1.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/beanshell-${PV}"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux"
# There was 1 failure:
# 1) do_not_access_non_open_methods(bsh.Java_9_Test)
diff --git a/dev-java/byaccj/byaccj-1.15-r3.ebuild b/dev-java/byaccj/byaccj-1.15-r3.ebuild
index fb5774267d91..e1f996fcb550 100644
--- a/dev-java/byaccj/byaccj-1.15-r3.ebuild
+++ b/dev-java/byaccj/byaccj-1.15-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_P}.tar.gz"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86 ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm64 ppc64 ~ppc-macos ~x64-macos"
S="${WORKDIR}/${PN}${PV}"
diff --git a/dev-java/byte-buddy/byte-buddy-1.14.0.ebuild b/dev-java/byte-buddy/byte-buddy-1.14.0.ebuild
index 6b883eb22df7..13232b00c524 100644
--- a/dev-java/byte-buddy/byte-buddy-1.14.0.ebuild
+++ b/dev-java/byte-buddy/byte-buddy-1.14.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/raphw/byte-buddy/archive/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND="
>=virtual/jdk-11:*
diff --git a/dev-java/c3p0/c3p0-0.9.5.5-r2.ebuild b/dev-java/c3p0/c3p0-0.9.5.5-r2.ebuild
index e41111b8469c..5878283bc742 100644
--- a/dev-java/c3p0/c3p0-0.9.5.5-r2.ebuild
+++ b/dev-java/c3p0/c3p0-0.9.5.5-r2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P}.src"
LICENSE="|| ( EPL-1.0 LGPL-2.1 )"
SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc64 ~amd64-linux ~x86-linux"
CP_DEPEND="
dev-java/log4j-12-api:2
diff --git a/dev-java/cache2k-api/cache2k-api-0.23.1.ebuild b/dev-java/cache2k-api/cache2k-api-0.23.1.ebuild
index 666cd5b256b9..2ce7b773296a 100644
--- a/dev-java/cache2k-api/cache2k-api-0.23.1.ebuild
+++ b/dev-java/cache2k-api/cache2k-api-0.23.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://cache2k.org"
SRC_URI="https://github.com/cache2k/cache2k/archive/v${PV}.tar.gz -> cache2k-${PV}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/caffeine/caffeine-2.6.2-r1.ebuild b/dev-java/caffeine/caffeine-2.6.2-r1.ebuild
index 673e2da08617..c20da083dfbd 100644
--- a/dev-java/caffeine/caffeine-2.6.2-r1.ebuild
+++ b/dev-java/caffeine/caffeine-2.6.2-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://repo1.maven.org/maven2/com/github/ben-manes/caffeine/caffeine/$
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="amd64 ppc64"
BDEPEND="app-arch/unzip"
CP_DEPEND="dev-java/jsr305:0"
diff --git a/dev-java/cal10n/cal10n-0.8.1.ebuild b/dev-java/cal10n/cal10n-0.8.1.ebuild
index 8ac959fa4cd6..1ed57cbe79a1 100644
--- a/dev-java/cal10n/cal10n-0.8.1.ebuild
+++ b/dev-java/cal10n/cal10n-0.8.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/qos-ch/cal10n/archive/v_${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/cdi-api/cdi-api-4.0.1-r2.ebuild b/dev-java/cdi-api/cdi-api-4.0.1-r2.ebuild
index 1bfa6f26fa45..275c3587d5ac 100644
--- a/dev-java/cdi-api/cdi-api-4.0.1-r2.ebuild
+++ b/dev-java/cdi-api/cdi-api-4.0.1-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/jakartaee/cdi/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
EL_API_SLOT="5.0"
diff --git a/dev-java/cdi-api/cdi-api-4.0.1-r3.ebuild b/dev-java/cdi-api/cdi-api-4.0.1-r3.ebuild
index c2a70d2e3f6f..78e44613fbeb 100644
--- a/dev-java/cdi-api/cdi-api-4.0.1-r3.ebuild
+++ b/dev-java/cdi-api/cdi-api-4.0.1-r3.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/cdi-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
EL_API_SLOT="5.0"
diff --git a/dev-java/cglib/cglib-3.3.0-r2.ebuild b/dev-java/cglib/cglib-3.3.0-r2.ebuild
index 8e8a165397c1..cb4cacd8a66b 100644
--- a/dev-java/cglib/cglib-3.3.0-r2.ebuild
+++ b/dev-java/cglib/cglib-3.3.0-r2.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}"
LICENSE="Apache-2.0"
SLOT="3"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
CP_DEPEND="
>=dev-java/ant-1.10.14-r3:0
diff --git a/dev-java/checker-framework-qual/checker-framework-qual-3.43.0.ebuild b/dev-java/checker-framework-qual/checker-framework-qual-3.43.0.ebuild
index 80ccf7fd5673..c2990d8c990e 100644
--- a/dev-java/checker-framework-qual/checker-framework-qual-3.43.0.ebuild
+++ b/dev-java/checker-framework-qual/checker-framework-qual-3.43.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/checker-framework-checker-framework-${PV}/checker-qual"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/checker-framework-qual/checker-framework-qual-3.47.0.ebuild b/dev-java/checker-framework-qual/checker-framework-qual-3.47.0.ebuild
index bb149d34c47a..5444f35ed4dc 100644
--- a/dev-java/checker-framework-qual/checker-framework-qual-3.47.0.ebuild
+++ b/dev-java/checker-framework-qual/checker-framework-qual-3.47.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/checker-framework-checker-framework-${PV}/checker-qual"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
DEPEND=">=virtual/jdk-11:*" # module-info
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/commons-beanutils/commons-beanutils-1.9.4-r2.ebuild b/dev-java/commons-beanutils/commons-beanutils-1.9.4-r2.ebuild
index 73b6201d3a6d..5ddf7fbbcc1b 100644
--- a/dev-java/commons-beanutils/commons-beanutils-1.9.4-r2.ebuild
+++ b/dev-java/commons-beanutils/commons-beanutils-1.9.4-r2.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${P}-src"
LICENSE="Apache-2.0"
SLOT="1.7"
-KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-macos"
VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
diff --git a/dev-java/commons-cli/commons-cli-1.9.0.ebuild b/dev-java/commons-cli/commons-cli-1.9.0.ebuild
index 000653a81f57..aa26f2dcf967 100644
--- a/dev-java/commons-cli/commons-cli-1.9.0.ebuild
+++ b/dev-java/commons-cli/commons-cli-1.9.0.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src"
LICENSE="Apache-2.0"
SLOT="0"
-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"
VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
diff --git a/dev-java/commons-codec/commons-codec-1.16.1.ebuild b/dev-java/commons-codec/commons-codec-1.16.1.ebuild
index 1ff9d7f6d788..e7dd7fc4a86f 100644
--- a/dev-java/commons-codec/commons-codec-1.16.1.ebuild
+++ b/dev-java/commons-codec/commons-codec-1.16.1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux"
RESTRICT="test" #839681
VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
diff --git a/dev-java/commons-codec/commons-codec-1.17.1-r1.ebuild b/dev-java/commons-codec/commons-codec-1.17.1-r1.ebuild
index f79f89406562..e71c4cf42e8d 100644
--- a/dev-java/commons-codec/commons-codec-1.17.1-r1.ebuild
+++ b/dev-java/commons-codec/commons-codec-1.17.1-r1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~amd64-linux ~x86-linux"
RESTRICT="test" #839681
VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
diff --git a/dev-java/commons-collections/commons-collections-3.2.2-r2.ebuild b/dev-java/commons-collections/commons-collections-3.2.2-r2.ebuild
index 87d0fc03846e..626e8277d402 100644
--- a/dev-java/commons-collections/commons-collections-3.2.2-r2.ebuild
+++ b/dev-java/commons-collections/commons-collections-3.2.2-r2.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-macos"
VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
diff --git a/dev-java/commons-collections/commons-collections-4.4-r2.ebuild b/dev-java/commons-collections/commons-collections-4.4-r2.ebuild
index 74dde6321edc..17ec6923d5ff 100644
--- a/dev-java/commons-collections/commons-collections-4.4-r2.ebuild
+++ b/dev-java/commons-collections/commons-collections-4.4-r2.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/commons-collections4-${PV}-src"
LICENSE="Apache-2.0"
SLOT="4"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/commons.apache.org.asc"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
diff --git a/dev-java/commons-compress/commons-compress-1.26.1.ebuild b/dev-java/commons-compress/commons-compress-1.26.1.ebuild
index 6a834af3eafa..c577a3f5b92d 100644
--- a/dev-java/commons-compress/commons-compress-1.26.1.ebuild
+++ b/dev-java/commons-compress/commons-compress-1.26.1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
diff --git a/dev-java/commons-compress/commons-compress-1.27.1.ebuild b/dev-java/commons-compress/commons-compress-1.27.1.ebuild
index 794252e1c1bd..9f6017f45156 100644
--- a/dev-java/commons-compress/commons-compress-1.27.1.ebuild
+++ b/dev-java/commons-compress/commons-compress-1.27.1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
diff --git a/dev-java/commons-csv/commons-csv-1.9.0.ebuild b/dev-java/commons-csv/commons-csv-1.9.0.ebuild
index 474254541af8..42d7e624ac0e 100644
--- a/dev-java/commons-csv/commons-csv-1.9.0.ebuild
+++ b/dev-java/commons-csv/commons-csv-1.9.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://commons.apache.org/proper/commons-csv/"
SRC_URI="mirror://apache/commons/csv/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
# missing test deps
RESTRICT="test"
diff --git a/dev-java/commons-daemon/commons-daemon-1.4.0.ebuild b/dev-java/commons-daemon/commons-daemon-1.4.0.ebuild
index 7780a7c4fbc0..d1c5b8fe6a5d 100644
--- a/dev-java/commons-daemon/commons-daemon-1.4.0.ebuild
+++ b/dev-java/commons-daemon/commons-daemon-1.4.0.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="amd64 ppc64"
VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
diff --git a/dev-java/commons-digester/commons-digester-2.1-r2.ebuild b/dev-java/commons-digester/commons-digester-2.1-r2.ebuild
index 1d6571243ef9..7bbce0d59dbb 100644
--- a/dev-java/commons-digester/commons-digester-2.1-r2.ebuild
+++ b/dev-java/commons-digester/commons-digester-2.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Skeleton command:
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/commons/digester/source/${P}-src.tar.gz"
LICENSE="Apache-2.0"
SLOT="2.1"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="amd64 ppc64"
# Common dependencies
# POM: pom.xml
diff --git a/dev-java/commons-digester/commons-digester-3.2-r3.ebuild b/dev-java/commons-digester/commons-digester-3.2-r3.ebuild
index 14a7ba03b87c..30428563c87c 100644
--- a/dev-java/commons-digester/commons-digester-3.2-r3.ebuild
+++ b/dev-java/commons-digester/commons-digester-3.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Skeleton command:
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/commons/digester/source/${PN}3-${PV}-src.tar.gz -> ${P}
LICENSE="Apache-2.0"
SLOT="3.2"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="amd64 ppc64"
# 1) atomWithNamespaceParse(org.apache.commons.digester3.xmlrules.SetNamespaceURITestCase)
# java.net.UnknownHostException: commons.apache.org
diff --git a/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild b/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild
index 4e5933879635..434aab011045 100644
--- a/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild
+++ b/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}"
LICENSE="Apache-2.0"
SLOT="3"
-KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux"
# Tests run: 2036, Failures: 91
RESTRICT="test"
diff --git a/dev-java/commons-imaging/commons-imaging-0.97.ebuild b/dev-java/commons-imaging/commons-imaging-0.97.ebuild
index 6017ef9c71e8..a403893ba5f1 100644
--- a/dev-java/commons-imaging/commons-imaging-0.97.ebuild
+++ b/dev-java/commons-imaging/commons-imaging-0.97.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/sanselan-${PV}-incubator"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
RESTRICT="test" # 5/48 failures, dunno why :(
DEPEND=">=virtual/jdk-1.8:*
diff --git a/dev-java/commons-imaging/commons-imaging-1.0_alpha3-r2.ebuild b/dev-java/commons-imaging/commons-imaging-1.0_alpha3-r2.ebuild
index 73382ff1998c..13d24c8e36ec 100644
--- a/dev-java/commons-imaging/commons-imaging-1.0_alpha3-r2.ebuild
+++ b/dev-java/commons-imaging/commons-imaging-1.0_alpha3-r2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P/_/-}-src"
LICENSE="Apache-2.0"
SLOT="1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
diff --git a/dev-java/commons-io/commons-io-2.16.1.ebuild b/dev-java/commons-io/commons-io-2.16.1.ebuild
index 68d1c40b0b6a..af581b24575f 100644
--- a/dev-java/commons-io/commons-io-2.16.1.ebuild
+++ b/dev-java/commons-io/commons-io-2.16.1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src"
LICENSE="Apache-2.0"
SLOT="1"
-KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos"
VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
diff --git a/dev-java/commons-io/commons-io-2.17.0.ebuild b/dev-java/commons-io/commons-io-2.17.0.ebuild
index ebd4151787b1..56e38e5d6014 100644
--- a/dev-java/commons-io/commons-io-2.17.0.ebuild
+++ b/dev-java/commons-io/commons-io-2.17.0.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src"
LICENSE="Apache-2.0"
SLOT="1"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos"
VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
diff --git a/dev-java/commons-junit4/commons-junit4-1.2.17.ebuild b/dev-java/commons-junit4/commons-junit4-1.2.17.ebuild
index ae54c6dcfaa5..db679ebbac95 100644
--- a/dev-java/commons-junit4/commons-junit4-1.2.17.ebuild
+++ b/dev-java/commons-junit4/commons-junit4-1.2.17.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/aunkrig/commons/archive/V${PV}.tar.gz -> unkrig-comm
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
CP_DEPEND="
~dev-java/commons-nullanalysis-${PV}:0
diff --git a/dev-java/commons-lang/commons-lang-3.17.0.ebuild b/dev-java/commons-lang/commons-lang-3.17.0.ebuild
index 4d74340022c0..2e6e6fe26018 100644
--- a/dev-java/commons-lang/commons-lang-3.17.0.ebuild
+++ b/dev-java/commons-lang/commons-lang-3.17.0.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}3-${PV}-src"
LICENSE="Apache-2.0"
SLOT="3.6"
-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"
VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
diff --git a/dev-java/commons-logging/Manifest b/dev-java/commons-logging/Manifest
index e45becaca4a5..7e4642ee4d7d 100644
--- a/dev-java/commons-logging/Manifest
+++ b/dev-java/commons-logging/Manifest
@@ -1,2 +1,4 @@
DIST commons-logging-1.3.1-src.tar.gz 189156 BLAKE2B 23308b2bff6ea67620b0f07f49a63ffdbd07833fc0d9a6654386f4c17c9125abef5ad2afb6d8c798dcb98bc3e99bd8d94d35b9deec569c3aec1dde20f69e1a1d SHA512 ffda970d086601df4b476caf8bd01d1bdc22dd7f8846a22287036f7f000ce6cf0a757d16621910f041f8d90aa6066819454b3977dd005ca66817bec59e91e91f
DIST commons-logging-1.3.1-src.tar.gz.asc 488 BLAKE2B 3225a62f6269224f1b52907631be03d97cde65d1c7a76c06b6a23b9e30b1cee08b048eb4fdaa41b0a6b5bcf090b54c9dc54307fb1629b039b786fd426572a4d1 SHA512 6f13f85a5aeab1099ebfca38a6173384050b1f1c2e7eac93d978587c92751ddd24d583e39bc5a949f0caec66ca141d265147e63e9e2afea2094bda4667936a86
+DIST commons-logging-1.3.4-src.tar.gz 195717 BLAKE2B ba691ea0033c14f54fcb525faeadd4b330e063f73175c5ee40a4f50f159f1b264efb9f40661c4af3902ddca7d43f8f9b84e7a77bf1eeb3b237b31f566fc98aab SHA512 a4049d8d7ea0d97f337e169fa5f572e32be1882e07102ab004d8b2de74170cb075a251ee9603590d6e10bee5933651e8e33e108a734fc100e8b2d5acd669cb44
+DIST commons-logging-1.3.4-src.tar.gz.asc 488 BLAKE2B a9cdc993891ff39bb8ebeaa3eefdecee1adb062ed77449dfa1dad75a43cf5aa5678f014d24765ebff7b761498abfc795d3bb68359a73f8de98cb4ac115cb68da SHA512 1c132b87f03ca54887172e45c36e1d8c66d4f12a2a6a2da84e0d6cf3ac2cd2366193829fac0393837371bc1cd34215cd6318c9e7ea6c406c11d9f0dce28b3143
diff --git a/dev-java/commons-logging/commons-logging-1.3.1.ebuild b/dev-java/commons-logging/commons-logging-1.3.1.ebuild
index 032920cdde5f..5c2c4113e057 100644
--- a/dev-java/commons-logging/commons-logging-1.3.1.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.3.1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src"
LICENSE="Apache-2.0"
SLOT="0"
-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"
IUSE="log4j"
VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
diff --git a/dev-java/commons-logging/commons-logging-1.3.4-r1.ebuild b/dev-java/commons-logging/commons-logging-1.3.4-r1.ebuild
new file mode 100644
index 000000000000..00830fe4cff1
--- /dev/null
+++ b/dev-java/commons-logging/commons-logging-1.3.4-r1.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="commons-logging:commons-logging:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Thin adapter allowing configurable bridging to other well known logging systems"
+HOMEPAGE="https://commons.apache.org/proper/commons-logging/"
+SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz
+ verify-sig? ( https://downloads.apache.org/commons/logging/source/${P}-src.tar.gz.asc )"
+S="${WORKDIR}/${P}-src"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="log4j"
+
+# src/test/java/org/apache/commons/logging/tccl/logfactory/AdaptersTcclTestCase.java:26:
+# error: cannot find symbol
+# import org.apache.commons.logging.impl.Log4jApiLogFactory;
+# ^
+# symbol: class Log4jApiLogFactory
+# location: package org.apache.commons.logging.impl
+REQUIRED_USE="test? ( log4j )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
+
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
+
+COMMON_DEPEND="
+ dev-java/jakarta-servlet-api:4
+ dev-java/slf4j-api:0
+ log4j? (
+ dev-java/log4j-12-api:2
+ dev-java/log4j-api:2
+ )
+"
+
+DEPEND="
+ ${COMMON_DEPEND}
+ >=virtual/jdk-11:*
+ test? (
+ dev-java/commons-io:1
+ dev-java/junit:5
+ )
+"
+
+RDEPEND="
+ ${COMMON_DEPEND}
+ >=virtual/jre-1.8:*
+"
+
+DOCS=( NOTICE.txt src/changes/changes.xml )
+HTML_DOCS=( PROPOSAL.html )
+
+JAVA_GENTOO_CLASSPATH="
+ jakarta-servlet-api-4
+ slf4j-api
+"
+
+JAVA_SRC_DIR="src/main/java"
+
+src_prepare() {
+ java-pkg-2_src_prepare
+
+ # https://avalon.apache.org/closed.html Apache Avalon has closed.
+ rm src/main/java/org/apache/commons/logging/impl/{Avalon,LogKit}Logger.java || die
+ rm src/test/java/org/apache/commons/logging/{avalon/AvalonLogger,logkit/Standard}TestCase.java || die
+
+ if use !log4j; then
+ rm src/main/java/org/apache/commons/logging/impl/Log4JLogger.java || die
+ rm src/main/java/org/apache/commons/logging/impl/Log4jApiLogFactory.java || die
+ else
+ JAVA_GENTOO_CLASSPATH+="
+ log4j-12-api-2
+ log4j-api-2
+ "
+ fi
+}
+
+src_compile() {
+ # getting dependencies into the modulepath
+ DEPENDENCIES=(
+ jakarta-servlet-api-4
+ slf4j-api
+ $(use log4j && echo log4j-12-api-2)
+ $(use log4j && echo log4j-api-2)
+ )
+ local modulepath
+ for dependency in ${DEPENDENCIES[@]}; do
+ modulepath="${modulepath}:$(java-pkg_getjars --build-only ${dependency})"
+ done
+
+ local JAVA_MODULE_NAME="org.apache.${PN/-/.}"
+ JAVA_JAR_FILENAME="${JAVA_MODULE_NAME}.jar"
+ java-pkg-simple_src_compile # creates a legacy jar file without module-info
+
+ # generate module-info.java
+ jdeps \
+ --module-path "${modulepath}" \
+ --add-modules=ALL-MODULE-PATH \
+ --generate-module-info src/main \
+ --multi-release 9 \
+ "${JAVA_MODULE_NAME}.jar" || die
+
+ # compile module-info.java
+ ejavac \
+ -source 9 -target 9 \
+ --module-path "${modulepath}" \
+ --patch-module "${JAVA_MODULE_NAME}"="${JAVA_MODULE_NAME}.jar" \
+ -d target/versions/9 \
+ src/main/"${JAVA_MODULE_NAME}"/versions/9/module-info.java
+
+ # package
+ JAVA_JAR_FILENAME="${PN}.jar"
+ jar cvf "${JAVA_JAR_FILENAME}" \
+ -C target/classes . \
+ --release 9 -C target/versions/9 . || die
+
+ pushd target/classes > /dev/null || die
+
+ # pom.xml, lines 81-103
+ jar -cvf ../../commons-logging-api.jar \
+ $(find . -type f -name '*.class' \
+ ! -name 'Jdk13LumberjackLogger.class' \
+ ! -name 'ServletContextCleaner.class' \
+ ) || die
+
+ # pom.xml, lines 205-124
+ jar -cvf ../../commons-logging-adapters.jar \
+ $(find . -type f -path './org/apache/commons/logging/impl/**.class' \
+ ! -name 'WeakHashtable*.class' \
+ ! -name 'LogFactoryImpl*.class' \
+ ) || die
+
+ popd > /dev/null || die
+}
+
+src_test() {
+ # Do not run Log4j tests because these tests use an Appender to verify
+ # logging correctness. The log4j-12-api bridge no longer supports using an
+ # Appender for verifications since the methods for adding an Appender in
+ # the bridge "are largely no-ops". This means an Appender's state would
+ # never be changed by log4j-12-api after new messages are logged. The test
+ # cases, however, expect changes to the Appender's state in such an event,
+ # so they would fail with log4j-12-api.
+ # https://logging.apache.org/log4j/log4j-2.8/log4j-1.2-api/index.html
+ rm src/test/java/org/apache/commons/logging/pathable/ParentFirstTestCase.java || die # Log4JLogger
+ rm src/test/java/org/apache/commons/logging/pathable/ChildFirstTestCase.java || die # Log4JLogger
+ rm -r src/test/java/org/apache/commons/logging/log4j || die
+ rm src/test/java/org/apache/commons/logging/log4j2/CallerInformationTestCase.java || die
+ # error: package ch.qos.logback.classic does not exist
+ rm src/test/java/org/apache/commons/logging/slf4j/CallerInformationTestCase.java || die
+
+ JAVA_TEST_EXCLUDES=(
+ org.apache.commons.logging.jdk14.TestHandler # No runnable methods
+ # junit.framework.AssertionFailedError: Wrong factory retrieved through
+ # ServiceLoader: org.apache.commons.logging.impl.Slf4jLogFactory
+ org.apache.commons.logging.serviceloader.ServiceLoaderTestCase
+ # junit.framework.ComparisonFailure: Log class expected:<...ommons.logging.impl.[NoOp]Log>
+ # but was:<...ommons.logging.impl.[Slf4jLogFactory$Slf4j]Log>
+ org.apache.commons.logging.noop.NoOpLogTestCase
+ # org.junit.runners.model.InvalidTestClassyyError: Invalid test class
+ org.apache.commons.logging.LogSourceTest # No runnable methods
+ # junit.framework.AssertionFailedError: Logging config succeeded when context class loader was null!
+ org.apache.commons.logging.LoadTestCase
+ # junit.framework.AssertionFailedError:
+ # expected:<org.apache.commons.logging.PathableClassLoader@1edf1c96>
+ # but was:<org.apache.commons.logging.PathableClassLoader@15615099>
+ org.apache.commons.logging.tccl.logfactory.AdaptersTcclTestCase
+ )
+ JAVA_TEST_EXTRA_ARGS=(
+ -Dcommons-lang3="$(java-pkg_getjars commons-lang-3.6)"
+ -Dlog4j-api="commons-logging-api.jar"
+ -Dservlet-api="$(java-pkg_getjars jakarta-servlet-api-4)"
+ -Dcommons-logging="commons-logging.jar"
+ -Dcommons-logging-api="commons-logging-api.jar"
+ -Dcommons-logging-adapters="commons-logging-adapters.jar"
+ -Dtestclasses="target/test-classes"
+ )
+ if use log4j; then
+ JAVA_TEST_EXTRA_ARGS+=" -Dlog4j12=$(java-pkg_getjars log4j-12-api-2,log4j-core-2)"
+ fi
+ JAVA_TEST_GENTOO_CLASSPATH="commons-io-1 commons-lang-3.6 junit-4 junit-5"
+ JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+ JAVA_TEST_SRC_DIR="src/test/java"
+ java-pkg-simple_src_test
+}
diff --git a/dev-java/commons-math/commons-math-3.6.1-r2.ebuild b/dev-java/commons-math/commons-math-3.6.1-r2.ebuild
index ec1fcd8b4040..0eea263d2bf0 100644
--- a/dev-java/commons-math/commons-math-3.6.1-r2.ebuild
+++ b/dev-java/commons-math/commons-math-3.6.1-r2.ebuild
@@ -20,6 +20,6 @@ RDEPEND=">=virtual/jre-1.8:*"
LICENSE="Apache-2.0"
SLOT="3"
-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"
JAVA_AUTOMATIC_MODULE_NAME="commons.math3"
diff --git a/dev-java/commons-net/commons-net-3.11.1.ebuild b/dev-java/commons-net/commons-net-3.11.1.ebuild
index b83e79946665..95cd09406799 100644
--- a/dev-java/commons-net/commons-net-3.11.1.ebuild
+++ b/dev-java/commons-net/commons-net-3.11.1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src"
LICENSE="Apache-2.0"
SLOT="0"
-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"
VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
diff --git a/dev-java/commons-nullanalysis/commons-nullanalysis-1.2.17.ebuild b/dev-java/commons-nullanalysis/commons-nullanalysis-1.2.17.ebuild
index b4789f122cf6..39a278856242 100644
--- a/dev-java/commons-nullanalysis/commons-nullanalysis-1.2.17.ebuild
+++ b/dev-java/commons-nullanalysis/commons-nullanalysis-1.2.17.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/aunkrig/commons/archive/V${PV}.tar.gz -> unkrig-comm
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/commons-validator/commons-validator-1.8.0.ebuild b/dev-java/commons-validator/commons-validator-1.8.0.ebuild
index e92d0c4c8374..cc7f18684c9e 100644
--- a/dev-java/commons-validator/commons-validator-1.8.0.ebuild
+++ b/dev-java/commons-validator/commons-validator-1.8.0.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="amd64 ppc64"
RESTRICT="test" #839681
VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
diff --git a/dev-java/commons-vfs/commons-vfs-2.0-r4.ebuild b/dev-java/commons-vfs/commons-vfs-2.0-r4.ebuild
index d8917fa99617..a0badac9a380 100644
--- a/dev-java/commons-vfs/commons-vfs-2.0-r4.ebuild
+++ b/dev-java/commons-vfs/commons-vfs-2.0-r4.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P}/core"
LICENSE="Apache-2.0"
SLOT="2"
-KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux"
CP_DEPEND="
>=dev-java/ant-1.10.14-r3:0
diff --git a/dev-java/concurrentlinkedhashmap-lru/concurrentlinkedhashmap-lru-1.4.2.ebuild b/dev-java/concurrentlinkedhashmap-lru/concurrentlinkedhashmap-lru-1.4.2.ebuild
index 7a5934e88b50..8ba3e3165de0 100644
--- a/dev-java/concurrentlinkedhashmap-lru/concurrentlinkedhashmap-lru-1.4.2.ebuild
+++ b/dev-java/concurrentlinkedhashmap-lru/concurrentlinkedhashmap-lru-1.4.2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN%lru}${P}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64"
CP_DEPEND="dev-java/jsr305:0"
diff --git a/dev-java/conversant-disruptor/conversant-disruptor-1.2.20.ebuild b/dev-java/conversant-disruptor/conversant-disruptor-1.2.20.ebuild
index 1cdf0756bce4..78e56af7a41a 100644
--- a/dev-java/conversant-disruptor/conversant-disruptor-1.2.20.ebuild
+++ b/dev-java/conversant-disruptor/conversant-disruptor-1.2.20.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/conversant/disruptor/archive/${PV}.tar.gz -> ${P}.ta
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
# Compile dependencies
# POM: pom.xml
diff --git a/dev-java/cortado/cortado-0.6.0-r3.ebuild b/dev-java/cortado/cortado-0.6.0-r3.ebuild
index 5334a3b56737..0b6d3a915571 100644
--- a/dev-java/cortado/cortado-0.6.0-r3.ebuild
+++ b/dev-java/cortado/cortado-0.6.0-r3.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}"
LICENSE="GPL-2 LGPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="amd64 ppc64"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/cpptasks/cpptasks-1.0_beta5-r3.ebuild b/dev-java/cpptasks/cpptasks-1.0_beta5-r3.ebuild
index 991ab5f53574..d7566c4033ac 100644
--- a/dev-java/cpptasks/cpptasks-1.0_beta5-r3.ebuild
+++ b/dev-java/cpptasks/cpptasks-1.0_beta5-r3.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P/_beta/b}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
CP_DEPEND="
>=dev-java/ant-1.10.14:0
diff --git a/dev-java/dom4j/dom4j-2.1.4.ebuild b/dev-java/dom4j/dom4j-2.1.4.ebuild
index e2ff5649ff11..8f84f42c2a58 100644
--- a/dev-java/dom4j/dom4j-2.1.4.ebuild
+++ b/dev-java/dom4j/dom4j-2.1.4.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-version-${PV}"
LICENSE="dom4j"
SLOT="1"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
IUSE="jaxen"
CP_DEPEND="
diff --git a/dev-java/easymock/easymock-2.5.2.ebuild b/dev-java/easymock/easymock-2.5.2.ebuild
index 2ef5679d7599..e2c809259df2 100644
--- a/dev-java/easymock/easymock-2.5.2.ebuild
+++ b/dev-java/easymock/easymock-2.5.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/easymock/easymock/archive/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="2.5"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/easymock/easymock-3.3.1-r1.ebuild b/dev-java/easymock/easymock-3.3.1-r1.ebuild
index be78b8757a2a..0e51e3cce151 100644
--- a/dev-java/easymock/easymock-3.3.1-r1.ebuild
+++ b/dev-java/easymock/easymock-3.3.1-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="3.2"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
CDEPEND="
dev-java/cglib:3
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.20.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.20.ebuild
index c80590e1760c..ed68d10fff3b 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.20.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.20.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV
LICENSE="EPL-1.0"
SLOT="4.20"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64"
BDEPEND="app-arch/unzip"
COMMON_DEP="app-eselect/eselect-java"
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.ebuild
index d37224c73bab..7461639f5d13 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"
LICENSE="EPL-1.0"
SLOT="4.26"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64"
BDEPEND="
app-arch/unzip
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.27-r1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.27-r1.ebuild
index 6042718d196f..8a56bb6643e9 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.27-r1.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.27-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV
LICENSE="EPL-1.0"
SLOT="4.27"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
BDEPEND="app-arch/unzip"
COMMON_DEP="app-eselect/eselect-java"
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.30-r1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.30-r1.ebuild
index fb20056ada16..fc58d48548c3 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.30-r1.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.30-r1.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}"
LICENSE="EPL-1.0"
SLOT="4.30"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
BDEPEND="
app-arch/unzip
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.31.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.31.ebuild
index d7601e8396e0..2313722e16b3 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.31.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.31.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}"
LICENSE="EPL-1.0"
SLOT="4.31"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
BDEPEND="app-arch/unzip"
COMMON_DEP="app-eselect/eselect-java"
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.32.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.32.ebuild
index 1b686c4f4bff..9389baa0e3bf 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.32.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.32.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}"
LICENSE="EPL-1.0"
SLOT="4.32"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
BDEPEND="app-arch/unzip"
COMMON_DEP="app-eselect/eselect-java"
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.33.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.33.ebuild
index 3aec5546ba39..9c70b5f1d581 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.33.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.33.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}"
LICENSE="EPL-1.0"
SLOT="4.33"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
BDEPEND="app-arch/unzip"
COMMON_DEP="app-eselect/eselect-java"
diff --git a/dev-java/eclipse-jdt-annotation/eclipse-jdt-annotation-4.30.ebuild b/dev-java/eclipse-jdt-annotation/eclipse-jdt-annotation-4.30.ebuild
index 328cf486e363..2ae4a1989ffd 100644
--- a/dev-java/eclipse-jdt-annotation/eclipse-jdt-annotation-4.30.ebuild
+++ b/dev-java/eclipse-jdt-annotation/eclipse-jdt-annotation-4.30.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/eclipse.jdt.core-R${PV//./_}/org.eclipse.jdt.annotation"
LICENSE="EPL-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64"
RDEPEND=">=virtual/jre-1.8:*"
DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/emma/emma-2.0.5312-r6.ebuild b/dev-java/emma/emma-2.0.5312-r6.ebuild
index 0a1618b2dc92..9fef4cd0a586 100644
--- a/dev-java/emma/emma-2.0.5312-r6.ebuild
+++ b/dev-java/emma/emma-2.0.5312-r6.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${P}"
LICENSE="CPL-1.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
IUSE="+launcher"
diff --git a/dev-java/error-prone-annotations/error-prone-annotations-2.27.1-r1.ebuild b/dev-java/error-prone-annotations/error-prone-annotations-2.27.1-r1.ebuild
index 4a53d942c5ba..8434f7b6be7e 100644
--- a/dev-java/error-prone-annotations/error-prone-annotations-2.27.1-r1.ebuild
+++ b/dev-java/error-prone-annotations/error-prone-annotations-2.27.1-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/error-prone-${PV}/annotations"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND=">=virtual/jdk-11:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/error-prone-annotations/error-prone-annotations-2.32.0.ebuild b/dev-java/error-prone-annotations/error-prone-annotations-2.32.0.ebuild
index d83bdf2a46ce..6f831c3b913f 100644
--- a/dev-java/error-prone-annotations/error-prone-annotations-2.32.0.ebuild
+++ b/dev-java/error-prone-annotations/error-prone-annotations-2.32.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/error-prone-${PV}/annotations"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
DEPEND=">=virtual/jdk-11:*" # module-info
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/fastinfoset/fastinfoset-2.1.0-r1.ebuild b/dev-java/fastinfoset/fastinfoset-2.1.0-r1.ebuild
index 9429768f46ec..330863ffeda8 100644
--- a/dev-java/fastinfoset/fastinfoset-2.1.0-r1.ebuild
+++ b/dev-java/fastinfoset/fastinfoset-2.1.0-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/eclipse-ee4j/jaxb-fi/archive/${PV}.tar.gz -> ${P}.ta
LICENSE="Apache-2.0 EPL-1.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND="
>=virtual/jdk-11:*
diff --git a/dev-java/fec/fec-1.0.4-r5.ebuild b/dev-java/fec/fec-1.0.4-r5.ebuild
index 0f80da1b2e93..63daf7190093 100644
--- a/dev-java/fec/fec-1.0.4-r5.ebuild
+++ b/dev-java/fec/fec-1.0.4-r5.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P}"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64"
CP_DEPEND="dev-java/log4j-12-api:2"
diff --git a/dev-java/felix-framework/felix-framework-7.0.5-r2.ebuild b/dev-java/felix-framework/felix-framework-7.0.5-r2.ebuild
index 2f5f837757f1..2a9511a9f70e 100644
--- a/dev-java/felix-framework/felix-framework-7.0.5-r2.ebuild
+++ b/dev-java/felix-framework/felix-framework-7.0.5-r2.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/org.apache.felix.framework-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
CP_DEPEND="dev-java/animal-sniffer-annotations:0"
diff --git a/dev-java/felix-gogo-runtime/felix-gogo-runtime-1.1.6.ebuild b/dev-java/felix-gogo-runtime/felix-gogo-runtime-1.1.6.ebuild
index 0ee5bb28538a..7ee6e06d26ec 100644
--- a/dev-java/felix-gogo-runtime/felix-gogo-runtime-1.1.6.ebuild
+++ b/dev-java/felix-gogo-runtime/felix-gogo-runtime-1.1.6.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/org.apache.felix.gogo.runtime-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64"
CP_DEPEND="
dev-java/osgi-annotation:0
diff --git a/dev-java/felix-main/felix-main-7.0.5-r2.ebuild b/dev-java/felix-main/felix-main-7.0.5-r2.ebuild
index aa787cf77c12..58289214edbd 100644
--- a/dev-java/felix-main/felix-main-7.0.5-r2.ebuild
+++ b/dev-java/felix-main/felix-main-7.0.5-r2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/org.apache.felix.main-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
# Common dependencies
# POM: pom.xml
diff --git a/dev-java/felix-resolver/felix-resolver-2.0.4-r1.ebuild b/dev-java/felix-resolver/felix-resolver-2.0.4-r1.ebuild
index f1c03f626f75..4dca801b9b68 100644
--- a/dev-java/felix-resolver/felix-resolver-2.0.4-r1.ebuild
+++ b/dev-java/felix-resolver/felix-resolver-2.0.4-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://apache/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
CP_DEPEND="
dev-java/osgi-annotation:0
diff --git a/dev-java/felix-utils/felix-utils-1.11.8-r1.ebuild b/dev-java/felix-utils/felix-utils-1.11.8-r1.ebuild
index 89c0b5e7da2e..f89f0115751d 100644
--- a/dev-java/felix-utils/felix-utils-1.11.8-r1.ebuild
+++ b/dev-java/felix-utils/felix-utils-1.11.8-r1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/org.apache.felix.utils-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND="
>=virtual/jdk-1.8:*
diff --git a/dev-java/findbugs-annotations/findbugs-annotations-3.0.1.ebuild b/dev-java/findbugs-annotations/findbugs-annotations-3.0.1.ebuild
index 88a735fa092c..707674f8b69f 100644
--- a/dev-java/findbugs-annotations/findbugs-annotations-3.0.1.ebuild
+++ b/dev-java/findbugs-annotations/findbugs-annotations-3.0.1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}"
LICENSE="LGPL-3"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
# Common dependencies
# POM: ${P}.pom
diff --git a/dev-java/fishbowl/fishbowl-1.4.1.ebuild b/dev-java/fishbowl/fishbowl-1.4.1.ebuild
index a00f47a95146..1cbcb60bb4ab 100644
--- a/dev-java/fishbowl/fishbowl-1.4.1.ebuild
+++ b/dev-java/fishbowl/fishbowl-1.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Skeleton command:
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/stefanbirkner/${PN}/archive/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64"
# Compile dependencies
# POM: pom.xml
diff --git a/dev-java/fontbox/fontbox-2.0.27.ebuild b/dev-java/fontbox/fontbox-2.0.27.ebuild
index 98a6bc644ba5..f707ac643437 100644
--- a/dev-java/fontbox/fontbox-2.0.27.ebuild
+++ b/dev-java/fontbox/fontbox-2.0.27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Skeleton command:
@@ -25,7 +25,7 @@ SRC_URI="mirror://apache/pdfbox/${PV}/pdfbox-${PV}-src.zip
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
# Common dependencies
# POM: pom.xml
diff --git a/dev-java/fop/fop-2.9-r1.ebuild b/dev-java/fop/fop-2.9-r1.ebuild
index c9268c877d7d..3f5794bf33af 100644
--- a/dev-java/fop/fop-2.9-r1.ebuild
+++ b/dev-java/fop/fop-2.9-r1.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/fop-${PV}"
LICENSE="Apache-2.0"
SLOT="2.8"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc64"
VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/xmlgraphics-fop.apache.org.asc"
diff --git a/dev-java/freenet-ext/freenet-ext-29-r1.ebuild b/dev-java/freenet-ext/freenet-ext-29-r1.ebuild
index be6fff085d47..92b682371ecd 100644
--- a/dev-java/freenet-ext/freenet-ext-29-r1.ebuild
+++ b/dev-java/freenet-ext/freenet-ext-29-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/contrib-${PV}"
LICENSE="public-domain"
SLOT="29"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64"
DEPEND="
dev-libs/gmp:0=
diff --git a/dev-java/gnu-regexp/gnu-regexp-1.1.4-r4.ebuild b/dev-java/gnu-regexp/gnu-regexp-1.1.4-r4.ebuild
index adda25c30f0a..cda48af055c0 100644
--- a/dev-java/gnu-regexp/gnu-regexp-1.1.4-r4.ebuild
+++ b/dev-java/gnu-regexp/gnu-regexp-1.1.4-r4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="1"
-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"
CDEPEND="dev-java/java-getopt:1"
diff --git a/dev-java/gradle-bin/gradle-bin-8.10.2.ebuild b/dev-java/gradle-bin/gradle-bin-8.10.2.ebuild
index fb2e7d556b51..e133a17f9b75 100644
--- a/dev-java/gradle-bin/gradle-bin-8.10.2.ebuild
+++ b/dev-java/gradle-bin/gradle-bin-8.10.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://services.gradle.org/distributions/${MY_P}-all.zip -> ${P}.zip"
S="${WORKDIR}/${MY_P}"
LICENSE="Apache-2.0"
SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
DEPEND="app-eselect/eselect-gradle"
BDEPEND="app-arch/unzip"
diff --git a/dev-java/gradle-bin/gradle-bin-8.10.ebuild b/dev-java/gradle-bin/gradle-bin-8.10.ebuild
index e83e548a9a62..58283037b3a6 100644
--- a/dev-java/gradle-bin/gradle-bin-8.10.ebuild
+++ b/dev-java/gradle-bin/gradle-bin-8.10.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://services.gradle.org/distributions/${MY_P}-all.zip -> ${P}.zip"
S="${WORKDIR}/${MY_P}"
LICENSE="Apache-2.0"
SLOT="${PV}"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64"
DEPEND="app-eselect/eselect-gradle"
BDEPEND="app-arch/unzip"
diff --git a/dev-java/gradle-bin/gradle-bin-8.4.ebuild b/dev-java/gradle-bin/gradle-bin-8.4.ebuild
index 1d63ca89fe19..6f7e1929e758 100644
--- a/dev-java/gradle-bin/gradle-bin-8.4.ebuild
+++ b/dev-java/gradle-bin/gradle-bin-8.4.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.gradle.org/"
LICENSE="Apache-2.0"
SLOT="${PV}"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64"
DEPEND="app-eselect/eselect-gradle"
BDEPEND="app-arch/unzip"
diff --git a/dev-java/gradle-bin/gradle-bin-8.5.ebuild b/dev-java/gradle-bin/gradle-bin-8.5.ebuild
index 1d63ca89fe19..6f7e1929e758 100644
--- a/dev-java/gradle-bin/gradle-bin-8.5.ebuild
+++ b/dev-java/gradle-bin/gradle-bin-8.5.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.gradle.org/"
LICENSE="Apache-2.0"
SLOT="${PV}"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64"
DEPEND="app-eselect/eselect-gradle"
BDEPEND="app-arch/unzip"
diff --git a/dev-java/gradle-bin/gradle-bin-8.7.ebuild b/dev-java/gradle-bin/gradle-bin-8.7.ebuild
index 1d63ca89fe19..6f7e1929e758 100644
--- a/dev-java/gradle-bin/gradle-bin-8.7.ebuild
+++ b/dev-java/gradle-bin/gradle-bin-8.7.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.gradle.org/"
LICENSE="Apache-2.0"
SLOT="${PV}"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64"
DEPEND="app-eselect/eselect-gradle"
BDEPEND="app-arch/unzip"
diff --git a/dev-java/greenmail/greenmail-2.0.0_alpha2.ebuild b/dev-java/greenmail/greenmail-2.0.0_alpha2.ebuild
index d31c70c44745..47cec623a6ab 100644
--- a/dev-java/greenmail/greenmail-2.0.0_alpha2.ebuild
+++ b/dev-java/greenmail/greenmail-2.0.0_alpha2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/greenmail-mail-test/greenmail/archive/release-${PV/_
LICENSE="Apache-2.0"
SLOT="2"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
# Common dependencies
# POM: pom.xml
diff --git a/dev-java/gson/gson-2.11.0-r2.ebuild b/dev-java/gson/gson-2.11.0-r2.ebuild
index fa0f0be91fdd..da7f2829daf6 100644
--- a/dev-java/gson/gson-2.11.0-r2.ebuild
+++ b/dev-java/gson/gson-2.11.0-r2.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/gson-gson-parent-${PV}/gson"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND="
dev-java/error-prone-annotations:0
diff --git a/dev-java/guava-testlib/guava-testlib-33.2.0.ebuild b/dev-java/guava-testlib/guava-testlib-33.2.0.ebuild
index c4639cacc882..e57335457d23 100644
--- a/dev-java/guava-testlib/guava-testlib-33.2.0.ebuild
+++ b/dev-java/guava-testlib/guava-testlib-33.2.0.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/guava-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
CP_DEPEND="
>=dev-java/error-prone-annotations-2.27.1:0
diff --git a/dev-java/guava-testlib/guava-testlib-33.3.0.ebuild b/dev-java/guava-testlib/guava-testlib-33.3.0.ebuild
index 5c451924ce3c..c455692605d2 100644
--- a/dev-java/guava-testlib/guava-testlib-33.3.0.ebuild
+++ b/dev-java/guava-testlib/guava-testlib-33.3.0.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/guava-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
CP_DEPEND="
>=dev-java/error-prone-annotations-2.32.0:0
diff --git a/dev-java/guava/guava-33.2.0.ebuild b/dev-java/guava/guava-33.2.0.ebuild
index 32595c8af1b4..eb0b91a27385 100644
--- a/dev-java/guava/guava-33.2.0.ebuild
+++ b/dev-java/guava/guava-33.2.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
CP_DEPEND="
>=dev-java/error-prone-annotations-2.27.1:0
diff --git a/dev-java/guava/guava-33.3.0.ebuild b/dev-java/guava/guava-33.3.0.ebuild
index bb83705ade7b..17827bdaab2c 100644
--- a/dev-java/guava/guava-33.3.0.ebuild
+++ b/dev-java/guava/guava-33.3.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
CP_DEPEND="
>=dev-java/error-prone-annotations-2.32.0:0
diff --git a/dev-java/guice/guice-5.1.0-r1.ebuild b/dev-java/guice/guice-5.1.0-r1.ebuild
index 5292d03c9c76..5bc330f4392f 100644
--- a/dev-java/guice/guice-5.1.0-r1.ebuild
+++ b/dev-java/guice/guice-5.1.0-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}"
LICENSE="Apache-2.0"
SLOT="4"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
# Most of the test dependencies are missing in Gentoo.
RESTRICT="test"
diff --git a/dev-java/hamcrest-core/hamcrest-core-1.1-r4.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.1-r4.ebuild
index 2f910de922b3..954a5e07b1ea 100644
--- a/dev-java/hamcrest-core/hamcrest-core-1.1-r4.ebuild
+++ b/dev-java/hamcrest-core/hamcrest-core-1.1-r4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${MY_PN}/JavaHamcrest/archive/${MY_PN}-java-${PV}.ta
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x64-solaris"
RDEPEND="
>=virtual/jre-1.8:*"
diff --git a/dev-java/hamcrest-core/hamcrest-core-1.3-r3.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.3-r3.ebuild
index e773a03b9827..539bef963fe7 100644
--- a/dev-java/hamcrest-core/hamcrest-core-1.3-r3.ebuild
+++ b/dev-java/hamcrest-core/hamcrest-core-1.3-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/hamcrest/JavaHamcrest/archive/hamcrest-java-${PV}.ta
LICENSE="BSD-2"
SLOT="${PV}"
-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"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/hamcrest-generator/hamcrest-generator-1.3-r4.ebuild b/dev-java/hamcrest-generator/hamcrest-generator-1.3-r4.ebuild
index d858c4594bfb..4a94b8f78396 100644
--- a/dev-java/hamcrest-generator/hamcrest-generator-1.3-r4.ebuild
+++ b/dev-java/hamcrest-generator/hamcrest-generator-1.3-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/hamcrest/JavaHamcrest/archive/hamcrest-java-${PV}.ta
LICENSE="BSD-2"
SLOT="${PV}"
-KEYWORDS="amd64 arm64 ppc64 x86 ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm64 ppc64 ~ppc-macos ~x64-macos"
CP_DEPEND="dev-java/qdox:1.12"
diff --git a/dev-java/hamcrest-library/hamcrest-library-1.3-r3.ebuild b/dev-java/hamcrest-library/hamcrest-library-1.3-r3.ebuild
index 41455ffcdf28..71c99713745f 100644
--- a/dev-java/hamcrest-library/hamcrest-library-1.3-r3.ebuild
+++ b/dev-java/hamcrest-library/hamcrest-library-1.3-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/hamcrest/JavaHamcrest/archive/hamcrest-java-${PV}.ta
LICENSE="BSD-2"
SLOT="${PV}"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
CP_DEPEND="dev-java/hamcrest-core:1.3"
diff --git a/dev-java/hamcrest/hamcrest-3.0.ebuild b/dev-java/hamcrest/hamcrest-3.0.ebuild
index 57a83eb1d7b8..701a6d3e141a 100644
--- a/dev-java/hamcrest/hamcrest-3.0.ebuild
+++ b/dev-java/hamcrest/hamcrest-3.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/JavaHamcrest-${PV}"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/hashcash/hashcash-1.1.ebuild b/dev-java/hashcash/hashcash-1.1.ebuild
index 403fb527195c..c275113737af 100644
--- a/dev-java/hashcash/hashcash-1.1.ebuild
+++ b/dev-java/hashcash/hashcash-1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.nettgryppa.com/code/HashCash.java"
LICENSE="GregoryRubin"
SLOT="1"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/hawtjni-runtime/hawtjni-runtime-1.18.ebuild b/dev-java/hawtjni-runtime/hawtjni-runtime-1.18.ebuild
index 54fa550717af..88fa7ce83e7f 100644
--- a/dev-java/hawtjni-runtime/hawtjni-runtime-1.18.ebuild
+++ b/dev-java/hawtjni-runtime/hawtjni-runtime-1.18.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/fusesource/hawtjni/archive/hawtjni-project-${PV}.tar
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/htmlcleaner/htmlcleaner-2.29-r1.ebuild b/dev-java/htmlcleaner/htmlcleaner-2.29-r1.ebuild
index c1e1a9887879..7b264723215c 100644
--- a/dev-java/htmlcleaner/htmlcleaner-2.29-r1.ebuild
+++ b/dev-java/htmlcleaner/htmlcleaner-2.29-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://downloads.sourceforge.net/project/htmlcleaner/htmlcleaner/htmlc
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64"
BDEPEND="app-arch/unzip"
CP_DEPEND="dev-java/jdom:2"
diff --git a/dev-java/httpcomponents-client/httpcomponents-client-4.5.13-r2.ebuild b/dev-java/httpcomponents-client/httpcomponents-client-4.5.13-r2.ebuild
index 992aa448d3d7..58857b3d2332 100644
--- a/dev-java/httpcomponents-client/httpcomponents-client-4.5.13-r2.ebuild
+++ b/dev-java/httpcomponents-client/httpcomponents-client-4.5.13-r2.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/httpcomponents-client-${PV}/httpclient"
LICENSE="Apache-2.0"
SLOT="4"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/httpcomponents-client.hc.apache.org.asc"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-httpcomponents-client )"
diff --git a/dev-java/httpcore/httpcore-4.4.14-r1.ebuild b/dev-java/httpcore/httpcore-4.4.14-r1.ebuild
index 0aea28cb0a19..8fc95ded1c04 100644
--- a/dev-java/httpcore/httpcore-4.4.14-r1.ebuild
+++ b/dev-java/httpcore/httpcore-4.4.14-r1.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/httpcore"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/httpcomponents-core.hc.apache.org.asc"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-httpcomponents-httpcore )"
diff --git a/dev-java/icedtea-sound/icedtea-sound-1.0.1-r1.ebuild b/dev-java/icedtea-sound/icedtea-sound-1.0.1-r1.ebuild
index a45b91d832c7..93879d39132c 100644
--- a/dev-java/icedtea-sound/icedtea-sound-1.0.1-r1.ebuild
+++ b/dev-java/icedtea-sound/icedtea-sound-1.0.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://icedtea.classpath.org/download/source/${P}.tar.xz"
LICENSE="GPL-2-with-linking-exception"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
IUSE="+doc"
diff --git a/dev-java/icedtea-web/icedtea-web-1.8.8-r1.ebuild b/dev-java/icedtea-web/icedtea-web-1.8.8-r1.ebuild
index f36cb218a52d..73754338cb33 100644
--- a/dev-java/icedtea-web/icedtea-web-1.8.8-r1.ebuild
+++ b/dev-java/icedtea-web/icedtea-web-1.8.8-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/AdoptOpenJDK/${PN}/archive/${P}.tar.gz
$(cargo_crate_uris ${CRATES})"
LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
IUSE="doc"
# tests require ton of java deps we don't have packaged/working
diff --git a/dev-java/icu4j/icu4j-75.1.ebuild b/dev-java/icu4j/icu4j-75.1.ebuild
index 6f486785234b..0472a16f07f5 100644
--- a/dev-java/icu4j/icu4j-75.1.ebuild
+++ b/dev-java/icu4j/icu4j-75.1.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/icu-release-${PV/./-}/icu4j/main"
LICENSE="icu"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND="
>=virtual/jdk-1.8:*
diff --git a/dev-java/identicon/identicon-1.0.ebuild b/dev-java/identicon/identicon-1.0.ebuild
index f14e3e3df091..f7d56b315da9 100644
--- a/dev-java/identicon/identicon-1.0.ebuild
+++ b/dev-java/identicon/identicon-1.0.ebuild
@@ -14,7 +14,7 @@ COMMIT="96902d3c7c9733d9da4cce9c5ed424557fc2ec3c"
SRC_URI="https://github.com/PauloMigAlmeida/identicon/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="1"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64"
CP_DEPEND="
dev-java/cache2k-api:0
diff --git a/dev-java/injection-api/injection-api-2.0.1.ebuild b/dev-java/injection-api/injection-api-2.0.1.ebuild
index d88fd7865d08..13fef21db179 100644
--- a/dev-java/injection-api/injection-api-2.0.1.ebuild
+++ b/dev-java/injection-api/injection-api-2.0.1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/inject-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND=">=virtual/jdk-11:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/iso-relax/iso-relax-20050331-r7.ebuild b/dev-java/iso-relax/iso-relax-20050331-r7.ebuild
index a9398088ae7a..74596e03bd35 100644
--- a/dev-java/iso-relax/iso-relax-20050331-r7.ebuild
+++ b/dev-java/iso-relax/iso-relax-20050331-r7.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P}"
LICENSE="MIT"
SLOT="0"
-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"
CP_DEPEND=">=dev-java/ant-1.10.14-r3:0"
DEPEND="${CP_DEPEND}
diff --git a/dev-java/istack-commons-runtime/istack-commons-runtime-3.0.12.ebuild b/dev-java/istack-commons-runtime/istack-commons-runtime-3.0.12.ebuild
index e99ba540d238..f4fd6f03e4fb 100644
--- a/dev-java/istack-commons-runtime/istack-commons-runtime-3.0.12.ebuild
+++ b/dev-java/istack-commons-runtime/istack-commons-runtime-3.0.12.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/jaxb-istack-commons-${PV}/istack-commons"
LICENSE="EPL-1.0"
SLOT="3"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
# fails if jdk-1.8:* # https://bugs.gentoo.org/857024
DEPEND="
diff --git a/dev-java/istack-commons-runtime/istack-commons-runtime-4.1.1-r1.ebuild b/dev-java/istack-commons-runtime/istack-commons-runtime-4.1.1-r1.ebuild
index 580a3be513f7..c8e2c54f0ffd 100644
--- a/dev-java/istack-commons-runtime/istack-commons-runtime-4.1.1-r1.ebuild
+++ b/dev-java/istack-commons-runtime/istack-commons-runtime-4.1.1-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/eclipse-ee4j/jaxb-istack-commons/archive/${PV}.tar.g
LICENSE="EPL-1.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
# Compile dependencies
# POM: runtime/pom.xml
diff --git a/dev-java/j2objc-annotations/j2objc-annotations-3.0.0-r1.ebuild b/dev-java/j2objc-annotations/j2objc-annotations-3.0.0-r1.ebuild
index a41a2f92c3fb..3d1e1d5f0571 100644
--- a/dev-java/j2objc-annotations/j2objc-annotations-3.0.0-r1.ebuild
+++ b/dev-java/j2objc-annotations/j2objc-annotations-3.0.0-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/j2objc-${PV}/annotations"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND=">=virtual/jdk-11:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jackcess/jackcess-4.0.0.ebuild b/dev-java/jackcess/jackcess-4.0.0.ebuild
index fb720ab8903f..3f4f7d3ef2c4 100644
--- a/dev-java/jackcess/jackcess-4.0.0.ebuild
+++ b/dev-java/jackcess/jackcess-4.0.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/jahlborn/${PN}/archive/refs/tags/${P}.tar.gz -> ${P}
LICENSE="Apache-2.0"
SLOT="1"
-KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos"
# Common dependencies
# POM: pom.xml
diff --git a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1-r3.ebuild b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1-r3.ebuild
index a11d54767811..278fab98fadf 100644
--- a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1-r3.ebuild
+++ b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1-r3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://apache/${MY_PN}/${PV}/${MY_PN}-${PV}-src.zip"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
S="${WORKDIR}/${MY_PN}-${PV}/${PN}"
diff --git a/dev-java/jackson-annotations/jackson-annotations-2.13.4.ebuild b/dev-java/jackson-annotations/jackson-annotations-2.13.4.ebuild
index 0c71b5e86e83..cb9faac05f7e 100644
--- a/dev-java/jackson-annotations/jackson-annotations-2.13.4.ebuild
+++ b/dev-java/jackson-annotations/jackson-annotations-2.13.4.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="2"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND=">=virtual/jdk-11:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jackson-core/jackson-core-2.13.4.ebuild b/dev-java/jackson-core/jackson-core-2.13.4.ebuild
index d75bfb95ac13..237b13f1d151 100644
--- a/dev-java/jackson-core/jackson-core-2.13.4.ebuild
+++ b/dev-java/jackson-core/jackson-core-2.13.4.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND=">=virtual/jdk-11:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jackson-databind/jackson-databind-2.13.4.1.ebuild b/dev-java/jackson-databind/jackson-databind-2.13.4.1.ebuild
index 241db0cd4681..8e6624f019b3 100644
--- a/dev-java/jackson-databind/jackson-databind-2.13.4.1.ebuild
+++ b/dev-java/jackson-databind/jackson-databind-2.13.4.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
# Common dependencies
# POM: pom.xml
diff --git a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.4-r1.ebuild b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.4-r1.ebuild
index b6adc5847020..bbbf48a2f339 100644
--- a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.4-r1.ebuild
+++ b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.4-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
# Common dependencies
# POM: pom.xml
diff --git a/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.4-r1.ebuild b/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.4-r1.ebuild
index 274a877625a5..a63f1c452946 100644
--- a/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.4-r1.ebuild
+++ b/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.4-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/jackson-dataformats-text/archive/jackson-d
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND="
~dev-java/jackson-core-${PV}:0
diff --git a/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.4-r1.ebuild b/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.4-r1.ebuild
index 9226c452ca2f..ad03a7d154b7 100644
--- a/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.4-r1.ebuild
+++ b/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.4-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/jackson-modules-base/archive/jackson-modul
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
# Common dependencies
# POM: pom.xml
diff --git a/dev-java/jacl/jacl-1.4.1-r2.ebuild b/dev-java/jacl/jacl-1.4.1-r2.ebuild
index 95998ce694e2..19942b013b42 100644
--- a/dev-java/jacl/jacl-1.4.1-r2.ebuild
+++ b/dev-java/jacl/jacl-1.4.1-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://downloads.sourceforge.net/project/tcljava/jacl/${PV}/jacl${PV}.
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
IUSE="doc"
CDEPEND=">=dev-lang/tcl-8.4.5:*"
diff --git a/dev-java/jai-imageio-core/jai-imageio-core-1.4.0.ebuild b/dev-java/jai-imageio-core/jai-imageio-core-1.4.0.ebuild
index cf43149a135d..8f78550137de 100644
--- a/dev-java/jai-imageio-core/jai-imageio-core-1.4.0.ebuild
+++ b/dev-java/jai-imageio-core/jai-imageio-core-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Skeleton command:
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/jai-imageio/${PN}/archive/refs/tags/${P}.tar.gz"
LICENSE="Sun-BSD-no-nuclear-2005"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jai-imageio-jpeg2000/jai-imageio-jpeg2000-1.4.0.ebuild b/dev-java/jai-imageio-jpeg2000/jai-imageio-jpeg2000-1.4.0.ebuild
index d6111d3e33ce..ed8e0ac6ef1a 100644
--- a/dev-java/jai-imageio-jpeg2000/jai-imageio-jpeg2000-1.4.0.ebuild
+++ b/dev-java/jai-imageio-jpeg2000/jai-imageio-jpeg2000-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Skeleton command:
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/jai-imageio/${PN}/archive/refs/tags/${P}.tar.gz"
LICENSE="Sun-BSD-no-nuclear-2005"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
# Common dependencies
# POM: ${PN}-${P}/pom.xml
diff --git a/dev-java/jakarta-activation-api/jakarta-activation-api-1.2.2-r1.ebuild b/dev-java/jakarta-activation-api/jakarta-activation-api-1.2.2-r1.ebuild
index f6b1cf134494..165a863fd632 100644
--- a/dev-java/jakarta-activation-api/jakarta-activation-api-1.2.2-r1.ebuild
+++ b/dev-java/jakarta-activation-api/jakarta-activation-api-1.2.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jakartaee/jaf-api/archive/${PV}.tar.gz -> jakarta-ac
LICENSE="EPL-1.0"
SLOT="1"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND=">=virtual/jdk-11:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.1.ebuild b/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.1.ebuild
index afa50e495e18..fa0367a49dce 100644
--- a/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.1.ebuild
+++ b/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/jaf-api-${PV}/api"
LICENSE="EPL-1.0"
SLOT="2"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND=">=virtual/jdk-11:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jakarta-activation/jakarta-activation-1.2.2-r1.ebuild b/dev-java/jakarta-activation/jakarta-activation-1.2.2-r1.ebuild
index f8921a3d1f14..c39866589e74 100644
--- a/dev-java/jakarta-activation/jakarta-activation-1.2.2-r1.ebuild
+++ b/dev-java/jakarta-activation/jakarta-activation-1.2.2-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/jaf-api-${PV}/activation"
LICENSE="EPL-1.0"
SLOT="1"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
CDEPEND="dev-java/jakarta-activation-api:1"
DEPEND="${CDEPEND}
diff --git a/dev-java/jakarta-activation/jakarta-activation-2.0.1-r1.ebuild b/dev-java/jakarta-activation/jakarta-activation-2.0.1-r1.ebuild
index 3151cbb69635..c8dfd432e338 100644
--- a/dev-java/jakarta-activation/jakarta-activation-2.0.1-r1.ebuild
+++ b/dev-java/jakarta-activation/jakarta-activation-2.0.1-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/jaf-api-${PV}/activation"
LICENSE="EPL-1.0"
SLOT="2"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND=">=virtual/jdk-11:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jakarta-annotations-api/jakarta-annotations-api-2.1.1.ebuild b/dev-java/jakarta-annotations-api/jakarta-annotations-api-2.1.1.ebuild
index 5357550dc236..01113c25736d 100644
--- a/dev-java/jakarta-annotations-api/jakarta-annotations-api-2.1.1.ebuild
+++ b/dev-java/jakarta-annotations-api/jakarta-annotations-api-2.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/eclipse-ee4j/${PN/jakarta/common}/archive/${PV}.tar.
LICENSE="EPL-2.0 GPL-2-with-classpath-exception"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND="
>=virtual/jdk-11:*
diff --git a/dev-java/jakarta-el-api/jakarta-el-api-5.0.1-r1.ebuild b/dev-java/jakarta-el-api/jakarta-el-api-5.0.1-r1.ebuild
index 82b42399dae2..075f5da2e2c4 100644
--- a/dev-java/jakarta-el-api/jakarta-el-api-5.0.1-r1.ebuild
+++ b/dev-java/jakarta-el-api/jakarta-el-api-5.0.1-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://projects.eclipse.org/projects/ee4j.el"
SRC_URI="https://github.com/jakartaee/expression-language/archive/${PV}-RELEASE-api.tar.gz -> ${P}.tar.gz"
LICENSE="EPL-2.0 GPL-2-with-classpath-exception"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
SLOT="5.0"
DEPEND=">=virtual/jdk-11:*"
diff --git a/dev-java/jakarta-interceptors/jakarta-interceptors-2.1.0.ebuild b/dev-java/jakarta-interceptors/jakarta-interceptors-2.1.0.ebuild
index 1b38e9f22f94..0f163e5b9ba2 100644
--- a/dev-java/jakarta-interceptors/jakarta-interceptors-2.1.0.ebuild
+++ b/dev-java/jakarta-interceptors/jakarta-interceptors-2.1.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/jakartaee/interceptors/archive/${PV}-RELEASE.tar.gz
LICENSE="EPL-2.0 GPL-2-with-classpath-exception"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND="
dev-java/jakarta-annotations-api:0
diff --git a/dev-java/jakarta-json-api/jakarta-json-api-1.1.6-r1.ebuild b/dev-java/jakarta-json-api/jakarta-json-api-1.1.6-r1.ebuild
index eb1e462721f7..cbcf4fa51918 100644
--- a/dev-java/jakarta-json-api/jakarta-json-api-1.1.6-r1.ebuild
+++ b/dev-java/jakarta-json-api/jakarta-json-api-1.1.6-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/eclipse-ee4j/jsonp/archive/${MY_PV}.tar.gz -> ${P}.t
LICENSE="|| ( EPL-2.0 GPL-2-with-classpath-exception )"
# Since version 2.0.0, the namespace has changed to jakarta.json
SLOT="1"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND=">=virtual/jdk-11:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.3.ebuild b/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.3.ebuild
index e241a0d4c317..211be5f49336 100644
--- a/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.3.ebuild
+++ b/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.3.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/mail-api-${PV}/api"
LICENSE="EPL-1.0 EPL-2.0 GPL-2-with-classpath-exception"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND="
dev-java/jakarta-activation-api:2
diff --git a/dev-java/jakarta-mail/jakarta-mail-2.0.1.ebuild b/dev-java/jakarta-mail/jakarta-mail-2.0.1.ebuild
index 86ebe42c5cb1..fbf1fb27aa54 100644
--- a/dev-java/jakarta-mail/jakarta-mail-2.0.1.ebuild
+++ b/dev-java/jakarta-mail/jakarta-mail-2.0.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/mail-api-${PV}/mail"
LICENSE="EPL-1.0 EPL-2.0 GPL-2-with-classpath-exception"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
CP_DEPEND="dev-java/jakarta-activation:2"
diff --git a/dev-java/jakarta-oro/jakarta-oro-2.0.8-r5.ebuild b/dev-java/jakarta-oro/jakarta-oro-2.0.8-r5.ebuild
index bac4111eef14..02739db122db 100644
--- a/dev-java/jakarta-oro/jakarta-oro-2.0.8-r5.ebuild
+++ b/dev-java/jakarta-oro/jakarta-oro-2.0.8-r5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://archive.apache.org/dist/${MY_J}/${MY_O}/${P}.tar.gz"
LICENSE="Apache-1.1"
SLOT="2.0"
-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"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.4-r3.ebuild b/dev-java/jakarta-regexp/jakarta-regexp-1.4-r3.ebuild
index 3ae587ae7fed..d547e0c1a0ed 100644
--- a/dev-java/jakarta-regexp/jakarta-regexp-1.4-r3.ebuild
+++ b/dev-java/jakarta-regexp/jakarta-regexp-1.4-r3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://jakarta.apache.org/"
SLOT="${PV}"
IUSE=""
LICENSE="Apache-1.1"
-KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos"
RDEPEND="
>=virtual/jre-1.8:*"
diff --git a/dev-java/jakarta-servlet-api/jakarta-servlet-api-4.0.4.ebuild b/dev-java/jakarta-servlet-api/jakarta-servlet-api-4.0.4.ebuild
index 681da33a4eae..260488ecb1f7 100644
--- a/dev-java/jakarta-servlet-api/jakarta-servlet-api-4.0.4.ebuild
+++ b/dev-java/jakarta-servlet-api/jakarta-servlet-api-4.0.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jakartaee/servlet/archive/${PV}-RELEASE.tar.gz -> ${
LICENSE="|| ( GPL-2 GPL-2-with-classpath-exception )"
SLOT="4"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
RDEPEND=">=virtual/jre-1.8:*"
DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/jakarta-servlet-api/jakarta-servlet-api-6.0.0.ebuild b/dev-java/jakarta-servlet-api/jakarta-servlet-api-6.0.0.ebuild
index d3336ae2a0c7..fbc433053891 100644
--- a/dev-java/jakarta-servlet-api/jakarta-servlet-api-6.0.0.ebuild
+++ b/dev-java/jakarta-servlet-api/jakarta-servlet-api-6.0.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/jakartaee/servlet/archive/${PV}-RELEASE.tar.gz -> ${
LICENSE="EPL-2.0 GPL-2-with-classpath-exception"
SLOT="6"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
RDEPEND=">=virtual/jre-1.8:*"
DEPEND=">=virtual/jdk-11:*"
diff --git a/dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2-r2.ebuild b/dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2-r2.ebuild
index 4b2b095fcbec..2f8395024399 100644
--- a/dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2-r2.ebuild
+++ b/dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2-r2.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/saaj-api-${PV}"
LICENSE="BSD"
# Since version 2.0.0, the namespace has changed to jakarta.xml.soap
SLOT="1"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
CP_DEPEND="
>=dev-java/jakarta-activation-api-1.2.2-r1:1
diff --git a/dev-java/jal/jal-20031117-r7.ebuild b/dev-java/jal/jal-20031117-r7.ebuild
index 184a2ce24dc7..04a4ec007862 100644
--- a/dev-java/jal/jal-20031117-r7.ebuild
+++ b/dev-java/jal/jal-20031117-r7.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P}"
LICENSE="HPND"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64"
DEPEND="
dev-java/ant:0
diff --git a/dev-java/jansi-native/jansi-native-1.8.ebuild b/dev-java/jansi-native/jansi-native-1.8.ebuild
index b3e4273e8f3d..8de28dab8b6d 100644
--- a/dev-java/jansi-native/jansi-native-1.8.ebuild
+++ b/dev-java/jansi-native/jansi-native-1.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/fusesource/${PN}/archive/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
CDEPEND="dev-java/hawtjni-runtime:0"
diff --git a/dev-java/jansi/jansi-1.13.ebuild b/dev-java/jansi/jansi-1.13.ebuild
index 4f6883a85bab..70462305dba4 100644
--- a/dev-java/jansi/jansi-1.13.ebuild
+++ b/dev-java/jansi/jansi-1.13.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/fusesource/${PN}/archive/${PN}-project-${PV}.tar.gz
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
CDEPEND="dev-java/jansi-native:0"
diff --git a/dev-java/jansi/jansi-2.4.0-r1.ebuild b/dev-java/jansi/jansi-2.4.0-r1.ebuild
index d8ebb9cfd71e..1a9c7c87c3a4 100644
--- a/dev-java/jansi/jansi-2.4.0-r1.ebuild
+++ b/dev-java/jansi/jansi-2.4.0-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/fusesource/${PN}/archive/refs/tags/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="2"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
# Compile dependencies
# POM: pom.xml
diff --git a/dev-java/java-dep-check/java-dep-check-0.5-r4.ebuild b/dev-java/java-dep-check/java-dep-check-0.5-r4.ebuild
index 4133d7e336de..39db4aac3f12 100644
--- a/dev-java/java-dep-check/java-dep-check-0.5-r4.ebuild
+++ b/dev-java/java-dep-check/java-dep-check-0.5-r4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64"
CP_DEPEND="
dev-java/commons-cli:0
diff --git a/dev-java/java-diff-utils/java-diff-utils-1.3.0.ebuild b/dev-java/java-diff-utils/java-diff-utils-1.3.0.ebuild
index 0a6851c00264..3d65bddb88bf 100644
--- a/dev-java/java-diff-utils/java-diff-utils-1.3.0.ebuild
+++ b/dev-java/java-diff-utils/java-diff-utils-1.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Skeleton command:
@@ -17,7 +17,7 @@ SRC_URI="https://repo1.maven.org/maven2/com/googlecode/${PN}/diffutils/${PV}/dif
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/java-diff-utils/java-diff-utils-4.12.ebuild b/dev-java/java-diff-utils/java-diff-utils-4.12.ebuild
index eda5f5df35e7..4d59a3d43198 100644
--- a/dev-java/java-diff-utils/java-diff-utils-4.12.ebuild
+++ b/dev-java/java-diff-utils/java-diff-utils-4.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -16,7 +16,7 @@ S="${WORKDIR}/java-diff-utils-java-diff-utils-parent-${PV}/java-diff-utils"
LICENSE="Apache-2.0"
SLOT="4"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
RESTRICT="test" #839681
BDEPEND="app-arch/unzip"
diff --git a/dev-java/java-getopt/java-getopt-1.0.14-r2.ebuild b/dev-java/java-getopt/java-getopt-1.0.14-r2.ebuild
index da855c85be92..065878b28f02 100644
--- a/dev-java/java-getopt/java-getopt-1.0.14-r2.ebuild
+++ b/dev-java/java-getopt/java-getopt-1.0.14-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.urbanophile.com/arenn/hacking/getopt/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="1"
-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"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r2.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r2.ebuild
index 914ca5e91990..6260d8841d19 100644
--- a/dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r2.ebuild
+++ b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/wrapper_${PV}_src"
LICENSE="tanuki-community"
SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64"
RESTRICT="!test? ( test )"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/javacc/javacc-4.1-r1.ebuild b/dev-java/javacc/javacc-4.1-r1.ebuild
index be826ea10073..d86c8b4e71e3 100644
--- a/dev-java/javacc/javacc-4.1-r1.ebuild
+++ b/dev-java/javacc/javacc-4.1-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/javacc-release_${PV//./}"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
BDEPEND=">=dev-java/ant-1.10.14:0"
diff --git a/dev-java/javacc/javacc-7.0.13-r1.ebuild b/dev-java/javacc/javacc-7.0.13-r1.ebuild
index 9940cbd4101d..b0f3f7faeb7a 100644
--- a/dev-java/javacc/javacc-7.0.13-r1.ebuild
+++ b/dev-java/javacc/javacc-7.0.13-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${P}"
LICENSE="BSD-2"
SLOT="7.0.13"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
BDEPEND=">=dev-java/ant-1.10.14:0[junit]"
DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/javacc/javacc-7.0.4-r1.ebuild b/dev-java/javacc/javacc-7.0.4-r1.ebuild
index b776e9741587..b82f43b77a42 100644
--- a/dev-java/javacc/javacc-7.0.4-r1.ebuild
+++ b/dev-java/javacc/javacc-7.0.4-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/javacc/javacc/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD-2"
SLOT="7.0.4"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="amd64 arm64"
BDEPEND=">=dev-java/ant-1.10.14-r3:0"
diff --git a/dev-java/javahelp/javahelp-2.0.05_p20170719-r4.ebuild b/dev-java/javahelp/javahelp-2.0.05_p20170719-r4.ebuild
index fdebeaa445de..29ffeb54d742 100644
--- a/dev-java/javahelp/javahelp-2.0.05_p20170719-r4.ebuild
+++ b/dev-java/javahelp/javahelp-2.0.05_p20170719-r4.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${COMMIT}"
LICENSE="GPL-2-with-linking-exception"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64"
CP_DEPEND="
dev-java/javax-jsp-api:2.0
diff --git a/dev-java/javaparser-core/javaparser-core-3.13.10.ebuild b/dev-java/javaparser-core/javaparser-core-3.13.10.ebuild
index 8afe19164fb2..48fd0d22fe30 100644
--- a/dev-java/javaparser-core/javaparser-core-3.13.10.ebuild
+++ b/dev-java/javaparser-core/javaparser-core-3.13.10.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/javaparser-${PV}"
LICENSE="Apache-2.0 LGPL-3"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64"
JAVACC_SLOT="7.0.4"
diff --git a/dev-java/javassist/javassist-3.29.2.ebuild b/dev-java/javassist/javassist-3.29.2.ebuild
index 9eb9c6834ac3..a26a44d09cbc 100644
--- a/dev-java/javassist/javassist-3.29.2.ebuild
+++ b/dev-java/javassist/javassist-3.29.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/jboss-javassist/javassist/archive/rel_${PV//./_}_ga.
LICENSE="Apache-2.0 LGPL-2.1 MPL-1.1"
SLOT="3"
-KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux"
# Compile dependencies
# POM: pom.xml
diff --git a/dev-java/javatoolkit/javatoolkit-0.6.7-r1.ebuild b/dev-java/javatoolkit/javatoolkit-0.6.7-r1.ebuild
index c1713aab202a..ce38487d9583 100644
--- a/dev-java/javatoolkit/javatoolkit-0.6.7-r1.ebuild
+++ b/dev-java/javatoolkit/javatoolkit-0.6.7-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-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"
BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-java/javax-el-api/javax-el-api-2.2.ebuild b/dev-java/javax-el-api/javax-el-api-2.2.ebuild
index b9fd395ea71b..d72e01341b3a 100644
--- a/dev-java/javax-el-api/javax-el-api-2.2.ebuild
+++ b/dev-java/javax-el-api/javax-el-api-2.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://repo1.maven.org/maven2/javax/el/el-api/${PV}/el-api-${PV}-sourc
# https://repo1.maven.org/maven2/javax/el/el-api/2.2/el-api-2.2.pom
LICENSE="CDDL GPL-2"
SLOT="2.2"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64"
RDEPEND=">=virtual/jre-1.8:*"
DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/javax-inject/javax-inject-1-r4.ebuild b/dev-java/javax-inject/javax-inject-1-r4.ebuild
index 70a1a1657a38..8331f33005c7 100644
--- a/dev-java/javax-inject/javax-inject-1-r4.ebuild
+++ b/dev-java/javax-inject/javax-inject-1-r4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://central.maven.org/maven2/javax/inject/${MY_PN}/${PV}/${MY_P}-sou
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux"
+KEYWORDS="amd64 arm64 ppc64 ~amd64-linux"
RDEPEND=">=virtual/jre-1.8:*"
DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/javax-jms-api/javax-jms-api-2.0.3.ebuild b/dev-java/javax-jms-api/javax-jms-api-2.0.3.ebuild
index 2737dfa6725e..215d44895575 100644
--- a/dev-java/javax-jms-api/javax-jms-api-2.0.3.ebuild
+++ b/dev-java/javax-jms-api/javax-jms-api-2.0.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/jakartaee/messaging/archive/${PV}-RELEASE.tar.gz ->
LICENSE="EPL-2.0 GPL-2-with-classpath-exception"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/javax-jsp-api/javax-jsp-api-2.0.ebuild b/dev-java/javax-jsp-api/javax-jsp-api-2.0.ebuild
index 74f5fa9fd05b..0c8c4fc07057 100644
--- a/dev-java/javax-jsp-api/javax-jsp-api-2.0.ebuild
+++ b/dev-java/javax-jsp-api/javax-jsp-api-2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://repo1.maven.org/maven2/javax/servlet/jsp/jsp-api/${PV}/jsp-api-
LICENSE="CDDL GPL-2-with-classpath-exception"
SLOT="2.0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64"
CP_DEPEND="dev-java/javax-servlet-api:2.5"
diff --git a/dev-java/javax-jsp-api/javax-jsp-api-2.2.ebuild b/dev-java/javax-jsp-api/javax-jsp-api-2.2.ebuild
index ab1d9a0524d1..7c100e1ee27b 100644
--- a/dev-java/javax-jsp-api/javax-jsp-api-2.2.ebuild
+++ b/dev-java/javax-jsp-api/javax-jsp-api-2.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://repo1.maven.org/maven2/javax/servlet/jsp/jsp-api/${PV}/jsp-api-
LICENSE="CDDL GPL-2-with-classpath-exception"
SLOT="2.2"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64"
CP_DEPEND="
dev-java/javax-el-api:2.2
diff --git a/dev-java/javax-mail/javax-mail-1.6.7-r2.ebuild b/dev-java/javax-mail/javax-mail-1.6.7-r2.ebuild
index 47865b252df3..814ea5eb82fd 100644
--- a/dev-java/javax-mail/javax-mail-1.6.7-r2.ebuild
+++ b/dev-java/javax-mail/javax-mail-1.6.7-r2.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/mail-api-${PV}"
LICENSE="EPL-1.0 EPL-2.0 GPL-2-with-classpath-exception"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND="
dev-java/jakarta-activation:1
diff --git a/dev-java/javax-persistence-api/javax-persistence-api-2.2-r1.ebuild b/dev-java/javax-persistence-api/javax-persistence-api-2.2-r1.ebuild
index 4d4cbd2e3dd1..11e58b4d2a2d 100644
--- a/dev-java/javax-persistence-api/javax-persistence-api-2.2-r1.ebuild
+++ b/dev-java/javax-persistence-api/javax-persistence-api-2.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://repo1.maven.org/maven2/javax/persistence/${PN/-/.}/${PV}/${PN/-
LICENSE="EPL-1.0 BSD"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
BDEPEND="app-arch/unzip"
DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/javax-servlet-api/javax-servlet-api-2.2.ebuild b/dev-java/javax-servlet-api/javax-servlet-api-2.2.ebuild
index 5cae7492e3f7..5ba2ead7e975 100644
--- a/dev-java/javax-servlet-api/javax-servlet-api-2.2.ebuild
+++ b/dev-java/javax-servlet-api/javax-servlet-api-2.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://repo1.maven.org/maven2/javax/servlet/servlet-api/${PV}/servlet-
LICENSE="CDDL GPL-2"
SLOT="2.2"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc64"
RDEPEND=">=virtual/jre-1.8:*"
DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/javax-servlet-api/javax-servlet-api-2.5.ebuild b/dev-java/javax-servlet-api/javax-servlet-api-2.5.ebuild
index e79c463f05c7..1dafea3fb148 100644
--- a/dev-java/javax-servlet-api/javax-servlet-api-2.5.ebuild
+++ b/dev-java/javax-servlet-api/javax-servlet-api-2.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://repo1.maven.org/maven2/javax/servlet/servlet-api/${PV}/servlet-
LICENSE="CDDL GPL-2"
SLOT="2.5"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
RDEPEND=">=virtual/jre-1.8:*"
DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/javax-servlet-api/javax-servlet-api-3.0.1.ebuild b/dev-java/javax-servlet-api/javax-servlet-api-3.0.1.ebuild
index 0a5185af3e37..f4e7ec9ff5b5 100644
--- a/dev-java/javax-servlet-api/javax-servlet-api-3.0.1.ebuild
+++ b/dev-java/javax-servlet-api/javax-servlet-api-3.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://repo1.maven.org/maven2/javax/servlet/javax.servlet-api/${PV}/ja
LICENSE="CDDL GPL-2"
SLOT="3.0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64"
RDEPEND=">=virtual/jre-1.8:*"
DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/javax-servlet-api/javax-servlet-api-3.1.0.ebuild b/dev-java/javax-servlet-api/javax-servlet-api-3.1.0.ebuild
index 0e2d0215d270..13f36585d1a2 100644
--- a/dev-java/javax-servlet-api/javax-servlet-api-3.1.0.ebuild
+++ b/dev-java/javax-servlet-api/javax-servlet-api-3.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://repo1.maven.org/maven2/javax/servlet/javax.servlet-api/${PV}/ja
LICENSE="CDDL GPL-2"
SLOT="3.1"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
RDEPEND=">=virtual/jre-1.8:*"
DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/jax-rpc-api/jax-rpc-api-1.1.4.ebuild b/dev-java/jax-rpc-api/jax-rpc-api-1.1.4.ebuild
index a085898a4527..90c307982f04 100644
--- a/dev-java/jax-rpc-api/jax-rpc-api-1.1.4.ebuild
+++ b/dev-java/jax-rpc-api/jax-rpc-api-1.1.4.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P}"
LICENSE="EPL-2.0 GPL-2-with-classpath-exception"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64"
# Common dependencies
# POM: api/pom.xml
diff --git a/dev-java/jaxb-api/jaxb-api-2.3.3-r2.ebuild b/dev-java/jaxb-api/jaxb-api-2.3.3-r2.ebuild
index 1d59acb70f92..92079e115c68 100644
--- a/dev-java/jaxb-api/jaxb-api-2.3.3-r2.ebuild
+++ b/dev-java/jaxb-api/jaxb-api-2.3.3-r2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}"
LICENSE="EPL-1.0"
SLOT="2"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
CDEPEND="dev-java/jakarta-activation-api:1"
DEPEND="${CDEPEND}
diff --git a/dev-java/jaxb-api/jaxb-api-3.0.1-r1.ebuild b/dev-java/jaxb-api/jaxb-api-3.0.1-r1.ebuild
index f56d8cadead8..277a8690bf2d 100644
--- a/dev-java/jaxb-api/jaxb-api-3.0.1-r1.ebuild
+++ b/dev-java/jaxb-api/jaxb-api-3.0.1-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/eclipse-ee4j/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
LICENSE="EPL-1.0"
SLOT="3"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
# Common dependencies
# POM: pom.xml
diff --git a/dev-java/jaxb-api/jaxb-api-4.0.2.ebuild b/dev-java/jaxb-api/jaxb-api-4.0.2.ebuild
index 41573e667ff3..9aa9e1192bb5 100644
--- a/dev-java/jaxb-api/jaxb-api-4.0.2.ebuild
+++ b/dev-java/jaxb-api/jaxb-api-4.0.2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}"
LICENSE="EPL-1.0"
SLOT="4"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
CP_DEPEND="dev-java/jakarta-activation:2"
diff --git a/dev-java/jaxb-runtime/jaxb-runtime-2.3.8.ebuild b/dev-java/jaxb-runtime/jaxb-runtime-2.3.8.ebuild
index f02347a47f1d..236c07d41988 100644
--- a/dev-java/jaxb-runtime/jaxb-runtime-2.3.8.ebuild
+++ b/dev-java/jaxb-runtime/jaxb-runtime-2.3.8.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/jaxb-ri-${PV}-RI/jaxb-ri/runtime/impl"
LICENSE="EPL-1.0"
SLOT="2"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
CP_DEPEND="
dev-java/fastinfoset:0
diff --git a/dev-java/jaxb-runtime/jaxb-runtime-4.0.0-r1.ebuild b/dev-java/jaxb-runtime/jaxb-runtime-4.0.0-r1.ebuild
index d0ca79ba53e2..8d5b42eead5a 100644
--- a/dev-java/jaxb-runtime/jaxb-runtime-4.0.0-r1.ebuild
+++ b/dev-java/jaxb-runtime/jaxb-runtime-4.0.0-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/eclipse-ee4j/jaxb-ri/archive/${PV}-RI.tar.gz -> jaxb
LICENSE="EPL-1.0"
SLOT="4"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND="
>=dev-java/fastinfoset-2.1.0-r1:0
diff --git a/dev-java/jaxb-stax-ex/jaxb-stax-ex-1.8.3.ebuild b/dev-java/jaxb-stax-ex/jaxb-stax-ex-1.8.3.ebuild
index 9583e7520a6a..fb8e148ace4e 100644
--- a/dev-java/jaxb-stax-ex/jaxb-stax-ex-1.8.3.ebuild
+++ b/dev-java/jaxb-stax-ex/jaxb-stax-ex-1.8.3.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}"
LICENSE="EPL-1.0"
SLOT="1"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND="
dev-java/jakarta-activation-api:1
diff --git a/dev-java/jaxb-stax-ex/jaxb-stax-ex-2.1.0-r1.ebuild b/dev-java/jaxb-stax-ex/jaxb-stax-ex-2.1.0-r1.ebuild
index 37750ddfb4a9..9a8ef61d196d 100644
--- a/dev-java/jaxb-stax-ex/jaxb-stax-ex-2.1.0-r1.ebuild
+++ b/dev-java/jaxb-stax-ex/jaxb-stax-ex-2.1.0-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/eclipse-ee4j/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
LICENSE="EPL-1.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND="
dev-java/jakarta-activation-api:2
diff --git a/dev-java/jaxen/jaxen-2.0.0.ebuild b/dev-java/jaxen/jaxen-2.0.0.ebuild
index 5d5c01fe3a73..615e61a2aec8 100644
--- a/dev-java/jaxen/jaxen-2.0.0.ebuild
+++ b/dev-java/jaxen/jaxen-2.0.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}"
LICENSE="BSD-2"
SLOT="1.2"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
IUSE="dom4j jdom xom"
# It seems that most tests depend on dom4j, jdom and xom which all depend back on jaxen
diff --git a/dev-java/jaxrs-api/jaxrs-api-2.1.6-r1.ebuild b/dev-java/jaxrs-api/jaxrs-api-2.1.6-r1.ebuild
index 5050f4eb3ee6..8f794268b211 100644
--- a/dev-java/jaxrs-api/jaxrs-api-2.1.6-r1.ebuild
+++ b/dev-java/jaxrs-api/jaxrs-api-2.1.6-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/rest-${PV}/${PN}"
LICENSE="EPL-2.0 GPL-2-with-classpath-exception"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND="
>=virtual/jdk-11:*
diff --git a/dev-java/jaxws-api/jaxws-api-2.3.3.ebuild b/dev-java/jaxws-api/jaxws-api-2.3.3.ebuild
index d635296add0c..1dcdddcb465b 100644
--- a/dev-java/jaxws-api/jaxws-api-2.3.3.ebuild
+++ b/dev-java/jaxws-api/jaxws-api-2.3.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/eclipse-ee4j/jax-ws-api/archive/${PV}.tar.gz -> ${P}
LICENSE="BSD" # "BSD-3 Clause"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
RDEPEND=">=virtual/jre-1.8:*"
DEPEND="
diff --git a/dev-java/jbcrypt/jbcrypt-0.4.ebuild b/dev-java/jbcrypt/jbcrypt-0.4.ebuild
index 9726e931a1a1..164af8eea9a8 100644
--- a/dev-java/jbcrypt/jbcrypt-0.4.ebuild
+++ b/dev-java/jbcrypt/jbcrypt-0.4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.mindrot.org/projects/jBCrypt"
SRC_URI="https://www.mindrot.org/files/jBCrypt/jBCrypt-${PV}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jbig2-imageio/jbig2-imageio-3.0.3.ebuild b/dev-java/jbig2-imageio/jbig2-imageio-3.0.3.ebuild
index 24e6a4482fb5..3989709b8320 100644
--- a/dev-java/jbig2-imageio/jbig2-imageio-3.0.3.ebuild
+++ b/dev-java/jbig2-imageio/jbig2-imageio-3.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Skeleton command:
@@ -18,7 +18,7 @@ SRC_URI="https://downloads.apache.org/pdfbox/${PN}/${PV}/${P}-src.zip"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jbitcollider-core/jbitcollider-core-0.8-r2.ebuild b/dev-java/jbitcollider-core/jbitcollider-core-0.8-r2.ebuild
index 8d3d1cce6572..a57b023fc468 100644
--- a/dev-java/jbitcollider-core/jbitcollider-core-0.8-r2.ebuild
+++ b/dev-java/jbitcollider-core/jbitcollider-core-0.8-r2.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jboss-jms-api/jboss-jms-api-1.0.1.ebuild b/dev-java/jboss-jms-api/jboss-jms-api-1.0.1.ebuild
index a33ef643e116..c31f9f711531 100644
--- a/dev-java/jboss-jms-api/jboss-jms-api-1.0.1.ebuild
+++ b/dev-java/jboss-jms-api/jboss-jms-api-1.0.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/jboss/${PN}_spec/archive/${PN}_1.1_spec-${PV}.Final.
LICENSE="CDDL GPL-2-with-classpath-exception"
SLOT="1.1"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jcalendar/jcalendar-1.4-r2.ebuild b/dev-java/jcalendar/jcalendar-1.4-r2.ebuild
index 2985f2ad4db0..6ae57b00fd4e 100644
--- a/dev-java/jcalendar/jcalendar-1.4-r2.ebuild
+++ b/dev-java/jcalendar/jcalendar-1.4-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.toedter.com/download/${P}.zip"
LICENSE="LGPL-2.1"
SLOT="1.2"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64"
BDEPEND="app-arch/unzip"
diff --git a/dev-java/jchart2d/jchart2d-3.2.2-r1.ebuild b/dev-java/jchart2d/jchart2d-3.2.2-r1.ebuild
index 52ae935d3ef8..f7b83ec0b7a9 100644
--- a/dev-java/jchart2d/jchart2d-3.2.2-r1.ebuild
+++ b/dev-java/jchart2d/jchart2d-3.2.2-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://downloads.sourceforge.net/project/jchart2d/jchart2d/sources/jch
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
CP_DEPEND="dev-java/jide-oss:0
dev-java/xmlgraphics-commons:2"
diff --git a/dev-java/jcifs/jcifs-1.3.19-r2.ebuild b/dev-java/jcifs/jcifs-1.3.19-r2.ebuild
index 1ae94af596dc..a6da74568583 100644
--- a/dev-java/jcifs/jcifs-1.3.19-r2.ebuild
+++ b/dev-java/jcifs/jcifs-1.3.19-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P/-/_}"
LICENSE="LGPL-2.1"
SLOT="1.1"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="amd64 ppc64"
CP_DEPEND="dev-java/jakarta-servlet-api:4"
diff --git a/dev-java/jclasslib/jclasslib-4.3.1.ebuild b/dev-java/jclasslib/jclasslib-4.3.1.ebuild
index bbaa4aef1fb5..d7478b38e568 100644
--- a/dev-java/jclasslib/jclasslib-4.3.1.ebuild
+++ b/dev-java/jclasslib/jclasslib-4.3.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jcommander/jcommander-1.64-r1.ebuild b/dev-java/jcommander/jcommander-1.64-r1.ebuild
index a5e29b6c5809..711f0e8997a6 100644
--- a/dev-java/jcommander/jcommander-1.64-r1.ebuild
+++ b/dev-java/jcommander/jcommander-1.64-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}"
LICENSE="Apache-2.0"
SLOT="1.64"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jcommander/jcommander-1.82.ebuild b/dev-java/jcommander/jcommander-1.82.ebuild
index aa707fd8b897..0f13c5ff3e27 100644
--- a/dev-java/jcommander/jcommander-1.82.ebuild
+++ b/dev-java/jcommander/jcommander-1.82.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/cbeust/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND="
>=virtual/jdk-1.8:*
diff --git a/dev-java/jctools-core/jctools-core-4.0.3-r1.ebuild b/dev-java/jctools-core/jctools-core-4.0.3-r1.ebuild
index 1c85f82b32b8..9b776803a38f 100644
--- a/dev-java/jctools-core/jctools-core-4.0.3-r1.ebuild
+++ b/dev-java/jctools-core/jctools-core-4.0.3-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/JCTools-${PV}/jctools-core"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND="
dev-java/osgi-annotation:0
diff --git a/dev-java/jctools-core/jctools-core-4.0.5-r1.ebuild b/dev-java/jctools-core/jctools-core-4.0.5-r1.ebuild
index 9ca972f475b4..2a061661d55c 100644
--- a/dev-java/jctools-core/jctools-core-4.0.5-r1.ebuild
+++ b/dev-java/jctools-core/jctools-core-4.0.5-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/JCTools-${PV}/jctools-core"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc64"
DEPEND="
dev-java/osgi-annotation:0
diff --git a/dev-java/jdbc-mysql/Manifest b/dev-java/jdbc-mysql/Manifest
index 52f0d34a093a..dd1f2dd5ea4c 100644
--- a/dev-java/jdbc-mysql/Manifest
+++ b/dev-java/jdbc-mysql/Manifest
@@ -1,4 +1,3 @@
-DIST mysql-connector-j-8.3.0.tar.gz 4255433 BLAKE2B b5cd437e4ab87052c0fd8e4da6a2612d4c068193a4fe2d207505b2f42d664a414c8a0f3131f34b471a30bfa6b6bb9e76ad0dd4779abbecb46ea014ab5d06e36d SHA512 0849ff13f4adc4ae2d2b9f64ff192435dd9560763a50c7df117a171ae1d90fc97bc36dc89097472d0a2c182492a45ca14ffcf577a9c54267be79e5b3f147dc41
DIST mysql-connector-j-9.0.0.tar.gz 4469329 BLAKE2B 3248d43654c56a2b566bbf515de996ab43f845beb2104f69c3c3c837b8b527d8e9851fe849bcf55fd7eafb061e4780dfaa19b42583a7d12b72367d0a36a61ab3 SHA512 40028f528e8bff686fcd700d165785194e1732a8c2c29efb2ffe67623f8915caaac4d2a9e548b0e9cda4328e25cfd6fe4e008cca1491117e38a4c79af0231475
DIST oci-java-sdk-common-3.29.0.jar 453619 BLAKE2B 41a68344a9cf4733c642e3a6e4254f3991f19c13edf57b3c61352b1e6ffdfabfe29cd8dccaa9b128fae618a492fb342007d14ad65b06cd614da572c787cf35ab SHA512 b6def960e114b69d3f34706d5e293f0a05b30c31a1443a92e454631712bb633eaea3795beeeabe4eb1303b8ad42ef2b73d69880b73d360e193f8f1b532bc3430
DIST opentelemetry-api-1.40.0.jar 141734 BLAKE2B 1f14ca7caadd0a3eed615da7ee528e5df72474d9a4eabcf5a820996830cf76c8fa3402de7d283598f1e4bb44b1a15c488b81863c4b5c0685ea35fe65f3fb12c2 SHA512 d4a1af66075b5f147ba297a8133a707716e323800d8aa2debcdace2bbe10046b2fee8a47d87fa9b6f1f11ad30f4da688670c546841990ad8daa7c8c0535498f2
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-8.3.0.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-8.3.0.ebuild
deleted file mode 100644
index fa5c0981ca39..000000000000
--- a/dev-java/jdbc-mysql/jdbc-mysql-8.3.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.mysql:mysql-connector-j:8.3.0"
-# Tests disabled, see bug #902723
-# JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-# Bundling a binary version of oci-java-sdk-common
-# https://github.com/oracle/oci-java-sdk/blob/v2.47.0/bmc-common/pom.xml
-OSC="3.29.0"
-
-DESCRIPTION="JDBC Type 4 driver for MySQL"
-HOMEPAGE="https://dev.mysql.com/doc/connector-j/en/"
-SRC_URI="https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-j-${PV}.tar.gz
- https://repo1.maven.org/maven2/com/oracle/oci/sdk/oci-java-sdk-common/${OSC}/oci-java-sdk-common-${OSC}.jar"
-
-S="${WORKDIR}/mysql-connector-j-${PV}"
-
-LICENSE="GPL-2-with-MySQL-FLOSS-exception"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~x86"
-
-CP_DEPEND="
- dev-java/c3p0:0
- >=dev-java/protobuf-java-3.25:0 <dev-java/protobuf-java-3.26:0
- dev-java/slf4j-api:0
-"
-DEPEND="${CP_DEPEND}
- >=virtual/jdk-1.8:*
- test? ( dev-java/junit:5 )"
-RDEPEND="${CP_DEPEND}
- >=virtual/jre-1.8:*"
-
-DOCS=( CHANGES README )
-
-JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/oci-java-sdk-common-${OSC}.jar"
-JAVA_JAR_FILENAME="mysql-connector-j.jar"
-JAVA_RESOURCE_DIRS="src/main/resources"
-JAVA_SRC_DIR=(
- "src/generated"
- "src/legacy/java"
- "src/main/core-api/java"
- "src/main/core-impl/java"
- "src/main/protocol-impl/java"
- "src/main/user-api/java"
- "src/main/user-impl/java"
-)
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,junit-5"
-JAVA_TEST_RESOURCE_DIRS="src/test/config"
-JAVA_TEST_SRC_DIR="src/test/java"
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-9.0.0.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-9.0.0.ebuild
index cf008e4783bc..7875ebd0d754 100644
--- a/dev-java/jdbc-mysql/jdbc-mysql-9.0.0.ebuild
+++ b/dev-java/jdbc-mysql/jdbc-mysql-9.0.0.ebuild
@@ -26,7 +26,7 @@ S="${WORKDIR}/mysql-connector-j-${PV}"
LICENSE="GPL-2-with-MySQL-FLOSS-exception"
SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64"
CP_DEPEND="
dev-java/c3p0:0
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-42.7.3.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-42.7.3.ebuild
index ab85f684bb07..f4388dd69826 100644
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-42.7.3.ebuild
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-42.7.3.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/postgresql-${PV}-jdbc-src"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="amd64 ppc64"
# package se.jiderhamn.classloader does not exist
# package se.jiderhamn.classloader.leak does not exist
# package uk.org.webcompere.systemstubs.environment does not exist
diff --git a/dev-java/jdepend/jdepend-2.10-r1.ebuild b/dev-java/jdepend/jdepend-2.10-r1.ebuild
index 1414b64960fb..a6f2780d19e3 100644
--- a/dev-java/jdepend/jdepend-2.10-r1.ebuild
+++ b/dev-java/jdepend/jdepend-2.10-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P}"
LICENSE="BSD"
SLOT="0"
-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"
RESTRICT="test" #921147
DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/jdisasm/jdisasm-1.0.6.ebuild b/dev-java/jdisasm/jdisasm-1.0.6.ebuild
index 240276e59df5..79b8714b5313 100644
--- a/dev-java/jdisasm/jdisasm-1.0.6.ebuild
+++ b/dev-java/jdisasm/jdisasm-1.0.6.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/aunkrig/jdisasm/archive/${MY_COMMIT}.tar.gz -> ${P}.
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
# There was 1 failure:
# 1) testWideLocals(jdisasm.Tests)
diff --git a/dev-java/jdom/jdom-1.1.3-r2.ebuild b/dev-java/jdom/jdom-1.1.3-r2.ebuild
index a588be4272e0..1dfeee085553 100644
--- a/dev-java/jdom/jdom-1.1.3-r2.ebuild
+++ b/dev-java/jdom/jdom-1.1.3-r2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}"
LICENSE="JDOM"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jdom/jdom-2.0.6.1.ebuild b/dev-java/jdom/jdom-2.0.6.1.ebuild
index baa58d08774c..2cda081b0341 100644
--- a/dev-java/jdom/jdom-2.0.6.1.ebuild
+++ b/dev-java/jdom/jdom-2.0.6.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/jdom-JDOM-${PV}"
LICENSE="Apache-1.1"
SLOT="2"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
CP_DEPEND="
dev-java/iso-relax:0
diff --git a/dev-java/jeromq/jeromq-0.5.2.ebuild b/dev-java/jeromq/jeromq-0.5.2.ebuild
index 21b797b7eff3..f554fbfac8ee 100644
--- a/dev-java/jeromq/jeromq-0.5.2.ebuild
+++ b/dev-java/jeromq/jeromq-0.5.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/zeromq/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MPL-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
PROPERTIES="test_network"
RESTRICT="test"
diff --git a/dev-java/jeromq/jeromq-0.6.0-r1.ebuild b/dev-java/jeromq/jeromq-0.6.0-r1.ebuild
index ac54d3f53769..a2bf48996304 100644
--- a/dev-java/jeromq/jeromq-0.6.0-r1.ebuild
+++ b/dev-java/jeromq/jeromq-0.6.0-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}"
LICENSE="MPL-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
PROPERTIES="test_network"
RESTRICT="test"
diff --git a/dev-java/jetbrains-annotations/Manifest b/dev-java/jetbrains-annotations/Manifest
index 69e32259d859..1cd87d3f4b58 100644
--- a/dev-java/jetbrains-annotations/Manifest
+++ b/dev-java/jetbrains-annotations/Manifest
@@ -1 +1 @@
-DIST jetbrains-annotations-24.1.0.tar.gz 84549 BLAKE2B 1c522e4eeb71520108d83305667571fd07b452977277a161ea0f6a940431212ccd3b7ca2980f77b0e8c015cce0b5a35500fefca73e74bf48c9859525332bdc81 SHA512 80dc35009eaac29b44a5126865bf76d1c2d20c0e9094a200b13bc9047d6ec327a25e49a06c462ba65c4aa6e3d201d0a3005614f27b07adcf107080c0189af9fa
+DIST jetbrains-annotations-26.0.1.tar.gz 148134 BLAKE2B 154dad272ea1326281e4dd7b6dbfed98a8ba018ce1d6fc2a225ddff1db785646b1707f4e59640658b6f6a512ef6b3c282fa18eb2d656ce659d0ed2e47e2e9b3f SHA512 230e5812242cdad9baf0c3fd8a9cc0ef17cc52e8c2d120988da84d9097cc63fb809547afdfcd17a3506fbf3e9c96eb9fd5e149ee90645ef9098a085318be3cf1
diff --git a/dev-java/jetbrains-annotations/jetbrains-annotations-24.1.0.ebuild b/dev-java/jetbrains-annotations/jetbrains-annotations-26.0.1.ebuild
index 5f359ddcbe74..596a02691f70 100644
--- a/dev-java/jetbrains-annotations/jetbrains-annotations-24.1.0.ebuild
+++ b/dev-java/jetbrains-annotations/jetbrains-annotations-26.0.1.ebuild
@@ -20,4 +20,4 @@ KEYWORDS="~amd64"
DEPEND=">=virtual/jdk-11:*" # module-info
RDEPEND=">=virtual/jre-1.8:*"
-JAVA_SRC_DIR=( {common,java8,module-info}/src/main/java )
+JAVA_SRC_DIR=( src/jvmMain/{java,moduleInfo} )
diff --git a/dev-java/jffi/jffi-1.3.10.ebuild b/dev-java/jffi/jffi-1.3.10.ebuild
index 70abe8077327..3c62e8a2a78c 100644
--- a/dev-java/jffi/jffi-1.3.10.ebuild
+++ b/dev-java/jffi/jffi-1.3.10.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${P}"
LICENSE="Apache-2.0"
SLOT="1.3"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND=">=virtual/jdk-1.8:*
>=dev-libs/libffi-3.4.2-r2:="
diff --git a/dev-java/jgoodies-common/jgoodies-common-1.8.0-r1.ebuild b/dev-java/jgoodies-common/jgoodies-common-1.8.0-r1.ebuild
index 92301470bd7f..084928c5c1ca 100644
--- a/dev-java/jgoodies-common/jgoodies-common-1.8.0-r1.ebuild
+++ b/dev-java/jgoodies-common/jgoodies-common-1.8.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -17,7 +17,7 @@ SRC_URI="http://www.jgoodies.com/download/libraries/${MY_PN}/${MY_P}.zip"
LICENSE="BSD"
SLOT="1.8"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ~ppc64"
IUSE=""
RESTRICT="test"
diff --git a/dev-java/jgoodies-looks/jgoodies-looks-2.6.0-r1.ebuild b/dev-java/jgoodies-looks/jgoodies-looks-2.6.0-r1.ebuild
index b66de1813650..bcb30c654081 100644
--- a/dev-java/jgoodies-looks/jgoodies-looks-2.6.0-r1.ebuild
+++ b/dev-java/jgoodies-looks/jgoodies-looks-2.6.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -17,7 +17,7 @@ SRC_URI="http://www.jgoodies.com/download/libraries/${MY_PN}/${MY_P}.zip"
LICENSE="BSD"
SLOT="2.6"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64"
IUSE=""
CDEPEND="dev-java/jgoodies-common:1.8"
diff --git a/dev-java/jide-oss/jide-oss-3.7.12-r1.ebuild b/dev-java/jide-oss/jide-oss-3.7.12-r1.ebuild
index c25d8ee7fdcc..39bb51991972 100644
--- a/dev-java/jide-oss/jide-oss-3.7.12-r1.ebuild
+++ b/dev-java/jide-oss/jide-oss-3.7.12-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/jidesoft/jide-oss/archive/${MY_COMMIT}.tar.gz -> ${P
LICENSE="GPL-2-with-classpath-exception"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
# Upstream does not support java-11
# https://github.com/jidesoft/jide-oss/issues/30
diff --git a/dev-java/jimfs/jimfs-1.3.0.ebuild b/dev-java/jimfs/jimfs-1.3.0.ebuild
index 9fbc54dbf4d7..51da03ba1670 100644
--- a/dev-java/jimfs/jimfs-1.3.0.ebuild
+++ b/dev-java/jimfs/jimfs-1.3.0.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}/jimfs"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
CP_DEPEND="
dev-java/auto-service-annotations:0
diff --git a/dev-java/jline/jline-2.14.6.ebuild b/dev-java/jline/jline-2.14.6.ebuild
index bb38923b3ae9..aaa438bb7511 100644
--- a/dev-java/jline/jline-2.14.6.ebuild
+++ b/dev-java/jline/jline-2.14.6.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}2-${P}"
LICENSE="BSD"
SLOT="2"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
IUSE="test"
# Needs yet-unpackaged powermock for tests
RESTRICT="!test? ( test ) test"
diff --git a/dev-java/jmh-core/jmh-core-1.37.ebuild b/dev-java/jmh-core/jmh-core-1.37.ebuild
index 918d1dd398c1..398898829f60 100644
--- a/dev-java/jmh-core/jmh-core-1.37.ebuild
+++ b/dev-java/jmh-core/jmh-core-1.37.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/jmh-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
CP_DEPEND="
dev-java/commons-math:3
diff --git a/dev-java/jmh-generator-annprocess/jmh-generator-annprocess-1.37.ebuild b/dev-java/jmh-generator-annprocess/jmh-generator-annprocess-1.37.ebuild
index e31b36bf2b55..eef83ed218c9 100644
--- a/dev-java/jmh-generator-annprocess/jmh-generator-annprocess-1.37.ebuild
+++ b/dev-java/jmh-generator-annprocess/jmh-generator-annprocess-1.37.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/jmh-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
DEPEND="
dev-java/jmh-core:0
diff --git a/dev-java/jmock/jmock-1.2.0-r2.ebuild b/dev-java/jmock/jmock-1.2.0-r2.ebuild
index 4565aca4f32d..6ba5eb3a2018 100644
--- a/dev-java/jmock/jmock-1.2.0-r2.ebuild
+++ b/dev-java/jmock/jmock-1.2.0-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://jmock.org/downloads/${P}-jars.zip"
LICENSE="BSD"
SLOT="1.0"
-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"
CDEPEND="dev-java/junit:0"
diff --git a/dev-java/jmock/jmock-2.12.0.ebuild b/dev-java/jmock/jmock-2.12.0.ebuild
index 48b5e810aeea..7d109b992e3c 100644
--- a/dev-java/jmock/jmock-2.12.0.ebuild
+++ b/dev-java/jmock/jmock-2.12.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/${PN}-developers/${PN}-library/archive/${PV}.tar.gz
LICENSE="BSD"
SLOT="2"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND="
dev-java/asm:9
diff --git a/dev-java/jna/jna-5.13.0-r1.ebuild b/dev-java/jna/jna-5.13.0-r1.ebuild
index 78bcd9e70833..2b0bbe85f60e 100644
--- a/dev-java/jna/jna-5.13.0-r1.ebuild
+++ b/dev-java/jna/jna-5.13.0-r1.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${P}"
LICENSE="|| ( Apache-2.0 LGPL-2.1+ )"
SLOT="4"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
BDEPEND="
virtual/pkgconfig
diff --git a/dev-java/jna/jna-5.14.0-r1.ebuild b/dev-java/jna/jna-5.14.0-r1.ebuild
index f2f626d4b2f0..30e69f517f10 100644
--- a/dev-java/jna/jna-5.14.0-r1.ebuild
+++ b/dev-java/jna/jna-5.14.0-r1.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${P}"
LICENSE="|| ( Apache-2.0 LGPL-2.1+ )"
SLOT="4"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ~ppc64"
BDEPEND="
virtual/pkgconfig
diff --git a/dev-java/jnacl/jnacl-1.0-r1.ebuild b/dev-java/jnacl/jnacl-1.0-r1.ebuild
index 5831302b3878..c6f3b8deffab 100644
--- a/dev-java/jnacl/jnacl-1.0-r1.ebuild
+++ b/dev-java/jnacl/jnacl-1.0-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
# We don't have fest-assert
RESTRICT="test"
diff --git a/dev-java/jnacl/jnacl-1.0.ebuild b/dev-java/jnacl/jnacl-1.0.ebuild
index 785ae00c3577..fec05a922c29 100644
--- a/dev-java/jnacl/jnacl-1.0.ebuild
+++ b/dev-java/jnacl/jnacl-1.0.ebuild
@@ -21,7 +21,7 @@ RESTRICT="test"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
# Compile dependencies
# POM: pom.xml
diff --git a/dev-java/jnr-a64asm/jnr-a64asm-1.0.0.ebuild b/dev-java/jnr-a64asm/jnr-a64asm-1.0.0.ebuild
index d823512aa8c5..9943cc56e9f8 100644
--- a/dev-java/jnr-a64asm/jnr-a64asm-1.0.0.ebuild
+++ b/dev-java/jnr-a64asm/jnr-a64asm-1.0.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/jnr/${PN}/archive/refs/tags/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="2"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND="
>=virtual/jdk-1.8:*
diff --git a/dev-java/jnr-constants/jnr-constants-0.10.4.ebuild b/dev-java/jnr-constants/jnr-constants-0.10.4.ebuild
index 77ca4ee87b62..bf517c0858fc 100644
--- a/dev-java/jnr-constants/jnr-constants-0.10.4.ebuild
+++ b/dev-java/jnr-constants/jnr-constants-0.10.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/jnr/${PN}/archive/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jnr-ffi/jnr-ffi-2.2.12.ebuild b/dev-java/jnr-ffi/jnr-ffi-2.2.12.ebuild
index 0b8b1a4e7b58..1bcbaea776f3 100644
--- a/dev-java/jnr-ffi/jnr-ffi-2.2.12.ebuild
+++ b/dev-java/jnr-ffi/jnr-ffi-2.2.12.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/jnr/${PN}/archive/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="2"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
CP_DEPEND="
dev-java/asm:9
diff --git a/dev-java/jnr-netdb/jnr-netdb-1.2.0.ebuild b/dev-java/jnr-netdb/jnr-netdb-1.2.0.ebuild
index 3faa1bbd7a54..4ce95b456a3a 100644
--- a/dev-java/jnr-netdb/jnr-netdb-1.2.0.ebuild
+++ b/dev-java/jnr-netdb/jnr-netdb-1.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jnr/jnr-netdb/archive/jnr-netdb-${PV}.tar.gz"
LICENSE="Apache-2.0"
SLOT="1.0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
CP_DEPEND="
dev-java/jnr-ffi:2"
diff --git a/dev-java/jnr-posix/jnr-posix-3.1.16.ebuild b/dev-java/jnr-posix/jnr-posix-3.1.16.ebuild
index b3e97a52ac5d..2d4d881cc2cf 100644
--- a/dev-java/jnr-posix/jnr-posix-3.1.16.ebuild
+++ b/dev-java/jnr-posix/jnr-posix-3.1.16.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${P}"
LICENSE="EPL-2.0 GPL-2 LGPL-2.1"
SLOT="3.0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
CP_DEPEND="
>=dev-java/jnr-ffi-2.2.12:2
diff --git a/dev-java/jnr-x86asm/jnr-x86asm-1.0.2-r2.ebuild b/dev-java/jnr-x86asm/jnr-x86asm-1.0.2-r2.ebuild
index 4633a61cb0f5..0888c3430d26 100644
--- a/dev-java/jnr-x86asm/jnr-x86asm-1.0.2-r2.ebuild
+++ b/dev-java/jnr-x86asm/jnr-x86asm-1.0.2-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jnr/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar
LICENSE="MIT"
SLOT="1.0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
IUSE=""
DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/joda-convert/joda-convert-2.2.2-r2.ebuild b/dev-java/joda-convert/joda-convert-2.2.2-r2.ebuild
index 2dc17927a5f3..dd3b55a98160 100644
--- a/dev-java/joda-convert/joda-convert-2.2.2-r2.ebuild
+++ b/dev-java/joda-convert/joda-convert-2.2.2-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/JodaOrg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
# Compile dependencies
# POM: pom.xml
diff --git a/dev-java/joda-time/joda-time-2.11.2.ebuild b/dev-java/joda-time/joda-time-2.11.2.ebuild
index 3420658c6077..113221e97500 100644
--- a/dev-java/joda-time/joda-time-2.11.2.ebuild
+++ b/dev-java/joda-time/joda-time-2.11.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/JodaOrg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos"
# Common dependencies
# POM: pom.xml
diff --git a/dev-java/jol-core/jol-core-0.16-r1.ebuild b/dev-java/jol-core/jol-core-0.16-r1.ebuild
index f63e52343fdc..eb361ed8b085 100644
--- a/dev-java/jol-core/jol-core-0.16-r1.ebuild
+++ b/dev-java/jol-core/jol-core-0.16-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/openjdk/jol/archive/${PV}.tar.gz -> jol-${PV}.tar.gz
LICENSE="GPL-2-with-classpath-exception"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND="
>=virtual/jdk-1.8:*
diff --git a/dev-java/jopt-simple/jopt-simple-5.0.4.ebuild b/dev-java/jopt-simple/jopt-simple-5.0.4.ebuild
index 72937c43363d..caf92a9f80de 100644
--- a/dev-java/jopt-simple/jopt-simple-5.0.4.ebuild
+++ b/dev-java/jopt-simple/jopt-simple-5.0.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jopt-simple/jopt-simple/archive/jopt-simple-${PV}.ta
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
RDEPEND=">=virtual/jre-1.8:*"
DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/jrobin/jrobin-1.6.0-r2.ebuild b/dev-java/jrobin/jrobin-1.6.0-r2.ebuild
index 591a820c6055..09faeb71c9b4 100644
--- a/dev-java/jrobin/jrobin-1.6.0-r2.ebuild
+++ b/dev-java/jrobin/jrobin-1.6.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Skeleton command:
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/OpenNMS/${PN}/archive/${P}-1.tar.gz"
LICENSE="LGPL-3"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64"
# Common dependencies
# POM: pom.xml
diff --git a/dev-java/jsch-agent-proxy/jsch-agent-proxy-0.0.9.ebuild b/dev-java/jsch-agent-proxy/jsch-agent-proxy-0.0.9.ebuild
index 0a12a3826469..1f9a9d46adbc 100644
--- a/dev-java/jsch-agent-proxy/jsch-agent-proxy-0.0.9.ebuild
+++ b/dev-java/jsch-agent-proxy/jsch-agent-proxy-0.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Skeleton command:
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ymnk/jsch-agent-proxy/archive/${MY_COMMIT}.tar.gz ->
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="amd64 ppc64"
# Common dependencies
# POM: ${PN}-12c3d64fc2b0a4fd37659369edfdee26e48954e2/${PN}-jsch/pom.xml
diff --git a/dev-java/jsch/jsch-0.1.55.ebuild b/dev-java/jsch/jsch-0.1.55.ebuild
index 185869283b8c..4685f67c902b 100644
--- a/dev-java/jsch/jsch-0.1.55.ebuild
+++ b/dev-java/jsch/jsch-0.1.55.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.zip"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
# Common dependencies
# POM: ${P}.pom
diff --git a/dev-java/json-simple/json-simple-2.3.1.ebuild b/dev-java/json-simple/json-simple-2.3.1.ebuild
index 110f81bfc90f..d9eee68bd912 100644
--- a/dev-java/json-simple/json-simple-2.3.1.ebuild
+++ b/dev-java/json-simple/json-simple-2.3.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${P}"
LICENSE="Apache-2.0"
SLOT="2.3"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc64"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/json-smart/json-smart-1.3.3.ebuild b/dev-java/json-smart/json-smart-1.3.3.ebuild
index e99f34716d66..1bf1ce4edfba 100644
--- a/dev-java/json-smart/json-smart-1.3.3.ebuild
+++ b/dev-java/json-smart/json-smart-1.3.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://urielch.github.io"
SRC_URI="https://github.com/netplex/json-smart-v1/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="1"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/json-smart/json-smart-2.5.0.ebuild b/dev-java/json-smart/json-smart-2.5.0.ebuild
index 1a50af565897..ddc968a2a7b6 100644
--- a/dev-java/json-smart/json-smart-2.5.0.ebuild
+++ b/dev-java/json-smart/json-smart-2.5.0.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${PN}-v2-${PV}"
LICENSE="Apache-2.0"
SLOT="2"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64"
RESTRICT="test" #839681
DEPEND="
diff --git a/dev-java/jsonrpc2-base/jsonrpc2-base-1.38.2.ebuild b/dev-java/jsonrpc2-base/jsonrpc2-base-1.38.2.ebuild
index c823ebe0bfaa..883446a934e5 100644
--- a/dev-java/jsonrpc2-base/jsonrpc2-base-1.38.2.ebuild
+++ b/dev-java/jsonrpc2-base/jsonrpc2-base-1.38.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://software.dzhuvinov.com/json-rpc-2.0-base.html"
SRC_URI="https://bitbucket.org/thetransactioncompany/json-rpc-2.0-base/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
LICENSE="Apache-2.0"
SLOT="1"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64"
CP_DEPEND="dev-java/json-smart:1"
DEPEND="
diff --git a/dev-java/jsonrpc2-server/jsonrpc2-server-1.11.1.ebuild b/dev-java/jsonrpc2-server/jsonrpc2-server-1.11.1.ebuild
index 802c9c7ef090..819ab21078c2 100644
--- a/dev-java/jsonrpc2-server/jsonrpc2-server-1.11.1.ebuild
+++ b/dev-java/jsonrpc2-server/jsonrpc2-server-1.11.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://software.dzhuvinov.com/json-rpc-2.0-server.html"
SRC_URI="https://bitbucket.org/thetransactioncompany/json-rpc-2.0-server/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
LICENSE="Apache-2.0"
SLOT="1"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64"
PROPERTIES="test_network"
RESTRICT="test" # single test, need access to google
diff --git a/dev-java/jsr305/jsr305-3.0.2-r1.ebuild b/dev-java/jsr305/jsr305-3.0.2-r1.ebuild
index 023c623ac166..7f44aab9e95a 100644
--- a/dev-java/jsr305/jsr305-3.0.2-r1.ebuild
+++ b/dev-java/jsr305/jsr305-3.0.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://repo1.maven.org/maven2/com/google/code/findbugs/jsr305/${PV}/js
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
RDEPEND=">=virtual/jre-1.8:*"
DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/jstl-api/jstl-api-1.2.7.ebuild b/dev-java/jstl-api/jstl-api-1.2.7.ebuild
index 058f3765dd68..db415207d233 100644
--- a/dev-java/jstl-api/jstl-api-1.2.7.ebuild
+++ b/dev-java/jstl-api/jstl-api-1.2.7.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/tags-${PV}-RELEASE"
LICENSE="EPL-2.0 GPL-2-with-classpath-exception"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64"
CP_DEPEND="
dev-java/javax-el-api:2.2
diff --git a/dev-java/jstl/jstl-1.2.7.ebuild b/dev-java/jstl/jstl-1.2.7.ebuild
index b4ff54f71e83..7ac9dc6987ca 100644
--- a/dev-java/jstl/jstl-1.2.7.ebuild
+++ b/dev-java/jstl/jstl-1.2.7.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/tags-${PV}-RELEASE"
LICENSE="EPL-2.0 GPL-2-with-classpath-exception"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64"
CP_DEPEND="
dev-java/javax-el-api:2.2
diff --git a/dev-java/jtds/jtds-1.3.1-r1.ebuild b/dev-java/jtds/jtds-1.3.1-r1.ebuild
index 650c6251d4b3..3a3f61a9e25c 100644
--- a/dev-java/jtds/jtds-1.3.1-r1.ebuild
+++ b/dev-java/jtds/jtds-1.3.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}-src.zi
LICENSE="LGPL-2.1"
SLOT="1.3"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64"
RESTRICT="test" # Needs a running server
CDEPEND="dev-java/jcifs:1.1"
diff --git a/dev-java/jtidy/jtidy-1.0-r2.ebuild b/dev-java/jtidy/jtidy-1.0-r2.ebuild
index 3121a966d659..be5a440b99a8 100644
--- a/dev-java/jtidy/jtidy-1.0-r2.ebuild
+++ b/dev-java/jtidy/jtidy-1.0-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://downloads.sourceforge.net/project/${PN}/JTidy/${MY_PV}/${PN}-${
LICENSE="HTML-Tidy W3C"
SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="amd64 ppc64"
BDEPEND="app-arch/unzip"
CP_DEPEND=">=dev-java/ant-1.10.14-r3:0"
diff --git a/dev-java/jtwig-core/jtwig-core-5.87.0.ebuild b/dev-java/jtwig-core/jtwig-core-5.87.0.ebuild
index 231f046c7506..4f96b964098c 100644
--- a/dev-java/jtwig-core/jtwig-core-5.87.0.ebuild
+++ b/dev-java/jtwig-core/jtwig-core-5.87.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}.RELEASE"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64"
# no tests because
# net.jperf does not exist
# org.unitils.reflectionassert does not exist
diff --git a/dev-java/jtwig-reflection/jtwig-reflection-5.87.0.ebuild b/dev-java/jtwig-reflection/jtwig-reflection-5.87.0.ebuild
index 577afe3d413b..44b9944c3e77 100644
--- a/dev-java/jtwig-reflection/jtwig-reflection-5.87.0.ebuild
+++ b/dev-java/jtwig-reflection/jtwig-reflection-5.87.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}.RELEASE"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64"
DEPEND="
dev-java/commons-lang:3.6
diff --git a/dev-java/jul-to-slf4j/jul-to-slf4j-2.0.3.ebuild b/dev-java/jul-to-slf4j/jul-to-slf4j-2.0.3.ebuild
index 77db651a8575..7f7230e4c053 100644
--- a/dev-java/jul-to-slf4j/jul-to-slf4j-2.0.3.ebuild
+++ b/dev-java/jul-to-slf4j/jul-to-slf4j-2.0.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/qos-ch/slf4j/archive/v_${PV}.tar.gz -> slf4j-${PV}.t
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
# Common dependencies
# POM: pom.xml
diff --git a/dev-java/junit-clptr/junit-clptr-1.2.2.ebuild b/dev-java/junit-clptr/junit-clptr-1.2.2.ebuild
index bbf2af86203e..8f5b3a458408 100644
--- a/dev-java/junit-clptr/junit-clptr-1.2.2.ebuild
+++ b/dev-java/junit-clptr/junit-clptr-1.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Skeleton command:
@@ -16,7 +16,7 @@ HOMEPAGE="http://nexus.sonatype.org/oss-repository-hosting.html/junit-clptr"
SRC_URI="https://github.com/bitstrings/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}-sources.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="amd64 ppc64"
# Common dependencies
# POM: pom.xml
diff --git a/dev-java/junit-dataprovider/junit-dataprovider-2.9.ebuild b/dev-java/junit-dataprovider/junit-dataprovider-2.9.ebuild
index 87a877751192..650cba22a78f 100644
--- a/dev-java/junit-dataprovider/junit-dataprovider-2.9.ebuild
+++ b/dev-java/junit-dataprovider/junit-dataprovider-2.9.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/TNG/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
CP_DEPEND="dev-java/findbugs-annotations:0"
diff --git a/dev-java/junit/junit-3.8.2-r2.ebuild b/dev-java/junit/junit-3.8.2-r2.ebuild
index cf296f8e6b7a..3138621640e8 100644
--- a/dev-java/junit/junit-3.8.2-r2.ebuild
+++ b/dev-java/junit/junit-3.8.2-r2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/junit${PV}"
LICENSE="CPL-1.0"
SLOT="0"
-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"
BDEPEND="app-arch/unzip"
DEPEND=">=virtual/jdk-1.8"
diff --git a/dev-java/junit/junit-4.13.2_p20240222.ebuild b/dev-java/junit/junit-4.13.2_p20240222.ebuild
index 7ad657694622..6685743be268 100644
--- a/dev-java/junit/junit-4.13.2_p20240222.ebuild
+++ b/dev-java/junit/junit-4.13.2_p20240222.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}4-${MY_COMMIT}"
LICENSE="EPL-1.0"
SLOT="4"
-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"
CP_DEPEND="dev-java/hamcrest-core:1.3"
DEPEND="${CP_DEPEND}
diff --git a/dev-java/junit/junit-5.10.3.ebuild b/dev-java/junit/junit-5.10.3.ebuild
index 943a09f2fe3d..81a4571700d9 100644
--- a/dev-java/junit/junit-5.10.3.ebuild
+++ b/dev-java/junit/junit-5.10.3.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/junit5-r${PV}"
LICENSE="EPL-2.0"
SLOT="5"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
IUSE="doc migration-support suite vintage"
CP_DEPEND="
diff --git a/dev-java/junitparams/junitparams-1.1.1-r1.ebuild b/dev-java/junitparams/junitparams-1.1.1-r1.ebuild
index 81bd68990a2b..9b511a320bec 100644
--- a/dev-java/junitparams/junitparams-1.1.1-r1.ebuild
+++ b/dev-java/junitparams/junitparams-1.1.1-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/Pragmatists/JUnitParams/archive/refs/tags/JUnitParam
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
# Common dependencies
# POM: pom.xml
diff --git a/dev-java/jzlib/jzlib-1.1.3-r2.ebuild b/dev-java/jzlib/jzlib-1.1.3-r2.ebuild
index d82563be8f7d..eabbd3f4d542 100644
--- a/dev-java/jzlib/jzlib-1.1.3-r2.ebuild
+++ b/dev-java/jzlib/jzlib-1.1.3-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/ymnk/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-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"
RDEPEND="
>=virtual/jre-1.8:*"
diff --git a/dev-java/kafka-clients/kafka-clients-1.1.1-r2.ebuild b/dev-java/kafka-clients/kafka-clients-1.1.1-r2.ebuild
index bb052740ba01..13aa6830ce98 100644
--- a/dev-java/kafka-clients/kafka-clients-1.1.1-r2.ebuild
+++ b/dev-java/kafka-clients/kafka-clients-1.1.1-r2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/kafka-${PV}-src/clients"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
CP_DEPEND="
>=dev-java/lz4-java-1.4.1:0
diff --git a/dev-java/leiningen-bin/leiningen-bin-2.11.2.ebuild b/dev-java/leiningen-bin/leiningen-bin-2.11.2.ebuild
index 9b67aaa8bbc5..02878c69efd3 100644
--- a/dev-java/leiningen-bin/leiningen-bin-2.11.2.ebuild
+++ b/dev-java/leiningen-bin/leiningen-bin-2.11.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
LICENSE="EPL-1.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ~x86 ~x64-macos"
+KEYWORDS="amd64 arm64 ~x64-macos"
RDEPEND=">=virtual/jre-1.8"
DEPEND=">=virtual/jdk-1.8"
diff --git a/dev-java/libg/libg-7.0.0.ebuild b/dev-java/libg/libg-7.0.0.ebuild
index a710bf8a69ef..a0d110013f1e 100644
--- a/dev-java/libg/libg-7.0.0.ebuild
+++ b/dev-java/libg/libg-7.0.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/bnd-${PV}"
LICENSE="Apache-2.0 EPL-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
# aQute.bnd.test.jupiter does not exist
# org.assertj.core.api.junit.jupiter does not exist
RESTRICT="test" #839681
diff --git a/dev-java/lmax-disruptor/lmax-disruptor-3.4.4.ebuild b/dev-java/lmax-disruptor/lmax-disruptor-3.4.4.ebuild
index 283d787a55b3..1cbd81f22f82 100644
--- a/dev-java/lmax-disruptor/lmax-disruptor-3.4.4.ebuild
+++ b/dev-java/lmax-disruptor/lmax-disruptor-3.4.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/LMAX-Exchange/disruptor/archive/${PV}.tar.gz -> ${P}
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/log4j-12-api/log4j-12-api-2.19.0.ebuild b/dev-java/log4j-12-api/log4j-12-api-2.19.0.ebuild
index 0925ebaa1f60..4272ee330433 100644
--- a/dev-java/log4j-12-api/log4j-12-api-2.19.0.ebuild
+++ b/dev-java/log4j-12-api/log4j-12-api-2.19.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.tar.gz"
LICENSE="Apache-2.0"
SLOT="2"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
# We don't have junit-vintage and junit-jupiter
RESTRICT="test"
diff --git a/dev-java/log4j-api/log4j-api-2.19.0.ebuild b/dev-java/log4j-api/log4j-api-2.19.0.ebuild
index d66b6048f026..73bc91bd6052 100644
--- a/dev-java/log4j-api/log4j-api-2.19.0.ebuild
+++ b/dev-java/log4j-api/log4j-api-2.19.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.tar.gz
LICENSE="Apache-2.0"
SLOT="2"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
# junit-{jupiter,vintage} is not available in ::gentoo
RESTRICT="test"
diff --git a/dev-java/log4j-core/log4j-core-2.19.0-r1.ebuild b/dev-java/log4j-core/log4j-core-2.19.0-r1.ebuild
index 926013cca9e9..c3bca3cfeaf1 100644
--- a/dev-java/log4j-core/log4j-core-2.19.0-r1.ebuild
+++ b/dev-java/log4j-core/log4j-core-2.19.0-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.tar.gz"
LICENSE="Apache-2.0"
SLOT="2"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
# We don't have junit-vintage and junit-jupiter
RESTRICT="test"
diff --git a/dev-java/log4j-over-slf4j/log4j-over-slf4j-2.0.3.ebuild b/dev-java/log4j-over-slf4j/log4j-over-slf4j-2.0.3.ebuild
index c2ceac16c4cc..96f51226a040 100644
--- a/dev-java/log4j-over-slf4j/log4j-over-slf4j-2.0.3.ebuild
+++ b/dev-java/log4j-over-slf4j/log4j-over-slf4j-2.0.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/qos-ch/slf4j/archive/v_${PV}.tar.gz -> slf4j-${PV}.t
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
# Common dependencies
# POM: pom.xml
diff --git a/dev-java/lucene/lucene-2.4.1-r5.ebuild b/dev-java/lucene/lucene-2.4.1-r5.ebuild
index 2a1641800238..ffee12eddb45 100644
--- a/dev-java/lucene/lucene-2.4.1-r5.ebuild
+++ b/dev-java/lucene/lucene-2.4.1-r5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.apache.org/dist/${PN}/java/${P}-src.tar.gz
LICENSE="Apache-2.0"
SLOT="2.4"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/lucene.apache.org.asc"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-lucene )"
diff --git a/dev-java/lz4-java/lz4-java-1.8.0-r6.ebuild b/dev-java/lz4-java/lz4-java-1.8.0-r6.ebuild
index ac2a355de844..939880e8104a 100644
--- a/dev-java/lz4-java/lz4-java-1.8.0-r6.ebuild
+++ b/dev-java/lz4-java/lz4-java-1.8.0-r6.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND="
app-arch/lz4:=
diff --git a/dev-java/lzma/lzma-22.01.ebuild b/dev-java/lzma/lzma-22.01.ebuild
index 8279b6b2d058..ecadcae4135f 100644
--- a/dev-java/lzma/lzma-22.01.ebuild
+++ b/dev-java/lzma/lzma-22.01.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://7-zip.org/a/lzma${PV/./}.7z -> ${P}.7z"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64"
RDEPEND=">=virtual/jre-1.8:*"
DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/lzmajio/lzmajio-0.95-r3.ebuild b/dev-java/lzmajio/lzmajio-0.95-r3.ebuild
index bcaffafa4561..4b1b53de7ee9 100644
--- a/dev-java/lzmajio/lzmajio-0.95-r3.ebuild
+++ b/dev-java/lzmajio/lzmajio-0.95-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/league/${P}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64"
CDEPEND="dev-java/lzma:0"
diff --git a/dev-java/maven-bin/maven-bin-3.8.8-r1.ebuild b/dev-java/maven-bin/maven-bin-3.8.8-r1.ebuild
index 731294052d5e..b05640d31613 100644
--- a/dev-java/maven-bin/maven-bin-3.8.8-r1.ebuild
+++ b/dev-java/maven-bin/maven-bin-3.8.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -16,7 +16,7 @@ HOMEPAGE="https://maven.apache.org/"
LICENSE="Apache-2.0"
SLOT="3.8"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64"
DEPEND="
>=virtual/jdk-1.8:*
diff --git a/dev-java/maven-bin/maven-bin-3.9.9.ebuild b/dev-java/maven-bin/maven-bin-3.9.9.ebuild
index 16060561ede9..199d1adc2e7b 100644
--- a/dev-java/maven-bin/maven-bin-3.9.9.ebuild
+++ b/dev-java/maven-bin/maven-bin-3.9.9.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="Apache-2.0"
SLOT="3.9"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64"
DEPEND="
>=virtual/jdk-1.8:*
diff --git a/dev-java/mchange-commons/mchange-commons-0.2.20.ebuild b/dev-java/mchange-commons/mchange-commons-0.2.20.ebuild
index 9ad7bcf8724b..984384073b88 100644
--- a/dev-java/mchange-commons/mchange-commons-0.2.20.ebuild
+++ b/dev-java/mchange-commons/mchange-commons-0.2.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Skeleton command:
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/swaldman/${PN}-java/archive/refs/tags/v${PV}.tar.gz
LICENSE="EPL-1.0 LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="amd64 ppc64"
CP_DEPEND="
dev-java/log4j-api:2
diff --git a/dev-java/memoryfilesystem/memoryfilesystem-2.3.0.ebuild b/dev-java/memoryfilesystem/memoryfilesystem-2.3.0.ebuild
index c8593df2a345..3b9997332847 100644
--- a/dev-java/memoryfilesystem/memoryfilesystem-2.3.0.ebuild
+++ b/dev-java/memoryfilesystem/memoryfilesystem-2.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/marschall/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
CP_DEPEND="
dev-java/jakarta-annotations-api:0
diff --git a/dev-java/mersennetwister/mersennetwister-0_pre23765-r2.ebuild b/dev-java/mersennetwister/mersennetwister-0_pre23765-r2.ebuild
index d00a925d7dfb..f55868287475 100644
--- a/dev-java/mersennetwister/mersennetwister-0_pre23765-r2.ebuild
+++ b/dev-java/mersennetwister/mersennetwister-0_pre23765-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64"
IUSE=""
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/metainf-services/metainf-services-1.11.ebuild b/dev-java/metainf-services/metainf-services-1.11.ebuild
index d03e2e80adf5..7f43378d96ca 100644
--- a/dev-java/metainf-services/metainf-services-1.11.ebuild
+++ b/dev-java/metainf-services/metainf-services-1.11.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-${P}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
RDEPEND=">=virtual/jre-1.8:*"
DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/metainf-services/metainf-services-1.9.ebuild b/dev-java/metainf-services/metainf-services-1.9.ebuild
index bc65997190d7..91c6c09f8493 100644
--- a/dev-java/metainf-services/metainf-services-1.9.ebuild
+++ b/dev-java/metainf-services/metainf-services-1.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/kohsuke/${PN}/archive/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64"
RDEPEND=">=virtual/jre-1.8:*"
DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/miglayout/miglayout-5.3.ebuild b/dev-java/miglayout/miglayout-5.3.ebuild
index 26caf78554f7..06d13085cba0 100644
--- a/dev-java/miglayout/miglayout-5.3.ebuild
+++ b/dev-java/miglayout/miglayout-5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}"
LICENSE="BSD"
SLOT="5"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
RDEPEND=">=virtual/jre-1.8:*"
DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/mill-bin/mill-bin-0.11.12.ebuild b/dev-java/mill-bin/mill-bin-0.11.12.ebuild
index 3534e0b8c898..13be1b452c85 100644
--- a/dev-java/mill-bin/mill-bin-0.11.12.ebuild
+++ b/dev-java/mill-bin/mill-bin-0.11.12.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/mill-bin/mill-bin-0.11.6.ebuild b/dev-java/mill-bin/mill-bin-0.11.6.ebuild
index 95f583ce077d..ffb3d77a5ada 100644
--- a/dev-java/mill-bin/mill-bin-0.11.6.ebuild
+++ b/dev-java/mill-bin/mill-bin-0.11.6.ebuild
@@ -8,7 +8,7 @@ MY_PN=${PN%-bin}
DESCRIPTION="A Java/Scala build tool"
HOMEPAGE="https://com-lihaoyi.github.io/mill/"
SRC_URI="https://github.com/com-lihaoyi/${MY_PN}/releases/download/${PV}/${PV}-assembly -> ${P}"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-java/mill-bin/mill-bin-0.11.7.ebuild b/dev-java/mill-bin/mill-bin-0.11.7.ebuild
index 95f583ce077d..ffb3d77a5ada 100644
--- a/dev-java/mill-bin/mill-bin-0.11.7.ebuild
+++ b/dev-java/mill-bin/mill-bin-0.11.7.ebuild
@@ -8,7 +8,7 @@ MY_PN=${PN%-bin}
DESCRIPTION="A Java/Scala build tool"
HOMEPAGE="https://com-lihaoyi.github.io/mill/"
SRC_URI="https://github.com/com-lihaoyi/${MY_PN}/releases/download/${PV}/${PV}-assembly -> ${P}"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-java/minidns-core/minidns-core-1.0.4.ebuild b/dev-java/minidns-core/minidns-core-1.0.4.ebuild
index 20d28700f9a7..7e7c891f7e6c 100644
--- a/dev-java/minidns-core/minidns-core-1.0.4.ebuild
+++ b/dev-java/minidns-core/minidns-core-1.0.4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/minidns/minidns"
SRC_URI="https://github.com/MiniDNS/minidns/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="1"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/mockito/mockito-1.9.5-r4.ebuild b/dev-java/mockito/mockito-1.9.5-r4.ebuild
index ac97e8fa9047..c84fa46afec3 100644
--- a/dev-java/mockito/mockito-1.9.5-r4.ebuild
+++ b/dev-java/mockito/mockito-1.9.5-r4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://repo1.maven.org/maven2/org/mockito/mockito-core/${PV}/mockito-c
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
CP_DEPEND="
>=dev-java/ant-1.10.14-r3:0
diff --git a/dev-java/mockito/mockito-2.28.2.ebuild b/dev-java/mockito/mockito-2.28.2.ebuild
index e7f90cf65b88..e4b9495c0ec1 100644
--- a/dev-java/mockito/mockito-2.28.2.ebuild
+++ b/dev-java/mockito/mockito-2.28.2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}"
LICENSE="MIT"
SLOT="2"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc64"
CP_DEPEND="
dev-java/asm:9
diff --git a/dev-java/mockito/mockito-4.11.0.ebuild b/dev-java/mockito/mockito-4.11.0.ebuild
index 18221ffc32d2..f6b5a44d91d6 100644
--- a/dev-java/mockito/mockito-4.11.0.ebuild
+++ b/dev-java/mockito/mockito-4.11.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/mockito/mockito/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="MIT"
SLOT="4"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
CP_DEPEND="
dev-java/asm:9
diff --git a/dev-java/msv/msv-2022.7.ebuild b/dev-java/msv/msv-2022.7.ebuild
index 4372b65dd143..63e4fa8f8afd 100644
--- a/dev-java/msv/msv-2022.7.ebuild
+++ b/dev-java/msv/msv-2022.7.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/xmlark/msv/archive/msv-${PV}.tar.gz"
LICENSE="BSD-1"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
# Common dependencies
# POM: pom.xml
diff --git a/dev-java/mvel/mvel-2.5.0-r1.ebuild b/dev-java/mvel/mvel-2.5.0-r1.ebuild
index 01e6ece80895..3a49e8935721 100644
--- a/dev-java/mvel/mvel-2.5.0-r1.ebuild
+++ b/dev-java/mvel/mvel-2.5.0-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${PN}2-${PV}.Final"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND="
dev-java/asm:9
diff --git a/dev-java/mvel/mvel-2.5.2.ebuild b/dev-java/mvel/mvel-2.5.2.ebuild
index 9f2010ad7771..a97925897508 100644
--- a/dev-java/mvel/mvel-2.5.2.ebuild
+++ b/dev-java/mvel/mvel-2.5.2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${PN}2-${PV}.Final"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
DEPEND="
dev-java/asm:9
diff --git a/dev-java/objenesis/objenesis-3.3.ebuild b/dev-java/objenesis/objenesis-3.3.ebuild
index edc916ac6475..9075fa6f0501 100644
--- a/dev-java/objenesis/objenesis-3.3.ebuild
+++ b/dev-java/objenesis/objenesis-3.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/easymock/objenesis/archive/${PV}.tar.gz -> ${P}.tar.
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/open-test-reporting-events/open-test-reporting-events-0.1.0_pre1.ebuild b/dev-java/open-test-reporting-events/open-test-reporting-events-0.1.0_pre1.ebuild
index da76af5d02f2..6a59c7786456 100644
--- a/dev-java/open-test-reporting-events/open-test-reporting-events-0.1.0_pre1.ebuild
+++ b/dev-java/open-test-reporting-events/open-test-reporting-events-0.1.0_pre1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/open-test-reporting-r${MY_PV}/events"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
CP_DEPEND="~dev-java/open-test-reporting-schema-${PV}:0"
RDEPEND=">=virtual/jre-1.8:*
diff --git a/dev-java/open-test-reporting-schema/open-test-reporting-schema-0.1.0_pre1.ebuild b/dev-java/open-test-reporting-schema/open-test-reporting-schema-0.1.0_pre1.ebuild
index 56f01c5ae24a..6cab8a063da8 100644
--- a/dev-java/open-test-reporting-schema/open-test-reporting-schema-0.1.0_pre1.ebuild
+++ b/dev-java/open-test-reporting-schema/open-test-reporting-schema-0.1.0_pre1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/open-test-reporting-r${MY_PV}/schema"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
RDEPEND=">=virtual/jre-1.8:*"
DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index 2abf63f860e6..bd9260a91235 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -1,9 +1,12 @@
DIST openjdk-11.0.18-riscv.patch.xz 272672 BLAKE2B b079612032a5bf135b05bdd1da16f2823772a5d9a18447a435f191daf78c5429a15c2e9ea64758dc9b26ee2a88275532b4f27714b2a7e4489f920c0ed2f5003b SHA512 c0426f243c5aa581d90366cb01ce811e34883a9d8a0298cab420378470e8eb427a56932ca1fbb5ed57e7430be2b38c6bc4491028ebaa25be0a938ba0bb2baf45
DIST openjdk-11.0.24_p8.tar.gz 116418943 BLAKE2B cb768b202b42f426f4edaead16ba09800d86c10da4a664176842ee396332284d410191a55dbb35d7604272231e5b3daf8a75ddc03bb819d670622b7682eec7f6 SHA512 ce45efd934b9bacc56c468d92083a85de311b4436a519ae1d6038aff025c2fa8a811abca4cdd99aeb8c09455effff53500f96c287976cd2ae90d4e11da2385a3
+DIST openjdk-11.0.25_p9.tar.gz 116541441 BLAKE2B 5be0d6e1996860f0d8f36732758207044668fdbd6e9c9b21b96c897d526f2d86a931f2b8d732ebe4b668679c0e48cb49a472baf29d4ea5785dc4edb0d8a5de2f SHA512 25971b26d04dd111a21c112f694968c8d56c3692a62eb1366a1f49617a308a3a0cb37ab92ff02cff727041d6e32cbbc345f313db46df58f9e933a801a1588e8b
DIST openjdk-17.0.12_p7.tar.gz 106597045 BLAKE2B f0e9baec472ecefbf28359abfc10757dc7cb2a6ddf8428086a6565831f1c13ee1a7cdb87b67d6b3840860ddbf2c74e80ece55f09238fddc2cb8fa77208695b9b SHA512 cc99e9742123f7d8ac7ad78abab0fbe5cff37999b9c06ad14851009a95c9868968e97dd0f3e4dea8bfa8578f8f903fccaa37134466a778375cdf24344138f1fc
-DIST openjdk-21.0.4_p7.tar.gz 112506384 BLAKE2B d58636bc9221d56afcf118a91e41326d2e086c9fe22675429ec50d0b62fefd9e2040140a9d99682547e8bf0d40fa4ca2cbcdf8be55b9a0556b95c90fc0a08d56 SHA512 507524d842fb7c371cf7d3163cdce87e9266d613998b797f2828178b35c087354ae30941384d5afd1d6e3982eddf5c9067553bc2b918a9e223b93893f7f27e76
-DIST openjdk-23_p37.tar.gz 116630157 BLAKE2B 38f1beed2f840b89aa7375cda657cd769472324a52293a11911f4b96cb62a5a6882814c0d31a0fbde560ac167468afd6bbee84389f0c61956ad80596702214d0 SHA512 1f03849cdb1a603848de0516ac2f736f4665efee4bc9a67b66b1e3a8138fa2dcf1828471b423585f07be3ffa94e6bdbd5752bbc456b8bd0306a8cb30d6127754
+DIST openjdk-17.0.13_p11.tar.gz 107315661 BLAKE2B e403a8f33d4e79dd5c77a5dbfc991b443e15bddefe7cfde6cbd6f8df29f1cf499d0bd467d23f0c1b89b92b1dca16ebfb398a5c64b8787f787465a8a5f50bdfce SHA512 6f2220b3b0b9ab4441968d487858449f0e58400bfbbf8cc322b6c9393ab44869ea27285bed1022ac531f0a9eec5b7d6a07db4f7e78b094bb5ca8cedd5f40711a
+DIST openjdk-21.0.5_p11.tar.gz 112679148 BLAKE2B 6cfb2ab73e1bcc5d74c28f56e163778ca42fa1b9eda5367f2198827eae04d5a269926c97b326d1e71b2a57f2780588f538db8d3a81f367903fd967534747d3af SHA512 2fdfdb7e21fcaf97590fa54317f87169d5fdabf38027f4f6570942b2af637fc9ace3d35c3bbb0df29720e7a0f6d6a4087253a713389743ed7947e433d7b8103b
+DIST openjdk-23.0.1_p11.tar.gz 116677478 BLAKE2B ad5e8ea1f4c55627941909473401ce54a690c36d3162b108bafceb3a8a15982711876864067c960322092fa1855f4b0e199a870f1ce74e360456dccc569010a7 SHA512 9c60352aa792c2802adc14426aaeb81ea97d2462fba3e7d5692912447e64fc22c6058bf24c41ac18c72eac6759cb627e6ce174b9b407f370dd28d22838142510
DIST openjdk-8.422_p05.tar.gz 93034877 BLAKE2B 2489fea62fbc5a7e3735055656ae89c67caf63e5bc6d5385ee811d0707d056bc3d10dd83f7eae5a5a86b7f57b8da47a9c1a77405f127b6f506bbf3b310ecd2ae SHA512 706db67f9be7509380e96ae2187bdb928e40c4382fd7073dd310da2981eeff324a5871702b087d4466911dbbea8376d5f9fed7029562ca62c9a1a193d931833e
+DIST openjdk-8.432_p06.tar.gz 92765730 BLAKE2B 9c3823ed0394730cdbf306a92062656a793dd7b57a333319282a6aa01a8150927227d3e91ee2ee975108b8c3aa2b0b87669af2971dfc27a6400fb7c4ef22d246 SHA512 263642d56915e0533c154ab51148b0f6a9860b243dddf5bbb70f49174d07dd505393fa6e257bfa34eca6e95ecd4f271737fa48fee8db93e624e8336fe488eb83
DIST openjdk-bootstrap-11.0.13_p8-ppc64.tar.xz 108215404 BLAKE2B 5e6c0b905b34b437137922b73a9724da96b8832186fea945f8c73d941db822ca1cc5718f3ecb4607ed98d1f8241c9f365b54caaf978863e8b84680a94f067b5d SHA512 732e2220219d42be10589fcaf2420da87ebc8564b4afc6bd02f61f31cdca9c31b339366e34d374fb814499b92f8aa796435a18f28e10c8cb00d9a0f5953bb60e
DIST openjdk-bootstrap-11.0.13_p8-x86.tar.xz 105420236 BLAKE2B d3137ad497937a9a04dedf38776f3ac45bf3b115d275991fd8582b72ade48390b6aa8ad89e0b4d34fa6a787a3c413dab20b32ef347dc8733544e810150c55d29 SHA512 f71a7ef8fbf19b0595dd7d4ebe52bbe1c95b8c17f34d092472c5f5ce8caf52a053f22db8587f1649f9a96ad01c0c632be343342812f5a8cc4ff843b33b8d9b0f
DIST openjdk-bootstrap-11.0.14_p9-riscv.tar.xz 104601676 BLAKE2B 5f976e8a626a829fae70ad6c007f10bfeff79e29c85d6c75fb2f5ff8984fd2a2bd44ee6e07958dbbdaaed761c6839d375e1b5ba6cffc63b02ad9e2c9178310db SHA512 580dec81626553fe3e7afd0f6385a733ba80a0502cf0f9e8bdc973048887290c9ab6171267d61d8838c4ece4de58c9ca8b78540bd52b1757495a27175057ec64
diff --git a/dev-java/openjdk/openjdk-11.0.25_p9.ebuild b/dev-java/openjdk/openjdk-11.0.25_p9.ebuild
new file mode 100644
index 000000000000..2c917adee686
--- /dev/null
+++ b/dev-java/openjdk/openjdk-11.0.25_p9.ebuild
@@ -0,0 +1,316 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
+
+# don't change versioning scheme
+# to find correct _p number, look at
+# https://github.com/openjdk/jdk${SLOT}u/tags
+# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point
+# to exact same commit sha. we should always use the full version.
+# -ga tag is just for humans to easily identify General Availability release tag.
+# we need -ga tag to fetch tarball and unpack it, but exact number everywhere else to
+# set build version properly
+MY_PV="${PV%_p*}-ga"
+
+# variable name format: <UPPERCASE_KEYWORD>_XPAK
+PPC64_XPAK="11.0.13_p8" # big-endian bootstrap tarball
+RISCV_XPAK="11.0.14_p9" # lp64d bootstrap tarball
+X86_XPAK="11.0.13_p8"
+
+# Usage: bootstrap_uri <keyword> <version> [extracond]
+# Example: $(bootstrap_uri ppc64 17.0.1_p12 big-endian)
+# Output: ppc64? ( big-endian? ( https://...17.0.1_p12-ppc64.tar.xz ) )
+bootstrap_uri() {
+ local baseuri="https://dev.gentoo.org/~arthurzam/distfiles/dev-java/${PN}/${PN}-bootstrap"
+ local suff="tar.xz"
+ local kw="${1:?${FUNCNAME[0]}: keyword not specified}"
+ local ver="${2:?${FUNCNAME[0]}: version not specified}"
+ local cond="${3-}"
+
+ # here be dragons
+ echo "${kw}? ( ${cond:+${cond}? (} ${baseuri}-${ver}-${kw}.${suff} ${cond:+) })"
+}
+
+DESCRIPTION="Open source implementation of the Java programming language"
+HOMEPAGE="https://openjdk.org"
+SRC_URI="
+ https://github.com/${PN}/jdk11u/archive/jdk-${MY_PV}.tar.gz
+ -> ${P}.tar.gz
+ !system-bootstrap? (
+ $(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian)
+ $(bootstrap_uri riscv ${RISCV_XPAK})
+ $(bootstrap_uri x86 ${X86_XPAK})
+ )
+ riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-11.0.18-riscv.patch.xz )
+"
+S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}"
+
+LICENSE="GPL-2-with-classpath-exception"
+SLOT="${MY_PV%%[.+]*}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap lto selinux source system-bootstrap systemtap"
+
+REQUIRED_USE="
+ javafx? ( alsa !headless-awt )
+ !system-bootstrap? ( jbootstrap )
+"
+
+COMMON_DEPEND="
+ media-libs/freetype:2=
+ media-libs/giflib:0/7
+ media-libs/harfbuzz:=
+ media-libs/libpng:0=
+ media-libs/lcms:2=
+ sys-libs/zlib
+ media-libs/libjpeg-turbo:0=
+ systemtap? ( dev-debug/systemtap )
+"
+
+# Many libs are required to build, but not to run, make is possible to remove
+# by listing conditionally in RDEPEND unconditionally in DEPEND
+RDEPEND="
+ ${COMMON_DEPEND}
+ >=sys-apps/baselayout-java-0.1.0-r1
+ !headless-awt? (
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXi
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ x11-libs/libXt
+ x11-libs/libXtst
+ )
+ alsa? ( media-libs/alsa-lib )
+ cups? ( net-print/cups )
+ selinux? ( sec-policy/selinux-java )
+"
+
+DEPEND="
+ ${COMMON_DEPEND}
+ app-arch/zip
+ media-libs/alsa-lib
+ net-print/cups
+ x11-base/xorg-proto
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXi
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ x11-libs/libXt
+ x11-libs/libXtst
+ javafx? ( dev-java/openjfx:${SLOT}= )
+ system-bootstrap? (
+ || (
+ dev-java/openjdk-bin:${SLOT}[gentoo-vm(+)]
+ dev-java/openjdk:${SLOT}[gentoo-vm(+)]
+ )
+ )
+"
+
+# The space required to build varies wildly depending on USE flags,
+# ranging from 2GB to 16GB. This function is certainly not exact but
+# should be close enough to be useful.
+openjdk_check_requirements() {
+ local M
+ M=2048
+ M=$(( $(usex jbootstrap 2 1) * $M ))
+ M=$(( $(usex debug 3 1) * $M ))
+ M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
+
+ CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
+}
+
+pkg_pretend() {
+ openjdk_check_requirements
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876"
+ fi
+}
+
+pkg_setup() {
+ openjdk_check_requirements
+ java-vm-2_pkg_setup
+
+ [[ ${MERGE_TYPE} == "binary" ]] && return
+
+ JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
+ JAVA_PKG_WANT_SOURCE="${SLOT}"
+ JAVA_PKG_WANT_TARGET="${SLOT}"
+
+ if use system-bootstrap; then
+ for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
+ if [[ -d ${BROOT}/usr/lib/jvm/${vm} ]]; then
+ java-pkg-2_pkg_setup
+ return
+ fi
+ done
+ fi
+}
+
+src_prepare() {
+ use riscv && eapply "${WORKDIR}"/openjdk-11.0.18-riscv.patch
+ default
+ chmod +x configure || die
+}
+
+src_configure() {
+ if ! use system-bootstrap; then
+ local xpakvar="${ARCH^^}_XPAK"
+ export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}"
+ fi
+
+ # Work around stack alignment issue, bug #647954.
+ use x86 && append-flags -mincoming-stack-boundary=2
+
+ # bug 906987; append-cppflags doesnt work
+ use elibc_musl && append-flags -D_LARGEFILE64_SOURCE
+
+ # Strip some flags users may set, but should not. #818502
+ filter-flags -fexceptions
+
+ # Strip lto related flags, we rely on USE=lto and --with-jvm-features=link-time-opt
+ # https://bugs.gentoo.org/833097
+ # https://bugs.gentoo.org/833098
+ filter-lto
+ filter-flags -fdevirtualize-at-ltrans
+
+ # Enabling full docs appears to break doc building. If not
+ # explicitly disabled, the flag will get auto-enabled if pandoc and
+ # graphviz are detected. pandoc has loads of dependencies anyway.
+
+ local myconf=(
+ --disable-ccache
+ --disable-precompiled-headers
+ --enable-full-docs=no
+ --with-boot-jdk="${JDK_HOME}"
+ --with-extra-cflags="${CFLAGS}"
+ --with-extra-cxxflags="${CXXFLAGS}"
+ --with-extra-ldflags="${LDFLAGS}"
+ --with-freetype="${XPAK_BOOTSTRAP:-system}"
+ --with-giflib="${XPAK_BOOTSTRAP:-system}"
+ --with-harfbuzz="${XPAK_BOOTSTRAP:-system}"
+ --with-lcms="${XPAK_BOOTSTRAP:-system}"
+ --with-libjpeg="${XPAK_BOOTSTRAP:-system}"
+ --with-libpng="${XPAK_BOOTSTRAP:-system}"
+ --with-native-debug-symbols=$(usex debug internal none)
+ --with-vendor-name="Gentoo"
+ --with-vendor-url="https://gentoo.org"
+ --with-vendor-bug-url="https://bugs.gentoo.org"
+ --with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
+ --with-vendor-version-string="${PVR}"
+ --with-version-pre=""
+ --with-version-string="${PV%_p*}"
+ --with-version-build="${PV#*_p}"
+ --with-zlib="${XPAK_BOOTSTRAP:-system}"
+ --enable-dtrace=$(usex systemtap yes no)
+ --enable-headless-only=$(usex headless-awt yes no)
+ $(tc-is-clang && echo "--with-toolchain-type=clang")
+ )
+ ! use riscv && myconf+=( --with-jvm-features=shenandoahgc )
+
+ use lto && myconf+=( --with-jvm-features=link-time-opt )
+
+ if use javafx; then
+ # this is not useful for users, just for upstream developers
+ # build system compares mesa version in md file
+ # https://bugs.gentoo.org/822612
+ export LEGAL_EXCLUDES=mesa3d.md
+
+ local zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
+ if [[ -r ${zip} ]]; then
+ myconf+=( --with-import-modules="${zip}" )
+ else
+ die "${zip} not found or not readable"
+ fi
+ fi
+
+ # Workaround for bug #938302
+ if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
+ myconf+=( DTRACE="${BROOT}"/usr/bin/stap-dtrace )
+ fi
+
+ if use !system-bootstrap ; then
+ addpredict /dev/random
+ addpredict /proc/self/coredump_filter
+ fi
+
+ (
+ unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS
+ CFLAGS= CXXFLAGS= LDFLAGS= \
+ CONFIG_SITE=/dev/null \
+ econf "${myconf[@]}"
+ )
+}
+
+src_compile() {
+ # Too brittle - gets confused by e.g. -Oline
+ export MAKEOPTS="-j$(makeopts_jobs) -l$(makeopts_loadavg)"
+ unset GNUMAKEFLAGS MAKEFLAGS
+
+ local myemakeargs=(
+ JOBS=$(makeopts_jobs)
+ LOG=debug
+ CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
+ NICE= # Use PORTAGE_NICENESS, don't adjust further down
+ $(usex doc docs '')
+ $(usex jbootstrap bootcycle-images product-images)
+ )
+ emake "${myemakeargs[@]}" -j1
+}
+
+src_install() {
+ local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
+ local ddest="${ED}/${dest#/}"
+
+ cd "${S}"/build/*-release/images/jdk || die
+
+ # Create files used as storage for system preferences.
+ mkdir .systemPrefs || die
+ touch .systemPrefs/.system.lock || die
+ touch .systemPrefs/.systemRootModFile || die
+
+ # Oracle and IcedTea have libjsoundalsa.so depending on
+ # libasound.so.2 but OpenJDK only has libjsound.so. Weird.
+ if ! use alsa ; then
+ rm -v lib/libjsound.* || die
+ fi
+
+ if ! use examples ; then
+ rm -vr demo/ || die
+ fi
+
+ if ! use source ; then
+ rm -v lib/src.zip || die
+ fi
+
+ rm -v lib/security/cacerts || die
+
+ dodir "${dest}"
+ cp -pPR * "${ddest}" || die
+
+ dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+
+ # must be done before running itself
+ java-vm_set-pax-markings "${ddest}"
+
+ einfo "Creating the Class Data Sharing archives and disabling usage tracking"
+ "${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die
+
+ java-vm_install-env "${FILESDIR}"/${PN}.env.sh
+ java-vm_revdep-mask
+ java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+
+ if use doc ; then
+ docinto html
+ dodoc -r "${S}"/build/*-release/images/docs/*
+ dosym -r /usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
+ fi
+}
+
+pkg_postinst() {
+ java-vm-2_pkg_postinst
+}
diff --git a/dev-java/openjdk/openjdk-17.0.13_p11.ebuild b/dev-java/openjdk/openjdk-17.0.13_p11.ebuild
new file mode 100644
index 000000000000..09ab2d7bf56a
--- /dev/null
+++ b/dev-java/openjdk/openjdk-17.0.13_p11.ebuild
@@ -0,0 +1,325 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
+
+# variable name format: <UPPERCASE_KEYWORD>_XPAK
+ARM64_XPAK="17.0.2_p8" # musl bootstrap install
+PPC64_XPAK="17.0.1_p12" # big-endian bootstrap tarball
+RISCV_XPAK="17.0.3_p7"
+X86_XPAK="17.0.1_p12"
+
+# Usage: bootstrap_uri <keyword> <version> [extracond]
+# Example: $(bootstrap_uri ppc64 17.0.1_p12 big-endian)
+# Output: ppc64? ( big-endian? ( https://...17.0.1_p12-ppc64.tar.xz ) )
+bootstrap_uri() {
+ local baseuri="https://dev.gentoo.org/~arthurzam/distfiles/dev-java/${PN}/${PN}-bootstrap"
+ local suff="tar.xz"
+ local kw="${1:?${FUNCNAME[0]}: keyword not specified}"
+ local ver="${2:?${FUNCNAME[0]}: version not specified}"
+ local cond="${3-}"
+ [[ ${cond} == elibc_musl* ]] && local musl=yes
+
+ # here be dragons
+ echo "${kw}? ( ${cond:+${cond}? (} ${baseuri}-${ver}-${kw}${musl:+-musl}.${suff} ${cond:+) })"
+}
+
+# don't change versioning scheme
+# to find correct _p number, look at
+# https://github.com/openjdk/jdk${SLOT}u/tags
+# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point
+# to exact same commit sha. we should always use the full version.
+# -ga tag is just for humans to easily identify General Availability release tag.
+MY_PV="${PV%_p*}-ga"
+
+DESCRIPTION="Open source implementation of the Java programming language"
+HOMEPAGE="https://openjdk.org"
+SRC_URI="
+ https://github.com/${PN}/jdk17u/archive/jdk-${MY_PV}.tar.gz
+ -> ${P}.tar.gz
+ !system-bootstrap? (
+ $(bootstrap_uri arm64 ${ARM64_XPAK} elibc_musl)
+ $(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian)
+ $(bootstrap_uri x86 ${X86_XPAK})
+ $(bootstrap_uri riscv ${RISCV_XPAK})
+ )
+"
+S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}"
+
+LICENSE="GPL-2-with-classpath-exception"
+SLOT="${MY_PV%%[.+]*}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap lto selinux source system-bootstrap systemtap"
+
+REQUIRED_USE="
+ javafx? ( alsa !headless-awt )
+ !system-bootstrap? ( jbootstrap )
+"
+
+COMMON_DEPEND="
+ media-libs/freetype:2=
+ media-libs/giflib:0/7
+ media-libs/harfbuzz:=
+ media-libs/libpng:0=
+ media-libs/lcms:2=
+ sys-libs/zlib
+ media-libs/libjpeg-turbo:0=
+ systemtap? ( dev-debug/systemtap )
+"
+
+# Many libs are required to build, but not to run, make is possible to remove
+# by listing conditionally in RDEPEND unconditionally in DEPEND
+RDEPEND="
+ ${COMMON_DEPEND}
+ >=sys-apps/baselayout-java-0.1.0-r1
+ !headless-awt? (
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXi
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ x11-libs/libXt
+ x11-libs/libXtst
+ )
+ alsa? ( media-libs/alsa-lib )
+ cups? ( net-print/cups )
+ selinux? ( sec-policy/selinux-java )
+"
+
+DEPEND="
+ ${COMMON_DEPEND}
+ app-arch/zip
+ media-libs/alsa-lib
+ net-print/cups
+ x11-base/xorg-proto
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXi
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ x11-libs/libXt
+ x11-libs/libXtst
+ javafx? ( dev-java/openjfx:${SLOT}= )
+ system-bootstrap? (
+ || (
+ dev-java/openjdk-bin:${SLOT}
+ dev-java/openjdk:${SLOT}
+ )
+ )
+"
+
+# The space required to build varies wildly depending on USE flags,
+# ranging from 2GB to 16GB. This function is certainly not exact but
+# should be close enough to be useful.
+openjdk_check_requirements() {
+ local M
+ M=2048
+ M=$(( $(usex jbootstrap 2 1) * $M ))
+ M=$(( $(usex debug 3 1) * $M ))
+ M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
+
+ CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
+}
+
+pkg_pretend() {
+ openjdk_check_requirements
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876"
+ fi
+}
+
+pkg_setup() {
+ openjdk_check_requirements
+ java-vm-2_pkg_setup
+
+ [[ ${MERGE_TYPE} == "binary" ]] && return
+
+ JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
+ JAVA_PKG_WANT_SOURCE="${SLOT}"
+ JAVA_PKG_WANT_TARGET="${SLOT}"
+
+ # The nastiness below is necessary while the gentoo-vm USE flag is
+ # masked. First we call java-pkg-2_pkg_setup if it looks like the
+ # flag was unmasked against one of the possible build VMs. If not,
+ # we try finding one of them in their expected locations. This would
+ # have been slightly less messy if openjdk-bin had been installed to
+ # /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env
+ # file but disable it so that it would not normally be selectable.
+
+ local vm
+ for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
+ if [[ -d ${BROOT}/usr/lib/jvm/${vm} ]]; then
+ java-pkg-2_pkg_setup
+ return
+ fi
+ done
+}
+
+src_prepare() {
+ default
+ chmod +x configure || die
+}
+
+src_configure() {
+ if has_version dev-java/openjdk:${SLOT}; then
+ export JDK_HOME=${BROOT}/usr/$(get_libdir)/openjdk-${SLOT}
+ elif use !system-bootstrap ; then
+ local xpakvar="${ARCH^^}_XPAK"
+ export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}"
+ else
+ JDK_HOME=$(best_version -b dev-java/openjdk-bin:${SLOT})
+ [[ -n ${JDK_HOME} ]] || die "Build VM not found!"
+ JDK_HOME=${JDK_HOME#*/}
+ JDK_HOME=${BROOT}/opt/${JDK_HOME%-r*}
+ export JDK_HOME
+ fi
+
+ # Work around stack alignment issue, bug #647954. in case we ever have x86
+ use x86 && append-flags -mincoming-stack-boundary=2
+
+ # bug 906987; append-cppflags doesnt work
+ use elibc_musl && append-flags -D_LARGEFILE64_SOURCE
+
+ # Strip some flags users may set, but should not. #818502
+ filter-flags -fexceptions
+
+ # Strip lto related flags, we rely on USE=lto and --with-jvm-features=link-time-opt
+ # https://bugs.gentoo.org/833097
+ # https://bugs.gentoo.org/833098
+ filter-lto
+ filter-flags -fdevirtualize-at-ltrans
+
+ # Enabling full docs appears to break doc building. If not
+ # explicitly disabled, the flag will get auto-enabled if pandoc and
+ # graphviz are detected. pandoc has loads of dependencies anyway.
+
+ local myconf=(
+ --disable-ccache
+ --disable-precompiled-headers
+ --disable-warnings-as-errors
+ --enable-full-docs=no
+ --with-boot-jdk="${JDK_HOME}"
+ --with-extra-cflags="${CFLAGS}"
+ --with-extra-cxxflags="${CXXFLAGS}"
+ --with-extra-ldflags="${LDFLAGS}"
+ --with-freetype="${XPAK_BOOTSTRAP:-system}"
+ --with-giflib="${XPAK_BOOTSTRAP:-system}"
+ --with-harfbuzz="${XPAK_BOOTSTRAP:-system}"
+ --with-lcms="${XPAK_BOOTSTRAP:-system}"
+ --with-libjpeg="${XPAK_BOOTSTRAP:-system}"
+ --with-libpng="${XPAK_BOOTSTRAP:-system}"
+ --with-native-debug-symbols=$(usex debug internal none)
+ --with-vendor-name="Gentoo"
+ --with-vendor-url="https://gentoo.org"
+ --with-vendor-bug-url="https://bugs.gentoo.org"
+ --with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
+ --with-vendor-version-string="${PVR}"
+ --with-version-pre=""
+ --with-version-string="${PV%_p*}"
+ --with-version-build="${PV#*_p}"
+ --with-zlib="${XPAK_BOOTSTRAP:-system}"
+ --enable-jvm-feature-dtrace=$(usex systemtap yes no)
+ --enable-headless-only=$(usex headless-awt yes no)
+ $(tc-is-clang && echo "--with-toolchain-type=clang")
+ )
+
+ use lto && myconf+=( --with-jvm-features=link-time-opt )
+
+ if use javafx; then
+ local zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
+ if [[ -r ${zip} ]]; then
+ myconf+=( --with-import-modules="${zip}" )
+ else
+ die "${zip} not found or not readable"
+ fi
+ fi
+
+ # Workaround for bug #938302
+ if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
+ myconf+=( DTRACE="${BROOT}"/usr/bin/stap-dtrace )
+ fi
+
+ if use !system-bootstrap ; then
+ addpredict /dev/random
+ addpredict /proc/self/coredump_filter
+ fi
+
+ (
+ unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS
+ CFLAGS= CXXFLAGS= LDFLAGS= \
+ CONFIG_SITE=/dev/null \
+ econf "${myconf[@]}"
+ )
+}
+
+src_compile() {
+ # Too brittle - gets confused by e.g. -Oline
+ export MAKEOPTS="-j$(makeopts_jobs) -l$(makeopts_loadavg)"
+ unset GNUMAKEFLAGS MAKEFLAGS
+
+ local myemakeargs=(
+ JOBS=$(makeopts_jobs)
+ LOG=debug
+ CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
+ NICE= # Use PORTAGE_NICENESS, don't adjust further down
+ $(usex doc docs '')
+ $(usex jbootstrap bootcycle-images product-images)
+ )
+ emake "${myemakeargs[@]}" -j1
+}
+
+src_install() {
+ local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
+ local ddest="${ED}/${dest#/}"
+
+ cd "${S}"/build/*-release/images/jdk || die
+
+ # Create files used as storage for system preferences.
+ mkdir .systemPrefs || die
+ touch .systemPrefs/.system.lock || die
+ touch .systemPrefs/.systemRootModFile || die
+
+ # Oracle and IcedTea have libjsoundalsa.so depending on
+ # libasound.so.2 but OpenJDK only has libjsound.so. Weird.
+ if ! use alsa ; then
+ rm -v lib/libjsound.* || die
+ fi
+
+ if ! use examples ; then
+ rm -vr demo/ || die
+ fi
+
+ if ! use source ; then
+ rm -v lib/src.zip || die
+ fi
+
+ rm -v lib/security/cacerts || die
+
+ dodir "${dest}"
+ cp -pPR * "${ddest}" || die
+
+ dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+
+ # must be done before running itself
+ java-vm_set-pax-markings "${ddest}"
+
+ einfo "Creating the Class Data Sharing archives and disabling usage tracking"
+ "${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die
+
+ java-vm_install-env "${FILESDIR}"/${PN}.env.sh
+ java-vm_revdep-mask
+ java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+
+ if use doc ; then
+ docinto html
+ dodoc -r "${S}"/build/*-release/images/docs/*
+ dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
+ fi
+}
+
+pkg_postinst() {
+ java-vm-2_pkg_postinst
+}
diff --git a/dev-java/openjdk/openjdk-21.0.4_p7.ebuild b/dev-java/openjdk/openjdk-21.0.5_p11.ebuild
index bb3ad26ff08a..bb3ad26ff08a 100644
--- a/dev-java/openjdk/openjdk-21.0.4_p7.ebuild
+++ b/dev-java/openjdk/openjdk-21.0.5_p11.ebuild
diff --git a/dev-java/openjdk/openjdk-23_p37.ebuild b/dev-java/openjdk/openjdk-23.0.1_p11.ebuild
index 47f8df8e9c6c..c88d48ceb72d 100644
--- a/dev-java/openjdk/openjdk-23_p37.ebuild
+++ b/dev-java/openjdk/openjdk-23.0.1_p11.ebuild
@@ -45,8 +45,7 @@ SRC_URI="
S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}"
LICENSE="GPL-2-with-classpath-exception"
-# SLOT="${MY_PV%%[.+]*}"
-SLOT="23"
+SLOT="${MY_PV%%[.+]*}"
# KEYWORDS="" # not LTS
# lto temporarily disabled due to https://bugs.gentoo.org/916735
diff --git a/dev-java/openjdk/openjdk-8.432_p06.ebuild b/dev-java/openjdk/openjdk-8.432_p06.ebuild
new file mode 100644
index 000000000000..6280651782d6
--- /dev/null
+++ b/dev-java/openjdk/openjdk-8.432_p06.ebuild
@@ -0,0 +1,283 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
+
+# don't change versioning scheme
+# to find correct _p number, look at
+# https://github.com/openjdk/jdk${SLOT}u/tags
+# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point
+# to exact same commit sha. we should always use the full version.
+# -ga tag is just for humans to easily identify General Availability release tag.
+# we need -ga tag to fetch tarball and unpack it, but exact number everywhere else to
+# set build version properly
+MY_PV="$(ver_rs 1 'u' 2 '-' ${PV%_p*}-ga)"
+
+# variable name format: <UPPERCASE_KEYWORD>_XPAK
+X86_XPAK="8.402_p06"
+PPC64_XPAK="8.402_p06"
+
+# Usage: bootstrap_uri <keyword> <version> [extracond]
+# Example: $(bootstrap_uri x86 8.402_p06)
+# Output: ppc64? ( big-endian? ( https://...8.402_p06-x86.tar.xz ) )
+bootstrap_uri() {
+ local baseuri="https://dev.gentoo.org/~arthurzam/distfiles/dev-java/${PN}/${PN}-bootstrap"
+ local suff="tar.xz"
+ local kw="${1:?${FUNCNAME[0]}: keyword not specified}"
+ local ver="${2:?${FUNCNAME[0]}: version not specified}"
+ local cond="${3-}"
+
+ # here be dragons
+ echo "${kw}? ( ${cond:+${cond}? (} ${baseuri}-${ver}-${kw}.${suff} ${cond:+) })"
+}
+
+DESCRIPTION="Open source implementation of the Java programming language"
+HOMEPAGE="https://openjdk.org"
+SRC_URI="
+ https://github.com/openjdk/jdk8u/archive/jdk${MY_PV}.tar.gz
+ -> ${P}.tar.gz
+ !system-bootstrap? (
+ $(bootstrap_uri x86 ${X86_XPAK})
+ $(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian)
+ )
+"
+S="${WORKDIR}/jdk${SLOT}u-jdk${MY_PV}"
+
+LICENSE="GPL-2-with-classpath-exception"
+SLOT="${PV%%[.+]*}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="alsa big-endian debug cups doc examples headless-awt javafx +jbootstrap selinux system-bootstrap source"
+
+COMMON_DEPEND="
+ media-libs/freetype:2=
+ media-libs/giflib:0/7
+ sys-libs/zlib
+"
+# Many libs are required to build, but not to run, make is possible to remove
+# by listing conditionally in RDEPEND unconditionally in DEPEND
+RDEPEND="
+ ${COMMON_DEPEND}
+ >=sys-apps/baselayout-java-0.1.0-r1
+ !headless-awt? (
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXi
+ x11-libs/libXrender
+ x11-libs/libXt
+ x11-libs/libXtst
+ )
+ alsa? ( media-libs/alsa-lib )
+ cups? ( net-print/cups )
+ selinux? ( sec-policy/selinux-java )
+"
+
+DEPEND="
+ ${COMMON_DEPEND}
+ app-arch/zip
+ media-libs/alsa-lib
+ net-print/cups
+ virtual/pkgconfig
+ x11-base/xorg-proto
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXi
+ x11-libs/libXrender
+ x11-libs/libXt
+ x11-libs/libXtst
+ system-bootstrap? (
+ || (
+ dev-java/openjdk-bin:${SLOT}
+ dev-java/openjdk:${SLOT}
+ )
+ )
+"
+
+BDEPEND="
+ virtual/pkgconfig
+"
+
+PDEPEND="javafx? ( dev-java/openjfx:${SLOT} )"
+
+PATCHES=(
+ "${FILESDIR}/openjdk-8-insantiate-arrayallocator.patch"
+ "${FILESDIR}/openjdk-8.402_p06-0001-Fix-Wint-conversion.patch"
+ "${FILESDIR}/openjdk-8.402_p06-0002-Fix-Wincompatible-pointer-types.patch"
+ "${FILESDIR}/openjdk-8.402_p06-0003-Fix-negative-value-left-shift.patch"
+ "${FILESDIR}/openjdk-8.402_p06-0004-Fix-misc.-warnings.patch"
+)
+
+# The space required to build varies wildly depending on USE flags,
+# ranging from 2GB to 16GB. This function is certainly not exact but
+# should be close enough to be useful.
+openjdk_check_requirements() {
+ local M
+ M=2048
+ M=$(( $(usex debug 3 1) * $M ))
+ M=$(( $(usex jbootstrap 2 1) * $M ))
+ M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
+
+ CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
+}
+
+pkg_pretend() {
+ openjdk_check_requirements
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876"
+ fi
+}
+
+pkg_setup() {
+ openjdk_check_requirements
+ java-vm-2_pkg_setup
+
+ [[ ${MERGE_TYPE} == "binary" ]] && return
+
+ JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
+ JAVA_PKG_WANT_SOURCE="${SLOT}"
+ JAVA_PKG_WANT_TARGET="${SLOT}"
+
+ if use system-bootstrap; then
+ for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
+ if [[ -d ${BROOT}/usr/lib/jvm/${vm} ]]; then
+ java-pkg-2_pkg_setup
+ return
+ fi
+ done
+ fi
+}
+
+src_prepare() {
+ default
+
+ # new warnings in new gcc https://bugs.gentoo.org/685426
+ sed -i '/^WARNINGS_ARE_ERRORS/ s/-Werror/-Wno-error/' \
+ hotspot/make/linux/makefiles/gcc.make || die
+
+ chmod +x configure || die
+}
+
+src_configure() {
+ if ! use system-bootstrap; then
+ local xpakvar="${ARCH^^}_XPAK"
+ export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}"
+ fi
+
+ # general build info found here:
+ # https://hg.openjdk.java.net/jdk8/jdk8/raw-file/tip/README-builds.html
+
+ # -Wregister use (bug #918655)
+ append-cxxflags -std=gnu++14
+
+ # Work around stack alignment issue, bug #647954.
+ use x86 && append-flags -mincoming-stack-boundary=2
+
+ # Strip some flags users may set, but should not. #818502
+ filter-flags -fexceptions
+
+ # Strip lto related flags, no support in this version.
+ # https://bugs.gentoo.org/833097
+ # https://bugs.gentoo.org/833098
+ filter-lto
+ filter-flags -fdevirtualize-at-ltrans
+
+ tc-export_build_env CC CXX PKG_CONFIG STRIP
+
+ local myconf=(
+ --disable-ccache
+ --disable-freetype-bundling
+ --disable-precompiled-headers
+ --enable-unlimited-crypto
+ --with-boot-jdk="${JDK_HOME}"
+ --with-extra-cflags="${CFLAGS}"
+ --with-extra-cxxflags="${CXXFLAGS}"
+ --with-extra-ldflags="${LDFLAGS}"
+ --with-freetype-lib="$( $(tc-getPKG_CONFIG) --variable=libdir freetype2 )"
+ --with-freetype-include="$( $(tc-getPKG_CONFIG) --variable=includedir freetype2)/freetype2"
+ --with-giflib="${XPAK_BOOTSTRAP:-system}"
+ --with-jtreg=no
+ --with-jobs=1
+ --with-num-cores=1
+ --with-update-version="$(ver_cut 2)"
+ --with-build-number="b$(ver_cut 4)"
+ --with-milestone="fcs" # magic variable that means "release version"
+ --with-vendor-name="Gentoo"
+ --with-vendor-url="https://gentoo.org"
+ --with-vendor-bug-url="https://bugs.gentoo.org"
+ --with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
+ --with-zlib="${XPAK_BOOTSTRAP:-system}"
+ --with-native-debug-symbols=$(usex debug internal none)
+ $(usex headless-awt --disable-headful '')
+ $(tc-is-clang && echo "--with-toolchain-type=clang")
+ )
+
+ (
+ unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC MAKE XARGS
+ CFLAGS= CXXFLAGS= LDFLAGS= \
+ CONFIG_SITE=/dev/null \
+ CONFIG_SHELL="${BROOT}/bin/bash"
+ econf "${myconf[@]}"
+ )
+}
+
+src_compile() {
+ # Too brittle - gets confused by e.g. -Oline
+ export MAKEOPTS="-j$(makeopts_jobs) -l$(makeopts_loadavg)"
+ unset GNUMAKEFLAGS MAKEFLAGS
+
+ local myemakeargs=(
+ JOBS=$(makeopts_jobs)
+ LOG=debug
+ CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
+ NICE= # Use PORTAGE_NICENESS, don't adjust further down
+ $(usex doc docs '')
+ $(usex jbootstrap bootcycle-images images)
+ )
+ emake "${myemakeargs[@]}" -j1
+}
+
+src_install() {
+ local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
+ local ddest="${ED}/${dest#/}"
+
+ cd "${S}"/build/*-release/images/j2sdk-image || die
+
+ if ! use alsa; then
+ rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
+ fi
+
+ # build system does not remove that
+ if use headless-awt ; then
+ rm -fvr jre/lib/$(get_system_arch)/lib*{[jx]awt,splashscreen}* \
+ {,jre/}bin/policytool bin/appletviewer || die
+ fi
+
+ if ! use examples ; then
+ rm -vr demo/ || die
+ fi
+
+ if ! use source ; then
+ rm -v src.zip || die
+ fi
+
+ dodir "${dest}"
+ cp -pPR * "${ddest}" || die
+
+ dosym -r /etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
+
+ java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+ java-vm_set-pax-markings "${ddest}"
+ java-vm_revdep-mask
+ java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+
+ if use doc ; then
+ docinto html
+ dodoc -r "${S}"/build/*-release/docs/*
+ fi
+}
+
+pkg_postinst() {
+ java-vm-2_pkg_postinst
+ einfo "JavaWebStart functionality provided by icedtea-web package"
+}
diff --git a/dev-java/opentest4j/opentest4j-1.2.0-r1.ebuild b/dev-java/opentest4j/opentest4j-1.2.0-r1.ebuild
index 4d74597d3fc3..7bc870ed0ad4 100644
--- a/dev-java/opentest4j/opentest4j-1.2.0-r1.ebuild
+++ b/dev-java/opentest4j/opentest4j-1.2.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/ota4j-team/opentest4j/archive/r${PV}.tar.gz -> ${P}.
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND="
>=virtual/jdk-11:*
diff --git a/dev-java/opentest4j/opentest4j-1.3.0-r1.ebuild b/dev-java/opentest4j/opentest4j-1.3.0-r1.ebuild
index 89ba6bf75137..e5d22fb3004a 100644
--- a/dev-java/opentest4j/opentest4j-1.3.0-r1.ebuild
+++ b/dev-java/opentest4j/opentest4j-1.3.0-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-r${PV}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc64"
DEPEND=">=virtual/jdk-11:*" # module-info
RDEPEND=">=virtual/jre-1.8:*" #939580
diff --git a/dev-java/osgi-annotation/osgi-annotation-8.1.0.ebuild b/dev-java/osgi-annotation/osgi-annotation-8.1.0.ebuild
index 3f97aae52d83..51f4822263b6 100644
--- a/dev-java/osgi-annotation/osgi-annotation-8.1.0.ebuild
+++ b/dev-java/osgi-annotation/osgi-annotation-8.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://docs.osgi.org/download/r$(ver_cut 1)/${PN/-/.}-${PV}.jar -> ${P
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
RDEPEND=">=virtual/jre-1.8:*"
DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/osgi-cmpn/osgi-cmpn-8.0.0-r1.ebuild b/dev-java/osgi-cmpn/osgi-cmpn-8.0.0-r1.ebuild
index 9ec6404daeb2..0100a6617c29 100644
--- a/dev-java/osgi-cmpn/osgi-cmpn-8.0.0-r1.ebuild
+++ b/dev-java/osgi-cmpn/osgi-cmpn-8.0.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://docs.osgi.org/download/r$(ver_cut 1)/${PN/-/.}-${PV}.jar -> ${P
LICENSE="Apache-2.0 OSGi-Specification-2.0"
SLOT="8"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
CP_DEPEND="
dev-java/cdi-api:0
diff --git a/dev-java/osgi-core/osgi-core-8.0.0.ebuild b/dev-java/osgi-core/osgi-core-8.0.0.ebuild
index 225662da9925..08d36e1a7dd8 100644
--- a/dev-java/osgi-core/osgi-core-8.0.0.ebuild
+++ b/dev-java/osgi-core/osgi-core-8.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://docs.osgi.org/download/r$(ver_cut 1)/${PN/-/.}-${PV}.jar -> ${P
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/osgi-service-log/osgi-service-log-1.3.0.ebuild b/dev-java/osgi-service-log/osgi-service-log-1.3.0.ebuild
index 958c51feee6d..9455e85394f2 100644
--- a/dev-java/osgi-service-log/osgi-service-log-1.3.0.ebuild
+++ b/dev-java/osgi-service-log/osgi-service-log-1.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://repo1.maven.org/maven2/org/osgi/org.osgi.service.log/${PV}/org.
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
CP_DEPEND="dev-java/osgi-core:0"
diff --git a/dev-java/osgi-service-subsystem/osgi-service-subsystem-1.1.0.ebuild b/dev-java/osgi-service-subsystem/osgi-service-subsystem-1.1.0.ebuild
index 9785c5bb84f6..57667c7c2232 100644
--- a/dev-java/osgi-service-subsystem/osgi-service-subsystem-1.1.0.ebuild
+++ b/dev-java/osgi-service-subsystem/osgi-service-subsystem-1.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://repo1.maven.org/maven2/org/osgi/org.${PN//-/.}/${PV}/org.${PN//
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64"
BDEPEND="app-arch/unzip"
diff --git a/dev-java/parboiled/parboiled-1.4.1.ebuild b/dev-java/parboiled/parboiled-1.4.1.ebuild
index e34a28ab8952..cadbe24b7e8a 100644
--- a/dev-java/parboiled/parboiled-1.4.1.ebuild
+++ b/dev-java/parboiled/parboiled-1.4.1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${P}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64"
CP_DEPEND="dev-java/asm:9"
DEPEND="${CP_DEPEND}
diff --git a/dev-java/pdfbox/pdfbox-2.0.27.ebuild b/dev-java/pdfbox/pdfbox-2.0.27.ebuild
index 3bb1b8e0c5bd..ffe02a58ecd9 100644
--- a/dev-java/pdfbox/pdfbox-2.0.27.ebuild
+++ b/dev-java/pdfbox/pdfbox-2.0.27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Skeleton command:
@@ -60,7 +60,7 @@ SRC_URI="mirror://apache/${PN}/${PV}/${P}-src.zip
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
IUSE="+tools"
PROPERTIES="test_network"
diff --git a/dev-java/picocli/picocli-4.6.3-r1.ebuild b/dev-java/picocli/picocli-4.6.3-r1.ebuild
index 2489f45d8ad5..2d44a0eff273 100644
--- a/dev-java/picocli/picocli-4.6.3-r1.ebuild
+++ b/dev-java/picocli/picocli-4.6.3-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://picocli.info"
SRC_URI="https://github.com/remkop/${PN}/archive/v${PV}.tar.gz -> ${P}-sources.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
# package org.junit.contrib.java.lang.system does not exist
# the project is here: https://github.com/stefanbirkner/system-rules
diff --git a/dev-java/plexus-classworlds/plexus-classworlds-2.7.0-r1.ebuild b/dev-java/plexus-classworlds/plexus-classworlds-2.7.0-r1.ebuild
index 1cc76cc2b554..4948c9a561a8 100644
--- a/dev-java/plexus-classworlds/plexus-classworlds-2.7.0-r1.ebuild
+++ b/dev-java/plexus-classworlds/plexus-classworlds-2.7.0-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${P}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND="
>=virtual/jdk-1.8:*
diff --git a/dev-java/poi/poi-5.2.5.ebuild b/dev-java/poi/poi-5.2.5.ebuild
index e7ba27cbe2a7..e16a09749d08 100644
--- a/dev-java/poi/poi-5.2.5.ebuild
+++ b/dev-java/poi/poi-5.2.5.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/poi-src-${PV}-${RELEASE_DATE}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/poi.apache.org.asc"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-poi )"
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index 7882f7aa572a..7056e5d90d11 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1,4 +1,3 @@
-DIST protobuf-25.3.tar.gz 5878962 BLAKE2B 9268f9bd993a1cfd6d3937a2ad56ba4cfe3d84923756513841cbf13039d4a07acb260468745cb1294f30334cb34b45c6fde272f5c40d9de63ac6a4ce5c263077 SHA512 1f73e237c919082e5423ae9e2ea8813dccf672c059051d1531fe89ffaa45872d3cf3052b8c3af26f674296ec17d7dc861c67b8f0834ed80261ce4a6a14ed7115
DIST protobuf-27.2.tar.gz 6282174 BLAKE2B 86d12e9f87e8e1c2961ad517115c8689a8dd984722513816d8d626e59a76f5e7a698a90cbf6007daacf66c6053c9ff28108ff113579a442ce61cd221178bda44 SHA512 664c66b62cf1ed0c65d9b910d8e67d4d5d471113697f1b8edf1573cd5c0fc8e850ac53ce984e48e6c6b9cbbefa12f8530058384e7388e65a59c1e46d03772397
DIST protobuf-28.1.tar.gz 9258233 BLAKE2B 908dd074cc4ef632efdf123fdc76e6d78fd0db13d580584f00fd6afd3b5e1b6d3b6b52e49c528d4095905c802dcf0f391b01d2edf872738ed11a70c1123258a9 SHA512 769ef61206e39336d93df786a25c08cdf1acb12f2f5818ae31afb268aad8b02076eeba15c41c68aadbf140c6e1653c0aaefc2a637278c7695ded1b5d72888d81
DIST truth-1.1.3.jar 243021 BLAKE2B a59149038c62ef5dd352b13d4b393e1b7715fbafe5ed86ec2d16d722c738a31dcdca10132fc73b17b367ac4309e5407ba2e489f8d4c8fbca60ce5f35ae75d1e3 SHA512 f29a9fb070aff8a32358a7b6c8998c0095de5d8d68afa7f7bac759c7050309deff929e767657ecbbefd96163460f10255ca01bc567ab30df4834b9d916a4fae8
diff --git a/dev-java/protobuf-java/files/protobuf-java-3.23.0-unittest_retention.proto.patch b/dev-java/protobuf-java/files/protobuf-java-3.23.0-unittest_retention.proto.patch
deleted file mode 100644
index c838bf3cede2..000000000000
--- a/dev-java/protobuf-java/files/protobuf-java-3.23.0-unittest_retention.proto.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-java/core/src/test/java/com/google/protobuf/DescriptorsTest.java:68: error: cannot find symbol
-import protobuf_unittest.UnittestRetention;
- ^
- symbol: class UnittestRetention
- location: package protobuf_unittest
-java/core/src/test/java/com/google/protobuf/DescriptorsTest.java:402: error: cannot find symbol
- FileOptions options = UnittestRetention.getDescriptor().getOptions();
- ^
- symbol: variable UnittestRetention
- location: class DescriptorsTest
-java/core/src/test/java/com/google/protobuf/DescriptorsTest.java:403: error: cannot find symbol
- assertThat(options.hasExtension(UnittestRetention.plainOption)).isTrue();
- ^
- symbol: variable UnittestRetention
- location: class DescriptorsTest
-java/core/src/test/java/com/google/protobuf/DescriptorsTest.java:404: error: cannot find symbol
- assertThat(options.hasExtension(UnittestRetention.runtimeRetentionOption)).isTrue();
- ^
- symbol: variable UnittestRetention
- location: class DescriptorsTest
-java/core/src/test/java/com/google/protobuf/DescriptorsTest.java:405: error: cannot find symbol
- assertThat(options.hasExtension(UnittestRetention.sourceRetentionOption)).isFalse();
- ^
- symbol: variable UnittestRetention
- location: class DescriptorsTest
---- a/java/core/generate-test-sources-build.xml
-+++ b/java/core/generate-test-sources-build.xml
-@@ -19,6 +19,7 @@
- <arg value="${protobuf.source.dir}/google/protobuf/unittest_optimize_for.proto"/>
- <arg value="${protobuf.source.dir}/google/protobuf/unittest_proto3.proto"/>
- <arg value="${protobuf.source.dir}/google/protobuf/unittest_proto3_optional.proto"/>
-+ <arg value="${protobuf.source.dir}/google/protobuf/unittest_retention.proto"/>
- <arg value="${protobuf.source.dir}/google/protobuf/unittest_well_known_types.proto"/>
- <arg value="${test.proto.dir}/com/google/protobuf/any_test.proto"/>
- <arg value="${test.proto.dir}/com/google/protobuf/cached_field_size_test.proto"/>
diff --git a/dev-java/protobuf-java/protobuf-java-3.25.3.ebuild b/dev-java/protobuf-java/protobuf-java-3.25.3.ebuild
deleted file mode 100644
index 95aa1c28a226..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.25.3.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 2008-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.google.protobuf:protobuf-java:${PV}"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple cmake
-
-DESCRIPTION="Core Protocol Buffers library"
-HOMEPAGE="https://protobuf.dev"
-# Currently we bundle the binary version of truth.jar used only for tests, we don't install it.
-# And we build artifact 3.25.3 from the 25.3 tarball in order to allow sharing the tarball with
-# dev-libs/protobuf.
-MY_PV3="${PV#3.}"
-MY_PV="${MY_PV3/_rc/-rc}"
-SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${MY_PV}.tar.gz -> protobuf-${MY_PV}.tar.gz
- test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )"
-S="${WORKDIR}/protobuf-${MY_PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="system-protoc"
-
-BDEPEND="
- system-protoc? ( ~dev-libs/protobuf-${MY_PV3}:0 )
- !system-protoc? ( >=dev-cpp/abseil-cpp-20230802.0 )
-"
-DEPEND="
- >=virtual/jdk-1.8:*
- test? (
- dev-java/guava:0
- dev-java/mockito:4
- )
-"
-RDEPEND=">=virtual/jre-1.8:*"
-
-PATCHES=(
- "${FILESDIR}/protobuf-java-3.23.0-unittest_retention.proto.patch"
-)
-
-JAVA_AUTOMATIC_MODULE_NAME="com.google.protobuf"
-JAVA_JAR_FILENAME="protobuf.jar"
-JAVA_RESOURCE_DIRS="java/core/src/main/resources"
-JAVA_SRC_DIR="java/core/src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4,mockito-4"
-JAVA_TEST_SRC_DIR="java/core/src/test/java"
-
-run-protoc() {
- if use system-protoc; then
- protoc $1
- else
- "${BUILD_DIR}"/protoc $1
- fi
-}
-
-src_prepare() {
- # If the corrsponding version of system-protoc is not available we build protoc locally
- if use system-protoc; then
- default # apply patches
- else
- cmake_src_prepare
- fi
- java-pkg-2_src_prepare
-
- mkdir "${JAVA_RESOURCE_DIRS}" || die
- # https://github.com/protocolbuffers/protobuf/blob/v25.3/java/core/pom.xml#L43-L62
- PROTOS=( $(sed \
- -n '/google\/protobuf.*\.proto/s:.*<include>\(.*\)</include>:\1:p' \
- "${S}/java/core/pom.xml") ) || die
- pushd src > /dev/null || die
- cp --parents -v "${PROTOS[@]}" ../"${JAVA_RESOURCE_DIRS}" || die
- popd > /dev/null || die
-
- # https://github.com/protocolbuffers/protobuf/blob/v25.3/java/core/generate-sources-build.xml
- einfo "Replace variables in generate-sources-build.xml"
- sed \
- -e 's:${generated.sources.dir}:java/core/src/main/java:' \
- -e 's:${protobuf.source.dir}:src:' \
- -e 's:^.*value="::' -e 's:\"/>::' \
- -e '/project\|echo\|mkdir\|exec/d' \
- -i java/core/generate-sources-build.xml || die "sed to sources failed"
-
- # https://github.com/protocolbuffers/protobuf/blob/v25.3/java/core/generate-test-sources-build.xml
- einfo "Replace variables in generate-test-sources-build.xml"
- sed \
- -e 's:${generated.testsources.dir}:java/core/src/test/java:' \
- -e 's:${protobuf.source.dir}:src:' \
- -e 's:${test.proto.dir}:java/core/src/test/proto:' \
- -e 's:^.*value="::' -e 's:\"/>::' \
- -e '/project\|mkdir\|exec\|Also generate/d' \
- -i java/core/generate-test-sources-build.xml || die "sed to test sources failed"
-
- # Split the file in two parts, one for each run-protoc call
- awk '/--java_out/{x="test-sources-build-"++i;}{print > x;}' \
- java/core/generate-test-sources-build.xml || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -Dprotobuf_BUILD_TESTS=OFF
- -Dprotobuf_ABSL_PROVIDER=package
- )
- if use system-protoc; then
- :
- else
- cmake_src_configure
- fi
-}
-
-src_compile() {
- if use system-protoc; then
- :
- else
- cmake_src_compile
- fi
-
- einfo "Run protoc to generate sources"
- run-protoc \
- @java/core/generate-sources-build.xml \
- || die "protoc sources failed"
-
- java-pkg-simple_src_compile
-}
-
-src_test() {
- # https://github.com/protocolbuffers/protobuf/blob/v25.3/java/core/pom.xml#L63-L71
- jar cvf testdata.jar \
- -C src google/protobuf/testdata/golden_message_oneof_implemented \
- -C src google/protobuf/testdata/golden_packed_fields_message || die
-
- JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.1.3.jar:testdata.jar"
-
- einfo "Running protoc on first part of generate-test-sources-build.xml"
- run-protoc @test-sources-build-1 \
- || die "run-protoc test-sources-build-1 failed"
-
- einfo "Running protoc on second part of generate-test-sources-build.xml"
- run-protoc @test-sources-build-2 \
- || die "run-protoc test-sources-build-2 failed"
-
- einfo "Running tests"
- # Invalid test class 'map_test.MapInitializationOrderTest':
- # 1. Test class should have exactly one public constructor
- # Invalid test class 'protobuf_unittest.CachedFieldSizeTest':
- # 1. Test class should have exactly one public constructor
- pushd "${JAVA_TEST_SRC_DIR}" || die
- local JAVA_TEST_RUN_ONLY=$(find * \
- -path "**/*Test.java" \
- ! -path "**/Abstract*Test.java" \
- ! -name "MapInitializationOrderTest.java" \
- ! -path '*protobuf_unittest/CachedFieldSizeTest.java'
- )
- popd
- JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
- JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
- java-pkg-simple_src_test
-}
-
-src_install() {
- java-pkg-simple_src_install
-}
diff --git a/dev-java/protobuf-java/protobuf-java-4.27.2.ebuild b/dev-java/protobuf-java/protobuf-java-4.27.2.ebuild
index a523e6fa904d..679d42cc7238 100644
--- a/dev-java/protobuf-java/protobuf-java-4.27.2.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-4.27.2.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/protobuf-${MY_PV}"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~amd64-linux ~x86-linux ~x64-macos"
IUSE="system-protoc"
BDEPEND="
diff --git a/dev-java/protobuf-java/protobuf-java-4.28.1.ebuild b/dev-java/protobuf-java/protobuf-java-4.28.1.ebuild
index 9fa442ce3c7d..c8dd1f690a36 100644
--- a/dev-java/protobuf-java/protobuf-java-4.28.1.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-4.28.1.ebuild
@@ -24,7 +24,7 @@ S="${WORKDIR}/protobuf-${MY_PV}"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~amd64-linux ~x86-linux ~x64-macos"
IUSE="system-protoc"
BDEPEND="
diff --git a/dev-java/qdox/qdox-1.12.1-r6.ebuild b/dev-java/qdox/qdox-1.12.1-r6.ebuild
index 7af40869c2ab..4cfeb6815df5 100644
--- a/dev-java/qdox/qdox-1.12.1-r6.ebuild
+++ b/dev-java/qdox/qdox-1.12.1-r6.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${PN}-${PV}"
LICENSE="Apache-2.0"
SLOT="1.12"
-KEYWORDS="amd64 arm64 ppc64 x86 ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm64 ppc64 ~ppc-macos ~x64-macos"
IUSE="ant-task"
REQUIRED_USE="test? ( ant-task )"
diff --git a/dev-java/randomized-runner/randomized-runner-2.8.0.ebuild b/dev-java/randomized-runner/randomized-runner-2.8.0.ebuild
index ba4b88f3bd0b..3bbf53b90023 100644
--- a/dev-java/randomized-runner/randomized-runner-2.8.0.ebuild
+++ b/dev-java/randomized-runner/randomized-runner-2.8.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/randomizedtesting/randomizedtesting/archive/release/
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
CP_DEPEND="
dev-java/junit:4
diff --git a/dev-java/reflections/reflections-0.9.12-r6.ebuild b/dev-java/reflections/reflections-0.9.12-r6.ebuild
index bb248bdb2ce2..fb1f5aec96c0 100644
--- a/dev-java/reflections/reflections-0.9.12-r6.ebuild
+++ b/dev-java/reflections/reflections-0.9.12-r6.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ronmamo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="WTFPL-2 BSD-2"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
# Common dependencies
# POM: pom.xml
diff --git a/dev-java/relaxng-datatype/relaxng-datatype-20020414.ebuild b/dev-java/relaxng-datatype/relaxng-datatype-20020414.ebuild
index c9f7281e1ee1..67fbd5e92480 100644
--- a/dev-java/relaxng-datatype/relaxng-datatype-20020414.ebuild
+++ b/dev-java/relaxng-datatype/relaxng-datatype-20020414.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Interface between RELAX NG validators and datatype libraries"
HOMEPAGE="https://relaxng.org/"
SRC_URI="https://repo1.maven.org/maven2/relaxngDatatype/relaxngDatatype/${PV}/relaxngDatatype-${PV}-sources.jar"
-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"
SLOT="0"
diff --git a/dev-java/reload4j/reload4j-1.2.22.ebuild b/dev-java/reload4j/reload4j-1.2.22.ebuild
index aa374f2e61f8..4f81320a7bcc 100644
--- a/dev-java/reload4j/reload4j-1.2.22.ebuild
+++ b/dev-java/reload4j/reload4j-1.2.22.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/qos-ch/reload4j/archive/v_${PV}.tar.gz -> ${P}.tar.g
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
# There are unresolved test failures
RESTRICT="test"
diff --git a/dev-java/rhino/rhino-1.7.14-r1.ebuild b/dev-java/rhino/rhino-1.7.14-r1.ebuild
index dd9a6f915127..f5f009acdc19 100644
--- a/dev-java/rhino/rhino-1.7.14-r1.ebuild
+++ b/dev-java/rhino/rhino-1.7.14-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/mozilla/rhino"
SRC_URI="https://github.com/mozilla/rhino/archive/Rhino${PV//./_}_Release.tar.gz -> ${P}.tar.gz"
LICENSE="MPL-1.1 GPL-2"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
SLOT="1.6"
# There are too many test failures:
diff --git a/dev-java/rome/rome-0.9-r4.ebuild b/dev-java/rome/rome-0.9-r4.ebuild
index 58f961d200e5..04752506fb2f 100644
--- a/dev-java/rome/rome-0.9-r4.ebuild
+++ b/dev-java/rome/rome-0.9-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}.zip"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64"
CP_DEPEND="dev-java/jdom:0"
diff --git a/dev-java/rxtx/rxtx-2.2_pre2-r2.ebuild b/dev-java/rxtx/rxtx-2.2_pre2-r2.ebuild
index 460474c3ba23..7f3f16461549 100644
--- a/dev-java/rxtx/rxtx-2.2_pre2-r2.ebuild
+++ b/dev-java/rxtx/rxtx-2.2_pre2-r2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://rxtx.qbang.org/"
SRC_URI="ftp://ftp.qbang.org/pub/rxtx/${MY_P}.zip"
LICENSE="LGPL-2.1+"
SLOT="2"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ~ppc64"
IUSE="lfd"
RDEPEND=">=virtual/jre-1.8:*
diff --git a/dev-java/saslprep/saslprep-1.1-r1.ebuild b/dev-java/saslprep/saslprep-1.1-r1.ebuild
index c36809a99c83..9fc2ec1f9f2f 100644
--- a/dev-java/saslprep/saslprep-1.1-r1.ebuild
+++ b/dev-java/saslprep/saslprep-1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://repo1.maven.org/maven2/com/ongres/stringprep/saslprep/${PV}/sas
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="amd64 ppc64"
CP_DEPEND="dev-java/stringprep:0"
DEPEND=">=virtual/jdk-1.8:*
diff --git a/dev-java/sax/sax-2.2.1-r5.ebuild b/dev-java/sax/sax-2.2.1-r5.ebuild
index 5bda68b0b794..addf2401f829 100644
--- a/dev-java/sax/sax-2.2.1-r5.ebuild
+++ b/dev-java/sax/sax-2.2.1-r5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_PN}.zip -> ${P}.zip"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos"
DEPEND="
>=virtual/jdk-1.8:*"
diff --git a/dev-java/saxon/saxon-9.2.0.6-r5.ebuild b/dev-java/saxon/saxon-9.2.0.6-r5.ebuild
index 9545816cfcea..efc878a3c6ee 100644
--- a/dev-java/saxon/saxon-9.2.0.6-r5.ebuild
+++ b/dev-java/saxon/saxon-9.2.0.6-r5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.sourceforge.net/saxon/Saxon-HE/$(ver_cut 1-2)/saxonhe
LICENSE="MPL-1.0"
SLOT="9"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
IUSE="ant-task"
BDEPEND="app-arch/unzip"
diff --git a/dev-java/sbt/sbt-0.13.18-r1.ebuild b/dev-java/sbt/sbt-0.13.18-r1.ebuild
index eb340eb54926..265669b73ccc 100644
--- a/dev-java/sbt/sbt-0.13.18-r1.ebuild
+++ b/dev-java/sbt/sbt-0.13.18-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -24,7 +24,7 @@ SRC_URI="
)"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64"
IUSE="binary"
# Restrict to jdk:1.8
diff --git a/dev-java/scala-cli-bin/Manifest b/dev-java/scala-cli-bin/Manifest
index 129c168ba886..58df934e0a5f 100644
--- a/dev-java/scala-cli-bin/Manifest
+++ b/dev-java/scala-cli-bin/Manifest
@@ -1,12 +1,3 @@
-DIST scala-cli-amd64-1.2.2.gz 33871512 BLAKE2B ef9328b26afb52ada07739539d560239d6ce2ffd72d1e353ce94d45c7358b6789aa0019804e249584ca497d5d15c96caab12eb31fab5b84a14162c00ca30c181 SHA512 02da0915ee140a129f622f973291c98c7dd7b7f16f5a2a5250ac825e09876b616a315fe5e6af43691f43870fa68234efeff73eadd4f6060d2d90fe937302eae7
-DIST scala-cli-amd64-1.4.3.gz 34238734 BLAKE2B ac40427ebd664c147f3134d067143207a024f2fa96be06f452d3b037a5f9866f6d6624c31a5a6045e5d1b6d087c87a14d2a376e050e6d23a10ce66de544b5969 SHA512 09b2ca1615a3c090a195f41237aa448d3535555c976ff4abdade1b8569126794009fcab11bde2087fcfe72c5a7a72b7b74bea647eef3a941bd1af4fb584b5f9b
-DIST scala-cli-amd64-1.5.0.gz 34334438 BLAKE2B 2369f8e4a27975e3bc3a646e9637f885016a7df08c1cbfd1874b2f07037b1452df5eda16fd64bc9182611aaa37e903392764a3cff19439e864cc3ee510e1c163 SHA512 53ec0a5a9079b40189391a7e2e6ef3d8bcf40ebe05af807fbe4bb3b8116975c21266d88eff87b5fc841dfd8584bb6fe8320583f19dbe1e24d0c550bdc086aea5
DIST scala-cli-amd64-1.5.1.gz 34375992 BLAKE2B 4af5f420df9ef15e4252bc65dc17b3c9df516e784cf5d5e48cc93686c6a068e13b5098c552d8c9155739eb56cecb7e410289025f3281135b9d7d4cfc5e0d5cd5 SHA512 0adcc503fd7de00d0df97c5c31c7fca18e6ce4e6f91b8a07ae4f94107b289f7301513d22ab6ab06f74a956b0ceb648cd487105ab5289c477c52287466e1d6e45
-DIST scala-cli-arm64-1.2.2.gz 33766128 BLAKE2B d5b2d7ab8157f3874b1cfe0b0647ab30f5dd191337e575056eb758d52eda30871c54b20a08a1cda3e28c51afd744b4b8320aee6aef056b39b98f2534184739ba SHA512 004ca188e4ddd01c0e46277fa514b1c9bd061ea26d4318b8daff3ffaae5bb7cc9f4746509401da19774537c7e56f8a5a7da846cd4b5f90c61a3ab1f8d3ed0493
-DIST scala-cli-arm64-1.4.3.gz 34137841 BLAKE2B 0e8ed1f1777ac507315b7e8136b85fa1486c5817f8ae49205a7e53eebc15be0f3c90123418890ce1c96110534a962ead961aad0c6fd9230df0a5a6a70147cca3 SHA512 c81a3be8fdb2b396252f5c31b5fd9182864e6bfda14ab3a119d9922ef1e1834521781eaf935ba91d74ba24388e9bf9617e82ad2d61dfe88f845426a16b7b4e7f
-DIST scala-cli-arm64-1.5.0.gz 34240198 BLAKE2B aadb5203d2b2e93e27b4408724c5ebfbfa3a1e14b9bd3f78ccefbd961063451dc16fc0374430088d981208614de82ddf538c0e04975adba46f997fbf71c0d915 SHA512 d5025e91057ba72e9a2aed177356c04c08cc10745c8614db44e7843e6825ec14c619d7c8e24154c168e485bb98ebfb234179fa4a50989c162bcf92d096413379
DIST scala-cli-arm64-1.5.1.gz 34284162 BLAKE2B 1db3c49d52a47ab276600d6e29179a920256ba56262cac0368dd8e8ddfd6f1b570a5124b64bc4005a7212801ad8615997a3f91f807e878a989e1359d053ea10e SHA512 026cfde5c108df8d91acf3394a53dfb49a962cd6ac1a1be78c4601afa4823d410205ad147bb8830b17923d209a0333d75b50dede1a00208081f64928e4198364
-DIST scala-cli-non-native-1.2.2 7837019 BLAKE2B 799ed83805ba767b687cf9a041a3e23f008e20e3ca55b8c52a9361c0b2465141abb7c17ca7dca59c9307af5a5a07a0cfe0d8035eea14a2adf2580913d67d6a10 SHA512 40aa43ee601c52238989a81884b6acc7a023599abb561bed1c9d31dff6053eff0f3477097a228bc30aab4df22d81b10fbbb64b5557d3067b4715c821c4eacb3e
-DIST scala-cli-non-native-1.4.3 8004147 BLAKE2B 79b37e21b4aa1335a766ff7a735cf6fd0ae47b054c246371cfe57dca601de9309abc92df60ccba9873bf112f03d61081397eb859754b3287d2f6712946988ab5 SHA512 6c032330c01b2f2730390ea83fbcd9259e498b65cb182c2cf20cec2674f3dac2262d746a8addbe8b856c34bded0805c23b9a6a59e345037ea0b546681ddc7596
-DIST scala-cli-non-native-1.5.0 8117168 BLAKE2B 9b55dec1e329c7242ff5cdcad65a77686498c6c5bf5b872473d18609e4fed59353121fc4e3df4d8c7466daa1590bb09b4c6fdbf5bddd80bcaeab541e31d426a1 SHA512 badf719bdd3d9a289ca1436ca83433ecd49ab9908158188b68682e2c8bcee9e69c0bf73d1791656ecc2d01fe560cc754ef0f5e965ea25a520d73c7f98db266b0
DIST scala-cli-non-native-1.5.1 8105280 BLAKE2B 2957eeda0c27f6c91de9cb36f103d5f9bfdcff5110e8c5b51c6067c756c1592f6e5e94f59b9471260bcd50369f50874ca6901466e4bc2e654e51c3666763620e SHA512 600b66c8db534f6e04c8a3ada969b998bb5923e9ec2322dc1919032c4221bfb3c259dda7abdf7f862d9693d4658fedef607d6a85094d1e6c6ed7f4655d9a8146
diff --git a/dev-java/scala-cli-bin/scala-cli-bin-1.2.2.ebuild b/dev-java/scala-cli-bin/scala-cli-bin-1.2.2.ebuild
deleted file mode 100644
index d73c7e68ad79..000000000000
--- a/dev-java/scala-cli-bin/scala-cli-bin-1.2.2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1
-
-UPSTREAM_PV=${PV/_/-}
-UPSTREAM_PV=${UPSTREAM_PV/rc/RC}
-
-DESCRIPTION="CLI to interact with Scala and Java"
-HOMEPAGE="https://scala-cli.virtuslab.org/"
-SRC_URI="
- !amd64? ( !arm64? (
- https://github.com/VirtusLab/scala-cli/releases/download/v${UPSTREAM_PV}/scala-cli
- -> scala-cli-non-native-${UPSTREAM_PV}
- ) )
- amd64? (
- https://github.com/VirtusLab/scala-cli/releases/download/v${UPSTREAM_PV}/scala-cli-x86_64-pc-linux.gz
- -> scala-cli-amd64-${UPSTREAM_PV}.gz
- )
- arm64? (
- https://github.com/VirtusLab/scala-cli/releases/download/v${UPSTREAM_PV}/scala-cli-aarch64-pc-linux.gz
- -> scala-cli-arm64-${UPSTREAM_PV}.gz
- )
-"
-
-KEYWORDS="amd64 ~arm64"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-S="${WORKDIR}"
-
-# A JRE is not strictly required if native images of scala-cli are used
-# (amd64, arm64). However we may want a system JRE anyway, and having JRE
-# in RDEPEND reduces the chances that scala-cli needs to install one
-# for the user.
-RDEPEND="
- >=virtual/jre-11
- sys-libs/zlib
-"
-BDEPEND="!amd64? ( !arm64? ( >=virtual/jre-11 ) )"
-
-QA_TEXTRELS="*"
-QA_FLAGS_IGNORED="/usr/bin/scala-cli"
-
-src_prepare() {
- default
-
- if use amd64; then
- mv scala-cli-amd64-${UPSTREAM_PV} scala-cli || die
- elif use arm64; then
- mv scala-cli-arm64-${UPSTREAM_PV} scala-cli || die
- else
- mv scala-cli-non-native-${UPSTREAM_PV} scala-cli || die
- fi
-
- chmod +x scala-cli || die
-}
-
-src_compile() {
- for shell in bash zsh; do
- ./scala-cli install-completions \
- --shell ${shell} \
- --env \
- --output "${S}" \
- > ${shell}-completion || die
- done
-}
-
-src_install() {
- dobin scala-cli
-
- newbashcomp bash-completion scala-cli
-
- insinto /usr/share/zsh/site-functions
- doins zsh/_scala-cli
-}
diff --git a/dev-java/scala-cli-bin/scala-cli-bin-1.4.3.ebuild b/dev-java/scala-cli-bin/scala-cli-bin-1.4.3.ebuild
deleted file mode 100644
index e89ddb52ce30..000000000000
--- a/dev-java/scala-cli-bin/scala-cli-bin-1.4.3.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1
-
-UPSTREAM_PV=${PV/_/-}
-UPSTREAM_PV=${UPSTREAM_PV/rc/RC}
-
-DESCRIPTION="CLI to interact with Scala and Java"
-HOMEPAGE="https://scala-cli.virtuslab.org/"
-SRC_URI="
- !amd64? ( !arm64? (
- https://github.com/VirtusLab/scala-cli/releases/download/v${UPSTREAM_PV}/scala-cli
- -> scala-cli-non-native-${UPSTREAM_PV}
- ) )
- amd64? (
- https://github.com/VirtusLab/scala-cli/releases/download/v${UPSTREAM_PV}/scala-cli-x86_64-pc-linux.gz
- -> scala-cli-amd64-${UPSTREAM_PV}.gz
- )
- arm64? (
- https://github.com/VirtusLab/scala-cli/releases/download/v${UPSTREAM_PV}/scala-cli-aarch64-pc-linux.gz
- -> scala-cli-arm64-${UPSTREAM_PV}.gz
- )
-"
-
-S="${WORKDIR}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-# A JRE is not strictly required if native images of scala-cli are used
-# (amd64, arm64). However we may want a system JRE anyway, and having JRE
-# in RDEPEND reduces the chances that scala-cli needs to install one
-# for the user.
-RDEPEND="
- >=virtual/jre-11
- sys-libs/zlib
-"
-BDEPEND="!amd64? ( !arm64? ( >=virtual/jre-11 ) )"
-
-QA_TEXTRELS="*"
-QA_FLAGS_IGNORED="/usr/bin/scala-cli"
-
-src_prepare() {
- default
-
- if use amd64; then
- mv scala-cli-amd64-${UPSTREAM_PV} scala-cli || die
- elif use arm64; then
- mv scala-cli-arm64-${UPSTREAM_PV} scala-cli || die
- else
- mv scala-cli-non-native-${UPSTREAM_PV} scala-cli || die
- fi
-
- chmod +x scala-cli || die
-}
-
-src_compile() {
- for shell in bash zsh; do
- ./scala-cli install-completions \
- --shell ${shell} \
- --env \
- --output "${S}" \
- > ${shell}-completion || die
- done
-}
-
-src_install() {
- dobin scala-cli
-
- newbashcomp bash-completion scala-cli
-
- insinto /usr/share/zsh/site-functions
- doins zsh/_scala-cli
-}
diff --git a/dev-java/scala-cli-bin/scala-cli-bin-1.5.0.ebuild b/dev-java/scala-cli-bin/scala-cli-bin-1.5.0.ebuild
deleted file mode 100644
index e89ddb52ce30..000000000000
--- a/dev-java/scala-cli-bin/scala-cli-bin-1.5.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1
-
-UPSTREAM_PV=${PV/_/-}
-UPSTREAM_PV=${UPSTREAM_PV/rc/RC}
-
-DESCRIPTION="CLI to interact with Scala and Java"
-HOMEPAGE="https://scala-cli.virtuslab.org/"
-SRC_URI="
- !amd64? ( !arm64? (
- https://github.com/VirtusLab/scala-cli/releases/download/v${UPSTREAM_PV}/scala-cli
- -> scala-cli-non-native-${UPSTREAM_PV}
- ) )
- amd64? (
- https://github.com/VirtusLab/scala-cli/releases/download/v${UPSTREAM_PV}/scala-cli-x86_64-pc-linux.gz
- -> scala-cli-amd64-${UPSTREAM_PV}.gz
- )
- arm64? (
- https://github.com/VirtusLab/scala-cli/releases/download/v${UPSTREAM_PV}/scala-cli-aarch64-pc-linux.gz
- -> scala-cli-arm64-${UPSTREAM_PV}.gz
- )
-"
-
-S="${WORKDIR}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-# A JRE is not strictly required if native images of scala-cli are used
-# (amd64, arm64). However we may want a system JRE anyway, and having JRE
-# in RDEPEND reduces the chances that scala-cli needs to install one
-# for the user.
-RDEPEND="
- >=virtual/jre-11
- sys-libs/zlib
-"
-BDEPEND="!amd64? ( !arm64? ( >=virtual/jre-11 ) )"
-
-QA_TEXTRELS="*"
-QA_FLAGS_IGNORED="/usr/bin/scala-cli"
-
-src_prepare() {
- default
-
- if use amd64; then
- mv scala-cli-amd64-${UPSTREAM_PV} scala-cli || die
- elif use arm64; then
- mv scala-cli-arm64-${UPSTREAM_PV} scala-cli || die
- else
- mv scala-cli-non-native-${UPSTREAM_PV} scala-cli || die
- fi
-
- chmod +x scala-cli || die
-}
-
-src_compile() {
- for shell in bash zsh; do
- ./scala-cli install-completions \
- --shell ${shell} \
- --env \
- --output "${S}" \
- > ${shell}-completion || die
- done
-}
-
-src_install() {
- dobin scala-cli
-
- newbashcomp bash-completion scala-cli
-
- insinto /usr/share/zsh/site-functions
- doins zsh/_scala-cli
-}
diff --git a/dev-java/scala-cli-bin/scala-cli-bin-1.5.1.ebuild b/dev-java/scala-cli-bin/scala-cli-bin-1.5.1.ebuild
index e89ddb52ce30..313d5fcd0b7d 100644
--- a/dev-java/scala-cli-bin/scala-cli-bin-1.5.1.ebuild
+++ b/dev-java/scala-cli-bin/scala-cli-bin-1.5.1.ebuild
@@ -29,7 +29,7 @@ S="${WORKDIR}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
# A JRE is not strictly required if native images of scala-cli are used
# (amd64, arm64). However we may want a system JRE anyway, and having JRE
diff --git a/dev-java/scram/scram-2.1.ebuild b/dev-java/scram/scram-2.1.ebuild
index 6e7eeccf9430..44dc7af7a78c 100644
--- a/dev-java/scram/scram-2.1.ebuild
+++ b/dev-java/scram/scram-2.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="amd64 ppc64"
CP_DEPEND="dev-java/saslprep:0"
diff --git a/dev-java/shrinkwrap-api/shrinkwrap-api-1.2.6.ebuild b/dev-java/shrinkwrap-api/shrinkwrap-api-1.2.6.ebuild
index bcd2262fae81..47325f95ad93 100644
--- a/dev-java/shrinkwrap-api/shrinkwrap-api-1.2.6.ebuild
+++ b/dev-java/shrinkwrap-api/shrinkwrap-api-1.2.6.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/shrinkwrap-${PV}/api"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
# Restrict to jdk:1.8 - otherwhise one test would fail:
# 1) shouldCreateDefensiveCopyOfURLOnConstruction(org.jboss.shrinkwrap.api.asset.UrlAssetTestCase)
diff --git a/dev-java/shrinkwrap-impl-base/shrinkwrap-impl-base-1.2.6.ebuild b/dev-java/shrinkwrap-impl-base/shrinkwrap-impl-base-1.2.6.ebuild
index 3f85023ccdac..634f20def372 100644
--- a/dev-java/shrinkwrap-impl-base/shrinkwrap-impl-base-1.2.6.ebuild
+++ b/dev-java/shrinkwrap-impl-base/shrinkwrap-impl-base-1.2.6.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/shrinkwrap-${PV}/impl-base"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
CP_DEPEND="
dev-java/jakarta-activation:1
diff --git a/dev-java/shrinkwrap-spi/shrinkwrap-spi-1.2.6-r1.ebuild b/dev-java/shrinkwrap-spi/shrinkwrap-spi-1.2.6-r1.ebuild
index d636cbda1802..c4720a2273de 100644
--- a/dev-java/shrinkwrap-spi/shrinkwrap-spi-1.2.6-r1.ebuild
+++ b/dev-java/shrinkwrap-spi/shrinkwrap-spi-1.2.6-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/shrinkwrap-${PV}/spi"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
CP_DEPEND="~dev-java/shrinkwrap-api-${PV}:0"
diff --git a/dev-java/sjsxp/sjsxp-1.0.2.ebuild b/dev-java/sjsxp/sjsxp-1.0.2.ebuild
index 4068f3093414..315a93d50b5b 100644
--- a/dev-java/sjsxp/sjsxp-1.0.2.ebuild
+++ b/dev-java/sjsxp/sjsxp-1.0.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://repo1.maven.org/maven2/com/sun/xml/stream/${PN}/${PV}/${P}-sour
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
# Common dependencies
# POM: ${P}.pom
diff --git a/dev-java/slf4j-api/slf4j-api-2.0.3.ebuild b/dev-java/slf4j-api/slf4j-api-2.0.3.ebuild
index c97900d1d925..11ce54fafaa7 100644
--- a/dev-java/slf4j-api/slf4j-api-2.0.3.ebuild
+++ b/dev-java/slf4j-api/slf4j-api-2.0.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/qos-ch/slf4j/archive/v_${PV}.tar.gz -> slf4j-${PV}.t
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND=">=virtual/jdk-11:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/slf4j-ext/slf4j-ext-2.0.3.ebuild b/dev-java/slf4j-ext/slf4j-ext-2.0.3.ebuild
index 7109a4a756a0..65ee8a091c61 100644
--- a/dev-java/slf4j-ext/slf4j-ext-2.0.3.ebuild
+++ b/dev-java/slf4j-ext/slf4j-ext-2.0.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/qos-ch/slf4j/archive/v_${PV}.tar.gz -> slf4j-${PV}.t
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
# Common dependencies
# POM: pom.xml
diff --git a/dev-java/slf4j-nop/slf4j-nop-2.0.3.ebuild b/dev-java/slf4j-nop/slf4j-nop-2.0.3.ebuild
index f370b6c8b64f..352e78102794 100644
--- a/dev-java/slf4j-nop/slf4j-nop-2.0.3.ebuild
+++ b/dev-java/slf4j-nop/slf4j-nop-2.0.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/qos-ch/slf4j/archive/v_${PV}.tar.gz -> slf4j-${PV}.t
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
# Common dependencies
# POM: pom.xml
diff --git a/dev-java/slf4j-reload4j/slf4j-reload4j-2.0.3.ebuild b/dev-java/slf4j-reload4j/slf4j-reload4j-2.0.3.ebuild
index 4ce899a6280d..7b5bec40e4ad 100644
--- a/dev-java/slf4j-reload4j/slf4j-reload4j-2.0.3.ebuild
+++ b/dev-java/slf4j-reload4j/slf4j-reload4j-2.0.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/qos-ch/slf4j/archive/v_${PV}.tar.gz -> slf4j-${PV}.t
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
# Common dependencies
# POM: pom.xml
diff --git a/dev-java/slf4j-simple/slf4j-simple-2.0.3.ebuild b/dev-java/slf4j-simple/slf4j-simple-2.0.3.ebuild
index e3b81fcfc558..9862a756e094 100644
--- a/dev-java/slf4j-simple/slf4j-simple-2.0.3.ebuild
+++ b/dev-java/slf4j-simple/slf4j-simple-2.0.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/qos-ch/slf4j/archive/v_${PV}.tar.gz -> slf4j-${PV}.t
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
# Common dependencies
# POM: pom.xml
diff --git a/dev-java/snakeyaml/snakeyaml-1.33.ebuild b/dev-java/snakeyaml/snakeyaml-1.33.ebuild
index b10a6cedf011..a5d4b02db176 100644
--- a/dev-java/snakeyaml/snakeyaml-1.33.ebuild
+++ b/dev-java/snakeyaml/snakeyaml-1.33.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://bitbucket.org/${PN}/${PN}/get/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
# Compile dependencies
# POM: pom.xml
diff --git a/dev-java/snakeyaml/snakeyaml-2.0.ebuild b/dev-java/snakeyaml/snakeyaml-2.0.ebuild
index 5c3b414fdd45..292a108784f4 100644
--- a/dev-java/snakeyaml/snakeyaml-2.0.ebuild
+++ b/dev-java/snakeyaml/snakeyaml-2.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/snakeyaml-snakeyaml-59ddbb3304bb"
LICENSE="Apache-2.0"
SLOT="2"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
# Compile dependencies
# POM: pom.xml
diff --git a/dev-java/snappy-java/snappy-java-1.1.10.5-r2.ebuild b/dev-java/snappy-java/snappy-java-1.1.10.5-r2.ebuild
index da6cddbb50c2..169bab40a0d6 100644
--- a/dev-java/snappy-java/snappy-java-1.1.10.5-r2.ebuild
+++ b/dev-java/snappy-java/snappy-java-1.1.10.5-r2.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${P}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
CP_DEPEND="dev-java/osgi-core:0"
diff --git a/dev-java/snappy-java/snappy-java-1.1.10.7.ebuild b/dev-java/snappy-java/snappy-java-1.1.10.7.ebuild
index 08c7d381ba69..94a0296557b4 100644
--- a/dev-java/snappy-java/snappy-java-1.1.10.7.ebuild
+++ b/dev-java/snappy-java/snappy-java-1.1.10.7.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${P}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
CP_DEPEND="dev-java/osgi-core:0"
diff --git a/dev-java/sparsebitset/sparsebitset-1.3.ebuild b/dev-java/sparsebitset/sparsebitset-1.3.ebuild
index 23f50d8a0940..a05d4f991245 100644
--- a/dev-java/sparsebitset/sparsebitset-1.3.ebuild
+++ b/dev-java/sparsebitset/sparsebitset-1.3.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/SparseBitSet-SparseBitSet-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND=">=virtual/jdk-1.8:*
test? ( dev-java/junit:4 )"
diff --git a/dev-java/stax2-api/stax2-api-4.2.1-r1.ebuild b/dev-java/stax2-api/stax2-api-4.2.1-r1.ebuild
index 400ffeb1e0c9..3ce227b13064 100644
--- a/dev-java/stax2-api/stax2-api-4.2.1-r1.ebuild
+++ b/dev-java/stax2-api/stax2-api-4.2.1-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/FasterXML/${PN}/archive/refs/tags/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND=">=virtual/jdk-1.9:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/stringprep/stringprep-1.1.ebuild b/dev-java/stringprep/stringprep-1.1.ebuild
index 4265e6c33f7a..2ef732f9f9f5 100644
--- a/dev-java/stringprep/stringprep-1.1.ebuild
+++ b/dev-java/stringprep/stringprep-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://repo1.maven.org/maven2/com/ongres/stringprep/stringprep/${PV}/s
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="amd64 ppc64"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/stringtemplate/stringtemplate-3.2.1-r3.ebuild b/dev-java/stringtemplate/stringtemplate-3.2.1-r3.ebuild
index 909f5072550c..217db7a0df22 100644
--- a/dev-java/stringtemplate/stringtemplate-3.2.1-r3.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-3.2.1-r3.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${PN}3-${MY_COMMIT}"
LICENSE="BSD-1"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-solaris"
CP_DEPEND="dev-java/antlr:0"
DEPEND="${CP_DEPEND}
diff --git a/dev-java/stringtemplate/stringtemplate-4.3.4.ebuild b/dev-java/stringtemplate/stringtemplate-4.3.4.ebuild
index ebf52ad19ee4..cbdea375ff50 100644
--- a/dev-java/stringtemplate/stringtemplate-4.3.4.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-4.3.4.ebuild
@@ -23,7 +23,7 @@ TARBALL_S="${S}/${PN}4-ST4-${PV}"
LICENSE="BSD"
SLOT="4"
-KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-solaris"
CP_DEPEND="
dev-java/antlr-runtime:3.5
diff --git a/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r2.ebuild b/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r2.ebuild
index 068b8ed34591..66546d392498 100644
--- a/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r2.ebuild
+++ b/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
LICENSE="sun-bcla-jai"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND=""
RDEPEND="virtual/jre:1.8"
diff --git a/dev-java/swing-layout/swing-layout-1.0.4-r2.ebuild b/dev-java/swing-layout/swing-layout-1.0.4-r2.ebuild
index 0c4a51533e6f..0a7547e93f3b 100644
--- a/dev-java/swing-layout/swing-layout-1.0.4-r2.ebuild
+++ b/dev-java/swing-layout/swing-layout-1.0.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}-src.zip"
LICENSE="LGPL-2.1"
SLOT="1"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64"
DEPEND="
>=virtual/jdk-1.8:*"
diff --git a/dev-java/swingx-beaninfo/swingx-beaninfo-1.6.4-r1.ebuild b/dev-java/swingx-beaninfo/swingx-beaninfo-1.6.4-r1.ebuild
index 0ccfaedb8b2b..e8a8440e5415 100644
--- a/dev-java/swingx-beaninfo/swingx-beaninfo-1.6.4-r1.ebuild
+++ b/dev-java/swingx-beaninfo/swingx-beaninfo-1.6.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/arotenberg/swingx"
SRC_URI="https://java.net/downloads/swingx/releases/${P}-sources.jar"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
CDEPEND="dev-java/swingx:1.6"
diff --git a/dev-java/swingx/swingx-1.6.4-r1.ebuild b/dev-java/swingx/swingx-1.6.4-r1.ebuild
index 88ad5fcd466c..6a6c4b071f66 100644
--- a/dev-java/swingx/swingx-1.6.4-r1.ebuild
+++ b/dev-java/swingx/swingx-1.6.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://maven.java.net/service/local/repositories/releases/content/org/
LICENSE="LGPL-2.1"
SLOT="1.6"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
CDEPEND="dev-java/metainf-services:0"
diff --git a/dev-java/swt/swt-3.7.2-r4.ebuild b/dev-java/swt/swt-3.7.2-r4.ebuild
index 18bc97088217..2fc62ad8c429 100644
--- a/dev-java/swt/swt-3.7.2-r4.ebuild
+++ b/dev-java/swt/swt-3.7.2-r4.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
SLOT="3.7"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="amd64 ppc64"
IUSE="cairo opengl"
BDEPEND="
diff --git a/dev-java/system-rules/system-rules-1.19.0.ebuild b/dev-java/system-rules/system-rules-1.19.0.ebuild
index c87c5005b7ab..c819878b9898 100644
--- a/dev-java/system-rules/system-rules-1.19.0.ebuild
+++ b/dev-java/system-rules/system-rules-1.19.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Skeleton command:
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/stefanbirkner/${PN}/archive/${P}.tar.gz"
LICENSE="CPL-1.0"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64"
# Common dependencies
# POM: pom.xml
diff --git a/dev-java/testng/testng-6.11-r1.ebuild b/dev-java/testng/testng-6.11-r1.ebuild
index 076977f08cc9..556064c5616e 100644
--- a/dev-java/testng/testng-6.11-r1.ebuild
+++ b/dev-java/testng/testng-6.11-r1.ebuild
@@ -28,7 +28,7 @@ SRC_URI="https://github.com/testng-team/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
S="${WORKDIR}/${P}"
LICENSE="Apache-2.0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
SLOT="0"
CP_DEPEND="
diff --git a/dev-java/tomcat-native/tomcat-native-1.3.1.ebuild b/dev-java/tomcat-native/tomcat-native-1.3.1.ebuild
index f4e9d9bd6779..d59cf80486c5 100644
--- a/dev-java/tomcat-native/tomcat-native-1.3.1.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-1.3.1.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${P}-src/native
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64"
IUSE="static-libs"
DEPEND="
diff --git a/dev-java/tomcat-native/tomcat-native-2.0.8.ebuild b/dev-java/tomcat-native/tomcat-native-2.0.8.ebuild
index 7dbe994033c0..ccc5fc078b90 100644
--- a/dev-java/tomcat-native/tomcat-native-2.0.8.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-2.0.8.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${P}-src/native
LICENSE="Apache-2.0"
SLOT="2"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64"
IUSE="static-libs"
DEPEND="
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.40-r1.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.40-r1.ebuild
index aa60f541a8f7..dc8e8e8993e3 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.40-r1.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.40-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}/servletapi"
LICENSE="Apache-2.0"
SLOT="2.3"
-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"
DEPEND=">=virtual/jdk-1.8"
RDEPEND=">=virtual/jre-1.8"
diff --git a/dev-java/treelayout/treelayout-1.0.3-r1.ebuild b/dev-java/treelayout/treelayout-1.0.3-r1.ebuild
index cf20199e9813..79480369f119 100644
--- a/dev-java/treelayout/treelayout-1.0.3-r1.ebuild
+++ b/dev-java/treelayout/treelayout-1.0.3-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/abego/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
# LICENSE="!!!equivalentPortageLicenseName-not-found!!!"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND="
>=virtual/jdk-1.8:*
diff --git a/dev-java/txw2/txw2-2.3.8-r1.ebuild b/dev-java/txw2/txw2-2.3.8-r1.ebuild
index d5d25dcdca92..725eb438279c 100644
--- a/dev-java/txw2/txw2-2.3.8-r1.ebuild
+++ b/dev-java/txw2/txw2-2.3.8-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/jaxb-ri-${PV}-RI/jaxb-ri/txw/runtime"
LICENSE="EPL-1.0"
SLOT="2"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND=">=virtual/jdk-11:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/typesafe-config/typesafe-config-1.4.2.ebuild b/dev-java/typesafe-config/typesafe-config-1.4.2.ebuild
index a1bf736882f7..014132b5d1a3 100644
--- a/dev-java/typesafe-config/typesafe-config-1.4.2.ebuild
+++ b/dev-java/typesafe-config/typesafe-config-1.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/lightbend/config/archive/v${PV}.tar.gz -> ${P}.tar.g
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="amd64 ppc64"
IUSE="doc source"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/unbescape/unbescape-1.1.6.ebuild b/dev-java/unbescape/unbescape-1.1.6.ebuild
index 0db2ef2d09fd..4b2e6582b734 100644
--- a/dev-java/unbescape/unbescape-1.1.6.ebuild
+++ b/dev-java/unbescape/unbescape-1.1.6.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/unbescape/unbescape/archive/unbescape-${PV}.RELEASE.
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64"
RDEPEND=">=virtual/jre-1.8:*"
DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/univocity-parsers/univocity-parsers-2.9.1.ebuild b/dev-java/univocity-parsers/univocity-parsers-2.9.1.ebuild
index a4033a241480..3596e4ff9238 100644
--- a/dev-java/univocity-parsers/univocity-parsers-2.9.1.ebuild
+++ b/dev-java/univocity-parsers/univocity-parsers-2.9.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/uniVocity/univocity-parsers/archive/refs/tags/v${PV}
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND="
>=virtual/jdk-1.8:*
diff --git a/dev-java/velocity/velocity-2.3_p20240314.ebuild b/dev-java/velocity/velocity-2.3_p20240314.ebuild
index 9c7827b2acdd..2288fd91a1a5 100644
--- a/dev-java/velocity/velocity-2.3_p20240314.ebuild
+++ b/dev-java/velocity/velocity-2.3_p20240314.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-engine-${MY_COMMIT}/${PN}-engine-core"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
CP_DEPEND="
>=dev-java/commons-io-2.8.0:1
diff --git a/dev-java/waffle-jna/waffle-jna-3.3.0.ebuild b/dev-java/waffle-jna/waffle-jna-3.3.0.ebuild
index 7d9114ca8512..94c43ff2575a 100644
--- a/dev-java/waffle-jna/waffle-jna-3.3.0.ebuild
+++ b/dev-java/waffle-jna/waffle-jna-3.3.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/waffle-waffle-parent-${PV}/Source/JNA/waffle-jna"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="amd64 ppc64"
RESTRICT="test" #839681
DEPEND="
diff --git a/dev-java/woodstox-core/woodstox-core-6.4.0-r1.ebuild b/dev-java/woodstox-core/woodstox-core-6.4.0-r1.ebuild
index fbae432ff233..216ef725d147 100644
--- a/dev-java/woodstox-core/woodstox-core-6.4.0-r1.ebuild
+++ b/dev-java/woodstox-core/woodstox-core-6.4.0-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/woodstox/archive/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
# Common dependencies
# POM: pom.xml
diff --git a/dev-java/wsdl4j/wsdl4j-1.6.3.ebuild b/dev-java/wsdl4j/wsdl4j-1.6.3.ebuild
index faea63d043a6..850640967e1c 100644
--- a/dev-java/wsdl4j/wsdl4j-1.6.3.ebuild
+++ b/dev-java/wsdl4j/wsdl4j-1.6.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://downloads.sourceforge.net/project/wsdl4j/WSDL4J/${PV}/wsdl4j-sr
LICENSE="CPL-1.0"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/xalan-serializer/xalan-serializer-2.7.3-r1.ebuild b/dev-java/xalan-serializer/xalan-serializer-2.7.3-r1.ebuild
index 2f73125ba363..6eec26b45a0c 100644
--- a/dev-java/xalan-serializer/xalan-serializer-2.7.3-r1.ebuild
+++ b/dev-java/xalan-serializer/xalan-serializer-2.7.3-r1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/xalan-j_${PV//./_}"
LICENSE="Apache-2.0"
SLOT="0"
-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"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/xalan/xalan-2.7.3-r2.ebuild b/dev-java/xalan/xalan-2.7.3-r2.ebuild
index 07aa960ae8a1..06f57ca47290 100644
--- a/dev-java/xalan/xalan-2.7.3-r2.ebuild
+++ b/dev-java/xalan/xalan-2.7.3-r2.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/xalan-j_${PV//./_}"
LICENSE="Apache-2.0"
SLOT="0"
-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"
# https://bugs.gentoo.org/936274 - for x86 we provide the precompiled java-cup
COMMON_DEPEND="
diff --git a/dev-java/xerces/xerces-2.12.2-r2.ebuild b/dev-java/xerces/xerces-2.12.2-r2.ebuild
index 5e5fe8b08d5e..4d432d460738 100644
--- a/dev-java/xerces/xerces-2.12.2-r2.ebuild
+++ b/dev-java/xerces/xerces-2.12.2-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/xerces/j/source/Xerces-J-src.${PV}.tar.gz
LICENSE="Apache-2.0"
SLOT="2"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
CP_DEPEND="
dev-java/xml-commons-external:1.4
diff --git a/dev-java/xerial-core/xerial-core-2.1.ebuild b/dev-java/xerial-core/xerial-core-2.1.ebuild
index 02f9cfd8c224..6f2c3b702a5b 100644
--- a/dev-java/xerial-core/xerial-core-2.1.ebuild
+++ b/dev-java/xerial-core/xerial-core-2.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/xerial/xerial-java/archive/${PV}.tar.gz -> ${P}.tar.
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/xml-commons-external/xml-commons-external-1.4.01-r2.ebuild b/dev-java/xml-commons-external/xml-commons-external-1.4.01-r2.ebuild
index bc26ab0507f9..ee1bcece646b 100644
--- a/dev-java/xml-commons-external/xml-commons-external-1.4.01-r2.ebuild
+++ b/dev-java/xml-commons-external/xml-commons-external-1.4.01-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://repo1.maven.org/maven2/${MY_PN}/${MY_PN}/${PV}/${MY_P}-sources.
LICENSE="Apache-2.0"
SLOT="1.4"
-KEYWORDS="amd64 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"
RDEPEND=">=virtual/jre-1.8:*"
DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/xml-commons-resolver/xml-commons-resolver-1.2-r3.ebuild b/dev-java/xml-commons-resolver/xml-commons-resolver-1.2-r3.ebuild
index d71ce4a0fca0..0e5698579273 100644
--- a/dev-java/xml-commons-resolver/xml-commons-resolver-1.2-r3.ebuild
+++ b/dev-java/xml-commons-resolver/xml-commons-resolver-1.2-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/xerces/xml-commons/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-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"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.9.ebuild b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.9.ebuild
index 2c0a190b489a..1fbf7d2b6de3 100644
--- a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.9.ebuild
+++ b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -18,7 +18,7 @@ S="${WORKDIR}/${P}"
LICENSE="Apache-2.0"
SLOT="2"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
CP_DEPEND="
dev-java/commons-io:1
diff --git a/dev-java/xmlunit-assertj/xmlunit-assertj-2.9.1.ebuild b/dev-java/xmlunit-assertj/xmlunit-assertj-2.9.1.ebuild
index b9599c67a994..40ce45e115f5 100644
--- a/dev-java/xmlunit-assertj/xmlunit-assertj-2.9.1.ebuild
+++ b/dev-java/xmlunit-assertj/xmlunit-assertj-2.9.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/xmlunit-${PV}-src/xmlunit-assertj"
LICENSE="Apache-2.0"
SLOT="2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
PROPERTIES="test_network"
RESTRICT="test"
diff --git a/dev-java/xmlunit-core/xmlunit-core-2.9.1.ebuild b/dev-java/xmlunit-core/xmlunit-core-2.9.1.ebuild
index 36aa4b624508..bae2207ea362 100644
--- a/dev-java/xmlunit-core/xmlunit-core-2.9.1.ebuild
+++ b/dev-java/xmlunit-core/xmlunit-core-2.9.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/xmlunit-${PV}-src/xmlunit-core"
LICENSE="Apache-2.0"
SLOT="2"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
CP_DEPEND="
dev-java/jaxb-api:2
diff --git a/dev-java/xmlunit-matchers/xmlunit-matchers-2.9.1.ebuild b/dev-java/xmlunit-matchers/xmlunit-matchers-2.9.1.ebuild
index 517b61dbed04..4f37d89a3a7b 100644
--- a/dev-java/xmlunit-matchers/xmlunit-matchers-2.9.1.ebuild
+++ b/dev-java/xmlunit-matchers/xmlunit-matchers-2.9.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/xmlunit-${PV}-src/xmlunit-matchers"
LICENSE="Apache-2.0"
SLOT="2"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
PROPERTIES="test_network"
RESTRICT="test"
diff --git a/dev-java/xmlunit/xmlunit-1.6-r2.ebuild b/dev-java/xmlunit/xmlunit-1.6-r2.ebuild
index d94ddaaab432..8142eb0346dc 100644
--- a/dev-java/xmlunit/xmlunit-1.6-r2.ebuild
+++ b/dev-java/xmlunit/xmlunit-1.6-r2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}"
LICENSE="BSD"
SLOT="1"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc64"
BDEPEND="app-arch/unzip"
CP_DEPEND="dev-java/junit:0"
diff --git a/dev-java/xmpbox/xmpbox-2.0.27.ebuild b/dev-java/xmpbox/xmpbox-2.0.27.ebuild
index e76bea27a1e5..d7d33f1ac5e1 100644
--- a/dev-java/xmpbox/xmpbox-2.0.27.ebuild
+++ b/dev-java/xmpbox/xmpbox-2.0.27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Skeleton command:
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/pdfbox/${PV}/pdfbox-${PV}-src.zip"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
# Common dependencies
# POM: pom.xml
diff --git a/dev-java/xom/xom-1.3.8-r1.ebuild b/dev-java/xom/xom-1.3.8-r1.ebuild
index c975a2eefab2..38151f3a2175 100644
--- a/dev-java/xom/xom-1.3.8-r1.ebuild
+++ b/dev-java/xom/xom-1.3.8-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/elharo/${PN}/releases/download/v${PV}/${P}-src.tar.g
LICENSE="LGPL-2"
SLOT="0"
-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"
# Bug #905215
PROPERTIES="test_network"
diff --git a/dev-java/xpp2/xpp2-2.1.10-r4.ebuild b/dev-java/xpp2/xpp2-2.1.10-r4.ebuild
index 2bc92ce9bbcc..9f1a440005be 100644
--- a/dev-java/xpp2/xpp2-2.1.10-r4.ebuild
+++ b/dev-java/xpp2/xpp2-2.1.10-r4.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="Apache-1.1 IBM"
SLOT="0"
-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"
# Some failures, partly because we haven't patched Xerces but probably
# also because this software is ancient. :(
diff --git a/dev-java/xpp3/xpp3-1.1.4c-r6.ebuild b/dev-java/xpp3/xpp3-1.1.4c-r6.ebuild
index 4779335ca756..05a147fc7f00 100644
--- a/dev-java/xpp3/xpp3-1.1.4c-r6.ebuild
+++ b/dev-java/xpp3/xpp3-1.1.4c-r6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar -> ${
LICENSE="Apache-1.1 IBM JDOM LGPL-2.1+"
SLOT="0"
-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"
# Restriction to java 1.8
# Otherwise jdk 11+ would fail to build javadoc:
diff --git a/dev-java/xsdlib/xsdlib-2022.7.ebuild b/dev-java/xsdlib/xsdlib-2022.7.ebuild
index 0fda7f0cac58..008ce11476f1 100644
--- a/dev-java/xsdlib/xsdlib-2022.7.ebuild
+++ b/dev-java/xsdlib/xsdlib-2022.7.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/xmlark/msv/archive/msv-${PV}.tar.gz"
LICENSE="BSD-1"
SLOT="0"
-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"
# Common dependencies
# POM: pom.xml
diff --git a/dev-java/xz-java/xz-java-1.10.ebuild b/dev-java/xz-java/xz-java-1.10.ebuild
index f75575a91713..5017fff07f60 100644
--- a/dev-java/xz-java/xz-java-1.10.ebuild
+++ b/dev-java/xz-java/xz-java-1.10.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
DEPEND=">=virtual/jdk-11:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/xz-java/xz-java-1.9-r2.ebuild b/dev-java/xz-java/xz-java-1.9-r2.ebuild
index 2826d64d7c78..fbd9a461e6ca 100644
--- a/dev-java/xz-java/xz-java-1.9-r2.ebuild
+++ b/dev-java/xz-java/xz-java-1.9-r2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND=">=virtual/jdk-11:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/zstd-jni/zstd-jni-1.5.2.5.ebuild b/dev-java/zstd-jni/zstd-jni-1.5.2.5.ebuild
index a1eb63566648..58d9185962be 100644
--- a/dev-java/zstd-jni/zstd-jni-1.5.2.5.ebuild
+++ b/dev-java/zstd-jni/zstd-jni-1.5.2.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/luben/zstd-jni/archive/c$(ver_rs 3 -).tar.gz -> ${P}
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
RDEPEND=">=virtual/jre-1.8:*"
DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/zxing-core/zxing-core-3.5.1.ebuild b/dev-java/zxing-core/zxing-core-3.5.1.ebuild
index 74066fc6c336..8fa97355fd36 100644
--- a/dev-java/zxing-core/zxing-core-3.5.1.ebuild
+++ b/dev-java/zxing-core/zxing-core-3.5.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/zxing/zxing/core"
SRC_URI="https://github.com/zxing/zxing/archive/zxing-${PV}.tar.gz"
LICENSE="Apache-2.0"
SLOT="3"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/zxing-javase/zxing-javase-3.5.1.ebuild b/dev-java/zxing-javase/zxing-javase-3.5.1.ebuild
index a6ef3763ad5f..0240cfbf5268 100644
--- a/dev-java/zxing-javase/zxing-javase-3.5.1.ebuild
+++ b/dev-java/zxing-javase/zxing-javase-3.5.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/zxing/zxing"
SRC_URI="https://github.com/zxing/zxing/archive/zxing-${PV}.tar.gz"
LICENSE="Apache-2.0"
SLOT="3"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64"
CP_DEPEND="
dev-java/jcommander:0