Merge updates from master

59 files changed, 59 insertions, 59 deletions

diff --git a/dev-perl/Alien-Libxml2/Alien-Libxml2-0.170.0.ebuild b/dev-perl/Alien-Libxml2/Alien-Libxml2-0.170.0.ebuild
index ac15bd7fbe42..f7fe974d08b4 100644
--- a/dev-perl/Alien-Libxml2/Alien-Libxml2-0.170.0.ebuild
+++ b/dev-perl/Alien-Libxml2/Alien-Libxml2-0.170.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Install the C libxml2 library on your system"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Astro-FITS-Header/Astro-FITS-Header-3.80.0.ebuild b/dev-perl/Astro-FITS-Header/Astro-FITS-Header-3.80.0.ebuild
index 7fd3c221fba1..6922278eef17 100644
--- a/dev-perl/Astro-FITS-Header/Astro-FITS-Header-3.80.0.ebuild
+++ b/dev-perl/Astro-FITS-Header/Astro-FITS-Header-3.80.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Interface to FITS headers"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~mips ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~hppa ~mips ppc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Crypt-Twofish/Crypt-Twofish-2.180.0.ebuild b/dev-perl/Crypt-Twofish/Crypt-Twofish-2.180.0.ebuild
index cd1538557998..08416159288b 100644
--- a/dev-perl/Crypt-Twofish/Crypt-Twofish-2.180.0.ebuild
+++ b/dev-perl/Crypt-Twofish/Crypt-Twofish-2.180.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="The Twofish Encryption Algorithm"
 
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 ~ia64 ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 src_compile() {
 	mymake=(
diff --git a/dev-perl/DBD-Pg/DBD-Pg-3.15.0.ebuild b/dev-perl/DBD-Pg/DBD-Pg-3.15.0.ebuild
index 18a9c56b9d51..e66772517807 100644
--- a/dev-perl/DBD-Pg/DBD-Pg-3.15.0.ebuild
+++ b/dev-perl/DBD-Pg/DBD-Pg-3.15.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 DESCRIPTION="PostgreSQL database driver for the DBI module"
 
 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"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/DBIx-SearchBuilder/DBIx-SearchBuilder-1.690.0.ebuild b/dev-perl/DBIx-SearchBuilder/DBIx-SearchBuilder-1.690.0.ebuild
index c280ea72fa1b..79aef78e91ae 100644
--- a/dev-perl/DBIx-SearchBuilder/DBIx-SearchBuilder-1.690.0.ebuild
+++ b/dev-perl/DBIx-SearchBuilder/DBIx-SearchBuilder-1.690.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Encapsulate SQL queries and rows in simple Perl objects"
 
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Data-HexDump/Data-HexDump-0.40.0.ebuild b/dev-perl/Data-HexDump/Data-HexDump-0.40.0.ebuild
index 3a40684c21c9..96b74a546880 100644
--- a/dev-perl/Data-HexDump/Data-HexDump-0.40.0.ebuild
+++ b/dev-perl/Data-HexDump/Data-HexDump-0.40.0.ebuild
@@ -11,4 +11,4 @@ inherit perl-module
 DESCRIPTION="Hexadecial Dumper"
 
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ~sparc x86"
diff --git a/dev-perl/Data-ObjectDriver/Data-ObjectDriver-0.210.0.ebuild b/dev-perl/Data-ObjectDriver/Data-ObjectDriver-0.210.0.ebuild
index e8907be99d72..92ec93857a7e 100644
--- a/dev-perl/Data-ObjectDriver/Data-ObjectDriver-0.210.0.ebuild
+++ b/dev-perl/Data-ObjectDriver/Data-ObjectDriver-0.210.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Simple, transparent data interface, with caching"
 
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Data-Validate-IP/Data-Validate-IP-0.300.0.ebuild b/dev-perl/Data-Validate-IP/Data-Validate-IP-0.300.0.ebuild
index 61d63f6493fc..74ffcb9c4a1f 100644
--- a/dev-perl/Data-Validate-IP/Data-Validate-IP-0.300.0.ebuild
+++ b/dev-perl/Data-Validate-IP/Data-Validate-IP-0.300.0.ebuild
@@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="IPv4 and IPv6 validation methods"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Date-Manip/Date-Manip-6.850.0.ebuild b/dev-perl/Date-Manip/Date-Manip-6.850.0.ebuild
index 94945dd26613..80c904de8319 100644
--- a/dev-perl/Date-Manip/Date-Manip-6.850.0.ebuild
+++ b/dev-perl/Date-Manip/Date-Manip-6.850.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Perl date manipulation routines"
 
 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="elibc_musl test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Devel-Hide/Devel-Hide-0.1.400.ebuild b/dev-perl/Devel-Hide/Devel-Hide-0.1.400.ebuild
index 364e616eb3f7..06deacf5f64e 100644
--- a/dev-perl/Devel-Hide/Devel-Hide-0.1.400.ebuild
+++ b/dev-perl/Devel-Hide/Devel-Hide-0.1.400.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Forces the unavailability of specified Perl modules (for testing)"
 
 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/Devel-NYTProf/Devel-NYTProf-6.100.0.ebuild b/dev-perl/Devel-NYTProf/Devel-NYTProf-6.100.0.ebuild
index 0ac5d55425a0..10da2380b1dc 100644
--- a/dev-perl/Devel-NYTProf/Devel-NYTProf-6.100.0.ebuild
+++ b/dev-perl/Devel-NYTProf/Devel-NYTProf-6.100.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module toolchain-funcs
 DESCRIPTION="Powerful feature-rich perl source code profiler"
 
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Devel-OverloadInfo/Devel-OverloadInfo-0.7.0.ebuild b/dev-perl/Devel-OverloadInfo/Devel-OverloadInfo-0.7.0.ebuild
index 32f63fbfba68..6c68e8634ca2 100644
--- a/dev-perl/Devel-OverloadInfo/Devel-OverloadInfo-0.7.0.ebuild
+++ b/dev-perl/Devel-OverloadInfo/Devel-OverloadInfo-0.7.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Introspect overloaded operators"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Digest-CRC/Digest-CRC-0.230.0.ebuild b/dev-perl/Digest-CRC/Digest-CRC-0.230.0.ebuild
index ba888104847e..eb9be57c753a 100644
--- a/dev-perl/Digest-CRC/Digest-CRC-0.230.0.ebuild
+++ b/dev-perl/Digest-CRC/Digest-CRC-0.230.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Generic CRC functions"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux"
 
 BDEPEND="
 	virtual/perl-ExtUtils-MakeMaker
diff --git a/dev-perl/Digest-HMAC/Digest-HMAC-1.40.0.ebuild b/dev-perl/Digest-HMAC/Digest-HMAC-1.40.0.ebuild
index 1f9db259422d..d6f25f75ba92 100644
--- a/dev-perl/Digest-HMAC/Digest-HMAC-1.40.0.ebuild
+++ b/dev-perl/Digest-HMAC/Digest-HMAC-1.40.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Keyed Hashing for Message Authentication"
 
 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-Digest-MD5-2.0.0
diff --git a/dev-perl/Email-MIME-ContentType/Email-MIME-ContentType-1.26.0.ebuild b/dev-perl/Email-MIME-ContentType/Email-MIME-ContentType-1.26.0.ebuild
index ab98b25615d2..46c67aff8eec 100644
--- a/dev-perl/Email-MIME-ContentType/Email-MIME-ContentType-1.26.0.ebuild
+++ b/dev-perl/Email-MIME-ContentType/Email-MIME-ContentType-1.26.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Parse a MIME Content-Type Header or Content-Disposition Header"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 ~x86 ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ppc ppc64 x86 ~sparc-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Email-Sender/Email-Sender-1.300.35.ebuild b/dev-perl/Email-Sender/Email-Sender-1.300.35.ebuild
index 1781d7dfb549..8b7535868052 100644
--- a/dev-perl/Email-Sender/Email-Sender-1.300.35.ebuild
+++ b/dev-perl/Email-Sender/Email-Sender-1.300.35.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A library for sending email"
 
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="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 d94ba44ba4d0..47c80492e15c 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 77b327e5e2f6..c81fe3b48bc3 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 7a48faf5eb00..ed126cf94528 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 ef3fa6b6410d..b01ca8e378d8 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 794ae8234e7d..27c1d23a88cf 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 628df6b5aefc..a250948ec4f9 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 9c77af275689..f46ae1bd01cb 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 a17e9d1cc9bc..4b2cc2c10e9d 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-Which/File-Which-1.270.0.ebuild b/dev-perl/File-Which/File-Which-1.270.0.ebuild
index 91c9166e0ac0..314f0e71fbc6 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/Getopt-Long-Descriptive/Getopt-Long-Descriptive-0.109.0.ebuild b/dev-perl/Getopt-Long-Descriptive/Getopt-Long-Descriptive-0.109.0.ebuild
index 69996204be33..8100e6813552 100644
--- a/dev-perl/Getopt-Long-Descriptive/Getopt-Long-Descriptive-0.109.0.ebuild
+++ b/dev-perl/Getopt-Long-Descriptive/Getopt-Long-Descriptive-0.109.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Getopt::Long with usage text"
 
 SLOT="0"
-KEYWORDS="amd64 arm ppc ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 arm ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="test minimal"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Glib-Object-Introspection/Glib-Object-Introspection-0.49.0.ebuild b/dev-perl/Glib-Object-Introspection/Glib-Object-Introspection-0.49.0.ebuild
index 93b18d85ed45..77e03997ae9d 100644
--- a/dev-perl/Glib-Object-Introspection/Glib-Object-Introspection-0.49.0.ebuild
+++ b/dev-perl/Glib-Object-Introspection/Glib-Object-Introspection-0.49.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Dynamically create Perl language bindings"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-perl/glib-perl-1.320.0
diff --git a/dev-perl/Graphics-ColorNames-WWW/Graphics-ColorNames-WWW-1.140.0.ebuild b/dev-perl/Graphics-ColorNames-WWW/Graphics-ColorNames-WWW-1.140.0.ebuild
index 8acabc0aece2..9a85a2b2c974 100644
--- a/dev-perl/Graphics-ColorNames-WWW/Graphics-ColorNames-WWW-1.140.0.ebuild
+++ b/dev-perl/Graphics-ColorNames-WWW/Graphics-ColorNames-WWW-1.140.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="WWW color names and equivalent RGB values"
 
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Graphics-ColorNames/Graphics-ColorNames-3.5.0.ebuild b/dev-perl/Graphics-ColorNames/Graphics-ColorNames-3.5.0.ebuild
index 9e28165465d8..0bd647f72ce1 100644
--- a/dev-perl/Graphics-ColorNames/Graphics-ColorNames-3.5.0.ebuild
+++ b/dev-perl/Graphics-ColorNames/Graphics-ColorNames-3.5.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Defines RGB values for common color names"
 
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Gtk2-Unique/Gtk2-Unique-0.70.0.ebuild b/dev-perl/Gtk2-Unique/Gtk2-Unique-0.70.0.ebuild
index a934db8c153f..a10cc0b99658 100644
--- a/dev-perl/Gtk2-Unique/Gtk2-Unique-0.70.0.ebuild
+++ b/dev-perl/Gtk2-Unique/Gtk2-Unique-0.70.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module virtualx
 DESCRIPTION="Perl binding for C libunique library"
 
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Gtk3-SimpleList/Gtk3-SimpleList-0.210.0.ebuild b/dev-perl/Gtk3-SimpleList/Gtk3-SimpleList-0.210.0.ebuild
index db16c447c2c2..a11e4e7a950f 100644
--- a/dev-perl/Gtk3-SimpleList/Gtk3-SimpleList-0.210.0.ebuild
+++ b/dev-perl/Gtk3-SimpleList/Gtk3-SimpleList-0.210.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A simple interface to GTK+ 3's complex MVC list widget"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Gtk3/Gtk3-0.38.0.ebuild b/dev-perl/Gtk3/Gtk3-0.38.0.ebuild
index 87390c750294..0c515a151032 100644
--- a/dev-perl/Gtk3/Gtk3-0.38.0.ebuild
+++ b/dev-perl/Gtk3/Gtk3-0.38.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module virtualx
 DESCRIPTION="Perl interface to the 3.x series of the gtk+ toolkit"
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/HTML-Clean/HTML-Clean-1.400.0.ebuild b/dev-perl/HTML-Clean/HTML-Clean-1.400.0.ebuild
index 3e1038698972..061a3c109721 100644
--- a/dev-perl/HTML-Clean/HTML-Clean-1.400.0.ebuild
+++ b/dev-perl/HTML-Clean/HTML-Clean-1.400.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Cleans up HTML code for web browsers, not humans"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 RDEPEND="!<app-text/html-xml-utils-5.3"
diff --git a/dev-perl/HTML-Form/HTML-Form-6.70.0.ebuild b/dev-perl/HTML-Form/HTML-Form-6.70.0.ebuild
index 5ee8aad0b97d..b9820521881b 100644
--- a/dev-perl/HTML-Form/HTML-Form-6.70.0.ebuild
+++ b/dev-perl/HTML-Form/HTML-Form-6.70.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Class that represents an HTML form element"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~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 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~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/HTML-HTMLDoc/HTML-HTMLDoc-0.210.0.ebuild b/dev-perl/HTML-HTMLDoc/HTML-HTMLDoc-0.210.0.ebuild
index 0c006565c753..d3e69c3a36cb 100644
--- a/dev-perl/HTML-HTMLDoc/HTML-HTMLDoc-0.210.0.ebuild
+++ b/dev-perl/HTML-HTMLDoc/HTML-HTMLDoc-0.210.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl interface to the htmldoc program for producing PDF-Files from HTML-Content"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc sparc ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/HTML-Mason/HTML-Mason-1.590.0.ebuild b/dev-perl/HTML-Mason/HTML-Mason-1.590.0.ebuild
index 73a798e852df..e3a8c997d4a8 100644
--- a/dev-perl/HTML-Mason/HTML-Mason-1.590.0.ebuild
+++ b/dev-perl/HTML-Mason/HTML-Mason-1.590.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A HTML development and delivery Perl Module"
 HOMEPAGE="http://www.masonhq.com/ https://metacpan.org/release/HTML-Mason"
 
 SLOT="0"
-KEYWORDS="amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="modperl test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/HTML-Object/HTML-Object-2.30.ebuild b/dev-perl/HTML-Object/HTML-Object-2.30.ebuild
index 35c5bb579021..10e65daf43b6 100644
--- a/dev-perl/HTML-Object/HTML-Object-2.30.ebuild
+++ b/dev-perl/HTML-Object/HTML-Object-2.30.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/htmlobject/${MY_P}.tar.gz"
 HOMEPAGE="http://htmlobject.sourceforge.net"
 
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="examples"
 
 RDEPEND="dev-perl/Data-FormValidator
diff --git a/dev-perl/HTML-Parser/HTML-Parser-3.760.0.ebuild b/dev-perl/HTML-Parser/HTML-Parser-3.760.0.ebuild
index 53a9e4694df6..55f81dc0fec0 100644
--- a/dev-perl/HTML-Parser/HTML-Parser-3.760.0.ebuild
+++ b/dev-perl/HTML-Parser/HTML-Parser-3.760.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Parse HTML documents"
 
 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/HTML-Scrubber/HTML-Scrubber-0.190.0.ebuild b/dev-perl/HTML-Scrubber/HTML-Scrubber-0.190.0.ebuild
index 5a7f4f13a7ce..5fabe5729bd2 100644
--- a/dev-perl/HTML-Scrubber/HTML-Scrubber-0.190.0.ebuild
+++ b/dev-perl/HTML-Scrubber/HTML-Scrubber-0.190.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl extension for scrubbing/sanitizing html"
 
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/HTML-TableContentParser/HTML-TableContentParser-0.304.0.ebuild b/dev-perl/HTML-TableContentParser/HTML-TableContentParser-0.304.0.ebuild
index 9794639b9ca8..3ea8235ddc92 100644
--- a/dev-perl/HTML-TableContentParser/HTML-TableContentParser-0.304.0.ebuild
+++ b/dev-perl/HTML-TableContentParser/HTML-TableContentParser-0.304.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Do interesting things with the contents of tables"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/HTML-TableParser/HTML-TableParser-0.430.0.ebuild b/dev-perl/HTML-TableParser/HTML-TableParser-0.430.0.ebuild
index adf76e8516ba..d7949253c28d 100644
--- a/dev-perl/HTML-TableParser/HTML-TableParser-0.430.0.ebuild
+++ b/dev-perl/HTML-TableParser/HTML-TableParser-0.430.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Extract data from an HTML table"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/HTTP-BrowserDetect/HTTP-BrowserDetect-3.310.0.ebuild b/dev-perl/HTTP-BrowserDetect/HTTP-BrowserDetect-3.310.0.ebuild
index d88684c4e8ce..145897d8aa81 100644
--- a/dev-perl/HTTP-BrowserDetect/HTTP-BrowserDetect-3.310.0.ebuild
+++ b/dev-perl/HTTP-BrowserDetect/HTTP-BrowserDetect-3.310.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Determine Web browser, version, and platform from an HTTP user agent string"
 
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~mips ppc ~x86"
+KEYWORDS="amd64 ~hppa ~mips ppc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/HTTP-Cookies/HTTP-Cookies-6.100.0.ebuild b/dev-perl/HTTP-Cookies/HTTP-Cookies-6.100.0.ebuild
index 0e7d9145891b..21b6b67bc4d3 100644
--- a/dev-perl/HTTP-Cookies/HTTP-Cookies-6.100.0.ebuild
+++ b/dev-perl/HTTP-Cookies/HTTP-Cookies-6.100.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Storage of cookies"
 
 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/HTTP-DAV/HTTP-DAV-0.490.0.ebuild b/dev-perl/HTTP-DAV/HTTP-DAV-0.490.0.ebuild
index 276e72eb5e33..897c4d6a7ea0 100644
--- a/dev-perl/HTTP-DAV/HTTP-DAV-0.490.0.ebuild
+++ b/dev-perl/HTTP-DAV/HTTP-DAV-0.490.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A WebDAV client library for Perl5"
 
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="
 	virtual/perl-File-Temp
diff --git a/dev-perl/HTTP-Date/HTTP-Date-6.50.0.ebuild b/dev-perl/HTTP-Date/HTTP-Date-6.50.0.ebuild
index 814ce87cbdf3..83801068fd72 100644
--- a/dev-perl/HTTP-Date/HTTP-Date-6.50.0.ebuild
+++ b/dev-perl/HTTP-Date/HTTP-Date-6.50.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Date conversion for HTTP date formats"
 
 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/HTTP-Message/HTTP-Message-6.320.0.ebuild b/dev-perl/HTTP-Message/HTTP-Message-6.320.0.ebuild
index 9cc56fc4af9f..773aa1998af4 100644
--- a/dev-perl/HTTP-Message/HTTP-Message-6.320.0.ebuild
+++ b/dev-perl/HTTP-Message/HTTP-Message-6.320.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Base class for Request/Response"
 
 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/Hash-MoreUtils/Hash-MoreUtils-0.60.0.ebuild b/dev-perl/Hash-MoreUtils/Hash-MoreUtils-0.60.0.ebuild
index d5f237da9d31..7a8deaa07162 100644
--- a/dev-perl/Hash-MoreUtils/Hash-MoreUtils-0.60.0.ebuild
+++ b/dev-perl/Hash-MoreUtils/Hash-MoreUtils-0.60.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Provide the stuff missing in Hash::Util"
 
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
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 007e2ac162f0..e187378d5f4b 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 a39dbee6be55..0a0fd54f1897 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 0d6676cfe352..ea46c9931b5f 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/Lingua-Stem/Lingua-Stem-2.310.0.ebuild b/dev-perl/Lingua-Stem/Lingua-Stem-2.310.0.ebuild
index adbc240c0f45..1133578dad53 100644
--- a/dev-perl/Lingua-Stem/Lingua-Stem-2.310.0.ebuild
+++ b/dev-perl/Lingua-Stem/Lingua-Stem-2.310.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Stemming of words"
 
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND="dev-perl/Snowball-Norwegian
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 d1bffba46c6a..a00feb4a291b 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 98ba795fc3a8..2e7c383c5b7b 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/Sereal-Decoder/Sereal-Decoder-4.18.0.ebuild b/dev-perl/Sereal-Decoder/Sereal-Decoder-4.18.0.ebuild
index 35cd086f8f19..70f78b018307 100644
--- a/dev-perl/Sereal-Decoder/Sereal-Decoder-4.18.0.ebuild
+++ b/dev-perl/Sereal-Decoder/Sereal-Decoder-4.18.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Fast, compact, powerful binary deserialization"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ppc64 sparc ~x86"
+KEYWORDS="amd64 ~ia64 ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/String-Format/String-Format-1.180.0.ebuild b/dev-perl/String-Format/String-Format-1.180.0.ebuild
index 8f6462ea7a36..a4840eb34d4a 100644
--- a/dev-perl/String-Format/String-Format-1.180.0.ebuild
+++ b/dev-perl/String-Format/String-Format-1.180.0.ebuild
@@ -11,5 +11,5 @@ DESCRIPTION="sprintf-like string formatting capabilities with arbitrary format d
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE=""
diff --git a/dev-perl/Sub-Quote/Sub-Quote-2.6.6.ebuild b/dev-perl/Sub-Quote/Sub-Quote-2.6.6.ebuild
index d2e944993f15..3ee62a2d6de6 100644
--- a/dev-perl/Sub-Quote/Sub-Quote-2.6.6.ebuild
+++ b/dev-perl/Sub-Quote/Sub-Quote-2.6.6.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Efficient generation of subroutines via string eval"
 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 minimal"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.420.0-r1.ebuild b/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.420.0-r1.ebuild
index 85498e1058d3..56c502678bb4 100644
--- a/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.420.0-r1.ebuild
+++ b/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.420.0-r1.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Perl extension for the GNU Readline/History Library"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Test-Needs/Test-Needs-0.2.9.ebuild b/dev-perl/Test-Needs/Test-Needs-0.2.9.ebuild
index 51df6adaab3e..ff92ff145f58 100644
--- a/dev-perl/Test-Needs/Test-Needs-0.2.9.ebuild
+++ b/dev-perl/Test-Needs/Test-Needs-0.2.9.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Skip tests when modules not available"
 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=""
 BDEPEND="${RDEPEND}
diff --git a/dev-perl/rename/rename-1.1100.0.ebuild b/dev-perl/rename/rename-1.1100.0.ebuild
index c3c820e39c42..6343fd88ce77 100644
--- a/dev-perl/rename/rename-1.1100.0.ebuild
+++ b/dev-perl/rename/rename-1.1100.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A filename renaming utility based on perl regular expression"
 
 HOMEPAGE="https://metacpan.org/source/PEDERST/rename-1.11"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 src_install() {