Merge updates from master

37 files changed, 37 insertions, 37 deletions

diff --git a/dev-lang/python-exec/python-exec-2.4.8.ebuild b/dev-lang/python-exec/python-exec-2.4.8.ebuild
index df1a4748b3ff..225797bdda50 100644
--- a/dev-lang/python-exec/python-exec-2.4.8.ebuild
+++ b/dev-lang/python-exec/python-exec-2.4.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mgorny/python-exec/releases/download/v${PV}/${P}.tar
 
 LICENSE="BSD-2"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~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"
 # Internal Python project hack.  Do not copy it.  Ever.
 IUSE="${_PYTHON_ALL_IMPLS[@]/#/python_targets_} +native-symlinks test"
 RESTRICT="!test? ( test )"
diff --git a/dev-perl/Event/Event-1.280.0.ebuild b/dev-perl/Event/Event-1.280.0.ebuild
index f2336ca8b066..f65bdb0b6ba1 100644
--- a/dev-perl/Event/Event-1.280.0.ebuild
+++ b/dev-perl/Event/Event-1.280.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Fast, generic event loop"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 sparc ~x86 ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Exception-Class/Exception-Class-1.450.0.ebuild b/dev-perl/Exception-Class/Exception-Class-1.450.0.ebuild
index 84e7a83740f2..7be7d04b0f0f 100644
--- a/dev-perl/Exception-Class/Exception-Class-1.450.0.ebuild
+++ b/dev-perl/Exception-Class/Exception-Class-1.450.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A module that allows you to declare real exception classes in Perl"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/ExtUtils-Depends/ExtUtils-Depends-0.800.100.ebuild b/dev-perl/ExtUtils-Depends/ExtUtils-Depends-0.800.100.ebuild
index 3f7a49db70e3..076ab6e6045f 100644
--- a/dev-perl/ExtUtils-Depends/ExtUtils-Depends-0.800.100.ebuild
+++ b/dev-perl/ExtUtils-Depends/ExtUtils-Depends-0.800.100.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Easily build XS extensions that depend on XS extensions"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/ExtUtils-F77/ExtUtils-F77-1.260.0.ebuild b/dev-perl/ExtUtils-F77/ExtUtils-F77-1.260.0.ebuild
index 0d18b7afc223..cb2364db349d 100644
--- a/dev-perl/ExtUtils-F77/ExtUtils-F77-1.260.0.ebuild
+++ b/dev-perl/ExtUtils-F77/ExtUtils-F77-1.260.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module toolchain-funcs
 DESCRIPTION="Simple interface to F77 libs"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-perl/File-Which
diff --git a/dev-perl/FFI-CheckLib/FFI-CheckLib-0.280.0.ebuild b/dev-perl/FFI-CheckLib/FFI-CheckLib-0.280.0.ebuild
index 6805867d3038..3386bed6d389 100644
--- a/dev-perl/FFI-CheckLib/FFI-CheckLib-0.280.0.ebuild
+++ b/dev-perl/FFI-CheckLib/FFI-CheckLib-0.280.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 
 DESCRIPTION="Check that a library is available for FFI"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/File-Listing/File-Listing-6.140.0.ebuild b/dev-perl/File-Listing/File-Listing-6.140.0.ebuild
index 26566c1a047a..b5a8b87c994a 100644
--- a/dev-perl/File-Listing/File-Listing-6.140.0.ebuild
+++ b/dev-perl/File-Listing/File-Listing-6.140.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Parse directory listings"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~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"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/File-ReadBackwards/File-ReadBackwards-1.60.0.ebuild b/dev-perl/File-ReadBackwards/File-ReadBackwards-1.60.0.ebuild
index c1c08e576ed5..f7f0b4d2424d 100644
--- a/dev-perl/File-ReadBackwards/File-ReadBackwards-1.60.0.ebuild
+++ b/dev-perl/File-ReadBackwards/File-ReadBackwards-1.60.0.ebuild
@@ -10,4 +10,4 @@ inherit perl-module
 DESCRIPTION="Read a file backwards by lines"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~x86-solaris"
diff --git a/dev-perl/File-Remove/File-Remove-1.600.0.ebuild b/dev-perl/File-Remove/File-Remove-1.600.0.ebuild
index eb2c20851b4a..edaea6be2999 100644
--- a/dev-perl/File-Remove/File-Remove-1.600.0.ebuild
+++ b/dev-perl/File-Remove/File-Remove-1.600.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Remove files and directories"
 LICENSE="|| ( Artistic GPL-1+ ) || ( CC0-1.0 public-domain MIT )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/File-ShareDir/File-ShareDir-1.118.0.ebuild b/dev-perl/File-ShareDir/File-ShareDir-1.118.0.ebuild
