sec-policy/*: stable for arm, arm64

Signed-off-by: Sam James <sam@gentoo.org>

507 files changed, 507 insertions, 507 deletions

diff --git a/sec-policy/selinux-abrt/selinux-abrt-2.20200818-r2.ebuild b/sec-policy/selinux-abrt/selinux-abrt-2.20200818-r2.ebuild
index a8ccf75cd425..f5b163d6b1c0 100644
--- a/sec-policy/selinux-abrt/selinux-abrt-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-abrt/selinux-abrt-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for abrt"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-abrt/selinux-abrt-2.20210203-r1.ebuild b/sec-policy/selinux-abrt/selinux-abrt-2.20210203-r1.ebuild
index a8ccf75cd425..f5b163d6b1c0 100644
--- a/sec-policy/selinux-abrt/selinux-abrt-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-abrt/selinux-abrt-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for abrt"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-accountsd/selinux-accountsd-2.20200818-r2.ebuild b/sec-policy/selinux-accountsd/selinux-accountsd-2.20200818-r2.ebuild
index 6669e96c001a..439a750f42f5 100644
--- a/sec-policy/selinux-accountsd/selinux-accountsd-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-accountsd/selinux-accountsd-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for accountsd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-accountsd/selinux-accountsd-2.20210203-r1.ebuild b/sec-policy/selinux-accountsd/selinux-accountsd-2.20210203-r1.ebuild
index 6669e96c001a..439a750f42f5 100644
--- a/sec-policy/selinux-accountsd/selinux-accountsd-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-accountsd/selinux-accountsd-2.20210203-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for accountsd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-acct/selinux-acct-2.20200818-r2.ebuild b/sec-policy/selinux-acct/selinux-acct-2.20200818-r2.ebuild
index 01cbb39090d5..d32ded49bed3 100644
--- a/sec-policy/selinux-acct/selinux-acct-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-acct/selinux-acct-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for acct"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-acct/selinux-acct-2.20210203-r1.ebuild b/sec-policy/selinux-acct/selinux-acct-2.20210203-r1.ebuild
index 01cbb39090d5..d32ded49bed3 100644
--- a/sec-policy/selinux-acct/selinux-acct-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-acct/selinux-acct-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for acct"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-afs/selinux-afs-2.20200818-r2.ebuild b/sec-policy/selinux-afs/selinux-afs-2.20200818-r2.ebuild
index 77a5cb05de0e..6c1a6e87cf1e 100644
--- a/sec-policy/selinux-afs/selinux-afs-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-afs/selinux-afs-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for afs"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-afs/selinux-afs-2.20210203-r1.ebuild b/sec-policy/selinux-afs/selinux-afs-2.20210203-r1.ebuild
index 77a5cb05de0e..6c1a6e87cf1e 100644
--- a/sec-policy/selinux-afs/selinux-afs-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-afs/selinux-afs-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for afs"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-aide/selinux-aide-2.20200818-r2.ebuild b/sec-policy/selinux-aide/selinux-aide-2.20200818-r2.ebuild
index 0a49215f5f7a..f0a037ef39cf 100644
--- a/sec-policy/selinux-aide/selinux-aide-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-aide/selinux-aide-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for aide"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-aide/selinux-aide-2.20210203-r1.ebuild b/sec-policy/selinux-aide/selinux-aide-2.20210203-r1.ebuild
index 0a49215f5f7a..f0a037ef39cf 100644
--- a/sec-policy/selinux-aide/selinux-aide-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-aide/selinux-aide-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for aide"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-alsa/selinux-alsa-2.20200818-r2.ebuild b/sec-policy/selinux-alsa/selinux-alsa-2.20200818-r2.ebuild
index 320670116e18..b17b184e1f59 100644
--- a/sec-policy/selinux-alsa/selinux-alsa-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-alsa/selinux-alsa-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for alsa"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-alsa/selinux-alsa-2.20210203-r1.ebuild b/sec-policy/selinux-alsa/selinux-alsa-2.20210203-r1.ebuild
index 320670116e18..b17b184e1f59 100644
--- a/sec-policy/selinux-alsa/selinux-alsa-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-alsa/selinux-alsa-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for alsa"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-amanda/selinux-amanda-2.20200818-r2.ebuild b/sec-policy/selinux-amanda/selinux-amanda-2.20200818-r2.ebuild
index edc48b041dff..c60940648a35 100644
--- a/sec-policy/selinux-amanda/selinux-amanda-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-amanda/selinux-amanda-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for amanda"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-inetd
diff --git a/sec-policy/selinux-amanda/selinux-amanda-2.20210203-r1.ebuild b/sec-policy/selinux-amanda/selinux-amanda-2.20210203-r1.ebuild
index edc48b041dff..c60940648a35 100644
--- a/sec-policy/selinux-amanda/selinux-amanda-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-amanda/selinux-amanda-2.20210203-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for amanda"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-inetd
diff --git a/sec-policy/selinux-amavis/selinux-amavis-2.20200818-r2.ebuild b/sec-policy/selinux-amavis/selinux-amavis-2.20200818-r2.ebuild
index 76ceb6d58f19..6c977f126036 100644
--- a/sec-policy/selinux-amavis/selinux-amavis-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-amavis/selinux-amavis-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for amavis"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-amavis/selinux-amavis-2.20210203-r1.ebuild b/sec-policy/selinux-amavis/selinux-amavis-2.20210203-r1.ebuild
index 76ceb6d58f19..6c977f126036 100644
--- a/sec-policy/selinux-amavis/selinux-amavis-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-amavis/selinux-amavis-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for amavis"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-android/selinux-android-2.20200818-r2.ebuild b/sec-policy/selinux-android/selinux-android-2.20200818-r2.ebuild
index 8d57f8ab09cb..9bdb1ad452e7 100644
--- a/sec-policy/selinux-android/selinux-android-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-android/selinux-android-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for android"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-android/selinux-android-2.20210203-r1.ebuild b/sec-policy/selinux-android/selinux-android-2.20210203-r1.ebuild
index 8d57f8ab09cb..9bdb1ad452e7 100644
--- a/sec-policy/selinux-android/selinux-android-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-android/selinux-android-2.20210203-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for android"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-apache/selinux-apache-2.20200818-r2.ebuild b/sec-policy/selinux-apache/selinux-apache-2.20200818-r2.ebuild
index e5dc20530882..1b579e1826cd 100644
--- a/sec-policy/selinux-apache/selinux-apache-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-apache/selinux-apache-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for apache"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-kerberos
diff --git a/sec-policy/selinux-apache/selinux-apache-2.20210203-r1.ebuild b/sec-policy/selinux-apache/selinux-apache-2.20210203-r1.ebuild
index e5dc20530882..1b579e1826cd 100644
--- a/sec-policy/selinux-apache/selinux-apache-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-apache/selinux-apache-2.20210203-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for apache"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-kerberos
diff --git a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20200818-r2.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20200818-r2.ebuild
index 7755d4404c06..985fb3f4b173 100644
--- a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for apcupsd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20210203-r1.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20210203-r1.ebuild
index 7755d4404c06..985fb3f4b173 100644
--- a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20210203-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for apcupsd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-apm/selinux-apm-2.20200818-r2.ebuild b/sec-policy/selinux-apm/selinux-apm-2.20200818-r2.ebuild
index 50e0dda45c45..46dc1da3de99 100644
--- a/sec-policy/selinux-apm/selinux-apm-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-apm/selinux-apm-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for acpi"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 
 pkg_postinst() {
diff --git a/sec-policy/selinux-apm/selinux-apm-2.20210203-r1.ebuild b/sec-policy/selinux-apm/selinux-apm-2.20210203-r1.ebuild
index 50e0dda45c45..46dc1da3de99 100644
--- a/sec-policy/selinux-apm/selinux-apm-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-apm/selinux-apm-2.20210203-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for acpi"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 
 pkg_postinst() {
diff --git a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20200818-r2.ebuild b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20200818-r2.ebuild
index b1c3c54b414a..3f38d26f0417 100644
--- a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for arpwatch"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20210203-r1.ebuild b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20210203-r1.ebuild
index b1c3c54b414a..3f38d26f0417 100644
--- a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for arpwatch"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-asterisk/selinux-asterisk-2.20200818-r2.ebuild b/sec-policy/selinux-asterisk/selinux-asterisk-2.20200818-r2.ebuild
index 09405e4b4dcd..f57d7d39daa8 100644
--- a/sec-policy/selinux-asterisk/selinux-asterisk-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-asterisk/selinux-asterisk-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for asterisk"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-asterisk/selinux-asterisk-2.20210203-r1.ebuild b/sec-policy/selinux-asterisk/selinux-asterisk-2.20210203-r1.ebuild
index 09405e4b4dcd..f57d7d39daa8 100644
--- a/sec-policy/selinux-asterisk/selinux-asterisk-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-asterisk/selinux-asterisk-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for asterisk"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-at/selinux-at-2.20200818-r2.ebuild b/sec-policy/selinux-at/selinux-at-2.20200818-r2.ebuild
index 3e479e60aed9..ea55e43c96e6 100644
--- a/sec-policy/selinux-at/selinux-at-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-at/selinux-at-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for at"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-at/selinux-at-2.20210203-r1.ebuild b/sec-policy/selinux-at/selinux-at-2.20210203-r1.ebuild
index 3e479e60aed9..ea55e43c96e6 100644
--- a/sec-policy/selinux-at/selinux-at-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-at/selinux-at-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for at"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-automount/selinux-automount-2.20200818-r2.ebuild b/sec-policy/selinux-automount/selinux-automount-2.20200818-r2.ebuild
index 0bcde8ce32c5..284d85e241d9 100644
--- a/sec-policy/selinux-automount/selinux-automount-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-automount/selinux-automount-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for automount"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-automount/selinux-automount-2.20210203-r1.ebuild b/sec-policy/selinux-automount/selinux-automount-2.20210203-r1.ebuild
index 0bcde8ce32c5..284d85e241d9 100644
--- a/sec-policy/selinux-automount/selinux-automount-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-automount/selinux-automount-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for automount"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-avahi/selinux-avahi-2.20200818-r2.ebuild b/sec-policy/selinux-avahi/selinux-avahi-2.20200818-r2.ebuild
index 2b7c32f4be72..af494c1f9b32 100644
--- a/sec-policy/selinux-avahi/selinux-avahi-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-avahi/selinux-avahi-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for avahi"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-avahi/selinux-avahi-2.20210203-r1.ebuild b/sec-policy/selinux-avahi/selinux-avahi-2.20210203-r1.ebuild
index 2b7c32f4be72..af494c1f9b32 100644
--- a/sec-policy/selinux-avahi/selinux-avahi-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-avahi/selinux-avahi-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for avahi"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-awstats/selinux-awstats-2.20200818-r2.ebuild b/sec-policy/selinux-awstats/selinux-awstats-2.20200818-r2.ebuild
index 87a7ba116d0d..4ffa7b0246b2 100644
--- a/sec-policy/selinux-awstats/selinux-awstats-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-awstats/selinux-awstats-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for awstats"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-awstats/selinux-awstats-2.20210203-r1.ebuild b/sec-policy/selinux-awstats/selinux-awstats-2.20210203-r1.ebuild
index 87a7ba116d0d..4ffa7b0246b2 100644
--- a/sec-policy/selinux-awstats/selinux-awstats-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-awstats/selinux-awstats-2.20210203-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for awstats"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-backup/selinux-backup-2.20200818-r2.ebuild b/sec-policy/selinux-backup/selinux-backup-2.20200818-r2.ebuild
index 3788bf353a4d..64cfa8507972 100644
--- a/sec-policy/selinux-backup/selinux-backup-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-backup/selinux-backup-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for generic backup apps"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-backup/selinux-backup-2.20210203-r1.ebuild b/sec-policy/selinux-backup/selinux-backup-2.20210203-r1.ebuild
index 3788bf353a4d..64cfa8507972 100644
--- a/sec-policy/selinux-backup/selinux-backup-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-backup/selinux-backup-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for generic backup apps"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-bacula/selinux-bacula-2.20200818-r2.ebuild b/sec-policy/selinux-bacula/selinux-bacula-2.20200818-r2.ebuild
index e0696b23464b..328690d779ea 100644
--- a/sec-policy/selinux-bacula/selinux-bacula-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-bacula/selinux-bacula-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for bacula"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-bacula/selinux-bacula-2.20210203-r1.ebuild b/sec-policy/selinux-bacula/selinux-bacula-2.20210203-r1.ebuild
index e0696b23464b..328690d779ea 100644
--- a/sec-policy/selinux-bacula/selinux-bacula-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-bacula/selinux-bacula-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for bacula"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20200818-r2.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20200818-r2.ebuild
index f1eece9e56fe..8f43b477ccee 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20200818-r2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_${PV/./_}/refpolicy-${PV}.tar.bz2
 			https://dev.gentoo.org/~perfinion/patches/${PN}/patchbundle-${PN}-${PVR}.tar.bz2"
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:SELinux"
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20210203-r1.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20210203-r1.ebuild
index 471440a59b8a..56db7e92b5d0 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20210203-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_${PV/./_}/refpolicy-${PV}.tar.bz2
 			https://dev.gentoo.org/~perfinion/patches/${PN}/patchbundle-${PN}-${PVR}.tar.bz2"
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:SELinux"
diff --git a/sec-policy/selinux-base/selinux-base-2.20200818-r2.ebuild b/sec-policy/selinux-base/selinux-base-2.20200818-r2.ebuild
index 7597060e52e3..a0491b496df9 100644
--- a/sec-policy/selinux-base/selinux-base-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-base/selinux-base-2.20200818-r2.ebuild
@@ -13,7 +13,7 @@ else
 	SRC_URI="https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_${PV/./_}/refpolicy-${PV}.tar.bz2
 			https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-${PVR}.tar.bz2"
 
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 
 IUSE="doc +unknown-perms systemd +ubac +unconfined"
diff --git a/sec-policy/selinux-base/selinux-base-2.20210203-r1.ebuild b/sec-policy/selinux-base/selinux-base-2.20210203-r1.ebuild
index 30334fc4b6f5..501b401f0312 100644
--- a/sec-policy/selinux-base/selinux-base-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-base/selinux-base-2.20210203-r1.ebuild
@@ -17,7 +17,7 @@ else
 	SRC_URI="https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_${PV/./_}/refpolicy-${PV}.tar.bz2
 			https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-${PVR}.tar.bz2"
 
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 
 IUSE="doc +unknown-perms systemd +ubac +unconfined"
diff --git a/sec-policy/selinux-bind/selinux-bind-2.20200818-r2.ebuild b/sec-policy/selinux-bind/selinux-bind-2.20200818-r2.ebuild
index f7838d55e7be..7ba748cc18a3 100644
--- a/sec-policy/selinux-bind/selinux-bind-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-bind/selinux-bind-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for bind"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-bind/selinux-bind-2.20210203-r1.ebuild b/sec-policy/selinux-bind/selinux-bind-2.20210203-r1.ebuild
index f7838d55e7be..7ba748cc18a3 100644
--- a/sec-policy/selinux-bind/selinux-bind-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-bind/selinux-bind-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for bind"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20200818-r2.ebuild b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20200818-r2.ebuild
index fa299d72d686..ab09c8253a02 100644
--- a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for bitcoin"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20210203-r1.ebuild b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20210203-r1.ebuild
index fa299d72d686..ab09c8253a02 100644
--- a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for bitcoin"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20200818-r2.ebuild b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20200818-r2.ebuild
index ac75981eba58..bde7f32a689a 100644
--- a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for bitlbee"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20210203-r1.ebuild b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20210203-r1.ebuild
index ac75981eba58..bde7f32a689a 100644
--- a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20210203-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for bitlbee"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20200818-r2.ebuild b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20200818-r2.ebuild
index 4b31709d32ca..0633ae59b1c9 100644
--- a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for bluetooth"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20210203-r1.ebuild b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20210203-r1.ebuild
index 4b31709d32ca..0633ae59b1c9 100644
--- a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for bluetooth"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-brctl/selinux-brctl-2.20200818-r2.ebuild b/sec-policy/selinux-brctl/selinux-brctl-2.20200818-r2.ebuild
index 45a4d7b7e2bb..6979ed3519b8 100644
--- a/sec-policy/selinux-brctl/selinux-brctl-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-brctl/selinux-brctl-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for brctl"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-brctl/selinux-brctl-2.20210203-r1.ebuild b/sec-policy/selinux-brctl/selinux-brctl-2.20210203-r1.ebuild
index 45a4d7b7e2bb..6979ed3519b8 100644
--- a/sec-policy/selinux-brctl/selinux-brctl-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-brctl/selinux-brctl-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for brctl"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20200818-r2.ebuild b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20200818-r2.ebuild
index 5929e1ab6feb..32570dacc511 100644
--- a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cachefilesd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20210203-r1.ebuild b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20210203-r1.ebuild
index 5929e1ab6feb..32570dacc511 100644
--- a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cachefilesd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-calamaris/selinux-calamaris-2.20200818-r2.ebuild b/sec-policy/selinux-calamaris/selinux-calamaris-2.20200818-r2.ebuild
index ac224963ee64..4a7cc4f08e6a 100644
--- a/sec-policy/selinux-calamaris/selinux-calamaris-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-calamaris/selinux-calamaris-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for calamaris"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-calamaris/selinux-calamaris-2.20210203-r1.ebuild b/sec-policy/selinux-calamaris/selinux-calamaris-2.20210203-r1.ebuild
index ac224963ee64..4a7cc4f08e6a 100644
--- a/sec-policy/selinux-calamaris/selinux-calamaris-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-calamaris/selinux-calamaris-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for calamaris"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-canna/selinux-canna-2.20200818-r2.ebuild b/sec-policy/selinux-canna/selinux-canna-2.20200818-r2.ebuild
index d4e5866a6198..2b2ae20df382 100644
--- a/sec-policy/selinux-canna/selinux-canna-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-canna/selinux-canna-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for canna"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-canna/selinux-canna-2.20210203-r1.ebuild b/sec-policy/selinux-canna/selinux-canna-2.20210203-r1.ebuild
index d4e5866a6198..2b2ae20df382 100644
--- a/sec-policy/selinux-canna/selinux-canna-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-canna/selinux-canna-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for canna"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ccs/selinux-ccs-2.20200818-r2.ebuild b/sec-policy/selinux-ccs/selinux-ccs-2.20200818-r2.ebuild
index 96d189a124c8..24bd9d3dd29f 100644
--- a/sec-policy/selinux-ccs/selinux-ccs-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-ccs/selinux-ccs-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ccs"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ccs/selinux-ccs-2.20210203-r1.ebuild b/sec-policy/selinux-ccs/selinux-ccs-2.20210203-r1.ebuild
index 96d189a124c8..24bd9d3dd29f 100644
--- a/sec-policy/selinux-ccs/selinux-ccs-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-ccs/selinux-ccs-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ccs"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20200818-r2.ebuild b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20200818-r2.ebuild
index 0c5f5b8c7262..64637ddeb12e 100644
--- a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cdrecord"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20210203-r1.ebuild b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20210203-r1.ebuild
index 0c5f5b8c7262..64637ddeb12e 100644
--- a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cdrecord"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ceph/selinux-ceph-2.20200818-r2.ebuild b/sec-policy/selinux-ceph/selinux-ceph-2.20200818-r2.ebuild
index 76d02346bef0..0a2f76b74297 100644
--- a/sec-policy/selinux-ceph/selinux-ceph-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-ceph/selinux-ceph-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ceph"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ceph/selinux-ceph-2.20210203-r1.ebuild b/sec-policy/selinux-ceph/selinux-ceph-2.20210203-r1.ebuild
index 76d02346bef0..0a2f76b74297 100644
--- a/sec-policy/selinux-ceph/selinux-ceph-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-ceph/selinux-ceph-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ceph"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20200818-r2.ebuild b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20200818-r2.ebuild
index 7b423c675726..a2c9a45b3cd3 100644
--- a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cgmanager"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20210203-r1.ebuild b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20210203-r1.ebuild
index 7b423c675726..a2c9a45b3cd3 100644
--- a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cgmanager"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-cgroup/selinux-cgroup-2.20200818-r2.ebuild b/sec-policy/selinux-cgroup/selinux-cgroup-2.20200818-r2.ebuild
index 73df2cac9c1d..b2dcaaf58e7b 100644
--- a/sec-policy/selinux-cgroup/selinux-cgroup-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-cgroup/selinux-cgroup-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cgroup"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-cgroup/selinux-cgroup-2.20210203-r1.ebuild b/sec-policy/selinux-cgroup/selinux-cgroup-2.20210203-r1.ebuild
index 73df2cac9c1d..b2dcaaf58e7b 100644
--- a/sec-policy/selinux-cgroup/selinux-cgroup-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-cgroup/selinux-cgroup-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cgroup"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-chromium/selinux-chromium-2.20200818-r2.ebuild b/sec-policy/selinux-chromium/selinux-chromium-2.20200818-r2.ebuild
index 800e68f9d5af..195883b0900f 100644
--- a/sec-policy/selinux-chromium/selinux-chromium-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-chromium/selinux-chromium-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for chromium"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-chromium/selinux-chromium-2.20210203-r1.ebuild b/sec-policy/selinux-chromium/selinux-chromium-2.20210203-r1.ebuild
index 800e68f9d5af..195883b0900f 100644
--- a/sec-policy/selinux-chromium/selinux-chromium-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-chromium/selinux-chromium-2.20210203-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for chromium"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-chronyd/selinux-chronyd-2.20200818-r2.ebuild b/sec-policy/selinux-chronyd/selinux-chronyd-2.20200818-r2.ebuild
index d6a5c1bd16d5..4250b7e59270 100644
--- a/sec-policy/selinux-chronyd/selinux-chronyd-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-chronyd/selinux-chronyd-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for chronyd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-chronyd/selinux-chronyd-2.20210203-r1.ebuild b/sec-policy/selinux-chronyd/selinux-chronyd-2.20210203-r1.ebuild
index d6a5c1bd16d5..4250b7e59270 100644
--- a/sec-policy/selinux-chronyd/selinux-chronyd-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-chronyd/selinux-chronyd-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for chronyd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-clamav/selinux-clamav-2.20200818-r2.ebuild b/sec-policy/selinux-clamav/selinux-clamav-2.20200818-r2.ebuild
index d82c659b0aea..1e2094ff2cd2 100644
--- a/sec-policy/selinux-clamav/selinux-clamav-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-clamav/selinux-clamav-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for clamav"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-clamav/selinux-clamav-2.20210203-r1.ebuild b/sec-policy/selinux-clamav/selinux-clamav-2.20210203-r1.ebuild
index d82c659b0aea..1e2094ff2cd2 100644
--- a/sec-policy/selinux-clamav/selinux-clamav-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-clamav/selinux-clamav-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for clamav"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20200818-r2.ebuild b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20200818-r2.ebuild
index 1a4a9eefeb3f..25cb478ff8fa 100644
--- a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for clockspeed"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20210203-r1.ebuild b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20210203-r1.ebuild
index 1a4a9eefeb3f..25cb478ff8fa 100644
--- a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for clockspeed"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-collectd/selinux-collectd-2.20200818-r2.ebuild b/sec-policy/selinux-collectd/selinux-collectd-2.20200818-r2.ebuild
index 8cafaa230651..ad5f6298c7f7 100644
--- a/sec-policy/selinux-collectd/selinux-collectd-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-collectd/selinux-collectd-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for collectd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-collectd/selinux-collectd-2.20210203-r1.ebuild b/sec-policy/selinux-collectd/selinux-collectd-2.20210203-r1.ebuild
index 8cafaa230651..ad5f6298c7f7 100644
--- a/sec-policy/selinux-collectd/selinux-collectd-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-collectd/selinux-collectd-2.20210203-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for collectd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-colord/selinux-colord-2.20200818-r2.ebuild b/sec-policy/selinux-colord/selinux-colord-2.20200818-r2.ebuild
index 19ed35443dbc..21e3f6d5dafe 100644
--- a/sec-policy/selinux-colord/selinux-colord-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-colord/selinux-colord-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for colord"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-colord/selinux-colord-2.20210203-r1.ebuild b/sec-policy/selinux-colord/selinux-colord-2.20210203-r1.ebuild
index 19ed35443dbc..21e3f6d5dafe 100644
--- a/sec-policy/selinux-colord/selinux-colord-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-colord/selinux-colord-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for colord"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-corosync/selinux-corosync-2.20200818-r2.ebuild b/sec-policy/selinux-corosync/selinux-corosync-2.20200818-r2.ebuild
index 90cc34dec39a..cf7ec3228f0b 100644
--- a/sec-policy/selinux-corosync/selinux-corosync-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-corosync/selinux-corosync-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for corosync"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-corosync/selinux-corosync-2.20210203-r1.ebuild b/sec-policy/selinux-corosync/selinux-corosync-2.20210203-r1.ebuild
index 90cc34dec39a..cf7ec3228f0b 100644
--- a/sec-policy/selinux-corosync/selinux-corosync-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-corosync/selinux-corosync-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for corosync"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-couchdb/selinux-couchdb-2.20200818-r2.ebuild b/sec-policy/selinux-couchdb/selinux-couchdb-2.20200818-r2.ebuild
index 1da35f7b632f..c0d649449225 100644
--- a/sec-policy/selinux-couchdb/selinux-couchdb-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-couchdb/selinux-couchdb-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for couchdb"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-couchdb/selinux-couchdb-2.20210203-r1.ebuild b/sec-policy/selinux-couchdb/selinux-couchdb-2.20210203-r1.ebuild
index 1da35f7b632f..c0d649449225 100644
--- a/sec-policy/selinux-couchdb/selinux-couchdb-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-couchdb/selinux-couchdb-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for couchdb"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-courier/selinux-courier-2.20200818-r2.ebuild b/sec-policy/selinux-courier/selinux-courier-2.20200818-r2.ebuild
index 5db53967b20b..dbebab64dc4c 100644
--- a/sec-policy/selinux-courier/selinux-courier-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-courier/selinux-courier-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for courier"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-courier/selinux-courier-2.20210203-r1.ebuild b/sec-policy/selinux-courier/selinux-courier-2.20210203-r1.ebuild
index 5db53967b20b..dbebab64dc4c 100644
--- a/sec-policy/selinux-courier/selinux-courier-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-courier/selinux-courier-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for courier"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20200818-r2.ebuild b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20200818-r2.ebuild
index fd7b5fd4661d..d715964e30d1 100644
--- a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cpucontrol"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20210203-r1.ebuild b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20210203-r1.ebuild
index fd7b5fd4661d..d715964e30d1 100644
--- a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cpucontrol"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20200818-r2.ebuild b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20200818-r2.ebuild
index 5b54858e6991..c35622178d13 100644
--- a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cpufreqselector"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20210203-r1.ebuild b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20210203-r1.ebuild
index 5b54858e6991..c35622178d13 100644
--- a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cpufreqselector"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-cups/selinux-cups-2.20200818-r2.ebuild b/sec-policy/selinux-cups/selinux-cups-2.20200818-r2.ebuild
index 4c2156916325..f9929af5bf63 100644
--- a/sec-policy/selinux-cups/selinux-cups-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-cups/selinux-cups-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cups"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-lpd
diff --git a/sec-policy/selinux-cups/selinux-cups-2.20210203-r1.ebuild b/sec-policy/selinux-cups/selinux-cups-2.20210203-r1.ebuild
index 4c2156916325..f9929af5bf63 100644
--- a/sec-policy/selinux-cups/selinux-cups-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-cups/selinux-cups-2.20210203-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cups"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-lpd
diff --git a/sec-policy/selinux-cvs/selinux-cvs-2.20200818-r2.ebuild b/sec-policy/selinux-cvs/selinux-cvs-2.20200818-r2.ebuild
index c49ae4672cdd..1049aaa7691f 100644
--- a/sec-policy/selinux-cvs/selinux-cvs-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-cvs/selinux-cvs-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cvs"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-cvs/selinux-cvs-2.20210203-r1.ebuild b/sec-policy/selinux-cvs/selinux-cvs-2.20210203-r1.ebuild
index c49ae4672cdd..1049aaa7691f 100644
--- a/sec-policy/selinux-cvs/selinux-cvs-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-cvs/selinux-cvs-2.20210203-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cvs"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20200818-r2.ebuild b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20200818-r2.ebuild
index 00104abb1a61..e840bef8b660 100644
--- a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cyphesis"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20210203-r1.ebuild b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20210203-r1.ebuild
index 00104abb1a61..e840bef8b660 100644
--- a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cyphesis"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-daemontools/selinux-daemontools-2.20200818-r2.ebuild b/sec-policy/selinux-daemontools/selinux-daemontools-2.20200818-r2.ebuild
index a81ecea42e29..6d0af0f44500 100644
--- a/sec-policy/selinux-daemontools/selinux-daemontools-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-daemontools/selinux-daemontools-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for daemontools"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-daemontools/selinux-daemontools-2.20210203-r1.ebuild b/sec-policy/selinux-daemontools/selinux-daemontools-2.20210203-r1.ebuild
index a81ecea42e29..6d0af0f44500 100644
--- a/sec-policy/selinux-daemontools/selinux-daemontools-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-daemontools/selinux-daemontools-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for daemontools"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dante/selinux-dante-2.20200818-r2.ebuild b/sec-policy/selinux-dante/selinux-dante-2.20200818-r2.ebuild
index a14faca8a231..e0c7959508c5 100644
--- a/sec-policy/selinux-dante/selinux-dante-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-dante/selinux-dante-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dante"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dante/selinux-dante-2.20210203-r1.ebuild b/sec-policy/selinux-dante/selinux-dante-2.20210203-r1.ebuild
index a14faca8a231..e0c7959508c5 100644
--- a/sec-policy/selinux-dante/selinux-dante-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-dante/selinux-dante-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dante"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dbadm/selinux-dbadm-2.20200818-r2.ebuild b/sec-policy/selinux-dbadm/selinux-dbadm-2.20200818-r2.ebuild
index 0893abe79587..59383536c5b0 100644
--- a/sec-policy/selinux-dbadm/selinux-dbadm-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-dbadm/selinux-dbadm-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dbadm"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dbadm/selinux-dbadm-2.20210203-r1.ebuild b/sec-policy/selinux-dbadm/selinux-dbadm-2.20210203-r1.ebuild
index 0893abe79587..59383536c5b0 100644
--- a/sec-policy/selinux-dbadm/selinux-dbadm-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-dbadm/selinux-dbadm-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dbadm"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dbskk/selinux-dbskk-2.20200818-r2.ebuild b/sec-policy/selinux-dbskk/selinux-dbskk-2.20200818-r2.ebuild
index c56a0e028adb..00dc17b582c1 100644
--- a/sec-policy/selinux-dbskk/selinux-dbskk-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-dbskk/selinux-dbskk-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dbskk"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-inetd
diff --git a/sec-policy/selinux-dbskk/selinux-dbskk-2.20210203-r1.ebuild b/sec-policy/selinux-dbskk/selinux-dbskk-2.20210203-r1.ebuild
index c56a0e028adb..00dc17b582c1 100644
--- a/sec-policy/selinux-dbskk/selinux-dbskk-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-dbskk/selinux-dbskk-2.20210203-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dbskk"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-inetd
diff --git a/sec-policy/selinux-dbus/selinux-dbus-2.20200818-r2.ebuild b/sec-policy/selinux-dbus/selinux-dbus-2.20200818-r2.ebuild
index 833d34d014a4..a8b0180e5bdb 100644
--- a/sec-policy/selinux-dbus/selinux-dbus-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-dbus/selinux-dbus-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dbus"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dbus/selinux-dbus-2.20210203-r1.ebuild b/sec-policy/selinux-dbus/selinux-dbus-2.20210203-r1.ebuild
index 833d34d014a4..a8b0180e5bdb 100644
--- a/sec-policy/selinux-dbus/selinux-dbus-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-dbus/selinux-dbus-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dbus"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dcc/selinux-dcc-2.20200818-r2.ebuild b/sec-policy/selinux-dcc/selinux-dcc-2.20200818-r2.ebuild
index 68e8b9bd3234..888831e784dc 100644
--- a/sec-policy/selinux-dcc/selinux-dcc-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-dcc/selinux-dcc-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dcc"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dcc/selinux-dcc-2.20210203-r1.ebuild b/sec-policy/selinux-dcc/selinux-dcc-2.20210203-r1.ebuild
index 68e8b9bd3234..888831e784dc 100644
--- a/sec-policy/selinux-dcc/selinux-dcc-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-dcc/selinux-dcc-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dcc"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ddclient/selinux-ddclient-2.20200818-r2.ebuild b/sec-policy/selinux-ddclient/selinux-ddclient-2.20200818-r2.ebuild
index 52dc30055624..ae4ba29ef504 100644
--- a/sec-policy/selinux-ddclient/selinux-ddclient-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-ddclient/selinux-ddclient-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ddclient"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ddclient/selinux-ddclient-2.20210203-r1.ebuild b/sec-policy/selinux-ddclient/selinux-ddclient-2.20210203-r1.ebuild
index 52dc30055624..ae4ba29ef504 100644
--- a/sec-policy/selinux-ddclient/selinux-ddclient-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-ddclient/selinux-ddclient-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ddclient"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20200818-r2.ebuild b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20200818-r2.ebuild
index c6cf965ec7e8..4c98f132aff4 100644
--- a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ddcprobe"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20210203-r1.ebuild b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20210203-r1.ebuild
index c6cf965ec7e8..4c98f132aff4 100644
--- a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ddcprobe"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20200818-r2.ebuild b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20200818-r2.ebuild
index 2725adf8f4aa..8db6052323db 100644
--- a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for denyhosts"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20210203-r1.ebuild b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20210203-r1.ebuild
index 2725adf8f4aa..8db6052323db 100644
--- a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for denyhosts"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-devicekit/selinux-devicekit-2.20200818-r2.ebuild b/sec-policy/selinux-devicekit/selinux-devicekit-2.20200818-r2.ebuild
index 03be34629e32..8c65493dc744 100644
--- a/sec-policy/selinux-devicekit/selinux-devicekit-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-devicekit/selinux-devicekit-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for devicekit"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-devicekit/selinux-devicekit-2.20210203-r1.ebuild b/sec-policy/selinux-devicekit/selinux-devicekit-2.20210203-r1.ebuild
index 03be34629e32..8c65493dc744 100644
--- a/sec-policy/selinux-devicekit/selinux-devicekit-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-devicekit/selinux-devicekit-2.20210203-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for devicekit"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-dhcp/selinux-dhcp-2.20200818-r2.ebuild b/sec-policy/selinux-dhcp/selinux-dhcp-2.20200818-r2.ebuild
index 18a9895a06a5..c61b4782b08b 100644
--- a/sec-policy/selinux-dhcp/selinux-dhcp-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-dhcp/selinux-dhcp-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dhcp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dhcp/selinux-dhcp-2.20210203-r1.ebuild b/sec-policy/selinux-dhcp/selinux-dhcp-2.20210203-r1.ebuild
index 18a9895a06a5..c61b4782b08b 100644
--- a/sec-policy/selinux-dhcp/selinux-dhcp-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-dhcp/selinux-dhcp-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dhcp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dictd/selinux-dictd-2.20200818-r2.ebuild b/sec-policy/selinux-dictd/selinux-dictd-2.20200818-r2.ebuild
index b8f2b4bc6dfc..6f512cd129fa 100644
--- a/sec-policy/selinux-dictd/selinux-dictd-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-dictd/selinux-dictd-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dictd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dictd/selinux-dictd-2.20210203-r1.ebuild b/sec-policy/selinux-dictd/selinux-dictd-2.20210203-r1.ebuild
index b8f2b4bc6dfc..6f512cd129fa 100644
--- a/sec-policy/selinux-dictd/selinux-dictd-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-dictd/selinux-dictd-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dictd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dirmngr/selinux-dirmngr-2.20200818-r2.ebuild b/sec-policy/selinux-dirmngr/selinux-dirmngr-2.20200818-r2.ebuild
index 9715e4853130..9d80e359750a 100644
--- a/sec-policy/selinux-dirmngr/selinux-dirmngr-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-dirmngr/selinux-dirmngr-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dirmngr"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dirmngr/selinux-dirmngr-2.20210203-r1.ebuild b/sec-policy/selinux-dirmngr/selinux-dirmngr-2.20210203-r1.ebuild
index 9715e4853130..9d80e359750a 100644
--- a/sec-policy/selinux-dirmngr/selinux-dirmngr-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-dirmngr/selinux-dirmngr-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dirmngr"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20200818-r2.ebuild b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20200818-r2.ebuild
index 00f01af8c7c8..bdf506cfdf86 100644
--- a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dirsrv"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20210203-r1.ebuild b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20210203-r1.ebuild
index 00f01af8c7c8..bdf506cfdf86 100644
--- a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dirsrv"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-distcc/selinux-distcc-2.20200818-r2.ebuild b/sec-policy/selinux-distcc/selinux-distcc-2.20200818-r2.ebuild
index d4049dd13276..238d7500674c 100644
--- a/sec-policy/selinux-distcc/selinux-distcc-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-distcc/selinux-distcc-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for distcc"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-distcc/selinux-distcc-2.20210203-r1.ebuild b/sec-policy/selinux-distcc/selinux-distcc-2.20210203-r1.ebuild
index d4049dd13276..238d7500674c 100644
--- a/sec-policy/selinux-distcc/selinux-distcc-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-distcc/selinux-distcc-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for distcc"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-djbdns/selinux-djbdns-2.20200818-r2.ebuild b/sec-policy/selinux-djbdns/selinux-djbdns-2.20200818-r2.ebuild
index a265ce86d42a..155f5cff25c9 100644
--- a/sec-policy/selinux-djbdns/selinux-djbdns-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-djbdns/selinux-djbdns-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for djbdns"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-daemontools
diff --git a/sec-policy/selinux-djbdns/selinux-djbdns-2.20210203-r1.ebuild b/sec-policy/selinux-djbdns/selinux-djbdns-2.20210203-r1.ebuild
index a265ce86d42a..155f5cff25c9 100644
--- a/sec-policy/selinux-djbdns/selinux-djbdns-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-djbdns/selinux-djbdns-2.20210203-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for djbdns"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-daemontools
diff --git a/sec-policy/selinux-dkim/selinux-dkim-2.20200818-r2.ebuild b/sec-policy/selinux-dkim/selinux-dkim-2.20200818-r2.ebuild
index d48f6a466e78..d50e5d3cc0a3 100644
--- a/sec-policy/selinux-dkim/selinux-dkim-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-dkim/selinux-dkim-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dkim"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-dkim/selinux-dkim-2.20210203-r1.ebuild b/sec-policy/selinux-dkim/selinux-dkim-2.20210203-r1.ebuild
index d48f6a466e78..d50e5d3cc0a3 100644
--- a/sec-policy/selinux-dkim/selinux-dkim-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-dkim/selinux-dkim-2.20210203-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dkim"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20200818-r2.ebuild b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20200818-r2.ebuild
index 742fea7d096d..b25cade1775c 100644
--- a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dmidecode"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20210203-r1.ebuild b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20210203-r1.ebuild
index 742fea7d096d..b25cade1775c 100644
--- a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dmidecode"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20200818-r2.ebuild b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20200818-r2.ebuild
index 729f27da5e34..a0b4cdb66293 100644
--- a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dnsmasq"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20210203-r1.ebuild b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20210203-r1.ebuild
index 729f27da5e34..a0b4cdb66293 100644
--- a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dnsmasq"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dovecot/selinux-dovecot-2.20200818-r2.ebuild b/sec-policy/selinux-dovecot/selinux-dovecot-2.20200818-r2.ebuild
index 95216226fcf7..51654fe92605 100644
--- a/sec-policy/selinux-dovecot/selinux-dovecot-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-dovecot/selinux-dovecot-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dovecot"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dovecot/selinux-dovecot-2.20210203-r1.ebuild b/sec-policy/selinux-dovecot/selinux-dovecot-2.20210203-r1.ebuild
index 95216226fcf7..51654fe92605 100644
--- a/sec-policy/selinux-dovecot/selinux-dovecot-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-dovecot/selinux-dovecot-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dovecot"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dpkg/selinux-dpkg-2.20200818-r2.ebuild b/sec-policy/selinux-dpkg/selinux-dpkg-2.20200818-r2.ebuild
index 9e8064429bd9..d7be0ac8d531 100644
--- a/sec-policy/selinux-dpkg/selinux-dpkg-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-dpkg/selinux-dpkg-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dpkg"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dpkg/selinux-dpkg-2.20210203-r1.ebuild b/sec-policy/selinux-dpkg/selinux-dpkg-2.20210203-r1.ebuild
index 9e8064429bd9..d7be0ac8d531 100644
--- a/sec-policy/selinux-dpkg/selinux-dpkg-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-dpkg/selinux-dpkg-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dpkg"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dracut/selinux-dracut-2.20200818-r2.ebuild b/sec-policy/selinux-dracut/selinux-dracut-2.20200818-r2.ebuild
index 03667b6de4c2..fdbceb802a0e 100644
--- a/sec-policy/selinux-dracut/selinux-dracut-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-dracut/selinux-dracut-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dracut"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dracut/selinux-dracut-2.20210203-r1.ebuild b/sec-policy/selinux-dracut/selinux-dracut-2.20210203-r1.ebuild
index 03667b6de4c2..fdbceb802a0e 100644
--- a/sec-policy/selinux-dracut/selinux-dracut-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-dracut/selinux-dracut-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dracut"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dropbox/selinux-dropbox-2.20200818-r2.ebuild b/sec-policy/selinux-dropbox/selinux-dropbox-2.20200818-r2.ebuild
index 533d8dc0cb4f..6000b38fc639 100644
--- a/sec-policy/selinux-dropbox/selinux-dropbox-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-dropbox/selinux-dropbox-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dropbox"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-dropbox/selinux-dropbox-2.20210203-r1.ebuild b/sec-policy/selinux-dropbox/selinux-dropbox-2.20210203-r1.ebuild
index 533d8dc0cb4f..6000b38fc639 100644
--- a/sec-policy/selinux-dropbox/selinux-dropbox-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-dropbox/selinux-dropbox-2.20210203-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dropbox"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-entropyd/selinux-entropyd-2.20200818-r2.ebuild b/sec-policy/selinux-entropyd/selinux-entropyd-2.20200818-r2.ebuild
index d6d761005f97..bb987b9798f3 100644
--- a/sec-policy/selinux-entropyd/selinux-entropyd-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-entropyd/selinux-entropyd-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for entropyd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-entropyd/selinux-entropyd-2.20210203-r1.ebuild b/sec-policy/selinux-entropyd/selinux-entropyd-2.20210203-r1.ebuild
index d6d761005f97..bb987b9798f3 100644
--- a/sec-policy/selinux-entropyd/selinux-entropyd-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-entropyd/selinux-entropyd-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for entropyd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-evolution/selinux-evolution-2.20200818-r2.ebuild b/sec-policy/selinux-evolution/selinux-evolution-2.20200818-r2.ebuild
index bafee0142943..7ce8476e8e97 100644
--- a/sec-policy/selinux-evolution/selinux-evolution-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-evolution/selinux-evolution-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for evolution"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-evolution/selinux-evolution-2.20210203-r1.ebuild b/sec-policy/selinux-evolution/selinux-evolution-2.20210203-r1.ebuild
index bafee0142943..7ce8476e8e97 100644
--- a/sec-policy/selinux-evolution/selinux-evolution-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-evolution/selinux-evolution-2.20210203-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for evolution"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-exim/selinux-exim-2.20200818-r2.ebuild b/sec-policy/selinux-exim/selinux-exim-2.20200818-r2.ebuild
index 18f6f86f3b0a..f38401f0b797 100644
--- a/sec-policy/selinux-exim/selinux-exim-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-exim/selinux-exim-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for exim"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-exim/selinux-exim-2.20210203-r1.ebuild b/sec-policy/selinux-exim/selinux-exim-2.20210203-r1.ebuild
index 18f6f86f3b0a..f38401f0b797 100644
--- a/sec-policy/selinux-exim/selinux-exim-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-exim/selinux-exim-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for exim"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20200818-r2.ebuild b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20200818-r2.ebuild
index 5f8026e15a18..d009a337bdce 100644
--- a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for fail2ban"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20210203-r1.ebuild b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20210203-r1.ebuild
index 5f8026e15a18..d009a337bdce 100644
--- a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for fail2ban"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20200818-r2.ebuild b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20200818-r2.ebuild
index 4ae406469edc..02332553c230 100644
--- a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for fetchmail"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20210203-r1.ebuild b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20210203-r1.ebuild
index 4ae406469edc..02332553c230 100644
--- a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for fetchmail"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-finger/selinux-finger-2.20200818-r2.ebuild b/sec-policy/selinux-finger/selinux-finger-2.20200818-r2.ebuild
index fb878145988d..fc91010c48db 100644
--- a/sec-policy/selinux-finger/selinux-finger-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-finger/selinux-finger-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for finger"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-finger/selinux-finger-2.20210203-r1.ebuild b/sec-policy/selinux-finger/selinux-finger-2.20210203-r1.ebuild
index fb878145988d..fc91010c48db 100644
--- a/sec-policy/selinux-finger/selinux-finger-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-finger/selinux-finger-2.20210203-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for finger"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-flash/selinux-flash-2.20200818-r2.ebuild b/sec-policy/selinux-flash/selinux-flash-2.20200818-r2.ebuild
index 5c4bf6110c78..468fbaa6e8c4 100644
--- a/sec-policy/selinux-flash/selinux-flash-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-flash/selinux-flash-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for flash"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-flash/selinux-flash-2.20210203-r1.ebuild b/sec-policy/selinux-flash/selinux-flash-2.20210203-r1.ebuild
index 5c4bf6110c78..468fbaa6e8c4 100644
--- a/sec-policy/selinux-flash/selinux-flash-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-flash/selinux-flash-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for flash"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-fprintd/selinux-fprintd-2.20200818-r2.ebuild b/sec-policy/selinux-fprintd/selinux-fprintd-2.20200818-r2.ebuild
index a50b8fb3fd57..e6a32a97f02f 100644
--- a/sec-policy/selinux-fprintd/selinux-fprintd-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-fprintd/selinux-fprintd-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for fprintd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-dbus
diff --git a/sec-policy/selinux-fprintd/selinux-fprintd-2.20210203-r1.ebuild b/sec-policy/selinux-fprintd/selinux-fprintd-2.20210203-r1.ebuild
index a50b8fb3fd57..e6a32a97f02f 100644
--- a/sec-policy/selinux-fprintd/selinux-fprintd-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-fprintd/selinux-fprintd-2.20210203-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for fprintd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-dbus
diff --git a/sec-policy/selinux-ftp/selinux-ftp-2.20200818-r2.ebuild b/sec-policy/selinux-ftp/selinux-ftp-2.20200818-r2.ebuild
index f80d8d5ecfc6..cf87432c3976 100644
--- a/sec-policy/selinux-ftp/selinux-ftp-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-ftp/selinux-ftp-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ftp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ftp/selinux-ftp-2.20210203-r1.ebuild b/sec-policy/selinux-ftp/selinux-ftp-2.20210203-r1.ebuild
index f80d8d5ecfc6..cf87432c3976 100644
--- a/sec-policy/selinux-ftp/selinux-ftp-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-ftp/selinux-ftp-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ftp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-games/selinux-games-2.20200818-r2.ebuild b/sec-policy/selinux-games/selinux-games-2.20200818-r2.ebuild
index 2c802bfc3869..5f53c1d4c8ba 100644
--- a/sec-policy/selinux-games/selinux-games-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-games/selinux-games-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for games"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-games/selinux-games-2.20210203-r1.ebuild b/sec-policy/selinux-games/selinux-games-2.20210203-r1.ebuild
index 2c802bfc3869..5f53c1d4c8ba 100644
--- a/sec-policy/selinux-games/selinux-games-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-games/selinux-games-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for games"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20200818-r2.ebuild b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20200818-r2.ebuild
index 4e4825491d11..37a2631b018a 100644
--- a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gatekeeper"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20210203-r1.ebuild b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20210203-r1.ebuild
index 4e4825491d11..37a2631b018a 100644
--- a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gatekeeper"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-git/selinux-git-2.20200818-r2.ebuild b/sec-policy/selinux-git/selinux-git-2.20200818-r2.ebuild
index 358a3fb97816..1bd2e9a8b523 100644
--- a/sec-policy/selinux-git/selinux-git-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-git/selinux-git-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for git"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-git/selinux-git-2.20210203-r1.ebuild b/sec-policy/selinux-git/selinux-git-2.20210203-r1.ebuild
index 358a3fb97816..1bd2e9a8b523 100644
--- a/sec-policy/selinux-git/selinux-git-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-git/selinux-git-2.20210203-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for git"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-gitosis/selinux-gitosis-2.20200818-r2.ebuild b/sec-policy/selinux-gitosis/selinux-gitosis-2.20200818-r2.ebuild
index 9f260dff8033..58172fe85cbf 100644
--- a/sec-policy/selinux-gitosis/selinux-gitosis-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-gitosis/selinux-gitosis-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gitosis"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-gitosis/selinux-gitosis-2.20210203-r1.ebuild b/sec-policy/selinux-gitosis/selinux-gitosis-2.20210203-r1.ebuild
index 9f260dff8033..58172fe85cbf 100644
--- a/sec-policy/selinux-gitosis/selinux-gitosis-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-gitosis/selinux-gitosis-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gitosis"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-gnome/selinux-gnome-2.20200818-r2.ebuild b/sec-policy/selinux-gnome/selinux-gnome-2.20200818-r2.ebuild
index 2cb09108f1e9..296da1ca64eb 100644
--- a/sec-policy/selinux-gnome/selinux-gnome-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-gnome/selinux-gnome-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gnome"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-gnome/selinux-gnome-2.20210203-r1.ebuild b/sec-policy/selinux-gnome/selinux-gnome-2.20210203-r1.ebuild
index 2cb09108f1e9..296da1ca64eb 100644
--- a/sec-policy/selinux-gnome/selinux-gnome-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-gnome/selinux-gnome-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gnome"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-googletalk/selinux-googletalk-2.20200818-r2.ebuild b/sec-policy/selinux-googletalk/selinux-googletalk-2.20200818-r2.ebuild
index f4b597d3531c..832f2bc2d0ab 100644
--- a/sec-policy/selinux-googletalk/selinux-googletalk-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-googletalk/selinux-googletalk-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for googletalk"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-googletalk/selinux-googletalk-2.20210203-r1.ebuild b/sec-policy/selinux-googletalk/selinux-googletalk-2.20210203-r1.ebuild
index f4b597d3531c..832f2bc2d0ab 100644
--- a/sec-policy/selinux-googletalk/selinux-googletalk-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-googletalk/selinux-googletalk-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for googletalk"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-gorg/selinux-gorg-2.20200818-r2.ebuild b/sec-policy/selinux-gorg/selinux-gorg-2.20200818-r2.ebuild
index 225374482df5..257d50cea731 100644
--- a/sec-policy/selinux-gorg/selinux-gorg-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-gorg/selinux-gorg-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gorg"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-gorg/selinux-gorg-2.20210203-r1.ebuild b/sec-policy/selinux-gorg/selinux-gorg-2.20210203-r1.ebuild
index 225374482df5..257d50cea731 100644
--- a/sec-policy/selinux-gorg/selinux-gorg-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-gorg/selinux-gorg-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gorg"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-gpg/selinux-gpg-2.20200818-r2.ebuild b/sec-policy/selinux-gpg/selinux-gpg-2.20200818-r2.ebuild
index a2d0e8489a1b..b7a05ceaea5b 100644
--- a/sec-policy/selinux-gpg/selinux-gpg-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-gpg/selinux-gpg-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gpg"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-gpg/selinux-gpg-2.20210203-r1.ebuild b/sec-policy/selinux-gpg/selinux-gpg-2.20210203-r1.ebuild
index a2d0e8489a1b..b7a05ceaea5b 100644
--- a/sec-policy/selinux-gpg/selinux-gpg-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-gpg/selinux-gpg-2.20210203-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gpg"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-gpm/selinux-gpm-2.20200818-r2.ebuild b/sec-policy/selinux-gpm/selinux-gpm-2.20200818-r2.ebuild
index bb629b843afb..5ca468ab57cd 100644
--- a/sec-policy/selinux-gpm/selinux-gpm-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-gpm/selinux-gpm-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gpm"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-gpm/selinux-gpm-2.20210203-r1.ebuild b/sec-policy/selinux-gpm/selinux-gpm-2.20210203-r1.ebuild
index bb629b843afb..5ca468ab57cd 100644
--- a/sec-policy/selinux-gpm/selinux-gpm-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-gpm/selinux-gpm-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gpm"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-gpsd/selinux-gpsd-2.20200818-r2.ebuild b/sec-policy/selinux-gpsd/selinux-gpsd-2.20200818-r2.ebuild
index 664125e6efd4..d0feea361787 100644
--- a/sec-policy/selinux-gpsd/selinux-gpsd-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-gpsd/selinux-gpsd-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gpsd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-gpsd/selinux-gpsd-2.20210203-r1.ebuild b/sec-policy/selinux-gpsd/selinux-gpsd-2.20210203-r1.ebuild
index 664125e6efd4..d0feea361787 100644
--- a/sec-policy/selinux-gpsd/selinux-gpsd-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-gpsd/selinux-gpsd-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gpsd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20200818-r2.ebuild b/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20200818-r2.ebuild
index d8211236fba7..f6af1676e562 100644
--- a/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gssproxy"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20210203-r1.ebuild b/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20210203-r1.ebuild
index d8211236fba7..f6af1676e562 100644
--- a/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gssproxy"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20200818-r2.ebuild b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20200818-r2.ebuild
index b87716d0823b..8ec723a4eb90 100644
--- a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for hddtemp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20210203-r1.ebuild b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20210203-r1.ebuild
index b87716d0823b..8ec723a4eb90 100644
--- a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for hddtemp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-howl/selinux-howl-2.20200818-r2.ebuild b/sec-policy/selinux-howl/selinux-howl-2.20200818-r2.ebuild
index ea7d4535e5c7..f057aa2df970 100644
--- a/sec-policy/selinux-howl/selinux-howl-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-howl/selinux-howl-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for howl"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-howl/selinux-howl-2.20210203-r1.ebuild b/sec-policy/selinux-howl/selinux-howl-2.20210203-r1.ebuild
index ea7d4535e5c7..f057aa2df970 100644
--- a/sec-policy/selinux-howl/selinux-howl-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-howl/selinux-howl-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for howl"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-icecast/selinux-icecast-2.20200818-r2.ebuild b/sec-policy/selinux-icecast/selinux-icecast-2.20200818-r2.ebuild
index 293ea6df21a5..91c04b86e092 100644
--- a/sec-policy/selinux-icecast/selinux-icecast-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-icecast/selinux-icecast-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for icecast"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-icecast/selinux-icecast-2.20210203-r1.ebuild b/sec-policy/selinux-icecast/selinux-icecast-2.20210203-r1.ebuild
index 293ea6df21a5..91c04b86e092 100644
--- a/sec-policy/selinux-icecast/selinux-icecast-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-icecast/selinux-icecast-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for icecast"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20200818-r2.ebuild b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20200818-r2.ebuild
index d7ea49cdb0ed..a4694e8f1ffb 100644
--- a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ifplugd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20210203-r1.ebuild b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20210203-r1.ebuild
index d7ea49cdb0ed..a4694e8f1ffb 100644
--- a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ifplugd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-imaze/selinux-imaze-2.20200818-r2.ebuild b/sec-policy/selinux-imaze/selinux-imaze-2.20200818-r2.ebuild
index 133f73d5035a..b3ec760a33f0 100644
--- a/sec-policy/selinux-imaze/selinux-imaze-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-imaze/selinux-imaze-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for imaze"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-imaze/selinux-imaze-2.20210203-r1.ebuild b/sec-policy/selinux-imaze/selinux-imaze-2.20210203-r1.ebuild
index 133f73d5035a..b3ec760a33f0 100644
--- a/sec-policy/selinux-imaze/selinux-imaze-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-imaze/selinux-imaze-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for imaze"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-inetd/selinux-inetd-2.20200818-r2.ebuild b/sec-policy/selinux-inetd/selinux-inetd-2.20200818-r2.ebuild
index 4d648dc18427..43b2f7509786 100644
--- a/sec-policy/selinux-inetd/selinux-inetd-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-inetd/selinux-inetd-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for inetd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-inetd/selinux-inetd-2.20210203-r1.ebuild b/sec-policy/selinux-inetd/selinux-inetd-2.20210203-r1.ebuild
index 4d648dc18427..43b2f7509786 100644
--- a/sec-policy/selinux-inetd/selinux-inetd-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-inetd/selinux-inetd-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for inetd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-inn/selinux-inn-2.20200818-r2.ebuild b/sec-policy/selinux-inn/selinux-inn-2.20200818-r2.ebuild
index 3526a4161b45..9fd4934e0d7d 100644
--- a/sec-policy/selinux-inn/selinux-inn-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-inn/selinux-inn-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for inn"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-inn/selinux-inn-2.20210203-r1.ebuild b/sec-policy/selinux-inn/selinux-inn-2.20210203-r1.ebuild
index 3526a4161b45..9fd4934e0d7d 100644
--- a/sec-policy/selinux-inn/selinux-inn-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-inn/selinux-inn-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for inn"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ipsec/selinux-ipsec-2.20200818-r2.ebuild b/sec-policy/selinux-ipsec/selinux-ipsec-2.20200818-r2.ebuild
index 7f6047db052f..bccb40d51a84 100644
--- a/sec-policy/selinux-ipsec/selinux-ipsec-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-ipsec/selinux-ipsec-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ipsec"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ipsec/selinux-ipsec-2.20210203-r1.ebuild b/sec-policy/selinux-ipsec/selinux-ipsec-2.20210203-r1.ebuild
index 7f6047db052f..bccb40d51a84 100644
--- a/sec-policy/selinux-ipsec/selinux-ipsec-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-ipsec/selinux-ipsec-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ipsec"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-irc/selinux-irc-2.20200818-r2.ebuild b/sec-policy/selinux-irc/selinux-irc-2.20200818-r2.ebuild
index a0349a6c1f50..aa0867fe0db8 100644
--- a/sec-policy/selinux-irc/selinux-irc-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-irc/selinux-irc-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for irc"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-irc/selinux-irc-2.20210203-r1.ebuild b/sec-policy/selinux-irc/selinux-irc-2.20210203-r1.ebuild
index a0349a6c1f50..aa0867fe0db8 100644
--- a/sec-policy/selinux-irc/selinux-irc-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-irc/selinux-irc-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for irc"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ircd/selinux-ircd-2.20200818-r2.ebuild b/sec-policy/selinux-ircd/selinux-ircd-2.20200818-r2.ebuild
index 9cc08278e61e..2cd36ee89fb0 100644
--- a/sec-policy/selinux-ircd/selinux-ircd-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-ircd/selinux-ircd-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ircd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ircd/selinux-ircd-2.20210203-r1.ebuild b/sec-policy/selinux-ircd/selinux-ircd-2.20210203-r1.ebuild
index 9cc08278e61e..2cd36ee89fb0 100644
--- a/sec-policy/selinux-ircd/selinux-ircd-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-ircd/selinux-ircd-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ircd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20200818-r2.ebuild b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20200818-r2.ebuild
index 114ef418b47a..3abe3ba756ae 100644
--- a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for irqbalance"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20210203-r1.ebuild b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20210203-r1.ebuild
index 114ef418b47a..3abe3ba756ae 100644
--- a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for irqbalance"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-jabber/selinux-jabber-2.20200818-r2.ebuild b/sec-policy/selinux-jabber/selinux-jabber-2.20200818-r2.ebuild
index 1128517ed1fb..9b0d373a37cf 100644
--- a/sec-policy/selinux-jabber/selinux-jabber-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-jabber/selinux-jabber-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for jabber"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-jabber/selinux-jabber-2.20210203-r1.ebuild b/sec-policy/selinux-jabber/selinux-jabber-2.20210203-r1.ebuild
index 1128517ed1fb..9b0d373a37cf 100644
--- a/sec-policy/selinux-jabber/selinux-jabber-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-jabber/selinux-jabber-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for jabber"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-java/selinux-java-2.20200818-r2.ebuild b/sec-policy/selinux-java/selinux-java-2.20200818-r2.ebuild
index 6b2b8c5a7834..e7474dfcd008 100644
--- a/sec-policy/selinux-java/selinux-java-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-java/selinux-java-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for java"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-java/selinux-java-2.20210203-r1.ebuild b/sec-policy/selinux-java/selinux-java-2.20210203-r1.ebuild
index 6b2b8c5a7834..e7474dfcd008 100644
--- a/sec-policy/selinux-java/selinux-java-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-java/selinux-java-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for java"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20200818-r2.ebuild b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20200818-r2.ebuild
index 3fa794ccca63..17a349fc8255 100644
--- a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for kdeconnect"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20210203-r1.ebuild b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20210203-r1.ebuild
index 3fa794ccca63..17a349fc8255 100644
--- a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for kdeconnect"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-kdump/selinux-kdump-2.20200818-r2.ebuild b/sec-policy/selinux-kdump/selinux-kdump-2.20200818-r2.ebuild
index cf94326cde09..8c35af7be10f 100644
--- a/sec-policy/selinux-kdump/selinux-kdump-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-kdump/selinux-kdump-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for kdump"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-kdump/selinux-kdump-2.20210203-r1.ebuild b/sec-policy/selinux-kdump/selinux-kdump-2.20210203-r1.ebuild
index cf94326cde09..8c35af7be10f 100644
--- a/sec-policy/selinux-kdump/selinux-kdump-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-kdump/selinux-kdump-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for kdump"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-kerberos/selinux-kerberos-2.20200818-r2.ebuild b/sec-policy/selinux-kerberos/selinux-kerberos-2.20200818-r2.ebuild
index 71c9135e91aa..92aed5989361 100644
--- a/sec-policy/selinux-kerberos/selinux-kerberos-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-kerberos/selinux-kerberos-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for kerberos"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-kerberos/selinux-kerberos-2.20210203-r1.ebuild b/sec-policy/selinux-kerberos/selinux-kerberos-2.20210203-r1.ebuild
index 71c9135e91aa..92aed5989361 100644
--- a/sec-policy/selinux-kerberos/selinux-kerberos-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-kerberos/selinux-kerberos-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for kerberos"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20200818-r2.ebuild b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20200818-r2.ebuild
index f143a35f0ee2..e7ab3b5c9127 100644
--- a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for kerneloops"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20210203-r1.ebuild b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20210203-r1.ebuild
index f143a35f0ee2..e7ab3b5c9127 100644
--- a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for kerneloops"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-kismet/selinux-kismet-2.20200818-r2.ebuild b/sec-policy/selinux-kismet/selinux-kismet-2.20200818-r2.ebuild
index 62910fb32f93..450ed9b64506 100644
--- a/sec-policy/selinux-kismet/selinux-kismet-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-kismet/selinux-kismet-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for kismet"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-kismet/selinux-kismet-2.20210203-r1.ebuild b/sec-policy/selinux-kismet/selinux-kismet-2.20210203-r1.ebuild
index 62910fb32f93..450ed9b64506 100644
--- a/sec-policy/selinux-kismet/selinux-kismet-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-kismet/selinux-kismet-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for kismet"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20200818-r2.ebuild b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20200818-r2.ebuild
index a6c5e2cf462e..f143a89faf4b 100644
--- a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ksmtuned"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20210203-r1.ebuild b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20210203-r1.ebuild
index a6c5e2cf462e..f143a89faf4b 100644
--- a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ksmtuned"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-kudzu/selinux-kudzu-2.20200818-r2.ebuild b/sec-policy/selinux-kudzu/selinux-kudzu-2.20200818-r2.ebuild
index 7c942f41039f..35d66603856a 100644
--- a/sec-policy/selinux-kudzu/selinux-kudzu-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-kudzu/selinux-kudzu-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for kudzu"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ldap/selinux-ldap-2.20200818-r2.ebuild b/sec-policy/selinux-ldap/selinux-ldap-2.20200818-r2.ebuild
index 4d0a69bcd3a3..008447aa7b1e 100644
--- a/sec-policy/selinux-ldap/selinux-ldap-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-ldap/selinux-ldap-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ldap"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ldap/selinux-ldap-2.20210203-r1.ebuild b/sec-policy/selinux-ldap/selinux-ldap-2.20210203-r1.ebuild
index 4d0a69bcd3a3..008447aa7b1e 100644
--- a/sec-policy/selinux-ldap/selinux-ldap-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-ldap/selinux-ldap-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ldap"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-links/selinux-links-2.20200818-r2.ebuild b/sec-policy/selinux-links/selinux-links-2.20200818-r2.ebuild
index 3f42ee6cb270..6d9e3ee9d1e5 100644
--- a/sec-policy/selinux-links/selinux-links-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-links/selinux-links-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for links"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-links/selinux-links-2.20210203-r1.ebuild b/sec-policy/selinux-links/selinux-links-2.20210203-r1.ebuild
index 3f42ee6cb270..6d9e3ee9d1e5 100644
--- a/sec-policy/selinux-links/selinux-links-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-links/selinux-links-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for links"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-lircd/selinux-lircd-2.20200818-r2.ebuild b/sec-policy/selinux-lircd/selinux-lircd-2.20200818-r2.ebuild
index 94f7f501a9ed..c92ef4944ce1 100644
--- a/sec-policy/selinux-lircd/selinux-lircd-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-lircd/selinux-lircd-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for lircd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-lircd/selinux-lircd-2.20210203-r1.ebuild b/sec-policy/selinux-lircd/selinux-lircd-2.20210203-r1.ebuild
index 94f7f501a9ed..c92ef4944ce1 100644
--- a/sec-policy/selinux-lircd/selinux-lircd-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-lircd/selinux-lircd-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for lircd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20200818-r2.ebuild b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20200818-r2.ebuild
index 52ba2dcd5add..f4f5ad4ec670 100644
--- a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for loadkeys"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20210203-r1.ebuild b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20210203-r1.ebuild
index 52ba2dcd5add..f4f5ad4ec670 100644
--- a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for loadkeys"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-lockdev/selinux-lockdev-2.20200818-r2.ebuild b/sec-policy/selinux-lockdev/selinux-lockdev-2.20200818-r2.ebuild
index 1a40d92ec950..ef1dc932400f 100644
--- a/sec-policy/selinux-lockdev/selinux-lockdev-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-lockdev/selinux-lockdev-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for lockdev"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-lockdev/selinux-lockdev-2.20210203-r1.ebuild b/sec-policy/selinux-lockdev/selinux-lockdev-2.20210203-r1.ebuild
index 1a40d92ec950..ef1dc932400f 100644
--- a/sec-policy/selinux-lockdev/selinux-lockdev-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-lockdev/selinux-lockdev-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for lockdev"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-logrotate/selinux-logrotate-2.20200818-r2.ebuild b/sec-policy/selinux-logrotate/selinux-logrotate-2.20200818-r2.ebuild
index 68523fcde1b9..e4a40ef1dc46 100644
--- a/sec-policy/selinux-logrotate/selinux-logrotate-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-logrotate/selinux-logrotate-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for logrotate"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-logrotate/selinux-logrotate-2.20210203-r1.ebuild b/sec-policy/selinux-logrotate/selinux-logrotate-2.20210203-r1.ebuild
index 68523fcde1b9..e4a40ef1dc46 100644
--- a/sec-policy/selinux-logrotate/selinux-logrotate-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-logrotate/selinux-logrotate-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for logrotate"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-logsentry/selinux-logsentry-2.20200818-r2.ebuild b/sec-policy/selinux-logsentry/selinux-logsentry-2.20200818-r2.ebuild
index e74b827990da..6c48cea3eb82 100644
--- a/sec-policy/selinux-logsentry/selinux-logsentry-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-logsentry/selinux-logsentry-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for logsentry"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-logsentry/selinux-logsentry-2.20210203-r1.ebuild b/sec-policy/selinux-logsentry/selinux-logsentry-2.20210203-r1.ebuild
index e74b827990da..6c48cea3eb82 100644
--- a/sec-policy/selinux-logsentry/selinux-logsentry-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-logsentry/selinux-logsentry-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for logsentry"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-logwatch/selinux-logwatch-2.20200818-r2.ebuild b/sec-policy/selinux-logwatch/selinux-logwatch-2.20200818-r2.ebuild
index 5891ba944a37..fb5db5780af3 100644
--- a/sec-policy/selinux-logwatch/selinux-logwatch-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-logwatch/selinux-logwatch-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for logwatch"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-logwatch/selinux-logwatch-2.20210203-r1.ebuild b/sec-policy/selinux-logwatch/selinux-logwatch-2.20210203-r1.ebuild
index 5891ba944a37..fb5db5780af3 100644
--- a/sec-policy/selinux-logwatch/selinux-logwatch-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-logwatch/selinux-logwatch-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for logwatch"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-lpd/selinux-lpd-2.20200818-r2.ebuild b/sec-policy/selinux-lpd/selinux-lpd-2.20200818-r2.ebuild
index e68f2f7b3039..93c9b09847bc 100644
--- a/sec-policy/selinux-lpd/selinux-lpd-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-lpd/selinux-lpd-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for lpd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-lpd/selinux-lpd-2.20210203-r1.ebuild b/sec-policy/selinux-lpd/selinux-lpd-2.20210203-r1.ebuild
index e68f2f7b3039..93c9b09847bc 100644
--- a/sec-policy/selinux-lpd/selinux-lpd-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-lpd/selinux-lpd-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for lpd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-mailman/selinux-mailman-2.20200818-r2.ebuild b/sec-policy/selinux-mailman/selinux-mailman-2.20200818-r2.ebuild
index 03c8d0c7cdb4..0598cb214503 100644
--- a/sec-policy/selinux-mailman/selinux-mailman-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-mailman/selinux-mailman-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mailman"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-mailman/selinux-mailman-2.20210203-r1.ebuild b/sec-policy/selinux-mailman/selinux-mailman-2.20210203-r1.ebuild
index 03c8d0c7cdb4..0598cb214503 100644
--- a/sec-policy/selinux-mailman/selinux-mailman-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-mailman/selinux-mailman-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mailman"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20200818-r2.ebuild b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20200818-r2.ebuild
index 6d63d7e51f7f..009fb0d9cde7 100644
--- a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for makewhatis"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20210203-r1.ebuild b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20210203-r1.ebuild
index 6d63d7e51f7f..009fb0d9cde7 100644
--- a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for makewhatis"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-mandb/selinux-mandb-2.20200818-r2.ebuild b/sec-policy/selinux-mandb/selinux-mandb-2.20200818-r2.ebuild
index e55680f4cf3b..20e99ffe2e71 100644
--- a/sec-policy/selinux-mandb/selinux-mandb-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-mandb/selinux-mandb-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mandb"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-mandb/selinux-mandb-2.20210203-r1.ebuild b/sec-policy/selinux-mandb/selinux-mandb-2.20210203-r1.ebuild
index e55680f4cf3b..20e99ffe2e71 100644
--- a/sec-policy/selinux-mandb/selinux-mandb-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-mandb/selinux-mandb-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mandb"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-mcelog/selinux-mcelog-2.20200818-r2.ebuild b/sec-policy/selinux-mcelog/selinux-mcelog-2.20200818-r2.ebuild
index 0e28f29a7cd4..36ce9b25131c 100644
--- a/sec-policy/selinux-mcelog/selinux-mcelog-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-mcelog/selinux-mcelog-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mcelog"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-mcelog/selinux-mcelog-2.20210203-r1.ebuild b/sec-policy/selinux-mcelog/selinux-mcelog-2.20210203-r1.ebuild
index 0e28f29a7cd4..36ce9b25131c 100644
--- a/sec-policy/selinux-mcelog/selinux-mcelog-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-mcelog/selinux-mcelog-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mcelog"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-memcached/selinux-memcached-2.20200818-r2.ebuild b/sec-policy/selinux-memcached/selinux-memcached-2.20200818-r2.ebuild
index 9eb215bda777..59beb0c57034 100644
--- a/sec-policy/selinux-memcached/selinux-memcached-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-memcached/selinux-memcached-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for memcached"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-memcached/selinux-memcached-2.20210203-r1.ebuild b/sec-policy/selinux-memcached/selinux-memcached-2.20210203-r1.ebuild
index 9eb215bda777..59beb0c57034 100644
--- a/sec-policy/selinux-memcached/selinux-memcached-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-memcached/selinux-memcached-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for memcached"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-milter/selinux-milter-2.20200818-r2.ebuild b/sec-policy/selinux-milter/selinux-milter-2.20200818-r2.ebuild
index 14b7183ae4f7..729a2f4664bb 100644
--- a/sec-policy/selinux-milter/selinux-milter-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-milter/selinux-milter-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for milter"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-milter/selinux-milter-2.20210203-r1.ebuild b/sec-policy/selinux-milter/selinux-milter-2.20210203-r1.ebuild
index 14b7183ae4f7..729a2f4664bb 100644
--- a/sec-policy/selinux-milter/selinux-milter-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-milter/selinux-milter-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for milter"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20200818-r2.ebuild b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20200818-r2.ebuild
index 3ccaccf6700e..39747105b0db 100644
--- a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for modemmanager"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-dbus
diff --git a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20210203-r1.ebuild b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20210203-r1.ebuild
index 3ccaccf6700e..39747105b0db 100644
--- a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20210203-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for modemmanager"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-dbus
diff --git a/sec-policy/selinux-mono/selinux-mono-2.20200818-r2.ebuild b/sec-policy/selinux-mono/selinux-mono-2.20200818-r2.ebuild
index 85ffac8ff383..e16b7cd44a53 100644
--- a/sec-policy/selinux-mono/selinux-mono-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-mono/selinux-mono-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mono"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-mono/selinux-mono-2.20210203-r1.ebuild b/sec-policy/selinux-mono/selinux-mono-2.20210203-r1.ebuild
index 85ffac8ff383..e16b7cd44a53 100644
--- a/sec-policy/selinux-mono/selinux-mono-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-mono/selinux-mono-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mono"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-mozilla/selinux-mozilla-2.20200818-r2.ebuild b/sec-policy/selinux-mozilla/selinux-mozilla-2.20200818-r2.ebuild
index f4e468adb090..68274a484b94 100644
--- a/sec-policy/selinux-mozilla/selinux-mozilla-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-mozilla/selinux-mozilla-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mozilla"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-mozilla/selinux-mozilla-2.20210203-r1.ebuild b/sec-policy/selinux-mozilla/selinux-mozilla-2.20210203-r1.ebuild
index f4e468adb090..68274a484b94 100644
--- a/sec-policy/selinux-mozilla/selinux-mozilla-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-mozilla/selinux-mozilla-2.20210203-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mozilla"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-mpd/selinux-mpd-2.20200818-r2.ebuild b/sec-policy/selinux-mpd/selinux-mpd-2.20200818-r2.ebuild
index 6a547cf6378c..15f4720bd857 100644
--- a/sec-policy/selinux-mpd/selinux-mpd-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-mpd/selinux-mpd-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mpd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-mpd/selinux-mpd-2.20210203-r1.ebuild b/sec-policy/selinux-mpd/selinux-mpd-2.20210203-r1.ebuild
index 6a547cf6378c..15f4720bd857 100644
--- a/sec-policy/selinux-mpd/selinux-mpd-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-mpd/selinux-mpd-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mpd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-mplayer/selinux-mplayer-2.20200818-r2.ebuild b/sec-policy/selinux-mplayer/selinux-mplayer-2.20200818-r2.ebuild
index aad630e11afe..fc4fd5985299 100644
--- a/sec-policy/selinux-mplayer/selinux-mplayer-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-mplayer/selinux-mplayer-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mplayer"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-mplayer/selinux-mplayer-2.20210203-r1.ebuild b/sec-policy/selinux-mplayer/selinux-mplayer-2.20210203-r1.ebuild
index aad630e11afe..fc4fd5985299 100644
--- a/sec-policy/selinux-mplayer/selinux-mplayer-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-mplayer/selinux-mplayer-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mplayer"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-mrtg/selinux-mrtg-2.20200818-r2.ebuild b/sec-policy/selinux-mrtg/selinux-mrtg-2.20200818-r2.ebuild
index 97f915809581..cb932a27eccd 100644
--- a/sec-policy/selinux-mrtg/selinux-mrtg-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-mrtg/selinux-mrtg-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mrtg"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-mrtg/selinux-mrtg-2.20210203-r1.ebuild b/sec-policy/selinux-mrtg/selinux-mrtg-2.20210203-r1.ebuild
index 97f915809581..cb932a27eccd 100644
--- a/sec-policy/selinux-mrtg/selinux-mrtg-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-mrtg/selinux-mrtg-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mrtg"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-munin/selinux-munin-2.20200818-r2.ebuild b/sec-policy/selinux-munin/selinux-munin-2.20200818-r2.ebuild
index 505cf266cbff..c86aecae510e 100644
--- a/sec-policy/selinux-munin/selinux-munin-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-munin/selinux-munin-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for munin"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-munin/selinux-munin-2.20210203-r1.ebuild b/sec-policy/selinux-munin/selinux-munin-2.20210203-r1.ebuild
index 505cf266cbff..c86aecae510e 100644
--- a/sec-policy/selinux-munin/selinux-munin-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-munin/selinux-munin-2.20210203-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for munin"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-mutt/selinux-mutt-2.20200818-r2.ebuild b/sec-policy/selinux-mutt/selinux-mutt-2.20200818-r2.ebuild
index 61ddf5207a8f..92f4d66755eb 100644
--- a/sec-policy/selinux-mutt/selinux-mutt-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-mutt/selinux-mutt-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mutt"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-mutt/selinux-mutt-2.20210203-r1.ebuild b/sec-policy/selinux-mutt/selinux-mutt-2.20210203-r1.ebuild
index 61ddf5207a8f..92f4d66755eb 100644
--- a/sec-policy/selinux-mutt/selinux-mutt-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-mutt/selinux-mutt-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mutt"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-mysql/selinux-mysql-2.20200818-r2.ebuild b/sec-policy/selinux-mysql/selinux-mysql-2.20200818-r2.ebuild
index da5057e35918..c42412711885 100644
--- a/sec-policy/selinux-mysql/selinux-mysql-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-mysql/selinux-mysql-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mysql"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-mysql/selinux-mysql-2.20210203-r1.ebuild b/sec-policy/selinux-mysql/selinux-mysql-2.20210203-r1.ebuild
index da5057e35918..c42412711885 100644
--- a/sec-policy/selinux-mysql/selinux-mysql-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-mysql/selinux-mysql-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mysql"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-nagios/selinux-nagios-2.20200818-r2.ebuild b/sec-policy/selinux-nagios/selinux-nagios-2.20200818-r2.ebuild
index 1f8c05b79eb0..c5ce244a14ca 100644
--- a/sec-policy/selinux-nagios/selinux-nagios-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-nagios/selinux-nagios-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for nagios"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-nagios/selinux-nagios-2.20210203-r1.ebuild b/sec-policy/selinux-nagios/selinux-nagios-2.20210203-r1.ebuild
index 1f8c05b79eb0..c5ce244a14ca 100644
--- a/sec-policy/selinux-nagios/selinux-nagios-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-nagios/selinux-nagios-2.20210203-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for nagios"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-ncftool/selinux-ncftool-2.20200818-r2.ebuild b/sec-policy/selinux-ncftool/selinux-ncftool-2.20200818-r2.ebuild
index 02a9b14edc10..31c444ca78a3 100644
--- a/sec-policy/selinux-ncftool/selinux-ncftool-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-ncftool/selinux-ncftool-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ncftool"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ncftool/selinux-ncftool-2.20210203-r1.ebuild b/sec-policy/selinux-ncftool/selinux-ncftool-2.20210203-r1.ebuild
index 02a9b14edc10..31c444ca78a3 100644
--- a/sec-policy/selinux-ncftool/selinux-ncftool-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-ncftool/selinux-ncftool-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ncftool"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20200818-r2.ebuild b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20200818-r2.ebuild
index fed506d174ca..8e4b98ff4949 100644
--- a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for networkmanager"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20210203-r1.ebuild b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20210203-r1.ebuild
index fed506d174ca..8e4b98ff4949 100644
--- a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for networkmanager"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-nginx/selinux-nginx-2.20200818-r2.ebuild b/sec-policy/selinux-nginx/selinux-nginx-2.20200818-r2.ebuild
index 2a1050fd93c2..5d46bcb71e9f 100644
--- a/sec-policy/selinux-nginx/selinux-nginx-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-nginx/selinux-nginx-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for nginx"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-nginx/selinux-nginx-2.20210203-r1.ebuild b/sec-policy/selinux-nginx/selinux-nginx-2.20210203-r1.ebuild
index 2a1050fd93c2..5d46bcb71e9f 100644
--- a/sec-policy/selinux-nginx/selinux-nginx-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-nginx/selinux-nginx-2.20210203-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for nginx"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-nslcd/selinux-nslcd-2.20200818-r2.ebuild b/sec-policy/selinux-nslcd/selinux-nslcd-2.20200818-r2.ebuild
index 3a7993c8efec..7bec988c11a8 100644
--- a/sec-policy/selinux-nslcd/selinux-nslcd-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-nslcd/selinux-nslcd-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for nslcd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-nslcd/selinux-nslcd-2.20210203-r1.ebuild b/sec-policy/selinux-nslcd/selinux-nslcd-2.20210203-r1.ebuild
index 3a7993c8efec..7bec988c11a8 100644
--- a/sec-policy/selinux-nslcd/selinux-nslcd-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-nslcd/selinux-nslcd-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for nslcd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ntop/selinux-ntop-2.20200818-r2.ebuild b/sec-policy/selinux-ntop/selinux-ntop-2.20200818-r2.ebuild
index f349c51d78e7..52a9243803f4 100644
--- a/sec-policy/selinux-ntop/selinux-ntop-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-ntop/selinux-ntop-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ntop"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ntop/selinux-ntop-2.20210203-r1.ebuild b/sec-policy/selinux-ntop/selinux-ntop-2.20210203-r1.ebuild
index f349c51d78e7..52a9243803f4 100644
--- a/sec-policy/selinux-ntop/selinux-ntop-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-ntop/selinux-ntop-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ntop"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ntp/selinux-ntp-2.20200818-r2.ebuild b/sec-policy/selinux-ntp/selinux-ntp-2.20200818-r2.ebuild
index 46a861316aea..8ec9ec07845d 100644
--- a/sec-policy/selinux-ntp/selinux-ntp-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-ntp/selinux-ntp-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ntp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ntp/selinux-ntp-2.20210203-r1.ebuild b/sec-policy/selinux-ntp/selinux-ntp-2.20210203-r1.ebuild
index 46a861316aea..8ec9ec07845d 100644
--- a/sec-policy/selinux-ntp/selinux-ntp-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-ntp/selinux-ntp-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ntp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-nut/selinux-nut-2.20200818-r2.ebuild b/sec-policy/selinux-nut/selinux-nut-2.20200818-r2.ebuild
index 47aedc46eff3..a1f658754dad 100644
--- a/sec-policy/selinux-nut/selinux-nut-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-nut/selinux-nut-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for nut"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-nut/selinux-nut-2.20210203-r1.ebuild b/sec-policy/selinux-nut/selinux-nut-2.20210203-r1.ebuild
index 47aedc46eff3..a1f658754dad 100644
--- a/sec-policy/selinux-nut/selinux-nut-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-nut/selinux-nut-2.20210203-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for nut"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-nx/selinux-nx-2.20200818-r2.ebuild b/sec-policy/selinux-nx/selinux-nx-2.20200818-r2.ebuild
index adc4fb867f1b..935595ba1bd4 100644
--- a/sec-policy/selinux-nx/selinux-nx-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-nx/selinux-nx-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for nx"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-nx/selinux-nx-2.20210203-r1.ebuild b/sec-policy/selinux-nx/selinux-nx-2.20210203-r1.ebuild
index adc4fb867f1b..935595ba1bd4 100644
--- a/sec-policy/selinux-nx/selinux-nx-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-nx/selinux-nx-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for nx"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-oddjob/selinux-oddjob-2.20200818-r2.ebuild b/sec-policy/selinux-oddjob/selinux-oddjob-2.20200818-r2.ebuild
index 5155cba85952..235cbc33bbfd 100644
--- a/sec-policy/selinux-oddjob/selinux-oddjob-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-oddjob/selinux-oddjob-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for oddjob"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-oddjob/selinux-oddjob-2.20210203-r1.ebuild b/sec-policy/selinux-oddjob/selinux-oddjob-2.20210203-r1.ebuild
index 5155cba85952..235cbc33bbfd 100644
--- a/sec-policy/selinux-oddjob/selinux-oddjob-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-oddjob/selinux-oddjob-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for oddjob"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-oident/selinux-oident-2.20200818-r2.ebuild b/sec-policy/selinux-oident/selinux-oident-2.20200818-r2.ebuild
index 001297ddadca..382d54dee42b 100644
--- a/sec-policy/selinux-oident/selinux-oident-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-oident/selinux-oident-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for oident"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-oident/selinux-oident-2.20210203-r1.ebuild b/sec-policy/selinux-oident/selinux-oident-2.20210203-r1.ebuild
index 001297ddadca..382d54dee42b 100644
--- a/sec-policy/selinux-oident/selinux-oident-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-oident/selinux-oident-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for oident"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-openct/selinux-openct-2.20200818-r2.ebuild b/sec-policy/selinux-openct/selinux-openct-2.20200818-r2.ebuild
index 83a586eda34d..23649440d43e 100644
--- a/sec-policy/selinux-openct/selinux-openct-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-openct/selinux-openct-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for openct"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-openct/selinux-openct-2.20210203-r1.ebuild b/sec-policy/selinux-openct/selinux-openct-2.20210203-r1.ebuild
index 83a586eda34d..23649440d43e 100644
--- a/sec-policy/selinux-openct/selinux-openct-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-openct/selinux-openct-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for openct"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-openrc/selinux-openrc-2.20200818-r2.ebuild b/sec-policy/selinux-openrc/selinux-openrc-2.20200818-r2.ebuild
index 291d7bdb59bc..afd6285a6226 100644
--- a/sec-policy/selinux-openrc/selinux-openrc-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-openrc/selinux-openrc-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for openrc"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-openrc/selinux-openrc-2.20210203-r1.ebuild b/sec-policy/selinux-openrc/selinux-openrc-2.20210203-r1.ebuild
index 291d7bdb59bc..afd6285a6226 100644
--- a/sec-policy/selinux-openrc/selinux-openrc-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-openrc/selinux-openrc-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for openrc"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-openvpn/selinux-openvpn-2.20200818-r2.ebuild b/sec-policy/selinux-openvpn/selinux-openvpn-2.20200818-r2.ebuild
index 542571bb8384..1c644e15270c 100644
--- a/sec-policy/selinux-openvpn/selinux-openvpn-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-openvpn/selinux-openvpn-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for openvpn"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-openvpn/selinux-openvpn-2.20210203-r1.ebuild b/sec-policy/selinux-openvpn/selinux-openvpn-2.20210203-r1.ebuild
index 542571bb8384..1c644e15270c 100644
--- a/sec-policy/selinux-openvpn/selinux-openvpn-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-openvpn/selinux-openvpn-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for openvpn"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-pan/selinux-pan-2.20200818-r2.ebuild b/sec-policy/selinux-pan/selinux-pan-2.20200818-r2.ebuild
index 3f25aa8b3af1..e545a7ddb3e5 100644
--- a/sec-policy/selinux-pan/selinux-pan-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-pan/selinux-pan-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for pan"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-pan/selinux-pan-2.20210203-r1.ebuild b/sec-policy/selinux-pan/selinux-pan-2.20210203-r1.ebuild
index 3f25aa8b3af1..e545a7ddb3e5 100644
--- a/sec-policy/selinux-pan/selinux-pan-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-pan/selinux-pan-2.20210203-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for pan"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20200818-r2.ebuild b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20200818-r2.ebuild
index 138b45c395b8..4671630684af 100644
--- a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for pcmcia"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-pcscd/selinux-pcscd-2.20200818-r2.ebuild b/sec-policy/selinux-pcscd/selinux-pcscd-2.20200818-r2.ebuild
index f9a9b3c9c547..c15259f422b0 100644
--- a/sec-policy/selinux-pcscd/selinux-pcscd-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-pcscd/selinux-pcscd-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for pcscd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-pcscd/selinux-pcscd-2.20210203-r1.ebuild b/sec-policy/selinux-pcscd/selinux-pcscd-2.20210203-r1.ebuild
index f9a9b3c9c547..c15259f422b0 100644
--- a/sec-policy/selinux-pcscd/selinux-pcscd-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-pcscd/selinux-pcscd-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for pcscd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20200818-r2.ebuild b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20200818-r2.ebuild
index b000f9878ed5..6b07859200ac 100644
--- a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for phpfpm"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20210203-r1.ebuild b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20210203-r1.ebuild
index b000f9878ed5..6b07859200ac 100644
--- a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20210203-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for phpfpm"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20200818-r2.ebuild b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20200818-r2.ebuild
index 54112746f2ca..7c8a5f1d12e0 100644
--- a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for plymouthd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20210203-r1.ebuild b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20210203-r1.ebuild
index 54112746f2ca..7c8a5f1d12e0 100644
--- a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for plymouthd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20200818-r2.ebuild b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20200818-r2.ebuild
index de175469eeab..a482608228bb 100644
--- a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for podsleuth"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-policykit/selinux-policykit-2.20200818-r2.ebuild b/sec-policy/selinux-policykit/selinux-policykit-2.20200818-r2.ebuild
index c59b675259ac..c0cbb57aa684 100644
--- a/sec-policy/selinux-policykit/selinux-policykit-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-policykit/selinux-policykit-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for policykit"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-policykit/selinux-policykit-2.20210203-r1.ebuild b/sec-policy/selinux-policykit/selinux-policykit-2.20210203-r1.ebuild
index c59b675259ac..c0cbb57aa684 100644
--- a/sec-policy/selinux-policykit/selinux-policykit-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-policykit/selinux-policykit-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for policykit"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-portmap/selinux-portmap-2.20200818-r2.ebuild b/sec-policy/selinux-portmap/selinux-portmap-2.20200818-r2.ebuild
index ab05ac72bf1b..1f7517c92348 100644
--- a/sec-policy/selinux-portmap/selinux-portmap-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-portmap/selinux-portmap-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for portmap"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-portmap/selinux-portmap-2.20210203-r1.ebuild b/sec-policy/selinux-portmap/selinux-portmap-2.20210203-r1.ebuild
index ab05ac72bf1b..1f7517c92348 100644
--- a/sec-policy/selinux-portmap/selinux-portmap-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-portmap/selinux-portmap-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for portmap"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-postfix/selinux-postfix-2.20200818-r2.ebuild b/sec-policy/selinux-postfix/selinux-postfix-2.20200818-r2.ebuild
index 426ee754856b..960707abb105 100644
--- a/sec-policy/selinux-postfix/selinux-postfix-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-postfix/selinux-postfix-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for postfix"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-postfix/selinux-postfix-2.20210203-r1.ebuild b/sec-policy/selinux-postfix/selinux-postfix-2.20210203-r1.ebuild
index 426ee754856b..960707abb105 100644
--- a/sec-policy/selinux-postfix/selinux-postfix-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-postfix/selinux-postfix-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for postfix"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-postgresql/selinux-postgresql-2.20200818-r2.ebuild b/sec-policy/selinux-postgresql/selinux-postgresql-2.20200818-r2.ebuild
index 21de2f8ae662..80883ba14b68 100644
--- a/sec-policy/selinux-postgresql/selinux-postgresql-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-postgresql/selinux-postgresql-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for postgresql"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-postgresql/selinux-postgresql-2.20210203-r1.ebuild b/sec-policy/selinux-postgresql/selinux-postgresql-2.20210203-r1.ebuild
index 21de2f8ae662..80883ba14b68 100644
--- a/sec-policy/selinux-postgresql/selinux-postgresql-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-postgresql/selinux-postgresql-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for postgresql"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-postgrey/selinux-postgrey-2.20200818-r2.ebuild b/sec-policy/selinux-postgrey/selinux-postgrey-2.20200818-r2.ebuild
index 542d9acfe0ea..b2840407ecdf 100644
--- a/sec-policy/selinux-postgrey/selinux-postgrey-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-postgrey/selinux-postgrey-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for postgrey"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-postgrey/selinux-postgrey-2.20210203-r1.ebuild b/sec-policy/selinux-postgrey/selinux-postgrey-2.20210203-r1.ebuild
index 542d9acfe0ea..b2840407ecdf 100644
--- a/sec-policy/selinux-postgrey/selinux-postgrey-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-postgrey/selinux-postgrey-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for postgrey"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ppp/selinux-ppp-2.20200818-r2.ebuild b/sec-policy/selinux-ppp/selinux-ppp-2.20200818-r2.ebuild
index a283840e396e..66f8d3a73871 100644
--- a/sec-policy/selinux-ppp/selinux-ppp-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-ppp/selinux-ppp-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ppp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ppp/selinux-ppp-2.20210203-r1.ebuild b/sec-policy/selinux-ppp/selinux-ppp-2.20210203-r1.ebuild
index a283840e396e..66f8d3a73871 100644
--- a/sec-policy/selinux-ppp/selinux-ppp-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-ppp/selinux-ppp-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ppp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-prelink/selinux-prelink-2.20200818-r2.ebuild b/sec-policy/selinux-prelink/selinux-prelink-2.20200818-r2.ebuild
index 3eb54ba01245..fdb199ea6b62 100644
--- a/sec-policy/selinux-prelink/selinux-prelink-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-prelink/selinux-prelink-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for prelink"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-prelink/selinux-prelink-2.20210203-r1.ebuild b/sec-policy/selinux-prelink/selinux-prelink-2.20210203-r1.ebuild
index 3eb54ba01245..fdb199ea6b62 100644
--- a/sec-policy/selinux-prelink/selinux-prelink-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-prelink/selinux-prelink-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for prelink"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-prelude/selinux-prelude-2.20200818-r2.ebuild b/sec-policy/selinux-prelude/selinux-prelude-2.20200818-r2.ebuild
index 04937a86e4a8..931bdcaa42a3 100644
--- a/sec-policy/selinux-prelude/selinux-prelude-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-prelude/selinux-prelude-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for prelude"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-prelude/selinux-prelude-2.20210203-r1.ebuild b/sec-policy/selinux-prelude/selinux-prelude-2.20210203-r1.ebuild
index 04937a86e4a8..931bdcaa42a3 100644
--- a/sec-policy/selinux-prelude/selinux-prelude-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-prelude/selinux-prelude-2.20210203-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for prelude"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-privoxy/selinux-privoxy-2.20200818-r2.ebuild b/sec-policy/selinux-privoxy/selinux-privoxy-2.20200818-r2.ebuild
index 3e89a5e0d2af..32bc6dd9764a 100644
--- a/sec-policy/selinux-privoxy/selinux-privoxy-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-privoxy/selinux-privoxy-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for privoxy"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-privoxy/selinux-privoxy-2.20210203-r1.ebuild b/sec-policy/selinux-privoxy/selinux-privoxy-2.20210203-r1.ebuild
index 3e89a5e0d2af..32bc6dd9764a 100644
--- a/sec-policy/selinux-privoxy/selinux-privoxy-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-privoxy/selinux-privoxy-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for privoxy"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-procmail/selinux-procmail-2.20200818-r2.ebuild b/sec-policy/selinux-procmail/selinux-procmail-2.20200818-r2.ebuild
index 81afe54405b9..fba8cf50ff92 100644
--- a/sec-policy/selinux-procmail/selinux-procmail-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-procmail/selinux-procmail-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for procmail"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-procmail/selinux-procmail-2.20210203-r1.ebuild b/sec-policy/selinux-procmail/selinux-procmail-2.20210203-r1.ebuild
index 81afe54405b9..fba8cf50ff92 100644
--- a/sec-policy/selinux-procmail/selinux-procmail-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-procmail/selinux-procmail-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for procmail"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-psad/selinux-psad-2.20200818-r2.ebuild b/sec-policy/selinux-psad/selinux-psad-2.20200818-r2.ebuild
index 9b1fe9e12b27..58fbb30d22d8 100644
--- a/sec-policy/selinux-psad/selinux-psad-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-psad/selinux-psad-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for psad"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-psad/selinux-psad-2.20210203-r1.ebuild b/sec-policy/selinux-psad/selinux-psad-2.20210203-r1.ebuild
index 9b1fe9e12b27..58fbb30d22d8 100644
--- a/sec-policy/selinux-psad/selinux-psad-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-psad/selinux-psad-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for psad"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-publicfile/selinux-publicfile-2.20200818-r2.ebuild b/sec-policy/selinux-publicfile/selinux-publicfile-2.20200818-r2.ebuild
index 5d9d3666da9f..056e406cde6e 100644
--- a/sec-policy/selinux-publicfile/selinux-publicfile-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-publicfile/selinux-publicfile-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for publicfile"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-publicfile/selinux-publicfile-2.20210203-r1.ebuild b/sec-policy/selinux-publicfile/selinux-publicfile-2.20210203-r1.ebuild
index 5d9d3666da9f..056e406cde6e 100644
--- a/sec-policy/selinux-publicfile/selinux-publicfile-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-publicfile/selinux-publicfile-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for publicfile"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20200818-r2.ebuild b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20200818-r2.ebuild
index c1c655235f07..4199c874b732 100644
--- a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for pulseaudio"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20210203-r1.ebuild b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20210203-r1.ebuild
index c1c655235f07..4199c874b732 100644
--- a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for pulseaudio"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-puppet/selinux-puppet-2.20200818-r2.ebuild b/sec-policy/selinux-puppet/selinux-puppet-2.20200818-r2.ebuild
index a85550e7acea..bf641a30640f 100644
--- a/sec-policy/selinux-puppet/selinux-puppet-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-puppet/selinux-puppet-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for puppet"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-puppet/selinux-puppet-2.20210203-r1.ebuild b/sec-policy/selinux-puppet/selinux-puppet-2.20210203-r1.ebuild
index a85550e7acea..bf641a30640f 100644
--- a/sec-policy/selinux-puppet/selinux-puppet-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-puppet/selinux-puppet-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for puppet"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20200818-r2.ebuild b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20200818-r2.ebuild
index ed6bc3ab3398..28a7324db8e9 100644
--- a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for pyicqt"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20210203-r1.ebuild b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20210203-r1.ebuild
index ed6bc3ab3398..28a7324db8e9 100644
--- a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for pyicqt"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-pyzor/selinux-pyzor-2.20200818-r2.ebuild b/sec-policy/selinux-pyzor/selinux-pyzor-2.20200818-r2.ebuild
index ef0fc0003c42..67a31cfe67d7 100644
--- a/sec-policy/selinux-pyzor/selinux-pyzor-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-pyzor/selinux-pyzor-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for pyzor"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-pyzor/selinux-pyzor-2.20210203-r1.ebuild b/sec-policy/selinux-pyzor/selinux-pyzor-2.20210203-r1.ebuild
index ef0fc0003c42..67a31cfe67d7 100644
--- a/sec-policy/selinux-pyzor/selinux-pyzor-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-pyzor/selinux-pyzor-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for pyzor"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-qemu/selinux-qemu-2.20200818-r2.ebuild b/sec-policy/selinux-qemu/selinux-qemu-2.20200818-r2.ebuild
index 91b81fd19737..f6795dd470af 100644
--- a/sec-policy/selinux-qemu/selinux-qemu-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-qemu/selinux-qemu-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for qemu"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-virt
diff --git a/sec-policy/selinux-qemu/selinux-qemu-2.20210203-r1.ebuild b/sec-policy/selinux-qemu/selinux-qemu-2.20210203-r1.ebuild
index 91b81fd19737..f6795dd470af 100644
--- a/sec-policy/selinux-qemu/selinux-qemu-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-qemu/selinux-qemu-2.20210203-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for qemu"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-virt
diff --git a/sec-policy/selinux-qmail/selinux-qmail-2.20200818-r2.ebuild b/sec-policy/selinux-qmail/selinux-qmail-2.20200818-r2.ebuild
index 2415e06c8418..14a977c504b9 100644
--- a/sec-policy/selinux-qmail/selinux-qmail-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-qmail/selinux-qmail-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for qmail"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-qmail/selinux-qmail-2.20210203-r1.ebuild b/sec-policy/selinux-qmail/selinux-qmail-2.20210203-r1.ebuild
index 2415e06c8418..14a977c504b9 100644
--- a/sec-policy/selinux-qmail/selinux-qmail-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-qmail/selinux-qmail-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for qmail"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-quota/selinux-quota-2.20200818-r2.ebuild b/sec-policy/selinux-quota/selinux-quota-2.20200818-r2.ebuild
index ab33cbc6d0f5..6bd089d10c3d 100644
--- a/sec-policy/selinux-quota/selinux-quota-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-quota/selinux-quota-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for quota"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-quota/selinux-quota-2.20210203-r1.ebuild b/sec-policy/selinux-quota/selinux-quota-2.20210203-r1.ebuild
index ab33cbc6d0f5..6bd089d10c3d 100644
--- a/sec-policy/selinux-quota/selinux-quota-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-quota/selinux-quota-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for quota"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-radius/selinux-radius-2.20200818-r2.ebuild b/sec-policy/selinux-radius/selinux-radius-2.20200818-r2.ebuild
index bd274decd94c..e069ea8c911a 100644
--- a/sec-policy/selinux-radius/selinux-radius-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-radius/selinux-radius-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for radius"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-radius/selinux-radius-2.20210203-r1.ebuild b/sec-policy/selinux-radius/selinux-radius-2.20210203-r1.ebuild
index bd274decd94c..e069ea8c911a 100644
--- a/sec-policy/selinux-radius/selinux-radius-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-radius/selinux-radius-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for radius"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-radvd/selinux-radvd-2.20200818-r2.ebuild b/sec-policy/selinux-radvd/selinux-radvd-2.20200818-r2.ebuild
index be5a7277a421..f00f5776808e 100644
--- a/sec-policy/selinux-radvd/selinux-radvd-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-radvd/selinux-radvd-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for radvd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-radvd/selinux-radvd-2.20210203-r1.ebuild b/sec-policy/selinux-radvd/selinux-radvd-2.20210203-r1.ebuild
index be5a7277a421..f00f5776808e 100644
--- a/sec-policy/selinux-radvd/selinux-radvd-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-radvd/selinux-radvd-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for radvd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-razor/selinux-razor-2.20200818-r2.ebuild b/sec-policy/selinux-razor/selinux-razor-2.20200818-r2.ebuild
index dfcb244c6620..4f11de1a6e51 100644
--- a/sec-policy/selinux-razor/selinux-razor-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-razor/selinux-razor-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for razor"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-razor/selinux-razor-2.20210203-r1.ebuild b/sec-policy/selinux-razor/selinux-razor-2.20210203-r1.ebuild
index dfcb244c6620..4f11de1a6e51 100644
--- a/sec-policy/selinux-razor/selinux-razor-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-razor/selinux-razor-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for razor"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-redis/selinux-redis-2.20200818-r2.ebuild b/sec-policy/selinux-redis/selinux-redis-2.20200818-r2.ebuild
index 160f4cbb581b..703738969925 100644
--- a/sec-policy/selinux-redis/selinux-redis-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-redis/selinux-redis-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for redis"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-redis/selinux-redis-2.20210203-r1.ebuild b/sec-policy/selinux-redis/selinux-redis-2.20210203-r1.ebuild
index 160f4cbb581b..703738969925 100644
--- a/sec-policy/selinux-redis/selinux-redis-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-redis/selinux-redis-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for redis"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20200818-r2.ebuild b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20200818-r2.ebuild
index d6e08ee5e34e..1205e0fe3185 100644
--- a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for remotelogin"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20210203-r1.ebuild b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20210203-r1.ebuild
index d6e08ee5e34e..1205e0fe3185 100644
--- a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for remotelogin"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20200818-r2.ebuild b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20200818-r2.ebuild
index 6ac4493f89b1..04d3290e44fc 100644
--- a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for resolvconf"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20210203-r1.ebuild b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20210203-r1.ebuild
index 6ac4493f89b1..04d3290e44fc 100644
--- a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for resolvconf"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20200818-r2.ebuild b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20200818-r2.ebuild
index 000919ce5b12..75f5ed604d49 100644
--- a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rgmanager"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20210203-r1.ebuild b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20210203-r1.ebuild
index 000919ce5b12..75f5ed604d49 100644
--- a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rgmanager"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-rngd/selinux-rngd-2.20200818-r2.ebuild b/sec-policy/selinux-rngd/selinux-rngd-2.20200818-r2.ebuild
index 1d3e9cb0e2f8..841e6b3632b8 100644
--- a/sec-policy/selinux-rngd/selinux-rngd-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-rngd/selinux-rngd-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rngd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-rngd/selinux-rngd-2.20210203-r1.ebuild b/sec-policy/selinux-rngd/selinux-rngd-2.20210203-r1.ebuild
index 1d3e9cb0e2f8..841e6b3632b8 100644
--- a/sec-policy/selinux-rngd/selinux-rngd-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-rngd/selinux-rngd-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rngd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-roundup/selinux-roundup-2.20200818-r2.ebuild b/sec-policy/selinux-roundup/selinux-roundup-2.20200818-r2.ebuild
index b4f8c732aec8..20f379e94a04 100644
--- a/sec-policy/selinux-roundup/selinux-roundup-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-roundup/selinux-roundup-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for roundup"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-rpc/selinux-rpc-2.20200818-r2.ebuild b/sec-policy/selinux-rpc/selinux-rpc-2.20200818-r2.ebuild
index 15e448e7fe2e..dddfe2bf6aef 100644
--- a/sec-policy/selinux-rpc/selinux-rpc-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-rpc/selinux-rpc-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rpc"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-rpc/selinux-rpc-2.20210203-r1.ebuild b/sec-policy/selinux-rpc/selinux-rpc-2.20210203-r1.ebuild
index 15e448e7fe2e..dddfe2bf6aef 100644
--- a/sec-policy/selinux-rpc/selinux-rpc-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-rpc/selinux-rpc-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rpc"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20200818-r2.ebuild b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20200818-r2.ebuild
index bec4f1cc04e3..119d6a18ddaf 100644
--- a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rpcbind"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20210203-r1.ebuild b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20210203-r1.ebuild
index bec4f1cc04e3..119d6a18ddaf 100644
--- a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rpcbind"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-rpm/selinux-rpm-2.20200818-r2.ebuild b/sec-policy/selinux-rpm/selinux-rpm-2.20200818-r2.ebuild
index 3ad3717d0689..d3a7396161ff 100644
--- a/sec-policy/selinux-rpm/selinux-rpm-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-rpm/selinux-rpm-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rpm"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-rpm/selinux-rpm-2.20210203-r1.ebuild b/sec-policy/selinux-rpm/selinux-rpm-2.20210203-r1.ebuild
index 3ad3717d0689..d3a7396161ff 100644
--- a/sec-policy/selinux-rpm/selinux-rpm-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-rpm/selinux-rpm-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rpm"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-rssh/selinux-rssh-2.20200818-r2.ebuild b/sec-policy/selinux-rssh/selinux-rssh-2.20200818-r2.ebuild
index 193921c19fc6..fbfa1a68e8d7 100644
--- a/sec-policy/selinux-rssh/selinux-rssh-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-rssh/selinux-rssh-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rssh"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-rssh/selinux-rssh-2.20210203-r1.ebuild b/sec-policy/selinux-rssh/selinux-rssh-2.20210203-r1.ebuild
index 193921c19fc6..fbfa1a68e8d7 100644
--- a/sec-policy/selinux-rssh/selinux-rssh-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-rssh/selinux-rssh-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rssh"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-rtkit/selinux-rtkit-2.20200818-r2.ebuild b/sec-policy/selinux-rtkit/selinux-rtkit-2.20200818-r2.ebuild
index a22545928a31..a41fa7785628 100644
--- a/sec-policy/selinux-rtkit/selinux-rtkit-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-rtkit/selinux-rtkit-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rtkit"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-dbus
diff --git a/sec-policy/selinux-rtkit/selinux-rtkit-2.20210203-r1.ebuild b/sec-policy/selinux-rtkit/selinux-rtkit-2.20210203-r1.ebuild
index a22545928a31..a41fa7785628 100644
--- a/sec-policy/selinux-rtkit/selinux-rtkit-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-rtkit/selinux-rtkit-2.20210203-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rtkit"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-dbus
diff --git a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20200818-r2.ebuild b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20200818-r2.ebuild
index 94a75e275bc7..b5d6e2d76d39 100644
--- a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rtorrent"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20210203-r1.ebuild b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20210203-r1.ebuild
index 94a75e275bc7..b5d6e2d76d39 100644
--- a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rtorrent"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-salt/selinux-salt-2.20200818-r2.ebuild b/sec-policy/selinux-salt/selinux-salt-2.20200818-r2.ebuild
index 6d3416e1f33e..beb4aab53613 100644
--- a/sec-policy/selinux-salt/selinux-salt-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-salt/selinux-salt-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for salt"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-salt/selinux-salt-2.20210203-r1.ebuild b/sec-policy/selinux-salt/selinux-salt-2.20210203-r1.ebuild
index 6d3416e1f33e..beb4aab53613 100644
--- a/sec-policy/selinux-salt/selinux-salt-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-salt/selinux-salt-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for salt"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-samba/selinux-samba-2.20200818-r2.ebuild b/sec-policy/selinux-samba/selinux-samba-2.20200818-r2.ebuild
index 20127721e440..1d4027fc3745 100644
--- a/sec-policy/selinux-samba/selinux-samba-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-samba/selinux-samba-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for samba"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-samba/selinux-samba-2.20210203-r1.ebuild b/sec-policy/selinux-samba/selinux-samba-2.20210203-r1.ebuild
index 20127721e440..1d4027fc3745 100644
--- a/sec-policy/selinux-samba/selinux-samba-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-samba/selinux-samba-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for samba"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-sasl/selinux-sasl-2.20200818-r2.ebuild b/sec-policy/selinux-sasl/selinux-sasl-2.20200818-r2.ebuild
index 3a4885fab096..4f428aafdc03 100644
--- a/sec-policy/selinux-sasl/selinux-sasl-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-sasl/selinux-sasl-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for sasl"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-sasl/selinux-sasl-2.20210203-r1.ebuild b/sec-policy/selinux-sasl/selinux-sasl-2.20210203-r1.ebuild
index 3a4885fab096..4f428aafdc03 100644
--- a/sec-policy/selinux-sasl/selinux-sasl-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-sasl/selinux-sasl-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for sasl"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-screen/selinux-screen-2.20200818-r2.ebuild b/sec-policy/selinux-screen/selinux-screen-2.20200818-r2.ebuild
index 36ff76f4d8d7..2ca58cf4515c 100644
--- a/sec-policy/selinux-screen/selinux-screen-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-screen/selinux-screen-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for screen"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-screen/selinux-screen-2.20210203-r1.ebuild b/sec-policy/selinux-screen/selinux-screen-2.20210203-r1.ebuild
index 36ff76f4d8d7..2ca58cf4515c 100644
--- a/sec-policy/selinux-screen/selinux-screen-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-screen/selinux-screen-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for screen"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-sendmail/selinux-sendmail-2.20200818-r2.ebuild b/sec-policy/selinux-sendmail/selinux-sendmail-2.20200818-r2.ebuild
index 073dce5c2ed7..3f625f16ca2c 100644
--- a/sec-policy/selinux-sendmail/selinux-sendmail-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-sendmail/selinux-sendmail-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for sendmail"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-sendmail/selinux-sendmail-2.20210203-r1.ebuild b/sec-policy/selinux-sendmail/selinux-sendmail-2.20210203-r1.ebuild
index 073dce5c2ed7..3f625f16ca2c 100644
--- a/sec-policy/selinux-sendmail/selinux-sendmail-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-sendmail/selinux-sendmail-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for sendmail"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-sensord/selinux-sensord-2.20200818-r2.ebuild b/sec-policy/selinux-sensord/selinux-sensord-2.20200818-r2.ebuild
index 402656b0199a..44c408a89acf 100644
--- a/sec-policy/selinux-sensord/selinux-sensord-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-sensord/selinux-sensord-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for sensord"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-sensord/selinux-sensord-2.20210203-r1.ebuild b/sec-policy/selinux-sensord/selinux-sensord-2.20210203-r1.ebuild
index 402656b0199a..44c408a89acf 100644
--- a/sec-policy/selinux-sensord/selinux-sensord-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-sensord/selinux-sensord-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for sensord"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-shorewall/selinux-shorewall-2.20200818-r2.ebuild b/sec-policy/selinux-shorewall/selinux-shorewall-2.20200818-r2.ebuild
index 53784c987afc..1c67c307123c 100644
--- a/sec-policy/selinux-shorewall/selinux-shorewall-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-shorewall/selinux-shorewall-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for shorewall"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-shorewall/selinux-shorewall-2.20210203-r1.ebuild b/sec-policy/selinux-shorewall/selinux-shorewall-2.20210203-r1.ebuild
index 53784c987afc..1c67c307123c 100644
--- a/sec-policy/selinux-shorewall/selinux-shorewall-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-shorewall/selinux-shorewall-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for shorewall"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-shutdown/selinux-shutdown-2.20200818-r2.ebuild b/sec-policy/selinux-shutdown/selinux-shutdown-2.20200818-r2.ebuild
index c77f7a1cdca8..2cb594fb13ec 100644
--- a/sec-policy/selinux-shutdown/selinux-shutdown-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-shutdown/selinux-shutdown-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for shutdown"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-shutdown/selinux-shutdown-2.20210203-r1.ebuild b/sec-policy/selinux-shutdown/selinux-shutdown-2.20210203-r1.ebuild
index c77f7a1cdca8..2cb594fb13ec 100644
--- a/sec-policy/selinux-shutdown/selinux-shutdown-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-shutdown/selinux-shutdown-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for shutdown"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-skype/selinux-skype-2.20200818-r2.ebuild b/sec-policy/selinux-skype/selinux-skype-2.20200818-r2.ebuild
index dd52ceeed26b..7f22b5fc8824 100644
--- a/sec-policy/selinux-skype/selinux-skype-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-skype/selinux-skype-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for skype"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-skype/selinux-skype-2.20210203-r1.ebuild b/sec-policy/selinux-skype/selinux-skype-2.20210203-r1.ebuild
index dd52ceeed26b..7f22b5fc8824 100644
--- a/sec-policy/selinux-skype/selinux-skype-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-skype/selinux-skype-2.20210203-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for skype"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-slocate/selinux-slocate-2.20200818-r2.ebuild b/sec-policy/selinux-slocate/selinux-slocate-2.20200818-r2.ebuild
index 862ee711f7f3..13911935d665 100644
--- a/sec-policy/selinux-slocate/selinux-slocate-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-slocate/selinux-slocate-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for slocate"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-slocate/selinux-slocate-2.20210203-r1.ebuild b/sec-policy/selinux-slocate/selinux-slocate-2.20210203-r1.ebuild
index 862ee711f7f3..13911935d665 100644
--- a/sec-policy/selinux-slocate/selinux-slocate-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-slocate/selinux-slocate-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for slocate"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20200818-r2.ebuild b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20200818-r2.ebuild
index 9ba56a15fad2..a29126e18ce2 100644
--- a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for slrnpull"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20210203-r1.ebuild b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20210203-r1.ebuild
index 9ba56a15fad2..a29126e18ce2 100644
--- a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for slrnpull"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-smartmon/selinux-smartmon-2.20200818-r2.ebuild b/sec-policy/selinux-smartmon/selinux-smartmon-2.20200818-r2.ebuild
index 650f2f59007f..1db18d47690f 100644
--- a/sec-policy/selinux-smartmon/selinux-smartmon-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-smartmon/selinux-smartmon-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for smartmon"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-smartmon/selinux-smartmon-2.20210203-r1.ebuild b/sec-policy/selinux-smartmon/selinux-smartmon-2.20210203-r1.ebuild
index 650f2f59007f..1db18d47690f 100644
--- a/sec-policy/selinux-smartmon/selinux-smartmon-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-smartmon/selinux-smartmon-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for smartmon"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-smokeping/selinux-smokeping-2.20200818-r2.ebuild b/sec-policy/selinux-smokeping/selinux-smokeping-2.20200818-r2.ebuild
index f91554d6b986..a6ed3eb26ba3 100644
--- a/sec-policy/selinux-smokeping/selinux-smokeping-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-smokeping/selinux-smokeping-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for smokeping"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-smokeping/selinux-smokeping-2.20210203-r1.ebuild b/sec-policy/selinux-smokeping/selinux-smokeping-2.20210203-r1.ebuild
index f91554d6b986..a6ed3eb26ba3 100644
--- a/sec-policy/selinux-smokeping/selinux-smokeping-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-smokeping/selinux-smokeping-2.20210203-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for smokeping"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-snmp/selinux-snmp-2.20200818-r2.ebuild b/sec-policy/selinux-snmp/selinux-snmp-2.20200818-r2.ebuild
index 9cf71e60fe94..7ab5d868b440 100644
--- a/sec-policy/selinux-snmp/selinux-snmp-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-snmp/selinux-snmp-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for snmp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-snmp/selinux-snmp-2.20210203-r1.ebuild b/sec-policy/selinux-snmp/selinux-snmp-2.20210203-r1.ebuild
index 9cf71e60fe94..7ab5d868b440 100644
--- a/sec-policy/selinux-snmp/selinux-snmp-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-snmp/selinux-snmp-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for snmp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-snort/selinux-snort-2.20200818-r2.ebuild b/sec-policy/selinux-snort/selinux-snort-2.20200818-r2.ebuild
index d33c80fde025..281ae66dff09 100644
--- a/sec-policy/selinux-snort/selinux-snort-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-snort/selinux-snort-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for snort"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-snort/selinux-snort-2.20210203-r1.ebuild b/sec-policy/selinux-snort/selinux-snort-2.20210203-r1.ebuild
index d33c80fde025..281ae66dff09 100644
--- a/sec-policy/selinux-snort/selinux-snort-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-snort/selinux-snort-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for snort"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-soundserver/selinux-soundserver-2.20200818-r2.ebuild b/sec-policy/selinux-soundserver/selinux-soundserver-2.20200818-r2.ebuild
index 6d0bfd3789e5..1a5b660dbdc9 100644
--- a/sec-policy/selinux-soundserver/selinux-soundserver-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-soundserver/selinux-soundserver-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for soundserver"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-soundserver/selinux-soundserver-2.20210203-r1.ebuild b/sec-policy/selinux-soundserver/selinux-soundserver-2.20210203-r1.ebuild
index 6d0bfd3789e5..1a5b660dbdc9 100644
--- a/sec-policy/selinux-soundserver/selinux-soundserver-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-soundserver/selinux-soundserver-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for soundserver"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20200818-r2.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20200818-r2.ebuild
index 17fa7f3f8e2c..d27ce11ca8fc 100644
--- a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for spamassassin"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20210203-r1.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20210203-r1.ebuild
index 17fa7f3f8e2c..d27ce11ca8fc 100644
--- a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for spamassassin"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20200818-r2.ebuild b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20200818-r2.ebuild
index 896001f9c549..86ef8634bb03 100644
--- a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for speedtouch"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-squid/selinux-squid-2.20200818-r2.ebuild b/sec-policy/selinux-squid/selinux-squid-2.20200818-r2.ebuild
index 70ce72a8aa2f..622d72bb1000 100644
--- a/sec-policy/selinux-squid/selinux-squid-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-squid/selinux-squid-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for squid"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-squid/selinux-squid-2.20210203-r1.ebuild b/sec-policy/selinux-squid/selinux-squid-2.20210203-r1.ebuild
index 70ce72a8aa2f..622d72bb1000 100644
--- a/sec-policy/selinux-squid/selinux-squid-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-squid/selinux-squid-2.20210203-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for squid"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-sssd/selinux-sssd-2.20200818-r2.ebuild b/sec-policy/selinux-sssd/selinux-sssd-2.20200818-r2.ebuild
index 96f3ec50dbe2..1ea2f80bdd14 100644
--- a/sec-policy/selinux-sssd/selinux-sssd-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-sssd/selinux-sssd-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for sssd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-sssd/selinux-sssd-2.20210203-r1.ebuild b/sec-policy/selinux-sssd/selinux-sssd-2.20210203-r1.ebuild
index 96f3ec50dbe2..1ea2f80bdd14 100644
--- a/sec-policy/selinux-sssd/selinux-sssd-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-sssd/selinux-sssd-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for sssd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-stunnel/selinux-stunnel-2.20200818-r2.ebuild b/sec-policy/selinux-stunnel/selinux-stunnel-2.20200818-r2.ebuild
index 83e240140013..59bc87531f17 100644
--- a/sec-policy/selinux-stunnel/selinux-stunnel-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-stunnel/selinux-stunnel-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for stunnel"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-stunnel/selinux-stunnel-2.20210203-r1.ebuild b/sec-policy/selinux-stunnel/selinux-stunnel-2.20210203-r1.ebuild
index 83e240140013..59bc87531f17 100644
--- a/sec-policy/selinux-stunnel/selinux-stunnel-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-stunnel/selinux-stunnel-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for stunnel"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-subsonic/selinux-subsonic-2.20200818-r2.ebuild b/sec-policy/selinux-subsonic/selinux-subsonic-2.20200818-r2.ebuild
index 521808c648c3..d61a54158a2c 100644
--- a/sec-policy/selinux-subsonic/selinux-subsonic-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-subsonic/selinux-subsonic-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for subsonic"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-subsonic/selinux-subsonic-2.20210203-r1.ebuild b/sec-policy/selinux-subsonic/selinux-subsonic-2.20210203-r1.ebuild
index 521808c648c3..d61a54158a2c 100644
--- a/sec-policy/selinux-subsonic/selinux-subsonic-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-subsonic/selinux-subsonic-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for subsonic"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-sudo/selinux-sudo-2.20200818-r2.ebuild b/sec-policy/selinux-sudo/selinux-sudo-2.20200818-r2.ebuild
index 3823f3be7481..0173ca006a11 100644
--- a/sec-policy/selinux-sudo/selinux-sudo-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-sudo/selinux-sudo-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for sudo"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-sudo/selinux-sudo-2.20210203-r1.ebuild b/sec-policy/selinux-sudo/selinux-sudo-2.20210203-r1.ebuild
index 3823f3be7481..0173ca006a11 100644
--- a/sec-policy/selinux-sudo/selinux-sudo-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-sudo/selinux-sudo-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for sudo"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-sxid/selinux-sxid-2.20200818-r2.ebuild b/sec-policy/selinux-sxid/selinux-sxid-2.20200818-r2.ebuild
index 552a507bc71d..29f68fb72706 100644
--- a/sec-policy/selinux-sxid/selinux-sxid-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-sxid/selinux-sxid-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for sxid"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-sxid/selinux-sxid-2.20210203-r1.ebuild b/sec-policy/selinux-sxid/selinux-sxid-2.20210203-r1.ebuild
index 552a507bc71d..29f68fb72706 100644
--- a/sec-policy/selinux-sxid/selinux-sxid-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-sxid/selinux-sxid-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for sxid"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-syncthing/selinux-syncthing-2.20200818-r2.ebuild b/sec-policy/selinux-syncthing/selinux-syncthing-2.20200818-r2.ebuild
index 2d97be5fb7da..a5734b8c6536 100644
--- a/sec-policy/selinux-syncthing/selinux-syncthing-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-syncthing/selinux-syncthing-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for syncthing"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-syncthing/selinux-syncthing-2.20210203-r1.ebuild b/sec-policy/selinux-syncthing/selinux-syncthing-2.20210203-r1.ebuild
index 2d97be5fb7da..a5734b8c6536 100644
--- a/sec-policy/selinux-syncthing/selinux-syncthing-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-syncthing/selinux-syncthing-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for syncthing"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-sysstat/selinux-sysstat-2.20200818-r2.ebuild b/sec-policy/selinux-sysstat/selinux-sysstat-2.20200818-r2.ebuild
index 70d375d4c2b2..e8fa0888bd13 100644
--- a/sec-policy/selinux-sysstat/selinux-sysstat-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-sysstat/selinux-sysstat-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for sysstat"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-sysstat/selinux-sysstat-2.20210203-r1.ebuild b/sec-policy/selinux-sysstat/selinux-sysstat-2.20210203-r1.ebuild
index 70d375d4c2b2..e8fa0888bd13 100644
--- a/sec-policy/selinux-sysstat/selinux-sysstat-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-sysstat/selinux-sysstat-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for sysstat"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-tboot/selinux-tboot-2.20200818-r2.ebuild b/sec-policy/selinux-tboot/selinux-tboot-2.20200818-r2.ebuild
index d31439ff3e86..d02522b45888 100644
--- a/sec-policy/selinux-tboot/selinux-tboot-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-tboot/selinux-tboot-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tboot"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-tboot/selinux-tboot-2.20210203-r1.ebuild b/sec-policy/selinux-tboot/selinux-tboot-2.20210203-r1.ebuild
index d31439ff3e86..d02522b45888 100644
--- a/sec-policy/selinux-tboot/selinux-tboot-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-tboot/selinux-tboot-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tboot"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-tcpd/selinux-tcpd-2.20200818-r2.ebuild b/sec-policy/selinux-tcpd/selinux-tcpd-2.20200818-r2.ebuild
index 8686772a263a..1f70c615814c 100644
--- a/sec-policy/selinux-tcpd/selinux-tcpd-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-tcpd/selinux-tcpd-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tcpd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-inetd
diff --git a/sec-policy/selinux-tcpd/selinux-tcpd-2.20210203-r1.ebuild b/sec-policy/selinux-tcpd/selinux-tcpd-2.20210203-r1.ebuild
index 8686772a263a..1f70c615814c 100644
--- a/sec-policy/selinux-tcpd/selinux-tcpd-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-tcpd/selinux-tcpd-2.20210203-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tcpd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-inetd
diff --git a/sec-policy/selinux-tcsd/selinux-tcsd-2.20200818-r2.ebuild b/sec-policy/selinux-tcsd/selinux-tcsd-2.20200818-r2.ebuild
index ac5b29584ab5..4dc6b1616e1c 100644
--- a/sec-policy/selinux-tcsd/selinux-tcsd-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-tcsd/selinux-tcsd-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tcsd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-tcsd/selinux-tcsd-2.20210203-r1.ebuild b/sec-policy/selinux-tcsd/selinux-tcsd-2.20210203-r1.ebuild
index ac5b29584ab5..4dc6b1616e1c 100644
--- a/sec-policy/selinux-tcsd/selinux-tcsd-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-tcsd/selinux-tcsd-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tcsd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-telnet/selinux-telnet-2.20200818-r2.ebuild b/sec-policy/selinux-telnet/selinux-telnet-2.20200818-r2.ebuild
index 80cd26b4902f..88c26bda9cc8 100644
--- a/sec-policy/selinux-telnet/selinux-telnet-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-telnet/selinux-telnet-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for telnet"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-remotelogin
diff --git a/sec-policy/selinux-telnet/selinux-telnet-2.20210203-r1.ebuild b/sec-policy/selinux-telnet/selinux-telnet-2.20210203-r1.ebuild
index 80cd26b4902f..88c26bda9cc8 100644
--- a/sec-policy/selinux-telnet/selinux-telnet-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-telnet/selinux-telnet-2.20210203-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for telnet"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-remotelogin
diff --git a/sec-policy/selinux-tftp/selinux-tftp-2.20200818-r2.ebuild b/sec-policy/selinux-tftp/selinux-tftp-2.20200818-r2.ebuild
index 49ccdad97d98..79ff218e92e5 100644
--- a/sec-policy/selinux-tftp/selinux-tftp-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-tftp/selinux-tftp-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tftp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-tftp/selinux-tftp-2.20210203-r1.ebuild b/sec-policy/selinux-tftp/selinux-tftp-2.20210203-r1.ebuild
index 49ccdad97d98..79ff218e92e5 100644
--- a/sec-policy/selinux-tftp/selinux-tftp-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-tftp/selinux-tftp-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tftp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-tgtd/selinux-tgtd-2.20200818-r2.ebuild b/sec-policy/selinux-tgtd/selinux-tgtd-2.20200818-r2.ebuild
index 5c77649107f0..51e65edf7ab0 100644
--- a/sec-policy/selinux-tgtd/selinux-tgtd-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-tgtd/selinux-tgtd-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tgtd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-tgtd/selinux-tgtd-2.20210203-r1.ebuild b/sec-policy/selinux-tgtd/selinux-tgtd-2.20210203-r1.ebuild
index 5c77649107f0..51e65edf7ab0 100644
--- a/sec-policy/selinux-tgtd/selinux-tgtd-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-tgtd/selinux-tgtd-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tgtd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20200818-r2.ebuild b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20200818-r2.ebuild
index ccb31655d693..a368fed3d794 100644
--- a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for thunderbird"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20210203-r1.ebuild b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20210203-r1.ebuild
index ccb31655d693..a368fed3d794 100644
--- a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20210203-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for thunderbird"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-timidity/selinux-timidity-2.20200818-r2.ebuild b/sec-policy/selinux-timidity/selinux-timidity-2.20200818-r2.ebuild
index 511e6d75c4d0..91e103a42f5d 100644
--- a/sec-policy/selinux-timidity/selinux-timidity-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-timidity/selinux-timidity-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for timidity"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-timidity/selinux-timidity-2.20210203-r1.ebuild b/sec-policy/selinux-timidity/selinux-timidity-2.20210203-r1.ebuild
index 511e6d75c4d0..91e103a42f5d 100644
--- a/sec-policy/selinux-timidity/selinux-timidity-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-timidity/selinux-timidity-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for timidity"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20200818-r2.ebuild b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20200818-r2.ebuild
index 2c39411f3d5d..e2dba41e5408 100644
--- a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tmpreaper"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20210203-r1.ebuild b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20210203-r1.ebuild
index 2c39411f3d5d..e2dba41e5408 100644
--- a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tmpreaper"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-tor/selinux-tor-2.20200818-r2.ebuild b/sec-policy/selinux-tor/selinux-tor-2.20200818-r2.ebuild
index 70a2a11a5ff1..796cf811fe7a 100644
--- a/sec-policy/selinux-tor/selinux-tor-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-tor/selinux-tor-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tor"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-tor/selinux-tor-2.20210203-r1.ebuild b/sec-policy/selinux-tor/selinux-tor-2.20210203-r1.ebuild
index 70a2a11a5ff1..796cf811fe7a 100644
--- a/sec-policy/selinux-tor/selinux-tor-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-tor/selinux-tor-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tor"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-tripwire/selinux-tripwire-2.20200818-r2.ebuild b/sec-policy/selinux-tripwire/selinux-tripwire-2.20200818-r2.ebuild
index 5de97d64bdc1..477c08f958fa 100644
--- a/sec-policy/selinux-tripwire/selinux-tripwire-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-tripwire/selinux-tripwire-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tripwire"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-tripwire/selinux-tripwire-2.20210203-r1.ebuild b/sec-policy/selinux-tripwire/selinux-tripwire-2.20210203-r1.ebuild
index 5de97d64bdc1..477c08f958fa 100644
--- a/sec-policy/selinux-tripwire/selinux-tripwire-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-tripwire/selinux-tripwire-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tripwire"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20200818-r2.ebuild b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20200818-r2.ebuild
index 478279555b04..e2e3702b175c 100644
--- a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ucspitcp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20210203-r1.ebuild b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20210203-r1.ebuild
index 478279555b04..e2e3702b175c 100644
--- a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ucspitcp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ulogd/selinux-ulogd-2.20200818-r2.ebuild b/sec-policy/selinux-ulogd/selinux-ulogd-2.20200818-r2.ebuild
index e4938f13f893..148f4b9ba01a 100644
--- a/sec-policy/selinux-ulogd/selinux-ulogd-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-ulogd/selinux-ulogd-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ulogd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ulogd/selinux-ulogd-2.20210203-r1.ebuild b/sec-policy/selinux-ulogd/selinux-ulogd-2.20210203-r1.ebuild
index e4938f13f893..148f4b9ba01a 100644
--- a/sec-policy/selinux-ulogd/selinux-ulogd-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-ulogd/selinux-ulogd-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ulogd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-uml/selinux-uml-2.20200818-r2.ebuild b/sec-policy/selinux-uml/selinux-uml-2.20200818-r2.ebuild
index a23d7faecd46..3166c41bc7ea 100644
--- a/sec-policy/selinux-uml/selinux-uml-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-uml/selinux-uml-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for uml"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-uml/selinux-uml-2.20210203-r1.ebuild b/sec-policy/selinux-uml/selinux-uml-2.20210203-r1.ebuild
index a23d7faecd46..3166c41bc7ea 100644
--- a/sec-policy/selinux-uml/selinux-uml-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-uml/selinux-uml-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for uml"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-unconfined/selinux-unconfined-2.20200818-r2.ebuild b/sec-policy/selinux-unconfined/selinux-unconfined-2.20200818-r2.ebuild
index 1a588247ed28..8cb4726b78f2 100644
--- a/sec-policy/selinux-unconfined/selinux-unconfined-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-unconfined/selinux-unconfined-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for unconfined"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-unconfined/selinux-unconfined-2.20210203-r1.ebuild b/sec-policy/selinux-unconfined/selinux-unconfined-2.20210203-r1.ebuild
index 1a588247ed28..8cb4726b78f2 100644
--- a/sec-policy/selinux-unconfined/selinux-unconfined-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-unconfined/selinux-unconfined-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for unconfined"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-uptime/selinux-uptime-2.20200818-r2.ebuild b/sec-policy/selinux-uptime/selinux-uptime-2.20200818-r2.ebuild
index 6cbdeb494b17..70c8c78f3849 100644
--- a/sec-policy/selinux-uptime/selinux-uptime-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-uptime/selinux-uptime-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for uptime"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-uptime/selinux-uptime-2.20210203-r1.ebuild b/sec-policy/selinux-uptime/selinux-uptime-2.20210203-r1.ebuild
index 6cbdeb494b17..70c8c78f3849 100644
--- a/sec-policy/selinux-uptime/selinux-uptime-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-uptime/selinux-uptime-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for uptime"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20200818-r2.ebuild b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20200818-r2.ebuild
index 10ac48fe0e0b..364e5ff28ed0 100644
--- a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for usbmuxd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20210203-r1.ebuild b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20210203-r1.ebuild
index 10ac48fe0e0b..364e5ff28ed0 100644
--- a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for usbmuxd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-uucp/selinux-uucp-2.20200818-r2.ebuild b/sec-policy/selinux-uucp/selinux-uucp-2.20200818-r2.ebuild
index 348020a5ef53..af025c3b5c7f 100644
--- a/sec-policy/selinux-uucp/selinux-uucp-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-uucp/selinux-uucp-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for uucp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-inetd
diff --git a/sec-policy/selinux-uucp/selinux-uucp-2.20210203-r1.ebuild b/sec-policy/selinux-uucp/selinux-uucp-2.20210203-r1.ebuild
index 348020a5ef53..af025c3b5c7f 100644
--- a/sec-policy/selinux-uucp/selinux-uucp-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-uucp/selinux-uucp-2.20210203-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for uucp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-inetd
diff --git a/sec-policy/selinux-uwimap/selinux-uwimap-2.20200818-r2.ebuild b/sec-policy/selinux-uwimap/selinux-uwimap-2.20200818-r2.ebuild
index ec150b7e4d53..e7279bd995eb 100644
--- a/sec-policy/selinux-uwimap/selinux-uwimap-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-uwimap/selinux-uwimap-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for uwimap"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-uwimap/selinux-uwimap-2.20210203-r1.ebuild b/sec-policy/selinux-uwimap/selinux-uwimap-2.20210203-r1.ebuild
index ec150b7e4d53..e7279bd995eb 100644
--- a/sec-policy/selinux-uwimap/selinux-uwimap-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-uwimap/selinux-uwimap-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for uwimap"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20200818-r2.ebuild b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20200818-r2.ebuild
index 0d04f671d24c..aa0c51f3c483 100644
--- a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for uWSGI"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20210203-r1.ebuild b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20210203-r1.ebuild
index 0d04f671d24c..aa0c51f3c483 100644
--- a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for uWSGI"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-varnishd/selinux-varnishd-2.20200818-r2.ebuild b/sec-policy/selinux-varnishd/selinux-varnishd-2.20200818-r2.ebuild
index b512486be9ec..28d5ad4f5d3e 100644
--- a/sec-policy/selinux-varnishd/selinux-varnishd-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-varnishd/selinux-varnishd-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for varnishd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-varnishd/selinux-varnishd-2.20210203-r1.ebuild b/sec-policy/selinux-varnishd/selinux-varnishd-2.20210203-r1.ebuild
index b512486be9ec..28d5ad4f5d3e 100644
--- a/sec-policy/selinux-varnishd/selinux-varnishd-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-varnishd/selinux-varnishd-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for varnishd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-vbetool/selinux-vbetool-2.20200818-r2.ebuild b/sec-policy/selinux-vbetool/selinux-vbetool-2.20200818-r2.ebuild
index 24d4bc67bc4f..11a704049121 100644
--- a/sec-policy/selinux-vbetool/selinux-vbetool-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-vbetool/selinux-vbetool-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for vbetool"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-vbetool/selinux-vbetool-2.20210203-r1.ebuild b/sec-policy/selinux-vbetool/selinux-vbetool-2.20210203-r1.ebuild
index 24d4bc67bc4f..11a704049121 100644
--- a/sec-policy/selinux-vbetool/selinux-vbetool-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-vbetool/selinux-vbetool-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for vbetool"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-vdagent/selinux-vdagent-2.20200818-r2.ebuild b/sec-policy/selinux-vdagent/selinux-vdagent-2.20200818-r2.ebuild
index 374180969bf4..4b6952d0b4ae 100644
--- a/sec-policy/selinux-vdagent/selinux-vdagent-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-vdagent/selinux-vdagent-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for vdagent"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-vdagent/selinux-vdagent-2.20210203-r1.ebuild b/sec-policy/selinux-vdagent/selinux-vdagent-2.20210203-r1.ebuild
index 374180969bf4..4b6952d0b4ae 100644
--- a/sec-policy/selinux-vdagent/selinux-vdagent-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-vdagent/selinux-vdagent-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for vdagent"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-vde/selinux-vde-2.20200818-r2.ebuild b/sec-policy/selinux-vde/selinux-vde-2.20200818-r2.ebuild
index 8e0e33457a47..4edeed08c0b3 100644
--- a/sec-policy/selinux-vde/selinux-vde-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-vde/selinux-vde-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for vde"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-vde/selinux-vde-2.20210203-r1.ebuild b/sec-policy/selinux-vde/selinux-vde-2.20210203-r1.ebuild
index 8e0e33457a47..4edeed08c0b3 100644
--- a/sec-policy/selinux-vde/selinux-vde-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-vde/selinux-vde-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for vde"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-virt/selinux-virt-2.20200818-r2.ebuild b/sec-policy/selinux-virt/selinux-virt-2.20200818-r2.ebuild
index 063aa89a95dd..7cf473fdbea5 100644
--- a/sec-policy/selinux-virt/selinux-virt-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-virt/selinux-virt-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for virt"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-virt/selinux-virt-2.20210203-r1.ebuild b/sec-policy/selinux-virt/selinux-virt-2.20210203-r1.ebuild
index 063aa89a95dd..7cf473fdbea5 100644
--- a/sec-policy/selinux-virt/selinux-virt-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-virt/selinux-virt-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for virt"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-vlock/selinux-vlock-2.20200818-r2.ebuild b/sec-policy/selinux-vlock/selinux-vlock-2.20200818-r2.ebuild
index cd9f3514bd2b..d98f3f80f696 100644
--- a/sec-policy/selinux-vlock/selinux-vlock-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-vlock/selinux-vlock-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for vlock"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-vlock/selinux-vlock-2.20210203-r1.ebuild b/sec-policy/selinux-vlock/selinux-vlock-2.20210203-r1.ebuild
index cd9f3514bd2b..d98f3f80f696 100644
--- a/sec-policy/selinux-vlock/selinux-vlock-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-vlock/selinux-vlock-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for vlock"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-vmware/selinux-vmware-2.20200818-r2.ebuild b/sec-policy/selinux-vmware/selinux-vmware-2.20200818-r2.ebuild
index c1f4afdf186d..b55f4bc23ab8 100644
--- a/sec-policy/selinux-vmware/selinux-vmware-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-vmware/selinux-vmware-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for vmware"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-vmware/selinux-vmware-2.20210203-r1.ebuild b/sec-policy/selinux-vmware/selinux-vmware-2.20210203-r1.ebuild
index c1f4afdf186d..b55f4bc23ab8 100644
--- a/sec-policy/selinux-vmware/selinux-vmware-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-vmware/selinux-vmware-2.20210203-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for vmware"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20200818-r2.ebuild b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20200818-r2.ebuild
index 0966e8271de3..9e1cc8eb1558 100644
--- a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for vnstatd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20210203-r1.ebuild b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20210203-r1.ebuild
index 0966e8271de3..9e1cc8eb1558 100644
--- a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for vnstatd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-vpn/selinux-vpn-2.20200818-r2.ebuild b/sec-policy/selinux-vpn/selinux-vpn-2.20200818-r2.ebuild
index e3b99465964d..43b8d1a3b4c9 100644
--- a/sec-policy/selinux-vpn/selinux-vpn-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-vpn/selinux-vpn-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for vpn"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-vpn/selinux-vpn-2.20210203-r1.ebuild b/sec-policy/selinux-vpn/selinux-vpn-2.20210203-r1.ebuild
index e3b99465964d..43b8d1a3b4c9 100644
--- a/sec-policy/selinux-vpn/selinux-vpn-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-vpn/selinux-vpn-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for vpn"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-watchdog/selinux-watchdog-2.20200818-r2.ebuild b/sec-policy/selinux-watchdog/selinux-watchdog-2.20200818-r2.ebuild
index 1ce11e772c54..661d939d13d1 100644
--- a/sec-policy/selinux-watchdog/selinux-watchdog-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-watchdog/selinux-watchdog-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for watchdog"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-watchdog/selinux-watchdog-2.20210203-r1.ebuild b/sec-policy/selinux-watchdog/selinux-watchdog-2.20210203-r1.ebuild
index 1ce11e772c54..661d939d13d1 100644
--- a/sec-policy/selinux-watchdog/selinux-watchdog-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-watchdog/selinux-watchdog-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for watchdog"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-webalizer/selinux-webalizer-2.20200818-r2.ebuild b/sec-policy/selinux-webalizer/selinux-webalizer-2.20200818-r2.ebuild
index e243330b911d..8625aa2ba356 100644
--- a/sec-policy/selinux-webalizer/selinux-webalizer-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-webalizer/selinux-webalizer-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for webalizer"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-webalizer/selinux-webalizer-2.20210203-r1.ebuild b/sec-policy/selinux-webalizer/selinux-webalizer-2.20210203-r1.ebuild
index e243330b911d..8625aa2ba356 100644
--- a/sec-policy/selinux-webalizer/selinux-webalizer-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-webalizer/selinux-webalizer-2.20210203-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for webalizer"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-wine/selinux-wine-2.20200818-r2.ebuild b/sec-policy/selinux-wine/selinux-wine-2.20200818-r2.ebuild
index 756d6db4b893..1a041cec47dc 100644
--- a/sec-policy/selinux-wine/selinux-wine-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-wine/selinux-wine-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for wine"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-wine/selinux-wine-2.20210203-r1.ebuild b/sec-policy/selinux-wine/selinux-wine-2.20210203-r1.ebuild
index 756d6db4b893..1a041cec47dc 100644
--- a/sec-policy/selinux-wine/selinux-wine-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-wine/selinux-wine-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for wine"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-wireguard/selinux-wireguard-2.20210203-r1.ebuild b/sec-policy/selinux-wireguard/selinux-wireguard-2.20210203-r1.ebuild
index 4288b7700343..d2d595fe12fa 100644
--- a/sec-policy/selinux-wireguard/selinux-wireguard-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-wireguard/selinux-wireguard-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for wireguard"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-wireshark/selinux-wireshark-2.20200818-r2.ebuild b/sec-policy/selinux-wireshark/selinux-wireshark-2.20200818-r2.ebuild
index 22c8ea92417d..118146d5f25c 100644
--- a/sec-policy/selinux-wireshark/selinux-wireshark-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-wireshark/selinux-wireshark-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for wireshark"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-wireshark/selinux-wireshark-2.20210203-r1.ebuild b/sec-policy/selinux-wireshark/selinux-wireshark-2.20210203-r1.ebuild
index 22c8ea92417d..118146d5f25c 100644
--- a/sec-policy/selinux-wireshark/selinux-wireshark-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-wireshark/selinux-wireshark-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for wireshark"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-wm/selinux-wm-2.20200818-r2.ebuild b/sec-policy/selinux-wm/selinux-wm-2.20200818-r2.ebuild
index d675e623b259..1e5e70e7aaae 100644
--- a/sec-policy/selinux-wm/selinux-wm-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-wm/selinux-wm-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for wm"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-wm/selinux-wm-2.20210203-r1.ebuild b/sec-policy/selinux-wm/selinux-wm-2.20210203-r1.ebuild
index d675e623b259..1e5e70e7aaae 100644
--- a/sec-policy/selinux-wm/selinux-wm-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-wm/selinux-wm-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for wm"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-xen/selinux-xen-2.20200818-r2.ebuild b/sec-policy/selinux-xen/selinux-xen-2.20200818-r2.ebuild
index 227515876eec..c073fa868725 100644
--- a/sec-policy/selinux-xen/selinux-xen-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-xen/selinux-xen-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for xen"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-xen/selinux-xen-2.20210203-r1.ebuild b/sec-policy/selinux-xen/selinux-xen-2.20210203-r1.ebuild
index 227515876eec..c073fa868725 100644
--- a/sec-policy/selinux-xen/selinux-xen-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-xen/selinux-xen-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for xen"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-xfs/selinux-xfs-2.20200818-r2.ebuild b/sec-policy/selinux-xfs/selinux-xfs-2.20200818-r2.ebuild
index 4bc810c37a09..d1dcc6c2958f 100644
--- a/sec-policy/selinux-xfs/selinux-xfs-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-xfs/selinux-xfs-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for xfs"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-xfs/selinux-xfs-2.20210203-r1.ebuild b/sec-policy/selinux-xfs/selinux-xfs-2.20210203-r1.ebuild
index 4bc810c37a09..d1dcc6c2958f 100644
--- a/sec-policy/selinux-xfs/selinux-xfs-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-xfs/selinux-xfs-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for xfs"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-xprint/selinux-xprint-2.20200818-r2.ebuild b/sec-policy/selinux-xprint/selinux-xprint-2.20200818-r2.ebuild
index 75568a770a6c..1716e4746dc4 100644
--- a/sec-policy/selinux-xprint/selinux-xprint-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-xprint/selinux-xprint-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for xprint"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20200818-r2.ebuild b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20200818-r2.ebuild
index ad06963a158a..c400d5e331d8 100644
--- a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for xscreensaver"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20210203-r1.ebuild b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20210203-r1.ebuild
index ad06963a158a..c400d5e331d8 100644
--- a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20210203-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for xscreensaver"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-xserver/selinux-xserver-2.20200818-r2.ebuild b/sec-policy/selinux-xserver/selinux-xserver-2.20200818-r2.ebuild
index 3f73ec78d67a..bfeb1b82e80a 100644
--- a/sec-policy/selinux-xserver/selinux-xserver-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-xserver/selinux-xserver-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for xserver"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-xserver/selinux-xserver-2.20210203-r1.ebuild b/sec-policy/selinux-xserver/selinux-xserver-2.20210203-r1.ebuild
index 3f73ec78d67a..bfeb1b82e80a 100644
--- a/sec-policy/selinux-xserver/selinux-xserver-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-xserver/selinux-xserver-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for xserver"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-zabbix/selinux-zabbix-2.20200818-r2.ebuild b/sec-policy/selinux-zabbix/selinux-zabbix-2.20200818-r2.ebuild
index 0d89cd0ec612..6fa022c331a3 100644
--- a/sec-policy/selinux-zabbix/selinux-zabbix-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-zabbix/selinux-zabbix-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for zabbix"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-zabbix/selinux-zabbix-2.20210203-r1.ebuild b/sec-policy/selinux-zabbix/selinux-zabbix-2.20210203-r1.ebuild
index 0d89cd0ec612..6fa022c331a3 100644
--- a/sec-policy/selinux-zabbix/selinux-zabbix-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-zabbix/selinux-zabbix-2.20210203-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for zabbix"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi