openstack mass stable for mitaka, x86 and amd64 for bug 582170

76 files changed, 77 insertions, 77 deletions

diff --git a/app-admin/glance/glance-12.0.0.ebuild b/app-admin/glance/glance-12.0.0.ebuild
index db3b2a85146a..9cecad90ab9e 100644
--- a/app-admin/glance/glance-12.0.0.ebuild
+++ b/app-admin/glance/glance-12.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="doc mysql postgres +sqlite +swift"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
diff --git a/dev-python/PyECLib/PyECLib-1.2.0.ebuild b/dev-python/PyECLib/PyECLib-1.2.0.ebuild
index 168d54b02843..054caf57b6ed 100644
--- a/dev-python/PyECLib/PyECLib-1.2.0.ebuild
+++ b/dev-python/PyECLib/PyECLib-1.2.0.ebuild
@@ -13,7 +13,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"
 
 CDEPEND="dev-libs/jerasure"
diff --git a/dev-python/alembic/alembic-0.8.6.ebuild b/dev-python/alembic/alembic-0.8.6.ebuild
index 324037163910..609319f22fb9 100644
--- a/dev-python/alembic/alembic-0.8.6.ebuild
+++ b/dev-python/alembic/alembic-0.8.6.ebuild
@@ -13,7 +13,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/bandit/bandit-1.0.1.ebuild b/dev-python/bandit/bandit-1.0.1.ebuild
index 43618a20b0de..65e303e21902 100644
--- a/dev-python/bandit/bandit-1.0.1.ebuild
+++ b/dev-python/bandit/bandit-1.0.1.ebuild
@@ -14,7 +14,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"
 
 CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/castellan/castellan-0.4.0.ebuild b/dev-python/castellan/castellan-0.4.0.ebuild
index 78a246205540..0b0de2b0112e 100644
--- a/dev-python/castellan/castellan-0.4.0.ebuild
+++ b/dev-python/castellan/castellan-0.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 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND="	>=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
diff --git a/dev-python/cliff/cliff-2.0.0.ebuild b/dev-python/cliff/cliff-2.0.0.ebuild
index 09351be0c740..29a121a15fa7 100644
--- a/dev-python/cliff/cliff-2.0.0.ebuild
+++ b/dev-python/cliff/cliff-2.0.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 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
diff --git a/dev-python/debtcollector/debtcollector-1.3.0.ebuild b/dev-python/debtcollector/debtcollector-1.3.0.ebuild
index 7d7708ca229a..d13880b2c215 100644
--- a/dev-python/debtcollector/debtcollector-1.3.0.ebuild
+++ b/dev-python/debtcollector/debtcollector-1.3.0.ebuild
@@ -14,7 +14,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/dogpile-cache/dogpile-cache-0.5.7.ebuild b/dev-python/dogpile-cache/dogpile-cache-0.5.7.ebuild
index d4004f25fe4d..889a0e2fa913 100644
--- a/dev-python/dogpile-cache/dogpile-cache-0.5.7.ebuild
+++ b/dev-python/dogpile-cache/dogpile-cache-0.5.7.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/dogpile.cache-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 
 RDEPEND=">=dev-python/dogpile-core-0.4.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/eventlet/eventlet-0.18.4.ebuild b/dev-python/eventlet/eventlet-0.18.4.ebuild
index b071e6022015..6fb4f8fc68ca 100644
--- a/dev-python/eventlet/eventlet-0.18.4.ebuild
+++ b/dev-python/eventlet/eventlet-0.18.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc examples test"
 
 RDEPEND=">=dev-python/greenlet-0.3[${PYTHON_USEDEP}]"
