Merge updates from master

28 files changed, 27 insertions, 91 deletions

diff --git a/app-portage/cpuid2cpuflags/cpuid2cpuflags-8.ebuild b/app-portage/cpuid2cpuflags/cpuid2cpuflags-8.ebuild
index 0c0af22b6295..c0e57ed3ad2b 100644
--- a/app-portage/cpuid2cpuflags/cpuid2cpuflags-8.ebuild
+++ b/app-portage/cpuid2cpuflags/cpuid2cpuflags-8.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mgorny/cpuid2cpuflags/releases/download/v${PV}/${P}.
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 pkg_postinst() {
diff --git a/dev-libs/boost/boost-1.72.0.ebuild b/dev-libs/boost/boost-1.72.0.ebuild
index c03e60926c93..7434b5bd5d16 100644
--- a/dev-libs/boost/boost-1.72.0.ebuild
+++ b/dev-libs/boost/boost-1.72.0.ebuild
@@ -39,7 +39,9 @@ RDEPEND="
 	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP},cxx,threads] )
 	python? (
 		${PYTHON_DEPS}
-		numpy? ( >=dev-python/numpy-1.14.5[$(python_gen_usedep -3)] )
+		numpy? (
+			$(python_gen_cond_dep '>=dev-python/numpy-1.17[${PYTHON_USEDEP}]' -3)
+		)
 	)
 	zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )
 	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.2-r1.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.2-r1.ebuild