index 70d494cbc177..49debbe7ce58 100644
--- a/dev-perl/File-ShareDir/File-ShareDir-1.118.0.ebuild
+++ b/dev-perl/File-ShareDir/File-ShareDir-1.118.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Locate per-dist and per-module shared files"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="minimal test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/File-Which/File-Which-1.270.0.ebuild b/dev-perl/File-Which/File-Which-1.270.0.ebuild
index d84b87b1b9c7..df395b466555 100644
--- a/dev-perl/File-Which/File-Which-1.270.0.ebuild
+++ b/dev-perl/File-Which/File-Which-1.270.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl implementation of the which utility as an API"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test pwhich"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/IO-CaptureOutput/IO-CaptureOutput-1.110.500.ebuild b/dev-perl/IO-CaptureOutput/IO-CaptureOutput-1.110.500.ebuild
index b44ee37383de..b10a6e24d2e1 100644
--- a/dev-perl/IO-CaptureOutput/IO-CaptureOutput-1.110.500.ebuild
+++ b/dev-perl/IO-CaptureOutput/IO-CaptureOutput-1.110.500.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Capture STDOUT and STDERR from Perl code, subprocesses or XS"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/IO-HTML/IO-HTML-1.4.0.ebuild b/dev-perl/IO-HTML/IO-HTML-1.4.0.ebuild
index da18846f643e..207cfffc8977 100644
--- a/dev-perl/IO-HTML/IO-HTML-1.4.0.ebuild
+++ b/dev-perl/IO-HTML/IO-HTML-1.4.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Open an HTML file with automatic charset detection"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~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"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/IO-Interactive/IO-Interactive-1.23.0.ebuild b/dev-perl/IO-Interactive/IO-Interactive-1.23.0.ebuild
index 2d09540615d8..9bf981e7a378 100644
--- a/dev-perl/IO-Interactive/IO-Interactive-1.23.0.ebuild
+++ b/dev-perl/IO-Interactive/IO-Interactive-1.23.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Utilities for interactive I/O"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~riscv ~x86"
+KEYWORDS="~amd64 ppc ~riscv ~x86"
 
 RDEPEND="
 	>=virtual/perl-version-0.780.0
diff --git a/dev-perl/IO-Pager/IO-Pager-2.100.0.ebuild b/dev-perl/IO-Pager/IO-Pager-2.100.0.ebuild
index c6daf9f53843..a36292c36502 100644
--- a/dev-perl/IO-Pager/IO-Pager-2.100.0.ebuild
+++ b/dev-perl/IO-Pager/IO-Pager-2.100.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Select a pager, optionally pipe it output if destination is a TTY"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~amd64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 
 RDEPEND="
 	virtual/perl-File-Spec
diff --git a/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.71.0.ebuild b/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.71.0.ebuild
index 749934583a61..10e2bffd0e0b 100644
--- a/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.71.0.ebuild
+++ b/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.71.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Nearly transparent SSL encapsulation for IO::Socket::INET"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~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"
 IUSE="idn"
 
 RDEPEND="
diff --git a/dev-perl/IO-Stty/IO-Stty-0.40.0.ebuild b/dev-perl/IO-Stty/IO-Stty-0.40.0.ebuild
index 8f7c7d021a00..eeec9d6fe19d 100644
--- a/dev-perl/IO-Stty/IO-Stty-0.40.0.ebuild
+++ b/dev-perl/IO-Stty/IO-Stty-0.40.0.ebuild
@@ -9,6 +9,6 @@ inherit perl-module
 
 DESCRIPTION="Change and print terminal line settings"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 
 PERL_RM_FILES=( t/98-pod-coverage.t t/99-pod.t )
diff --git a/dev-perl/IO-Tee/IO-Tee-0.660.0.ebuild b/dev-perl/IO-Tee/IO-Tee-0.660.0.ebuild
index 3e14a1c09f91..230d4d483505 100644
--- a/dev-perl/IO-Tee/IO-Tee-0.660.0.ebuild
+++ b/dev-perl/IO-Tee/IO-Tee-0.660.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Multiplex output to multiple output handles"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc sparc ~x86"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/IO-Tty/IO-Tty-1.160.0.ebuild b/dev-perl/IO-Tty/IO-Tty-1.160.0.ebuild
index dc6daca58d97..71dbe8325f09 100644
--- a/dev-perl/IO-Tty/IO-Tty-1.160.0.ebuild
+++ b/dev-perl/IO-Tty/IO-Tty-1.160.0.ebuild
@@ -10,4 +10,4 @@ inherit perl-module
 DESCRIPTION="IO::Tty and IO::Pty modules for Perl"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-perl/IPC-System-Simple/IPC-System-Simple-1.300.0.ebuild b/dev-perl/IPC-System-Simple/IPC-System-Simple-1.300.0.ebuild
