Merge updates from master

90 files changed, 91 insertions, 91 deletions

diff --git a/app-admin/glance/glance-14.0.0.ebuild b/app-admin/glance/glance-14.0.0.ebuild
index 02f04305b642..d968f2a9e32d 100644
--- a/app-admin/glance/glance-14.0.0.ebuild
+++ b/app-admin/glance/glance-14.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc mysql postgres +sqlite +swift"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
diff --git a/dev-libs/liberasurecode/liberasurecode-1.1.1.ebuild b/dev-libs/liberasurecode/liberasurecode-1.1.1.ebuild
index 1c631ac77f96..98e668e95e1d 100644
--- a/dev-libs/liberasurecode/liberasurecode-1.1.1.ebuild
+++ b/dev-libs/liberasurecode/liberasurecode-1.1.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/tsg--${PN}-${CUSTOM_VERSION}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc static-libs"
 
 RDEPEND=""
diff --git a/dev-python/PyECLib/PyECLib-1.4.0.ebuild b/dev-python/PyECLib/PyECLib-1.4.0.ebuild
index 0434041b3351..264e32353f7b 100644
--- a/dev-python/PyECLib/PyECLib-1.4.0.ebuild
+++ b/dev-python/PyECLib/PyECLib-1.4.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/pyeclib-${PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 
 CDEPEND="dev-libs/jerasure"
diff --git a/dev-python/WSME/WSME-0.9.1.ebuild b/dev-python/WSME/WSME-0.9.1.ebuild
index 62ae7e59d89a..12bed14e2b99 100644
--- a/dev-python/WSME/WSME-0.9.1.ebuild
+++ b/dev-python/WSME/WSME-0.9.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]"
diff --git a/dev-python/alembic/alembic-0.8.10.ebuild b/dev-python/alembic/alembic-0.8.10.ebuild
index 9407498fc640..38fb8ef801fd 100644
--- a/dev-python/alembic/alembic-0.8.10.ebuild
+++ b/dev-python/alembic/alembic-0.8.10.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test doc"
 
 # requires.txt cites 'SQLAlchemy>=0.7.3' which is really both old and silly
diff --git a/dev-python/aodhclient/aodhclient-0.8.0.ebuild b/dev-python/aodhclient/aodhclient-0.8.0.ebuild
index 916304c7781a..b25c298fd486 100644
--- a/dev-python/aodhclient/aodhclient-0.8.0.ebuild
+++ b/dev-python/aodhclient/aodhclient-0.8.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/cliff/cliff-2.4.0.ebuild b/dev-python/cliff/cliff-2.4.0.ebuild
index 08b363afa4c5..f84e3bbca81b 100644
--- a/dev-python/cliff/cliff-2.4.0.ebuild
+++ b/dev-python/cliff/cliff-2.4.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/debtcollector/debtcollector-1.11.0.ebuild b/dev-python/debtcollector/debtcollector-1.11.0.ebuild
index b9451e244b9d..5eb92d9dd8a3 100644
--- a/dev-python/debtcollector/debtcollector-1.11.0.ebuild
+++ b/dev-python/debtcollector/debtcollector-1.11.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc test"
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/dnspython/dnspython-1.15.0.ebuild b/dev-python/dnspython/dnspython-1.15.0.ebuild
index 02efe94a6f12..eb1c37219f62 100644
--- a/dev-python/dnspython/dnspython-1.15.0.ebuild
+++ b/dev-python/dnspython/dnspython-1.15.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="examples test"
 
 RDEPEND="dev-python/pycrypto[${PYTHON_USEDEP}]"
diff --git a/dev-python/glance_store/glance_store-0.20.0.ebuild b/dev-python/glance_store/glance_store-0.20.0.ebuild
index 86fab2e44741..e0841900f036 100644
--- a/dev-python/glance_store/glance_store-0.20.0.ebuild
+++ b/dev-python/glance_store/glance_store-0.20.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="+cinder"
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/jinja/jinja-2.9.5.ebuild b/dev-python/jinja/jinja-2.9.5.ebuild
index 4179e5078024..145d38c48add 100644
--- a/dev-python/jinja/jinja-2.9.5.ebuild
+++ b/dev-python/jinja/jinja-2.9.5.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/pallets/jinja/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/keystoneauth/keystoneauth-2.18.0.ebuild b/dev-python/keystoneauth/keystoneauth-2.18.0.ebuild
index d66b091c87ed..261777960416 100644
--- a/dev-python/keystoneauth/keystoneauth-2.18.0.ebuild
+++ b/dev-python/keystoneauth/keystoneauth-2.18.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}1-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/keystonemiddleware/keystonemiddleware-4.14.0.ebuild b/dev-python/keystonemiddleware/keystonemiddleware-4.14.0.ebuild
index c8afb45fcca4..aee980dd87d9 100644
--- a/dev-python/keystonemiddleware/keystonemiddleware-4.14.0.ebuild
+++ b/dev-python/keystonemiddleware/keystonemiddleware-4.14.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 
 CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
diff --git a/dev-python/lxml/lxml-3.7.3.ebuild b/dev-python/lxml/lxml-3.7.3.ebuild
index 22250443c7fb..343a619ce9a8 100644
--- a/dev-python/lxml/lxml-3.7.3.ebuild
+++ b/dev-python/lxml/lxml-3.7.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples +threads test"
 
 # Note: lib{xml2,xslt} are used as C libraries, not Python modules.
diff --git a/dev-python/monotonic/monotonic-1.2.ebuild b/dev-python/monotonic/monotonic-1.2.ebuild
index 81be52da705e..01ce8a6d0cc1 100644
--- a/dev-python/monotonic/monotonic-1.2.ebuild
+++ b/dev-python/monotonic/monotonic-1.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/neutron-lib/neutron-lib-1.1.0.ebuild b/dev-python/neutron-lib/neutron-lib-1.1.0.ebuild
index eed915f47901..ea7c4e059c40 100644
--- a/dev-python/neutron-lib/neutron-lib-1.1.0.ebuild
+++ b/dev-python/neutron-lib/neutron-lib-1.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/oauthlib/oauthlib-2.0.1.ebuild b/dev-python/oauthlib/oauthlib-2.0.1.ebuild
index 6cd11eaf0a92..8267b4c0f751 100644
--- a/dev-python/oauthlib/oauthlib-2.0.1.ebuild
+++ b/dev-python/oauthlib/oauthlib-2.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="test"
 
 # optional extras hard set as RDEPs. See setup.py
diff --git a/dev-python/openstacksdk/openstacksdk-0.9.13.ebuild b/dev-python/openstacksdk/openstacksdk-0.9.13.ebuild
index 43c726d522f7..08b001471336 100644
--- a/dev-python/openstacksdk/openstacksdk-0.9.13.ebuild
+++ b/dev-python/openstacksdk/openstacksdk-0.9.13.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/os-brick/os-brick-1.11.0.ebuild b/dev-python/os-brick/os-brick-1.11.0.ebuild
index 3d0e4221a394..a0d100a46f60 100644
--- a/dev-python/os-brick/os-brick-1.11.0.ebuild
+++ b/dev-python/os-brick/os-brick-1.11.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/os-client-config/os-client-config-1.26.0.ebuild b/dev-python/os-client-config/os-client-config-1.26.0.ebuild
index de61dfc0bb4e..501add8f5f67 100644
--- a/dev-python/os-client-config/os-client-config-1.26.0.ebuild
+++ b/dev-python/os-client-config/os-client-config-1.26.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc test"
 
 CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/os-vif/os-vif-1.4.0.ebuild b/dev-python/os-vif/os-vif-1.4.0.ebuild
index 82ba9b443f33..ae6a79b6b1e4 100644
--- a/dev-python/os-vif/os-vif-1.4.0.ebuild
+++ b/dev-python/os-vif/os-vif-1.4.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/os_vif-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND="
diff --git a/dev-python/os-win/os-win-1.4.1.ebuild b/dev-python/os-win/os-win-1.4.1.ebuild
index d54c25148e65..5920ff93365f 100644
--- a/dev-python/os-win/os-win-1.4.1.ebuild
+++ b/dev-python/os-win/os-win-1.4.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/os-xenapi/os-xenapi-0.1.1.ebuild b/dev-python/os-xenapi/os-xenapi-0.1.1.ebuild
index efec91cbe3c2..bbee10c3ca2f 100644
--- a/dev-python/os-xenapi/os-xenapi-0.1.1.ebuild
+++ b/dev-python/os-xenapi/os-xenapi-0.1.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND="
diff --git a/dev-python/osc-lib/osc-lib-1.3.0.ebuild b/dev-python/osc-lib/osc-lib-1.3.0.ebuild
index 65cec900a4fa..6a1ddeeb0ef1 100644
--- a/dev-python/osc-lib/osc-lib-1.3.0.ebuild
+++ b/dev-python/osc-lib/osc-lib-1.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-cache/oslo-cache-1.17.0.ebuild b/dev-python/oslo-cache/oslo-cache-1.17.0.ebuild
index 0de9648650ef..848707757815 100644
--- a/dev-python/oslo-cache/oslo-cache-1.17.0.ebuild
+++ b/dev-python/oslo-cache/oslo-cache-1.17.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
 DEPEND="
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-3.18.0.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-3.18.0.ebuild
index c1283616e01f..c434cc9a21b1 100644
--- a/dev-python/oslo-concurrency/oslo-concurrency-3.18.0.ebuild
+++ b/dev-python/oslo-concurrency/oslo-concurrency-3.18.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.concurrency-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 
 CDPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-config/oslo-config-3.22.0.ebuild b/dev-python/oslo-config/oslo-config-3.22.0.ebuild
index 709271716290..f664eb86e465 100644
--- a/dev-python/oslo-config/oslo-config-3.22.0.ebuild
+++ b/dev-python/oslo-config/oslo-config-3.22.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 CDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-context/oslo-context-2.12.1.ebuild b/dev-python/oslo-context/oslo-context-2.12.1.ebuild
index 87096c97748d..adbcca66fe82 100644
--- a/dev-python/oslo-context/oslo-context-2.12.1.ebuild
+++ b/dev-python/oslo-context/oslo-context-2.12.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/oslo.context/oslo.context-${PV}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-db/oslo-db-4.17.0.ebuild b/dev-python/oslo-db/oslo-db-4.17.0.ebuild
index d21513799da8..d9501008369b 100644
--- a/dev-python/oslo-db/oslo-db-4.17.0.ebuild
+++ b/dev-python/oslo-db/oslo-db-4.17.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.db-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="+sqlite mysql postgres"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
diff --git a/dev-python/oslo-i18n/oslo-i18n-3.12.0.ebuild b/dev-python/oslo-i18n/oslo-i18n-3.12.0.ebuild
index 1c4788b05690..0cf87b88975e 100644
--- a/dev-python/oslo-i18n/oslo-i18n-3.12.0.ebuild
+++ b/dev-python/oslo-i18n/oslo-i18n-3.12.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc test"
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-log/oslo-log-3.20.1.ebuild b/dev-python/oslo-log/oslo-log-3.20.1.ebuild
index 639802bb4912..fc0db9e7e301 100644
--- a/dev-python/oslo-log/oslo-log-3.20.1.ebuild
+++ b/dev-python/oslo-log/oslo-log-3.20.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/oslo.log-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-messaging/oslo-messaging-5.17.1.ebuild b/dev-python/oslo-messaging/oslo-messaging-5.17.1.ebuild
index 02bace6b7416..af009c4eb33e 100644
--- a/dev-python/oslo-messaging/oslo-messaging-5.17.1.ebuild
+++ b/dev-python/oslo-messaging/oslo-messaging-5.17.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.messaging-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-middleware/oslo-middleware-3.23.1.ebuild b/dev-python/oslo-middleware/oslo-middleware-3.23.1.ebuild
index 9b958c92ba1e..67e9cbafb5fc 100644
--- a/dev-python/oslo-middleware/oslo-middleware-3.23.1.ebuild
+++ b/dev-python/oslo-middleware/oslo-middleware-3.23.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.middleware-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-policy/oslo-policy-1.18.0.ebuild b/dev-python/oslo-policy/oslo-policy-1.18.0.ebuild
index be18eefa37ec..a2986e4f27e8 100644
--- a/dev-python/oslo-policy/oslo-policy-1.18.0.ebuild
+++ b/dev-python/oslo-policy/oslo-policy-1.18.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.policy-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-privsep/oslo-privsep-1.16.0.ebuild b/dev-python/oslo-privsep/oslo-privsep-1.16.0.ebuild
index 6b67f64c6e61..a69b8431978b 100644
--- a/dev-python/oslo-privsep/oslo-privsep-1.16.0.ebuild
+++ b/dev-python/oslo-privsep/oslo-privsep-1.16.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.privsep-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 
 CDEPEND="
diff --git a/dev-python/oslo-reports/oslo-reports-1.17.0.ebuild b/dev-python/oslo-reports/oslo-reports-1.17.0.ebuild
index 0c16ed0946c0..074ad9e09bae 100644
--- a/dev-python/oslo-reports/oslo-reports-1.17.0.ebuild
+++ b/dev-python/oslo-reports/oslo-reports-1.17.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.reports-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-rootwrap/oslo-rootwrap-5.4.0.ebuild b/dev-python/oslo-rootwrap/oslo-rootwrap-5.4.0.ebuild
index 42e6fb2940bd..82a554a79ab4 100644
--- a/dev-python/oslo-rootwrap/oslo-rootwrap-5.4.0.ebuild
+++ b/dev-python/oslo-rootwrap/oslo-rootwrap-5.4.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.rootwrap-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 
 CDEPEND="
diff --git a/dev-python/oslo-serialization/oslo-serialization-2.16.0.ebuild b/dev-python/oslo-serialization/oslo-serialization-2.16.0.ebuild
index e98506682f1d..f9c7052e5501 100644
--- a/dev-python/oslo-serialization/oslo-serialization-2.16.0.ebuild
+++ b/dev-python/oslo-serialization/oslo-serialization-2.16.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc test"
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-service/oslo-service-1.19.0.ebuild b/dev-python/oslo-service/oslo-service-1.19.0.ebuild
index 0660928ac7c8..68dd17fdfc1a 100644
--- a/dev-python/oslo-service/oslo-service-1.19.0.ebuild
+++ b/dev-python/oslo-service/oslo-service-1.19.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.service-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-utils/oslo-utils-3.22.0.ebuild b/dev-python/oslo-utils/oslo-utils-3.22.0.ebuild
index 2b0f9d679f4b..0df859adf445 100644
--- a/dev-python/oslo-utils/oslo-utils-3.22.0.ebuild
+++ b/dev-python/oslo-utils/oslo-utils-3.22.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc test"
 
 CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.21.0.ebuild b/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.21.0.ebuild
index 696c123d60d7..c9368e1c7258 100644
--- a/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.21.0.ebuild
+++ b/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.21.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.versionedobjects-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-vmware/oslo-vmware-2.17.0.ebuild b/dev-python/oslo-vmware/oslo-vmware-2.17.0.ebuild
index e73a3fbf7894..ec1d49fecfed 100644
--- a/dev-python/oslo-vmware/oslo-vmware-2.17.0.ebuild
+++ b/dev-python/oslo-vmware/oslo-vmware-2.17.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.vmware-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/osprofiler/osprofiler-1.5.0.ebuild b/dev-python/osprofiler/osprofiler-1.5.0.ebuild
index 1f158dae1a79..edb368df8464 100644
--- a/dev-python/osprofiler/osprofiler-1.5.0.ebuild
+++ b/dev-python/osprofiler/osprofiler-1.5.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/paramiko/paramiko-2.1.1.ebuild b/dev-python/paramiko/paramiko-2.1.1.ebuild
index c9ede18a2633..61ce0c1a47c0 100644
--- a/dev-python/paramiko/paramiko-2.1.1.ebuild
+++ b/dev-python/paramiko/paramiko-2.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/dev-python/passlib/passlib-1.7.1-r1.ebuild b/dev-python/passlib/passlib-1.7.1-r1.ebuild
index 00a8176a4c66..8cb5fa14d8b7 100644
--- a/dev-python/passlib/passlib-1.7.1-r1.ebuild
+++ b/dev-python/passlib/passlib-1.7.1-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://bitbucket.org/ecollins/passlib/wiki/Home/"
 SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 SLOT="0"
 IUSE="+bcrypt doc +scrypt test +totp"
 
diff --git a/dev-python/psutil/psutil-5.0.1.ebuild b/dev-python/psutil/psutil-5.0.1.ebuild
index ab3ee8d3bb2f..4ebde498567c 100644
--- a/dev-python/psutil/psutil-5.0.1.ebuild
+++ b/dev-python/psutil/psutil-5.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/pycadf/pycadf-2.5.0.ebuild b/dev-python/pycadf/pycadf-2.5.0.ebuild
index 8f046e4c7b7f..75af4f8597ef 100644
--- a/dev-python/pycadf/pycadf-2.5.0.ebuild
+++ b/dev-python/pycadf/pycadf-2.5.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc test"
 
 CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyldap/pyldap-2.4.28.ebuild b/dev-python/pyldap/pyldap-2.4.28.ebuild
index 24240860dc1d..e6af168421d7 100644
--- a/dev-python/pyldap/pyldap-2.4.28.ebuild
+++ b/dev-python/pyldap/pyldap-2.4.28.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-solaris"
 IUSE="doc examples sasl ssl"
 
 # If you need support for openldap-2.3.x, please use python-ldap-2.3.9.
diff --git a/dev-python/pymongo/pymongo-3.4.0.ebuild b/dev-python/pymongo/pymongo-3.4.0.ebuild
index 01c003201d56..34dcb88ed5f9 100644
--- a/dev-python/pymongo/pymongo-3.4.0.ebuild
+++ b/dev-python/pymongo/pymongo-3.4.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="amd64 ~hppa x86"
 IUSE="doc kerberos test"
 
 RDEPEND="
diff --git a/dev-python/pyparsing/pyparsing-2.1.10.ebuild b/dev-python/pyparsing/pyparsing-2.1.10.ebuild
index a6a441e6a25d..043d2be302ff 100644
--- a/dev-python/pyparsing/pyparsing-2.1.10.ebuild
+++ b/dev-python/pyparsing/pyparsing-2.1.10.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples"
 
 # not contained in the tarball
diff --git a/dev-python/pyroute2/pyroute2-0.4.12.ebuild b/dev-python/pyroute2/pyroute2-0.4.12.ebuild
index d4d9bda7fbc5..cbe16b6e62e2 100644
--- a/dev-python/pyroute2/pyroute2-0.4.12.ebuild
+++ b/dev-python/pyroute2/pyroute2-0.4.12.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/python-barbicanclient/python-barbicanclient-4.2.0.ebuild b/dev-python/python-barbicanclient/python-barbicanclient-4.2.0.ebuild
index b9afc55321d8..21e2515c1cff 100644
--- a/dev-python/python-barbicanclient/python-barbicanclient-4.2.0.ebuild
+++ b/dev-python/python-barbicanclient/python-barbicanclient-4.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/python-cinderclient/python-cinderclient-1.11.0.ebuild b/dev-python/python-cinderclient/python-cinderclient-1.11.0.ebuild
index d4a8d3693142..d41b20615d1d 100644
--- a/dev-python/python-cinderclient/python-cinderclient-1.11.0.ebuild
+++ b/dev-python/python-cinderclient/python-cinderclient-1.11.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-designateclient/python-designateclient-2.6.0.ebuild b/dev-python/python-designateclient/python-designateclient-2.6.0.ebuild
index e45898734e60..d92305ea0e1c 100644
--- a/dev-python/python-designateclient/python-designateclient-2.6.0.ebuild
+++ b/dev-python/python-designateclient/python-designateclient-2.6.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-glanceclient/python-glanceclient-2.6.0.ebuild b/dev-python/python-glanceclient/python-glanceclient-2.6.0.ebuild
index 4e86e02873c7..0c9a39ad8287 100644
--- a/dev-python/python-glanceclient/python-glanceclient-2.6.0.ebuild
+++ b/dev-python/python-glanceclient/python-glanceclient-2.6.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 REQUIRED_USE="test? ( doc )"
 