index 31a4f8186c63..5e2237b6f3b2 100644
--- a/dev-libs/jsoncpp/jsoncpp-1.9.2-r1.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-1.9.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/open-source-parsers/${PN}/archive/${PV}.tar.gz -> ${
 
 LICENSE="|| ( public-domain MIT )"
 SLOT="0/22"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/autopep8/autopep8-1.4.3.ebuild b/dev-python/autopep8/autopep8-1.4.3.ebuild
index f5e2bd374d14..513c94362cc7 100644
--- a/dev-python/autopep8/autopep8-1.4.3.ebuild
+++ b/dev-python/autopep8/autopep8-1.4.3.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="MIT"
diff --git a/dev-python/jupyter_client/jupyter_client-5.2.3-r1.ebuild b/dev-python/jupyter_client/jupyter_client-5.2.3-r1.ebuild
index 4bd11d0a2399..40e09303e681 100644
--- a/dev-python/jupyter_client/jupyter_client-5.2.3-r1.ebuild
+++ b/dev-python/jupyter_client/jupyter_client-5.2.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/nbval/nbval-0.9.1.ebuild b/dev-python/nbval/nbval-0.9.1.ebuild
index a24f9d28b0bb..d14a6d2e5ca1 100644
--- a/dev-python/nbval/nbval-0.9.1.ebuild
+++ b/dev-python/nbval/nbval-0.9.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/notebook/notebook-5.7.8.ebuild b/dev-python/notebook/notebook-5.7.8.ebuild
index ebc285e3dc6b..e5db986f8da8 100644
--- a/dev-python/notebook/notebook-5.7.8.ebuild
+++ b/dev-python/notebook/notebook-5.7.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 RDEPEND="
diff --git a/dev-python/python-fastimport/Manifest b/dev-python/python-fastimport/Manifest
index 00372e23b44b..ec268fd1126c 100644
--- a/dev-python/python-fastimport/Manifest
+++ b/dev-python/python-fastimport/Manifest
@@ -1,3 +1 @@
-DIST fastimport-0.9.6.tar.gz 33333 BLAKE2B 46e654c26bd388a61ae0717b66294dbc1261aca9a2b6e1823e6d8afad014fd21d0ea54e70e018ba79cc45dc6111ccf84a4eb68e053c0812773a4c25cb32e0569 SHA512 cc38c1218d65ef4a9e3a68d8af3fadf98c7cc0dcd8075b338b8f492d25765bc2fe2247000868fd3c95e1f7f4c2b9a05964ef7b4f9196c2777f6a7941f127f416
 DIST fastimport-0.9.8.tar.gz 39512 BLAKE2B 484ba865e749cca33df73417285e51a9117e7c905ab2922588d6eef9a64ea6b3d72de285a2affbe7d4a770ead9ece30f6242777087af1c469d59c8f2a4e1b008 SHA512 5d195b641cf6138fdbc6c75781a4a6d3699e3ada9743bbe4c4264879b2da2f8a2e995e7cc3955a5241e9c7a7f24f8114474a0a30907f86e2e335e2be4669f588
-DIST python-fastimport-0.9.2.tar.gz 30762 BLAKE2B 2484e02077017c5534afafcc17627bef8875379bd8e66b5610408b5b11feb6db32cd9e97905a9ff3bc23cc58f6e01255bb3e18ea6fa66e0d077a42504e0def39 SHA512 8fd9f89267ca88edff94cea7537740431d02680a1eebd085ee376954b47bf5222e7575750895d0d2da246694cdac7a5afe50d857b87c0f36e04eb3511bcbe472
diff --git a/dev-python/python-fastimport/python-fastimport-0.9.2-r1.ebuild b/dev-python/python-fastimport/python-fastimport-0.9.2-r1.ebuild
deleted file mode 100644
index bbff297ec58d..000000000000
--- a/dev-python/python-fastimport/python-fastimport-0.9.2-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Library for parsing the fastimport VCS serialization format"
-HOMEPAGE="https://github.com/jelmer/python-fastimport"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="
-	test? (
-		dev-python/testtools[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	local test_runner=( "${PYTHON}" -m unittest )
-
-	if [[ ${EPYTHON} == python2.6 ]]; then
-		test_runner=( unit2 )
-	fi
-
-	"${test_runner[@]}" fastimport.tests.test_suite \
-		|| die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/python-fastimport/python-fastimport-0.9.6.ebuild b/dev-python/python-fastimport/python-fastimport-0.9.6.ebuild
deleted file mode 100644
index 17053b741e12..000000000000
--- a/dev-python/python-fastimport/python-fastimport-0.9.6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
-
-inherit distutils-r1
-
-MY_PN="${PN#python-}"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Library for parsing the fastimport VCS serialization format"
-HOMEPAGE="https://github.com/jelmer/python-fastimport"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
-
-python_test() {
-	"${PYTHON}" -m unittest fastimport.tests.test_suite \
-		|| die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pyzmq/pyzmq-17.1.0.ebuild b/dev-python/pyzmq/pyzmq-17.1.0.ebuild
index e44725afeb4f..64bee69abfaa 100644
--- a/dev-python/pyzmq/pyzmq-17.1.0.ebuild
+++ b/dev-python/pyzmq/pyzmq-17.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/send2trash/send2trash-1.5.0.ebuild b/dev-python/send2trash/send2trash-1.5.0.ebuild
index c92db1247a8e..3927f5b12513 100644
--- a/dev-python/send2trash/send2trash-1.5.0.ebuild
+++ b/dev-python/send2trash/send2trash-1.5.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/terminado/terminado-0.8.1.ebuild b/dev-python/terminado/terminado-0.8.1.ebuild
index dc08973aa49d..433eab78e137 100644
--- a/dev-python/terminado/terminado-0.8.1.ebuild
+++ b/dev-python/terminado/terminado-0.8.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/vobject/vobject-0.9.6.1-r1.ebuild b/dev-python/vobject/vobject-0.9.6.1-r1.ebuild
index a63b83b0ba52..1eab8ca38339 100644
--- a/dev-python/vobject/vobject-0.9.6.1-r1.ebuild
+++ b/dev-python/vobject/vobject-0.9.6.1-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/zope-event/zope-event-4.4.ebuild b/dev-python/zope-event/zope-event-4.4.ebuild
index 4c824ab7f1dd..d9aca2f4d747 100644
--- a/dev-python/zope-event/zope-event-4.4.ebuild
+++ b/dev-python/zope-event/zope-event-4.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-util/elfkickers/elfkickers-3.1a.ebuild b/dev-util/elfkickers/elfkickers-3.1a.ebuild
index 8b2f661fe707..a581ac986671 100644
--- a/dev-util/elfkickers/elfkickers-3.1a.ebuild
+++ b/dev-util/elfkickers/elfkickers-3.1a.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.muppetlabs.com/~breadbox/pub/software/${MY_PN}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~mips sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~mips sparc x86"
 IUSE="doc"
 
 DEPEND="app-misc/pax-utils"
diff --git a/mail-filter/opendkim/opendkim-2.10.3-r17.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r17.ebuild
index 20825611e39b..49ff115b99b3 100644
--- a/mail-filter/opendkim/opendkim-2.10.3-r17.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3-r17.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://downloads.sourceforge.net/project/opendkim/${P}.tar.gz"
 # The GPL-2 is for the init script, bug 425960.
 LICENSE="BSD GPL-2 Sendmail-Open-Source"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="berkdb ldap libressl lmdb lua memcached opendbx poll sasl selinux +ssl static-libs stats querycache test unbound"
 
 BDEPEND="acct-user/opendkim
diff --git a/media-libs/libdv/libdv-1.0.0-r4.ebuild b/media-libs/libdv/libdv-1.0.0-r4.ebuild
index 367a76d0d623..e519ffd56a41 100644
--- a/media-libs/libdv/libdv-1.0.0-r4.ebuild
+++ b/media-libs/libdv/libdv-1.0.0-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 RDEPEND="dev-libs/popt:="
 DEPEND="
diff --git a/media-video/openshot/openshot-2.4.4.ebuild b/media-video/openshot/openshot-2.4.4.ebuild
index 46081a9567ec..d1d143bbbd74 100644
--- a/media-video/openshot/openshot-2.4.4.ebuild
+++ b/media-video/openshot/openshot-2.4.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/OpenShot/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-3+"
 SLOT="1"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/net-libs/libqmi/libqmi-1.22.2.ebuild b/net-libs/libqmi/libqmi-1.22.2.ebuild
index 85358c5dfcea..baa6bed183ff 100644
--- a/net-libs/libqmi/libqmi-1.22.2.ebuild
+++ b/net-libs/libqmi/libqmi-1.22.2.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 	EGIT_REPO_URI="https://anongit.freedesktop.org/git/libqmi.git"
 else
-	KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ppc64 x86"
 	SRC_URI="https://www.freedesktop.org/software/libqmi/${P}.tar.xz"
 fi
 
diff --git a/net-vpn/openvpn/openvpn-2.4.7-r1.ebuild b/net-vpn/openvpn/openvpn-2.4.7-r1.ebuild
index 161e42d2b100..09518d64afef 100644
--- a/net-vpn/openvpn/openvpn-2.4.7-r1.ebuild
+++ b/net-vpn/openvpn/openvpn-2.4.7-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://openvpn.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam"
 IUSE+=" pkcs11 +plugins selinux +ssl static systemd test userland_BSD"
diff --git a/sci-libs/gsl/gsl-2.5-r1.ebuild b/sci-libs/gsl/gsl-2.5-r1.ebuild
index 73cb091a5fb4..22e2c8677c62 100644
--- a/sci-libs/gsl/gsl-2.5-r1.ebuild
+++ b/sci-libs/gsl/gsl-2.5-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0/23"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cblas-external +deprecated static-libs"
 
 RDEPEND="cblas-external? ( virtual/cblas:= )"
diff --git a/sys-apps/cpuid/cpuid-20180519.ebuild b/sys-apps/cpuid/cpuid-20180519.ebuild
index 67b3c7f2d1bf..5150f88eecac 100644
--- a/sys-apps/cpuid/cpuid-20180519.ebuild
+++ b/sys-apps/cpuid/cpuid-20180519.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.etallen.com/${PN}/${P}.src.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="dev-lang/perl"
 DEPEND="app-arch/gzip"
diff --git a/sys-apps/lcdutils/lcdutils-0.2-r1.ebuild b/sys-apps/lcdutils/lcdutils-0.2-r1.ebuild
index 885e05c28b42..b19562bac8fa 100644
--- a/sys-apps/lcdutils/lcdutils-0.2-r1.ebuild
+++ b/sys-apps/lcdutils/lcdutils-0.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://people.debian.org/~pm/mips-cobalt/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~mips ~x86"
+KEYWORDS="~mips x86"
 
 PATCHES=(
 	"${FILESDIR}/${P}-include-stdlib.h-for-exit.patch"
diff --git a/sys-apps/qdirstat/qdirstat-1.6.ebuild b/sys-apps/qdirstat/qdirstat-1.6.ebuild
index 97f2678dd6ca..1033decd52b1 100644
--- a/sys-apps/qdirstat/qdirstat-1.6.ebuild
+++ b/sys-apps/qdirstat/qdirstat-1.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/shundhammer/qdirstat/archive/${PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	dev-qt/qtgui:5
diff --git a/virtual/cblas/cblas-3.8.ebuild b/virtual/cblas/cblas-3.8.ebuild
index 851240419048..998b30ba4e52 100644
--- a/virtual/cblas/cblas-3.8.ebuild
+++ b/virtual/cblas/cblas-3.8.ebuild
@@ -5,7 +5,7 @@ EAPI="7"
 
 DESCRIPTION="Virtual for BLAS C implementation"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="eselect-ldso"
 
 RDEPEND="
diff --git a/www-servers/tornado/tornado-5.1.ebuild b/www-servers/tornado/tornado-5.1.ebuild
index 650cdfc7f538..7ae492a1d302 100644
--- a/www-servers/tornado/tornado-5.1.ebuild
+++ b/www-servers/tornado/tornado-5.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.2.ebuild b/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.2.ebuild
index 351cfeb484b0..21c27ac8d19b 100644
--- a/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.2.ebuild
+++ b/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.2.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://github.com/majn/telegram-purple"
 SRC_URI="https://github.com/majn/telegram-purple/releases/download/v${PV}/telegram-purple_${PV}.orig.tar.gz"
 
 LICENSE="GPL-2+"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="0"
 IUSE="gcrypt libressl +nls +webp"