diff --git a/app-crypt/debian-archive-keyring/debian-archive-keyring-2021.1.1.ebuild b/app-crypt/debian-archive-keyring/debian-archive-keyring-2021.1.1.ebuild
index bbf259a150b64..547d41918d4ed 100644
--- a/app-crypt/debian-archive-keyring/debian-archive-keyring-2021.1.1.ebuild
+++ b/app-crypt/debian-archive-keyring/debian-archive-keyring-2021.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}_all.deb"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
IUSE=""
S="${WORKDIR}"
diff --git a/app-portage/gentoolkit/gentoolkit-0.6.1-r3.ebuild b/app-portage/gentoolkit/gentoolkit-0.6.1-r3.ebuild
index a42f4f4243a59..f91686bd22d56 100644
--- a/app-portage/gentoolkit/gentoolkit-0.6.1-r3.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.6.1-r3.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} = 9999* ]]; then
inherit git-r3
else
SRC_URI="https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="Collection of administration scripts for Gentoo"
diff --git a/app-portage/gentoolkit/gentoolkit-9999.ebuild b/app-portage/gentoolkit/gentoolkit-9999.ebuild
index c8ce2d30696cc..80d98e2e07d7e 100644
--- a/app-portage/gentoolkit/gentoolkit-9999.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-9999.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
DISTUTILS_USE_SETUPTOOLS=no
PYTHON_COMPAT=( python3_{8..11} pypy3 )
@@ -14,7 +14,7 @@ if [[ ${PV} = 9999* ]]; then
inherit git-r3
else
SRC_URI="https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="Collection of administration scripts for Gentoo"
@@ -23,6 +23,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools"
LICENSE="GPL-2"
SLOT="0"
+# Need newer Portage for XML fix, bug #857537
DEPEND="
>=sys-apps/portage-3.0.32[${PYTHON_USEDEP}]"
RDEPEND="${DEPEND}
diff --git a/app-portage/gentoolkit/metadata.xml b/app-portage/gentoolkit/metadata.xml
index f2cdb158d95a6..b637fc87273c5 100644
--- a/app-portage/gentoolkit/metadata.xml
+++ b/app-portage/gentoolkit/metadata.xml
@@ -5,6 +5,7 @@
tools-portage@gentoo.org
Gentoo Portage tools team
+
Gentoolkit is a collection of useful adminstration scripts particular to
the Gentoo Linux distribution. It contains rough drafts and
diff --git a/dev-java/felix-main/felix-main-7.0.5-r1.ebuild b/dev-java/felix-main/felix-main-7.0.5-r1.ebuild
index bdd2226d3731b..57db6f06bc229 100644
--- a/dev-java/felix-main/felix-main-7.0.5-r1.ebuild
+++ b/dev-java/felix-main/felix-main-7.0.5-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://apache/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc64"
# Common dependencies
# POM: pom.xml
diff --git a/dev-java/greenmail/greenmail-2.0.0_alpha2.ebuild b/dev-java/greenmail/greenmail-2.0.0_alpha2.ebuild
index cf19ce7e617a6..7f4684b7fd89d 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 ~arm arm64 ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc64"
# Common dependencies
# POM: pom.xml
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 ab3341a5a764e..3335992b15cd7 100644
--- a/dev-java/jakarta-mail/jakarta-mail-2.0.1.ebuild
+++ b/dev-java/jakarta-mail/jakarta-mail-2.0.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/jakartaee/mail-api/archive/${PV}.tar.gz -> ${P}.tar.
LICENSE="EPL-1.0 EPL-2.0 GPL-2-with-classpath-exception"
SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc64"
# Common dependencies
# POM: pom.xml
diff --git a/dev-java/logback-classic/logback-classic-1.4.1.ebuild b/dev-java/logback-classic/logback-classic-1.4.1.ebuild
index c75f3b96c4483..5538d5f55cf67 100644
--- a/dev-java/logback-classic/logback-classic-1.4.1.ebuild
+++ b/dev-java/logback-classic/logback-classic-1.4.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/qos-ch/logback/archive/v_${PV}.tar.gz -> logback-${P
LICENSE="EPL-1.0 LGPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc64"
# Common dependencies
# POM: ${PN}/pom.xml
diff --git a/dev-java/logback-core/logback-core-1.4.1.ebuild b/dev-java/logback-core/logback-core-1.4.1.ebuild
index 4437b0fb3bb66..7a73216f0f414 100644
--- a/dev-java/logback-core/logback-core-1.4.1.ebuild
+++ b/dev-java/logback-core/logback-core-1.4.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/qos-ch/logback/archive/v_${PV}.tar.gz -> logback-${P
LICENSE="EPL-1.0 LGPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc64"
# Common dependencies
# POM: ${PN}/pom.xml
diff --git a/dev-libs/libebml/libebml-1.4.4.ebuild b/dev-libs/libebml/libebml-1.4.4.ebuild
index c97ad557c8fd5..8f39909f8cbcf 100644
--- a/dev-libs/libebml/libebml-1.4.4.ebuild
+++ b/dev-libs/libebml/libebml-1.4.4.ebuild
@@ -11,4 +11,4 @@ SRC_URI="https://dl.matroska.org/downloads/${PN}/${P}.tar.xz"
LICENSE="LGPL-2.1"
SLOT="0/5" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
diff --git a/net-dns/avahi/avahi-0.8-r7.ebuild b/net-dns/avahi/avahi-0.8-r7.ebuild
index ed36d9edfc0c4..b0c57de4e8b74 100644
--- a/net-dns/avahi/avahi-0.8-r7.ebuild
+++ b/net-dns/avahi/avahi-0.8-r7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/lathiat/avahi/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
IUSE="autoipd bookmarks +dbus doc gdbm gtk howl-compat +introspection ipv6 mdnsresponder-compat mono nls python qt5 selinux systemd test"
REQUIRED_USE="
diff --git a/net-misc/bsdwhois/bsdwhois-1.43.2.1-r1.ebuild b/net-misc/bsdwhois/bsdwhois-1.43.2.1-r1.ebuild
index 2361c19c70eb2..785627cad80e2 100644
--- a/net-misc/bsdwhois/bsdwhois-1.43.2.1-r1.ebuild
+++ b/net-misc/bsdwhois/bsdwhois-1.43.2.1-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://utenti.gufi.org/~drizzt/codes/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc x86 ~amd64-linux ~x86-linux"
PATCHES=(
"${FILESDIR}/${PN}-1.43.2.1-musl-cdefs.patch"
diff --git a/net-misc/radvd/radvd-2.19-r4.ebuild b/net-misc/radvd/radvd-2.19-r4.ebuild
index 856b6bce07267..a568472d4f89e 100644
--- a/net-misc/radvd/radvd-2.19-r4.ebuild
+++ b/net-misc/radvd/radvd-2.19-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://v6web.litech.org/radvd/dist/${P}.tar.xz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv sparc x86"
IUSE="selinux test"
RESTRICT="!test? ( test )"
diff --git a/net-print/cups/cups-2.4.2-r6.ebuild b/net-print/cups/cups-2.4.2-r6.ebuild
index c555f7fcb2f20..8543aa3e34958 100644
--- a/net-print/cups/cups-2.4.2-r6.ebuild
+++ b/net-print/cups/cups-2.4.2-r6.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]] ; then
else
SRC_URI="https://github.com/OpenPrinting/cups/releases/download/v${MY_PV}/cups-${MY_PV}-source.tar.gz"
if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
fi
fi
diff --git a/sys-apps/irqbalance/irqbalance-1.9.2.ebuild b/sys-apps/irqbalance/irqbalance-1.9.2.ebuild
index 1edb1533cf88c..a6b680e620306 100644
--- a/sys-apps/irqbalance/irqbalance-1.9.2.ebuild
+++ b/sys-apps/irqbalance/irqbalance-1.9.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Irqbalance/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 x86"
IUSE="caps +numa systemd selinux tui"
# Hangs
RESTRICT="test"
diff --git a/sys-kernel/dracut/dracut-057-r2.ebuild b/sys-kernel/dracut/dracut-057-r2.ebuild
index 924d4968c3ad8..5a6ec27fcb438 100644
--- a/sys-kernel/dracut/dracut-057-r2.ebuild
+++ b/sys-kernel/dracut/dracut-057-r2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then
EGIT_REPO_URI="https://github.com/dracutdevs/dracut"
else
if [[ "${PV}" != *_rc* ]]; then
- KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
fi
SRC_URI="https://github.com/dracutdevs/dracut/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
fi