diff --git a/dev-python/python-heatclient/python-heatclient-1.8.0.ebuild b/dev-python/python-heatclient/python-heatclient-1.8.0.ebuild
index ce88a3dd514f..ddd3d025fe57 100644
--- a/dev-python/python-heatclient/python-heatclient-1.8.0.ebuild
+++ b/dev-python/python-heatclient/python-heatclient-1.8.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-ironicclient/python-ironicclient-1.11.1.ebuild b/dev-python/python-ironicclient/python-ironicclient-1.11.1.ebuild
index 1291d045ccce..a325de10acb9 100644
--- a/dev-python/python-ironicclient/python-ironicclient-1.11.1.ebuild
+++ b/dev-python/python-ironicclient/python-ironicclient-1.11.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 CDEPEND="
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-3.10.0.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-3.10.0.ebuild
index 986f8a500d24..21aada1b1287 100644
--- a/dev-python/python-keystoneclient/python-keystoneclient-3.10.0.ebuild
+++ b/dev-python/python-keystoneclient/python-keystoneclient-3.10.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 RESTRICT="test"
 
diff --git a/dev-python/python-manilaclient/python-manilaclient-1.14.0.ebuild b/dev-python/python-manilaclient/python-manilaclient-1.14.0.ebuild
index 809f244fbb77..7e26fe8f4b34 100644
--- a/dev-python/python-manilaclient/python-manilaclient-1.14.0.ebuild
+++ b/dev-python/python-manilaclient/python-manilaclient-1.14.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/python-neutronclient/python-neutronclient-6.1.0.ebuild b/dev-python/python-neutronclient/python-neutronclient-6.1.0.ebuild
index e6af0fa7bc03..25faa89e78fa 100644
--- a/dev-python/python-neutronclient/python-neutronclient-6.1.0.ebuild
+++ b/dev-python/python-neutronclient/python-neutronclient-6.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 REQUIRED_USE="test? ( doc )"
 
diff --git a/dev-python/python-novaclient/python-novaclient-7.1.0.ebuild b/dev-python/python-novaclient/python-novaclient-7.1.0.ebuild
index 7f3cfc478aee..d033672ac343 100644
--- a/dev-python/python-novaclient/python-novaclient-7.1.0.ebuild
+++ b/dev-python/python-novaclient/python-novaclient-7.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-openstackclient/python-openstackclient-3.8.1.ebuild b/dev-python/python-openstackclient/python-openstackclient-3.8.1.ebuild
index f994d66e2c12..c8d7d6f2f6ec 100644
--- a/dev-python/python-openstackclient/python-openstackclient-3.8.1.ebuild
+++ b/dev-python/python-openstackclient/python-openstackclient-3.8.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-saharaclient/python-saharaclient-1.1.0.ebuild b/dev-python/python-saharaclient/python-saharaclient-1.1.0.ebuild
index 050fe7e9716f..6093ccd41c5d 100644
--- a/dev-python/python-saharaclient/python-saharaclient-1.1.0.ebuild
+++ b/dev-python/python-saharaclient/python-saharaclient-1.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-senlinclient/python-senlinclient-1.2.0.ebuild b/dev-python/python-senlinclient/python-senlinclient-1.2.0.ebuild
index d07aa3305177..679dc8f19bc5 100644
--- a/dev-python/python-senlinclient/python-senlinclient-1.2.0.ebuild
+++ b/dev-python/python-senlinclient/python-senlinclient-1.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/python-sqlparse/python-sqlparse-0.2.2.ebuild b/dev-python/python-sqlparse/python-sqlparse-0.2.2.ebuild
index f2275fc70903..0882f9639e10 100644
--- a/dev-python/python-sqlparse/python-sqlparse-0.2.2.ebuild
+++ b/dev-python/python-sqlparse/python-sqlparse-0.2.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://code.google.com/p/python-sqlparse/ https://github.com/andialbr
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 LICENSE="BSD-2"
 IUSE="doc test"
 