index 4fe033b25486..4aa3b8154b01 100644
--- a/dev-perl/IPC-System-Simple/IPC-System-Simple-1.300.0.ebuild
+++ b/dev-perl/IPC-System-Simple/IPC-System-Simple-1.300.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Run commands simply, with detailed diagnostics"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Image-Info/Image-Info-1.420.0.ebuild b/dev-perl/Image-Info/Image-Info-1.420.0.ebuild
index d4044e16335a..3c070f841838 100644
--- a/dev-perl/Image-Info/Image-Info-1.420.0.ebuild
+++ b/dev-perl/Image-Info/Image-Info-1.420.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="The Perl Image-Info Module"
 
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~hppa ppc ppc64 sparc ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Importer/Importer-0.26.0.ebuild b/dev-perl/Importer/Importer-0.26.0.ebuild
index 28c31ec7fa09..6aae0bbb4668 100644
--- a/dev-perl/Importer/Importer-0.26.0.ebuild
+++ b/dev-perl/Importer/Importer-0.26.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Alternative interface to modules that export symbols"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Inline-Files/Inline-Files-0.710.0.ebuild b/dev-perl/Inline-Files/Inline-Files-0.710.0.ebuild
index 2f594711d7a5..a230a660e1c0 100644
--- a/dev-perl/Inline-Files/Inline-Files-0.710.0.ebuild
+++ b/dev-perl/Inline-Files/Inline-Files-0.710.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Multiple virtual files in a single file"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+KEYWORDS="~alpha ~amd64 ppc ~x86"
 RESTRICT="!test? ( test )"
 
 RDEPEND=""
diff --git a/dev-perl/JSON-XS/JSON-XS-4.30.0.ebuild b/dev-perl/JSON-XS/JSON-XS-4.30.0.ebuild
index 2da3b6d92f0d..0d02a2220ce0 100644
--- a/dev-perl/JSON-XS/JSON-XS-4.30.0.ebuild
+++ b/dev-perl/JSON-XS/JSON-XS-4.30.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="JSON::XS - JSON serialising/deserialising, done correctly and fast"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	dev-perl/Types-Serialiser
diff --git a/dev-perl/LWP-MediaTypes/LWP-MediaTypes-6.40.0.ebuild b/dev-perl/LWP-MediaTypes/LWP-MediaTypes-6.40.0.ebuild
index f27d4013ceae..64084e099944 100644
--- a/dev-perl/LWP-MediaTypes/LWP-MediaTypes-6.40.0.ebuild
+++ b/dev-perl/LWP-MediaTypes/LWP-MediaTypes-6.40.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Media types and mailcap processing"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~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"
 
 RDEPEND="
 	!<dev-perl/libwww-perl-6
diff --git a/dev-perl/LWP-Protocol-https/LWP-Protocol-https-6.100.0.ebuild b/dev-perl/LWP-Protocol-https/LWP-Protocol-https-6.100.0.ebuild
index 26f5d5700bf8..0851bccb0ff2 100644
--- a/dev-perl/LWP-Protocol-https/LWP-Protocol-https-6.100.0.ebuild
+++ b/dev-perl/LWP-Protocol-https/LWP-Protocol-https-6.100.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Provide https support for LWP::UserAgent"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
 
 RDEPEND="
 	app-misc/ca-certificates
diff --git a/dev-perl/Lingua-EN-Inflect/Lingua-EN-Inflect-1.905.0.ebuild b/dev-perl/Lingua-EN-Inflect/Lingua-EN-Inflect-1.905.0.ebuild
index 0356c2684689..cd1d68ec7841 100644
--- a/dev-perl/Lingua-EN-Inflect/Lingua-EN-Inflect-1.905.0.ebuild
+++ b/dev-perl/Lingua-EN-Inflect/Lingua-EN-Inflect-1.905.0.ebuild
@@ -11,4 +11,4 @@ inherit perl-module
 DESCRIPTION="Perl module to pluralize English words"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-perl/Lingua-EN-NameParse/Lingua-EN-NameParse-1.380.0.ebuild b/dev-perl/Lingua-EN-NameParse/Lingua-EN-NameParse-1.380.0.ebuild
