Adding metadata

59 files changed, 59 insertions, 59 deletions

diff --git a/dev-java/ant/ant-1.10.15.ebuild b/dev-java/ant/ant-1.10.15.ebuild
index 4b01dce5cd4b..92e9ebaa2874 100644
--- a/dev-java/ant/ant-1.10.15.ebuild
+++ b/dev-java/ant/ant-1.10.15.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/apache-${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~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-tool/antlr-tool-3.5.3-r1.ebuild b/dev-java/antlr-tool/antlr-tool-3.5.3-r1.ebuild
index 88a93668baf1..cc33ac1e7399 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 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos ~x64-solaris"
 
 CP_DEPEND="
 	~dev-java/antlr-runtime-${PV}:${SLOT}
diff --git a/dev-java/antlr-tool/antlr-tool-4.13.2-r1.ebuild b/dev-java/antlr-tool/antlr-tool-4.13.2-r1.ebuild
index 99b51502ade0..8e73341db74c 100644
--- a/dev-java/antlr-tool/antlr-tool-4.13.2-r1.ebuild
+++ b/dev-java/antlr-tool/antlr-tool-4.13.2-r1.ebuild
@@ -27,7 +27,7 @@ S="${WORKDIR}/${MY_PN}4-${PV}"
 
 LICENSE="BSD"
 SLOT="4"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos ~x64-solaris"
 
 CP_DEPEND="
 	~dev-java/antlr-runtime-${PV}:${SLOT}
diff --git a/dev-java/antlr/antlr-2.7.7-r10.ebuild b/dev-java/antlr/antlr-2.7.7-r10.ebuild
index 86a3333fddf1..c8caf6ed429d 100644
--- a/dev-java/antlr/antlr-2.7.7-r10.ebuild
+++ b/dev-java/antlr/antlr-2.7.7-r10.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos ~x64-solaris"
 
 DEPEND=">=virtual/jdk-1.8:*"
 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 16052030afcf..d7d6da91d945 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 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~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 c8b458f4acef..c61d1440241e 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 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos ~x64-solaris"
 
 CP_DEPEND="
 	~dev-java/antlr-runtime-${PV}:${SLOT}
diff --git a/dev-java/antlr/antlr-4.13.2.ebuild b/dev-java/antlr/antlr-4.13.2.ebuild
index 7a19da2ad21b..79118c3ebbf1 100644
--- a/dev-java/antlr/antlr-4.13.2.ebuild
+++ b/dev-java/antlr/antlr-4.13.2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}4-${PV}"
 
 LICENSE="BSD"
 SLOT="4"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos ~x64-solaris"
 
 CP_DEPEND="
 	~dev-java/antlr-runtime-${PV}:${SLOT}
diff --git a/dev-java/aopalliance/aopalliance-1.0-r3.ebuild b/dev-java/aopalliance/aopalliance-1.0-r3.ebuild
index 8cd8ff2e5ac9..f9dd44793a5d 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 ~amd64-linux"
+KEYWORDS="amd64 arm64 ppc64"
 
 IUSE=""
 
diff --git a/dev-java/bcel/bcel-6.10.0-r2.ebuild b/dev-java/bcel/bcel-6.10.0-r2.ebuild
index b7088b3d6a80..bfe622437f00 100644
--- a/dev-java/bcel/bcel-6.10.0-r2.ebuild
+++ b/dev-java/bcel/bcel-6.10.0-r2.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~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/bsf/bsf-2.4.0-r7.ebuild b/dev-java/bsf/bsf-2.4.0-r7.ebuild
index 778447e72226..9fb04c64b5c5 100644
--- a/dev-java/bsf/bsf-2.4.0-r7.ebuild
+++ b/dev-java/bsf/bsf-2.4.0-r7.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="Apache-2.0"
 SLOT="2.3"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~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-r2.ebuild b/dev-java/bsh/bsh-2.1.1-r2.ebuild