diff --git a/dev-python/python-swiftclient/python-swiftclient-3.3.0.ebuild b/dev-python/python-swiftclient/python-swiftclient-3.3.0.ebuild
index fbfbecccbd5c..c4cb6240c2ce 100644
--- a/dev-python/python-swiftclient/python-swiftclient-3.3.0.ebuild
+++ b/dev-python/python-swiftclient/python-swiftclient-3.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/requests-mock/requests-mock-1.2.0.ebuild b/dev-python/requests-mock/requests-mock-1.2.0.ebuild
index 78f9d3b56aa7..f1334e757942 100644
--- a/dev-python/requests-mock/requests-mock-1.2.0.ebuild
+++ b/dev-python/requests-mock/requests-mock-1.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/requests/requests-2.12.5.ebuild b/dev-python/requests/requests-2.12.5.ebuild
index b1b891e58d1a..79831fa90a7e 100644
--- a/dev-python/requests/requests-2.12.5.ebuild
+++ b/dev-python/requests/requests-2.12.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/routes/routes-2.4.1.ebuild b/dev-python/routes/routes-2.4.1.ebuild
index 28d8d29e778d..37edfc258068 100644
--- a/dev-python/routes/routes-2.4.1.ebuild
+++ b/dev-python/routes/routes-2.4.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/rtslib-fb/rtslib-fb-2.1.62.ebuild b/dev-python/rtslib-fb/rtslib-fb-2.1.62.ebuild
index bbf9db7a5261..c8c150c626d3 100644
--- a/dev-python/rtslib-fb/rtslib-fb-2.1.62.ebuild
+++ b/dev-python/rtslib-fb/rtslib-fb-2.1.62.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~mips x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/ryu/ryu-4.10.ebuild b/dev-python/ryu/ryu-4.10.ebuild
index 8d626b01641e..53e4a313ee99 100644
--- a/dev-python/ryu/ryu-4.10.ebuild
+++ b/dev-python/ryu/ryu-4.10.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/scrypt/scrypt-0.8.0.ebuild b/dev-python/scrypt/scrypt-0.8.0.ebuild
index 75c38306dbae..e8a275ed3604 100644
--- a/dev-python/scrypt/scrypt-0.8.0.ebuild
+++ b/dev-python/scrypt/scrypt-0.8.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://bitbucket.org/mhallin/py-scrypt/wiki/Home/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 SLOT="0"
 IUSE="test doc"
 
diff --git a/dev-python/semantic_version/semantic_version-2.6.0.ebuild b/dev-python/semantic_version/semantic_version-2.6.0.ebuild
index 3a703983e9f0..cedf16e3ec0c 100644
--- a/dev-python/semantic_version/semantic_version-2.6.0.ebuild
+++ b/dev-python/semantic_version/semantic_version-2.6.0.ebuild
@@ -12,7 +12,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=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0.ebuild b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0.ebuild
index 8ffba1e43954..93c4f74a5cf0 100644
--- a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0.ebuild
+++ b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 IUSE="doc"
 
 CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.0.17.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.0.17.ebuild
index 1e0a6318de86..2c12159a3490 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.0.17.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.0.17.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples +sqlite test"
 
 REQUIRED_USE="test? ( sqlite )"
