diff --git a/app-portage/showbuild/showbuild-0.9.1-r1.ebuild b/app-portage/showbuild/showbuild-0.9.1-r1.ebuild
index 36e1f12720..23fa65ea07 100644
--- a/app-portage/showbuild/showbuild-0.9.1-r1.ebuild
+++ b/app-portage/showbuild/showbuild-0.9.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~x86 ~x86-linux ~x64-macos"
 
 IUSE=""
 
diff --git a/app-text/noweb/noweb-2.12.ebuild b/app-text/noweb/noweb-2.12.ebuild
index 224304fd2f..e62e7dd59e 100644
--- a/app-text/noweb/noweb-2.12.ebuild
+++ b/app-text/noweb/noweb-2.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -16,7 +16,7 @@ LICENSE="
 	emacs? ( GPL-2 )
 "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos"
 IUSE="emacs examples"
 
 DEPEND="
diff --git a/gui-libs/webp-pixbuf-loader/webp-pixbuf-loader-0.0.1.ebuild b/gui-libs/webp-pixbuf-loader/webp-pixbuf-loader-0.0.1.ebuild
index 02b3ab150e..4086624a24 100644
--- a/gui-libs/webp-pixbuf-loader/webp-pixbuf-loader-0.0.1.ebuild
+++ b/gui-libs/webp-pixbuf-loader/webp-pixbuf-loader-0.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/aruiz/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 PATCHES=( "${FILESDIR}/${PN}_gentoo.patch" )
 
diff --git a/x11-themes/obsidian-icon-theme/obsidian-icon-theme-4.14.ebuild b/x11-themes/obsidian-icon-theme/obsidian-icon-theme-4.14.ebuild
index da86256ddb..9662e9f1bc 100644
--- a/x11-themes/obsidian-icon-theme/obsidian-icon-theme-4.14.ebuild
+++ b/x11-themes/obsidian-icon-theme/obsidian-icon-theme-4.14.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/madmaxms/${GIT_PN}.git"
 else
 	SRC_URI="https://github.com/madmaxms/${GIT_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	S="${WORKDIR}/${GIT_PN}-${PV}"
 fi
 
diff --git a/x11-themes/obsidian-icon-theme/obsidian-icon-theme-9999.ebuild b/x11-themes/obsidian-icon-theme/obsidian-icon-theme-9999.ebuild
index da86256ddb..9662e9f1bc 100644
--- a/x11-themes/obsidian-icon-theme/obsidian-icon-theme-9999.ebuild
+++ b/x11-themes/obsidian-icon-theme/obsidian-icon-theme-9999.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/madmaxms/${GIT_PN}.git"
 else
 	SRC_URI="https://github.com/madmaxms/${GIT_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	S="${WORKDIR}/${GIT_PN}-${PV}"
 fi
 
diff --git a/x11-themes/obsidian2-gtk-theme/obsidian2-gtk-theme-2.17.ebuild b/x11-themes/obsidian2-gtk-theme/obsidian2-gtk-theme-2.17.ebuild
index 42fb2f7f50..0f3a37faf4 100644
--- a/x11-themes/obsidian2-gtk-theme/obsidian2-gtk-theme-2.17.ebuild
+++ b/x11-themes/obsidian2-gtk-theme/obsidian2-gtk-theme-2.17.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/madmaxms/${GIT_PN}.git"
 else
 	SRC_URI="https://github.com/madmaxms/${GIT_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	S="${WORKDIR}/${GIT_PN}-${PV}"
 fi
 
diff --git a/x11-themes/obsidian2-gtk-theme/obsidian2-gtk-theme-9999.ebuild b/x11-themes/obsidian2-gtk-theme/obsidian2-gtk-theme-9999.ebuild
index 42fb2f7f50..0f3a37faf4 100644
--- a/x11-themes/obsidian2-gtk-theme/obsidian2-gtk-theme-9999.ebuild
+++ b/x11-themes/obsidian2-gtk-theme/obsidian2-gtk-theme-9999.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/madmaxms/${GIT_PN}.git"
 else
 	SRC_URI="https://github.com/madmaxms/${GIT_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	S="${WORKDIR}/${GIT_PN}-${PV}"
 fi