index a4b22492e299..d61fba244315 100644
--- a/dev-java/bsh/bsh-2.1.1-r2.ebuild
+++ b/dev-java/bsh/bsh-2.1.1-r2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/beanshell-${PV}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ppc64"
 
 # There was 1 failure:
 # 1) do_not_access_non_open_methods(bsh.Java_9_Test)
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 5878283bc742..7ca5ac2ae3bd 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 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc64"
 
 CP_DEPEND="
 	dev-java/log4j-12-api:2
diff --git a/dev-java/commons-beanutils/commons-beanutils-1.11.0.ebuild b/dev-java/commons-beanutils/commons-beanutils-1.11.0.ebuild
index 4e658eb94ee9..f50330171213 100644
--- a/dev-java/commons-beanutils/commons-beanutils-1.11.0.ebuild
+++ b/dev-java/commons-beanutils/commons-beanutils-1.11.0.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${P}-src"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos"
 IUSE="log4j"
 
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-ggregory )"
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 5ddf7fbbcc1b..bbced5733489 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 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm64 ppc64 ~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.10.0.ebuild b/dev-java/commons-cli/commons-cli-1.10.0.ebuild
index 963892ca608e..771cbc819ff2 100644
--- a/dev-java/commons-cli/commons-cli-1.10.0.ebuild
+++ b/dev-java/commons-cli/commons-cli-1.10.0.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${P}-src"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos"
 
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-ggregory )"
 
diff --git a/dev-java/commons-codec/commons-codec-1.19.0.ebuild b/dev-java/commons-codec/commons-codec-1.19.0.ebuild
index dbc2d8b3042c..7f6f92b508b1 100644
--- a/dev-java/commons-codec/commons-codec-1.19.0.ebuild
+++ b/dev-java/commons-codec/commons-codec-1.19.0.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ppc64"
 
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-ggregory )"
 
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 626e8277d402..00b6b71dfaa6 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 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm64 ppc64 ~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-httpclient/commons-httpclient-3.1-r3.ebuild b/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild
index 434aab011045..4aebdc406066 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 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ppc64"
 
 # Tests run: 2036,  Failures: 91
 RESTRICT="test"
diff --git a/dev-java/commons-io/commons-io-2.18.0.ebuild b/dev-java/commons-io/commons-io-2.18.0.ebuild
index 07616c52470e..791d91de614d 100644
--- a/dev-java/commons-io/commons-io-2.18.0.ebuild
+++ b/dev-java/commons-io/commons-io-2.18.0.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux"
+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-io/commons-io-2.20.0.ebuild b/dev-java/commons-io/commons-io-2.20.0.ebuild
index 516e89317f6a..9614848ccefe 100644
--- a/dev-java/commons-io/commons-io-2.20.0.ebuild
+++ b/dev-java/commons-io/commons-io-2.20.0.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ppc64"
 
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-ggregory )"
 
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 f673a72e60f8..3995719dda75 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 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~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-lang/commons-lang-3.19.0.ebuild b/dev-java/commons-lang/commons-lang-3.19.0.ebuild
index 95f276cc3963..aba206a984f4 100644
--- a/dev-java/commons-lang/commons-lang-3.19.0.ebuild
+++ b/dev-java/commons-lang/commons-lang-3.19.0.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}3-${PV}-src"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~x64-solaris"
 
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-ggregory )"
 
diff --git a/dev-java/commons-logging/commons-logging-1.3.5.ebuild b/dev-java/commons-logging/commons-logging-1.3.5.ebuild
index 1a7860dd0658..a99279c04f4c 100644
--- a/dev-java/commons-logging/commons-logging-1.3.5.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.3.5.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos ~x64-solaris"
 IUSE="log4j"
 
 # src/test/java/org/apache/commons/logging/tccl/logfactory/AdaptersTcclTestCase.java:26:
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 7f37b0cdfbc0..9681ddaa9e17 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 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos ~x64-solaris"
 
 JAVA_AUTOMATIC_MODULE_NAME="commons.math3"