diff --git a/dev-python/statsd/statsd-3.2.1.ebuild b/dev-python/statsd/statsd-3.2.1.ebuild
index 0940f02155b2..9b9d2627faea 100644
--- a/dev-python/statsd/statsd-3.2.1.ebuild
+++ b/dev-python/statsd/statsd-3.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/stevedore/stevedore-1.20.0.ebuild b/dev-python/stevedore/stevedore-1.20.0.ebuild
index a10bbe2975d8..f1c2d7db1060 100644
--- a/dev-python/stevedore/stevedore-1.20.0.ebuild
+++ b/dev-python/stevedore/stevedore-1.20.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc test"
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/taskflow/taskflow-2.9.0.ebuild b/dev-python/taskflow/taskflow-2.9.0.ebuild
index 00eb85c4f025..85fdca800809 100644
--- a/dev-python/taskflow/taskflow-2.9.0.ebuild
+++ b/dev-python/taskflow/taskflow-2.9.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/tenacity/tenacity-3.7.1.ebuild b/dev-python/tenacity/tenacity-3.7.1.ebuild
index 05bfffd64aab..8ed0e24a1174 100644
--- a/dev-python/tenacity/tenacity-3.7.1.ebuild
+++ b/dev-python/tenacity/tenacity-3.7.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/tooz/tooz-1.48.0.ebuild b/dev-python/tooz/tooz-1.48.0.ebuild
index df777607e208..5c3c5d498543 100644
--- a/dev-python/tooz/tooz-1.48.0.ebuild
+++ b/dev-python/tooz/tooz-1.48.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/weakrefmethod/weakrefmethod-1.0.3.ebuild b/dev-python/weakrefmethod/weakrefmethod-1.0.3.ebuild
index 74134ef65693..01ea69b6ab7e 100644
--- a/dev-python/weakrefmethod/weakrefmethod-1.0.3.ebuild
+++ b/dev-python/weakrefmethod/weakrefmethod-1.0.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/webob/webob-1.6.3.ebuild b/dev-python/webob/webob-1.6.3.ebuild
index 06e85d686a51..c190fa386a95 100644
--- a/dev-python/webob/webob-1.6.3.ebuild
+++ b/dev-python/webob/webob-1.6.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/yaql/yaql-1.1.3.ebuild b/dev-python/yaql/yaql-1.1.3.ebuild
index 388ce33d51f0..43f091b206cc 100644
--- a/dev-python/yaql/yaql-1.1.3.ebuild
+++ b/dev-python/yaql/yaql-1.1.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
diff --git a/net-dns/dnsmasq/dnsmasq-2.76-r1.ebuild b/net-dns/dnsmasq/dnsmasq-2.76-r1.ebuild
index be4541c90f74..27f157cd660e 100644
--- a/net-dns/dnsmasq/dnsmasq-2.76-r1.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.76-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz"
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec idn +inotify ipv6 lua nls script selinux static tftp"
 DM_LINGUAS="de es fi fr id it no pl pt_BR ro"
 for dm_lingua in ${DM_LINGUAS}; do
diff --git a/sys-auth/keystone/keystone-11.0.0.ebuild b/sys-auth/keystone/keystone-11.0.0.ebuild
index 58adaa0bd7e7..1b85e1ef41bf 100644
--- a/sys-auth/keystone/keystone-11.0.0.ebuild
+++ b/sys-auth/keystone/keystone-11.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="+sqlite ldap memcached mongo mysql postgres test"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
diff --git a/sys-cluster/cinder/cinder-10.0.0.ebuild b/sys-cluster/cinder/cinder-10.0.0.ebuild
index 0889f3683161..9f60fa4e6e8a 100644
--- a/sys-cluster/cinder/cinder-10.0.0.ebuild
+++ b/sys-cluster/cinder/cinder-10.0.0.ebuild
@@ -15,7 +15,7 @@ https://tarballs.openstack.org/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt"
 REQUIRED_USE="|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma )"
 
diff --git a/sys-cluster/heat/heat-8.0.0.ebuild b/sys-cluster/heat/heat-8.0.0.ebuild
index 323cdb3bbabf..2faaffb6d42f 100644
--- a/sys-cluster/heat/heat-8.0.0.ebuild
+++ b/sys-cluster/heat/heat-8.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="+mysql +memcached postgres sqlite"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
diff --git a/sys-cluster/neutron/neutron-10.0.0.ebuild b/sys-cluster/neutron/neutron-10.0.0.ebuild
index 3d7f813965c4..482826b624b0 100644
--- a/sys-cluster/neutron/neutron-10.0.0.ebuild
+++ b/sys-cluster/neutron/neutron-10.0.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ocata/con
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="compute-only dhcp ipv6 l3 metadata openvswitch linuxbridge server sqlite mysql postgres"
 REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
 						compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server
diff --git a/sys-cluster/nova/nova-15.0.2.ebuild b/sys-cluster/nova/nova-15.0.2.ebuild
index 8091ac78fa29..640ec44b6e75 100644
--- a/sys-cluster/nova/nova-15.0.2.ebuild
+++ b/sys-cluster/nova/nova-15.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/ocata/nova.c
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="+compute compute-only iscsi +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite"
 REQUIRED_USE="
 	!compute-only? ( || ( mysql postgres sqlite ) )
diff --git a/sys-cluster/swift/swift-2.13.0.ebuild b/sys-cluster/swift/swift-2.13.0.ebuild
index 6ce4c0551b21..4a220c731033 100644
--- a/sys-cluster/swift/swift-2.13.0.ebuild
+++ b/sys-cluster/swift/swift-2.13.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="proxy account container object +memcached"
 REQUIRED_USE="|| ( proxy account container object )"