diff --git a/dev-python/futurist/futurist-0.13.0.ebuild b/dev-python/futurist/futurist-0.13.0.ebuild
index 344104b49e7f..a004a2363595 100644
--- a/dev-python/futurist/futurist-0.13.0.ebuild
+++ b/dev-python/futurist/futurist-0.13.0.ebuild
@@ -14,7 +14,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.6[${PYTHON_USEDEP}]"
diff --git a/dev-python/gdata/gdata-2.0.18.ebuild b/dev-python/gdata/gdata-2.0.18.ebuild
index 214dee27df22..4a6a9eaaf238 100644
--- a/dev-python/gdata/gdata-2.0.18.ebuild
+++ b/dev-python/gdata/gdata-2.0.18.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://gdata-python-client.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="examples"
 
 python_test() {
diff --git a/dev-python/git-python/git-python-1.0.2.ebuild b/dev-python/git-python/git-python-1.0.2.ebuild
index e7daa4265be0..ea1c4511d04d 100644
--- a/dev-python/git-python/git-python-1.0.2.ebuild
+++ b/dev-python/git-python/git-python-1.0.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 # Tests dont make sense without a git repo
diff --git a/dev-python/glance_store/glance_store-0.13.1.ebuild b/dev-python/glance_store/glance_store-0.13.1.ebuild
index a63c9bfa2ff0..4ce466a66614 100644
--- a/dev-python/glance_store/glance_store-0.13.1.ebuild
+++ b/dev-python/glance_store/glance_store-0.13.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="+cinder"
 
 CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
diff --git a/dev-python/google-api-python-client/google-api-python-client-1.5.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-1.5.0.ebuild
index aef0fa73123e..26bae22effb5 100644
--- a/dev-python/google-api-python-client/google-api-python-client-1.5.0.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-1.5.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/google/google-api-python-client/archive/v${PV}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="test"
 
 RDEPEND="
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}
 		dev-python/nose[${PYTHON_USEDEP}]
 	)"
 