diff --git a/dev-java/commons-net/commons-net-3.12.0.ebuild b/dev-java/commons-net/commons-net-3.12.0.ebuild
index 86a0258cc73f..28fc2ae60392 100644
--- a/dev-java/commons-net/commons-net-3.12.0.ebuild
+++ b/dev-java/commons-net/commons-net-3.12.0.ebuild
@@ -24,7 +24,7 @@ S="${WORKDIR}/${P}-src"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos ~x64-solaris"
 
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-ggregory )"
 
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 f83938ac5b4d..a334d1d7e660 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 ppc64 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc64"
 
 CP_DEPEND="
 	>=dev-java/ant-1.10.14-r3: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 f04cdbf18d65..50e7df50bd3a 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 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm64 ppc64 ~x64-macos ~x64-solaris"
 
 CDEPEND="dev-java/java-getopt:1"
 
diff --git a/dev-java/hamcrest-core/hamcrest-core-1.1-r5.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.1-r5.ebuild
index 4dacae9bd323..72eee6edbe84 100644
--- a/dev-java/hamcrest-core/hamcrest-core-1.1-r5.ebuild
+++ b/dev-java/hamcrest-core/hamcrest-core-1.1-r5.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/JavaHamcrest-${MY_PN}-java-${PV}"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~x64-solaris"
 
 DEPEND="
 	>=virtual/jdk-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 3e2838dfdbaa..72a3837fca5f 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 ~amd64-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos ~x64-solaris"
 
 DEPEND=">=virtual/jdk-1.8:*"
 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 67b897129b08..d1810571aaca 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 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~x64-solaris"
 
 CP_DEPEND=">=dev-java/ant-1.10.14-r3:0"
 DEPEND="${CP_DEPEND}
diff --git a/dev-java/jackcess/jackcess-4.0.7.ebuild b/dev-java/jackcess/jackcess-4.0.7.ebuild
index d5750f410b6c..abd0a20315a6 100644
--- a/dev-java/jackcess/jackcess-4.0.7.ebuild
+++ b/dev-java/jackcess/jackcess-4.0.7.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ppc64"
 
 CP_DEPEND="
 	>=dev-java/commons-lang-3.17:3.6
diff --git a/dev-java/jakarta-oro/jakarta-oro-2.0.8-r6.ebuild b/dev-java/jakarta-oro/jakarta-oro-2.0.8-r6.ebuild
index b29d5409c34b..fcd573521886 100644
--- a/dev-java/jakarta-oro/jakarta-oro-2.0.8-r6.ebuild
+++ b/dev-java/jakarta-oro/jakarta-oro-2.0.8-r6.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="Apache-1.1"
 SLOT="2.0"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~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 40b7666e2294..9e856e8728b0 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 @@ S="${WORKDIR}/${P}"
 
 LICENSE="Apache-1.1"
 SLOT="${PV}"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ppc64"
 
 DEPEND="<virtual/jdk-26:*" # bug #965859
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/java-config/java-config-2.3.4.ebuild b/dev-java/java-config/java-config-2.3.4.ebuild
index ed259cf8b3cd..eb84625effe4 100644
--- a/dev-java/java-config/java-config-2.3.4.ebuild
+++ b/dev-java/java-config/java-config-2.3.4.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/java-config.git"
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86 ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="Java environment configuration query tool"
diff --git a/dev-java/java-config/java-config-9999.ebuild b/dev-java/java-config/java-config-9999.ebuild
index 51dc59aba59a..ca0de6999c78 100644
--- a/dev-java/java-config/java-config-9999.ebuild
+++ b/dev-java/java-config/java-config-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/java-config.git"
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="Java environment configuration query tool"
diff --git a/dev-java/java-getopt/java-getopt-1.0.14-r3.ebuild b/dev-java/java-getopt/java-getopt-1.0.14-r3.ebuild
index e625aef044cc..84320db162b4 100644
--- a/dev-java/java-getopt/java-getopt-1.0.14-r3.ebuild
+++ b/dev-java/java-getopt/java-getopt-1.0.14-r3.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 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm64 ppc64 ~x64-macos ~x64-solaris"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/javacup/javacup-11b_p20160615-r2.ebuild b/dev-java/javacup/javacup-11b_p20160615-r2.ebuild
index 63e1a59fb52f..a5cde5ef488b 100644
--- a/dev-java/javacup/javacup-11b_p20160615-r2.ebuild
+++ b/dev-java/javacup/javacup-11b_p20160615-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www2.cs.tum.edu/projects/cup/releases/java-cup-src-${PV/_p/-}.t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos ~x64-solaris"
 IUSE="ant-task"
 
 DEPEND="
