summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-admin/sysstat/sysstat-12.6.2.ebuild2
-rw-r--r--app-crypt/seahorse/seahorse-43.0-r1.ebuild2
-rw-r--r--app-editors/ghex/ghex-43.1.ebuild2
-rw-r--r--app-misc/geoclue/geoclue-2.7.0.ebuild2
-rw-r--r--app-misc/gnote/gnote-43.1.ebuild2
-rw-r--r--app-text/enchant/enchant-2.3.4.ebuild2
-rw-r--r--app-text/iso-codes/iso-codes-4.13.0.ebuild2
-rw-r--r--dev-lang/vala/vala-0.56.4.ebuild2
-rw-r--r--dev-libs/ayatana-ido/ayatana-ido-0.9.3.ebuild2
-rw-r--r--dev-libs/gjs/gjs-1.74.2.ebuild2
-rw-r--r--dev-libs/glib/glib-2.74.6.ebuild2
-rw-r--r--dev-libs/libayatana-appindicator/libayatana-appindicator-0.5.92.ebuild2
-rw-r--r--dev-libs/libayatana-indicator/libayatana-indicator-0.9.3.ebuild2
-rw-r--r--dev-libs/libgusb/libgusb-0.4.5.ebuild2
-rw-r--r--dev-libs/template-glib/template-glib-3.36.1.ebuild2
-rw-r--r--dev-libs/vala-common/vala-common-0.56.4.ebuild2
-rw-r--r--dev-ml/cudf/cudf-0.10.ebuild2
-rw-r--r--dev-ml/dose3/dose3-7.0.0.ebuild2
-rw-r--r--dev-ml/labltk/labltk-8.06.12-r2.ebuild2
-rw-r--r--dev-ml/ocaml-expat/ocaml-expat-1.3.0.ebuild2
-rw-r--r--dev-util/gdbus-codegen/gdbus-codegen-2.74.6.ebuild2
-rw-r--r--dev-util/glib-utils/glib-utils-2.74.6.ebuild2
-rw-r--r--dev-util/gnome-builder/gnome-builder-43.6.ebuild2
-rw-r--r--dev-util/umockdev/umockdev-0.17.16.ebuild2
-rw-r--r--gnome-base/gnome-control-center/gnome-control-center-43.4.1.ebuild2
-rw-r--r--gnome-base/gnome-desktop/gnome-desktop-43.2-r300.ebuild2
-rw-r--r--gnome-base/gnome-desktop/gnome-desktop-43.2-r400.ebuild2
-rw-r--r--gnome-base/gnome-shell/gnome-shell-43.3.ebuild2
-rw-r--r--gnome-extra/evolution-data-server/evolution-data-server-3.46.4.ebuild2
-rw-r--r--gnome-extra/evolution-ews/evolution-ews-3.46.4.ebuild2
-rw-r--r--gnome-extra/gnome-boxes/gnome-boxes-43.3.ebuild2
-rw-r--r--gnome-extra/gnome-contacts/gnome-contacts-43.1.ebuild2
-rw-r--r--gnome-extra/nm-applet/nm-applet-1.30.0-r2.ebuild2
-rw-r--r--gnome-extra/yelp/yelp-42.2-r1.ebuild2
-rw-r--r--gnome-extra/zenity/zenity-3.44.0.ebuild2
-rw-r--r--gui-libs/libadwaita/libadwaita-1.2.3.ebuild2
-rw-r--r--gui-libs/libhandy/libhandy-1.8.2.ebuild2
-rw-r--r--gui-libs/libwpe/libwpe-1.14.1.ebuild2
-rw-r--r--gui-libs/vte-common/vte-common-0.70.3.ebuild2
-rw-r--r--gui-libs/vte/vte-0.70.3.ebuild2
-rw-r--r--gui-libs/wpebackend-fdo/wpebackend-fdo-1.14.1.ebuild2
-rw-r--r--mail-client/evolution/evolution-3.46.4.ebuild2
-rw-r--r--media-video/pipewire/pipewire-0.3.66-r1.ebuild2
-rw-r--r--net-libs/libcloudproviders/libcloudproviders-0.3.1.ebuild2
-rw-r--r--net-libs/rest/rest-0.9.1-r1.ebuild2
-rw-r--r--net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild2
-rw-r--r--net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild2
-rw-r--r--net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild2
-rw-r--r--net-misc/networkmanager/networkmanager-1.42.2.ebuild2
-rw-r--r--net-misc/rygel/rygel-0.42.1.ebuild2
-rw-r--r--net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.0.ebuild2
-rw-r--r--net-misc/tigervnc/tigervnc-1.13.0.ebuild2
-rw-r--r--sci-geosciences/gnome-maps/gnome-maps-43.4.ebuild2
-rw-r--r--sys-block/gparted/gparted-1.5.0.ebuild2
-rw-r--r--www-client/epiphany/epiphany-43.1.ebuild2
-rw-r--r--x11-libs/goffice/goffice-0.10.55.ebuild2
-rw-r--r--x11-libs/gtk+/gtk+-3.24.37.ebuild2
-rw-r--r--x11-libs/libnotify/libnotify-0.8.2.ebuild2
-rw-r--r--x11-libs/pango/pango-1.50.13.ebuild2
-rw-r--r--x11-libs/vte/vte-0.70.3.ebuild2
-rw-r--r--x11-terms/gnome-terminal/gnome-terminal-3.46.8.ebuild2
-rw-r--r--x11-themes/gnome-backgrounds/gnome-backgrounds-43.1.ebuild2
-rw-r--r--x11-wm/mutter/mutter-43.3.ebuild2
63 files changed, 63 insertions, 63 deletions
diff --git a/app-admin/sysstat/sysstat-12.6.2.ebuild b/app-admin/sysstat/sysstat-12.6.2.ebuild
index a8bb5747ab3e..679307b89766 100644
--- a/app-admin/sysstat/sysstat-12.6.2.ebuild
+++ b/app-admin/sysstat/sysstat-12.6.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="dcron debug nls lm-sensors lto selinux systemd"
BDEPEND="
diff --git a/app-crypt/seahorse/seahorse-43.0-r1.ebuild b/app-crypt/seahorse/seahorse-43.0-r1.ebuild
index 496566b5b5de..876b56992f86 100644
--- a/app-crypt/seahorse/seahorse-43.0-r1.ebuild
+++ b/app-crypt/seahorse/seahorse-43.0-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
LICENSE="GPL-2+ FDL-1.1+"
SLOT="0"
IUSE="ldap zeroconf"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
RDEPEND="
>=dev-libs/glib-2.66:2
diff --git a/app-editors/ghex/ghex-43.1.ebuild b/app-editors/ghex/ghex-43.1.ebuild
index 7d5199d0588b..5bc774b4b945 100644
--- a/app-editors/ghex/ghex-43.1.ebuild
+++ b/app-editors/ghex/ghex-43.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/ghex.git"
SRC_URI=""
else
- KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="amd64 ~arm ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
fi
LICENSE="GPL-2+ FDL-1.1+"
diff --git a/app-misc/geoclue/geoclue-2.7.0.ebuild b/app-misc/geoclue/geoclue-2.7.0.ebuild
index c78a5adb1b7a..475b40d05d1c 100644
--- a/app-misc/geoclue/geoclue-2.7.0.ebuild
+++ b/app-misc/geoclue/geoclue-2.7.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gitlab.freedesktop.org/geoclue/${PN}/-/archive/${PV}/${P}.tar.b
LICENSE="LGPL-2.1+ GPL-2+"
SLOT="2.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86"
IUSE="+introspection gtk-doc modemmanager vala zeroconf"
REQUIRED_USE="vala? ( introspection )"
diff --git a/app-misc/gnote/gnote-43.1.ebuild b/app-misc/gnote/gnote-43.1.ebuild
index 5372712a5529..de957e621661 100644
--- a/app-misc/gnote/gnote-43.1.ebuild
+++ b/app-misc/gnote/gnote-43.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gnote"
LICENSE="GPL-3+ FDL-1.1"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/app-text/enchant/enchant-2.3.4.ebuild b/app-text/enchant/enchant-2.3.4.ebuild
index 3c71c0775e63..cfb8b308e119 100644
--- a/app-text/enchant/enchant-2.3.4.ebuild
+++ b/app-text/enchant/enchant-2.3.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz
LICENSE="LGPL-2.1+"
SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
IUSE="aspell +hunspell nuspell test voikko"
RESTRICT="!test? ( test )"
diff --git a/app-text/iso-codes/iso-codes-4.13.0.ebuild b/app-text/iso-codes/iso-codes-4.13.0.ebuild
index 2cb3270120b4..c36acb0c8cc2 100644
--- a/app-text/iso-codes/iso-codes-4.13.0.ebuild
+++ b/app-text/iso-codes/iso-codes-4.13.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://salsa.debian.org/${PN}-team/${PN}/-/archive/v${PV}/${PN}-v${PV}
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
BDEPEND="${PYTHON_DEPS}
sys-devel/gettext
diff --git a/dev-lang/vala/vala-0.56.4.ebuild b/dev-lang/vala/vala-0.56.4.ebuild
index 70072f140f0d..f756dde60076 100644
--- a/dev-lang/vala/vala-0.56.4.ebuild
+++ b/dev-lang/vala/vala-0.56.4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala https://gitlab.gnome.org/GNOME/va
LICENSE="LGPL-2.1+"
SLOT="0.56"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux"
IUSE="test valadoc"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/ayatana-ido/ayatana-ido-0.9.3.ebuild b/dev-libs/ayatana-ido/ayatana-ido-0.9.3.ebuild
index 055837810486..e9af4f907a64 100644
--- a/dev-libs/ayatana-ido/ayatana-ido-0.9.3.ebuild
+++ b/dev-libs/ayatana-ido/ayatana-ido-0.9.3.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
IUSE="test"
RESTRICT="!test? ( test )"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
RDEPEND="
>=dev-libs/glib-2.58:2
diff --git a/dev-libs/gjs/gjs-1.74.2.ebuild b/dev-libs/gjs/gjs-1.74.2.ebuild
index 3c494fc4f0f8..c86be1b458fa 100644
--- a/dev-libs/gjs/gjs-1.74.2.ebuild
+++ b/dev-libs/gjs/gjs-1.74.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gjs https://gitlab.gnome.org/GNOME/gjs
LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
SLOT="0"
IUSE="+cairo examples readline sysprof test"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv x86"
RESTRICT="!test? ( test )"
RDEPEND="
diff --git a/dev-libs/glib/glib-2.74.6.ebuild b/dev-libs/glib/glib-2.74.6.ebuild
index 7924f656d5e2..0d798bedb57b 100644
--- a/dev-libs/glib/glib-2.74.6.ebuild
+++ b/dev-libs/glib/glib-2.74.6.ebuild
@@ -16,7 +16,7 @@ IUSE="dbus debug +elf gtk-doc +mime selinux static-libs sysprof systemtap test u
RESTRICT="!test? ( test )"
#REQUIRED_USE="gtk-doc? ( test )" # Bug #777636
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
# * elfutils (via libelf) does not build on Windows. gresources are not embedded
# within ELF binaries on that platform anyway and inspecting ELF binaries from
diff --git a/dev-libs/libayatana-appindicator/libayatana-appindicator-0.5.92.ebuild b/dev-libs/libayatana-appindicator/libayatana-appindicator-0.5.92.ebuild
index 526250a3ec88..9a0fa5d4a6e6 100644
--- a/dev-libs/libayatana-appindicator/libayatana-appindicator-0.5.92.ebuild
+++ b/dev-libs/libayatana-appindicator/libayatana-appindicator-0.5.92.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/AyatanaIndicators/${PN}/archive/${PV}.tar.gz -> ${P}
LICENSE="GPL-3 LGPL-2 LGPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/libayatana-indicator/libayatana-indicator-0.9.3.ebuild b/dev-libs/libayatana-indicator/libayatana-indicator-0.9.3.ebuild
index 045dad6eb366..3495f14cea12 100644
--- a/dev-libs/libayatana-indicator/libayatana-indicator-0.9.3.ebuild
+++ b/dev-libs/libayatana-indicator/libayatana-indicator-0.9.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/AyatanaIndicators/${PN}/archive/${PV}.tar.gz -> ${P}
LICENSE="GPL-3"
SLOT="3"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/libgusb/libgusb-0.4.5.ebuild b/dev-libs/libgusb/libgusb-0.4.5.ebuild
index 79fdfd6e4237..f8921bf2d5c2 100644
--- a/dev-libs/libgusb/libgusb-0.4.5.ebuild
+++ b/dev-libs/libgusb/libgusb-0.4.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/hughsie/libgusb/releases/download/${PV}/${P}.tar.xz"
LICENSE="LGPL-2.1+"
SLOT="0"
-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"
IUSE="gtk-doc +introspection test +vala"
REQUIRED_USE="
diff --git a/dev-libs/template-glib/template-glib-3.36.1.ebuild b/dev-libs/template-glib/template-glib-3.36.1.ebuild
index 3470a4030680..ce897f1fe8c3 100644
--- a/dev-libs/template-glib/template-glib-3.36.1.ebuild
+++ b/dev-libs/template-glib/template-glib-3.36.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/template-glib"
LICENSE="LGPL-2.1+"
SLOT="0/1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="gtk-doc +introspection test vala"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/vala-common/vala-common-0.56.4.ebuild b/dev-libs/vala-common/vala-common-0.56.4.ebuild
index cd0ecf1d538a..39c9a2cef594 100644
--- a/dev-libs/vala-common/vala-common-0.56.4.ebuild
+++ b/dev-libs/vala-common/vala-common-0.56.4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala https://gitlab.gnome.org/GNOME/va
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
RDEPEND=""
DEPEND=""
diff --git a/dev-ml/cudf/cudf-0.10.ebuild b/dev-ml/cudf/cudf-0.10.ebuild
index c361f445d2b1..00c999757bff 100644
--- a/dev-ml/cudf/cudf-0.10.ebuild
+++ b/dev-ml/cudf/cudf-0.10.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.com/irill/${PN}/-/archive/v${PV}/${MYP}.tar.bz2"
LICENSE="LGPL-3"
SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
IUSE="+ocamlopt llvm-libunwind test"
RESTRICT="!test? ( test )"
diff --git a/dev-ml/dose3/dose3-7.0.0.ebuild b/dev-ml/dose3/dose3-7.0.0.ebuild
index 100e9ea4d47c..f6a5d1d6560e 100644
--- a/dev-ml/dose3/dose3-7.0.0.ebuild
+++ b/dev-ml/dose3/dose3-7.0.0.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
LICENSE="LGPL-3"
SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 ~riscv x86"
IUSE="+ocamlopt"
BDEPEND="
diff --git a/dev-ml/labltk/labltk-8.06.12-r2.ebuild b/dev-ml/labltk/labltk-8.06.12-r2.ebuild
index 00be52274408..8842a41bed31 100644
--- a/dev-ml/labltk/labltk-8.06.12-r2.ebuild
+++ b/dev-ml/labltk/labltk-8.06.12-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/garrigue/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="QPL-1.0 LGPL-2"
SLOT="0/${PV}"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
IUSE="+ocamlopt X"
RDEPEND="dev-lang/tk:=
diff --git a/dev-ml/ocaml-expat/ocaml-expat-1.3.0.ebuild b/dev-ml/ocaml-expat/ocaml-expat-1.3.0.ebuild
index 2902133ef033..6fc80a5bf5eb 100644
--- a/dev-ml/ocaml-expat/ocaml-expat-1.3.0.ebuild
+++ b/dev-ml/ocaml-expat/ocaml-expat-1.3.0.ebuild
@@ -20,7 +20,7 @@ DEPEND="${RDEPEND}
SLOT="0/${PV}"
LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
PATCHES=(
"${FILESDIR}/ounit2.patch"
"${FILESDIR}/${PN}-1.1.0-cc.patch"
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.74.6.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.74.6.ebuild
index 787dfc5d3dab..ce6f5c1d29d1 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.74.6.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.74.6.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.gtk.org/"
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
RDEPEND="${PYTHON_DEPS}"
DEPEND="${RDEPEND}"
diff --git a/dev-util/glib-utils/glib-utils-2.74.6.ebuild b/dev-util/glib-utils/glib-utils-2.74.6.ebuild
index 33bfee268b48..d036ee333b80 100644
--- a/dev-util/glib-utils/glib-utils-2.74.6.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.74.6.ebuild
@@ -14,7 +14,7 @@ LICENSE="LGPL-2.1+"
SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-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 ~x86-winnt"
+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 ~x86-winnt"
RDEPEND="${PYTHON_DEPS}"
DEPEND="${RDEPEND}"
diff --git a/dev-util/gnome-builder/gnome-builder-43.6.ebuild b/dev-util/gnome-builder/gnome-builder-43.6.ebuild
index b62a1a10fd38..92f02b73c78b 100644
--- a/dev-util/gnome-builder/gnome-builder-43.6.ebuild
+++ b/dev-util/gnome-builder/gnome-builder-43.6.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Builder https://gitlab.gnome.org/GNOME/gno
# FIXME: Review licenses at some point
LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
IUSE="clang doc +d-spy flatpak +git gtk-doc spell +sysprof test +webkit"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
diff --git a/dev-util/umockdev/umockdev-0.17.16.ebuild b/dev-util/umockdev/umockdev-0.17.16.ebuild
index a0aa5c033605..edb6a5bf004a 100644
--- a/dev-util/umockdev/umockdev-0.17.16.ebuild
+++ b/dev-util/umockdev/umockdev-0.17.16.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then
inherit git-r3
else
SRC_URI="https://github.com/martinpitt/umockdev/releases/download/${PV}/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86"
fi
DESCRIPTION="Mock hardware devices for creating unit tests"
diff --git a/gnome-base/gnome-control-center/gnome-control-center-43.4.1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-43.4.1.ebuild
index 5667fc321228..1d95b47e8135 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-43.4.1.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-43.4.1.ebuild
@@ -19,7 +19,7 @@ RESTRICT="!test? ( test )"
REQUIRED_USE="
^^ ( elogind systemd )
" # Theoretically "?? ( elogind systemd )" is fine too, lacking some functionality at runtime, but needs testing if handled gracefully enough
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
# meson.build depends on python unconditionally
BDEPEND="${PYTHON_DEPS}"
diff --git a/gnome-base/gnome-desktop/gnome-desktop-43.2-r300.ebuild b/gnome-base/gnome-desktop/gnome-desktop-43.2-r300.ebuild
index 799b1e12fe58..a95214264f55 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-43.2-r300.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-43.2-r300.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
SLOT="3/20" # subslot = libgnome-desktop-3 soname version
IUSE="debug +introspection seccomp systemd udev"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
COMMON_DEPEND="
>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
diff --git a/gnome-base/gnome-desktop/gnome-desktop-43.2-r400.ebuild b/gnome-base/gnome-desktop/gnome-desktop-43.2-r400.ebuild
index 4d067f32db74..f7095df3504a 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-43.2-r400.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-43.2-r400.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
SLOT="4/2" # subslot = libgnome-desktop-4 soname version
IUSE="debug gtk-doc seccomp systemd udev"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
COMMON_DEPEND="
>=x11-libs/gdk-pixbuf-2.36.5:2[introspection]
diff --git a/gnome-base/gnome-shell/gnome-shell-43.3.ebuild b/gnome-base/gnome-shell/gnome-shell-43.3.ebuild
index de9705b12794..0a9c47f9cf8f 100644
--- a/gnome-base/gnome-shell/gnome-shell-43.3.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-43.3.ebuild
@@ -16,7 +16,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
?? ( elogind systemd )"
RESTRICT="!test? ( test )"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
# libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h>
DEPEND="
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.46.4.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.46.4.ebuild
index 3814c5a9df63..842d62a79216 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.46.4.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.46.4.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
vala? ( introspection )
"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
# berkdb needed only for migrating old addressbook data from <3.13 versions, bug #519512
# glib-2.70 for build-time optional GPowerProfileMonitor
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.46.4.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.46.4.ebuild
index 675ec4ff7d00..5cfc13424a53 100644
--- a/gnome-extra/evolution-ews/evolution-ews-3.46.4.ebuild
+++ b/gnome-extra/evolution-ews/evolution-ews-3.46.4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Evolution https://gitlab.gnome.org/GNOME/e
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
IUSE="test"
# libical-glib currently (2020-02-29) oddly behind USE=introspection
diff --git a/gnome-extra/gnome-boxes/gnome-boxes-43.3.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-43.3.ebuild
index b59e201fb377..99000f7319d4 100644
--- a/gnome-extra/gnome-boxes/gnome-boxes-43.3.ebuild
+++ b/gnome-extra/gnome-boxes/gnome-boxes-43.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Boxes"
LICENSE="LGPL-2+ CC-BY-2.0"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
# FIXME: qemu probably needs to depend on spice[smartcard] directly with USE=spice
# FIXME: Check over libvirt USE=libvirtd,qemu and the smartcard/usbredir requirements
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-43.1.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-43.1.ebuild
index def2741f3456..54902120cddf 100644
--- a/gnome-extra/gnome-contacts/gnome-contacts-43.1.ebuild
+++ b/gnome-extra/gnome-contacts/gnome-contacts-43.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/Contacts"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~sparc x86"
VALA_DEPEND="
$(vala_depend)
diff --git a/gnome-extra/nm-applet/nm-applet-1.30.0-r2.ebuild b/gnome-extra/nm-applet/nm-applet-1.30.0-r2.ebuild
index f3f80b5aa233..c67129fdceca 100644
--- a/gnome-extra/nm-applet/nm-applet-1.30.0-r2.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-1.30.0-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
LICENSE="GPL-2+"
SLOT="0"
IUSE="appindicator modemmanager selinux teamd"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
RDEPEND="
>=dev-libs/glib-2.40:2
diff --git a/gnome-extra/yelp/yelp-42.2-r1.ebuild b/gnome-extra/yelp/yelp-42.2-r1.ebuild
index 75a1f09987ab..cb2d623125de 100644
--- a/gnome-extra/yelp/yelp-42.2-r1.ebuild
+++ b/gnome-extra/yelp/yelp-42.2-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Yelp"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
RDEPEND="
app-arch/bzip2:=
diff --git a/gnome-extra/zenity/zenity-3.44.0.ebuild b/gnome-extra/zenity/zenity-3.44.0.ebuild
index 9080ff54a435..75866aca7426 100644
--- a/gnome-extra/zenity/zenity-3.44.0.ebuild
+++ b/gnome-extra/zenity/zenity-3.44.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Zenity"
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="libnotify webkit"
# TODO: X11 dependency is automagically enabled
diff --git a/gui-libs/libadwaita/libadwaita-1.2.3.ebuild b/gui-libs/libadwaita/libadwaita-1.2.3.ebuild
index 11c36e9c0796..cc14f7deaf38 100644
--- a/gui-libs/libadwaita/libadwaita-1.2.3.ebuild
+++ b/gui-libs/libadwaita/libadwaita-1.2.3.ebuild
@@ -14,7 +14,7 @@ SLOT="1"
IUSE="+introspection test +vala"
REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
RDEPEND="
>=dev-libs/glib-2.66:2
diff --git a/gui-libs/libhandy/libhandy-1.8.2.ebuild b/gui-libs/libhandy/libhandy-1.8.2.ebuild
index 1a9f78259e46..4faf2a847f78 100644
--- a/gui-libs/libhandy/libhandy-1.8.2.ebuild
+++ b/gui-libs/libhandy/libhandy-1.8.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libhandy/"
LICENSE="LGPL-2.1+"
SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
IUSE="examples glade gtk-doc +introspection test +vala"
REQUIRED_USE="
diff --git a/gui-libs/libwpe/libwpe-1.14.1.ebuild b/gui-libs/libwpe/libwpe-1.14.1.ebuild
index d8dce1ac8315..9630ea944396 100644
--- a/gui-libs/libwpe/libwpe-1.14.1.ebuild
+++ b/gui-libs/libwpe/libwpe-1.14.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://wpewebkit.org/releases/${P}.tar.xz"
LICENSE="BSD-2"
SLOT="1.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
RDEPEND="
media-libs/mesa[egl(+)]
diff --git a/gui-libs/vte-common/vte-common-0.70.3.ebuild b/gui-libs/vte-common/vte-common-0.70.3.ebuild
index 49887bf0c20b..b72a02622dcf 100644
--- a/gui-libs/vte-common/vte-common-0.70.3.ebuild
+++ b/gui-libs/vte-common/vte-common-0.70.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
LICENSE="LGPL-3+ GPL-3+"
SLOT="2.91" # vte_api_version in meson.build
IUSE="systemd"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
# Upstream is hostile and refuses to upload tarballs.
SRC_URI="https://gitlab.gnome.org/GNOME/vte/-/archive/${PV}/vte-${PV}.tar.bz2"
diff --git a/gui-libs/vte/vte-0.70.3.ebuild b/gui-libs/vte/vte-0.70.3.ebuild
index 600eb48e4b87..41b6f2286eb9 100644
--- a/gui-libs/vte/vte-0.70.3.ebuild
+++ b/gui-libs/vte/vte-0.70.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
LICENSE="LGPL-3+ GPL-3+"
SLOT="2.91-gtk4" # vte_api_version + "-gtk4" in meson.build
IUSE="+crypt debug gtk-doc +icu +introspection systemd +vala vanilla"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
REQUIRED_USE="
gtk-doc? ( introspection )
vala? ( introspection )
diff --git a/gui-libs/wpebackend-fdo/wpebackend-fdo-1.14.1.ebuild b/gui-libs/wpebackend-fdo/wpebackend-fdo-1.14.1.ebuild
index a831404745c4..88a19421f78d 100644
--- a/gui-libs/wpebackend-fdo/wpebackend-fdo-1.14.1.ebuild
+++ b/gui-libs/wpebackend-fdo/wpebackend-fdo-1.14.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://wpewebkit.org/releases/${P}.tar.xz"
LICENSE="BSD-2"
SLOT="1.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
RDEPEND="
media-libs/libepoxy[egl]
diff --git a/mail-client/evolution/evolution-3.46.4.ebuild b/mail-client/evolution/evolution-3.46.4.ebuild
index aa8049682a72..5c8de672ba9e 100644
--- a/mail-client/evolution/evolution-3.46.4.ebuild
+++ b/mail-client/evolution/evolution-3.46.4.ebuild
@@ -14,7 +14,7 @@ SLOT="2.0"
IUSE="archive +bogofilter geolocation gtk-doc highlight ldap spamassassin spell ssl +weather ytnef"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
# glade-3 support is for maintainers only per configure.ac
# pst is not mature enough and changes API/ABI frequently
diff --git a/media-video/pipewire/pipewire-0.3.66-r1.ebuild b/media-video/pipewire/pipewire-0.3.66-r1.ebuild
index 402f74b3156a..9af52bf09561 100644
--- a/media-video/pipewire/pipewire-0.3.66-r1.ebuild
+++ b/media-video/pipewire/pipewire-0.3.66-r1.ebuild
@@ -29,7 +29,7 @@ else
SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.bz2"
fi
- KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
+ KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
fi
DESCRIPTION="Multimedia processing graphs"
diff --git a/net-libs/libcloudproviders/libcloudproviders-0.3.1.ebuild b/net-libs/libcloudproviders/libcloudproviders-0.3.1.ebuild
index ec842ecb5d9f..2f11bd173b8c 100644
--- a/net-libs/libcloudproviders/libcloudproviders-0.3.1.ebuild
+++ b/net-libs/libcloudproviders/libcloudproviders-0.3.1.ebuild
@@ -13,7 +13,7 @@ SLOT="0"
IUSE="gtk-doc +introspection vala"
REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86"
DEPEND="
>=dev-libs/glib-2.51.2:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/rest/rest-0.9.1-r1.ebuild b/net-libs/rest/rest-0.9.1-r1.ebuild
index 5cabb1551b69..043934d58939 100644
--- a/net-libs/rest/rest-0.9.1-r1.ebuild
+++ b/net-libs/rest/rest-0.9.1-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Librest"
LICENSE="LGPL-2.1"
SLOT="1.0" # librest_soversion
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
IUSE="gtk-doc +introspection test vala"
REQUIRED_USE="
gtk-doc? ( introspection )
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild
index 3452a65b31db..3d919335303e 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
LICENSE="LGPL-2+ BSD"
SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild
index e3232066c118..b43bd6147052 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
LICENSE="LGPL-2+ BSD"
SLOT="5/0" # soname version of libwebkit2gtk-5.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild
index d028ce2e49f0..2ef4cf597c04 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
LICENSE="LGPL-2+ BSD"
SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
diff --git a/net-misc/networkmanager/networkmanager-1.42.2.ebuild b/net-misc/networkmanager/networkmanager-1.42.2.ebuild
index ea8c15c407b0..37422c3effd1 100644
--- a/net-misc/networkmanager/networkmanager-1.42.2.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.42.2.ebuild
@@ -29,7 +29,7 @@ REQUIRED_USE="
?? ( syslog systemd )
"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
COMMON_DEPEND="
sys-apps/util-linux[${MULTILIB_USEDEP}]
diff --git a/net-misc/rygel/rygel-0.42.1.ebuild b/net-misc/rygel/rygel-0.42.1.ebuild
index 4d3ce4b56313..aa0b7a5ac42e 100644
--- a/net-misc/rygel/rygel-0.42.1.ebuild
+++ b/net-misc/rygel/rygel-0.42.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Rygel"
LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="gtk gtk-doc +introspection +sqlite tracker test transcode"
RESTRICT="!test? ( test )"
diff --git a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.0.ebuild b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.0.ebuild
index c0aa84fe9b18..48f881ebf961 100644
--- a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.0.ebuild
+++ b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://tigervnc.org/"
LICENSE="metapackage"
SLOT="0"
-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"
RDEPEND="
~net-misc/tigervnc-${PV}[server]
diff --git a/net-misc/tigervnc/tigervnc-1.13.0.ebuild b/net-misc/tigervnc/tigervnc-1.13.0.ebuild
index 76fee7aaf401..8084b2b74a7b 100644
--- a/net-misc/tigervnc/tigervnc-1.13.0.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.13.0.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]]; then
EGIT_REPO_URI="https://github.com/TigerVNC/tigervnc/"
else
SRC_URI+=" https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- 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
LICENSE="GPL-2"
diff --git a/sci-geosciences/gnome-maps/gnome-maps-43.4.ebuild b/sci-geosciences/gnome-maps/gnome-maps-43.4.ebuild
index fbde0d6d6cf0..258e281fe40b 100644
--- a/sci-geosciences/gnome-maps/gnome-maps-43.4.ebuild
+++ b/sci-geosciences/gnome-maps/gnome-maps-43.4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Maps"
LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
# Pure introspection dependencies found by grepping imports in ${S}
RDEPEND="
diff --git a/sys-block/gparted/gparted-1.5.0.ebuild b/sys-block/gparted/gparted-1.5.0.ebuild
index 89c079a360cd..f02c299619b9 100644
--- a/sys-block/gparted/gparted-1.5.0.ebuild
+++ b/sys-block/gparted/gparted-1.5.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2+ FDL-1.2+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv x86"
IUSE="kde policykit wayland"
DEPEND="
diff --git a/www-client/epiphany/epiphany-43.1.ebuild b/www-client/epiphany/epiphany-43.1.ebuild
index caf195038caa..646e6a620935 100644
--- a/www-client/epiphany/epiphany-43.1.ebuild
+++ b/www-client/epiphany/epiphany-43.1.ebuild
@@ -12,7 +12,7 @@ LICENSE="GPL-3+"
SLOT="0"
IUSE="test"
RESTRICT="!test? ( test )"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
DEPEND="
>=x11-libs/cairo-1.2
diff --git a/x11-libs/goffice/goffice-0.10.55.ebuild b/x11-libs/goffice/goffice-0.10.55.ebuild
index f639a1e00361..5d0538c39d21 100644
--- a/x11-libs/goffice/goffice-0.10.55.ebuild
+++ b/x11-libs/goffice/goffice-0.10.55.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/goffice/"
LICENSE="GPL-2"
SLOT="0.10"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
IUSE="+introspection"
# FIXME: add lasem to tree
diff --git a/x11-libs/gtk+/gtk+-3.24.37.ebuild b/x11-libs/gtk+/gtk+-3.24.37.ebuild
index f9e974d28a51..94709c4380c7 100644
--- a/x11-libs/gtk+/gtk+-3.24.37.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.37.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
"
RESTRICT="!test? ( test )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
COMMON_DEPEND="
>=app-accessibility/at-spi2-core-2.46.0[introspection?,${MULTILIB_USEDEP}]
diff --git a/x11-libs/libnotify/libnotify-0.8.2.ebuild b/x11-libs/libnotify/libnotify-0.8.2.ebuild
index d961823a695b..fa34a35d2a73 100644
--- a/x11-libs/libnotify/libnotify-0.8.2.ebuild
+++ b/x11-libs/libnotify/libnotify-0.8.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libnotify"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
IUSE="gtk-doc +introspection test"
RESTRICT="!test? ( test )"
REQUIRED_USE="gtk-doc? ( introspection )"
diff --git a/x11-libs/pango/pango-1.50.13.ebuild b/x11-libs/pango/pango-1.50.13.ebuild
index fca45be53855..0878fd4d2947 100644
--- a/x11-libs/pango/pango-1.50.13.ebuild
+++ b/x11-libs/pango/pango-1.50.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/pango/$(ver_cut 1-2)/${P}.tar.xz
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ppc64 ~riscv ~s390 ~sparc x86"
IUSE="debug +introspection sysprof test X"
RESTRICT="!test? ( test )"
diff --git a/x11-libs/vte/vte-0.70.3.ebuild b/x11-libs/vte/vte-0.70.3.ebuild
index 35c20aff9ffa..bc43213f9b76 100644
--- a/x11-libs/vte/vte-0.70.3.ebuild
+++ b/x11-libs/vte/vte-0.70.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
LICENSE="LGPL-3+ GPL-3+"
SLOT="2.91" # vte_api_version in meson.build
IUSE="+crypt debug gtk-doc +icu +introspection systemd +vala vanilla"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
REQUIRED_USE="
gtk-doc? ( introspection )
vala? ( introspection )
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.46.8.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.46.8.ebuild
index 0e839d532785..24a225c5dbec 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-3.46.8.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.46.8.ebuild
@@ -16,7 +16,7 @@ IUSE="debug +gnome-shell +nautilus vanilla"
SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${PV}/${P}.tar.bz2"
SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-3.46.2-cntr-ntfy-autottl-ts.patch.xz )"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
# FIXME: automagic dependency on gtk+[X], just transitive but needs proper control, bug 624960
RDEPEND="
diff --git a/x11-themes/gnome-backgrounds/gnome-backgrounds-43.1.ebuild b/x11-themes/gnome-backgrounds/gnome-backgrounds-43.1.ebuild
index 8636516b5b76..732fff016970 100644
--- a/x11-themes/gnome-backgrounds/gnome-backgrounds-43.1.ebuild
+++ b/x11-themes/gnome-backgrounds/gnome-backgrounds-43.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-backgrounds"
LICENSE="CC-BY-SA-2.0 CC-BY-SA-3.0 CC-BY-2.0 CC-BY-4.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
RDEPEND="gui-libs/gdk-pixbuf-loader-webp"
BDEPEND=">=sys-devel/gettext-0.19.8"
diff --git a/x11-wm/mutter/mutter-43.3.ebuild b/x11-wm/mutter/mutter-43.3.ebuild
index ae5c2fcf0d2e..e6e29160b91d 100644
--- a/x11-wm/mutter/mutter-43.3.ebuild
+++ b/x11-wm/mutter/mutter-43.3.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
test? ( wayland )"
RESTRICT="!test? ( test )"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
# gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema
# xorg-server is needed at build and runtime with USE=wayland for Xwayland