index 97e0df316efe..c73657ad9a44 100644
--- a/dev-perl/Lingua-EN-NameParse/Lingua-EN-NameParse-1.380.0.ebuild
+++ b/dev-perl/Lingua-EN-NameParse/Lingua-EN-NameParse-1.380.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Routines for manipulating a person's name"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ppc ~x86"
 
 RDEPEND="
 	>=dev-perl/Parse-RecDescent-1
diff --git a/dev-perl/Lingua-EN-Numbers-Ordinate/Lingua-EN-Numbers-Ordinate-1.50.0.ebuild b/dev-perl/Lingua-EN-Numbers-Ordinate/Lingua-EN-Numbers-Ordinate-1.50.0.ebuild
index fd14e58e389a..9ced8cfd0be4 100644
--- a/dev-perl/Lingua-EN-Numbers-Ordinate/Lingua-EN-Numbers-Ordinate-1.50.0.ebuild
+++ b/dev-perl/Lingua-EN-Numbers-Ordinate/Lingua-EN-Numbers-Ordinate-1.50.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Convert cardinal numbers(3) to ordinal numbers(3rd)"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ppc sparc ~x86"
 
 RDEPEND="
 	virtual/perl-Exporter
diff --git a/dev-perl/Log-Dispatch/Log-Dispatch-2.700.0.ebuild b/dev-perl/Log-Dispatch/Log-Dispatch-2.700.0.ebuild
index 17890374bc8a..d794762d7460 100644
--- a/dev-perl/Log-Dispatch/Log-Dispatch-2.700.0.ebuild
+++ b/dev-perl/Log-Dispatch/Log-Dispatch-2.700.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Dispatches messages to one or more outputs"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86"
 
 PERL_RM_FILES=( "t/email-exit.t" )
 
diff --git a/dev-perl/MailTools/MailTools-2.210.0.ebuild b/dev-perl/MailTools/MailTools-2.210.0.ebuild
index c6aec317a5d9..7d29e05e165a 100644
--- a/dev-perl/MailTools/MailTools-2.210.0.ebuild
+++ b/dev-perl/MailTools/MailTools-2.210.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Manipulation of electronic mail addresses"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	dev-perl/TimeDate
diff --git a/dev-perl/PPI/PPI-1.270.0-r1.ebuild b/dev-perl/PPI/PPI-1.270.0-r1.ebuild
index 4373725965e0..523b669523fe 100644
--- a/dev-perl/PPI/PPI-1.270.0-r1.ebuild
+++ b/dev-perl/PPI/PPI-1.270.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Parse, Analyze and Manipulate Perl (without perl)"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/PPIx-Regexp/PPIx-Regexp-0.80.0.ebuild b/dev-perl/PPIx-Regexp/PPIx-Regexp-0.80.0.ebuild
index f56c25d823c5..f14244ab44a3 100644
--- a/dev-perl/PPIx-Regexp/PPIx-Regexp-0.80.0.ebuild
+++ b/dev-perl/PPIx-Regexp/PPIx-Regexp-0.80.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Represent a regular expression of some sort"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="test examples"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pylint/pylint-2.9.3.ebuild b/dev-python/pylint/pylint-2.9.3.ebuild
index e32124a3c572..bdecb18a46f8 100644
--- a/dev-python/pylint/pylint-2.9.3.ebuild
+++ b/dev-python/pylint/pylint-2.9.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/sci-mathematics/z3/z3-4.8.11b.ebuild b/sci-mathematics/z3/z3-4.8.11b.ebuild
index 985b483904f9..6716e2d4fda3 100644
--- a/sci-mathematics/z3/z3-4.8.11b.ebuild
+++ b/sci-mathematics/z3/z3-4.8.11b.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/z3-${P}
 
 SLOT="0/4.8"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ppc64 ~riscv ~x86"
 IUSE="doc examples gmp isabelle java python"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/sys-fs/fuse/fuse-3.10.3.ebuild b/sys-fs/fuse/fuse-3.10.3.ebuild
index 23c420f21ebc..80905c5ccb83 100644
--- a/sys-fs/fuse/fuse-3.10.3.ebuild
+++ b/sys-fs/fuse/fuse-3.10.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libfuse/libfuse/releases/download/${P}/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="+suid test"
 RESTRICT="!test? ( test )"
 
diff --git a/www-servers/tornado/tornado-6.1.ebuild b/www-servers/tornado/tornado-6.1.ebuild
index 51a921586515..4fbcd193a31d 100644
--- a/www-servers/tornado/tornado-6.1.ebuild
+++ b/www-servers/tornado/tornado-6.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="examples test"
 RESTRICT="!test? ( test )"