-python_prepare_all(){
+python_prepare_all() {
 	export SKIP_GOOGLEAPICLIENT_COMPAT_CHECK=true
 	distutils-r1_python_prepare_all
 }
diff --git a/dev-python/jinja/jinja-2.8.ebuild b/dev-python/jinja/jinja-2.8.ebuild
index 41dfa7c8df4c..476c92c2c664 100644
--- a/dev-python/jinja/jinja-2.8.ebuild
+++ b/dev-python/jinja/jinja-2.8.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_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 ~x86-interix ~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 ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/dev-python/keyring/keyring-8.6.ebuild b/dev-python/keyring/keyring-8.6.ebuild
index 06a13e8ae02b..1df90db1aa59 100644
--- a/dev-python/keyring/keyring-8.6.ebuild
+++ b/dev-python/keyring/keyring-8.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/k/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="PSF-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/keystoneauth/keystoneauth-2.4.0.ebuild b/dev-python/keystoneauth/keystoneauth-2.4.0.ebuild
index fa1557e802fc..ebaae9bc60ce 100644
--- a/dev-python/keystoneauth/keystoneauth-2.4.0.ebuild
+++ b/dev-python/keystoneauth/keystoneauth-2.4.0.ebuild
@@ -14,7 +14,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.6[${PYTHON_USEDEP}]"
diff --git a/dev-python/keystonemiddleware/keystonemiddleware-4.4.0.ebuild b/dev-python/keystonemiddleware/keystonemiddleware-4.4.0.ebuild
index 52b896ae2ec7..0d7402f1ccde 100644
--- a/dev-python/keystonemiddleware/keystonemiddleware-4.4.0.ebuild
+++ b/dev-python/keystonemiddleware/keystonemiddleware-4.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 ~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/kombu/kombu-3.0.34.ebuild b/dev-python/kombu/kombu-3.0.34.ebuild
index e74c50071905..dab483c08488 100644
--- a/dev-python/kombu/kombu-3.0.34.ebuild
+++ b/dev-python/kombu/kombu-3.0.34.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="amqplib doc examples msgpack sqs test"
 
 # couchdb backend support possible via dev-python/couchdb-python
diff --git a/dev-python/monotonic/monotonic-1.0.ebuild b/dev-python/monotonic/monotonic-1.0.ebuild
index d8618e1e42e8..dd10bd032c91 100644
--- a/dev-python/monotonic/monotonic-1.0.ebuild
+++ b/dev-python/monotonic/monotonic-1.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=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/netaddr/netaddr-0.7.18.ebuild b/dev-python/netaddr/netaddr-0.7.18.ebuild
index 9c11f738e641..a0006efdac59 100644
--- a/dev-python/netaddr/netaddr-0.7.18.ebuild
+++ b/dev-python/netaddr/netaddr-0.7.18.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="cli test"
 
 RDEPEND="cli? ( >=dev-python/ipython-0.13.1-r1[${PYTHON_USEDEP}] )"
diff --git a/dev-python/neutron-lib/neutron-lib-0.0.2.ebuild b/dev-python/neutron-lib/neutron-lib-0.0.2.ebuild
index 74c6811c479b..3f6a06c821d9 100644
--- a/dev-python/neutron-lib/neutron-lib-0.0.2.ebuild
+++ b/dev-python/neutron-lib/neutron-lib-0.0.2.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=""
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/oauth2client/oauth2client-2.0.1.ebuild b/dev-python/oauth2client/oauth2client-2.0.1.ebuild
index 55bc6bc7ad30..d92b753fd22a 100644
--- a/dev-python/oauth2client/oauth2client-2.0.1.ebuild
+++ b/dev-python/oauth2client/oauth2client-2.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/google/oauth2client/archive/v${PV/_p/-post}.tar.gz -
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/openstacksdk/openstacksdk-0.8.2.ebuild b/dev-python/openstacksdk/openstacksdk-0.8.2.ebuild
index ffbb18c55494..5497a5c0d035 100644
--- a/dev-python/openstacksdk/openstacksdk-0.8.2.ebuild
+++ b/dev-python/openstacksdk/openstacksdk-0.8.2.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=""
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/os-brick/os-brick-1.2.0.ebuild b/dev-python/os-brick/os-brick-1.2.0.ebuild
index 47b4fa06950c..f6347b278304 100644
--- a/dev-python/os-brick/os-brick-1.2.0.ebuild
+++ b/dev-python/os-brick/os-brick-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=""
 
 CDEPEND="
diff --git a/dev-python/os-client-config/os-client-config-1.16.0.ebuild b/dev-python/os-client-config/os-client-config-1.16.0.ebuild
index abd4aaa77d82..44dc03c8d33a 100644
--- a/dev-python/os-client-config/os-client-config-1.16.0.ebuild
+++ b/dev-python/os-client-config/os-client-config-1.16.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[${PYTHON_USEDEP}]"
diff --git a/dev-python/os-testr/os-testr-0.6.0.ebuild b/dev-python/os-testr/os-testr-0.6.0.ebuild
index 8c34e4a850b5..bcae8b24617e 100644
--- a/dev-python/os-testr/os-testr-0.6.0.ebuild
+++ b/dev-python/os-testr/os-testr-0.6.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"
 
 CDEPEND="
diff --git a/dev-python/os-win/os-win-0.4.0.ebuild b/dev-python/os-win/os-win-0.4.0.ebuild
index fe9a8e0b6aab..4cfba90be5d2 100644
--- a/dev-python/os-win/os-win-0.4.0.ebuild
+++ b/dev-python/os-win/os-win-0.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 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-cache/oslo-cache-1.6.0.ebuild b/dev-python/oslo-cache/oslo-cache-1.6.0.ebuild
index 2fe2236a0ad1..be36c81ea0e0 100644
--- a/dev-python/oslo-cache/oslo-cache-1.6.0.ebuild
+++ b/dev-python/oslo-cache/oslo-cache-1.6.0.ebuild
@@ -16,7 +16,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.7.0.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-3.7.0.ebuild
index 71c155b2f89b..d617f7667f9d 100644
--- a/dev-python/oslo-concurrency/oslo-concurrency-3.7.0.ebuild
+++ b/dev-python/oslo-concurrency/oslo-concurrency-3.7.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/oslo.concurrency-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 
 CDPEND="
diff --git a/dev-python/oslo-config/oslo-config-3.9.0.ebuild b/dev-python/oslo-config/oslo-config-3.9.0.ebuild
index 86002716c5c8..ce17a301626a 100644
--- a/dev-python/oslo-config/oslo-config-3.9.0.ebuild
+++ b/dev-python/oslo-config/oslo-config-3.9.0.ebuild
@@ -16,7 +16,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.2.0.ebuild b/dev-python/oslo-context/oslo-context-2.2.0.ebuild
index ca235592e08b..f00496067a86 100644
--- a/dev-python/oslo-context/oslo-context-2.2.0.ebuild
+++ b/dev-python/oslo-context/oslo-context-2.2.0.ebuild
@@ -14,7 +14,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.6[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-db/oslo-db-4.7.0.ebuild b/dev-python/oslo-db/oslo-db-4.7.0.ebuild
index 6cf10653e254..552f3ad92462 100644
--- a/dev-python/oslo-db/oslo-db-4.7.0.ebuild
+++ b/dev-python/oslo-db/oslo-db-4.7.0.ebuild
@@ -14,7 +14,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.5.0.ebuild b/dev-python/oslo-i18n/oslo-i18n-3.5.0.ebuild
index 13f8999094f5..af5d00f786ad 100644
--- a/dev-python/oslo-i18n/oslo-i18n-3.5.0.ebuild
+++ b/dev-python/oslo-i18n/oslo-i18n-3.5.0.ebuild
@@ -16,7 +16,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/oslotest-1.10.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-log/oslo-log-3.3.0.ebuild b/dev-python/oslo-log/oslo-log-3.3.0.ebuild
index bcefaa8b4fdf..40f9a88100f0 100644
--- a/dev-python/oslo-log/oslo-log-3.3.0.ebuild
+++ b/dev-python/oslo-log/oslo-log-3.3.0.ebuild
@@ -15,7 +15,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-4.6.1.ebuild b/dev-python/oslo-messaging/oslo-messaging-4.6.1.ebuild
index fdbfd22bcd24..b075d508a3fe 100644
--- a/dev-python/oslo-messaging/oslo-messaging-4.6.1.ebuild
+++ b/dev-python/oslo-messaging/oslo-messaging-4.6.1.ebuild
@@ -14,7 +14,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}]
diff --git a/dev-python/oslo-middleware/oslo-middleware-3.8.0-r1.ebuild b/dev-python/oslo-middleware/oslo-middleware-3.8.0-r1.ebuild
index 18faffd1267c..697abd01f78f 100644
--- a/dev-python/oslo-middleware/oslo-middleware-3.8.0-r1.ebuild
+++ b/dev-python/oslo-middleware/oslo-middleware-3.8.0-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/oslo.middleware-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 
 CDEPEND="