diff --git a/dev-java/javassist/javassist-3.30.2-r1.ebuild b/dev-java/javassist/javassist-3.30.2-r1.ebuild
index 1c6b68352db9..9af856d93ad5 100644
--- a/dev-java/javassist/javassist-3.30.2-r1.ebuild
+++ b/dev-java/javassist/javassist-3.30.2-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-rel_${PV//./_}_ga"
 
 LICENSE="Apache-2.0 LGPL-2.1 MPL-1.1"
 SLOT="3"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ppc64"
 
 # src/main/javassist/tools/rmi/ObjectImporter.java:99: error: package java.applet does not exist
 #     public ObjectImporter(@SuppressWarnings("deprecation") java.applet.Applet applet) {
diff --git a/dev-java/javatoolkit/javatoolkit-0.6.10.ebuild b/dev-java/javatoolkit/javatoolkit-0.6.10.ebuild
index c74cdda0379f..0dc132a85bea 100644
--- a/dev-java/javatoolkit/javatoolkit-0.6.10.ebuild
+++ b/dev-java/javatoolkit/javatoolkit-0.6.10.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 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~sparc ~x64-macos ~x64-solaris"
 
 distutils_enable_tests unittest
 
diff --git a/dev-java/javax-inject/javax-inject-1-r4.ebuild b/dev-java/javax-inject/javax-inject-1-r4.ebuild
index 8331f33005c7..ffea8938a449 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 ~amd64-linux"
+KEYWORDS="amd64 arm64 ppc64"
 
 RDEPEND=">=virtual/jre-1.8:*"
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/jdepend/jdepend-2.10-r1.ebuild b/dev-java/jdepend/jdepend-2.10-r1.ebuild
index ee2e7a366996..c4e81e5e8f58 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 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos ~x64-solaris"
 RESTRICT="test" #921147
 
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/jmock/jmock-1.2.0-r3.ebuild b/dev-java/jmock/jmock-1.2.0-r3.ebuild
index 1e1907f70851..e4ecd04cb34e 100644
--- a/dev-java/jmock/jmock-1.2.0-r3.ebuild
+++ b/dev-java/jmock/jmock-1.2.0-r3.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="BSD"
 SLOT="1.0"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos"
 
 CP_DEPEND="dev-java/junit:0"
 
diff --git a/dev-java/joda-time/joda-time-2.13.0.ebuild b/dev-java/joda-time/joda-time-2.13.0.ebuild
index 68aec550a687..953b382a9f71 100644
--- a/dev-java/joda-time/joda-time-2.13.0.ebuild
+++ b/dev-java/joda-time/joda-time-2.13.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ppc64"
 
 DEPEND="
 	dev-java/joda-convert:0
diff --git a/dev-java/junit/junit-3.8.2-r2.ebuild b/dev-java/junit/junit-3.8.2-r2.ebuild
index 0c211b2600ee..0c4baf46e39c 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 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~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 58e6bbc34ee0..c8bb1759613c 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 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos ~x64-solaris"
 
 CP_DEPEND="dev-java/hamcrest-core:1.3"
 DEPEND="${CP_DEPEND}
diff --git a/dev-java/jzlib/jzlib-1.1.3-r3.ebuild b/dev-java/jzlib/jzlib-1.1.3-r3.ebuild
index cff504d9eebc..5bec9d74d0d7 100644
--- a/dev-java/jzlib/jzlib-1.1.3-r3.ebuild
+++ b/dev-java/jzlib/jzlib-1.1.3-r3.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos ~x64-solaris"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/relaxng-datatype/relaxng-datatype-20020414.ebuild b/dev-java/relaxng-datatype/relaxng-datatype-20020414.ebuild
index fdb19fa6e8e7..c216e4e62d98 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 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos ~x64-solaris"
 LICENSE="BSD"
 SLOT="0"
 
diff --git a/dev-java/sax/sax-2.2.1-r5.ebuild b/dev-java/sax/sax-2.2.1-r5.ebuild
index 1e399bafab12..5264c5d488a9 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 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc64"
 
 DEPEND="
 	>=virtual/jdk-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 217db7a0df22..8a5ce4f447f5 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 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~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 cbdea375ff50..3d78efe68787 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 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~x64-solaris"
 
 CP_DEPEND="
 	dev-java/antlr-runtime:3.5
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 5afbc0580e61..16503dd35a8d 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 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos ~x64-solaris"
 
 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 cfde20ba2931..b11848671f3d 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 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos ~x64-solaris"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/xalan/xalan-2.7.3-r3.ebuild b/dev-java/xalan/xalan-2.7.3-r3.ebuild
index 95c72882eb9f..c1da9ccdc5cf 100644
--- a/dev-java/xalan/xalan-2.7.3-r3.ebuild
+++ b/dev-java/xalan/xalan-2.7.3-r3.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/xalan-j_${PV//./_}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos ~x64-solaris"
 
 # https://bugs.gentoo.org/936274 - for x86 we provide the precompiled java-cup
 COMMON_DEPEND="
diff --git a/dev-java/xml-commons-external/xml-commons-external-1.4.01-r3.ebuild b/dev-java/xml-commons-external/xml-commons-external-1.4.01-r3.ebuild
index 9b715ef5f9f6..c6038253e387 100644
--- a/dev-java/xml-commons-external/xml-commons-external-1.4.01-r3.ebuild
+++ b/dev-java/xml-commons-external/xml-commons-external-1.4.01-r3.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 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos ~x64-solaris"
 
 BDEPEND="source? ( app-arch/zip )"
 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 12a3bc7f746f..882f6332a72b 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 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos ~x64-solaris"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/xom/xom-1.3.9.ebuild b/dev-java/xom/xom-1.3.9.ebuild
index ca9fbc5f328b..bdee7ef324e6 100644
--- a/dev-java/xom/xom-1.3.9.ebuild
+++ b/dev-java/xom/xom-1.3.9.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 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos"
 
 # Bug #905215 Without 'test_network',there are 14 test failures like:
 #java.net.UnknownHostException: raw.githubusercontent.com
diff --git a/dev-java/xpp2/xpp2-2.1.10-r4.ebuild b/dev-java/xpp2/xpp2-2.1.10-r4.ebuild
index 71cfb086458c..79cda029d924 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 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~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 5e61a2f8604a..e1a00ce2c1b6 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 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~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-r1.ebuild b/dev-java/xsdlib/xsdlib-2022.7-r1.ebuild
index 7124d953a062..9f481aaee6d7 100644
--- a/dev-java/xsdlib/xsdlib-2022.7-r1.ebuild
+++ b/dev-java/xsdlib/xsdlib-2022.7-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/msv-msv-${PV}/xsdlib"
 
 LICENSE="BSD-1"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos ~x64-solaris"
 
 CP_DEPEND="dev-java/relaxng-datatype:0"