diff --git a/dev-python/oslo-policy/oslo-policy-1.6.0.ebuild b/dev-python/oslo-policy/oslo-policy-1.6.0.ebuild
index d7e888f1390f..f7656fad24d9 100644
--- a/dev-python/oslo-policy/oslo-policy-1.6.0.ebuild
+++ b/dev-python/oslo-policy/oslo-policy-1.6.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/oslo.policy-${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-reports/oslo-reports-1.7.0.ebuild b/dev-python/oslo-reports/oslo-reports-1.7.0.ebuild
index eb5e4bee4978..c760a327e8eb 100644
--- a/dev-python/oslo-reports/oslo-reports-1.7.0.ebuild
+++ b/dev-python/oslo-reports/oslo-reports-1.7.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/oslo.reports-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND="
diff --git a/dev-python/oslo-rootwrap/oslo-rootwrap-4.1.0.ebuild b/dev-python/oslo-rootwrap/oslo-rootwrap-4.1.0.ebuild
index e2c0b44677aa..c848f801e33b 100644
--- a/dev-python/oslo-rootwrap/oslo-rootwrap-4.1.0.ebuild
+++ b/dev-python/oslo-rootwrap/oslo-rootwrap-4.1.0.ebuild
@@ -14,7 +14,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-1.11.0.ebuild b/dev-python/oslo-serialization/oslo-serialization-1.11.0.ebuild
index e8a4fc1a3036..740daf049550 100644
--- a/dev-python/oslo-serialization/oslo-serialization-1.11.0.ebuild
+++ b/dev-python/oslo-serialization/oslo-serialization-1.11.0.ebuild
@@ -16,7 +16,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.8.0.ebuild b/dev-python/oslo-service/oslo-service-1.8.0.ebuild
index 0fc13a5796ef..a2aa18ec4e41 100644
--- a/dev-python/oslo-service/oslo-service-1.8.0.ebuild
+++ b/dev-python/oslo-service/oslo-service-1.8.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/oslo.service-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 
 CDEPEND="
diff --git a/dev-python/oslo-utils/oslo-utils-3.8.0.ebuild b/dev-python/oslo-utils/oslo-utils-3.8.0.ebuild
index 1a421a46c7b5..40969870fa25 100644
--- a/dev-python/oslo-utils/oslo-utils-3.8.0.ebuild
+++ b/dev-python/oslo-utils/oslo-utils-3.8.0.ebuild
@@ -16,7 +16,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="
diff --git a/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.8.0.ebuild b/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.8.0.ebuild
index f88f25a265a9..80f96efee044 100644
--- a/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.8.0.ebuild
+++ b/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.8.0.ebuild
@@ -14,7 +14,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.5.0.ebuild b/dev-python/oslo-vmware/oslo-vmware-2.5.0.ebuild
index 2004ceea4963..a3d66f52c6a0 100644
--- a/dev-python/oslo-vmware/oslo-vmware-2.5.0.ebuild
+++ b/dev-python/oslo-vmware/oslo-vmware-2.5.0.ebuild
@@ -14,7 +14,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.6[${PYTHON_USEDEP}]"
diff --git a/dev-python/osprofiler/osprofiler-1.2.0.ebuild b/dev-python/osprofiler/osprofiler-1.2.0.ebuild
index 5c1c29e0d4a2..ce0574881331 100644
--- a/dev-python/osprofiler/osprofiler-1.2.0.ebuild
+++ b/dev-python/osprofiler/osprofiler-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=""
 
 DEPEND="
diff --git a/dev-python/ovs/ovs-2.4.0.ebuild b/dev-python/ovs/ovs-2.4.0.ebuild
index fcd312573d22..5c763c7210c8 100644
--- a/dev-python/ovs/ovs-2.4.0.ebuild
+++ b/dev-python/ovs/ovs-2.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 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pika-pool/pika-pool-0.1.3.ebuild b/dev-python/pika-pool/pika-pool-0.1.3.ebuild
index 27e18dd85b38..fe163651191f 100644
--- a/dev-python/pika-pool/pika-pool-0.1.3.ebuild
+++ b/dev-python/pika-pool/pika-pool-0.1.3.ebuild
@@ -13,7 +13,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/pika/pika-0.10.0.ebuild b/dev-python/pika/pika-0.10.0.ebuild
index 613210b4ef8a..56adf95d607c 100644
--- a/dev-python/pika/pika-0.10.0.ebuild
+++ b/dev-python/pika/pika-0.10.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/positional/positional-1.0.1.ebuild b/dev-python/positional/positional-1.0.1.ebuild
index 037652a0ef4b..a68116ea7c6d 100644
--- a/dev-python/positional/positional-1.0.1.ebuild
+++ b/dev-python/positional/positional-1.0.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="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/py-amqp/py-amqp-1.4.9.ebuild b/dev-python/py-amqp/py-amqp-1.4.9.ebuild
index 15085b57f62a..bf8d2b9f52c3 100644
--- a/dev-python/py-amqp/py-amqp-1.4.9.ebuild
+++ b/dev-python/py-amqp/py-amqp-1.4.9.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc examples extras test"
 
 RDEPEND=""
diff --git a/dev-python/pyinotify/pyinotify-0.9.6.ebuild b/dev-python/pyinotify/pyinotify-0.9.6.ebuild
index e5a2ae89ca74..45b8b07b236a 100644
--- a/dev-python/pyinotify/pyinotify-0.9.6.ebuild
+++ b/dev-python/pyinotify/pyinotify-0.9.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://seb.dbzteam.org/pub/pyinotify/releases/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pymongo/pymongo-3.2.2.ebuild b/dev-python/pymongo/pymongo-3.2.2.ebuild
index 8fbd7cd7b6bc..caf98e02b9a4 100644
--- a/dev-python/pymongo/pymongo-3.2.2.ebuild
+++ b/dev-python/pymongo/pymongo-3.2.2.ebuild
@@ -14,7 +14,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/python-cinderclient/python-cinderclient-1.6.0.ebuild b/dev-python/python-cinderclient/python-cinderclient-1.6.0.ebuild
index 234be30a6261..7f8547dc49f3 100644
--- a/dev-python/python-cinderclient/python-cinderclient-1.6.0.ebuild
+++ b/dev-python/python-cinderclient/python-cinderclient-1.6.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 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-dateutil/python-dateutil-2.4.2-r1.ebuild b/dev-python/python-dateutil/python-dateutil-2.4.2-r1.ebuild
index 8207deb6e3b3..ad428b93cdbc 100644
--- a/dev-python/python-dateutil/python-dateutil-2.4.2-r1.ebuild
+++ b/dev-python/python-dateutil/python-dateutil-2.4.2-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/python-designateclient/python-designateclient-2.0.0.ebuild b/dev-python/python-designateclient/python-designateclient-2.0.0.ebuild
index 380565d32a6b..985359653800 100644
--- a/dev-python/python-designateclient/python-designateclient-2.0.0.ebuild
+++ b/dev-python/python-designateclient/python-designateclient-2.0.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=""
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-glanceclient/python-glanceclient-2.0.0.ebuild b/dev-python/python-glanceclient/python-glanceclient-2.0.0.ebuild
index ac2b7f86e580..946babc4723b 100644
--- a/dev-python/python-glanceclient/python-glanceclient-2.0.0.ebuild
+++ b/dev-python/python-glanceclient/python-glanceclient-2.0.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 ~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-keystoneclient/python-keystoneclient-2.3.1.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-2.3.1.ebuild
index 6c300e1ae1e7..d806edc34c76 100644
--- a/dev-python/python-keystoneclient/python-keystoneclient-2.3.1.ebuild
+++ b/dev-python/python-keystoneclient/python-keystoneclient-2.3.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 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 # Note: blacklist version not in portage:
diff --git a/dev-python/python-neutronclient/python-neutronclient-4.1.1.ebuild b/dev-python/python-neutronclient/python-neutronclient-4.1.1.ebuild
index 620f66223d35..525bd14001d7 100644
--- a/dev-python/python-neutronclient/python-neutronclient-4.1.1.ebuild
+++ b/dev-python/python-neutronclient/python-neutronclient-4.1.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 ~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-3.3.0.ebuild b/dev-python/python-novaclient/python-novaclient-3.3.0.ebuild
index 7570fc94399f..d3a78cf24843 100644
--- a/dev-python/python-novaclient/python-novaclient-3.3.0.ebuild
+++ b/dev-python/python-novaclient/python-novaclient-3.3.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 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-openstackclient/python-openstackclient-2.3.0.ebuild b/dev-python/python-openstackclient/python-openstackclient-2.3.0.ebuild
index ba9928b262a6..2bd367ff0115 100644
--- a/dev-python/python-openstackclient/python-openstackclient-2.3.0.ebuild
+++ b/dev-python/python-openstackclient/python-openstackclient-2.3.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 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
diff --git a/dev-python/requests-mock/requests-mock-0.7.0.ebuild b/dev-python/requests-mock/requests-mock-0.7.0.ebuild
index 7c3512b4736b..0d5213c4d2bc 100644
--- a/dev-python/requests-mock/requests-mock-0.7.0.ebuild
+++ b/dev-python/requests-mock/requests-mock-0.7.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/requestsexceptions/requestsexceptions-1.1.3.ebuild b/dev-python/requestsexceptions/requestsexceptions-1.1.3.ebuild
index 699e009aed55..0efd54ad1c1f 100644
--- a/dev-python/requestsexceptions/requestsexceptions-1.1.3.ebuild
+++ b/dev-python/requestsexceptions/requestsexceptions-1.1.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=""
 
 CDEPEND=">=dev-python/pbr-0.11[${PYTHON_USEDEP}]"
diff --git a/dev-python/ryu/ryu-4.0.ebuild b/dev-python/ryu/ryu-4.0.ebuild
index 894cfa8a1d44..80c8568330fe 100644
--- a/dev-python/ryu/ryu-4.0.ebuild
+++ b/dev-python/ryu/ryu-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 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/setuptools_scm/setuptools_scm-1.10.1.ebuild b/dev-python/setuptools_scm/setuptools_scm-1.10.1.ebuild
index ef6073bc1db8..ee64266c5d91 100644
--- a/dev-python/setuptools_scm/setuptools_scm-1.10.1.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-1.10.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.0.12.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.0.12.ebuild
index 243bc3f8fb09..fa771373c42c 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.0.12.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.0.12.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~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 ~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/taskflow/taskflow-1.30.0.ebuild b/dev-python/taskflow/taskflow-1.30.0.ebuild
index ce3b38b1f1f4..ba5f62e61f50 100644
--- a/dev-python/taskflow/taskflow-1.30.0.ebuild
+++ b/dev-python/taskflow/taskflow-1.30.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 ~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/tempest-lib/tempest-lib-1.0.0.ebuild b/dev-python/tempest-lib/tempest-lib-1.0.0.ebuild
index cc5bacabb394..a07e74380a67 100644
--- a/dev-python/tempest-lib/tempest-lib-1.0.0.ebuild
+++ b/dev-python/tempest-lib/tempest-lib-1.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/t/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 
 CDEPEND="
diff --git a/dev-python/tooz/tooz-1.34.0.ebuild b/dev-python/tooz/tooz-1.34.0.ebuild
index 7bc386a4b915..d841346afff3 100644
--- a/dev-python/tooz/tooz-1.34.0.ebuild
+++ b/dev-python/tooz/tooz-1.34.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=""
 
 CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
diff --git a/dev-python/voluptuous/voluptuous-0.8.8.ebuild b/dev-python/voluptuous/voluptuous-0.8.8.ebuild
index e61bff5ac12e..f3340c1de5cb 100644
--- a/dev-python/voluptuous/voluptuous-0.8.8.ebuild
+++ b/dev-python/voluptuous/voluptuous-0.8.8.ebuild
@@ -13,7 +13,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/net-misc/dibbler/dibbler-1.0.1.ebuild b/net-misc/dibbler/dibbler-1.0.1.ebuild
index e680fe44f1a5..b6697b5f53e0 100644
--- a/net-misc/dibbler/dibbler-1.0.1.ebuild
+++ b/net-misc/dibbler/dibbler-1.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://klub.com.pl/dhcpv6/dibbler/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~mips ~x86"
+KEYWORDS="amd64 ~hppa ~mips x86"
 IUSE="doc"
 
 DEPEND="doc? ( || (
diff --git a/sys-auth/keystone/keystone-9.0.0-r1.ebuild b/sys-auth/keystone/keystone-9.0.0-r1.ebuild
index e6b66351bdfc..09bb4b163668 100644
--- a/sys-auth/keystone/keystone-9.0.0-r1.ebuild
+++ b/sys-auth/keystone/keystone-9.0.0-r1.ebuild
@@ -14,7 +14,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-8.0.0.ebuild b/sys-cluster/cinder/cinder-8.0.0.ebuild
index 2836a339940e..ae2349b515d8 100644
--- a/sys-cluster/cinder/cinder-8.0.0.ebuild
+++ b/sys-cluster/cinder/cinder-8.0.0.ebuild
@@ -17,7 +17,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="+api +scheduler +volume iscsi lvm mysql +memcached postgres sqlite test"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
diff --git a/sys-cluster/neutron/neutron-8.0.0.ebuild b/sys-cluster/neutron/neutron-8.0.0.ebuild
index c15208b51130..47163a58fe0b 100644
--- a/sys-cluster/neutron/neutron-8.0.0.ebuild
+++ b/sys-cluster/neutron/neutron-8.0.0.ebuild
@@ -15,7 +15,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="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-13.0.0.ebuild b/sys-cluster/nova/nova-13.0.0.ebuild
index 37aa41f7eed9..2a260502a6cf 100644
--- a/sys-cluster/nova/nova-13.0.0.ebuild
+++ b/sys-cluster/nova/nova-13.0.0.ebuild
@@ -14,7 +14,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="+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.7.0.ebuild b/sys-cluster/swift/swift-2.7.0.ebuild
index bca2f5d91547..1f4afbc77448 100644
--- a/sys-cluster/swift/swift-2.7.0.ebuild
+++ b/sys-cluster/swift/swift-2.7.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="proxy account container object test +memcached"
 REQUIRED_USE="|| ( proxy account container object )"