gentoo resync : 31.03.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-03-31 10:55:17 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-03-31 10:55:17 +0100
commit: 75fc75ae1f0481ffdb78450e801a9b443ba641bd (patch)
tree: cef96ea0860ae39a202bbf1e226100335209627d /dev-python
parent: 1173ad5704ce725916e0c332416aff326d850d06 (diff)
291 files changed, 505 insertions, 309 deletions
diff --git a/dev-python/Babel/Babel-2.5.3.ebuild b/dev-python/Babel/Babel-2.5.3.ebuild
index 002805adb211..dd04c227a16a 100644
--- a/dev-python/Babel/Babel-2.5.3.ebuild
+++ b/dev-python/Babel/Babel-2.5.3.ebuild
@@ -14,7 +14,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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="doc test"
 
 RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
diff --git a/dev-python/Babel/Manifest b/dev-python/Babel/Manifest
index b9bf4698f1c4..66836f7af81b 100644
--- a/dev-python/Babel/Manifest
+++ b/dev-python/Babel/Manifest
@@ -1,5 +1,5 @@
 DIST Babel-2.5.0.tar.gz 6612353 BLAKE2B 85268f0226f1db019fb906da0dfbbc6b6aa199ab491e9d767c932fb5ca77cb6d86328ebaa9c6eb61fb8d28c8e566babd435cdcee9b900c3c680d0dfb49c2bcac SHA512 b24b74121695e0068fb28a6294d4b5b2065e94dcd62ca0d70c8fde3a00cb5ff111480505594460989c6f67a75935f55e153b1b493f917317d2c5ee0f0d7921fc
 DIST Babel-2.5.3.tar.gz 6611941 BLAKE2B 99b71642b00a853fea844220c0ce5ef2fe425906cbdd1618e31f39b60d16382d54ff5e00c493153eee2be8894edc8c96e57fc2703620db5bafcf7b7a4f1b72ef SHA512 1a41f69141da9f66e27110e7a1a5955f76d8ae9353ff7e54182c5bb6ca16e8b4799031e4df1049af54de513da9f101e171e4312b2e7775f2cab9116d5b50c0fb
 EBUILD Babel-2.5.0.ebuild 1477 BLAKE2B 340f4e488117ed48288f9d842ec23b9fbd70294bfd471a4fec68d1fade530c8455435280d11b201307cd98e8300d46f544448cb7bf399cc70a439009a9aa8e16 SHA512 db072a3022bf1558201853cddc02a7b0614ffdd474a467fb4d819f7dcde5fcdd227dd37a65205b530bee715ebbd16dcbd0ac00af8b5759e52ab63def0b9948c6
-EBUILD Babel-2.5.3.ebuild 1487 BLAKE2B ffd8a2cdfd82d92ab25e1a7ef30df724c8f29f0ec51c2088c65124f31e8c6b884150e9c9984c4ee97810a9b7a2cce7200e9ebf394b026729e89b1f60232abf17 SHA512 3c5303a56021da4d371d0c7faba9c0c24a3311d50c152074bd212a48f947fa31c07e2c8c7990029da06d849ac9aba78e412ae7fb65e7330399ac8ce273e156bd
+EBUILD Babel-2.5.3.ebuild 1478 BLAKE2B 78ac9ba8239fc1d6da3981d3a7e50e51c8e229ffe71578e71da5ac6c1634b710aa65cee0ca547a17a1f46ad491def4bf40afa60eff62ac6d4b1e05850e24b2a3 SHA512 7c5137bcc60576c5c8227a958cc8640924fa3f56bc66b7387d1c7b8e7a2be0157595f2803500a0ee37cb34a48f92dc40c26cc455562ae6041cd67ac939b4c0af
 MISC metadata.xml 691 BLAKE2B 9e0ec2fb9848f2994ed990ba0e9de14963eac7f1847fe7918e64030af2c3189ed194775a9ae7c506cb923ca7421f309fda970a8c97cf3bf8d7feab55ac15045a SHA512 91b4f1fa5ceebae1ded51ef3bee9a5c47380709eb3ededd83f8cbb20a85c45acd0603fb8c7244910c15037036056047b074b79c5d6668f68c44d29cb507e76e7
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index a0ada711bda4..51de8b9e0d42 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/alembic/Manifest b/dev-python/alembic/Manifest
index ddcd3f125b62..46ff9913ee64 100644
--- a/dev-python/alembic/Manifest
+++ b/dev-python/alembic/Manifest
@@ -3,5 +3,5 @@ DIST alembic-0.9.5.tar.gz 990808 BLAKE2B a8155d15a9de2acb7a2f01829a0d01eeae5a798
 DIST alembic-0.9.7.tar.gz 1003312 BLAKE2B 2c8c2c14bede5f1997f8822ae6400718fa8302cef55020ef84975965295ccfa20885d48274a24e0c5dab72ec1611884d29d4bec422da8a93241aa280cda47dc3 SHA512 102592f7a25033af197fadc260dbb5ee4ad7038feb015fe5672de83c42f6125b659873071b339cccf5eebcf390c16651f6b9064f225198f88b42d58796fb1ca3
 EBUILD alembic-0.9.3.ebuild 1396 BLAKE2B 93319592ebc29ce633dd7517577c65c94c1046104b41e820a28925f335d964be7f3b8272d0f20c3d8a3c249a7678ed3bff470b437c85bc7e9bc2971d45e3ffaf SHA512 194f68fb4364bf625f414dfee1e3aff268f24f4d2505a0d201ebd466563a5e8a7a86a617a790eb6a369df078c8f7f3d9545978dd5a739aecebc9ff3bf5d6e19b
 EBUILD alembic-0.9.5.ebuild 1398 BLAKE2B 9a935aab7770383adb4e43139bbb2eed13247e44e236c2bd23315a77bcef44c2d48939c5e1eee602460540e3c89083b3670ac9b2ed20f3130d97795f90f7a6af SHA512 52e82d8a19e6112df9ceec510b35c0a7f5c46ba3e1e75d5a1940bc4292be510ec98604be584f50a44dd67d36d771ae9f398dec0b1f1c12ef34e1fcd2660b0b0e
-EBUILD alembic-0.9.7.ebuild 1398 BLAKE2B 66c1f071354ee000e45d5456033499011d8f26c75debf3cee65a7e85917aa845864be882797047c8368856ded4cd12ddacb8ae634c6688590349250d4be2c219 SHA512 0ab9cfe6f35ca9cbe817a9c63cf9a380142818cd228a027a22ddb47d8614bbcf6d65f99d8f6e987cc97311d37262b055c33f1b764167e5128b8500e1a65be168
+EBUILD alembic-0.9.7.ebuild 1396 BLAKE2B 482d4f0b0c1078b7e1fda445b2f67fb006573a41bf996eab6b4371cc834071e676a27d0ee9a139f0e86d6de08bf883709d8d971ae21a1405f58b5490ddf91b0c SHA512 6a16767cb0d86c99750e458ec8218fa591ec9176335f89bf23c7a7ce560cb581c22971772bfc23ba7d1f5757e4f23a4a27dd0f9b8cf98d9af8275e1bcfc38998
 MISC metadata.xml 379 BLAKE2B 8fcdef99cd9d57757692cf72b6f43bf874b7657899197d754ad81866f77d0a48d0fdaf168eeb37ad29ec975ddd7533be90f1e9926de9faf1bb56c3ad4e1d7513 SHA512 809c3f1585e85726feefc7f8493ec83ee31a9f7aa99aacf82026742f278726ad960a63b40c701a1a2453d46fd64d8245b83f2bd7511b5cc077c44bc62dda3e83
diff --git a/dev-python/alembic/alembic-0.9.7.ebuild b/dev-python/alembic/alembic-0.9.7.ebuild
index d8ba57593ce5..98cfa80e521b 100644
--- a/dev-python/alembic/alembic-0.9.7.ebuild
+++ b/dev-python/alembic/alembic-0.9.7.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/Manifest b/dev-python/aodhclient/Manifest
index a5660d2e8aae..3e02c8d1763d 100644
--- a/dev-python/aodhclient/Manifest
+++ b/dev-python/aodhclient/Manifest
@@ -1,5 +1,5 @@
 DIST aodhclient-0.8.0.tar.gz 41676 BLAKE2B e9399f6f5adc2962b28b375db010b699fcfb4358daec375a6588f38f1600e557c73adde558d0ab88b14686f295d6dbbc2446e71de127d695ff2afcdcae99000f SHA512 8cb6ccd3fee3e2abecd5f9eb1b00c67ec4476f85498a9b23f4818c80e787d5373899eb90217e03b5baa376dcdf3c5aed9da8f369a0d6e562c3d97fd22b5b8850
 DIST aodhclient-1.0.0.tar.gz 40704 BLAKE2B bb097a62bf52f77df013ddc9301bd357bfbbff9a084b9a83ec5658512abfff811316ee9f39c227a74b2d2d139c1b21a402acd8d8cd8ba948d307d5e73b26fb93 SHA512 61bc58aad95e5781a8ed4f5cf7687d3cbb4f893513f8abacc7a93cd9774aed0ad02565a8e26718cf9dcb1c095d6b8bdd4719f78855b6af9629f1a04a6ecc0f59
 EBUILD aodhclient-0.8.0.ebuild 1042 BLAKE2B 77912f022dc0103a7fc234652cd848d4c5e66f9e480a33d0113600ea52baf56e84e0e073847a187605de00bdd060785c552ebc3388e8073a627e0fd691bbe3e3 SHA512 7da4ef3079c4197edbbdca0a21271c537f58f2158f674dca57079bb18d864b3c58036d55225fb66f4549deb0e200124899ae5c39d2e8c538a4d7cfea374f1d0f
-EBUILD aodhclient-1.0.0.ebuild 992 BLAKE2B 053568a9203f6aff74653536027606b9c1e88ee582bf95da3ca6f4b3f99d3ec4a73a685383dc27e87c16ca9487db733c5d6470fe005dc1aeecfd2155f3f63467 SHA512 d0b924fd33ab8736b4a24e9e6dda84b8eeb03718f8aa0b81d392c2143decc7470d136b16792d44a4d0b1214e2d98786dfbd2dc08cad22cbee20bbe5499143842
+EBUILD aodhclient-1.0.0.ebuild 990 BLAKE2B b7f6e2957c769a8534be9755ae85736dcfe91c598e1d5ef661180f30ba27fcfcd5e0482332a36127be938a8b31f58e5b6f0ec5e3a037d03f87ac000f297ee94e SHA512 7401fb9c147078bccb4209602c2121b65151c0ab46c205385c8c932f0de1daa88249cd2c260a9f7eb0cc2f4e296123555e2f97053fc08fb3334e9fb3e8e4c6de
 MISC metadata.xml 604 BLAKE2B 2389e07026b35c4cf96b7caecf3c29f7f8c7f5f8a7cc6b9c576043163826d97092999ff76dbf6f52b49475c001a89409095a7af25c182bc2069bb9e7c6ae0536 SHA512 95b484267b9f6eceeed9f404fe3ca3140d364aa9551cb306e0a40769b17afcd927b1570fa367eff9c250b1fd8bdf8adddfb4f61f506d297eb011f83ab4676aa7
diff --git a/dev-python/aodhclient/aodhclient-1.0.0.ebuild b/dev-python/aodhclient/aodhclient-1.0.0.ebuild
index c42301b261c6..d0b717aeabee 100644
--- a/dev-python/aodhclient/aodhclient-1.0.0.ebuild
+++ b/dev-python/aodhclient/aodhclient-1.0.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/argh/Manifest b/dev-python/argh/Manifest
index dcf398eeceb6..1384e8d37c82 100644
--- a/dev-python/argh/Manifest
+++ b/dev-python/argh/Manifest
@@ -1,4 +1,4 @@
 DIST argh-0.26.2.tar.gz 32913 BLAKE2B 315dc36c4a98cb4a8fdab68a30ed3d4d87d1565717722ed496255d8b1b4e505277032217da4c5d750f210974890d8094c52f920044173ff2168adf7cb7f6a2bd SHA512 90382900d5cec9629dacb4459a2c9491d1425b66fa3f90d7cbf511dec846a99dbb9424f3e08f0c006da48fbf9c067078705be70b314700541fd800630e4b1707
-EBUILD argh-0.26.2-r1.ebuild 689 BLAKE2B 774dd598de78d4a16e6f3b45c97373b9fd275fa2f4648182415c627a68a2479e04e606c373cf08d3f292adfe57187d03e5f655f5c7be0ac09f7a96acf9d262f8 SHA512 e329bb664be3f574f1163802ea4f860c3e3a8a48545520c4ab6a478cf830199410abe8a38a1478b6f8898beb11891293a37fb970d551a98c4dbd1d784391704f
+EBUILD argh-0.26.2-r1.ebuild 688 BLAKE2B fd537a7d09cac86674ee61abb6e34397ff5008adfac81d0ed9cbc99270875f133a1f5ef667c2ab88159985e8a760cd6171f8a8ab91b8f3bd4ba75b33bf721d91 SHA512 66d52452a2ba1d5c5f4e89a1daf723897c12e35d86575c42f501634bc5662bffafbedcf135297e2b27c6dff9cf6eba048c8a5a85d3c39ac13c607d1f87523c20
 EBUILD argh-0.26.2.ebuild 683 BLAKE2B 43746e1b54becfd3abc7122ecab1177976dc702cc05699a0cad7951729722f791724127a9d43deaab6ac5f0dc7ff80aaef4d98cef9e82e1b79d38c3ece2ad5ea SHA512 fa139347f6d7f712f7f7460e7869f28b20ad8d2cd9ff1824cc05420a9ffd9a28044f81d3f302b15e8df3b7e33111859f2b4b429579db68ee396cb5a7b6c87ca5
 MISC metadata.xml 307 BLAKE2B 172ad4318c81373d000c3138ea3efd86183f1b17fbbdbb793a99aa43732c85ebbaa90235096835ca07a70db115fad09debf1f9ca3c5a46f6f01b6273b4e04d5a SHA512 6236f4f54de93e831341d268725741e3a46e4a4cd815ead1d5751ab551ec06fd58acb410d2cff973c992d564b69f21e6e56168ad567fe3e7c810eca5c2a83712
diff --git a/dev-python/argh/argh-0.26.2-r1.ebuild b/dev-python/argh/argh-0.26.2-r1.ebuild
index 409a529b632a..4dfb79dc0f6f 100644
--- a/dev-python/argh/argh-0.26.2-r1.ebuild
+++ b/dev-python/argh/argh-0.26.2-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://pythonhosted.org/argh/"
 SRC_URI="mirror://pypi/a/${PN}/${P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~x86"
 LICENSE="LGPL-3"
 IUSE="test"
 
diff --git a/dev-python/args/Manifest b/dev-python/args/Manifest
index a2c44eba6bbb..ad05e2b0d2a3 100644
--- a/dev-python/args/Manifest
+++ b/dev-python/args/Manifest
@@ -1,3 +1,3 @@
 DIST args-0.1.0.tar.gz 3048 BLAKE2B 4f31ec64f740640c9c927585ae35877654eb99beb5f0673ce8561ee093efd8b69eb5cb0c08a304c2319a38496935b62286f8bb9b2f1dca7c9447671ab0e3732f SHA512 664d33386af2ac0b9d30344db5fb5cea4210f600df28708ada19266afec237d6e6d9d57f03c8b64cfdbb6a17eff05f633a2cc4ddbfedc320dd133be246aee033
-EBUILD args-0.1.0.ebuild 439 BLAKE2B 1ca66860e2f47766be0e6b276235e6b797b4d84f476ef114416773cea59f8d71bbf5a1ce9ba1a0d9380c494d3f7e95279a6db882af118d6f78f2dfdca146c870 SHA512 719bc77044aaefb73d71015e416b9083f024fcb3ea7051cacbbcf7993f6c6942f730d3dd249d50919b03585d1dd20b76879289a749fb2158c6d145c9551bd2c0
+EBUILD args-0.1.0.ebuild 438 BLAKE2B ac6c831f1b7409fd8d5498d87795254b530772b32f8f94963e9e1af9826e4c6f397e69240d01b7b388c9a2ee717e60f64b249b18afef740b1286adf1bfe94d21 SHA512 8d2b3642fae0aa376fb514101f24571ed9702d4e764455a4861cb020efdbc17d0bdf4d08c1c15156fb3026b2a98bf84752db4299c0b0405eaf9510a6ed14396e
 MISC metadata.xml 263 BLAKE2B 7f205bb99d5cbf7bc3ffeea336f6c58b17dff256c0b7e1dbd4571e2d9aaaaca0809bf1e526c2d1e3e307bb78fe6a287883b59e809cc19a302ba1d9d8a2da8d54 SHA512 68e530dcdeed8175dcc8efcfebaaa7a397e7f0225ef945490ed249a62f0006054863759dda2001db41d0ba195da00e960c505fc37cf6759e2ea8f658d0f55125
diff --git a/dev-python/args/args-0.1.0.ebuild b/dev-python/args/args-0.1.0.ebuild
index f6305894d7f3..a3def6c40813 100644
--- a/dev-python/args/args-0.1.0.ebuild
+++ b/dev-python/args/args-0.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/asn1crypto/Manifest b/dev-python/asn1crypto/Manifest
index 57bc2092afc2..c0f60a3c796e 100644
--- a/dev-python/asn1crypto/Manifest
+++ b/dev-python/asn1crypto/Manifest
@@ -1,5 +1,5 @@
 DIST asn1crypto-0.22.0.tar.gz 84508 BLAKE2B 5f21e13e6af0f5edf6f79454654e677182e2ae06a36d3f86a641e76e5043f8818fd17dbce40a8b0c4070a254fdd169a3eada99434f3b9e4097d4c106a774c30c SHA512 fdc98f71ec3b744e69a75909b5b0a8381fb82d448941a6e1059823af47ca107218e1dbe6ff192e2173f11fc2454be1afcd387d801dc8e716451179857d71f8b8
 DIST asn1crypto-0.24.0.gh.tar.gz 641322 BLAKE2B eb30afd0d2579f44ee4f556139357dc7622691bdc2067df913a4412cd3dca8372b85d84e3a3cbef6ba83648bf4ef55d7e8614992e2abb019301c92d24b15a926 SHA512 426cc380903b4dd7aadd7b831e3a11ee3442c961a33b856d4aa8d9060e829f2e0ad905a60c4d6504569718fe2cee01d9be31628c89ef030bc34281e381c898e8
 EBUILD asn1crypto-0.22.0.ebuild 610 BLAKE2B 562ffe89a03cd014c14fc4dc9bfc453fd24a3a5fc910fad1a70cabbcac24445211bc1b6eaeef8211642c58ba820308dd9396e820fd9905d80cd02549669fef54 SHA512 c99ccbc6fd5f5b4d6c0c87d4332580e0190de21789cb82b99eda16a9a741beb5d37e6489a469fd46bff693bc1313822cc1a4e2281d99bcc509534a70f6752f64
-EBUILD asn1crypto-0.24.0.ebuild 740 BLAKE2B 51ad6cd69f37a288f4f57e72631916cffe570519b2b0e0cdf69f1574c5c2f904262e8035282d626dae1f8a60b518468f5264587c5396d83abf76492fbb59e5d9 SHA512 f14b1fa68cfa4854c71e697639cb3e10ca15b9480dca3fabff246319847d6b44be22f3b627d067c31edd04c065c4dcae30d43dfcb1da56441bc2fb0ad79cbe77
+EBUILD asn1crypto-0.24.0.ebuild 747 BLAKE2B b7a08e7b15d648696d79a537b2d0243fac0210ae004a974509e0eff62e1ce26cf9b08bfe3892bc6b18eb3e3820647e286ec89052da986dbe9407c294ef0abb20 SHA512 495ad0b3e7dbb21fd4168cb19cace3aa51cb44fde0eb7101a4f600349fcbda89eaf93ed58e2a0ee4b2177f5cb5d111182bb91b88cebaa145f361fc6ad805ca9a
 MISC metadata.xml 384 BLAKE2B 6dbfdd39bb24b2df61454716e308605ae1d35c3babd01f16556bbbab240e425434315cb2b80a2c3e8e9b18b237899b5fb96566a7ffefde2af3af1dcc2e08362b SHA512 c2806f846608bdd0720b589494e13f57ab2d64026747f2b13f412c9a0e9d2bef6b16fc357e4d16b74ad7a2a2af8daa5e28d0b6bfe4d2141ce68881c724fd24c7
diff --git a/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild b/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild
index 1e78322804bb..7447491c7a35 100644
--- a/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild
+++ b/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/wbond/asn1crypto/archive/${PV}.tar.gz -> ${P}.gh.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x64-solaris"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/atomicwrites/Manifest b/dev-python/atomicwrites/Manifest
index 4186471b5834..cd1577d527c9 100644
--- a/dev-python/atomicwrites/Manifest
+++ b/dev-python/atomicwrites/Manifest
@@ -3,5 +3,5 @@ DIST atomicwrites-0.1.9.tar.gz 14475 BLAKE2B 68d69493b892e1c02a71ebaaf4a73919181
 DIST atomicwrites-1.1.5.tar.gz 18951 BLAKE2B b0932995aae3ca23c11aace182429f4888819ea542a12b59d5b7ed4621c4759285d0cba306437bd1ce35b1ba32eac8ae6afc6548f2bae61870dbf03927c4fe75 SHA512 4de8ab93dcb226c55e8ae1b0ef883c2e1eeae50ac6596afe036ca51dbf6b094c13dbf2d792972312d4c53551886aaa2713aac54bfab42b85abef4d1146e039ac
 EBUILD atomicwrites-0.1.8.ebuild 430 BLAKE2B c6c424f1ec9a05b798a852b752a5abbcf64ff592db7fa435d18c80436adf124349760fdcbc94b5a51e380e01485aa7787e957453a1f431c95a76c3ff3f152faf SHA512 a08b5e18d5a6f1b4bb3bb2dbf75673928785374ea258e760c5e621a197d650ba7c3c84ec08eb861adaa333e3853b777f39f228184c5eaecea09e1e95211bf9cb
 EBUILD atomicwrites-0.1.9.ebuild 430 BLAKE2B 50f43c7dfa4a9daa18b13c66bdd8f74815e749fa52ae7373effbc0847f397691b16d9c8023c71684e56b6a9a6dac5a27406e145e09c813abba68729fb6f585e6 SHA512 5e3651c03d05495bf92900f4d56327ba464266bae929b8cfbfb39d5734dcd0eaa699314b26bc5e428d6e993f349509c05d5d4c109d39f11ed7cbc6dba7085445
-EBUILD atomicwrites-1.1.5-r2.ebuild 572 BLAKE2B 144a818fccb27924cf71f083b9f2a1e75f3e4dea75add36eb0a07d64d40f1270f3cc883f116cca71effd82793e34d534ab73cb9699ef27e69dad675d995f68c3 SHA512 0c1fdc7d46767e7718f7620578dce0fffda3552bd9114366afb9e0921d598a8c3a47aa333b42ef08e45d8bfead54187ac217e6e8d6c6cfe0a247705ac54fb305
+EBUILD atomicwrites-1.1.5-r2.ebuild 571 BLAKE2B 757553e486c6c83ac380c706ab793e1f9d6a639c72d99701106b5f00e38f2600c90a05376400bc4d85220bca3802f7c5386a54e4d34d6916a7b4c9bd4847f76e SHA512 8b464fbf29b83a168ba0e4db734c01202229fa916ca5ed3b1ebf7bb8f92572a6eb3b5cbee44e03ae7faa531b88c851cba9066da6d9e3bdfd8aadbe1550cc445d
 MISC metadata.xml 361 BLAKE2B 6da7694cc6f2418e0cc27b713e2bd0dc96c50177b3c57b9f6b1fbe3c329ced0e995406086077e9303bad0ccef4a33c4fae06b3ce82dc954f0fc2d2c303aebf83 SHA512 133ca39503eb471d6391e849430c41ab9ca2ae66c367f8843b221ea2e5535967ca4a09cf94364558f65d61f8a6ffd43a98af0f8a70f4c46a46936b83a0d18f59
diff --git a/dev-python/atomicwrites/atomicwrites-1.1.5-r2.ebuild b/dev-python/atomicwrites/atomicwrites-1.1.5-r2.ebuild
index 6c3d46816bcf..e965e08ed393 100644
--- a/dev-python/atomicwrites/atomicwrites-1.1.5-r2.ebuild
+++ b/dev-python/atomicwrites/atomicwrites-1.1.5-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/bcrypt/Manifest b/dev-python/bcrypt/Manifest
index 743559ebb353..829b5e0e2d28 100644
--- a/dev-python/bcrypt/Manifest
+++ b/dev-python/bcrypt/Manifest
@@ -1,5 +1,5 @@
 DIST bcrypt-3.1.3.tar.gz 40806 BLAKE2B 60b42bd4326ae1285911a79eff43f871366d6db8f1c2eb102f4f4cd3e91d29e58d30906b542d6f04ec0608dd5583550c0c9ddb795d8fd05cd1802396535ba59b SHA512 1fe80a156cd3707c27d4d3b6495caede3404acfdcd238d0461fdd83249601a0b0f2945e0f531dd4422f19e9cd47107245d8e40eb8b47b78e5c679e7e6b37a92c
 DIST bcrypt-3.1.4.tar.gz 42575 BLAKE2B c4521ecfa55e5b857e35c9d9e402b8e911b2546bdb349a4e87f31e6af0a2686ebc9df4fc6268534c65d3bca8facfa2e8ccd549174f8f91a25002e94ba7fb9be4 SHA512 885dadec10aa9c5944a68e73ebc3ba409d41517850fad1bcb61321a8ce4072b95422472b9f7ca76508e9b0d24a86e19f3e415a0713f0a1921b9d3f796089ae71
-EBUILD bcrypt-3.1.3.ebuild 878 BLAKE2B 2369aa4715baa2b08ebbf762ee9d22fecfccb2cfae280b1b475af9b964bf7f4797539f0e55c6c90ada76e49e731355b0fea7975f4c22c0b2bab48293f104db3d SHA512 6a1d9208106248a4fd594bbf0a70826c752ed890428a75816a34cb68859ec59c8827b85e16c976b59d60e88ca81d2cb1a328285e8a6d20ce8f0a317bc4af844c
-EBUILD bcrypt-3.1.4.ebuild 897 BLAKE2B b552235f3e2ccc7c5cced2e9dfa99f56c942f55380104ba40a0a4476646e58fc0ed7b3fa73ca862df30325eb15f04811e6aa23ce6032aff6fc599115b875c896 SHA512 e81e0fed9c8e362c70d87358dd933ee8af3a83f45268e2c7d0aa46423cf4dbdfce1a5814f458e7d1522d125da6433d208851a3270dbaadac938924dcf936e144
+EBUILD bcrypt-3.1.3.ebuild 1020 BLAKE2B 7dafd441c0a89ed311852f5481fd4932163ecb87d5ce2d1a2289ab013e16e9b961b1786070882b4189edaeb1132956200dcd5f75d9d0dafb62f2649b15f04761 SHA512 c625fb61aac780e10cf5b1bf9a18131e8a61dbc1b3d5a8b6cb4aa2a4efaa27a66ab9afc0cb39c596cfbff32b7b22fd0c646e0ba70724a39e4979aaf56cd89523
+EBUILD bcrypt-3.1.4.ebuild 1037 BLAKE2B 47f81f2316aec510abc3f780890fdd2b848d80e165dc3cd798e062c631d5166c2b271f3ed3abfab4f1db9236fc59f5573f4b59e1f0e096adb3d501464733079d SHA512 dd29bf498cdb76ad3a309506f5e70e3abec64b7953527ac9f79876b84fc928b61a293a6f7a025763afa287c1eaab81dfc9b45c651aae0172b139d282f7ec830a
 MISC metadata.xml 485 BLAKE2B 789fde3cb8c29c27778293f22f9e3a4453b743d52f5fab1dd2db6d940e4e1bff843d6ccdb4f7374b456b2cd4f80877f453205bb9a5eeee9f6e32382297ab967b SHA512 3b4fb489f9d1ecdee3dedc58dda61aa86c6bc30f29aba50de6dc4faa499276d83fe15518088e4d0e76c98ca30188b2f1b921807821fc73b5dfc592490e6fdb46
diff --git a/dev-python/bcrypt/bcrypt-3.1.3.ebuild b/dev-python/bcrypt/bcrypt-3.1.3.ebuild
index a38a5b2cd51d..ba02d5479193 100644
--- a/dev-python/bcrypt/bcrypt-3.1.3.ebuild
+++ b/dev-python/bcrypt/bcrypt-3.1.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~amd64-fbsd ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
 IUSE="test"
 
 COMMON_DEPEND="
diff --git a/dev-python/bcrypt/bcrypt-3.1.4.ebuild b/dev-python/bcrypt/bcrypt-3.1.4.ebuild
index 3877ad3752d6..4e5976fdc3be 100644
--- a/dev-python/bcrypt/bcrypt-3.1.4.ebuild
+++ b/dev-python/bcrypt/bcrypt-3.1.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~amd64-fbsd ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
 IUSE="test"
 
 COMMON_DEPEND="
diff --git a/dev-python/cached-property/Manifest b/dev-python/cached-property/Manifest
index f4e5a935297b..6bf98c5f9db5 100644
--- a/dev-python/cached-property/Manifest
+++ b/dev-python/cached-property/Manifest
@@ -5,5 +5,5 @@ DIST cached-property-1.3.1.tar.gz 9648 BLAKE2B 154208108cfbec914519f2a08ecc6ad02
 EBUILD cached-property-0.1.5.ebuild 591 BLAKE2B b122a31a43bae62ca9eb7fce6abdb40cd916ecb295c421a1b53cb1017cf35e9f19b9394142ebd83dcd074b46498e474a77f6ce30c983c5c6670dd7e671843bdb SHA512 eaf5d64c5842b120f8b5442ac4efbc0d089edadc591983e4d28029c45f50149f75615b450e01129ef896ad2e377e2facb010e93a162a01e6e0ba675444637b98
 EBUILD cached-property-1.0.0.ebuild 591 BLAKE2B b122a31a43bae62ca9eb7fce6abdb40cd916ecb295c421a1b53cb1017cf35e9f19b9394142ebd83dcd074b46498e474a77f6ce30c983c5c6670dd7e671843bdb SHA512 eaf5d64c5842b120f8b5442ac4efbc0d089edadc591983e4d28029c45f50149f75615b450e01129ef896ad2e377e2facb010e93a162a01e6e0ba675444637b98
 EBUILD cached-property-1.2.0.ebuild 591 BLAKE2B b122a31a43bae62ca9eb7fce6abdb40cd916ecb295c421a1b53cb1017cf35e9f19b9394142ebd83dcd074b46498e474a77f6ce30c983c5c6670dd7e671843bdb SHA512 eaf5d64c5842b120f8b5442ac4efbc0d089edadc591983e4d28029c45f50149f75615b450e01129ef896ad2e377e2facb010e93a162a01e6e0ba675444637b98
-EBUILD cached-property-1.3.1.ebuild 626 BLAKE2B b861c6c4b18b5ef56359df1b09c283b2f5a60b05217829233b41c11c3ede823e2d8ef7a3ad72e0c2fab70f2e44f8d546524f61e64f7eda78d6006098b4e24f6d SHA512 690af4b5aa5a8c0a0e4e516bf4ce983f7ccf28847f22d7f45f97e287ff657661672268573ae9702da6c429bfe3b8c0aee9a30c0c1bdadfff3eb9854ded2df6ff
+EBUILD cached-property-1.3.1.ebuild 625 BLAKE2B d05f358db313bb62e8e6af7733fbeb9bb378db4ebe34be8d2c44da08147aed09567c8dea352c93ee3a94ca6ac52733b19c5ddfaa119795d9f515c1b9a0972093 SHA512 8b408e180af71d702e053ee0e56327eeae8843ca3b75e15b71d41997a428ce63c59f04e74e59edd93f4898e99280f39dd5f37ef1c64ae8e30d33404a22802547
 MISC metadata.xml 489 BLAKE2B 36f59b8764462acd2920868cc5b5c84e27cf2e86b1356a76a816ec60a5f69bda780a62a811aefe06639827bdc3257128cded2d6c2e53e8c4516af9d1b9769879 SHA512 cecc6d43fcd54d1a949a60380d91a313d0464e0858be0fd544a76232f04961eca2530ebddaf6daabc5f050bdfe12092c99028c4a9cd33a14f23c0b43befe7def
diff --git a/dev-python/cached-property/cached-property-1.3.1.ebuild b/dev-python/cached-property/cached-property-1.3.1.ebuild
index e4264f287693..34c9ffcc1114 100644
--- a/dev-python/cached-property/cached-property-1.3.1.ebuild
+++ b/dev-python/cached-property/cached-property-1.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 
 DEPEND="test? (
diff --git a/dev-python/castellan/Manifest b/dev-python/castellan/Manifest
index 32d889c858fe..e950b4d58194 100644
--- a/dev-python/castellan/Manifest
+++ b/dev-python/castellan/Manifest
@@ -1,5 +1,5 @@
 DIST castellan-0.12.2.tar.gz 50938 BLAKE2B 03cec0cd85042c482432bef7a0115413a9ea03aab05555dc1d4a65b5cb9893b57e2164a5174fb984c8ffcd190b27f9c26552dc242f9d79e3d60dce5a4a27479e SHA512 11ed1eb7fa1e5721f26afe23299ac7b0d13b4570b1f0670f4b13ac05149bdb9b9daa85cd1b29374f7d67eaa22957088b2f42313e23d8c0adf4edef108f7b44d9
 DIST castellan-0.17.0.tar.gz 61193 BLAKE2B 91f9a4d6b495bd4bb8f1f00a9b2435a892a7ea2f6f64d36423aee3c87250deda73cdcb2070e12cb1c38c5ca716c4365d489990e7b07f35fa7e6e597eda442af7 SHA512 21b702cf73cf62456d677d01706f23e9d64c726d06d867d61559b0b221e016f519c067c1f10e540fb25bb73841ef633b7b4a602ed13ae64456aaa4843ee19c53
 EBUILD castellan-0.12.2.ebuild 1437 BLAKE2B a4259d9f6405ebad390042c67b437d3dd156dbe28d07eb37dc3e5d2c9551e5395c8782cc33ef23f9846caf1c55ecceb1471f953277c7d62e88c3c97b59101654 SHA512 2c6d7918c1e5987d9df0e777c0a98aceae41cf05c10854e4e32bcff25fb2b8ce7bf1ff54c112b8612225390e33e6e0af9e0dc2def7a29d7500046536c7393a2c
-EBUILD castellan-0.17.0.ebuild 1291 BLAKE2B fb199e71b3651d85a33831c74d888b57d001720f0bf2aeb72355931f7b84be57ffaf48ed0f27a3009fcea67737953f7c55369a4c74fd773a51644d6f81ececcd SHA512 74fc3aaf6df1ccd99381cfdcce73b715105dbf4b54b2884fb479509b51807e55e226e73a2b46d3117023dfc0bbb5912fa8122a31c938c1aa551855b3033a153f
+EBUILD castellan-0.17.0.ebuild 1289 BLAKE2B 213d2fd11146b302b7e7ae2331b783e3a30d91eb5e24a6ee5615dadd987ae79882c921f0710feae91ce4891fc7cc800264c92af74c3a1dead7b9dd14d529834b SHA512 1f13d975303af5823f40180a87b5924eea430cce7548212603aa899f8689c6dfff36e90291be062dfcb71d5e07ebcb78d1697b79eee145723c52e9d2809cd5d3
 MISC metadata.xml 326 BLAKE2B 5ce95fc1eeafa570c9910dd492a822dfeb251bb98c5b341281ee99e7402be32234fc38bbca1b7ea0fbb67f8bc88e9b1a1c85da73f79d2a9ffc3a69289da507b4 SHA512 f8d928ab94ac70a7a3c2548b67a6296b8e86b5e239a9c74cc4b1a120f64c1e2e2084612b025e26fa3c02099f543ce156e5419a5f6ea165eff79b2dd77e9a2d66
diff --git a/dev-python/castellan/castellan-0.17.0.ebuild b/dev-python/castellan/castellan-0.17.0.ebuild
index 8f408674d4b7..b741ec8ac689 100644
--- a/dev-python/castellan/castellan-0.17.0.ebuild
+++ b/dev-python/castellan/castellan-0.17.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-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/cffi/Manifest b/dev-python/cffi/Manifest
index 737ab608dde0..3a9d2cc9ca1d 100644
--- a/dev-python/cffi/Manifest
+++ b/dev-python/cffi/Manifest
@@ -2,6 +2,6 @@ DIST cffi-1.11.2.tar.gz 435142 BLAKE2B ba90cc377261a75557cef626f1c6b8c0c625c6721
 DIST cffi-1.11.4.tar.gz 436857 BLAKE2B 46b5d1adf4aca2a75ea02ba01ae934821d0e864accd9c355745a681d11a08ed34c33c473204c78ecb2113b2d59fbc762ca0607ff92f6cd2dc411907844bbdaf3 SHA512 184572ab8c1f7a72f00084c23894efe1691aa20f9e822a3f7184ebbed16e757586ac47e7f1d12dd7b14b4322bf5b88e35465dc3bc8b0caf0dc8e2b626a52615e
 DIST cffi-1.9.1.tar.gz 407108 BLAKE2B f95e99cbb7a10aacb714d6ddbe85755e24d4fbdebb9ada0ab87c95b58aa56b364df612fbdfbf6fcc3a9dfff6e96fe5e979ee37b1c6c9b62b6ba8d3a9565def2f SHA512 6e76f181b6b7b760a14ad70338edd104a8b8e2eac5680e336d3868e0bd031a1665608e29a65dc0c56806afb8a8c03811586f151f3acef11e54e60c1bfcf902e3
 EBUILD cffi-1.11.2.ebuild 1480 BLAKE2B c23becdeea76e177e8dbe0477e912c530bb681b135b21d589de0572da460954b9af97af8c241ca690d155a9d1926ccbcd1d00d86769cd995929d20cd0b14b2c7 SHA512 53a7ffd66b39c0913db5fb8a1d299964311243282a0adb95b3a909fa1875777d5a4d0fa730805a1f488a157f27083f6221884662ed6e57d6772e752421a62b5c
-EBUILD cffi-1.11.4.ebuild 1492 BLAKE2B efc8cb5c599305bdcf683d2ab18e715f6ec7cd624548b84298e0c2a5f5a47156a13de3584d4d10599e2398a61d5612fd015b3a42b512095943ad3587213990fc SHA512 24f29ff92cda1aac7266dec44fa7092dd39ab0d81fa0fa1af0cfea4af7d7e45369f23ce5bb7c927313665a32034c61cfb9db013356d1d9076719450f168801a7
+EBUILD cffi-1.11.4.ebuild 1482 BLAKE2B b437c55679f408426fd35d4eff523c5e854a3e50c0f7de79fb1e25907e0959d1feeb4419479c54c3b9ba0faa6e94df28e504d1c342a50a0d87926525b6984a32 SHA512 a77dff12f1838f8b18ce1c2e6c6ce321b4f0f73b3e08b937417056901386b92593d92598484e341e584499b9f099623cf17147a6c846c7298b870179a7bd8af3
 EBUILD cffi-1.9.1.ebuild 1470 BLAKE2B 9205a47a11f98db74678be1a1db8037bafdac399ccd90a9ec20b347a39ac69ef486b53adfb72e9482bca0922ff06cc4a85d23e251600c9ab34bf18d0b815563d SHA512 54dce8ee5a318e032fe01e6e47682674a7f9c0f5d04f56e96ffd028902d19e2bceecef123cfca68f3c0048ca40193fc49ebaac555ada72847642331d85ccd7c3
 MISC metadata.xml 317 BLAKE2B b6416209bd2358c42c2be3bd228238b401bf126919b6e7371d83d7cec8cb55a40f89db562701cc8f3dfa904e225426881b22ff1d3b72085365b5caf9b8c6a403 SHA512 0744ca7b98b2ebe2985bf2a81a337d09be62cfaa51f8380bac52f8d30941e997f09be20e28caf6967226a71369003cf35977790aba56ed0d469cc490cfa089b6
diff --git a/dev-python/cffi/cffi-1.11.4.ebuild b/dev-python/cffi/cffi-1.11.4.ebuild
index c8e28a30f4cc..ec59ddce570b 100644
--- a/dev-python/cffi/cffi-1.11.4.ebuild
+++ b/dev-python/cffi/cffi-1.11.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~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"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/cliff/Manifest b/dev-python/cliff/Manifest
index ba8fe829025e..8406a5488fd5 100644
--- a/dev-python/cliff/Manifest
+++ b/dev-python/cliff/Manifest
@@ -1,5 +1,5 @@
 DIST cliff-2.11.0.tar.gz 77037 BLAKE2B a38f37574f1802a2724143f35cc1d1159d8165f75f4c9e582e726cfdc9090814635d99b073a5d8df3a3e3b3d57b79e4e383c0569bd6769325d81af69384e9946 SHA512 0f29431b30610f0c781c9eddac57724043b6d7c05bc82f0ec3027a68230222f18f78ffc1d82dbd8ff4b5408b255b27879bbc1266e8641b4bc1c871f029f6cba2
 DIST cliff-2.8.0.tar.gz 71815 BLAKE2B d73d467a1e2e06e5f45e7fce766d6c8daf79d9a882692c0e77049427bb6de629409a282c8c554ba92c62a9c8fd44e0b19cd3cd93b9b3f1f2b8091a1e917a25b8 SHA512 a371916945ee71ec519aeb923ca44b0a0e10fe6e460d236434c5c2946ad2b517050bf9d0430bdde506bdf2d28ba60bd45941d9ce21d77a83e2d5541b088d04b3
-EBUILD cliff-2.11.0.ebuild 1794 BLAKE2B 4762b3ec99c3f8b1faf511f24911a5d2235f5c3a7145dccd170cdf0b8e6552bb88e4f14c5c6e6ee240e2df6f9ced4cddf1e6e4438f9d166eecb301d03aff3f64 SHA512 96f5671663c1081839d0495b7df119bbea640afb5562cb6c21188c927d9f972b0c5174a44a826dbff0865bb51770fafccb5b8884a4a3cbd2f058cb1b090fcb78
+EBUILD cliff-2.11.0.ebuild 1792 BLAKE2B bb7681de97dca176d57102544bc1fa0dcc2071a34c012ced494cc1443f7cea3feb19abc816c0da47894076ed87dea6b0bb7828a95d3428d9086051419ad009b5 SHA512 9ba5a9c5bcf077dee7e2b2fa8782d5fad6a4da4589933f9cca28d7848faacf3e5333029e5ec52f53160a5ce01db411cedf86e17d97549171509d50af30c033a5
 EBUILD cliff-2.8.0.ebuild 1803 BLAKE2B 1c356b186cd61f0b64ec018b9b798832541d967bc78335e6ac8c1bb80b20656bcc7d05c4c6bc62d4262ecd2efce17e1ca0db2329fd748919b78d33ad72edeb86 SHA512 714dcf939b7044a111e7e40fd8efa141907ea852d4f763ebc4b39fd4bb792445d078f85132ede9171d237af386025c5743236fdb0d19daa3a59a70a17fc15001
 MISC metadata.xml 709 BLAKE2B 05e69832a5cff97a52caebc4c113a39342e62803fd523a753a8ba119f4326a9814c7c382e88906514e539922c1f22683a09dd46b2c11e3d60b8f885072a08e72 SHA512 f031fa34d06b4c12c8eba5a046c07f1e391fd84bd29d6a4ca8c769c2d774262d66d7bac12d05cb8ef669db7e2713d6862b6a118e9f9ca810e9ae0fa9fb881892
diff --git a/dev-python/cliff/cliff-2.11.0.ebuild b/dev-python/cliff/cliff-2.11.0.ebuild
index 0d69f56ea359..74b55bdf26dd 100644
--- a/dev-python/cliff/cliff-2.11.0.ebuild
+++ b/dev-python/cliff/cliff-2.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="doc test"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/clint/Manifest b/dev-python/clint/Manifest
index 44dcf52a9294..64c2a34e9d9e 100644
--- a/dev-python/clint/Manifest
+++ b/dev-python/clint/Manifest
@@ -1,3 +1,3 @@
 DIST clint-0.5.1.tar.gz 81140 BLAKE2B 5b42e7d46321f0416d3ffb51edf66c53476d3e4a211e971f36cab54a412f6b0f0ec26486c2b95871956ab09e7e4adf68e8329dd7e9e3c7ed1adb3f8a0dd2a728 SHA512 3ad8bfc587acb1322c7d7c3e73756a07c98f3b4215a3d4dc409b5a2067bc70dce2dd98d19250b8122b319b7bcf5e2859251de2829780345de06f93b35447c4e8
-EBUILD clint-0.5.1.ebuild 954 BLAKE2B cfbb7b8501bbe4413b73110459fe0a72cb1c4cc5c92e9a3f62e8c7d01e853160145a9735729b68d9c989a68d1f06767228e0d5aced0e96aaff58ead648dfabe6 SHA512 53543c3dde301dd7e707525b412398a526db53306aa9c175746075aa039181c3e5e1fd43679e66a7b6899b5dc361cddfe08704909c314ff15266493f6d3ca1c4
+EBUILD clint-0.5.1.ebuild 953 BLAKE2B 0ef52583a238e73f5026a6feb21918830597ddfc1c7593d15667a742219679f28b8bc09ed34f64d7629c4402dc33820fa449aab6b0b50a43b659393883d3d48a SHA512 ba012d77cc1fceebf281c0d641da81f17b2678c7fc1aab6e0a804298f3fdfa9e65d0a87a2dd181c3d1b03d32206506bbbae9b4f7e2d2a79b5e86bbc749232d90
 MISC metadata.xml 222 BLAKE2B e38fd6b3adcc5736d84eccc152fae308171324da8a845eacd6b5e5d0b4d18cf1ccc5436bb66f26dc3eb0cf5e4eb03549f52b23a51403d8677713c2295f773f0b SHA512 714a5bebab34700e6110a052f7b6a094ca2532c6b860d7a707e645c75da1c2c7710aab5f9e9fdd4a5c189a92c115dc27e9fec70baaaa3769550c4a0218aa1c94
diff --git a/dev-python/clint/clint-0.5.1.ebuild b/dev-python/clint/clint-0.5.1.ebuild
index 31d0ad0583a3..9140d667e9f7 100644
--- a/dev-python/clint/clint-0.5.1.ebuild
+++ b/dev-python/clint/clint-0.5.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/kennethreitz/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ~x86"
 IUSE="doc examples test"
 
 DEPEND="
diff --git a/dev-python/cmd2/Manifest b/dev-python/cmd2/Manifest
index d0fa355b3115..660824388afe 100644
--- a/dev-python/cmd2/Manifest
+++ b/dev-python/cmd2/Manifest
@@ -1,5 +1,5 @@
 DIST cmd2-0.7.5.tar.gz 64939 BLAKE2B 57c8d3f4c7c94e8e2627fb5d2cf8c164da72c531808a53118f950ee79fcc2e0f431621ffbd74d275bf508c8646ded761d2d38c2b99570fdadbbaddf095e422a1 SHA512 14376ee283ac1c153ab0194a5dfa168eca36174783322ff72e190ed96b8c315518fef4f3ef09d77633851cb53b32f71fe380042ee3c0ef8ef2cbdfa16dabf704
 DIST cmd2-0.7.9.tar.gz 71298 BLAKE2B d1623e2d6a7ac66058b5a43a9688ba850962fa7b5659c3287a9aef9a7deb16338d71a2c07ef15ec72ee5e62aae0ce3cdf2f202d0d423040b734dee059f1d4876 SHA512 39086794ea57cdfdc7388aaa485770f1a76457bf2b2f58cd4703dc0c082f58a8343aa777304e833133040fdab8ef8451d85bc3c19721432514bb380330823abd
 EBUILD cmd2-0.7.5.ebuild 903 BLAKE2B a70910a059ed60cc5020f02cb72edd76125ec36294086ebb54d7f228ebfe1dc68b6c0497a2a398511243bf238aa58bd75a56f74617480a244845a31fad88b0fb SHA512 e99f600e4ac11649242aa8155245e109cfee733915b59edc48f76c2eb48cbc0c6649b21781760ef5f6d006418e5e1dc6c4069d6943613881533d25a63dcdbe39
-EBUILD cmd2-0.7.9.ebuild 905 BLAKE2B ab69b5a7624dc5acfaf2d134c74f8a507906cb083d572639e9b210070ecf885d1abf3a541b774e59de44b5a6f5d3f7b9065e7547787026d0f4344aaf7beb6945 SHA512 8f6c0ab8cfaad4d0ca76ca71d42a3c7201d7c82d31964b097780ac502ae80f80cc332d2d1a8bf469ccb4bf2ce4108162b9023c4a09430ee5517039fce9a3f763
+EBUILD cmd2-0.7.9.ebuild 903 BLAKE2B e3a635d611f6545fdb75eebb9075e37fc4c1c11fe4b7abb70a0c5bfe34b3d96c5d91d8b97f83561b024fd55b44784ae19cac0b61f7f7ee36d00680caa596a75b SHA512 785cb4ab291ba9e50ba8ec94a2fa651d25f30fd636d93d35098c59782f43e9f74fbcf8249f3bb8e024bde500e0f9dd9b6f76d1cc88201e27390b6de9bd6f8804
 MISC metadata.xml 665 BLAKE2B 796824fde35499ef70bd730f7e6c6ae4b239ea278f77188215ae0fc6e062598d943b0ae42ab5b378e8777c7c6a2162b330971bc00572e6dd43c663a3da677aab SHA512 64183ffbb33f229d4295e6fb34d98603d38da0241c6d1593704da866c17e04c9fe7f9500a1256b6e83c919eae019f71da93fdec7f09db99e073dbd809144b735
diff --git a/dev-python/cmd2/cmd2-0.7.9.ebuild b/dev-python/cmd2/cmd2-0.7.9.ebuild
index d988f981f34d..f5ae38965ce0 100644
--- a/dev-python/cmd2/cmd2-0.7.9.ebuild
+++ b/dev-python/cmd2/cmd2-0.7.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 # restrict tests because pyperclip is fairly unstable...
diff --git a/dev-python/constantly/Manifest b/dev-python/constantly/Manifest
index e72bd234356e..95d601b3a6ec 100644
--- a/dev-python/constantly/Manifest
+++ b/dev-python/constantly/Manifest
@@ -1,5 +1,5 @@
 DIST constantly-15.1.0.gh.tar.gz 40635 BLAKE2B d400336901f7df7b1535a0e46fe092a2542546964ea144014210e8be3807aabfe8e8370e94f426061a0c3a6257ee66a6ceb963b159717def7e047405368d910e SHA512 eeaa74552fe8e01c40566ac3c8b3d41085f800863ac516e30fe1242f40d3401e4e872279149776f29d3ba78a7a16337a794ad26230efab4dd1847d42bffa81ce
 DIST constantly-15.1.0.tar.gz 21465 BLAKE2B fc3781e521f3a9988567c437e456e2f8215b8d61115e076d4f9fc52926125540f59bad457413105422d31184506bf7fd3fa38711dae8a8057b38941f2c5584bb SHA512 ccc6f41b0bd552d2bb5346cc9d64cd7b91a59dd30e0cf66b01e82f7e0e079c01c34bc6c66b69c5fee9d2eed35ae5455258d309e66278d708d5f576ddf2e00ac3
 EBUILD constantly-15.1.0-r1.ebuild 687 BLAKE2B 6e5223196737093ee28325821c46c5f54f2f245aba7499fc3927cbe9e39486c25c7d4289aa582b69b3816c38adaaf72e8690adf8480587e7d420e1b17ae27096 SHA512 a1f73b557f1f740f8c91f13a19fdfb9932f57fa968ac9dfcb56911010c50b1980e8c7ff948bd95ae9ee34c22ac987eff739e61d5643929b34c3226456b5fd3a3
-EBUILD constantly-15.1.0.ebuild 570 BLAKE2B 42801024adf10c7662619c571265579a419ae7f713375f1e1dd5727eecfe353f835bbfa9bcae971c5abbe50565600e50f74c95dfe47f292d4201efa530ecc778 SHA512 37c40e92526797f36baf5b52517d83b1d5e4ec40770bdfc9f3524b815bf529bb426297e595c34e9e923c402e303e5ddfc7231654660fe44384b0583ffc9433d7
+EBUILD constantly-15.1.0.ebuild 569 BLAKE2B 7c0be91be5b50a95af3d8cffe6a1957351a021daaeb7fb516133c7a281199c48846e6c5e08bf681ba3bad03e5b8852e7902fceefd1abf7a01689066e7a9f3bef SHA512 f921850f9b215e08515c290e385af5f814212193201b1179bad1c390e87d958d43fc6d834bc9d3bc003fa08e08e6d3c717f524ea4681c373f23f6006882bbe05
 MISC metadata.xml 714 BLAKE2B 696bd5218dd217515c0b9d6ac7afc0da90ac2ed404120221de9b35a84621533cf1aa8d55878c722f55a59c2a36a4216a092c88efa0936e94dc980a1ed577c990 SHA512 850ed41a1f806475ac8a877f78d4c4df161a81ea47fe08df8e0fd9161f6823ca401519b8c007f06f5db182924e906ffc9ca912b72b4f2f9e66a5ad80d8f67f66
diff --git a/dev-python/constantly/constantly-15.1.0.ebuild b/dev-python/constantly/constantly-15.1.0.ebuild
index 0b2342f69bb4..8b5a8b696e16 100644
--- a/dev-python/constantly/constantly-15.1.0.ebuild
+++ b/dev-python/constantly/constantly-15.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/cryptography-vectors/Manifest b/dev-python/cryptography-vectors/Manifest
index b814179206ec..093d002332e9 100644
--- a/dev-python/cryptography-vectors/Manifest
+++ b/dev-python/cryptography-vectors/Manifest
@@ -3,5 +3,5 @@ DIST cryptography_vectors-2.0.2.tar.gz 27011827 BLAKE2B eda02ca72a4a6a608050c531
 DIST cryptography_vectors-2.1.4.tar.gz 27255711 BLAKE2B 6c842b6366d794e9986110479e2175996b344aa191345c85a5cec8c0640b7a67b157f310eca31ac8e6487739357b11a2b86b9832fc680318e754c4751414c754 SHA512 74c2c1e3924f848488a3b5abdabda1a0089ae7d070b94e65f9fa2bf2da057ad27a37e46f90de4f2c3e9f1cc96c1c179cb5dbf0f50d5166a02846923e3bceb165
 EBUILD cryptography-vectors-1.7.1.ebuild 632 BLAKE2B cf2ecbb63c20058a909c1de56572b17fb8a96fd36ee35e81ee8163422508dbdf6c31d21e317bff332bcaa00bf7b6ab42e465210019ea70a25feebd3ef2c5a030 SHA512 652b04cd22ce0aedac1904acbb292355622fbee31da765b4acc2ca7f2e8de577e196acb935eb1335459d11a9fc7367c8ed448eec76538a22ac6151f5b152b27b
 EBUILD cryptography-vectors-2.0.2.ebuild 634 BLAKE2B bd08d78ca9991391197a5924358e514cb34fc04e295f74611f7a7ea852defdf9ef3186efe13d5385f742d3850171213eb818c9f7bee9815466ba412d9a9c26fc SHA512 fd846b4ae8994bbdee8d0833f43bc6ce44efeee9036ca348ed0630256756b5766e2d6990a4b77f0a7593f333af805cd64eba73192049d59fee0042e2999fe45b
-EBUILD cryptography-vectors-2.1.4.ebuild 654 BLAKE2B caefc078fccf593db9649231cce0fbf37182e87c764088e506d135886586c584f0d5134fd8b0faf652110f47dd77981db0f741ac2769ef7f311f60c23ab9ab1f SHA512 afa71985ca08131f0bb8cbfd58bf3efa4b9d96645c953bbbdb0a0bba9a1645e996219afd598183247b00b9e98c9668a314eb19c9f79801c255249f77a15ca8ff
+EBUILD cryptography-vectors-2.1.4.ebuild 668 BLAKE2B 65573f2788820fb3de523d167f90e169aa780d45ae9e2815feba5981500352e2c974d3907ffe9e656bc7fec9b65c081f0e54826ec39d6ce1a97c650378691f09 SHA512 ceeac201063ef6cfe93db2f1576232cb8e19349329e95a7203b031c647f22b3257d16e833b8f94b99a2eca2c2748edcb193990c60d7aabefffeceda4cd65a904
 MISC metadata.xml 333 BLAKE2B 31fb9fd463281fce83ac94d33dc69e54eee748ab3a230fa26ef36f29026ce8bcaf821e69994d2d94ed3b69c24b30cc80fa0a67f100cd45327ff1bb36a91c6014 SHA512 d65176e5ea86d82a13687d70fb2f29ca046bd71526752fb3583be9b0507b124363f271d697cfe6724245d6863c5aac36e67b1e50808041c52066d66e1f8b586a
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-2.1.4.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-2.1.4.ebuild
index 8844c582287c..3b723507d7ed 100644
--- a/dev-python/cryptography-vectors/cryptography-vectors-2.1.4.ebuild
+++ b/dev-python/cryptography-vectors/cryptography-vectors-2.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-fbsd"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index 4dba93ca6851..4ef3f1a41b91 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -3,5 +3,5 @@ DIST cryptography-2.0.2.tar.gz 427303 BLAKE2B 53f891c02aa4b82b13a66a4c74bd6db9e8
 DIST cryptography-2.1.4.tar.gz 441557 BLAKE2B 66aa07930ee54469328977e27096e65b7a333b38b71828c71cb7891b489ef7af60f5e5590f67b43d5e63dc2279d9ca1ba036879f3145264f7639d65000958b50 SHA512 f749cb4384badc174a842514e5a4fee2ed01ab9c716799d8d9d5301f6d2d97b6c41deb9e425f48928b639fa34bef8c05529ed7e5b777ef5ca75c244f8fda8fd4
 EBUILD cryptography-1.7.1.ebuild 1666 BLAKE2B b474878fa899bf532dc628455180463f8068d4ce90a3d0f91f6367aef1eaa5f9dc9027496bb2ccc1c9bd9451b00ae0e713c92a4e0fe156b68ae209fb5befb14a SHA512 d30f513b2b76fb1fa100b9c9a06adf3330e66f6fcc18ca62d01dc493fa70aa6e84e6cc902e0d2d537d456c8fe8b963b25142bedd5d1185d476c032d0c50b7950
 EBUILD cryptography-2.0.2-r1.ebuild 1625 BLAKE2B 8ad8cec1c8e8d005b954afa1657cb28691f3a8718009b38834fe5eff5fd04e6827694f65ae266ef544b7ddbad2e2c4ef3d9f4cf300ca4ecd5c4eb1b479b5ec88 SHA512 5ab761262bbdae17ee75b54b5c02a295df4ee0d2b6c4a33c6371b99a20c565d0e8dd6a9cd857e474b782dec9759188b046bd354a5f65a1f9946e426fb23b4e60
-EBUILD cryptography-2.1.4.ebuild 1768 BLAKE2B 01147a65006c312dc087e723cbfbe693b2b28542df3f595f0a40be23d335c201b299d72580f924bfe557a2f71eac798f81afcb27710579d8230d9c5ddb3b7a4b SHA512 31fd755c0258aceae9926e318629c251b796afa912578e7edb7740fdf62a777be4f11146f269639c9d5758de66f7e2fa0807db65239f8fbc517cd0baa7640c6b
+EBUILD cryptography-2.1.4.ebuild 1775 BLAKE2B d06cdee6a446cbb995b7a9b44dfc9ac46c2b8871e45874620d35e02c10dbd2fdccaf626c8a66b672a88675ae17b7c83d959ad7fd2b2ed1b7f216c510006b49b9 SHA512 2c676a3518056e4dbbabe15dd77248def8408163f57166dc76315bc3a7913a13e8c826364792170a4ba398ef6427c1d02012f2d328c10d881e63671bfb7181a9
 MISC metadata.xml 384 BLAKE2B 6dbfdd39bb24b2df61454716e308605ae1d35c3babd01f16556bbbab240e425434315cb2b80a2c3e8e9b18b237899b5fb96566a7ffefde2af3af1dcc2e08362b SHA512 c2806f846608bdd0720b589494e13f57ab2d64026747f2b13f412c9a0e9d2bef6b16fc357e4d16b74ad7a2a2af8daa5e28d0b6bfe4d2141ce68881c724fd24c7
diff --git a/dev-python/cryptography/cryptography-2.1.4.ebuild b/dev-python/cryptography/cryptography-2.1.4.ebuild
index ca6ef79819a1..312a95c25ec5 100644
--- a/dev-python/cryptography/cryptography-2.1.4.ebuild
+++ b/dev-python/cryptography/cryptography-2.1.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x64-solaris"
 IUSE="libressl test"
 
 RDEPEND="
diff --git a/dev-python/cursive/Manifest b/dev-python/cursive/Manifest
index 2bb5f6e28a18..12bc5366e098 100644
--- a/dev-python/cursive/Manifest
+++ b/dev-python/cursive/Manifest
@@ -3,5 +3,5 @@ DIST cursive-0.1.2.tar.gz 18620 BLAKE2B 058a15d9fc7b0e23318da903ad25b6e3b5efec56
 DIST cursive-0.2.1.tar.gz 40334 BLAKE2B 9d90793d4cfb63ae9f4f6bbe8628a7130b3b9658f98b044f0cbb60720c70e3abe4a34773ce3e4100d4bfa9c81e25cdbd215d8752306fba13abe5e811412aacd2 SHA512 70d16d27cba944946579821e3669a17a72b2d5cc1b026427e5a09d0385e08afb7cd7ea3c3cd180d3bc8f3e7b58772e1055e193d06cb57a58e1c83d1230c62c23
 EBUILD cursive-0.1.1.ebuild 1037 BLAKE2B 7ea604c3540374b9f8b32750ed20f4b128e284a7c10aca219a7174b9c13e4d7315709169ec0eb35487213b390f04a549f213e4e45977613c493883d8fbb0f338 SHA512 0a6ee0f9e349c1c16ab65a6c404f479d64a85970f750d8a8b476b0f90186eae3c0886a0963dde41017d09e16bf82cd3dec67b9d33830b7db8057708775063942
 EBUILD cursive-0.1.2.ebuild 1085 BLAKE2B 18c9c552035717a7c0f76b6cdd0ce47a1e455bf9b7ca931a951fe7e344fe0c78712b44f4562acbff5a4943663f8c02955f7683fdac6201714702a3a95bed2824 SHA512 a39541d510d607dc00d5c4c8bd2420e8ddc77384c07e63380c7e97a246db0c054dfe867da72b0703d85faf36dd9b15c2ef320ee736d962260e61307e3ec5d32c
-EBUILD cursive-0.2.1.ebuild 1087 BLAKE2B 71bc7b904bd4b0a4c7af302833af888169d9387b5ce4a2e9fce9dd02acee9b7e5daaa8d0dd5642b350cebfe714ff12e88fe377dbb98903616b31fedeb656088a SHA512 469e070c661f46d92cc04cfba5127a23ab14bcacbbf8440c1879aaf51f7df2a7582bf442722237df22bb3ee0929fe89a3166a4a6e13865dfbf3a268143c3756e
+EBUILD cursive-0.2.1.ebuild 1085 BLAKE2B e88402f9427a0519e204d94fb6d4337fe4b024cd4959e9df536a85f7f87c8b9bd2ab1dc5799cb96ff43d4c0ad98667c1823e094ef96e6c6ecc7b42e2859da44a SHA512 f989c153e78d647fddcd4f9c1b8c7c5a5aaa52cc2b67a8cbdd33aadacadd5ff858263e39615f708a4f24802b4b2012741139144c6ca7d85549e89a39bc23f915
 MISC metadata.xml 633 BLAKE2B 7b363a0b8ced131965cfbe2616dd30d3608d3d61b1c402b1885eea0e10c379e5d82e87e15abe1d805349ad2d99b94a2c2ebc2df7e8df7a5a095a4fffdd174c52 SHA512 0ab2f1ce6ef8d6e2a53a9dad20c26a26beddb6738857e3cd360362e0c1ad1c562eca6551cc88bb8ad4a8e08f621224934a4476b1ff22aee805dfe6f1ce352c6c
diff --git a/dev-python/cursive/cursive-0.2.1.ebuild b/dev-python/cursive/cursive-0.2.1.ebuild
index 26f122ee8bb1..d3bf2016ac73 100644
--- a/dev-python/cursive/cursive-0.2.1.ebuild
+++ b/dev-python/cursive/cursive-0.2.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=""
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/debtcollector/Manifest b/dev-python/debtcollector/Manifest
index 9eeeeb37b325..30503b58eff6 100644
--- a/dev-python/debtcollector/Manifest
+++ b/dev-python/debtcollector/Manifest
@@ -3,5 +3,5 @@ DIST debtcollector-1.17.1.tar.gz 28805 BLAKE2B 25d965359ba815e182cddb2a8c82d7360
 DIST debtcollector-1.19.0.tar.gz 26176 BLAKE2B be471b8ccb8cc3df3ade1af544f6326073f65cb1a6c64a8a864ee437692508fe21d7a117f47ab9f0c8cfb74502a7cf1c68e5e9dc26d8da3cd2ac0519c93be93b SHA512 f2bd1eeb9f402853e57ef6bd31d9961acc45617c50be36192b8761454869b3b9fc7709dbd14c36be469e6dbf3532f5d75a9fb863c7ea95c276f82d06f69a2164
 EBUILD debtcollector-1.11.0.ebuild 1856 BLAKE2B a9486fc09e19b4fa0ab9b66c11bca51d03c5ef483bf82f9f79d815c157f3775009abbbc3800faff05a9782f317785281ddef17f321475e414d894bdd1170b6f2 SHA512 df6e094e314ae712d6ccf9a622f6a8141cb1aa972edc6386ce632f64e0ba368cd6477c66d24444fe71ecde640ecaa9f9fa0a79b0543e8d17e99e2c67fc0c6233
 EBUILD debtcollector-1.17.1.ebuild 1996 BLAKE2B b5c8733f2e99508878a70b62fe060c4a140961e5e75aa6124ad0e8ad036f44ff81e97b0b5d891cdff58640a5e7a5e27595498d1a3aa0256a8e07188918f8270c SHA512 f20840d293cbea4ca6c6be39d297608610776bec1f890a479fb45e651b1f2424dcf09be5a00ec03a283d275feb937b2e870e39353067e0bdf3cf5e5b3e50d8d3
-EBUILD debtcollector-1.19.0.ebuild 1870 BLAKE2B c6e42d41378e3710726192d1296bf89f7e39a83fcda5111db37324dc4182ada64929b557718a7d6eb0bd195173c5c94b3ae59a5ab9ec8c4c96b5bea501403339 SHA512 d433ec8a542f425450a9e39a089fcb8043b3bff090a7fedfd0e734c054bc6c5a37456143e175cbe6da9c0fad5bf3331a37c3edebe8cc64e7cddb2dd384f4b461
+EBUILD debtcollector-1.19.0.ebuild 1868 BLAKE2B ec8f44d764d0ebbce2bf28d2a327af0c19c0fa0b760b1345514787d1d376a5b3435525458acde7569bd3de9d8eb281eacebe3d5f45c6a52d3cd18107b6a7e74d SHA512 9bd6303d0456694510b82063f5dc9311c9e22b2d82a93d1733561f4d20744fc67e2751b0dd29e9c5b90eaa920806653fb2d672e6d4f35fa24d276bcbf2c83be5
 MISC metadata.xml 330 BLAKE2B f67815c96ec5d1c50e57e80edcf471c38482eab644d201f4f1d4afa9a44941aa26cf5151d74ab2be666514454a3cb041cb1cf31ab22b4c4efe01a4a57ab5aa75 SHA512 b7a055d8cce134695b3443f4c361636ec4b6741080671b65b47cb7823384370caefb825ab3851cd8cb4852a696d2ded714087917cb565e381aac7ce53e537268
diff --git a/dev-python/debtcollector/debtcollector-1.19.0.ebuild b/dev-python/debtcollector/debtcollector-1.19.0.ebuild
index d499f8f46a5b..2b35a185964b 100644
--- a/dev-python/debtcollector/debtcollector-1.19.0.ebuild
+++ b/dev-python/debtcollector/debtcollector-1.19.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-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/decorator/Manifest b/dev-python/decorator/Manifest
index f838eb5a8d10..565dcf9d3cb8 100644
--- a/dev-python/decorator/Manifest
+++ b/dev-python/decorator/Manifest
@@ -1,5 +1,5 @@
 DIST decorator-4.1.2.tar.gz 32325 BLAKE2B 19754506bf18f03748d61fe3cf85e13e91f5a7b4b3550cf087b1c9506fa2d10a4fb6c32914f7c2078a74ac34f5ffaf0edf8b15aa1f46d2eafa91926c40430dba SHA512 4a4b9dc39de9b3f00eae9b6829136f5d836355d3d719371440f69c33fdddf73636e9faaa8fc35829c64d5c5a61d968ea427267da944c524c22ad08b69fb6f0ff
 DIST decorator-4.2.1.tar.gz 33376 BLAKE2B 29a03fb4af1de8c60c5ba4a4b30f59f8b1aa8bbde107b9d5719cc0a084c45b58f7e14ff2046d7247c43d57717db57aea0db52dc068d73a73188a0e022c058cbb SHA512 8a6fc53f830470fe15d4bf9dfe8cea434019aa2e1734e55f873dc617138a6ba75d63ddf50a3fcd21a8f67d9d1b19c35c75149d8cee157e909aff4873093c4e0e
 EBUILD decorator-4.1.2.ebuild 790 BLAKE2B 175d5fda8f707a14fa25ffa3cdb6743a19bddf2b3bc1495394daca005037450b9c6603c85cc53425456077096ff5e92f4cd36e3377903f05b3ad1d1d74c25ca1 SHA512 629daba9c0e1c43954285eff022f5dbc3d031e00e095521ef4ad9e38c54aab6c06c5777360c3b12bd7967c05d23077b4218d5da86afd6bf12192f405adb06450
-EBUILD decorator-4.2.1.ebuild 802 BLAKE2B a3dc35e8a6bded1da4cacb4c10dd80103cf6e61ab22056454b6426fd614ff888c99707f21dfe88188607b12fc1f376ba7dc58e43fc9a2baaac7a2bb33b43b986 SHA512 ae7c4dd54567a70cf9d5ddc84ca0492ca8d2fb13105969f2c902677b9013a77c77bea27b97e486319e5094063f5766dd56d2916983054c7b01b3b41f8ed8a6c8
+EBUILD decorator-4.2.1.ebuild 790 BLAKE2B 175d5fda8f707a14fa25ffa3cdb6743a19bddf2b3bc1495394daca005037450b9c6603c85cc53425456077096ff5e92f4cd36e3377903f05b3ad1d1d74c25ca1 SHA512 629daba9c0e1c43954285eff022f5dbc3d031e00e095521ef4ad9e38c54aab6c06c5777360c3b12bd7967c05d23077b4218d5da86afd6bf12192f405adb06450
 MISC metadata.xml 665 BLAKE2B e73aef85a2fa36e50a503bb86e9eee781fc10a3cf9419afcccacb7ae282ed957027cf905e9b056865a13ead6319571ce4508029c08005762dd813ec07d7e1265 SHA512 c368940486c27fe99f5ec094929db337680227ec74dcdc6a45a173d3163a1e0cee9d6830bb2ac531c17b48cb2f32f3dd7238d666748f856b01e3ed4af77d0aac
diff --git a/dev-python/decorator/decorator-4.2.1.ebuild b/dev-python/decorator/decorator-4.2.1.ebuild
index cabace0b36c9..dc69f6e48097 100644
--- a/dev-python/decorator/decorator-4.2.1.ebuild
+++ b/dev-python/decorator/decorator-4.2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/docker-py/Manifest b/dev-python/docker-py/Manifest
index 9f5415eef68e..b426c33b8d70 100644
--- a/dev-python/docker-py/Manifest
+++ b/dev-python/docker-py/Manifest
@@ -1,7 +1,9 @@
 DIST docker-py-2.4.2.tar.gz 180890 BLAKE2B 57518a0c8481fde0198100354225cd8a2908af6d3ca2690d98ad80b386ca4c688c7ccd6a34634ce04fb5ab1553b6c0dfbc75d28333a10f28de7188fe2ee7ffde SHA512 3367066b2acd96b85bef28aef00c91d752dc25b3055575b4f2f9c0b981eb4bca81a742bc6da5f97cf039cd9c7d818e3f80101997fe3a2e2c6f3a9c42fd3111c2
 DIST docker-py-2.7.0.tar.gz 196369 BLAKE2B dd181dbf32f5afda06e748cb49f15d5fc6ff4a579c64b505308ad0d96913ddc8065d165090ec2b20e1f17a4519988a5665dd7a8c7643ca53aaa4385ceecb1341 SHA512 15cf1d8949d71e472f7636ff975cbc4c5f3e18e2d193cb603ade1397a56d0c1ec239167b71be325af99105bc36590a0f0faa1ab010f36fe8baca7807ddfa191b
 DIST docker-py-3.1.4.tar.gz 202064 BLAKE2B 6ee3672cd1f62cd570d3939805465698879d747215b8424bc4edd79253c5bc25d193582dbfa6aa423f9b183d477486d6347f65ac7245d601d3f1fe2a1fd124ed SHA512 78081010ce4027156d3b4ebafee6023f387ee8e7ee4d77ee671a16a3fcb646fca91c5c36cfbaf94157f8a524a3e1a09b9cbfabf304e278a3c1e0132df5d13d13
+DIST docker-py-3.2.0.tar.gz 205546 BLAKE2B 0784408a0373721e30cc101bf9e20e93af4721ace3841721b851efa49874163a1684239db6a56b7e91e83ad77eb4290dde61f53d70d6656853cedaff95da90b2 SHA512 fa36b65a047aec6dbec07b2ee5ac895b333acc804e372b5b3ccae587045fa03613f4083c66cd6289e188fd78c6f7012c4252e9bbf9f30a980fb94f32efba03b7
 EBUILD docker-py-2.4.2.ebuild 1578 BLAKE2B f09a649f8ef49dbecddfdc8fa74dcb2e03bbb1aa72ec90488ec0da4f5c320c2872dda32838ba237e9c5df52cd8384a51b8f20286929b9a76511a09fdd9de3615 SHA512 98bdc785eac2b65557f3079c51d46d44ac47e1d3007bca99b4fd26d7d03b8e7826fa49646039cf659c75b7c660922af290def904bedc554b485471e78eded83e
 EBUILD docker-py-2.7.0.ebuild 1531 BLAKE2B d2d1ae4449c2379b07a0e3dd6eaee69f303d035a9d1b234359eff53bcd4ad2a40f271aff3e7e13e7e66ad49b8f7d6bd788076ece3896a8b06f5580af1f82554f SHA512 807b2a01920c4efc9ca29699ed05cc4018bc76faa343d729f627886412248e702c48e630a0fcca134f0c3c1a7b7eeb61ef8b132f920bc8260702c2ac40b7aca6
 EBUILD docker-py-3.1.4.ebuild 1539 BLAKE2B 711aee78353725adadbb797ae28c378df1b29df40282807cee4881fb408bfcb38aa473e37331f0471a0144e2d0b8daa2c64f2a057118769840377d1f94f18872 SHA512 41314274e0d6c3348f5682d148fca5a4c4b2f3d493e0c135f57bf769231128436f7e8a6d2cc822c1ff88c6e768cf1f7de1e2b021a6682d899482478df5ceb61a
+EBUILD docker-py-3.2.0.ebuild 1539 BLAKE2B 711aee78353725adadbb797ae28c378df1b29df40282807cee4881fb408bfcb38aa473e37331f0471a0144e2d0b8daa2c64f2a057118769840377d1f94f18872 SHA512 41314274e0d6c3348f5682d148fca5a4c4b2f3d493e0c135f57bf769231128436f7e8a6d2cc822c1ff88c6e768cf1f7de1e2b021a6682d899482478df5ceb61a
 MISC metadata.xml 402 BLAKE2B 449733b9057dfcde3dd0ff82df6a9cf870d1138d3c721a39174a71f54a359422cb3411f513f68662b1c840480c4aa253f8fe77a2afe1020e82c4e7c81dc4d691 SHA512 13bee9843188ebf018e25e2a738fd0ecc10ddb3508bbbe3e47048a9ec714196498ea71044a57a20b4c649eacd0672b956d20a3e5487047723cbda9047ca214cd
diff --git a/dev-python/docker-py/docker-py-3.2.0.ebuild b/dev-python/docker-py/docker-py-3.2.0.ebuild
new file mode 100644
index 000000000000..8108a4abde8e
--- /dev/null
+++ b/dev-python/docker-py/docker-py-3.2.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python client for Docker"
+HOMEPAGE="https://github.com/docker/docker-py"
+SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/docker-pycreds-0.2.2[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' 'python3_4' )
+	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.9.1[${PYTHON_USEDEP}]
+	)
+	doc? (
+		dev-python/recommonmark[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.4.6[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	sed -i -e "s/import pip//" -e "s/if 'docker-py'.*/if False:/" setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build docs html || die "docs failed to build"
+		HTML_DOCS=( html/. )
+	fi
+}
+
+python_test() {
+	py.test tests/unit/ || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/dockerpty/Manifest b/dev-python/dockerpty/Manifest
index 4cf81c321a7b..2fff6522f72c 100644
--- a/dev-python/dockerpty/Manifest
+++ b/dev-python/dockerpty/Manifest
@@ -1,3 +1,3 @@
 DIST dockerpty-0.4.1.tar.gz 19608 BLAKE2B 1c7229bdd18100bb75a8ec80f0b8a636137efce40affb2bbadf27eef5ee13322ab92f9a3f77db0ef79c35366daf700550eb9a358534f7a1f1c2b92ec2cd4d5d0 SHA512 1f27a1d1cf9bfa21a77f2c0695334ec09a81ed5b70190b16fb23ec0e2ab4cb84af334b5e9275265eff2d8014aac5f96890276bed5775bb805c3f30260c99da70
-EBUILD dockerpty-0.4.1.ebuild 786 BLAKE2B 3115a9a9527f499a4903635eb39c2db41a8479cb18b6b4c25ec6c22bf24bad16b26a34eb6bda0724427ce5a470bf4b7fe5b6ad942646807eea62ca0bb6e8ce28 SHA512 3e14990815563229bad34bdd03f77cda1b82afec8057cc1ea366cc7f9ed1aae351f5ff22b4c7a679f83ab8872d61aa60b8ce161483d93b5b4617de7761910b0f
+EBUILD dockerpty-0.4.1.ebuild 785 BLAKE2B ad1629712f8979c59dba24b88b89f358d7c91c900818e6aa62cf5c36214998dcf159d0fd6fb4267ec20711c08d8a1f9102bb3bb3f13106d162f935673af44fc5 SHA512 6a3ca7f589860b9c592cd37c037bfb2f9a4b416aef9c488f7a67cd2c008f2bc9089c8a671197258b28d43d9850a69a15eb0bb80be1d9574158fbc707797e1b62
 MISC metadata.xml 220 BLAKE2B 40c610207f83c594fcf2d77853832138fd0f24196a36de37219311477391a0a4fb78ff1d0cf4bf4cd18eb5c289c2d5ac9d5bcf06121ee39114af1425a384eae7 SHA512 f14e0899fa2b1e1df186f4331f8dc7f517c169dfb578ed87490fb6b4255e8cb2013ed7f99cddb2f59ed224a9c5d85845284b52c67d7cca1e457acbef78fddd04
diff --git a/dev-python/dockerpty/dockerpty-0.4.1.ebuild b/dev-python/dockerpty/dockerpty-0.4.1.ebuild
index 1068fac1b819..5e0731d7cd48 100644
--- a/dev-python/dockerpty/dockerpty-0.4.1.ebuild
+++ b/dev-python/dockerpty/dockerpty-0.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/d11wtq/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/doublex-expects/Manifest b/dev-python/doublex-expects/Manifest
index 66521be3030c..3c8289985fc8 100644
--- a/dev-python/doublex-expects/Manifest
+++ b/dev-python/doublex-expects/Manifest
@@ -1,3 +1,3 @@
 DIST doublex-expects-0.7.0_rc2.tar.gz 6151 BLAKE2B 34d385467fec24a5210dcad53ef768d23eb5117b14679b89bcef721bf90ea380da50c62233afe92abaaf3bd015dc1bb021adedaf98c463400af3ec4e462b7aaf SHA512 94e499f01fbdc73f3f97bbfb64f299d43e3b767f8eb00eecb7c05e062cedd8fa84569cc97ef48aeca24df5ff94b1bfbb330a786500641c857039c2e7d287e952
-EBUILD doublex-expects-0.7.0_rc2.ebuild 758 BLAKE2B 7c741e2b4d191ad86b4f07ecb7be16f614e527326708298964641496def29d6110545a6783cc208bdba124f91f9bf7bedcea0e3d640a5cea9893ec390e7a125c SHA512 7d3971161703180dc9db7793aae03ef50449e7549e13c6257dd2cc3d92b5b1ca2cc76d6d21d90e09c1779e89dd66a775d241cd73930719c852a83b9fd54b4807
+EBUILD doublex-expects-0.7.0_rc2.ebuild 757 BLAKE2B 0ca80a3fb9d044466588b03120b77afd9aa8a6fa8bd604c2d88d3dcd868cdf509cc909fb5dddfbe0ecb24a658c2d15b73ccd5b92612ba8dd04a2bd1c2a2e1a8a SHA512 9ac1c1ecfe2f7d26d499072e92c6b75343426bd5ccf29b310b06dfad4e03bd8ad0c685a25b3a52381c2d307640a64b0847d032f622bee2108fbee678010d8718
 MISC metadata.xml 237 BLAKE2B 444828ba665090177635ecafaf39aff3967d2adb4546737b4f84691fa60ffbd704f5893c53ff127f4522f6f5eac1110597d156ab91cb11c7e529ff7d50c8bb24 SHA512 b64b8bbac240cf5c5ac737ddfe3d7db7105afa8d667c00c6b3a84ec9c53ba858297b854ea866a5aabe291ec33593cd8d43a509e27d8b431caec940e3e5992c14
diff --git a/dev-python/doublex-expects/doublex-expects-0.7.0_rc2.ebuild b/dev-python/doublex-expects/doublex-expects-0.7.0_rc2.ebuild
index 9ebcc2039ad9..6bd32353fa40 100644
--- a/dev-python/doublex-expects/doublex-expects-0.7.0_rc2.ebuild
+++ b/dev-python/doublex-expects/doublex-expects-0.7.0_rc2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jaimegildesagredo/${PN}/archive/v${MY_PV}.tar.gz ->
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/doublex/Manifest b/dev-python/doublex/Manifest
index 38432e4c0ce2..35bd98337142 100644
--- a/dev-python/doublex/Manifest
+++ b/dev-python/doublex/Manifest
@@ -1,3 +1,3 @@
 DIST doublex-1.8.1.tar.gz 69685 BLAKE2B 38f80ac0cf68dc2401eaa8051542c91d382e9ba22ed229b3c12a192f0b180b33a5660e54f647b2273401500a3292619d918dde9b0f685807217bca40e1aafbfc SHA512 30d2b572862370da8402cc2cfa5481d3278f0fefd2d5b2f5be126a793c8e165df0e2ae6089ba321e71d994f14024b882933c1523f7a0b9e341bf75644b49e073
-EBUILD doublex-1.8.1.ebuild 973 BLAKE2B 725dcbe32cb4479f466d0deaa738293f39576e092efa9b80e640c1d5211c3953849a2ab17b0be60e067fdb47c547d11c211b0d6b300fb8698231b0ef68348a77 SHA512 d0c171a71f27c15a81dc6f0f2c856f43c606c8ed09ac9125b7d9ad35bdca125fcd4bcce99a887d7864421411e9d12d8ac707874a8de1f933fe029dba98222e23
+EBUILD doublex-1.8.1.ebuild 972 BLAKE2B ba30b38bf434e042a3303d5ef382c93de39a4c2ddb2662f37c01688a688632484c776046f549e4f1d5fb85d7d088af0c443287dab675624627dbcd5387b5bb78 SHA512 bb6d659956f8321b0f9957a2201d6f719de99590ef9f78faa8749e10318a3142bab8c0367acfa728376dd9bed5f58a712875d87cda81c1bce4d2e33ed26a5c11
 MISC metadata.xml 277 BLAKE2B 563ae4ae4ede406674ba1ba83be6202dfdd79a1aaa02ca96cecfd27ef8cdbb35406a27336b7fbb48eb0e216e1b101b83ea04e95f4e9243ce9a755994d41f9e16 SHA512 3cc2947b7aa4a62c02611bb9e7abf2ad9f8ce358e5d8b9aa75be0fdd2ece325e7566716302d53c8ea476c1e3af7397c7e153f7368771fc8cbf87c89959bf858a
diff --git a/dev-python/doublex/doublex-1.8.1.ebuild b/dev-python/doublex/doublex-1.8.1.ebuild
index 9b04f90054f2..eb25e92c0a75 100644
--- a/dev-python/doublex/doublex-1.8.1.ebuild
+++ b/dev-python/doublex/doublex-1.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="https://bitbucket.org/DavidVilla/python-${PN}/get/v${PV}.tar.gz -> ${P}
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="doc test"
 
 CDEPEND="dev-python/pyhamcrest[${PYTHON_USEDEP}]"
diff --git a/dev-python/dulwich/Manifest b/dev-python/dulwich/Manifest
index 9a4bdc47a258..73e8d4895813 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -2,5 +2,5 @@ AUX dulwich-0.18.3-skip-failing-test.patch 695 BLAKE2B 27ad8e5037931859e8dc138cc
 DIST dulwich-0.18.5.tar.gz 330097 BLAKE2B c29f3016ab63082051c8c4fc42301c12ca752008a317afc41defceee2db47e50efb69b9a21b3d50c241b3b51c32222c1e9cf35eedaf2811f66cec2330ce7865a SHA512 4ba0f70ebddf4c7f4e71721812e228f820226d4ea42bda4d5f06a0720a029d4dddb800cfc05b2610525922c5fcef1020edd1485105706d9ef3fcf810e6381035
 DIST dulwich-0.18.6.tar.gz 331325 BLAKE2B 781227bf91d8df8f941dd2eddb1682fb8c358d37f35671b08334ef197355e33dbbd09d18b43a179f9200cd6abca563a2fc833da68bd860859a52d951fe679ac0 SHA512 2d2120e23dd4bc2c9dcfe601f21ac757ee3fe2a343923c50b32c067f4d329ac89cdf0894bff450bf52c69e99759bb8692f0f14ed73d01be6bc3b0402d58d1148
 EBUILD dulwich-0.18.5.ebuild 1329 BLAKE2B 88eb1801396b86abf530c73ecff27f55fea55074ca3b888dbec7b1294fb92629cd7ec44e9f7984bba623a37cf2e05d6dca57ce144e5a4b3b53282fa62a7f5fca SHA512 dba5abbe37d81f56ee70712ab4877bea0e7f6efd269617450ef6c6d825e81f02495a3a27e39dd9b92ac173152a2cfa60195f55d00ee9bf8c5e5c8e27e1db3121
-EBUILD dulwich-0.18.6.ebuild 1332 BLAKE2B 6f3d39bbf883be1399ab9459e25612348ca031671a771ae25a0595aa10d3de80537906dd895bc46196fa5d7ebe62a4aababa846921a325c109d28af5a6291b3b SHA512 937e977c3c85bd9de34f1717608a67f67ec1df1126fda2f74213e02a6f03c0a0a5fdd3d9e8591d5b5c635f654dd859023358254da3b2ea292eb8f48fda665a8f
+EBUILD dulwich-0.18.6.ebuild 1330 BLAKE2B ac8e9e63b351da39520c1af0825a2057d3eafac16c4636bb846c66866e4c342683e1b49442ebd537587aaa95074b800173243830c8c48e8839998e5f68ab0691 SHA512 9d4a10d76ac5a6051159b9b5ce002aa9188c0f6330d6b9411c5b4e328dbc87a0ba3ce62b121f6ad37fabf3ff00551a03bf336f4700f1e7303cb0cf304207fdb1
 MISC metadata.xml 555 BLAKE2B 4487eec512ac72ee6be5bc357b6eca9a51046d8ca108611fa0160ee84e433232b96547b161fdf1469cc726030e490fde677561c63deba754fe62bede1f96efeb SHA512 1f48222049a8ada15172ca0868c6b3f2eda4f465409cd1058ab6b9e498a521ac52d14f1bc2f2265c588f0afb9d874f4a45e6effef40e022f9bf8f6c7e4e38353
diff --git a/dev-python/dulwich/dulwich-0.18.6.ebuild b/dev-python/dulwich/dulwich-0.18.6.ebuild
index d15c71b6f2cc..1aedb3e5b4a7 100644
--- a/dev-python/dulwich/dulwich-0.18.6.ebuild
+++ b/dev-python/dulwich/dulwich-0.18.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${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"
+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="doc examples test"
 
 DEPEND="
diff --git a/dev-python/expects/Manifest b/dev-python/expects/Manifest
index d3e86fcd1509..99a196d5f782 100644
--- a/dev-python/expects/Manifest
+++ b/dev-python/expects/Manifest
@@ -1,3 +1,3 @@
 DIST expects-0.8.0.tar.gz 27801 BLAKE2B 3371ad3b494a6cfaf463660d013dbd5c26d88e0cd7816be11a39466a831d2a3c19e9459967947651e004dc1bbc6f6e9a61eb0b9f69685482440056061fb9bd95 SHA512 c2379bb6b3b6181a0365a84b0602f2552de40760b7cbadd775705bacfe113ffbe55bcde818c5766f7079867ae38c8c02e318f3c9ffdccdddb58e6cf0559f1e25
-EBUILD expects-0.8.0.ebuild 819 BLAKE2B 530e208b90ffaf69e778846f9b44583dcd888b34144235d966f4fe0844d3ff9bd60d2b4421ad7ca815debdea9fb33a5e07ae0475f2e0ae56e363ae276b636577 SHA512 9a1ca0d4a39ee3e5107caefbe2a2a8cad6d5c3684ba66870c2f08464a9eb2798bad688730476c487276814b85f51153e79ed59b0f0c3fe5dca27b62fbf1aea9a
+EBUILD expects-0.8.0.ebuild 818 BLAKE2B c52bcec28b1b878979ffb5bc7f4067cff25cc73618ea92d106a1b84f2d35d32bdbb12d36c8a9dc691d53fae7df84420a9f5f557da368c0b7c1cf6f6e661e4ae6 SHA512 db8d245d46dbc4d1cf8aef6238885df9e717114ba8900324a9dfa328540733832a7e1013ece283c368829c4c83fb1419e7e61ca6a7e27f98021e2faf3af1334d
 MISC metadata.xml 274 BLAKE2B fb1fc8d6bca26cdc3c2678f2b86b410c3d9e83ce5d27ebf3bd2d90477f20f35361e8194364f7cc80d39f918798bd10e087efd35689b1130018449b3fb414b9bd SHA512 b43b9a0e58dc6a73b1d3a8f99639ba7424a871961b76c778363dd6ff14bd4df4696723babdbf5075272d6aa6503d2adf1109c366f55a0935fecdaaea6084b42a
diff --git a/dev-python/expects/expects-0.8.0.ebuild b/dev-python/expects/expects-0.8.0.ebuild
index 2c8fcdf98246..2f5a88defe3c 100644
--- a/dev-python/expects/expects-0.8.0.ebuild
+++ b/dev-python/expects/expects-0.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="doc test"
 
 DEPEND="
diff --git a/dev-python/extras/Manifest b/dev-python/extras/Manifest
index 30708167919a..8cd3111727fb 100644
--- a/dev-python/extras/Manifest
+++ b/dev-python/extras/Manifest
@@ -1,5 +1,5 @@
 DIST extras-0.0.3.tar.gz 6231 BLAKE2B 28f60a341628f87f2fbd333de8f2d6e37d42890a186e42d262079f26beca5f9452860b9c434c6953fb8395d13903c2fe63969726d1c1cb4bcc0a469efec8fb13 SHA512 7b08d094717a27fbb522d49c0c538e98baccef6540216479d176b55b94f3f0b97c4b70ed48f3802a1bf08a58fe9a319a113d4ca04d9dadcb85e3a99bf7490a3c
 DIST extras-1.0.0.tar.gz 6759 BLAKE2B 341bce7f172afeb9e2a5179ab392d396920dc8ec2b9a6e734daf8668c7f329d9a64de6f3f90b70f8e42d5e111ef196315341c0bb0f347f13ba4974d970695fac SHA512 510c796628f28db90bb96c7c9ba5fc9b2b950d2968e219efe67f3899bbe7ef68fe5de1494f8fd640f13a1ccd329e7dac9cd38aa965ab1e07c4cd287c04da50fb
 EBUILD extras-0.0.3.ebuild 739 BLAKE2B ec50b51408c32bc9ded2eccf1a73d075c56e035a16fefcad07a83cbeff75caf9f6300b564692954bcaa48c497be841bba76891ff11b14185f32c1823ba88be6c SHA512 925d191e7e457d4f797b8d378613630780b59abb2e81d90750298c8295a81f3b0c2c968a501ef83976bd43138be07dcd4a69e53f288a73f11f60b2dc76c82077
-EBUILD extras-1.0.0.ebuild 763 BLAKE2B 1e23e536c2c32e27a7f7f5b6adeb85871bf466a0968fba9ea0da18f9738a5e4e7babca5ac3212b4f8130e998adce85d0be8f08289dfa8fdb34d3716ca735e3cf SHA512 c55b5a9025fe33cec81ffe9d658f93153619a67760195ef054ee7f10caa598f4637a6ed1151446a1d2b92ff835f8c9a42447e552d43c11fc5b435836a3d2783c
+EBUILD extras-1.0.0.ebuild 753 BLAKE2B e5518ef1f2bbb002a8c3ecd403f199bea6f4892c5f00751aef56f1b0abed4deb35c4c17063e2427d54dca0bd8114f3b1705366277bff925357404c293536d3f5 SHA512 de4c0c95e40e1452dd6e61b6dbbb4941b77725b4f1619bb5f4fe1b15a12a0c450e9ea652ebaf8d31619e60b55d9047f5f8fc4014d55529585859b516e963f715
 MISC metadata.xml 381 BLAKE2B c7f141d44f01d1f5163cf4f55c03f5a939f575297bfda8a6b5c59442372314cc637cd83f1f0b2fa4c21f70266bebb5645468afad0d747f8e15df689751b89545 SHA512 bd91400e2886a9f79e973f16fa5a84c6b3d38a3fab45db89bdc5f930e7bd8adff02fddbb9f8fcc72199dad32881a355b046c5cdc2c16e679a46c1bc9e08c3e02
diff --git a/dev-python/extras/extras-1.0.0.ebuild b/dev-python/extras/extras-1.0.0.ebuild
index b620d21e8a29..257356669d3e 100644
--- a/dev-python/extras/extras-1.0.0.ebuild
+++ b/dev-python/extras/extras-1.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index 0e38ba5248bb..9ba544be1736 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -3,9 +3,11 @@ DIST fonttools-3.20.1.tar.gz 998249 BLAKE2B e6949d421d317cf2ddfe5d77f59b770b6a7a
 DIST fonttools-3.21.1.tar.gz 1002962 BLAKE2B c60d95b769abda7c973b5226d6ed5f23fe4ef159f7ddbdef8fcb4bda27f173f6a1856c596ef845954d4d555e3c475242bd03abfd37cfd0553ee87f86f733d1d3 SHA512 db06d84e7a2998b317a4166be328bf3e8ed1e168e623993f120c94df1e8ee35e6836b906cb53b15d3abbda7ca84ca4924b708d03b6e2fe96414d4f4007777f4f
 DIST fonttools-3.24.0.tar.gz 1264063 BLAKE2B a457b0f44088b0aecadc897070a95f4b1b8ae0ef1237d59f67e967e21d08f1a55a07ec5dbe06d80daef9ef11cda447303e05060bf6b3dbd94ad62943356c2a44 SHA512 7417a4472791b80308fb800f48126ef6ca2d9163a5fcac76caaa3623072ce30726ffd8d005e03adae96272c4f6183c010d6883a78cd26f48aaf065bcdc1ddebe
 DIST fonttools-3.24.1.tar.gz 1264565 BLAKE2B f67eaf66ca2ed6bcb455060b8090b96700fa8c9a9fc4de7e943b0ce0979687882d9cac4d2750028c18eef1e2470ad39fa1ad6cef3dc652a150ec28a857da9e00 SHA512 d5621a52cf67dfa54bc0a63d93bbe4f79b1032a05391b9c075c8d4c3bf2bbefd7d4bb26c4ec7b51182ab979d0775e5b4128088912002d083476d618f31af39ef
+DIST fonttools-3.24.2.tar.gz 1264825 BLAKE2B dd08243ec237c9c8616cb15f749a89b38fce13a0ac3a3deb64abe19dd95854222aa40003d0457f8821aeebe2e2d637262861f2af90235deb26bafccba30819dc SHA512 6a4b771e94ff23bf75f7a4aad2049350bc8cc41aae09c7fddaac6dc76662248032f138f64849cad8b8a46ad4c7ff8ff115e22084b6af4833cefb2614fdd289a8
 EBUILD fonttools-3.0.ebuild 721 BLAKE2B 795ed9214f81cb968350bddaa894c8c614faa5745531797ed6564eaf2591022e920a0773f95db80ce0896b3413e6685df8a84179da95bb7af7a94fdde2e0f97e SHA512 25263d4a9a2dc606e62e68425708ae4ba4c9b4c37f3f7c3f4a8950adb5145342ab594c5fce718797d2d4aaf56e240eb76fa8ffd3ca24281f4943030a176f3aed
 EBUILD fonttools-3.20.1.ebuild 795 BLAKE2B 16231c6206e9c0d0105607c509de4f680d3d67b78dbd6ae1b4b6a8aed7b0f0f1be2415c5e77277eceae8b5cbccbaf4866791991a519cf03c4f386b13205c5960 SHA512 6657e2931c11ffec069c4c0fc1fb0bbf11c740068639fff39125dfc77c0d531d7bea6ea8ec66f785775332a03c2bbfae8916a6db3c9e33fbcc56895f0d1c1a00
 EBUILD fonttools-3.21.1.ebuild 807 BLAKE2B 78b8e653ff5cdd3aa01f1f947574306186c5ff98051633b6ca34d4b01af6c77288383ca5debb681f2323a66bc3eccb0ace035550ddc18da093e8d3209c9c3d61 SHA512 b48c9ac995c15f4500e97e503bc8f9f5e6c147bbcd37b6b9f9defc5748e3d0216667c9cc140f487bf90d71dcd8eb6db6ba471d7377daa0bb7acb489ea1156533
 EBUILD fonttools-3.24.0.ebuild 807 BLAKE2B 78b8e653ff5cdd3aa01f1f947574306186c5ff98051633b6ca34d4b01af6c77288383ca5debb681f2323a66bc3eccb0ace035550ddc18da093e8d3209c9c3d61 SHA512 b48c9ac995c15f4500e97e503bc8f9f5e6c147bbcd37b6b9f9defc5748e3d0216667c9cc140f487bf90d71dcd8eb6db6ba471d7377daa0bb7acb489ea1156533
 EBUILD fonttools-3.24.1.ebuild 813 BLAKE2B de3a7227f7964fdd89f9fea71bc20dddf6ede25a10454e8eab083b70e222952062cc63ace625e28f28482d08623e18bb0cabe2499fbfbbc77c1915dc4db961ce SHA512 9c7d660b997d71f54bda40a347a0daf4244894f5dab401cc90cc4b7082ad5660ffbd5dfa6dcc40f9d891f59d7bb1f941d9f94c528f411e46fe86496a7b35430c
+EBUILD fonttools-3.24.2.ebuild 813 BLAKE2B de3a7227f7964fdd89f9fea71bc20dddf6ede25a10454e8eab083b70e222952062cc63ace625e28f28482d08623e18bb0cabe2499fbfbbc77c1915dc4db961ce SHA512 9c7d660b997d71f54bda40a347a0daf4244894f5dab401cc90cc4b7082ad5660ffbd5dfa6dcc40f9d891f59d7bb1f941d9f94c528f411e46fe86496a7b35430c
 MISC metadata.xml 474 BLAKE2B 54300181cb1e91d9754d3a0ab96f3ef8ecf4dbfb2d57ac6d2fb2cf9727acd07fa39b45155e1109e570b498be6cc3c1c98919593620f050482a41490c6a219af3 SHA512 f683da73b5db5e132fa4eacd6de94e50e434f12a88e14b1d97585492c4c4bbe3dda1791eb7855e6b4111ecd61601da4da22c6b77305d9affdd8f9e478c140ed4
diff --git a/dev-python/fonttools/fonttools-3.24.2.ebuild b/dev-python/fonttools/fonttools-3.24.2.ebuild
new file mode 100644
index 000000000000..e2594c28365a
--- /dev/null
+++ b/dev-python/fonttools/fonttools-3.24.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
+HOMEPAGE="https://github.com/fonttools/fonttools/"
+SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	touch Tests/svgLib/__init__.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/freezegun/Manifest b/dev-python/freezegun/Manifest
index c35cda78dc24..92ea8fe48ce0 100644
--- a/dev-python/freezegun/Manifest
+++ b/dev-python/freezegun/Manifest
@@ -1,5 +1,5 @@
 DIST freezegun-0.3.10.tar.gz 20398 BLAKE2B 971f4f3de565878b8a1e4671160f41cc7c558f5c848f5c79dfc48e3f3e3cb71ff9c71090705167d4252edbfee040ef52a7eafd33073011c07337311a7e0ec366 SHA512 64364459dc72484e2124a20a0a84d2b88617efd0578fba687adb51635d578a1e36a00cb119998082610c608e7b6c3589bff5424e38845bad026e85449c8065a5
 DIST freezegun-0.3.9.tar.gz 18118 BLAKE2B 7382646acf0ca8100680cd44d22de3263541031686e05f7957023eaf22f2a1dea370c98f8b6af89a5075aa5636c304e6e7d5a1c64285aa221a73c732bfc5e0c6 SHA512 1aba8ffacc8b9ebdf810253181418bacb75c04222dc59a5e1e526a9f2d97573944926b1b9fcb6c6e6971a7958acaf9b7522c5582190ae6be448c043b6f908c17
 EBUILD freezegun-0.3.10.ebuild 870 BLAKE2B aa80183292882defdd403dc057ef6602f6be60f9ba8da775ebd2388d881e1b654db90e5aeb043a67a2f88061d2101fe9a11de1531db5091041d464e0a82e0cef SHA512 fb8f25c1b29d0c0192e51da335a27b5881411cf7c74467a39ac0a693e1d2d06bce5173f5f8e365844e5069320bdf90be3fa2b3399e37d75088eb15fc4bf5d6c1
-EBUILD freezegun-0.3.9.ebuild 655 BLAKE2B 4c2cb2e79de6feae14becdcdf141655396733db5ab58d033af8606aa6096af216ddb82add6403cb5b4f47ce6d0c14b9eac539281510bc023eed9a5c10e285b80 SHA512 4f41246dbf768e9c8dfd8b3c79f4761e231f76d0c5af8c142cd9b2cc76bf23ff6ff9783d68a5cf8e66daf6c0738779871c37cb4e9edc0e6ce0028f102a8d4bd6
+EBUILD freezegun-0.3.9.ebuild 654 BLAKE2B a48e34dd3278053d7eb42f73e0e6c226f2c28d0075dfd7457bae59a6913631b0389334eaa1ccfef4535ffca72f3370f0a255f362a26c54c9f19ce37317384f30 SHA512 0060d7b5a703225eae1dc91cf3d5568cbb48926e1f60bc7ee4ae9936a62a7286f974d9887b91af19cc3269779ab9e68a334ab6208f239e5aebf9342a75c47510
 MISC metadata.xml 368 BLAKE2B fb6f96314188337bb64e24955ca9c4830ef82b11443779d2daca5dd124156db58efc27d6f28f8497b4308526459634cd3d32d7e1698cfdf943d987f493f5e636 SHA512 5d268015dd8be027059e5d405c47c0bf48ca8ead3103031e29748e63a9aa132321257b8f9963e557829a3602fe078933613e70b07b8291d32b7ce2da14b6bccd
diff --git a/dev-python/freezegun/freezegun-0.3.9.ebuild b/dev-python/freezegun/freezegun-0.3.9.ebuild
index a782d8873da1..7ff68e9e66d8 100644
--- a/dev-python/freezegun/freezegun-0.3.9.ebuild
+++ b/dev-python/freezegun/freezegun-0.3.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="test"
 
 RDEPEND=">dev-python/python-dateutil-2.0
diff --git a/dev-python/futurist/Manifest b/dev-python/futurist/Manifest
index 1df3cbce1985..afb967798e4c 100644
--- a/dev-python/futurist/Manifest
+++ b/dev-python/futurist/Manifest
@@ -1,5 +1,5 @@
 DIST futurist-1.3.1.tar.gz 40927 BLAKE2B 7a746bc7dbdfe1ac9ff2fcdd02a0f4f6e0caccadb52b46439620bc5daf736545de906d0a8d159d39fe7d0ab8eda05767aff4723607dc777ec5c1b43a1670c277 SHA512 88b3af8922542d0bcc3e3e1ba8c456adb6233a616c1e14b3b49b11162be5b65855e7088ae6ce573d42bc80675f51070270533fea65e70935304954a3889db3e3
 DIST futurist-1.6.0.tar.gz 40372 BLAKE2B 295a2a274de8a613025c6c46f6abd048cc6d988e9f4c5dc2de9559d295d88f2d93e5afc017dbd8c9c20a6bb50a63567d42f3ac46c61fd9b0d08a028dbdb2c5bf SHA512 fdbd93e3ffa61661218e4a3f180a448b1d8c75126847c50a36264543bac02f50984d4e493031c0ce3257d16661f7b4a4463b5b3dfd7ae7e2f974410e0d1234a1
 EBUILD futurist-1.3.1.ebuild 911 BLAKE2B 8892be731215a067aba62e498b91dbd23fa297e62119893dea3069d352c7d4b0bbbe9619be59d6d9880d12fd14ed4eb4d27b8ba9a44a2303f7c757bac3cffd94 SHA512 6595e2e5075f9581545316ca5a698664e5f0abd2ef6f0de9146bfb730bcbebf4a08ee2704266a332aba763c6c36da4ec563fbeefd72a94253d3ad8c1d83afb8f
-EBUILD futurist-1.6.0.ebuild 867 BLAKE2B 28dff76298a8bc801f1b532355e3c297c65facf9583e95ffdf02d93c5c1a6bb5625bb86db64dc8db2ac903ffcf9171513d454ff0c15120c99382f6d8493ddba7 SHA512 058919224a305990a4c93f82c4e974a1a5a643d5ef1c1441f6883678b5b2ba26f0df992f115ef3778a6e3a9b16eef8f3f1fd04805c683e6616108d8e2d40be63
+EBUILD futurist-1.6.0.ebuild 865 BLAKE2B 9117b78cc30b4d76c13be29c6239c5807d7df3133f2c8d2247912e1f9f7139ea2b5c5ba5bc938cf406870ccfce7b0b52c1f20f8bfcb144f3f1d634d617667352 SHA512 3c9f9b09db4dceb082b9b384b92f20a49067e200d13641559cdc117ac2bd1ce384940ff5ff7843aac45ebf13f9087608f096befd09bb84eb67d9afebdd6c0439
 MISC metadata.xml 325 BLAKE2B fd30488beae3d9648ca9812b6b719c85c4b8aa98bd1209400fcfbc729955ffd8d3690a145b26fe5404737d2b2df346a73547abf3b519e0f8d6200686a4bcb62f SHA512 4d4d42c2821349f1a2144c297cf80c572482eff31cd1fb4f43f43c503d1533a1ea53627528cfac417ab0d1c174f7924f951f823c9577ebea86ce7cdd88195bed
diff --git a/dev-python/futurist/futurist-1.6.0.ebuild b/dev-python/futurist/futurist-1.6.0.ebuild
index 3882f6c3262e..598228dbbeea 100644
--- a/dev-python/futurist/futurist-1.6.0.ebuild
+++ b/dev-python/futurist/futurist-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"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/glance_store/Manifest b/dev-python/glance_store/Manifest
index 627eabb8b17c..fca2c36cd518 100644
--- a/dev-python/glance_store/Manifest
+++ b/dev-python/glance_store/Manifest
@@ -1,5 +1,5 @@
 DIST glance_store-0.22.0.tar.gz 130377 BLAKE2B 7dc46dde1dbccddbbabf0e0d1d4033429e4ffa3d6dec6fe379b6f7aabcaa5eeed639aa2c76e5b85ccf3444f4e76ec894251bdb8ae573b094e657fe61acb7887b SHA512 3de073fd4926513674b87afb15a2d4485c4a98f76c7d36cd0957a9cd848399bfb1fc6b3b40550522b712e9bbddf8efec5c3fc629a944fe447543d35eb7184168
 DIST glance_store-0.23.0.tar.gz 140917 BLAKE2B 764510b2d24b633a9120d4c39e66100a75de23c0bd7ef633bff4d381369c67d6a21b4f16019432ac02c6ed1b995c5c6373014dd9a5bd4df4981721146ced4145 SHA512 ee3d1187ac47427981af294604bd4742a12b60bdf406039a86c5eb33645e1407bc077ae079ea07b9c031922d9350b0e2eb7eaba70f51854c288faf90f9cd7b41
 EBUILD glance_store-0.22.0.ebuild 1631 BLAKE2B 1c3c27e87efeb8314db12b798992fc40ea09a452ab1c58cb2631fbcac065ceb12938ba31791299f2aeb2e936046d8427db3fabc946faccf6a6edb2c77adb4cc6 SHA512 09fdad30dd0da08e1e685bf85a3dd6f5c95379d36743d6bc30cf67bdd8ee82e42a7ebf00bbcaf791942fb2a7376279c9c0a2713395e744f650d5a601fa1f0ed3
-EBUILD glance_store-0.23.0.ebuild 1866 BLAKE2B f9062268e8b95651086a1c07f580883c05764bc0f653f3516cb038d7159af3f2c9fd819956e873772d71c222fbd74137d4b877dba8d764fb818c82354075c59b SHA512 a8b483c4e0ff9fbe5e24154b0dc2e3a5556b655f9e736742f60789d69ea59dd3d0996f100d4e1f43a5f4ed0f10004c04bc5b5bf5b03d4fea66a5ce90a863a4f6
+EBUILD glance_store-0.23.0.ebuild 1864 BLAKE2B d7a2bee411479c6b5aa0891e434ca5d7060db45f90cc26b5354c67990956d045a3080dee9adf326a1cbb18dbc052d8cf9b1be92a62fd7af6602a5c6cfb852e87 SHA512 2f8879e8605fe7c9f618e0b8524ca06ab7dd83cbead0abeecafacab0025e2c1119d634cdf131deff1ecc27d6887d124e0ce6dc9a96a68395cc092a82ec057598
 MISC metadata.xml 807 BLAKE2B c5195ef9669d04dc0f81f47b07e802984114b15bf4dedaf99b7214187befb556765a4b14c7d55c9bbbf1dcc2acb4f22e7c5a12a65912cb9f2bbcb73d1cafa4a5 SHA512 3479866f525828fbd21f7d0953088720d0045bf2e00d8dd4cb5bba25f7d5ba939c4bc9bac89d1f9bbf5c3a815f0d5199045f6ad0585c6712843dc1f26135705d
diff --git a/dev-python/glance_store/glance_store-0.23.0.ebuild b/dev-python/glance_store/glance_store-0.23.0.ebuild
index 87104d200212..3cb2be32811b 100644
--- a/dev-python/glance_store/glance_store-0.23.0.ebuild
+++ b/dev-python/glance_store/glance_store-0.23.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 swift vmware"
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/gmpy/Manifest b/dev-python/gmpy/Manifest
index 458c182f2fe4..6334498259d3 100644
--- a/dev-python/gmpy/Manifest
+++ b/dev-python/gmpy/Manifest
@@ -1,3 +1,3 @@
 DIST gmpy2-2.0.8.zip 280551 BLAKE2B b73c48b739ae6972231672ad28598c09e00db6348cd281d190c6dfcf49b0e977563baabe84825658d78bf1e2ac4927ad1882787b6d4efd19f28a4f7fd6a061b4 SHA512 090f449641f378c73eb166831b1d956c6cee3da83e42fde8741f18aa0fa687e37927fc3b045d4b35e3a3b75570e6b1074150d8bc29d16119ab5c717bcfcf9fb4
-EBUILD gmpy-2.0.8.ebuild 1483 BLAKE2B ff31f541a7c929a1d54090261c1dc9586acf2c0678d1817851e3f2a0127aca7b99e82ec65e42143daaf358432877f780c5df3d9952cdd5e0ee0adf35eea8449d SHA512 7806c68f55a0ed66b0cc7222918c79c7f0885b9d1a7dc8d905a6e6ed048c4197173e83b50263a21ba1d524bd4a77a66b9b97c18e74ee504fda15f7ae639a9ab1
+EBUILD gmpy-2.0.8.ebuild 1482 BLAKE2B 8c64e2f15ba5559f3e245fc5b672dc1d4906d47e5f6b36068db778a0bd47635c10077b82c68dc44ddf93170a3c55c011463d3c0014c2a35766069d0dccbb3a02 SHA512 5c25f9d11546c439696556a24347fc1abe8762417b502c3fe25c789db766b451d8b60c00364fd6c399d2ba7f20d955fdf771cfb64ef4a685142335203d43b53e
 MISC metadata.xml 795 BLAKE2B df987c466b2666db915c405dea507c17f90181c2e2948885292a6de44ba0c4bec640fe25bea3b8b8105d035c3ff999750b747cfd7f4caaab561f459056823eb5 SHA512 e7f8324cdacceed22f28e27a224668f59955fb5a639d26376da037b0d21437ef57708c7c325e00c771df9e11050be8dc423a3d4b631599da2cc1ef3f97cf3795
diff --git a/dev-python/gmpy/gmpy-2.0.8.ebuild b/dev-python/gmpy/gmpy-2.0.8.ebuild
index c82cccb42066..1d39738f918a 100644
--- a/dev-python/gmpy/gmpy-2.0.8.ebuild
+++ b/dev-python/gmpy/gmpy-2.0.8.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.zip"
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc mpir"
 
 RDEPEND="
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 11b46209dec2..87ff7e0ee9c4 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -3,5 +3,5 @@ DIST google-api-python-client-1.6.2.tar.gz 4262337 BLAKE2B 0ae3e5b1c6bbb80999cfa
 DIST google-api-python-client-1.6.5.tar.gz 4255929 BLAKE2B 4e2197fe56f25cd202f7a0b3f64b3796158d798bfedb9c0690a59c24bd5ce10fbe0300093ebb76cd343dae5eea2a0a360903cd0890834241926fd55a7dc07ea9 SHA512 b2f2be81e6f54ee3065e75ea064ea3ae49cb983d401ac46dca8459409dbd6df7c3ba07798285b5177bfa632a20d43aaaef3a7c73d5d565796567b8b305737565
 EBUILD google-api-python-client-1.5.3.ebuild 1132 BLAKE2B 57e30f9ca7eda67b6f280e9dcb014968bbe539d69b9f8bec97a807976fe172d13bf3f8cd2ff3e686712c1fd02f75b83584c7c0004a662035f1614cdb598a9f42 SHA512 3a4fb461c807189da1d26e3388fff90ece1a30ca9b8bfeb51841d7f68a36c7e8494ec7589d0760ac15e6744a5e5d4ddd691875ad5aeeedb9cdf54d37d2f29ee2
 EBUILD google-api-python-client-1.6.2.ebuild 1194 BLAKE2B ea6981dd0cb48f90f0c07237c5ebf8a3927cc2d3ad7f37ca07faede40e8a0b92ea63bd9ed092937495e19e3a64a4583bc13dfa7527e7320c433f0db7ed66e199 SHA512 41384e153fb18d48229bb57b7413267342e8ea8cdd5a560fb6fbef8aefb540dec712b410edb4b02b718d022b3349c87028d0d452d7b18b718d0590c7dd829665
-EBUILD google-api-python-client-1.6.5.ebuild 1196 BLAKE2B 6f7fb764dd1ddcf165150f6fc6e0fe9c8de6238ca1dce12d295599e8d86bb1d6874af1bab4f9f50eaf0307824dca377a369ef12ac50007c5ec3baf575fe3ec19 SHA512 88c6adb6d101479245b1c603464877513609c180b770e1dea03cf4835d4c2f0ce05ece69716d7dbb87c3537478d10c5de00432179f9ae1ecb3f21c8697d088d8
+EBUILD google-api-python-client-1.6.5.ebuild 1194 BLAKE2B 0c9f20067803da8dbeb6f1f759ba8118282a4ece4c973ad55e7b2910f367c9cd893e1eb3fe68330374b1aaaf56f378bd44bddeda8a0ba3cd3a55717565b68d78 SHA512 cfe6616a9f1b4fda92b5a11bc793383c93f680b13150152325eee414ee75ea233292ce45e41dfb7f39c18d85eace00b5ef6641e9a4ddaf95b663021616a4efc7
 MISC metadata.xml 356 BLAKE2B 57ec373091acbeaf75beafc097b6b84f56bc052d9c27b0386e12579e3bef8ca955413d38344ecdac04c7f5a0ab463295a827efd5c6691db1cb958fc4a7f350f6 SHA512 e45fdf92fc9a3fcf08b74e9ac07326cced2cd7971b16a6cc4f96203199aafb9d72d36a29e3a924a43ce8dc4f3709add9c8bfcc8413bef028408cfb899eec9338
diff --git a/dev-python/google-api-python-client/google-api-python-client-1.6.5.ebuild b/dev-python/google-api-python-client/google-api-python-client-1.6.5.ebuild
index 6b96fa2281f9..0141e3fbcc9d 100644
--- a/dev-python/google-api-python-client/google-api-python-client-1.6.5.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-1.6.5.ebuild
@@ -13,7 +13,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 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/hpack/Manifest b/dev-python/hpack/Manifest
index 37a086d384f4..5a60e1bda3f8 100644
--- a/dev-python/hpack/Manifest
+++ b/dev-python/hpack/Manifest
@@ -1,5 +1,5 @@
 DIST hpack-2.3.0.tar.gz 41610 BLAKE2B 65fe4f07f64dddff5b24b3a84f7e49de32e358fa59bb1b21e619135ef33d282d4cd24283e93c71bb71c89d7b5b2a3f8ed36f6d406751c54247472a75192bf50b SHA512 a3d13da105482bb258ee3a2314b2629215028777f84127f71359f08819c96af088a3952bb0a74435472035d10ee6e3943cdad689a28f04cbc12cddcc4af9a8a7
 DIST hpack-3.0.0.tar.gz 5305971 BLAKE2B d1df8a1b2a1ce8b91e63cab475d3957f937fb74c0bec343d342971be1bb7cfbc929c53cf041845df2965cef0cfb098345bf0612acabc7ef3e5e23f6f0aa44f2f SHA512 7b9cf5e643dff2a6454bfe419b797c8ed1a0fe6ec3b725d2696da5a820ab96fe87a64e600b1831c7024bd82616b155a0aa058301acb32172155b6538ba0a73c6
-EBUILD hpack-2.3.0-r1.ebuild 1043 BLAKE2B 19ea6a6ee4bea64b5dd2c1053cf677d23dea062600b28bc3e5318d66e4ae9bfdad8c042998f404e8de50c511cddcc8ffd88075d1669e8b41438fc6fc5f9983e7 SHA512 4a231e29b61bcac5ec6b9ef42fffe624c68b27d496e6cc3e8bcff04f7ab5bb9cba119be8c92b0889574d28d28220f9b27a6388d2db3f992ad01f1d79316cd0e0
+EBUILD hpack-2.3.0-r1.ebuild 1042 BLAKE2B f50c4d28ebe1d1fad1e220dd1873ccb2d79379bd43e572f4207b6eaadaf9f969b1244719b23ab4686cacad101265638a4a2b87d1794c8fec67038da94e197320 SHA512 d10d0d338fd41f845557ddfeffda83c478ab8d92d0291cf9a674e84985ecb0622b132cea67421093c7a6b27e465bbfb70297fe1560f348a1ed5d1f010dba5977
 EBUILD hpack-3.0.0.ebuild 1193 BLAKE2B f59867e635f399fcf8c8573108f3a7ca60528ab177ed7200ad52280c2ecf7e73ab2f34621ae6ae5ef56e98943e459aebec606ef2800a29d2afe746c8ae4462b9 SHA512 dc769bb754f715e4f6e838f6bf7644cefa1ac3912acb9b59e8f9686a95c570f09870352655171f7a384f20554bbc0c5775e93918b46f0a2bc184f6b264153ed2
 MISC metadata.xml 755 BLAKE2B 07d55adb82a465399ac181c0bc57d6e884acc171eaf00ae4b32b1c7df02082a80e1904cca1755f755fdf3d7dee3028dfba951d7799485f43657c0141bc12c002 SHA512 0941a33f24de0db1f466447ba36585cd3d5dfa70eade8d076089cbe2309a7ac5498b77a712dc237f335a27c954b7b57be7c951c5a3c052b648499dbb545375be
diff --git a/dev-python/hpack/hpack-2.3.0-r1.ebuild b/dev-python/hpack/hpack-2.3.0-r1.ebuild
index 4912f9218fd0..3dda7d73fe81 100644
--- a/dev-python/hpack/hpack-2.3.0-r1.ebuild
+++ b/dev-python/hpack/hpack-2.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/html5-parser/Manifest b/dev-python/html5-parser/Manifest
index 193e62d37b0c..128e14c9d2d5 100644
--- a/dev-python/html5-parser/Manifest
+++ b/dev-python/html5-parser/Manifest
@@ -1,3 +1,3 @@
 DIST html5-parser-0.4.4.tar.gz 267787 BLAKE2B 9fcaec9faa906914d43f2b19381fe3095d4cd009bfb534537d2eabb420195276b3690d760c1defc92ad00e4965b3eb34ce4700d54f4f0291dff88026d890c90d SHA512 3aaeb32f360d2c131ecbe11fa1dcd3dfcd62c9ca046fce7dd4ff8127d0e62216f666e83bb20c7809c6adc591e1fb2798e382e78a1cf6129b1f0a09a71377f8d4
-EBUILD html5-parser-0.4.4-r1.ebuild 782 BLAKE2B da66c97b3d85c0073647a47d314be4e75badefc8abb6994d46053c2bbe90a06b150a6f1e8562dba95857292662f11056c50a516db03b820314f02c1359e90e71 SHA512 46abe3fe7a4c794a8fa81e4883a1912fdb0f69b2b5437a90a2caa0f87a52c943538678f24b9696fd188ae0826a036fc1b3345daec3dcd9e3ba99a8b5c0ac4c6f
+EBUILD html5-parser-0.4.4-r1.ebuild 781 BLAKE2B fb3b90ff9be74f83720840b7047c7abb26f748ca93c995a133790e09e5babddbe11e1feb5d0f3882e246b8f9d35ec84aea659031538447a135b929803812329d SHA512 b6601a36c802d85d205885ce269ec52d39b2fc8d657aa16b27b754fa75e2c0926b4d03d96d7d2f35e444fe95c556193b394ce562880e35d863cd9f484a9a9bdf
 MISC metadata.xml 356 BLAKE2B 8e97cfc61c6249d06916c0c6464637f4d776d81ebb060409181ba40eb91a65485a3c067b50f18dc9d9c9bf29f5a98bd40dc6ff89a0c68b30bc00353917db4e08 SHA512 3452ea432c8187cf09b7ce3b70df1c951ae243c153300093583efc337d9f6c42c41082b34ff6a81c19337ef508c90cff4308d0da63a44f4976d11ff57779baca
diff --git a/dev-python/html5-parser/html5-parser-0.4.4-r1.ebuild b/dev-python/html5-parser/html5-parser-0.4.4-r1.ebuild
index 72db339fab9c..08015ad28534 100644
--- a/dev-python/html5-parser/html5-parser-0.4.4-r1.ebuild
+++ b/dev-python/html5-parser/html5-parser-0.4.4-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 RDEPEND="dev-libs/libxml2:=
diff --git a/dev-python/hyper-h2/Manifest b/dev-python/hyper-h2/Manifest
index 741a7cf2085a..69a2d1a25559 100644
--- a/dev-python/hyper-h2/Manifest
+++ b/dev-python/hyper-h2/Manifest
@@ -1,5 +1,5 @@
 DIST hyper-h2-2.5.1.tar.gz 92713 BLAKE2B d00baea98dfab43c2d6157f4dec3b04b2a42d0ad280980cb8b7d03d1c6f75de59e188745e7cc29fb36fd8c0799f9d5cb50a94282c70f045289daccfdcc12dabd SHA512 e82a7e6b592b43d74defbd4c729ad287ed019881f6ddf0d2dff9d3eb4fdba29cab8d988848ec64b693da77df5cbcacb06eecf1ecd77843c66c9eea8808fc949c
 DIST hyper-h2-3.0.1.tar.gz 2198911 BLAKE2B 453ce1bf8e6216e2852f49c5a22ec5cfa487a744a818e82929dd0c4f03280953c1f742890d74f771080987e2f70d9430e4d66481501357f0d4c5ec490fc5fbf7 SHA512 5d98b4fb654c20f6b9e6918bb71b88a42a3027bae795f31c32c2b5cc4428774457c44a194f9c819f99b9cfd01753a6e6d8edb6c162020ff463602452d8e9057c
-EBUILD hyper-h2-2.5.1.ebuild 970 BLAKE2B 3211e44ad349016655428007a1f83798c1b3268cc61fa53c267043baa04770522d2b9b152490634d2bafdf997aaf76e00edf27f82b131764a0880880b604947c SHA512 9a728d649ab658a90f90fbb85ffd99baeb13300c3281b104ea1df36ea8d3078411c99ab1a53319be3ccfb6e6b6c92de386317129d9b5bc8582235b012df9e62a
+EBUILD hyper-h2-2.5.1.ebuild 969 BLAKE2B 37a125cc03670d91465b632a3dcc2b16a2e373f6feb9110364961727a0db74a64d1d7ee8b8c61447a0911be5031761f6f0026e911f614a231840775a117b81f9 SHA512 ca50d7e3c3d03a2ccbe6b69db1bfc3f0a7a5a20fe1404741a3228c6c354e61815e8d61c314e9633643128ffe715a9976039cf8d6cb0802da434e57868778253a
 EBUILD hyper-h2-3.0.1.ebuild 912 BLAKE2B dbe2fa3f17fd3965a79be2266abba8a3b9ff03acc1e5e8de161aaf934c22c5e8f5a0745244e8e3ea38118d582762390b09d648057ab94b40c9960512d4a12a8d SHA512 853944aed91d876f4722e4bfcbdb9751079e5332b93deb363b958dddac7c3f50d4d1b0cd3154c20189b4f1d2a83422094e8b9282804c185c344e98605bc0ada5
 MISC metadata.xml 747 BLAKE2B ca9107ee5025360a343d9ec92424ac6be517d1e45ffb2dab10f0c37c82ee30db30a0fa9eaf7bbd0066f0e772e47a09bb11e954afe3904bfad2f672961bb608f0 SHA512 5efdebf70cf061471f14af5941c609b31c75208bc4f632b05bf017e493d4a8091a3fba335c95efacb0a1271aaae6a54589032dfa393d2844053cb859fd6b0d38
diff --git a/dev-python/hyper-h2/hyper-h2-2.5.1.ebuild b/dev-python/hyper-h2/hyper-h2-2.5.1.ebuild
index 4b1fda25ee19..528672a3e65f 100644
--- a/dev-python/hyper-h2/hyper-h2-2.5.1.ebuild
+++ b/dev-python/hyper-h2/hyper-h2-2.5.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/hyperframe/Manifest b/dev-python/hyperframe/Manifest
index e8e95f2f9e60..d8d1d2b59abc 100644
--- a/dev-python/hyperframe/Manifest
+++ b/dev-python/hyperframe/Manifest
@@ -1,5 +1,5 @@
 DIST hyperframe-4.0.1.tar.gz 16110 BLAKE2B 44e99247a818c1f7b7b31b5170b72aed08511aef2af2d3a55a4aa7609f86c067d14821b510b0ca1433a9de9213be6a0048f2e1eef4e25676807815aff7c14e27 SHA512 0970faf8711b12b4be2cb4a41b4be6d067eea57c40ee063e2ea0c15b148f1eed0214b29c9e8a4341ed453edd8679b55f290c3818157d66f247dc4ab8e3d369b9
 DIST hyperframe-5.1.0.tar.gz 17851 BLAKE2B f9c938b74699029bd39e2b1541f18111fea5ac760d9047fd09341e199948da13795d786f5a0eb8e85d698f90d07ffd02776fb82638ec1f1eb564059401291253 SHA512 5326f1b3362086a905e9c9ec63767707547428311b3ccee28d4bbf2ce729869bdc6d30a21617984ec3ac7ebef5919708fc1f2edc08d22b99a7820789408e281b
-EBUILD hyperframe-4.0.1.ebuild 499 BLAKE2B 1791b20feeca030955555a4c300154a39db1293bd65545cd19ba7f1f92635c1807208a4414b501e98d37eec520bb04eca32a1324defdc46c7891a4cd51945c91 SHA512 b559eadd904b9fa9d237155b244c6f4d631f05e6d566286ef87693f9c085df12ffbf034b2112e7bdd73a8d842896d1953fb541ae0a1d45e61c24c2eb09fb7e9d
+EBUILD hyperframe-4.0.1.ebuild 498 BLAKE2B 34db69b36514adc2a54f1ca0b7c2cf708471b3832b4f0406bd39e3706e0e1f92bb138481c5245398010890a04713d1089afd57a5ebe9c47e6fa35da33b1129dc SHA512 d2ba6a9fbee23223b23d84d018a07ce8d0d33a24f2374f5febb79823ca13a9975a3fe7575bec440503869654a41594837786768713dd847328bd2b5d6d10b976
 EBUILD hyperframe-5.1.0.ebuild 518 BLAKE2B 6977302680274d6131003c4cdc6023b109431951db71d150fd17598beda59458bf8a4bdd47df314f17f9de8d74a36e5efe318c53bfe983e3527673e37a1c6f18 SHA512 9604c1ffccdcb3910f1a566577e13f8d1ba963cf8b54de30fc45bf3c142825446b5b6425d22075b7c472fbde1933cd2b746416faa1d58d607af143f3b6f705b1
 MISC metadata.xml 702 BLAKE2B 36daaf246eae4068fb2729e91e95865e831d1449f78f2c37061adff7530225c1dc7c68e245170acabc91178fc679116d5639d4779587f05a599566507b5da5a9 SHA512 4539720057ccf3c78a94dffea4f59f628a68e9f1d0dfd6ab987dd991f2b1b5e6d1b7b46c04fe1faf2249cdb481309b8a176c1947fc99801130a4c94f6a9a0032
diff --git a/dev-python/hyperframe/hyperframe-4.0.1.ebuild b/dev-python/hyperframe/hyperframe-4.0.1.ebuild
index 70330da38bbb..02dd5890c7a5 100644
--- a/dev-python/hyperframe/hyperframe-4.0.1.ebuild
+++ b/dev-python/hyperframe/hyperframe-4.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/incremental/Manifest b/dev-python/incremental/Manifest
index a69172e6500b..08f2d1247ee1 100644
--- a/dev-python/incremental/Manifest
+++ b/dev-python/incremental/Manifest
@@ -1,5 +1,5 @@
 DIST incremental-16.10.1.tar.gz 16066 BLAKE2B 86bd85f9ea1ffe92a572b1744588f34f21e4bddc4aa80373dba47a59961183a77a338212500829440d216582ce15ab1412e9994f89486861297407f22eb989fa SHA512 b60ebc41c32f27da5a489ebd76c7fa1707a5a38c32097bfab20f355a86b490ce21acc7be157d0309a30c63b85d79f72f850587d1449110bd1a8075ca3586db5e
 DIST incremental-17.5.0.tar.gz 15527 BLAKE2B a967ba891b69e91768db213a9692da10eb9987bf962bdbc3b6fe70e337322686d58901878b72934a5abc8d9b0c9884d6e03de5b8912067f07b7562427bcba38a SHA512 91443205f7c92ec8f6502f38379c5ac2fe441435ff9490af01e5420d6bb05bb1c666dd612fc45204199a34afd533fd3de1390ca482bb554dfec7d3a22958a4bc
-EBUILD incremental-16.10.1.ebuild 607 BLAKE2B 09dbd622b4f1f90609ede801d9a815a95f79c227b8d6c3b5a5f9bd5d7d45cd9dfdbd0e91d45659ce915da866f28f1e7cc1e8f19c34d7cd4271c1c07dee1218a4 SHA512 c0093c9b4da016c5ca9a1934ae55a80f3db6cf9e622bdb9f144222a08235c3ba4789fc48862c34e43ad948c869593cc834c3f5d1887179cf373a516d770eaa35
+EBUILD incremental-16.10.1.ebuild 606 BLAKE2B 8c8d9e0245be42d301a7e97ae14a78f5890ef96f9dadc09741a4d639805da8284e543db797a4614973f4d88d54ff48e7e6bcc0d3972fb6d937d778c754bfcfb5 SHA512 98a2bd8ca3b1153eacc11922e9237368e423ddfef1be330493371b8e2236c7c6531dd81a7626f82b3eba2764b4f10092b97962794a4521a788874c3f8b56276f
 EBUILD incremental-17.5.0.ebuild 625 BLAKE2B 203fd6c9972bf24073a04cdc9de4143a3bc939d85560d73368a996abd423abe51a29803bc4db1dfeef92da0da952f18516b0108f2448bab6f7360d82b5a82a94 SHA512 6089e213243726717c6abf2111ab23b6a34c95b64323b411e40b20584954a55d6d4321ce031af5e44b500681dba6656bf6a7b52cf4c013da08b4a3837f9f0a7b
 MISC metadata.xml 554 BLAKE2B ab26ba9e5a69a853b0c0a167dfad54de819a17ad44a47a9987e8cb632bf1551151a208500f37c96543d7f577e99d6d47b4157c97b71d7ae60e88cc086a1ef1ba SHA512 a3bd82ee309e301f175da663ecda74af803631324b0d1097082ad04e6bd9e2537208fea8ebf753f38341429b1d2bfffc887ced6b707655ec862541ff93e83c6b
diff --git a/dev-python/incremental/incremental-16.10.1.ebuild b/dev-python/incremental/incremental-16.10.1.ebuild
index 31500c7670a1..8696bf422a80 100644
--- a/dev-python/incremental/incremental-16.10.1.ebuild
+++ b/dev-python/incremental/incremental-16.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/iocapture/Manifest b/dev-python/iocapture/Manifest
index a0421a999207..ece3166f0ab5 100644
--- a/dev-python/iocapture/Manifest
+++ b/dev-python/iocapture/Manifest
@@ -1,4 +1,4 @@
 DIST iocapture-0.1.2.tar.gz 13114 BLAKE2B 4404ed96cda15db41d30c10fd68747e61980c1ee173671ff496ba05af5d122eeebcbd7fa901a8ad43ffd46efe219e437e205236392855d43fa3bfdd1416ca6d9 SHA512 1205d13b107d83dcb45d5546038d8b0b5417a20a51149c405123111488c351ff81a447f10653cd3dd9ecc236e01a0fcceb6647091e38ff2fa34c69e0baff1567
-EBUILD iocapture-0.1.2-r1.ebuild 695 BLAKE2B 45176e1609abc6b6aa71fa45d801ce7ead52ecd06b53d1f33b9324ff65dbdbaa54dc989889d2c4ed78017848a0a5d8bf5e781a57e3c76eb7d96cb60f9beb87a5 SHA512 1ec63835220083849d3dd6494d25972080f9ed7028474548f5cb89ba4b88fa66a28c7025690f283262abb6266c0f7cd9c38be1b920eed6e71e22328baafdb5fb
+EBUILD iocapture-0.1.2-r1.ebuild 694 BLAKE2B e3fd1e1bb2cb37a6ffa5262549013af5b491d5393cfc503b3dc8c3856eab13b4df5ce60f8112817c0963907e7ba2d65e325b945cdd2676ee833a5998d6aa51d9 SHA512 d3f4351a4b1082cfc7f5e6bd222bf39469a900ac33641c1ff15416fd4e82624c3924c9da38adbb3b55b5db4c548268c77e7b2be7349f120b15ff8ead25983b1a
 EBUILD iocapture-0.1.2.ebuild 689 BLAKE2B 07660e86c042b8ecfec25df29c6c84ab0f317a325d8cec8edbfe428ee9f8d53630378ca7d019d6b3c62ecfd82904d520e115487a6d17629e3953997e93298681 SHA512 c892f52bd40e64cb165244d5790777ee3203bab92fd0beffde127b445d3b6cfcbe2ac350bd646f01264af41d9ee073ce00c37afa2d9eba8b43ccc45c8c5deed0
 MISC metadata.xml 368 BLAKE2B 69295da6af2e74122fdf5f62eff141417283e7e51729f0c35ff593387fcf3640bdfbeffe079427b368e175f3aa80b97637d6cbefd68e2a3a9a79155735570560 SHA512 463826d4afeb4be68800318809427cb4762f9fb7e14f6f4ed2fe84a7765dfb5acaf9d5fe2f1e339e06a092d8a4dec5d21b3a9f15fc10c9112b69e85f4903b932
diff --git a/dev-python/iocapture/iocapture-0.1.2-r1.ebuild b/dev-python/iocapture/iocapture-0.1.2-r1.ebuild
index 20efb540ea09..32d33181ccfe 100644
--- a/dev-python/iocapture/iocapture-0.1.2-r1.ebuild
+++ b/dev-python/iocapture/iocapture-0.1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ HOMEPAGE="https://pypi.python.org/pypi/iocapture/"
 SRC_URI="https://github.com/oinume/iocapture/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~x86"
 LICENSE="MIT"
 IUSE="test"
 
diff --git a/dev-python/ipaddress/Manifest b/dev-python/ipaddress/Manifest
index 3d4a3b4a62c1..6d13c1bd6f4d 100644
--- a/dev-python/ipaddress/Manifest
+++ b/dev-python/ipaddress/Manifest
@@ -3,5 +3,5 @@ DIST ipaddress-1.0.18.tar.gz 32475 BLAKE2B 7d116b1aad36bc58f9a6769b562e0b6dd260f
 DIST ipaddress-1.0.19.tar.gz 32854 BLAKE2B ea6bd0ac5418dca343e39c12e31a96aa6b13b091da05b7afcb3051251d3c8b8ce76a19f1d6b7ad2caf3f0077f6b522c4e0915a7a8eae28a72700732278ae4c6b SHA512 e49d0d0b76c108f985a5d209092495b5839195d9c4d5c975cc17c89e98d9b6bf0983f71f3b183c3974eccf0529cfb22aa8fbe384485be019da3fb74d50f1f4f1
 EBUILD ipaddress-1.0.14.ebuild 617 BLAKE2B 77e3ecef32c54642bc2e5ffeea21ea424118a86eea0cff1256b2515e7781ce7cb0c619e462753dfc92160b55ae6ddcd30576cdca424176734774e0d20872b8ba SHA512 7b21d5cd33817248dcf66651222695cd198009682bda5ed82c0013593557fa85daf7677218c58c1a635e035f4adec9ee093dfc719389f7aa6d0517156b06f08e
 EBUILD ipaddress-1.0.18.ebuild 656 BLAKE2B 6391c57a20088a880d68452cdb1bdbcd81750328444b6383119f359a92ee3c9855965ed472d939c05772ab0e7599d507565d59b84be4a18f667ab6b74b340975 SHA512 78f7b945c912c19172352c9134f7fa9896e925803a3bd8d0145b51e90bf8a1600ebf8e0bbb9418538968b84f03cc909e58ce28c6787ab24ad5f87203f5145290
-EBUILD ipaddress-1.0.19.ebuild 658 BLAKE2B 80d5edf434635b95be7a206a3256a244344f66fb11bae2429eff960791c7472f891f8f8fad2055a129be4a9e96a037405ef8b5540ede2ac58ed1c1a4d4a948d1 SHA512 37d3189672deee5ddd8d4920a8d02fd1781da28bbd7713682e2968ad042187adf5d2dab0b112c816b87876aea1943526868429c28a8a646ab95eea6879897e85
+EBUILD ipaddress-1.0.19.ebuild 648 BLAKE2B df209e9967c8f09fbfe943c8ddb38889089c451cb2b5a71e326f1d43997be58701bc0220c8968814491245af9e80c448accbca7de595c18e3c26c4ea735a30d0 SHA512 7d9caa70161db0cc6940853d02285b1ea3f26ce402417e6753cd0ef6941607cca0180cd1121d037a3875446414af09e1c12b3e1e9ea5a1281946016de2bece50
 MISC metadata.xml 501 BLAKE2B a1528e6bef6960599198e71c0bf4ef65b0feaf042d588e5a29970141703780892f907ac73aa247a94a14d00ac7e42d393ede430c39c9c322cc45403c22844182 SHA512 e3b1bcf46848fc0b6faf58d4b9df44df0d0dfb6649a6c7f3806d1ca148528ddccefb4323ebdb046ff4469c07f081a0ff0ef32d767b37d6539b77c356371ffd12
diff --git a/dev-python/ipaddress/ipaddress-1.0.19.ebuild b/dev-python/ipaddress/ipaddress-1.0.19.ebuild
index 25470870e9dd..636958f662d6 100644
--- a/dev-python/ipaddress/ipaddress-1.0.19.ebuild
+++ b/dev-python/ipaddress/ipaddress-1.0.19.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="PSF-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/jinja/Manifest b/dev-python/jinja/Manifest
index 12c18cb73703..e3b09af25d50 100644
--- a/dev-python/jinja/Manifest
+++ b/dev-python/jinja/Manifest
@@ -1,5 +1,5 @@
 DIST jinja-2.10.tar.gz 267508 BLAKE2B 3872a073bd3954a079aee74fb2f23815f75559a88a8ab6d849cc9855e158d096a1ac62c219ae7f48a54d082c3073e83749c8536439248c80494e882f6a18995f SHA512 bdfd3c4d01b39827c128cbd7f6ebc0ad1434748be41c5037ba1b23156eea1d28f805ffe2a051b4e9b5b38938615c35c8876095b0bf0bed2c139cf5ea49ae2420
 DIST jinja-2.9.5.tar.gz 486763 BLAKE2B 680b8d58056b180295b52998a573da2fe86ac8b117a942e647626aef16d42c7af89a0ba7f5ab098fcdb29bd18940e316144fea1882e15d71f67bda945b4a6ab8 SHA512 15c1b79981c4d6fcbb7fa947fe0fd7e43973433c03d6549a84deec8ad70881f7fd0d3a35160bf6371361994f838da7eb478c577de2612e004679ae51bd97b121
-EBUILD jinja-2.10.ebuild 1661 BLAKE2B 1990163cdaa3caab4e5c823de8a06eed73c94b608be15bccb87e919c9697e06b539c73202e7b797ad611db46a5ed376fd14d9e69e47214d3e8e6989e68b0e91c SHA512 7c102db950d863abd1cd63ac166338dd72dc043cceb8ea02b5a96ddfdbd8ec63d6f0f3ea68f8e7937790a4389518c72db9f84706aa7e1895438ae7e51eaa2859
+EBUILD jinja-2.10.ebuild 1651 BLAKE2B d14e808276e332938bf8df103ffb42fd6e054f3fd1c021f8192e13663e6a41196c449a269ea7e234f4b843b8b74bc5250a4023b7668d1d5cd9b5cdc26c6b854f SHA512 e243d541baf6025dfcceb4e7738a376e69a8a544628c07c6884dafdf63e27e1096c4b920ac50b6b7232d256d1735e77a3d2dfce04313ae95db662b07492ba96a
 EBUILD jinja-2.9.5.ebuild 1743 BLAKE2B a66120efe251248303966bb1f9eba2e5c27ab4447c4e30e7b26095e109f10a52f4ac7ea8694775654d2d11854849a282230a2d7f49298685e0611dfce29c09d2 SHA512 6fb29a936be6d869196433cd9fe704107bc1198668d659eab7306dc17e57d41d5ca17e1f00fd331e0d4f078fdfd7e3824f18780f9a83d0f09efafea980a90349
 MISC metadata.xml 374 BLAKE2B 7d6caffa81473cac206ff3ad29cc5be6ebc22d82bd3a7eb0befec7cd65a859aa9208851237c629d0c019307986eafda5a93d2977d62f847d68dfe5d415139daf SHA512 5c3b1f608d45786b27c3bf31f04816f6a85e2cfaa44eec5a9aa21029a2e8ab26264e87f9a6faa4c44a44d718aa8186110fb4d0878655dd76d880a7173b6e5d59
diff --git a/dev-python/jinja/jinja-2.10.ebuild b/dev-python/jinja/jinja-2.10.ebuild
index 35747dfc21a7..45e90ddca63c 100644
--- a/dev-python/jinja/jinja-2.10.ebuild
+++ b/dev-python/jinja/jinja-2.10.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 ~x64-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 ~x64-solaris"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jsonpatch/Manifest b/dev-python/jsonpatch/Manifest
index fc36ca9bd0de..711a22b36ea5 100644
--- a/dev-python/jsonpatch/Manifest
+++ b/dev-python/jsonpatch/Manifest
@@ -3,5 +3,5 @@ DIST jsonpatch-1.15.tar.gz 15544 BLAKE2B 1b9facd2a88a997356aeace8ddec9011f4f3c4d
 DIST jsonpatch-1.21.tar.gz 15208 BLAKE2B 88af93bfd7c317319d958bc3386f9551279af2fa9631c24c49231eb67398fd80f298e26957f232c9705219d4fa7033bb62f98b5d5391f6eb9f53113a1d351876 SHA512 dc902b750241833a68612430f07007080ed56dce8a7a4bdd1c042f944cd6cfdc03f4b422cc6bed6bc3b21ea390c5a281cd08181e27d6b57fc5fb657787c1d740
 EBUILD jsonpatch-1.13.ebuild 801 BLAKE2B b1c54c4c546b20febb77cac5e6401e8fe5a2fbf7029577ca46c8e016005c9e0be358af91b2a3da7f37a3beb2369732703c0f42a917af201dff72e41abd1076e5 SHA512 06bec10c49dc7a3b09f3ffa8aea48c67d75feb63384a1a0714f334dcfbb0615504b27fc2526ff8cc65edb7462be8a5856d139693db688d6b610f2af1896225d9
 EBUILD jsonpatch-1.15.ebuild 809 BLAKE2B 2fdc567d95b0862337ad6f6edce0fcb0180cfce4a0bd3c9f638b221eaa914af293578982b5067887f9b684d12a41f93979a235c5249d24cbe1c2607cc2515dab SHA512 288a6d1297c6d286b15b152796701cc71d9bdb9e9bf518ba50a169e31b4e56dbb67dfba2d8bb212582188b3d64a60b2fef312a66c94af626857febd821ae45a7
-EBUILD jsonpatch-1.21.ebuild 801 BLAKE2B 302951f0847de46c65b7c6349dd990ade5b6a87518ab82e2ba334f0351946eb13405b4e252fd7f66d65534d703eb24914e80b87831ed8212a07c909bf8b4a0f7 SHA512 087eeba0acf5d1a6c9a3017d097ee699efbda8a39cfe62c508197446dd73fac5be8de6e71ffa4938a5fb1d70c16f0bf47cd56da46488fa8169518466a4e3ca3a
+EBUILD jsonpatch-1.21.ebuild 798 BLAKE2B 8f23c63c1caaabb28fff1452e869b5c3ffd61a0decd1fc01e0e97e4d522ed6b7868aaeb886715a8f4bc7704fe5caeb4f5920c41a8e1d5ad6d3a2d24967166fd7 SHA512 e6fdec8e910502d08f01f935feb19898e72ebfcfb2e30cbb83f11e0fe0011aaeca9e7b00bda539bc27e22f0545a7c619f09cb05c6d2364f1731228aea501e915
 MISC metadata.xml 679 BLAKE2B ecac7a9a6da1482f0585c29ab1e7f1ea3729dc4c2b4640440b0a1a5eddbbbdc7d2c029c4318ab3645a4025b5e21d11015ec76b21f5b069d49a37bd74dcad6e1f SHA512 37946af836c2d8b521618688ffee4b33c1864751081c1f1cd86442e6eb6cf822cfd9dbc228f834fbd31ca63b1dd24927cdb680076e2bd7ead941558ac1d2e436
diff --git a/dev-python/jsonpatch/jsonpatch-1.21.ebuild b/dev-python/jsonpatch/jsonpatch-1.21.ebuild
index 3bf2670e142d..38b78c6233da 100644
--- a/dev-python/jsonpatch/jsonpatch-1.21.ebuild
+++ b/dev-python/jsonpatch/jsonpatch-1.21.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND=">=dev-python/jsonpointer-1.9[${PYTHON_USEDEP}]"
diff --git a/dev-python/keystoneauth/Manifest b/dev-python/keystoneauth/Manifest
index 0c44251802ca..536dbc8ac796 100644
--- a/dev-python/keystoneauth/Manifest
+++ b/dev-python/keystoneauth/Manifest
@@ -1,5 +1,5 @@
 DIST keystoneauth1-3.1.0.tar.gz 217744 BLAKE2B 4e07c7f4dd6fc097c6838b2a18105656b16f8e45dd553d2908c55fa7aeb5c8dcd2968ca0c3954be0b66044880eec7c33fd9c42413a1ae6c93258a902666bb896 SHA512 3214e08cf449a0eff35eff0400542cbb9e46051095d7955593fec89c4ba31062677f434c70c40037db213fa0e0db15c66d1058e0eca35b1d214967f7fa3fcf14
 DIST keystoneauth1-3.4.0.tar.gz 227170 BLAKE2B 57f28ce5a36362f34fcfb2f456a19332df6851a4d372fe890286b4d48469ff69a3ad7281b55d4aa338f61d437f5e07908fc55210e2085a6d9a974cf0bf451c81 SHA512 aeaefb0e5b369e36e06adc1bada104dab2c2aed22bf96cc3e20a5dd4ce8ae10869eb73ce4802faef70f191c3bbd38e3b5c3dff3606c46956fb350c0875cb7a7d
 EBUILD keystoneauth-3.1.0.ebuild 888 BLAKE2B 503f687fb600920941bc826c1a157b310797942135ad5b45fb94657fb409d6e8f8d301d8b2cd272e3c0f211d4fe8af0069a9ea1900142bdd6d898dfd03a28a51 SHA512 dadadd0754f365119b68199e92e6d7d63a2ab169f69d49c237321e8d2503df4359f46cd1d11f734a187b3142729de49c857458ab0d439a9a967306057f6e23a4
-EBUILD keystoneauth-3.4.0.ebuild 842 BLAKE2B b9b1a044ac8d8801b23cf1982832e2695ca7be2d2788466fce20c536d43d02c4b224b8b16c9a0fab97bf93ece9f85a57ba171e6ae7717831e2a5cae7f736c65f SHA512 e7b4bb92a807c5dd48ba69fe300c1596dc357482285f72fae861a8a685925f1b397fdfb8bc43c0b62ff18a494da1bb58ee6f52fee27d19073f5e8c77e36e7ce2
+EBUILD keystoneauth-3.4.0.ebuild 840 BLAKE2B fec1e19678873cf2c91afe09e92d7d59ce46933a71e0ba3d8d60064381aa65f0b8c11e223dd1b75ec00e6afa15e01e08529fd26bf0ff91c352f2befc16a496f6 SHA512 b3785bbbd9521eb91968fd56dc39b0f43138f146a7fe276e024b76e031cc23a5be995d832144aec4f2188ccb7fc70367e255fa2c18b6743bbb43c45ac266144e
 MISC metadata.xml 519 BLAKE2B 22f32029ae01c1067c8ce7c4ea3adca3e462ef4f274b278dcdbc45f74325c719df3ed89b77a6f5f40a3fdf2219b7ed1b1272a944b1e30ea2d50f4ab2b206e000 SHA512 8a00d549ee4cf755cb819cab370b9e66cea6d3396d7c15c3b644731991ad292b0a2c862b2be42e045584e1a429ff5b8950bfe55d58a904cbefaeda8d117ac117
diff --git a/dev-python/keystoneauth/keystoneauth-3.4.0.ebuild b/dev-python/keystoneauth/keystoneauth-3.4.0.ebuild
index e636a0e9f388..9a1cf63f0cc1 100644
--- a/dev-python/keystoneauth/keystoneauth-3.4.0.ebuild
+++ b/dev-python/keystoneauth/keystoneauth-3.4.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-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/keystonemiddleware/Manifest b/dev-python/keystonemiddleware/Manifest
index bc6354d8297d..e84b0bdda722 100644
--- a/dev-python/keystonemiddleware/Manifest
+++ b/dev-python/keystonemiddleware/Manifest
@@ -1,5 +1,5 @@
 DIST keystonemiddleware-4.17.0.tar.gz 204603 BLAKE2B 37c3de6b5151b8e6d6e53ae70836f2d8a068472822cf8fdb71f38bea58099281a4e2648b11605d5952e65baf1722ca539e06a337d6854136e84bfdeea149e309 SHA512 ead2eb829a2189efddb6cf0052d86d32eaca0ae7474cf0444640c0c976df66bc1cf61971891639b798ffb6745fb510fe6499e42e94cc60f2c2084ad7f06c7ab7
 DIST keystonemiddleware-4.21.0.tar.gz 207164 BLAKE2B da9e55170c4af189661b518c596caa216d44df4caf139992ddd3cb9de0f14799cb08fb02e9bb6472df1a68aff7971687109002e6308009afbd2532e32eebebb4 SHA512 2746c2524559d6de18433d3718c7caf887fc92499466c04c65bef38467e9d16f80b1907c663b47c148dc18c2aae6192a79b4d5b2387f575a69cc837971eddf76
 EBUILD keystonemiddleware-4.17.0.ebuild 2863 BLAKE2B 7ece1f2dd56dbc80e230d40144adcb93f4f5a1cb85e9f8ccffcdcfa74abaa60c3a54bcce9b75aeb197b66bf2831fb8487766cd4296be93b76369b69fa9ee467e SHA512 d0188b3155628486cf3d1dffd34f5a767e678b63ba4b936c3c5dc538b48ecdfef124c1529c1ef453139bd4c1a157510e427d1df23a90e15468006faa9fd52001
-EBUILD keystonemiddleware-4.21.0.ebuild 2668 BLAKE2B 76cbed12c40717c9ea7dff97a11a2a69395bb24620054c39efb38cd33680b24917598f5759aa9870e4076e0763fa34460066152db53bad935aa5bfeb829420c9 SHA512 829d092dcca6556307eda65618ab6cbebc98257a72f089ee4e1628771c39ff708cd02e94a1a0b682c8ce5b81b502eb2d365e8d4347551bc82ab5b820b80fa072
+EBUILD keystonemiddleware-4.21.0.ebuild 2666 BLAKE2B 9f642a6ac372cc88ca40b5b14a44dbb2bd0a6497354695b8f41422bf413bdf95dca912fef19ab5124ac3958b4456c0edf7435bc507333910f1265aaf54dcae7e SHA512 a9760ea0e9edac94d7ae2a586e1748629bcab46231e4a8d11272c6346379e0ae3f7e5b8d291aba4540ec719e65c4cd4059f3db9e0c85cdaf316436c5205fcd3e
 MISC metadata.xml 624 BLAKE2B 9431121807a163b4dac75bfe53e40ee4b86412db23d46c8fa6318ec6e0d2af338eb6423076879bbb863e7a2aa173d484d2f1a3c98211021e5357e07f9cae481b SHA512 5ca1f6ea10053be2f9f74c797cd1143f6b3ab267d0decb66f3609973c20637b55769bcb305ab70693d99d3ab09da6aa6ac7d2acc66431a4a52f6dc9aef79aa6c
diff --git a/dev-python/keystonemiddleware/keystonemiddleware-4.21.0.ebuild b/dev-python/keystonemiddleware/keystonemiddleware-4.21.0.ebuild
index 355182ce4da4..224d51ab653b 100644
--- a/dev-python/keystonemiddleware/keystonemiddleware-4.21.0.ebuild
+++ b/dev-python/keystonemiddleware/keystonemiddleware-4.21.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-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index 58bee4fc8162..c2622dc6298f 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -4,6 +4,6 @@ DIST lxml-3.8.0.tar.gz 3795205 BLAKE2B 39f3edc7efe48bd569b636de89cfcd8f7e4e88e02
 DIST lxml-4.1.1.tar.gz 2380804 BLAKE2B 4d3c4ef0472c7af7bb4185142a8274b596dd55a908d41f5295d0a78031a7efb3aef8893ca739f8db0675e44d4b0c346746a2758d31a54825c06a153203599ab9 SHA512 9542e5206f9b2f9e072c52ef8e6cf44d1aaae8ae3e7ca7e820c1fac12e716503308ccb3cebc52155b4c93799f3ebca247781fc491524d004378bd26f5cddb9d1
 DIST lxml-4.2.0.tar.gz 4282112 BLAKE2B 5dd68d984097253fac4c35d59e7b687fa1bc0699946accb66687b94e0b3d807c7c555795486828307ccbadd87aa989b6bba2d2fc71cec27e8b8e52f2762c5548 SHA512 89c7dd5d36e8816008b22b25bb02275a008fcfe26f6fdeff139ac8394bd773035bf423b9d7c4233f19985e5a8c12f936b71096c55e28957e97da0810d88de8d3
 EBUILD lxml-3.8.0.ebuild 2254 BLAKE2B af045d3431f3d876327f59cc9da8523a1936dd81a60806d939776bb01dd00ee0d8c7cb3b219725e4e3e04584dc88ec489d30e09f3623bf7cf2c91a5af351f5bc SHA512 bd042b2a97d121436bc890f017b908510e4c199a37524c0497c0adb0d81071c3061f67b0f9fc1435def6d47cd9a4970e9f7f94aba9a629b8964d351a7d58b75b
-EBUILD lxml-4.1.1.ebuild 2269 BLAKE2B 0f4a8bc8f5c7dd0b7d8a051f7db27863c711b82b91aa4526af9026b86f588a363d995e36caf3c1c4bbc6cce188c74da95b6858d42616afcde3de274edfb82ef9 SHA512 9335416193581247ac14cc264148385a6ebb5ce510117affee0446b2c9b854d54ec8137341681bcf0b4768b6235bdf3ddda6b28b025d7971de6e13d86d575757
+EBUILD lxml-4.1.1.ebuild 2259 BLAKE2B 3be6266498e8a00a126eac368f9be92a7399b489350578dd48435db1ad4a455135c95d0c77a60f06e49ab417bf25ee26f7607b3aeddef97e9bb7fe1f2e8a0717 SHA512 a65ecb58f574c937b907f396c5ee855d4e499cb6862f8da8060752955bcefd2cff71ecff8572c46759b98611c4fa921c9d01e2f968ed36cdf8e384872cdfa06b
 EBUILD lxml-4.2.0.ebuild 2026 BLAKE2B a1821db827a0a5d23e4445e1d5528ade6522c7756eaac50d491723c85bb092c7a2263d9540db0ea87771a5ab1c35b37bf7b3698ee63d08caf4ceebb6bb200258 SHA512 240dbf3a64c8fcabb02e51187022a5470311267552de6005ef077eaedafc72cc0f97f99549b29bd54770414145096ac1223f41bb415e34ca4540b4f084c1a443
 MISC metadata.xml 317 BLAKE2B ba93bbba5105423b6640b86b29f2a54ff50c9daf42424915cfe25049e983ca03c6f2fc066d4e27fe42292e8290b7091bc00d5a40f49d368a3dd6acce42c4504e SHA512 900609bfd7cd032821afb5d1f6e5c25287178f06a49e59431a710d4e76187a2b41a4a0da383d257777a2120b60f15620da37c70d145eca4a84aa30a08b824fae
diff --git a/dev-python/lxml/lxml-4.1.1.ebuild b/dev-python/lxml/lxml-4.1.1.ebuild
index 50407de9c305..5bb19ed6728c 100644
--- a/dev-python/lxml/lxml-4.1.1.ebuild
+++ b/dev-python/lxml/lxml-4.1.1.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/mamba/Manifest b/dev-python/mamba/Manifest
index 395d6fe48653..e649dada30e5 100644
--- a/dev-python/mamba/Manifest
+++ b/dev-python/mamba/Manifest
@@ -1,3 +1,3 @@
 DIST mamba-0.8.6.tar.gz 10430 BLAKE2B f3629525cfe882adb040674852ed9e725332ab19525305efd42a0fa0a0a3ab20df7a257299df525149609858792c267219eb3caf761a6f15b7d3b2557d4e98a2 SHA512 f35396bcb607c2eb10caa99f4c82924b0c75c2eeddb3d18ed5db3d5e38dca41917c23f1fcd7003b596576436cea6a02f40c352e6a11f63e472144e0ae0575198
-EBUILD mamba-0.8.6.ebuild 908 BLAKE2B 94d21dae1fb37592db95ff57823bb30025fa68ed5f1265b138f450a5e42c87d16207bca19da4fd066055a711eaf8abc63dbedc28c8a74961a5cc960e47dba3ba SHA512 da75fe2bcff3cc1ad8bcc09c57e62d97efd1be473df6289e378c9991348a169543be54931751b5aaf3458d9d336d2b2d232ef715f18f3ca3377ab7eb0ba37316
+EBUILD mamba-0.8.6.ebuild 907 BLAKE2B 0a1cd6fefad55e72853eb96c05ba01e0f266578aef50c38f3402344fa3c81fcc80ba08d428858b131aaca94d28465c44b017d1303c87f9d5e774b44092e0cc8f SHA512 15f5cd3fd5f939695f5f330a7a20ffc86860780fed5d67c0c23d17808980527c6bb58e3e8acc96e68bc7bfc1870f789739acb7d318a15c852d0d5210bd970cfc
 MISC metadata.xml 272 BLAKE2B 319bebdacca75fe0f885e35d8286f70fe5310e2592652ad84cf4c23d246a82d7159a45439588c0d94f596d1d136026e5cb22e1f492a4e2de5b2d2926c7d13079 SHA512 835f509dbc78ca30d8cd22f80e9d86c520836cfa6ce348f28e1a802940edd5724a6e6d63ea56f16a7896ac5d49abc389f567adb164d647631c6ef1e93a2d59ea
diff --git a/dev-python/mamba/mamba-0.8.6.ebuild b/dev-python/mamba/mamba-0.8.6.ebuild
index 7ddb9d87c8a8..85fd14a255bf 100644
--- a/dev-python/mamba/mamba-0.8.6.ebuild
+++ b/dev-python/mamba/mamba-0.8.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="test"
 
 CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/miniupnpc/Manifest b/dev-python/miniupnpc/Manifest
index e2c18b219799..ba6b93abb5ea 100644
--- a/dev-python/miniupnpc/Manifest
+++ b/dev-python/miniupnpc/Manifest
@@ -7,5 +7,5 @@ DIST miniupnpc-2.0.20180222.tar.gz 87018 BLAKE2B 656ae02ac6e462084252d95e579972d
 EBUILD miniupnpc-2.0.20170509.ebuild 714 BLAKE2B c5de8d25eb9c8219ac4d124c53a8af8f62b88ace08d12084a0110571ec00b2518c3a163c54dd6b2ff3fcc215449fce8b0ffa58549c7458259ad57bf86bc6da94 SHA512 a145554f2dc93f098f6a4bf70f2505d8878de57ceb44fa74c894bbd1a6f7d27e57b2ed2f2e2d1144503444a1c25ef72a244139748db7dc5877888d785c1f330d
 EBUILD miniupnpc-2.0.20171212.ebuild 757 BLAKE2B f0b24778ea05968421c18f0da2c2e44b4fe22446fd1189a8b2b672a3939171aba0342f390561583f1ce64f79c2164bc1eab543656c1290c1795eac576aef0e5a SHA512 ef1e1fbaa80d4c26240063e73a9da5e28be195faad1816587f3f92268d6128ebf602285dc1b987db0a328748a63d3f49d59e54a4a5680c6e986c5ce970b2d73d
 EBUILD miniupnpc-2.0.20180203.ebuild 759 BLAKE2B a7eb0f7a95739c12bc7d598af88739fbb8ea89b653880f90ff93b4512270caea1beff3db54b364458ee899f533f2fd30d508bed7d1e626306735b46f48418850 SHA512 21446a2e52a00e5671cf7270d07eff3a797b14afc97573dd06caedb123d1b825e31e269f3144fb1004ea69c73fcf6cbb85d499c37420801467442b6e3577ad71
-EBUILD miniupnpc-2.0.20180222.ebuild 759 BLAKE2B a7eb0f7a95739c12bc7d598af88739fbb8ea89b653880f90ff93b4512270caea1beff3db54b364458ee899f533f2fd30d508bed7d1e626306735b46f48418850 SHA512 21446a2e52a00e5671cf7270d07eff3a797b14afc97573dd06caedb123d1b825e31e269f3144fb1004ea69c73fcf6cbb85d499c37420801467442b6e3577ad71
+EBUILD miniupnpc-2.0.20180222.ebuild 758 BLAKE2B eba6abe410e2782d2f44bea832af68ae655662d46b0edc9c138fc64d73d6d0c7ac8c943bab0a76244eaed2c2f59d0a59cb4bac7fb8af6d7e8b97ecb0860e7f96 SHA512 2a5017a6e58ac9a8304c5734bfd9388b01eb487d8889b16bd478a8ff998e19d87cc4930bb7a125ea925ab8861603dde715595c9425ec32273f443ec32209070a
 MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
diff --git a/dev-python/miniupnpc/miniupnpc-2.0.20180222.ebuild b/dev-python/miniupnpc/miniupnpc-2.0.20180222.ebuild
index dd70b6c5a34d..ee184e968ec3 100644
--- a/dev-python/miniupnpc/miniupnpc-2.0.20180222.ebuild
+++ b/dev-python/miniupnpc/miniupnpc-2.0.20180222.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=net-libs/miniupnpc-${PV}:0="
diff --git a/dev-python/monotonic/Manifest b/dev-python/monotonic/Manifest
index 88351a58e194..69d96246c14a 100644
--- a/dev-python/monotonic/Manifest
+++ b/dev-python/monotonic/Manifest
@@ -1,5 +1,5 @@
 DIST monotonic-1.3.tar.gz 7211 BLAKE2B ee05b43f8734099c3d7472ff98bc815cb33cd45d33cd780f33703429773cb3f7cccbf97c3e476247b749616f16ee4493cf300ea137b6da89068c912e4689f72c SHA512 870b9530235715eda099cc332c94935ebb80f52a30523dca90639b9f8b3391dd706a9a8f3aac402ebd8c008672e84cd09b5397e954160751e71940b3a9120bd9
 DIST monotonic-1.4.tar.gz 7463 BLAKE2B c9123bb5ed5ece16014c9467c7e25dfaee8d0f30096a73f5d001b0bfc965c0c1f2b501ae39f5b490edd61f179c4e688ce4b794bdb6a842ba350d499eccd8335f SHA512 f9fa079cc325592b0bff799fabe7f9e87922cfe351776ed08be7a0060d27f81ae2c23aa7a1fac2ac2203ec26547e05fe3a918e68e6a474768b431ce860522eca
 EBUILD monotonic-1.3.ebuild 485 BLAKE2B 260a18bd71b5219dc858737b101ebd13209edeaffeb64be09138bd476902d500d8304fee42b72b259359f406c31412fa7d24d615a99d1a07a727bf2bb8b016b7 SHA512 e536452af47fbd12dfe47a5d8a637f031ca736e171f4b39d3f0f41a8b131f653e9174ddc1b3eb8f564861cf8df5d61d154b800f9d6277a4ca9741e6990f8daea
-EBUILD monotonic-1.4.ebuild 492 BLAKE2B 865111af1f1adf658c1ea17444a317a25874e0ab5d3dd648ea7b132d83e20ddbd70bb9424d8cbe51c2ac740b55dc912a50699b1c13cfd74b2d00270d458bffb9 SHA512 d6138e9c42b67e57139cc544d3b4d04fb2e0932d2d2170f8c4c52ac255d8d7560a290c9073f849f4e0a263001c3f5555226399088e63651a6273389e7b5a6a88
+EBUILD monotonic-1.4.ebuild 490 BLAKE2B f1a693d907ba48b51abda74002232a42ccfe37ccb4912e444e5aca61616726f79a4ce542cb7200072f43430b8af53fda6982be83a17f57f666d4fbe7502c8d47 SHA512 2ab6bd131db94be8a62248c8e7ed3f09f9d6ceaad663834e027bfb45fbc5c361ee44bbc5be717fbd4d2f51651f442d81ce957d29db8fc2fd61f1ac404bc42ceb
 MISC metadata.xml 265 BLAKE2B 3933f653f010c95cad9fed21d1511497c49a48ec369592bf48061a987133ef492a792274685c56a0aaa640cc1f39b2aafe6dd141191191dd1693f6ac9a9aab1d SHA512 46857509ccd598f4774b26386248a7309cde1fdf63a3edb3e75926029abff5cd653a57e213bdea8b976b452ad4ba9f35b65111f6a53ee5868ca4bf76bd8bd1f9
diff --git a/dev-python/monotonic/monotonic-1.4.ebuild b/dev-python/monotonic/monotonic-1.4.ebuild
index 4c51bdf4eef9..d5987536bf3b 100644
--- a/dev-python/monotonic/monotonic-1.4.ebuild
+++ b/dev-python/monotonic/monotonic-1.4.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 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/mox3/Manifest b/dev-python/mox3/Manifest
index fe4d7762cd45..df1f6e67017a 100644
--- a/dev-python/mox3/Manifest
+++ b/dev-python/mox3/Manifest
@@ -4,5 +4,5 @@ DIST mox3-0.12.0.tar.gz 42377 BLAKE2B d6a841c8b28d47f21ae8e6f65abb7e2079762d45cc
 DIST mox3-0.24.0.tar.gz 44846 BLAKE2B dd1a27b20fc821de79f1e1f209872c3fb66f39b2330d1dda04c5b17045e337c84920e4538d7971f025d1377f9e91abd2fca8167508c5614fee06d9fca92aaa75 SHA512 6c081cf2b1e529f3213f7f48d22ed5d2980420b2de8f49607b624d5861f8b784f2f36d8a32fae3e81fe8186c1a9c36e6c4ec7d9de172c41c0530523590ef97b6
 EBUILD mox3-0.10.0.ebuild 2093 BLAKE2B 23078bba6c6a1a04627b8c1c9d90fb4936742d061d14fe86a74934da28deeddc7a43003c3306353d6870ce15b404edd895b0cb120e35fe01de2ca80e835f816d SHA512 65dafacb31908c9e8291ebb5e3be9c8010894b882ca0f3ffec2db33da5635f3782894712ed491ef95e337411e7c6e52db4c374511e79d3d5c517daf3a77021a2
 EBUILD mox3-0.12.0.ebuild 1464 BLAKE2B f4cbc1508ddd3d3a29680e9db11d8d8a7bda44b489247599ee54befb9e2e5acc0b2a425800d952136bbdf7e1c144b9c2fb823044511e5e3eca91a3be9838b04f SHA512 07d475bbe8181819ab03d648930274ea47ef4213f41c11e08fa6958f29cd74c36e6582ce2fc21564082dae51112c48fea5add532cc5985f51d12350482148cdb
-EBUILD mox3-0.24.0.ebuild 1442 BLAKE2B d4a7064a348337c1f15bd803c7daf966791388f8a4763e3add5b09b257163f53e05dfdb9d7f44ad9485716c1e99f6ddcb2a147834131604bff6fa58a715e6e3b SHA512 9f3d082a9afd08f52154b6a64789d04a40621b18b4227f08d52f2fe8b3d49af04ac1434e3e672b65116f7afd3c5e59359caf996356ac5c809a1c6dfe2a067dcd
+EBUILD mox3-0.24.0.ebuild 1440 BLAKE2B 8a26040fa7b31ce078820eb7dbaaade6c756cd2a67517d4b922e1a642626c9ade6cd92b5f676a3b1d8fa301cb7ac94dec9d6c36041c77ba1f8f331a3682ae436 SHA512 16f32f0dd82a39d9c9fd8fd8f63bdc79c35c07d80ef30b662fd4d94f84cbc33badffd1e86a8885ceb88401e9abcf9f65e5a867298d83b7356692f342889add7e
 MISC metadata.xml 323 BLAKE2B 880203c04d889c65278f42730f465e61463109e5e8e71ffacf21d3ad98eb804d36ff66886349eec536aef71a7741a1df9496f1c8073ce1421aed9863593a9ebd SHA512 cb4be23a6eabcd2f0c9761234006bdba088200a94c23087fd3e09ac054c785bfcbe2c35ac060843cc0de2d4774298ac4c94ba8bd3e16eac9a8a4d08fa342e4f3
diff --git a/dev-python/mox3/mox3-0.24.0.ebuild b/dev-python/mox3/mox3-0.24.0.ebuild
index 6a213ae74bd4..4a42c64cee2a 100644
--- a/dev-python/mox3/mox3-0.24.0.ebuild
+++ b/dev-python/mox3/mox3-0.24.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[${PYTHON_USEDEP}]"
diff --git a/dev-python/msgpack/Manifest b/dev-python/msgpack/Manifest
index 0b2724a85692..d6e0b6bc111c 100644
--- a/dev-python/msgpack/Manifest
+++ b/dev-python/msgpack/Manifest
@@ -2,6 +2,6 @@ DIST msgpack-0.5.6.tar.gz 138292 BLAKE2B 6a3b8472b785d77e142d21464b9e52c55166a8e
 DIST msgpack-python-0.4.8.tar.gz 113641 BLAKE2B d22efe13302e28d0701b95b2dc4cf4792f9e045efdf77b31ac5c6170b503c885c265ff63387fe76a1aa67b1624963aa26d76dffb15fc2cb10cfe672b59e71b99 SHA512 59e9c43be6b92e6d10f40999e0902c350137e67a83c43bb15b273eca856a6eb39f24b625b02b40188a9365ce3101f03bfa9aa3dfff56c5c3b551533942183481
 DIST msgpack-python-0.5.1.tar.gz 138953 BLAKE2B 1fb7e5be33992808319e1444ff7f84cc13f034e60ce0ef2f72161bd4ccd0cd1ede27382bc1f365f268557c8ffe503fd12de66eb5840e79760d818e7e2f67fdcd SHA512 e5172e20bb25d2e12ba34ad2805ba4ea0776397986e8bf8e26d21353f57a2dba59a9c6669c817e4e91d5801558a50f95d81e02343f8f0292a01ec5d822fba61c
 EBUILD msgpack-0.4.8.ebuild 773 BLAKE2B ab7192dbe86ca9d4afd62ac8b243578250b31853eef5ea038e86b6e96ed016a18c9994670c5a885ea412e6613f2a7f511dd0f58c068881dc4965d0f537fc6128 SHA512 42cf014e27f2a209d362a0c10d35697fcb10628f18770b9502130f7afa59c3f077c0d34d8cf81804dd22f85a7d5704ee70236520a87b7ca9eeead015c282d8b2
-EBUILD msgpack-0.5.1.ebuild 774 BLAKE2B 086f2dfd0fa2f0590f014b1623670c448c521c52383c1b025c06c3288c904dba4825b519d14950c2c10580c38bed2037fb5d44da56bb2d4ef2784b457cce8262 SHA512 53195d9730ba6f7b082b44d8e9c18201b71806f5954047df9eb794373e6536661982d92334a015b917eee1f5e1d067c381cdf8bebaa915f7d7ad1fa150a90669
+EBUILD msgpack-0.5.1.ebuild 770 BLAKE2B f66759188f3a807081998c123c3f5e2c0da2d59861bc7e745c666b7ec6f62075c7592ae1c0b99557e336502b58ce6a0ee6f7f9557855353a8a84341183a1637e SHA512 d8229cbbfa6a4a26f1612362dbfa4b2847f15478810a646bfa9f871c4d45d5b1f3181bc3ed958721c1ccda42e786261590970b912cd93bdab748bb8566b3d4e9
 EBUILD msgpack-0.5.6.ebuild 1060 BLAKE2B 3a72f0249336cc925a9f657ef03376b208aca8cadb0b746e5cd950671bc370cf28c85117c3e1a2d3b0606eba00a0788baf5196fa34561dd189b2494c6325788a SHA512 7fba4d7ed7cfc5e720e547cf5064ce3d226588165576cfa7b899da6ef00a31570bc05285e6e9b2d4267393a88bcbe69772cb2a63b4d7a6cf9ded8673e60c1b36
 MISC metadata.xml 801 BLAKE2B 8455df40b89a2cb103d06cea5d334a70a2f9f913786c046533a3415c7dbd71387b72133ffcee0d9d2a5e2a70890c602453a4550ca2f9b5dd183f3103f278fa5d SHA512 c7633faceb2c6da02e144af13aad5256376ca60842e674f835c28f9eef9a34665ef5094fd8f1269b6d7a8b2355a9e3fba11863b1940d3ae152c126e89ef9c60b
diff --git a/dev-python/msgpack/msgpack-0.5.1.ebuild b/dev-python/msgpack/msgpack-0.5.1.ebuild
index abb50487307d..2d29ace7e2ca 100644
--- a/dev-python/msgpack/msgpack-0.5.1.ebuild
+++ b/dev-python/msgpack/msgpack-0.5.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 arm ~arm64 ppc x86"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/munch/Manifest b/dev-python/munch/Manifest
index 592f73c45634..cb0709e67771 100644
--- a/dev-python/munch/Manifest
+++ b/dev-python/munch/Manifest
@@ -1,5 +1,5 @@
 DIST munch-2.1.1.tar.gz 6565 BLAKE2B 81d0ea79df9934ec4fcd4d650dde6822258b3dbaaee8b114cb445219c89b76e40c7aaddd06306f9ba585081b556d7fa32d2e002de8bf5c071b0fe361092cd18b SHA512 5ffd78b1e062f71c73047a03949e6cddcd0eeae3a0ccccf36687140d12de9eb29161d2891a0fa2f1e70dfbc2b33c4ddab5d8a3611990718330c280ea769e85c0
 DIST munch-2.2.0.tar.gz 7108 BLAKE2B c01635adbcc1083dd539317f6619ad15bb654d1f5114d3b5f5253bbd1bf92a860d3b030233f85878780d33ca171bd08c44b37c9bdb538e4be868704861c4372f SHA512 420b9fe4486aac00b3a0d747995df46bb3fc72a5bcfa4fadbad3e3a50431493f69ca76294ae541042aaabec6e01794f8f3c9c03a5c0d6058e730dccb62e42e45
 EBUILD munch-2.1.1.ebuild 486 BLAKE2B 61a2f243cd796f5b83a3402b56dead28bd309e6c67c276a7ffb8bf303882be13d86aa6ec1952850e6f960ec728f84d4f496a6eaded8f7541eb301ef50e671932 SHA512 523651634c947b4aa0f08800bd9fd01607ce6d7db463ea7e61958e12b7b4b204165a58e6a2592e25cb0c584f59525fe1c8e810e12e2741f90b67114425db5984
-EBUILD munch-2.2.0.ebuild 493 BLAKE2B 1a2b2838330444e6bfe25d7cb186dddc4400ed54ce30e8558e39bf24be103496d8c06fa544e16782586d4faa9eb0dd149b88877d028a3702aae44a43aee80872 SHA512 e469e41a3b434ebc133652f3bd1a5fbbf19f30d96c8ad4e28b33eea3fefe56d5cfac2ce662d3bc4ec1a5288604e16972d0eb201d0a5050d84bb63942ae4dd758
+EBUILD munch-2.2.0.ebuild 491 BLAKE2B 9cefad9049dc438835dda27b4eb7f23dc6f9f420e9186f7fbb83599906875ea4b02b77ed656efe0900ed7cee1895f970c8dc1e71acc9f38c628fd0d0e65b8b66 SHA512 3fc441d774c55441920797216e58e5391e61a8f27cf966a9b37aca861f1207fa3f2a04c5bec231cc5f670f12e3edc28712f04c3b8d4109e004e40a74691ce80b
 MISC metadata.xml 348 BLAKE2B b02f6b0b5a5acc47ab4d719f9b70dd7e6a8c5d1694d374fe5eeedbede01105160c91226db47d08cbb5e290b9d57e1741b954f8c36a52d69016b8013eedd470ef SHA512 1787b144611cf1dd895b7a822ec2c5ef81e523f277c3394c4e23de466d11f1a4e22bbff019f92383de6b116ca911eff0293b4945c18d0287de07bf020303bf08
diff --git a/dev-python/munch/munch-2.2.0.ebuild b/dev-python/munch/munch-2.2.0.ebuild
index e1d463fd5a54..28b12abbf6c2 100644
--- a/dev-python/munch/munch-2.2.0.ebuild
+++ b/dev-python/munch/munch-2.2.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/Infinidat/munch"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-python/networkx/Manifest b/dev-python/networkx/Manifest
index 996c1559146a..944d1e9f3926 100644
--- a/dev-python/networkx/Manifest
+++ b/dev-python/networkx/Manifest
@@ -1,5 +1,5 @@
 AUX 1.11-sphinx-pngmath.patch 361 BLAKE2B 1cc9c5d7ac8cf426656565df9afba6e4c75459550daafbaf98f4dbaa0814deb711963a3c7fee33537143e3f45bf7367b6a7c5213f72873f9ec5a47e7ebfa2807 SHA512 2db58b8f6067ccbe66bcdb3f39a80d126bd549c6838a34907b01360b5441f8b122632f1863b51142cba8688f4705697b9cd15d8fb6534ded8a9613e374edea4e
 DIST networkx-1.11.tar.gz 1315737 BLAKE2B 9f6556af1a4e23bf7fcf51fcbc753a08f2616dfe63c7b05fbe20ad7532580bf566c44ddc5db0c0d89626a17fd2029485583b513f44688e8033ca83cb36f28315 SHA512 622c93330bb5ba93a2be087f7f19963a1bb9a50dc72b6500ea8321c36aa9da19af379c5cd4bbee8bba3cb6e68a28f11ee24bbe333047f5c7d0ce0b755fd57253
-EBUILD networkx-1.11-r1.ebuild 1931 BLAKE2B 20597ec1e3661beefaff41d089f2ad720403651543b2cfc8c90f5e1a174f590f07a7147f5e7068e0fdb71c7719767ac6e5f40a5e2f471549e4a5d8c88acdbb38 SHA512 15d2d1450b10ef2429f658d5d94464f1c71ea33e0134e75dd3e9650094571abaca44ad3eeb141aa8aea1f2db3fd06f063f6d9f2e5e96a7b917476eb4aa21d8ca
+EBUILD networkx-1.11-r1.ebuild 1929 BLAKE2B 7852413061c7b9aa3960b9263a9d372e4ea343d0cf90a9e2113150eca7fd5b2ad3c5930e3cd66e90503da639c275ca198c48cfbcabafe99d795e60db687306ae SHA512 bbe4384d6ed6dbe201840f5bbd4d44cdbc1b89e4100f8c0045cdaf45c1ace297573221fcba6b6527ca261c25e4f466acbd81bf9f3a6613ce21e27e03d0547d9c
 EBUILD networkx-1.11.ebuild 1905 BLAKE2B 2ff9b91b619fc0846a90bf0388148398e295de9095e8fe973fbcb53a45650b84b845b67633951d2e45963d6d9e45e05a7bca82ad9c91cddec91ed61a24edc7b6 SHA512 4cb7100d2083b3dcf4c4d829ae30da9d9e4632bb7117f3255f3a3af4f74e8fc1515680cde0cf27d12c2e975e540a8ac32e95549de0c2c4a3bf6e280dd8423a6b
 MISC metadata.xml 1131 BLAKE2B 59e8dfa70e76d2084bc9bf4cdaeaeee7844ed7cd58b096d840ca266b10ca5213899717f60e416f336a288ae5fcdfc764c28e3a0376388c290c42f2ca924c9f34 SHA512 d91220a26181e850a8ddb2a4cc31105bc01cac62e88ab9d76757cf0732cd680aa1568a671902790893f08508072fac160093457f3d09b670ea704d38afe49e1c
diff --git a/dev-python/networkx/networkx-1.11-r1.ebuild b/dev-python/networkx/networkx-1.11-r1.ebuild
index e94f2e4f4840..471e3405c6d4 100644
--- a/dev-python/networkx/networkx-1.11-r1.ebuild
+++ b/dev-python/networkx/networkx-1.11-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${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 examples scipy test"
 
 REQUIRED_USE="doc? ( || ( $(python_gen_useflags -2) ) )"
diff --git a/dev-python/neutron-lib/Manifest b/dev-python/neutron-lib/Manifest
index d834f22598df..36ee8bb54f71 100644
--- a/dev-python/neutron-lib/Manifest
+++ b/dev-python/neutron-lib/Manifest
@@ -1,5 +1,5 @@
 DIST neutron-lib-1.13.0.tar.gz 322076 BLAKE2B 389f0abd2c114e486df1306b58a6e6714e3106c1e175295f0a2250424553fad17303eee29d96aa7b05b48b1bf2c8ac3f4714031ae9716a351d3f4e58d16778dd SHA512 36eaa6c6c848d46389d615c1b4372f0e762aad5f5f28681523826e1b8b31284cb1278d387caf62234553db0eaa8d90e838c4145392e9d8439750ad3fd56571ca
 DIST neutron-lib-1.9.1.tar.gz 269151 BLAKE2B 82bf212f59659ad3f4774ee4bdc0dbc1ada6cde84761f1397eb506a7803d5c5d649c9ff59efaa359d4fe751a1b8864669b57b3d0afb26adefa5e9dfb329324cd SHA512 1bfe986a5174f19ebcea34220535b20b4afcebb8215d105b911badccf606f02dcda8def6f3abd49c44352f3fcc509da977646f65a371a4d94d448e7f9436302c
-EBUILD neutron-lib-1.13.0.ebuild 1690 BLAKE2B 5ee3a1683ceea2ddce4da9bf635eb3d0296172b3898a68f67e485bd205fd0224c707293a9f44eb264e356229a47500f66695d7f354128e58386d5fb1852ef08a SHA512 0f2c60d8dd3d141abfd1464454d26e5e638c95a86fedaec7b43be4e17381197b42db745ee684ee69e04f2bcfe46ae8e4b640164a5522363956a687dd1585943c
+EBUILD neutron-lib-1.13.0.ebuild 1688 BLAKE2B 8ace462d7b910488a0aeddfc2b65e457a3086dbce453b8215178f8736de21427d5f6a48e86e46224b193d10ac93683fde61917b8be5b4760fa784fbd01a7749a SHA512 f6399b34321f296e9d04058bf427832abd20683e517876ee9da1e9427a6d6ece517c8f3ed1f905d9c7ab8eafaa822643f043c92dd35d2a7ecbbee0e139576a70
 EBUILD neutron-lib-1.9.1.ebuild 1626 BLAKE2B accadcce930f49550a7bb4f4f67df0b4ed32a17d0e1f161aa2ec92e759db9f00912fdf53a4c0492bf58f1ad373bdcae88e5d9233062a4e0ab28b5151f7d59d04 SHA512 5d5751023228bf5b9a6c3b291aa7a33c34e46e65aba15cb0c40580ddcdb8b7a4676f62ec881c8efb94c8a13661c635bee38e07aa591ef8fff20bfca057570c77
 MISC metadata.xml 478 BLAKE2B 479b1ffc2e6b3de332fbdd2612c50a3471bd26615beed90810463b56122faf219cb602818de421a16c1e3227d13f5553d9db330dbbcfd6e67a725a3479566f3c SHA512 c642bad9f710c347629fca6952be3efe57e247dee81fac187d4a6458b4cb8280dc0d3d4a66e4d329bfd293b9e27edbb7a38247311fbb817088eeb70c441737bc
diff --git a/dev-python/neutron-lib/neutron-lib-1.13.0.ebuild b/dev-python/neutron-lib/neutron-lib-1.13.0.ebuild
index e5a73860ade6..496976e4f351 100644
--- a/dev-python/neutron-lib/neutron-lib-1.13.0.ebuild
+++ b/dev-python/neutron-lib/neutron-lib-1.13.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-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oauthlib/Manifest b/dev-python/oauthlib/Manifest
index e43c5e25e96b..bdadcf827d35 100644
--- a/dev-python/oauthlib/Manifest
+++ b/dev-python/oauthlib/Manifest
@@ -5,5 +5,5 @@ DIST oauthlib-2.0.6.tar.gz 127675 BLAKE2B fb9db14e06007d575fc099381b9aea8f337666
 EBUILD oauthlib-1.0.3.ebuild 1036 BLAKE2B f0eeff3327bdb91898f3cc58c795eab1dcc722a22cf1540f078652da64dbfb86c94064ec1decc062c258e8ab1ab3d1e71676a8a38b214df7f2b0d421edfa2878 SHA512 143732f61737e44b5f1e35847cb64c3e16e190a466ec952697b95f7231157df0356eea7b734ac6e2cf5c250d8834009b53bbd1518c63ec8194ee34cf9fac1e2e
 EBUILD oauthlib-2.0.2.ebuild 997 BLAKE2B 76290de7d96e3baa7dd27e1c8ea7671d97abe57d3d2463c9f17d1cfa1c8a8e3e5f18c64b6337bff5a49ef29b9c57cb16a5c4a09904efa3ee7a597416185f1dd7 SHA512 f5adfd7136d19aa45fa52127e5f3175059ccf5bc9b8a3b8f79aa21a24f8e8a2d3b1f079e304fd1a774d7fc67bf2cd0afc00cacdf014cd8620f68a9348c9c1726
 EBUILD oauthlib-2.0.3.ebuild 1002 BLAKE2B bd98cf786a007a421dc4c52b4cf95b4a98a25ebf3a4733e63609406a2dfcddb8ce44145b25a87838821134971d4d17bf501404e084ed390211732ef0cbbfa24a SHA512 240a5187a0a24a9f4513caa8c55030b32967dc30e3ac2ec28afcf58eca385a921eba43e6807f72f6302427d2ee5c5b0ae40b97376ee27ae6383f02b187cb2593
-EBUILD oauthlib-2.0.6.ebuild 1002 BLAKE2B ff422978a20ffa71770d1bd710cdcc95f95b3999693579d4bff162a795d3923ed27c9bfc13b18fcc5a120cdce6e8bbbf4bf42d3eb4cc19050fcfc2fdd59e963a SHA512 4f60faa872fc18bb78d6b2bb67da1b923f4931f9ebb7688dfa7376fd9ecb117251b4009646ad75dc4d43f147965cfd41a10c816b74595a1aba304598d5880503
+EBUILD oauthlib-2.0.6.ebuild 1000 BLAKE2B 87b83293c6555b568ef140c0385f1b7e951f920367d3ddb9f7a1dc2c63dc51c7fdef75ee955e3c4a0a3f6b594a97bd872bb9349b4ebc51e05a42ce3a33ef8802 SHA512 18636475b53ff6b7c8c718ed57a65c265035ebe4fb4f31c94e441a668f23a7acc858a6709ad4c5bbf5fc15633eccd8c4e227b7b0bbf792861d54199ca6e6f44d
 MISC metadata.xml 376 BLAKE2B cc62cffdc76d014f0c43c3cd9495942d08f592f6a3d241d8147dc907e233d7b3ed394c52e8b7767570768a50bc4b76fcfd64fb90f2860b4f7ed65f016eb69a68 SHA512 ec1f35a21ea68091f6fe901d7c05c711f891f7edcf48496dbf57312cf331e7df9465309ca90789b795efa024e3ba3ede3d0416c7d9362823cffab8fbb23fd3fe
diff --git a/dev-python/oauthlib/oauthlib-2.0.6.ebuild b/dev-python/oauthlib/oauthlib-2.0.6.ebuild
index 75343c46ee84..a1951a9802a2 100644
--- a/dev-python/oauthlib/oauthlib-2.0.6.ebuild
+++ b/dev-python/oauthlib/oauthlib-2.0.6.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/openstackdocstheme/Manifest b/dev-python/openstackdocstheme/Manifest
index 33b5eddb1fd1..6e327cda626c 100644
--- a/dev-python/openstackdocstheme/Manifest
+++ b/dev-python/openstackdocstheme/Manifest
@@ -1,5 +1,5 @@
 DIST openstackdocstheme-1.16.1.tar.gz 1179830 BLAKE2B 9f30e0206e0f7cf0e74bed486b6c4c0ee5fd8aaaf8118a4cac2da99f0cf8ffad2c1d14440177d4db232e29abfa38116a8a395b28b3efc883a22803757c0875bd SHA512 fb5c6e8d9945603dd2f09799520eaac8586784cbb1a9fa5f5c5f53e04905150646159f1d0fe4ff0e9da0e04a4df348a931272a59dd3893b5ee2cb10b4a271dd7
 DIST openstackdocstheme-1.18.1.tar.gz 1185809 BLAKE2B 253b2140109b90c63fb782f9f1e9994a2b5d422525cfca60e2d54379fca9d9ae936822b04acb29807254fbfb20ccd2c460621cede03f15d4807bdf067a565a97 SHA512 7361cc972ad036528b9b3bc58a7adb92a96142493a1ed4ccb1dab135cd33cd911d5b3fe3ed9e17a58763abf4c9abc68167d31a96b3364f3f4c139c332e7a36ec
 EBUILD openstackdocstheme-1.16.1.ebuild 594 BLAKE2B bdb509052f8f419b5a12ad99fd8fdab59f4e3985caabccfd00c9713b6e0561c3656ba68f08e1d10606ad355464d68c9a589a074ba5d49c0bc91c61cc92f1c53d SHA512 20e9b5b59e160e98bdcd2dd9dc536a805a37670ce55f81b6413c4de5bb8d0d5ffdab7b213b4f6aef63fe57092f998a9baab1bf8add9c67a034f676f441646feb
-EBUILD openstackdocstheme-1.18.1.ebuild 596 BLAKE2B 2541b118cba478508d6190cfc18dc358095acc45a57e620589e8581a3a4df9efa4ca14df192d6c612a95d32e14c662f20d29ff3367edd2dd72322dd9c186a175 SHA512 cd9d49add835eeb5c0ba567cd94a8fd471fec663d47a9056279162636af6c13bace9c1336b15211c98e1dd7b391e0525d9e0d430c1150c1e0745f795f5db8628
+EBUILD openstackdocstheme-1.18.1.ebuild 594 BLAKE2B 35ceb2986c509212aead978b7630ff93dc62d71da7aebbd2592ae1fa75db94b0bcf8526a4b4f1f15b9419d9b53524b8e5d3992ebd1dcda88f519f673bb50c6e2 SHA512 8d0e1a3b64093636ee510f479492cd8ec7aec3989a74482c63e880e678dead7ee8454fdcde49dc7ed18a8b4e72f6ab90ed2b36c722fe9e1afcda76fb1fea0d29
 MISC metadata.xml 506 BLAKE2B 71e15d9fcae38b184e8ce3a4bc3eccb1369dcee434e6d257930f955a18a7068a92a7b3e7a2d875651e36a74063350e75bf6ddbf3ce4fb00d5966c7e4113ccb4d SHA512 6111af92dd3436c323603a2351083701e9ad9108fe94dd4a5ceb29fc5e4408d2732481604f3f57936c243fc0f88f4ef6c1c351915ec65d3e3384e34c5e683ac0
diff --git a/dev-python/openstackdocstheme/openstackdocstheme-1.18.1.ebuild b/dev-python/openstackdocstheme/openstackdocstheme-1.18.1.ebuild
index 06f5782a4fea..4a641e1c516b 100644
--- a/dev-python/openstackdocstheme/openstackdocstheme-1.18.1.ebuild
+++ b/dev-python/openstackdocstheme/openstackdocstheme-1.18.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/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/openstacksdk/Manifest b/dev-python/openstacksdk/Manifest
index 4e75851ea89d..461bc51dda2b 100644
--- a/dev-python/openstacksdk/Manifest
+++ b/dev-python/openstacksdk/Manifest
@@ -1,5 +1,5 @@
 DIST openstacksdk-0.11.3.tar.gz 693350 BLAKE2B 6e5edc27a2c2d35682827fa9cf15a93bdc7cc5b5fcd440d15f7448a52fbf8fbbdb0f0f528828b23cc9585b72bde2d1537745c0176c8d117ed6fe7d40c6a01c56 SHA512 140d69d853e7e1049f2c539267f9199058b6f5a9452a80b8a6361efe70f42f07a91d94935ef75e43591a5cf70e8102aed31570c559fc89d83ce86ce26fb54d44
 DIST openstacksdk-0.9.17.tar.gz 335611 BLAKE2B 2f1ac157c957cc90d53d97dad1930a2cab7dc40c15cb76f22394762eefffa402480a8fa4b9fd30358690b401e2d362b4f7e29b8a17d0e7ef87885256d1d62bcf SHA512 4699e80ad68896cea709c861b013404234b1d6acf2fcd8bc4e8b21b8841f8c204e693c4e631a85906b5b415404cf50f35f395df6206e471920c68d2f26726696
-EBUILD openstacksdk-0.11.3.ebuild 1427 BLAKE2B f95e18f5621912f979ce86efb9358524ad3aa5bd016a5cf645c55973458447347d0122551f7c1a46b2df1dda9bad32c04fd58c9d5d9e03d15984747a719dba91 SHA512 bea38bff926c33035b36033f25228480282c930e70ecb3360eb283da481df8ef4a3651e8257eb6dad98711cd7597451a8d9482cb26e430abb684af63ae5bd7f7
+EBUILD openstacksdk-0.11.3.ebuild 1425 BLAKE2B 3a93e50e5d9f75b1579604815d49884c09fdd27a53aeb65fdcb6f0fe321ac13e5c1fa7ff4751899ea7298ac067f4c13f3a557f7e63cfbbe381db05be32bc8c3d SHA512 0fb885ef2121d2e767b84bb9a3c7cca7e4b3faa3456c587457876cc8414605aa3a8c04978dec03e47d77e8de72b55ddeb76858d48f927e46e365a58a750614c9
 EBUILD openstacksdk-0.9.17.ebuild 907 BLAKE2B 5ca73882937e040c9faa12235c9e9521dba18b6352263aa04118f03a2a20ba782187ce2d00fcd98ab6f93c02828df74f64e04bc3c726a211dbc320bc40c04b33 SHA512 225f9e9a65d17c1dbbe7d140498a2287e8b485d289c17732b482ee4e0ad942bac96c6f0ff211604f2af60cde42a5f8f29778c0b309cbb53b859d122078036a32
 MISC metadata.xml 532 BLAKE2B 6432003077d4f17d035396d83fdd85037468296b4e58c7e93a773bfd99e1d65144d88ef93709e41fa5618a300fc1c9f2e85bdb3f8520d5ca2bdbb4a9520003a9 SHA512 1dd04969556dfc8648aefe2358c81dcbb2e6c36fe487d153f0b488d3a066130f99d31edabafd15933892a0b6b1979f0edba37ca88e1d62be9898380890d0977c
diff --git a/dev-python/openstacksdk/openstacksdk-0.11.3.ebuild b/dev-python/openstacksdk/openstacksdk-0.11.3.ebuild
index 66af0c78d3ce..3e4d1dc55780 100644
--- a/dev-python/openstacksdk/openstacksdk-0.11.3.ebuild
+++ b/dev-python/openstacksdk/openstacksdk-0.11.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"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/os-brick/Manifest b/dev-python/os-brick/Manifest
index db7203f8590c..d414e9a24642 100644
--- a/dev-python/os-brick/Manifest
+++ b/dev-python/os-brick/Manifest
@@ -1,5 +1,5 @@
 DIST os-brick-1.15.5.tar.gz 161371 BLAKE2B 0fdfb5978cb1d1ca635d64f98b75210b03353c033affd9834294c4d505a0d9e580f0f829a5e5c96fdb53f1cf2a29ba63ded6fbba4ae662a5dad0d20fdf98356b SHA512 c73c0f227e68aeba80b6b5687fc876e7dfe3ba36a800b7241ed08a0f189e0a57adfdf3b3e1f63230514ddac848be84e1f05e6be6aa0f50412695c6d37124717d
-DIST os-brick-2.3.0.tar.gz 166100 BLAKE2B 073aa9f27ba75776f693b99b69e4abc73900d0d13560666335e3af0ca368dcc7ff1ef5ea4ea95e9e9aa8ba56808c3cbd78ac07d3fad82f3eae4601e0df5c398c SHA512 ab40e16ba3362a8ad5b5778bd8ea73c3a8adf831f504533d1566d563513df232747bd94ed3888fdfa7d1f519f7f50cb5022db7040afe6d8fc9c6fe43fa5d01af
+DIST os-brick-2.3.1.tar.gz 166518 BLAKE2B d58acd3ffffa6a5ca328eda9f74f4e9897846b047fc96777fb438c5e5a2fbef642e1672bd7f216acddef29138543627ef79fb6e6fc01e9e7cb34ee59663bedd8 SHA512 243d574289a95a07c43b112f9c00372a8b95560628f1d86f3ea750755b4026ef9426864a216a459c159b7275218a08df585aaf0f4f3c973d63af5a59083a6b2b
 EBUILD os-brick-1.15.5.ebuild 1636 BLAKE2B efa6611d1e5a4aff93de21ac1620ae1197cb4f279c364d3f0fc0f7938fa5039b460eafa99894003d49a82dafd75fd0bcfe34ad7f2f412e67fd78278ae8fb2151 SHA512 f2f08b712035ef08499f19d4ee4526d6549faa0a0826d9398a8ea67985cca6d570c84d2ac667a279bb411301f33e1082180fa19e71c2c65c7aee2cb0ce0daeb5
-EBUILD os-brick-2.3.0.ebuild 1479 BLAKE2B d54336772c3b71cf841803451fca4fe1338e15b886eb75c212d67a9289cc61f4d7f8a98515c04217690c93da30de2e62371b0a924424b6c098200242e75283e3 SHA512 5fc9619030e82d4a595ace1489d46620da8907164fbb0772d4c36cb127754c96fbdb43ad8852682707f2fb2fb5d7fc092643baedac5d5d66f519b9f95fc00ab7
+EBUILD os-brick-2.3.1.ebuild 1477 BLAKE2B ad6db78ca7ba97804a9027bd3dccd5b40a138d7a4b8a4661839a6201400696f0b0fddc508a3cc8d19390d88714b5ccaf85debc874195a213a206b369e776f80b SHA512 2bde7fdc7ece30455b7bb3f8cdef8001da24899c21effe9b7b1b690a78d791c8356b01f83fefe7c32bc0a949d2d90b0cc133c4be04dc7cb0ff0418755583218b
 MISC metadata.xml 381 BLAKE2B 6d5a168e81b27c1e9a5ada920a182616c150d5f5ca204e334067f4bcce2878b19152810391d0506b9e4bf1dd287bc56fda035d576c5fee64a9ff2fecfb7b39c3 SHA512 b3cdc328f38ade8cd2ebb44c533ec0c79fbd1c187999bcf6c9c04104ba7c29136f0a0d6d57016aa6c7b607e66bfc511eaeff90c6d1a9708c494f4358b324f3b9
diff --git a/dev-python/os-brick/os-brick-2.3.0.ebuild b/dev-python/os-brick/os-brick-2.3.1.ebuild
index 0214d7f04231..d441459d17de 100644
--- a/dev-python/os-brick/os-brick-2.3.0.ebuild
+++ b/dev-python/os-brick/os-brick-2.3.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-2.0.0[${PYTHON_USEDEP}]
@@ -36,7 +36,7 @@ RDEPEND="
 	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
 	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
 	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/os-win-2.0.0[${PYTHON_USEDEP}]"
+	>=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]"
 
 python_prepare_all() {
 	sed -i '/^hacking/d' test-requirements.txt || die
diff --git a/dev-python/os-client-config/Manifest b/dev-python/os-client-config/Manifest
index f92428b76b5e..8790c29b1896 100644
--- a/dev-python/os-client-config/Manifest
+++ b/dev-python/os-client-config/Manifest
@@ -2,5 +2,5 @@ AUX test_get_all_clouds.patch 662 BLAKE2B 33ae4a1400073519cb41bf048b274dcec6a018
 DIST os-client-config-1.28.0.tar.gz 64102 BLAKE2B 955f3e4387d38ef99805c9fa53032c974b68d2128c89b9525570f1736f74d4a757e43ec50957bd5fbc7c6c1bf9a9b97577058f44aa9abc77d58e917cb2670151 SHA512 80cea066eeb8dce03afa91a720b2e3449676f019f33c8ab0a3c0ecd5cfd49cd5a061abde1a4f0eb1ff947e505de74d94ba3ce71e763d2e2e4fbd1c72b313d1d9
 DIST os-client-config-1.29.0.tar.gz 65974 BLAKE2B f8632f4f4ae95941e81b039ea928bb1013d4208b93a3cf67abcb689aeb8f2f128ad309b4c86ead98ede98c2a9c44a5e0db49a32bd6e73490ce50a357f1f37bba SHA512 1b50777fb1476a58ff0b6ca9fe3015d4002eee312bc970d23284f2a05c5b27a96204c3e892b8262c8d830b1681fb7376387cc4a032736e31a3c353a0a348e752
 EBUILD os-client-config-1.28.0.ebuild 2283 BLAKE2B 9ddafe2421558c8d6af8e2ed744603e7cd98c05b7833cd5b81ae4e32f9037bf30f0f648a96d0ee44166be9a9dd381a39478101c0dd295fcbbd419927f8ac8a10 SHA512 ebdab2b24800e9467de664c7384ceb0f7878d3ab85a5f987f7b490638a32e98fae1ac0b4985dd03835c2286f6530660aff9cfa425517368039b8a13d4978d995
-EBUILD os-client-config-1.29.0.ebuild 896 BLAKE2B 65779e0aec76a037b5d24ca06c8b3d065217abff3f89d9dcc4a1eeb531fb5b6b3a6740afc588681d07ef8676f897bd0b28065f687c882831f8680776f62943da SHA512 5b4deeee2260abfcbe64647795eefdd0389f5bfbd4e39e7d847d88756ee4648612ce0cdbef96f2bbc4628168b9fe81a2556e44106939876c7175c1d651ac794a
+EBUILD os-client-config-1.29.0.ebuild 894 BLAKE2B 8cc9eaa7655743d3fb976c2c0711a269d7ca8cc6b0007ec91b959584fee51a91a8455a030df454277c78f0f37308655488af1b1423ed4cfba4dff89e506f0ed6 SHA512 6a8887eeca4787d5d70d044c0997ebf2e25bf75befb773c929c375ab246362c3dbbc76e4617e2d31b9d654d6188210193f59a1bbf21bc545a4a08bb61aff21e0
 MISC metadata.xml 450 BLAKE2B 107120c3a7de0bdacbcc1d06d9daa9dd5379da49a46cdd8d7578809654eeece85ffd309e12b5044553ebfb8b46176f614aca67d141db99e4a615f98eb140f8b5 SHA512 776aca3159f9e170b02e6d6ef52fd088fc77315fef951f24d6a4477b7a95f109dc790daf814a373df04e263c68ff4f9acf0b50c221e1ea4b932804c4355ec4ef
diff --git a/dev-python/os-client-config/os-client-config-1.29.0.ebuild b/dev-python/os-client-config/os-client-config-1.29.0.ebuild
index befab13b638f..e18734049c69 100644
--- a/dev-python/os-client-config/os-client-config-1.29.0.ebuild
+++ b/dev-python/os-client-config/os-client-config-1.29.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.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/os-service-types/Manifest b/dev-python/os-service-types/Manifest
index fa8de2d71840..398a84ebfbb9 100644
--- a/dev-python/os-service-types/Manifest
+++ b/dev-python/os-service-types/Manifest
@@ -1,3 +1,3 @@
 DIST os-service-types-1.1.0.tar.gz 20838 BLAKE2B 8fbf5b5bf9d7fefcf88f51f98a6e0326bd42c0f452d614801543b45c79cc5220aeb15d4e3225c83636cb462e03914cd235942f06a367b0a4b67805c503b63d08 SHA512 d6a5e9ce633a92c61c7ca2b44e7c0bb5fb7f28efc3bdb7e240bb8c1d06f02ce1c038e11a709508dcdc4bbb8e1245297b7dafae5b49535b69359af576bb147130
-EBUILD os-service-types-1.1.0.ebuild 570 BLAKE2B 2d7df8d37f7d730655415b3495fe5278a57acd6e2f098fb55131344ff369aee9895a40d0b73cf4b811d8dd922f67e74d0754322f7100adcf4320389054114fec SHA512 4b96627eea16f8d2799b573c7d6d3d35e9b7dded17ce77a5e307e632752fce4dfa4a09c6d002906a725aa0dd5324308f5ae457f725aa68c3463f67d3a3389a16
+EBUILD os-service-types-1.1.0.ebuild 568 BLAKE2B f983b6043f078c5772233ff82381b5fa9bfca1ea84e1262af788b078c684b5ef058d99afc3f1dc0550d2e6823889e8fff761cb8ad1a98a39d4e77c6aeafe6c2d SHA512 8dc2db79a35a115b8780e256e0b6d8dd861cf4fca9456b312e873e8d6d134c6cd082e28700e29ab371d5911c48dd35d82a5afd43578ac7ecc6522cfb73ae2173
 MISC metadata.xml 596 BLAKE2B cd24306b859d804610fccde33b67ec4e0e9ac1724449f67af93df2e98e840781d7a077daac575dd9401c03d53148192d3f520b488426d428f803ffe812fd631a SHA512 063efcfb4484e91c21d5b2d0ea66acb2362a791c402bc2f2fe5a7f8bd2401a732dc0859e9be2a87f5eed72454fc87e05eaaa7666a9f99f73b68c35baa1f734ba
diff --git a/dev-python/os-service-types/os-service-types-1.1.0.ebuild b/dev-python/os-service-types/os-service-types-1.1.0.ebuild
index 489c644e010c..e5409a2e0e46 100644
--- a/dev-python/os-service-types/os-service-types-1.1.0.ebuild
+++ b/dev-python/os-service-types/os-service-types-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-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/os-testr/Manifest b/dev-python/os-testr/Manifest
index f1da568781ff..a4b042b2da6a 100644
--- a/dev-python/os-testr/Manifest
+++ b/dev-python/os-testr/Manifest
@@ -1,5 +1,5 @@
 DIST os-testr-0.8.0.tar.gz 42102 BLAKE2B 030ee587bc6465e414f09d177abd4f75d869da7e8339e1b396da31165212cec221d156b4cb095b1466b19f8baf2dc01087559b1d6b73fbfbfd41dced3df033c1 SHA512 62b5fbb859c1a3b44bc0d57cf4b2cd0a5e6eeff540f5507efd079a73e0f9ee70813e47537b456f1bc600c87da55d05fd23aee0c215b8558cc0b5e71a55950af4
 DIST os-testr-1.0.0.tar.gz 43382 BLAKE2B c5a9b22700ce40acff8ceeb796d9fa0b840038cd285d80630b16c3399e8c188d87dc54de653d06a2c0918185e9ffd4695747f59d4d42eb158f9ea18bc361963d SHA512 2189abc76840d935d63635874ebdae7c325b392bc24a52e07e1046b47a17be6fd97ba17dc5593ae7a1e2bff9c5b0dbbfd8ade8a2382dce2223ee4047b3483cec
 EBUILD os-testr-0.8.0.ebuild 1257 BLAKE2B ecaba70b32a4021d40cb4e277c00c682dd5ef307a8bb42b592219d0d7ce93c9599479990e9cf88cf97facdb3cbe72cf50475898282534065c49ff3661e0ef3eb SHA512 9470c28f42726c1df298ba5b2e5d1cca1cec13fc9ccaf70966fd4fa59cbe4a2b6cd6046035ff1e7d2fde63fb5c802175802252456b2675788d4d902517b0bf70
-EBUILD os-testr-1.0.0.ebuild 1228 BLAKE2B 2bdcbb92ec84951b0c94a7cf02f02d02fc085cc94ba783428f9f41f22a99f6d6c638a1f246a8eb8245f648fb223119230d711cec8ee6c8c0448923e6b77d53f6 SHA512 25f737c2d6fad3a26a40d3c2aa3ed6f63d40dcc667ea6a32ed530276d6620b4462439dfff9293749e017b9ac0ac44ec327dde4a589b440f4599557438de49f9a
+EBUILD os-testr-1.0.0.ebuild 1226 BLAKE2B fcc31156beea163342aa84a9141a434d09013f878e79f79a4c285039e9faf85d5fcddafe6003ec06a4ec583cf2dd4b4b9fc4ec9aa97d3d4c635c8b7967f7e423 SHA512 a225d997bbb340967638fa8ccd23b00c3c4861f7616249b486c08b5b23d8623d2e19ca7d4eeb3ed99f548b926e03c9effd446ff9bdf44e7113d35c7a1d5e5aa8
 MISC metadata.xml 383 BLAKE2B 1d861bbcd12c0cd7c1d3798cf03163ae3a114349b3efc600179c47d71a275c211d65e8e542dc9b5c22b3b4690af4048ba85a573c7a40b8373f2783d154c050b9 SHA512 6e205857c3d2b3d94baceef580f343bee82210bf3003106ac58ad48d0403aa32c38332aee7b030eacd7d0bd272d7bcb34054e5852bd8b4870cebd0af74eb2577
diff --git a/dev-python/os-testr/os-testr-1.0.0.ebuild b/dev-python/os-testr/os-testr-1.0.0.ebuild
index a5a6ce424f55..7e2944c6a359 100644
--- a/dev-python/os-testr/os-testr-1.0.0.ebuild
+++ b/dev-python/os-testr/os-testr-1.0.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="test"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/os-traits/Manifest b/dev-python/os-traits/Manifest
index 1e6919100dc9..4d72fedf018b 100644
--- a/dev-python/os-traits/Manifest
+++ b/dev-python/os-traits/Manifest
@@ -1,5 +1,5 @@
 DIST os-traits-0.3.3.tar.gz 17374 BLAKE2B cc5707317448f66aac84e69340dc1923436846553b059753217ae51971289dc2413ce858f46fc809e80b1754c917fd431b4134b3886eaa6ffac81a4962c30730 SHA512 bd8a7a29170aee1be59ed21684ed2a5dbb1440841a54b522bd3ec31ef61c9fd4f6eecca812c8a8b927c285142801c3da190d7bb47c7b315312e10c1c81d50e27
 DIST os-traits-0.5.0.tar.gz 15775 BLAKE2B 288db72d500a3187a8520b9674982f3233f8644a537ec04971453ece394344b7310cbf133785dfee7122e1aeadebee7fd91d18f57a6ccecf0f176fd569b2bfae SHA512 2dd9019b13fc3394bf97fa9ff6c82d02d26dc6ca8ba8b32e619e9f88a9fdee0d3082e3818ca6a51eea9eb45997dfb48eee6976190b27dff6ab5b892747ce2a54
 EBUILD os-traits-0.3.3.ebuild 743 BLAKE2B 8477c162056c97ee2d1fbde0bfb05256ac0df176d3f5bbb934a464d91aa0bb4270828b7e33b2c0c382c8a973d09986adfc4ac83a88210c219ade4c1057068561 SHA512 d8e2e9af800940e588c4f14e9bc47d65a4ce3370802de0eec9743f12e54f4848741e87086d783b492fc8419e862d8e879fb85640fc34f343bcd0c7d8beb2e5ad
-EBUILD os-traits-0.5.0.ebuild 746 BLAKE2B 8923dea3bbafbde154a0b98bc79ed528844acc99f77e2862d5647f06473ab79744b3ebb7d79f5ae3e6beaafec84b420ccbb2d2102026573fd34eb250b13f36c4 SHA512 02c376c11ba0ec5c6f667e838a2679008d493149928e4ba591348b74e203200db939977d9809cc99e1d9cb570454df9f8f904e8300eece56c8c475784651713e
+EBUILD os-traits-0.5.0.ebuild 744 BLAKE2B 27701435ce043dce5de32fe1907e7d664113af2bf87ddfbbe8923c352ee145c23d62a133405b69d04a5ac129ad2f577bc22efb8a480c871ff58a7bcde6fc99c4 SHA512 f3f5b9a2212e0f92636ece8fd0ad983bf7c656bea16e216d5de2dad06765c032ff56489c25021812b658c8bacb2e5a690c6fe2c1d37f77e042b91ce6f763476d
 MISC metadata.xml 385 BLAKE2B 2ba965a78d301c8f0b65378ff482552eba70236b457b96461367e0ffa5cbab79ddac2296cab4184803f7970e4162faa0ace82762ff356eef2e739625bfc99878 SHA512 9dc66a1191f15d9a8569e229a59164a7527c2ad27c06f67d89a9a25910bdaafe70f6c9269a2482d5770105ce58a64705dde15db56b34f2568add1800df0cc42d
diff --git a/dev-python/os-traits/os-traits-0.5.0.ebuild b/dev-python/os-traits/os-traits-0.5.0.ebuild
index 9d648359e829..da6982e68223 100644
--- a/dev-python/os-traits/os-traits-0.5.0.ebuild
+++ b/dev-python/os-traits/os-traits-0.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=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/os-vif/Manifest b/dev-python/os-vif/Manifest
index 1f98c221fa19..16448dfdb522 100644
--- a/dev-python/os-vif/Manifest
+++ b/dev-python/os-vif/Manifest
@@ -1,5 +1,5 @@
 DIST os_vif-1.7.0.tar.gz 55976 BLAKE2B 8adb4043f872a76c1120774bd0453f162aa1a3877b8495b1ea32d7f2ca03ae7401885ca190b5f35bb11e7559f08a9a24ee6cee41c6603c7bbd2a987e974106a7 SHA512 815f7ba169ef4c1235ad70f31ec065179fa021701c69304385c1a95a1125db9afc1be9e6ceddfca44fe6ea1866dfdb303f7ded2914a3757b095118e41bfdd19e
-DIST os_vif-1.9.0.tar.gz 62461 BLAKE2B cc62aa95b7d131e7c95b0d228ee242fbcb4784818243ac78ba5f9899c76ce8b72c327c8f20e12bf942b96d895551dea85924f0b55c05ed1fd1eabd42c64af4a9 SHA512 a458e3d5dee698d28236b733ae29802c7bf58c1d40743622976c4498a51dec46a7481289d0511fa09231ffc48ce795c56cdeeb6297c185b474174cae59c7207a
+DIST os_vif-1.9.1.tar.gz 63535 BLAKE2B b4c017b129c2540794f85292341a165761d00439d24727fe2f421c96a7e5d6e79e8572a217064e01e62bb137f136fcfd1d51ff089c48026de82d91a8b9a22386 SHA512 d7aeec1bd277a91a1f4fbda69e5408f5648ad49ffac17d1ca54148ec30c31bd64639151988355395166747df91cd89cbed1863a2668a5bce89a10d2aea55c288
 EBUILD os-vif-1.7.0.ebuild 1467 BLAKE2B 3ded081386d3f321bd91f24b40472e600177885ff9876b8d2a2be3b54807fc0979f2d097a0214425f4c17e488f80b57625d8fb13a3d2ba5ca0b890b41f71a8e9 SHA512 62f01c13b0257c998e103fb53fa5f6549532d62f66f96ef1eb7416970721c4c9b4617b5114880cf16f3ec9e475b258b3536b4f15905b834c85c9df45f7adbb3d
-EBUILD os-vif-1.9.0.ebuild 1328 BLAKE2B 2140b7c9f96a5c23d0f31c922c2a4f1c63df1395976db86c5965e0bde6ee8ed5113aabe11244d9a09378e013a94706ee73cea564943dd741907f1c3d12fdde1f SHA512 d2e561f8987bd6afdd71ac342d57926da594839df479a989bd80b33cb838bbee381786ef601b62b12ec275afa6171c92bfcb0b3fdf4ee730c41c7464fd710c3b
+EBUILD os-vif-1.9.1.ebuild 1325 BLAKE2B 9f3e50325752e895f1cb8deabea3aff79da240d9edc1acb2a0536b0eb531675819acb4c48286f9454e7131cf1e62df8824ef142ac9c5e1fa478e5efc1ca29ee2 SHA512 88d6f4fcded98285a49178f765cfa2c3f635fd8380cd547c4ab1133e3e3315b3fe250220f79ea0418039a9cb04a837af719a54e7988ab1519a52191ae0d831a4
 MISC metadata.xml 379 BLAKE2B 9c4bc302bcb12ea964647546867a2f00cc84eda6f1193a700cd248248c6c992f6183c735ac55f021a8b89974ca336d4d840578444f02d1ac85cfdfcb8d48bc0c SHA512 3667aff7bf331a2383c2e4a854ceb0b1fa214bc605e98bcc9829dae0eb5e870ad123e9a2989a345134db916541005f54dce777c680e32ec6196785727a89831f
diff --git a/dev-python/os-vif/os-vif-1.9.0.ebuild b/dev-python/os-vif/os-vif-1.9.1.ebuild
index c641a41a126c..c99cdc556486 100644
--- a/dev-python/os-vif/os-vif-1.9.0.ebuild
+++ b/dev-python/os-vif/os-vif-1.9.1.ebuild
@@ -8,12 +8,12 @@ inherit distutils-r1
 
 DESCRIPTION="OpenStack Cinder brick library for managing local volume attaches"
 HOMEPAGE="https://github.com/openstack/os-vif"
-SRC_URI="mirror://pypi/${PN:0:1}/os_vif/os_vif-${PV}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/os_vif-${PV}.tar.gz"
 S="${WORKDIR}/os_vif-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/os-win/Manifest b/dev-python/os-win/Manifest
index b5dfa6b2e273..cb10479db143 100644
--- a/dev-python/os-win/Manifest
+++ b/dev-python/os-win/Manifest
@@ -1,5 +1,5 @@
 DIST os-win-2.2.0.tar.gz 192662 BLAKE2B 4da623f2f3fff0466156468a09477d29cda391275935dc56be06eaf7562cb153d7d00771206385b3cfada2fe86679e1a80e52e32f539a5c4e62bf9aa10967079 SHA512 02bb9b7ddaa7b3807ce66ce32242fe9938f28bde6880cf9ed461072e764e41a34a1238ccdc8b67ebc95a07ac003bb0771b8943602582ede6c8a41440f865060b
-DIST os-win-3.0.0.tar.gz 202084 BLAKE2B 61b8c5eff51e594422801c39dfe52ec720d39e9369d1fb0375e6075ee75dd0d34699cc6207548138ce2f62dabba0ed0d98ba16c54f8e0fbd4934f8c9d2a4657c SHA512 f60b07d1c5319f23133de9199d2318229f90ae7134f4830f000e06abaf4cc0246b18705710ddc8986f3fc72f79b5b4c36457c4a32c23d4b1a7b5430f1dae5e8e
+DIST os-win-3.0.1.tar.gz 202691 BLAKE2B 934f90970ccdb7890379ca6f3545936db65f104414c4de51dd8956345b4e5330a3d6db286b6fc2cbc9f218528751fea56b7836d81cb9da1f271737817b220101 SHA512 619b893f4595fda57c2d339b10bf4a7de48c711829f1e2407f981c943b76999d1ee84c15a5b91b03fcd946f16754501cede2081c5ce0ae3ffea0e6f4faaaf23e
 EBUILD os-win-2.2.0.ebuild 1317 BLAKE2B 29d61ac1b7fcef2fcfb2c7ff64b02c529044a0a01bf0c44e9c73fc0c0ced3d47b2171404e6da81532a439316f8613c4720799b0f6ac0fdea3fdacfebe9467b93 SHA512 e54a571099aa7daa338fec6baa128863bf41d592b0c8a21ae3175a8de381625219278e72e4aeee6bf94a370708be6b87188d45c5e27d4afd06a2a84e06865b49
-EBUILD os-win-3.0.0.ebuild 1215 BLAKE2B 132ef1ac930e7b99cd1135df5392f1c5ff65c5100e70232b8f59e4da8a1cc9701cf9b6f7f36b379eacfaccec23a8a74e930a4a700db2a003c6775152f652a342 SHA512 41f3d11cbae296d2d04570b6d580fa600b7cfb6759260985638cc5837fa0162ffc482678a20bcfd1a8a94a09ebcb61b245d8baa6d9b0db6dc9f0eb6d260d7e24
+EBUILD os-win-3.0.1.ebuild 1213 BLAKE2B 8346b53c3b8c1c4c30fdd39cc97c050cc1e581070c73506b254b7ab8939e2c821768b94477df153ed3a10fc97d44733c58d67c62f49a889517159cf5069bc9be SHA512 8eeb2709eae16fd78c457136b6a9e74408d8ef81c0b9b3aa4152e002ff8862591185585bedb7de28936b08fe298a7b5823d0b34bb450691c8c8d2e0d00a5c619
 MISC metadata.xml 480 BLAKE2B b17e3983e5660147a3a55a76948e00dd9e0fc800e442cdf92e4e17a70737740b749a86063f3f644b092df6e0d00d4e9c36d11f6a8ba697f214c08fd79c560008 SHA512 6454d56af0f829cf94cd211f78651a6d611eabebd8a3aaf5cf2cb92aef29107ed6efa5e974b5f9e5f6f53ed29565c1c6ac0448de72a3f21efbf73ecbcad2dd3e
diff --git a/dev-python/os-win/os-win-3.0.0.ebuild b/dev-python/os-win/os-win-3.0.1.ebuild
index 4b9a27c4fecc..95144af51b33 100644
--- a/dev-python/os-win/os-win-3.0.0.ebuild
+++ b/dev-python/os-win/os-win-3.0.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-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/os-xenapi/Manifest b/dev-python/os-xenapi/Manifest
index d28503a77842..a4ba9751618a 100644
--- a/dev-python/os-xenapi/Manifest
+++ b/dev-python/os-xenapi/Manifest
@@ -1,5 +1,5 @@
 DIST os-xenapi-0.2.0.tar.gz 73753 BLAKE2B dbb42c1fe15a55e39622876293d7797801ee4e67d152957e32e88a1d1a4503a2d70ab144216924c7d45935bbc79109a76535cc0b121df63e82468a37cb353cfc SHA512 6eb7a8b8137c6c28cf07af51ddfed9aa08ad5af3cafd48ed72d9fa909d0dd2416e17eed8a587fc5cffac55704652e24ef8e759f60806b569f2765a5fff58884f
 DIST os-xenapi-0.3.1.tar.gz 121953 BLAKE2B 4c2091fe0d7610dea7e973a6db68b0edea62d7323d09b0e3cc0c3a43b9a5a4b4509e29ee9e48755958f8d99dd5db2bb6ea13a3425c0156388e19ff986f86fa24 SHA512 24c1fa9e7b3e37b7847d7f82a533d9c92e7b551bd69681a985950d92ba22974a495e10ab7acf0f8f6a9a6fc9bf4c71820f413f948684a5b17d010dd076749cf4
 EBUILD os-xenapi-0.2.0.ebuild 990 BLAKE2B d96e4aeab528ad5b9a4a6e3abc75a98f58a774a2a12ccaf6f6c621caed71fa0810bceff018e007a2c86dfe704d9e66a078a3e80de48980d25957cbc5aab7cd6a SHA512 32e9af2a80f638343f7b2c8fbd597b64193cff8ce8cb62ed1091bc63a9055b3a8e1e70f6c9fb3e73a891a6916a796384b656c59ffabf9125581bda9be679129e
-EBUILD os-xenapi-0.3.1.ebuild 1089 BLAKE2B 114508731af8cfdbb6c21d05207290cff97ff1a09b1f1949645e46db55ceba37958a3eac5fbc6be11b22190c9314c60a5e05195b262b0e555ed0159a41988473 SHA512 515ce27fca0d169ef81062384236db8d2761c1fb1fda0a0a33ce4c98fedcc89e36abbe30699a320b01eff53f6c71841bec942c25363f693843570db52d73c0b8
+EBUILD os-xenapi-0.3.1.ebuild 1087 BLAKE2B 22e00c0c73633ba677defdae0d3ba4c898d30168eb2e89d73a2ce8e900a2e1ba95b6144fb37ea49be583bbad0e2927077f45f052ae57af1a4e58cda741db71be SHA512 27b37877d512c48719d5d710c927c27fd0f101e5ebb92be4602ca22f1cc0829884d2dc26b7df18404373a549a97b51028f4b2da922fd491f4419f612a7c4e2e8
 MISC metadata.xml 385 BLAKE2B f9d38f905be85b349d2afbc8c957f4da69f640e1156cf17ea94d64df946e836e7f1d5629f03eff601e625330320e99a1df11dea785bd142e82492beeedbe7a13 SHA512 b8a779ae9c1158dc5d435fdea67f528af82d880b858cacd091d6d9b0e1812cc0c909b46d76396785aeee8f26cb00d5ca53ce38b063c42ae05deb90efd01b586c
diff --git a/dev-python/os-xenapi/os-xenapi-0.3.1.ebuild b/dev-python/os-xenapi/os-xenapi-0.3.1.ebuild
index 277791e4eaa6..eb464e7607c1 100644
--- a/dev-python/os-xenapi/os-xenapi-0.3.1.ebuild
+++ b/dev-python/os-xenapi/os-xenapi-0.3.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/Manifest b/dev-python/osc-lib/Manifest
index e2ed3f22b46e..2af38b150c48 100644
--- a/dev-python/osc-lib/Manifest
+++ b/dev-python/osc-lib/Manifest
@@ -1,5 +1,5 @@
 DIST osc-lib-1.7.0.tar.gz 81917 BLAKE2B 3a87d42fb8baed7096e01e591d863097d5efab63fc36f0245b5311fa52a0f952a3a8a52cfc964e14630009aed7922752e7a0c5d9aeb1da0d31d7caf40c3a9a44 SHA512 a3dd3ceeaf674692fa318809b190df30d1d6be5b59355b8f0b5862f5b220452e3df0185415b35ef596158ce010b47bdfea24e5fcc3d957d38a2a89b8a5905bcf
 DIST osc-lib-1.9.0.tar.gz 86263 BLAKE2B 23105d3e0a327e0c7a9d08be59ff70b510528bbc26bf8b5fad0dbd6bb53e96773427ea4a0a6fe069ffb8270ea001e767d2e58863132938398a0d9c99a427f13d SHA512 26ade2147f5e0f7c02a2ff0ca1e0b2c369f6cbcb7d7843c4df09e5c5ae9e5e6eb7001cc9232723b2941b956fec1c7ae34457fd8ba7c45056a185576cd8abe2a4
 EBUILD osc-lib-1.7.0.ebuild 1141 BLAKE2B 7e753ba5b0f26d9ecd23ffbd01df0d33c5331fae27e62697fc7055ed16a5e3e17df2a63aab6e69a212b33838209de3416f21c22c9348a17a34fa0dda89172dab SHA512 a4bd61de7bb5cb0839ea8c391c9d9a5569e30e18e888782a7f62144bf5ad37768de56ecce6deeb5e115c7c32729e449e791f09262ca0610ae12d4c60524c87a1
-EBUILD osc-lib-1.9.0.ebuild 1191 BLAKE2B db27235cc72f89adcb0811d31cfab963af02433154142eaf6e6e790e53ed3455862fe035e4ccd289849fba94f22b7acd9f0bf00d11ebfdeb104f1b90bb2d6d53 SHA512 6217b7d46ab74f0733ed0972a78023f8e521980e9f92683a9edcfd2b738b702090c9107bf049dbec12e02df6908f554be385a21e6c6cff53792ccecf6db3b89f
+EBUILD osc-lib-1.9.0.ebuild 1189 BLAKE2B 38b4ea524fe9b78b7850f2c17d8c594ebe4372cc883ed5ec2f07c35bd7ce2fe317be7a7d7231e93506a2b833dc88d21540d1cee6fe731b20972c4ca6bcceb3fe SHA512 491475cc3399081588176ce9d933b5f808c3fc186af20da107fe88d305043db9dbba1ff3ac3a69ccc3220d449b7d33ae2c4c8e1672e1506e7276df3ebf3b3e3d
 MISC metadata.xml 703 BLAKE2B c8c0ecef0cabde0df016a0a65b6f29079fc44b98f23bfa74abd7e9c9305b3469fe103998262027d7f16d4132d0520c530d41cf28d869cf50bdec307dac6ae475 SHA512 78f928551abdf1d6c53aa4f7ab7dc4b3f6a5212157b7c31adb5019a3b88064d06c66c693493ac2bcc6cf62e0f4b3fa2c6b4e329a25ab530df72220f430bd8df4
diff --git a/dev-python/osc-lib/osc-lib-1.9.0.ebuild b/dev-python/osc-lib/osc-lib-1.9.0.ebuild
index c09ccd567c18..5e8b841f4f58 100644
--- a/dev-python/osc-lib/osc-lib-1.9.0.ebuild
+++ b/dev-python/osc-lib/osc-lib-1.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-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-cache/Manifest b/dev-python/oslo-cache/Manifest
index 73ca7ad9f073..f933d1e57c14 100644
--- a/dev-python/oslo-cache/Manifest
+++ b/dev-python/oslo-cache/Manifest
@@ -1,5 +1,5 @@
 DIST oslo-cache-1.25.1.tar.gz 51049 BLAKE2B 24e229d7c7a03fc244fe257394fcff1dc55509c6ed6a60ef8eef49c1a7660972a8412188ca96902b61463dd452bc63fed890ba27235d93dd620a93a52de706a2 SHA512 bc5b6502c6f310670ffae9b70b232ff90f0d0c04b75ba14aa4d528634f912efb243b89e229b8277e86ef3d7cbe2e81e69996c80f011d8ea4e1050646f074b297
 DIST oslo-cache-1.28.0.tar.gz 52015 BLAKE2B 897e54008ea99f367f373291d874736287dfd3d480046bdee0ab2b54969e8681144677713794ff32682b1ef65547618d5fcf403e9ae24b57768905daf7ae7f5e SHA512 44deabf9dbe3c24afd04d09f91f95d902221995130559e7895045eed98356ed9e085f5ee9b7e2bd0b4581df563a67707121b7571b0b7f822f0bb5a55b6dedafe
 EBUILD oslo-cache-1.25.1.ebuild 1190 BLAKE2B 97e324d523d406a006a66c30afe34673b7e38f8032ca070e2ffe65f8e3de794debc745d78f71fb600f324ceb2c62586e282c89f5e2c8897f2b93a307f741de75 SHA512 bb2a6e3313fb504275a7a3ec56dc60f8f94b03db0e20b11248e89464bf38502cfbc125528c8f42fb096dffb2965fe9ac16edb392ee3761f0946d01b9481e3a6d
-EBUILD oslo-cache-1.28.0.ebuild 1045 BLAKE2B a47f79ccdc2cfeaefebbe565d0d32a3a1900a0ad0c698fbafeb1bebdf8d3c64693c0894880cb484fcbae4e18eca2b6e0ce282db1f4b0ce135d88d37508b750cd SHA512 a0605886a36d3489538495e76cc53814896c2f273b57b1044e0c8cf74f0374e7ecbb3fd1e6843b8b1eac251287bddabfdc1f23289ce4f44503576e3537bb36f3
+EBUILD oslo-cache-1.28.0.ebuild 1043 BLAKE2B 14ddcf62ee2e7983559863374167be76c7deaf143ab976634533cc4628142a3afc8945037f9a1c609179cacc4a8776af44deba59d1bde2bc65cc4eb0a0d97dcb SHA512 479a3947b0caa515f94bc0bfcb2ca94f69450cea19b83bda1db7dd877f6c294707689e7742cb56c941120ba4120e9f45c7c4148d97f95561f5c8e43aae5ced21
 MISC metadata.xml 457 BLAKE2B 09e44ecf9952f5bfd930616506874014a267d8622daf6c22b3da4856d9f4bbedcb3e4e72285972da026f310c47973c0bb70c222292caf877d4f9ab6d5166955a SHA512 f98547e9de8c502afabf7c53409df90ec687159b5160c8ff2166acff4d6bce0fe69c8eec78d50f52919cd75733f44f82dea5f9cde362d22ed69200d332b9d6b7
diff --git a/dev-python/oslo-cache/oslo-cache-1.28.0.ebuild b/dev-python/oslo-cache/oslo-cache-1.28.0.ebuild
index 6c06bff91981..5c7bbdd735d9 100644
--- a/dev-python/oslo-cache/oslo-cache-1.28.0.ebuild
+++ b/dev-python/oslo-cache/oslo-cache-1.28.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-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-concurrency/Manifest b/dev-python/oslo-concurrency/Manifest
index d39d2d6266bc..a3ed34012911 100644
--- a/dev-python/oslo-concurrency/Manifest
+++ b/dev-python/oslo-concurrency/Manifest
@@ -1,5 +1,5 @@
 DIST oslo.concurrency-3.21.1.tar.gz 48866 BLAKE2B b621548173e30e7a7f3683d1f5ef3821574e780d1df99c91d8bb77d4e3d3280da395066be7c9ec95b3d3e640da694aae81943e126c8c4e6cd5f18c2db99efba6 SHA512 6d165ebf952b29d96d2d1a8b938b2ef4746c77b99a62ca596ee93e6fb6d919f183eede380763b6167cb7d372e03803556715523b7a63ad1dbadff4eede7c0bcd
 DIST oslo.concurrency-3.25.0.tar.gz 48736 BLAKE2B fe8506599d175d22c44fd52bb2c4e5f238687ba7eeb926d3f042be14e6ef8cecb3c13b010c1540c835d9bc7e587560ea391ea00b99f05553d6bfd46d2bbe3d9c SHA512 0273112cdc0a1de45ec231b672f2ed8f8fe5842dea756bc062a18247036b2fdbfbce392f3edbfbb871a2bda94412f6c82f3a634fd98a77c1df5a243babcbd4de
 EBUILD oslo-concurrency-3.21.1.ebuild 1952 BLAKE2B a9ff0a2a4c8dc730335ff225bed5221e7f17dd824234f19b10a49598edea40a2a0f75e954d4338f24fc7848e7d40f2f7d0be41968cb4707ae094aaaa6b996d3e SHA512 f5ed1e768fa298959da1c2d46db9d919ae0d52f09e1b1181dc1969136213a6b7d3a450ac04363ea837801c8e1b2bdccecf901a3927796bc7a32802d7086acfd3
-EBUILD oslo-concurrency-3.25.0.ebuild 1811 BLAKE2B 278c63067ef0cc6e40888760d0908d583e70d884874c0c3f342869a40fa79c595165ce65bfb192ca576b84532cc693bef0fd809083e86699c985247cc1e9f493 SHA512 75f1539af522616fd430c3178d06af3eb0382412da73d6ef41dd35cdc8ec1eae00668e38d918a32dd48a210ff94729862b3e9727a144006746cb551ac092e2a6
+EBUILD oslo-concurrency-3.25.0.ebuild 1809 BLAKE2B 489d50e744363b07fe992b9d6b5c2fb2fc791e1cf7491b4b17c22f575d093d5ffaa5bbea0ce87e52a74d06392b96518d9e32331b5891f2527e2e32d0730a3e34 SHA512 0c4e8fb8c1bb4298a361bb27b5f28a1d5d0ac52637973cf9209b05e4fdb1019e8c35f205ae30d589460c740dba7aa0b6a456970fa581072edda6faba7acbfdcd
 MISC metadata.xml 665 BLAKE2B d648ddb783230e648e931b39640fbb9d8a68029ae87ebe48eec97e05cadafa39dde8999fd01f8fc6b05cbd8590150b1f1444263b654ab3bb4bd3cfd2baf3d13c SHA512 de8aa8ac698d88f71b8368334e2e9c5edbc559a612e8d92379400fb73d82e44f70b9e23726fef13414e36fc159f3a8bc41753c4c83daa4d31aadef942e9a484e
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-3.25.0.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-3.25.0.ebuild
index b0254407070b..b95096e324e2 100644
--- a/dev-python/oslo-concurrency/oslo-concurrency-3.25.0.ebuild
+++ b/dev-python/oslo-concurrency/oslo-concurrency-3.25.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-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-config/Manifest b/dev-python/oslo-config/Manifest
index e0f3014e65d9..bb8a2f116b9c 100644
--- a/dev-python/oslo-config/Manifest
+++ b/dev-python/oslo-config/Manifest
@@ -1,5 +1,5 @@
 DIST oslo-config-4.11.1.tar.gz 130922 BLAKE2B ab3f142c54a09a3f512614452966f61032ae4f1a0163ac4ffd1aba13b4e2d0c52f597c401a7a0894276aa7a05879a4bfdc1d0a5f0f8fafc6e61b2770d34a6d7d SHA512 c7087080ef336d8aaf262a968495afd599f83528a7eefe6d9d13a819ca4d198964550d516abf4bb674eb4bb95c42e278b65cc9bb8e90ef3d6010e24959d393be
 DIST oslo-config-5.2.0.tar.gz 130627 BLAKE2B 7d5e78a7486ea5b24d9eaa488c70c3222da137d230912551e98fdd4a433b3979c2d8841aa4cff3d763ca356ea1f80f2cba13716569ee41e8ff7c4e6511a3d91e SHA512 fa3323926f7f7b1a79e4823dfc102027cb466728500980d9f079c2098c93006b4fdeebb2f09bda41512dc854f5dfe080b727fa2d63910e6fc609d69fab87596c
 EBUILD oslo-config-4.11.1.ebuild 2287 BLAKE2B 8195369bfe88ba2c33840cd6ac9e744d6f31bcb84048bb054d61d3928979c725ff02352023e3d103506bcb8055c15dbf00e09dde4a3adfc7e6d951dce2285117 SHA512 82404fe61a991735ba3601725986bad53a66efe4fe04abc2b357cecaf48d04e5368dcf45556b231d0ff2244710d7fdac35dd226f24ef33162083101270f31aca
-EBUILD oslo-config-5.2.0.ebuild 2061 BLAKE2B 6d5118a65f91bee40d8cadcbfaf4ad13be223c572c73976a1dd5a41235530103b6d86ba1dad9b75300056071bd6a83385e23e1009e4c3cce6937ce19cb3beafd SHA512 8c51770dcbccbb5a3d39d41f7c2250951daeb42d2dad42e2bfdd9a98a585df313b8c352edc164ca8d253430dc6dfdff19682d24dba73e9e425432f26102aa6ff
+EBUILD oslo-config-5.2.0.ebuild 2059 BLAKE2B 903926387ee247a3803ced58b569125876424f90990b28837e46cb970c795f7e3811940e34da3c80934c725fd64d5cb7a8bb4d7baae68ff9907c627158955d6e SHA512 558446547c9442ff2d42eb63ce2c69a10a8f54e30b1f4da36ea45bb20ff5b2b82361ec243d6393f2967c61f0a97a7e82e9eefc1db492d90e7c0ee0d5bad8add5
 MISC metadata.xml 670 BLAKE2B 5e3551e2fb4d57226dd82ad46f361f624d1b05ccdeffc1ce86a90692a385841ed26739a3ab01e72284fd6dc47a2607ee1bf30548a2b754944a9b975629fef261 SHA512 c09cd1761655f29d25e689ec95939fa59f4fb9a3fbd48509c0a65d2d289e073b3c60faa838e4075efafe32b2caf2b7fc3ae46af556cd50f66c37ac5ed8a1d52c
diff --git a/dev-python/oslo-config/oslo-config-5.2.0.ebuild b/dev-python/oslo-config/oslo-config-5.2.0.ebuild
index 373c353d1b24..66895c8aa974 100644
--- a/dev-python/oslo-config/oslo-config-5.2.0.ebuild
+++ b/dev-python/oslo-config/oslo-config-5.2.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/Manifest b/dev-python/oslo-context/Manifest
index 75a05baaab36..b24aff066f4b 100644
--- a/dev-python/oslo-context/Manifest
+++ b/dev-python/oslo-context/Manifest
@@ -1,5 +1,5 @@
 DIST oslo.context-2.17.1.tar.gz 27266 BLAKE2B 6d539af2d191103a411db0a7671d0ea4a9bb21d0a33e4e306ceac8455c4b0aafe594541b3cf7e565372dee66c3a7c6685b86c96256046e108ee21f74633d01a5 SHA512 f75d9cececaa095cab3b87b05ab0c4bf9f115b96ab7feb5607edd00a33440a4418692f4f6cf8a3dffbbc302758e734c4184f271e3860e65d9da95f0a97ae633f
 DIST oslo.context-2.20.0.tar.gz 28203 BLAKE2B cbb3cb6f30b1b16011caa6fdec36c19aae571125b88f642bfc52c5a8a63a2b17eb308628d9a5f19b8a0c3bd28fb0db54e5485abd10c90c9495de05263ac25709 SHA512 ce7bd92c7e22e02e91bdc86e9b697f746233a41081b4f3ebb9fe30fec8000c69f732f55de0d333b349b8e01e638ddc835fd3cf0d8f7a11aa3454466a1e87ad08
 EBUILD oslo-context-2.17.1.ebuild 1407 BLAKE2B e506841756253ffc5bf45fcc1830f216a88a66cf8a13894da49acb5ab75f11ca727a11d9f3dcd0e0fa867bbc98ffd29a1b606a49fe399861c6384656b437f076 SHA512 c156fc6f1d63f2459a321313812d596d5adceca14a83b0cd0fdeb53d3e8b240d17d0f1da6b129bad2852be00506c9b90e1bd80d8a7c6216ed5f2f192f9d80b9b
-EBUILD oslo-context-2.20.0.ebuild 1213 BLAKE2B 57c4dacc16f9e38b1c7aac2e96be4443c204ed1b2ac0300ba94f79788a6237217aa507846e7a824943281f2731f001cdfa114f08f6c51c26d6a0693cc53ec22b SHA512 b43ffb0ecd5c7f24cda55e264dc6ec728b88c7651227df19324eca9b6dd9436982db5e62dc8329489df0918a06b68e2c0dc33467ed20faf6ced2ebd8cfffb987
+EBUILD oslo-context-2.20.0.ebuild 1211 BLAKE2B c13385b4f311681dd18110427f139655c77cc7451372256a55b4f948869c7d0c1094eaab7e97e749f262c0deb5425d60cf1635c24f3b57558436341722e2dd6d SHA512 2f48bfc0b1111034ea1b5646184b4fb73e6506f85e023c4219b40db5b1a60d655f4f6fb5f816a9401bb4e35a11b57cc7ca09c98560bd5758e679710c8c0f783a
 MISC metadata.xml 700 BLAKE2B d0e048afd7e2d85b6cbadc1927d2cf83469e0c8bf31d6aa6516e8d9f6af5d07e387c975c54c2bd877a22f2a964ab6b99d7f2c70130efcb80af68368d2f4c769c SHA512 2ff5f7f1e4a65feee089f19c189a30668f09000ffe03e852d084d65f4db245e94086dea053620cfbde5a793f3c1014f84e3e3e192deb5e16e94bd46017e88bcb
diff --git a/dev-python/oslo-context/oslo-context-2.20.0.ebuild b/dev-python/oslo-context/oslo-context-2.20.0.ebuild
index 9f56c6954add..674a56cd203d 100644
--- a/dev-python/oslo-context/oslo-context-2.20.0.ebuild
+++ b/dev-python/oslo-context/oslo-context-2.20.0.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-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-db/Manifest b/dev-python/oslo-db/Manifest
index de06fe51fdb9..0cef1e99903c 100644
--- a/dev-python/oslo-db/Manifest
+++ b/dev-python/oslo-db/Manifest
@@ -1,5 +1,5 @@
 DIST oslo.db-4.25.1.tar.gz 165509 BLAKE2B ef4994857328123cfe28fb0f0e01756901c1cdb47d54ec5db40d922c8476a934511f2d387548f8da4627a4e2f8cb89f02df5f1431ff1e97a503eae4a70ae2400 SHA512 35d648466f89b14157d269d29f88ba34e51e9afacd04c27cc651e3e5fe77d94b27bc3e02ec832e0b87650ece6308f6c7a2d3ce8f7862173b545c9146eacb5b8d
 DIST oslo.db-4.33.0.tar.gz 167982 BLAKE2B a6bde0df966333048c59786971f9785c6272dae92b84877243f91945e5d72eb52e1a64b01b57fde5d7995aad7bf02075ca1dae7e4715f8d05a901535d98580fd SHA512 5886e60845afe89855ac6b990aa0bc2a3984cc860ef05c76ff751c2b4053112f89583b470765819c7cb3fb91d51110f53cbe6c9ddc5cfafb1d11dfe38a3c07ef
 EBUILD oslo-db-4.25.1-r1.ebuild 2198 BLAKE2B 769049043547e9509fd2480485ee4c0f9caeaf8aed823dde9d1498c0efb04cbdf3cb2b2ec3148eb5cc3fd0e5472293c3964b18d89062fd20f72418197c6faaae SHA512 076ba50c4a0d0e2e5420cf84418521b0fe8892bd66edeee1dc1923097864f8c6fa410574d50743e9fec884d183c33532030d02c535cac6471b96fa8c912d4ee3
-EBUILD oslo-db-4.33.0.ebuild 2053 BLAKE2B 05b85c303e78e1d9dd5354045769188ca9540a3c1d47d980e62d312c9935d2ccc1b92292ef5328f6ca6e860d2a55d64363aa9721cfcc63b313345460dcfe166c SHA512 78d70216bd686f5aec087916d96b9e9680ab65cc3d23394b8a9f55f6abdb2fae4910ffe26903779e47542e882493abf97775d2375bc53d5ed47ba4ac8e941c5e
+EBUILD oslo-db-4.33.0.ebuild 2051 BLAKE2B a4495e041056b92ca29c1b6370c851f8d436fe5d4c2eb02a35e0d368ac8b76cbb6d3e519b4903ca8888bd3e39bb16799f75ac0534c9c88dacbcba7bee4519757 SHA512 60a07462719a8b08f0f8b339f5f59d33ea5970f56ff17852ce18a6004461193e91ae76c88a06b97e1fec09ab604fff7bbc2c5aac2c58f0e0f59550340e0b4466
 MISC metadata.xml 553 BLAKE2B 692d0b1168c0d7d4ab698d04351e60ee38503f2b4f429329e5b1d680f6d3498721a6bb4bf135898ddfd3aa70378a5d399d520ab026ad1b752974f572b6add628 SHA512 381c6771ca698c6d8958ecee9805e079e0194d35ad55d0ce3543428026229450689ae681e80b33cffab498537a8874b0236aad996e843ecc00d39e943ff0f7dd
diff --git a/dev-python/oslo-db/oslo-db-4.33.0.ebuild b/dev-python/oslo-db/oslo-db-4.33.0.ebuild
index 15fd3d5ac288..2c75687bc087 100644
--- a/dev-python/oslo-db/oslo-db-4.33.0.ebuild
+++ b/dev-python/oslo-db/oslo-db-4.33.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/Manifest b/dev-python/oslo-i18n/Manifest
index 1549bef76bff..aeded5615b0b 100644
--- a/dev-python/oslo-i18n/Manifest
+++ b/dev-python/oslo-i18n/Manifest
@@ -1,5 +1,5 @@
 DIST oslo-i18n-3.17.1.tar.gz 42660 BLAKE2B 645a8341cf2bedf18932fbfa092b608da4169993a2a62aef36b869e975dfd662b7d52008aedf046b09ac10e4641e810902904b16e450a728b0f075fdee654977 SHA512 86d244eba7a887d4b8c3327487c9dd67c8e4baa52afdc05f94a229d6c1c951b8a25fc628f490320501773bb808afb8fb3b450a8d26e11b9a36a3c22baaa64544
 DIST oslo-i18n-3.19.0.tar.gz 41888 BLAKE2B 651b6e1ee2d2d6c11bd1b86b78eadf70b33338f5495fb93d58747635961df20fbf74fb2a949ef81b82efce582410f05c88806e678f688bb686b500378c77ff6e SHA512 2c12fc5ec24fbebd2624b3bf9d3043a62da84304e73a995c49b395e792bd9bd7d38a13f5e3086abe59bbb9ef43729a47eaee78ea0701ed05c15f5070af232a69
 EBUILD oslo-i18n-3.17.1.ebuild 1944 BLAKE2B f50bccee49fa6c4182b8012918efa1c905e22716ccb9e7385043da9c10ecd2fd53c5c09e2530f1088a96283e8053b91ce74e457338da3412b0d8dacf371a3ac4 SHA512 f1a189771d993733f56b44985664bafe4f0db4a53d60c7c51b143f53aa8ff5b6f375e624a3860145945575975b465cfcd3adf412ad1635baba6e30464f54f0cc
-EBUILD oslo-i18n-3.19.0.ebuild 1757 BLAKE2B 48d70d025711cc2d8376395b2412e6608cad06029714b0a0849ddb6b9548ff49c43960a4a4d7e2e0317833a2bdd80a650ad21ac9c56a1a643ea9bde75e13c6d1 SHA512 d6247e4011e46ef3a7ac4bec529546de6d5a02f2e1a1dc30ae7b262aac05a9ec239ed6ee954d2f3bb5e882ff19517e16867c8b7804b8dbcdea402a1be85df785
+EBUILD oslo-i18n-3.19.0.ebuild 1755 BLAKE2B 4f8b1a1c4b99948448456b45bc63e9f6823edd414be0b1d6e065cc178f1d1438c3165be5c2458ddab2da0c55dc48a75891043a1f519fcf993283d1cb281fa060 SHA512 3e6edb9e5fe343cc91b29896fe14f1cd24a2d83e51984b2fee0941bf35b6fd9c4bc5b96d6fa3bc0054a1f68cc6269f53d121248adcc29a664c002ea011aee839
 MISC metadata.xml 365 BLAKE2B de17547743fb15cc3453fbff770a48a4f7d7222e6a5f437064eef2269ecbc0a8ba3723893d653074364afd320894fda16f4e2f70da3dc6f60bf5e2ac763d61d5 SHA512 c3f2d54fd641ba2c5f423e2d358ccd8001354a7a3dc405af89b781ed167340b8a1dc23b3c15e70d60b72ed2d35ced17f9d4e6c1442ba8b3f919ab1788b33db37
diff --git a/dev-python/oslo-i18n/oslo-i18n-3.19.0.ebuild b/dev-python/oslo-i18n/oslo-i18n-3.19.0.ebuild
index b5bcdc237653..07468ede85f9 100644
--- a/dev-python/oslo-i18n/oslo-i18n-3.19.0.ebuild
+++ b/dev-python/oslo-i18n/oslo-i18n-3.19.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-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-log/Manifest b/dev-python/oslo-log/Manifest
index 480a52ce11b8..89d73d9267a0 100644
--- a/dev-python/oslo-log/Manifest
+++ b/dev-python/oslo-log/Manifest
@@ -1,5 +1,5 @@
 DIST oslo.log-3.30.2.tar.gz 78807 BLAKE2B d2042a185daed8aedd2f3ff7ef1a5a47b730b1a79c05e73aba60a635a459f1f683d27e422568f1798713e0d095863bbdb0580a4a6f8263c1f47a6055aa1f81ab SHA512 c4e7b9f5c7a3d813ea816b06cea58cc1d8908f4914bf3221f564c65bb8998e4fed7df96faa54d69782e5ce43258339f32330b12f51b4a4cdb9bfdd5aa092e7a6
 DIST oslo.log-3.36.0.tar.gz 81964 BLAKE2B f08a5cc5160da123e7a0acef96f94a20b4051c415056e639b4eb20a10ca725da2527a5c6c25cbce8e532606ab390bd273be54b691d52e6e93a1a51b59f8ba909 SHA512 47234c4bef09e105709b765fe0d5b297312ac73169a438f2759cbff335f059afdefc323c290a32bb587dbb6d2095de536ae7111a31e6c5b280e760b9b6b971c6
 EBUILD oslo-log-3.30.2.ebuild 2209 BLAKE2B cea9ee93a7b895c83e5fa743a9654a3a6c37b7058365199ec18767113527c37d1f2719b5d6b106c64e459a11f9a4e27d9be1585a07af0c0d8424f9c022e43fdb SHA512 116bc9e67636a9fe6dc04c46e8adeecc54725512458b395339cb6d2cda0660256f5bf5300e4916aa1b94aa57b9aba1db2e19bc2bf8d98187255ea6c848303486
-EBUILD oslo-log-3.36.0.ebuild 1972 BLAKE2B f987f6af011aae92e8007fe47cb0d6e1675fcdd83b8640f7d05b65caf28ccea6be4d99174d0bdc82ac4903c5a9a2481c234ffff7f4ff476b64780830788a4f27 SHA512 ab4c997a089545700d8e7823b8a76f046ef1edd5b2828094bf383f08cd766f532e16b25355e00cec63ab59930571166bec5924833206e42386022ce995533a83
+EBUILD oslo-log-3.36.0.ebuild 1970 BLAKE2B c3294b7538a35b276c412cb3ad3ee2c162ae0f202d6f3a6415135cf73d267041ee34e76c63471cedb8cb0cd48c7f4530341e5c0d3e837f55f8e2c24d61c2de81 SHA512 6b9e582dce7d4385d099c41372cba9d01d899324ff7c2e8788819d14fd231b8b909385d40bc192d7ef3d090cf527c792f8f0e22979e16087bcb267c96a3fc4cc
 MISC metadata.xml 882 BLAKE2B 4d0b8744bc619081ffbeea3099c745d07f12de450dccbe6dd4ddb58ee6aa87c7269cdbc2bf6daac36b5a4000e5fdb94ef056a7cd0c7557d4d909359392a2ed72 SHA512 89df6a639f1b44eccb4409c95237f3b4841312b74e74d315a169b7c6faa8a457507b7c085ebbef56b8e399cf37b27ff02474491a128880e919866a6da01a084e
diff --git a/dev-python/oslo-log/oslo-log-3.36.0.ebuild b/dev-python/oslo-log/oslo-log-3.36.0.ebuild
index 757cfe037db4..be21b76fe218 100644
--- a/dev-python/oslo-log/oslo-log-3.36.0.ebuild
+++ b/dev-python/oslo-log/oslo-log-3.36.0.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-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-messaging/Manifest b/dev-python/oslo-messaging/Manifest
index e00e04788e42..a191825860c2 100644
--- a/dev-python/oslo-messaging/Manifest
+++ b/dev-python/oslo-messaging/Manifest
@@ -1,5 +1,5 @@
 DIST oslo.messaging-5.30.2.tar.gz 317883 BLAKE2B 4003de476db2636eae2462cd3aef7bacb911e321c2cb228263482eda7a82361ec4c731872dbaa8394cfdb42759a8c5e200a03b919c0941f74da32498831394b2 SHA512 b4715c73c158414d1b65fd56c6697ff67ce24499e96ca076f8c3d5d93d0b06ca1f9f80fa0de43c5ee0d5e8de221f20b95e077738b026bac6671d1a2ec6128b08
 DIST oslo.messaging-5.35.0.tar.gz 325918 BLAKE2B d219a630b0958930bdd84693f43030c34c7beddce42f017f7f5ffddf5a6530c59b3eb29c5110a468a4606715f766a62abe3bd2d77c79ce025beafee6f322321e SHA512 30989d9418d30570ce212110b263ac7227acc3d6cd05305f7df23844253a81265c76e3fd93228e13a25399f5188431fa2f959a2c15639162abb5297a6fb7d4a1
 EBUILD oslo-messaging-5.30.2.ebuild 2145 BLAKE2B d27a718e90755170492a47c25701e55f73332037e52a0463dd3a528521c284ef3ba01600e29f9f72b8416e21ec1b1e9a4049d5c50df54f3b07749606470c9c9a SHA512 5e6d85a3f10b78d37a0d77e4dc943ac0c4400682330bf90aed803c8a30349bb9d18fa67af0de5df12519b0d096759638a79b5fd69e248d7eed889d1e9bc7c1be
-EBUILD oslo-messaging-5.35.0.ebuild 2003 BLAKE2B 5c0f4972381f55a2a061517758f681b263300afeabd60aa85d728bbac0dd078ba9c8f407bcc4054c73e0cfc5a2be975efccb8b6df7109e1954615d47867e139a SHA512 0bc7d31f67a8c7d127335c13e6450f6c24f2a8c51b050c5ceb77fd1b9f2e9ba4d4482f027d84f5d1b1fd92aae3d906a7917419fc8f036f1cea73b679e4301dd5
+EBUILD oslo-messaging-5.35.0.ebuild 2001 BLAKE2B 9b0c90909e9e9e33f7646589c72efb71220496f4c1c79e1c5acadb80849d95628e83d233cb5abe34b883a1a46eeadd2dc92196ac2b69ed49b4949426551f9dc3 SHA512 7e943e7a3a7b8a47ecc56ab6d760655af986e053bc961af7fbe5b157caa6c311d317b168708ff1af608f702d93ee0316f5accfa13b5e27c6ad43601dce44b49e
 MISC metadata.xml 606 BLAKE2B 8ec973e563bc5efc9566d127aed486c8ebb7e71183c845f87d9c073971800868e7c2eda9056dd05da0310f82a121aedfa73204709f34477e75df34937202830e SHA512 c59bfd0c40ee7623a4194afa2848759b968c81955986f5b6a692d9ec59cbf11a14734466383da626535f9fb795193ba4994f8e57ff6c6cb732a9748abdccfd35
diff --git a/dev-python/oslo-messaging/oslo-messaging-5.35.0.ebuild b/dev-python/oslo-messaging/oslo-messaging-5.35.0.ebuild
index f50bc20b0b96..af544589a999 100644
--- a/dev-python/oslo-messaging/oslo-messaging-5.35.0.ebuild
+++ b/dev-python/oslo-messaging/oslo-messaging-5.35.0.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-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-middleware/Manifest b/dev-python/oslo-middleware/Manifest
index 06f926112b7d..e609af0fd30c 100644
--- a/dev-python/oslo-middleware/Manifest
+++ b/dev-python/oslo-middleware/Manifest
@@ -1,5 +1,5 @@
 DIST oslo.middleware-3.30.1.tar.gz 56811 BLAKE2B e32cfb91a813883b8f50aa72484f679758efe1f1a0faf9fb3df25c77bc3e0c53464bc77fad95482ec002ca013e17d6f20e4318cd46373decb6ce7ce28f933884 SHA512 ec70d1a5e932c8da7bc4febce8be6b63ec8fb581e2b30051ab655a2a98689467d8e824d073cd19c8dd320d02a975ce22845ca5ea73f1c4e3b5ac9f725452a9db
 DIST oslo.middleware-3.34.0.tar.gz 55582 BLAKE2B 0e1af09d016cd5b81c5e0e719d40665ce24e0caaf28a4aae0043f99eee4e74a36669fdaa39330d0ffa13b588892480ee5081e1ffa41b431687c85964c7f30460 SHA512 ba8b418eb11f25ca929db32eb0451fdba757197e1bdba90dd56665e08daaa6f0a4dc6cc07788db4f14ebf2625312d3db69b73acc5cb425fa9e35299f22b6d451
 EBUILD oslo-middleware-3.30.1.ebuild 2265 BLAKE2B 9fec3d7aa36fdd950281046c661df5d1826763a49d3c08215a0dc45ba151b6f019440f689fa34acdff22a01311946aea09f916259dbea15fddb7583350c90e75 SHA512 d1809bdc071a0187b4177b3088605b3a7ca66c8b50c23dc0a4ff3eb5bca33b7e374b65e2d660ae99d9088597c4c397815ca484e356c0ae7947f787c2667d035a
-EBUILD oslo-middleware-3.34.0.ebuild 2189 BLAKE2B c46ca81aad3c0fab09c3a7717ddb02adedefb6a3b93c5ea95ac6bc7b625217dce9b9a89144233f1b226d965367e6b715c46c85b8c97d7ec3b9f697987c3361c8 SHA512 615235b3e93f9aba67b554f25dbcb2bf67f1c0eb163ba1d69e0709ad9f31759e650f468c90a9a536f7600d5fbb384ee73f2163977e6f68c4cf15b2fe7f0ee0a7
+EBUILD oslo-middleware-3.34.0.ebuild 2187 BLAKE2B 7495c056bd2618f69f369b77b474186bbc44a601e8bc3a665919b9c786b511cd37afe302b28f9e0d32905fa9b3a347164e34923cb71a61c7e627fad288163b6f SHA512 6cd53b4d2a5d1aa10c8ed6bbb7abbcb5c5adc6ca205a9272f440435f334423b5d02c9cabdef7d3c1cc224e05eeeb2c02b825c39a6cfcfc929bc3b237f006f79d
 MISC metadata.xml 766 BLAKE2B 09e791c996ee3e46083287243f3180ad073f53611981ef527b166c7c251401b2a3c34b8c0db8142ad77b4d4a82b92e43696b36f5fe80f7077e92928d5a825930 SHA512 38381c4dd993470e01cb5d469f345880a730b9afb3536b467a6e86243174192db346dfad58282e17d1bc0bcfb33e08b0f1797577e938c982e633cec8719d468e
diff --git a/dev-python/oslo-middleware/oslo-middleware-3.34.0.ebuild b/dev-python/oslo-middleware/oslo-middleware-3.34.0.ebuild
index 5d1d13467205..00150703ccce 100644
--- a/dev-python/oslo-middleware/oslo-middleware-3.34.0.ebuild
+++ b/dev-python/oslo-middleware/oslo-middleware-3.34.0.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-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-policy/Manifest b/dev-python/oslo-policy/Manifest
index f01349c1cfbc..dc78b8902cd7 100644
--- a/dev-python/oslo-policy/Manifest
+++ b/dev-python/oslo-policy/Manifest
@@ -1,5 +1,5 @@
 DIST oslo.policy-1.25.2.tar.gz 72984 BLAKE2B 7f2e4d48309082c1069ffcb561502c71b86e0c5508bb07cff943a1fc32fbbec8a232451937b678842909779e94b7eecdd5f2991152e0c8ca557a58b1ce137fc7 SHA512 8d66fe73d7b9d381c54997d980833e4e5d429a9ca28343adf777af20042694bf5dd878f9c1a9ed7168c075816e4b37263f9b520274bbdccbe0c6649b7cd7d213
 DIST oslo.policy-1.33.1.tar.gz 74314 BLAKE2B dda781284b77a6677f9a5dd55473bc239a5b482e635a8e0e808f918ad7aa6f2a8178676f9584a15c418cad373e9f34f6a24bfc462c053f06d0993786fb5ede0d SHA512 50d2c146afe04f669c0d7f3e7309a9d03883ca72fece4135e20f7d8a75b71a5a69b9b5b26e36b6afb0fd162c4ddcc5566c08cdf26dbf3bd9679f5ff75c27d722
 EBUILD oslo-policy-1.25.2.ebuild 1322 BLAKE2B d2bce22aab9c3dd8dbabb2c7fa089baa3f4a4bd8f0148fd53d9b049e36eb2ad9d1603f7f3643d5c2c1d91de605f3e6605b116b670797d6e368c02f0a9a8213c6 SHA512 1e661429bb1e19c495a7f8b945e5762abc69b0293205761a5f4919749af44f5c3d32654ceb6ad31558dc8161ca1b17309130f98c737e91c71e86e889c8d30756
-EBUILD oslo-policy-1.33.1.ebuild 1177 BLAKE2B ea0ef8623404ea29963c3af942a036af3f090f1a8ef48a63c1304ba690703a4cf442a13941396fb686dbca08bbb33743da21b10975178d0c85704461c9ea9555 SHA512 b4bb872a792437b535046e33221933d19636af64bf0497d37f01a80fdde6e0b6bdbaaa47bbdc359ed503cc01c046bba1946e6cc9d92c3dda52af209491a8ab6f
+EBUILD oslo-policy-1.33.1.ebuild 1175 BLAKE2B f8334b04397ad92c87ec834ac697351b833ab1fba8e23b55f20171d6100111d8fd80112132750caa9f1a86e42557c7451df584ac16c31d916908441b4ab90538 SHA512 db201a710a8f388e4df88fd053748d456d308077a8358e2c50f579714e0bdac72a6a65d48061db167ee03954f4b90d457a655328058998bf96e7ac6d317a7608
 MISC metadata.xml 600 BLAKE2B 5c911411e88182db677743ddc559bdbd0695f12648a00fc6b0474535ba52493eb2dc291f51a2fd37701a17f951627fabd83c1ae3c616331c200fa231eb3c4dce SHA512 82a8956e15cd74342d77c66c47b96a5b35c9ccf7871f4f4c4c27970737f69abda5664dba601e98bd9df0bd958d2450462eda4c7477d5dd10af7b7bb11c7f4bbe
diff --git a/dev-python/oslo-policy/oslo-policy-1.33.1.ebuild b/dev-python/oslo-policy/oslo-policy-1.33.1.ebuild
index 16797b7c55cf..1ce4176797c8 100644
--- a/dev-python/oslo-policy/oslo-policy-1.33.1.ebuild
+++ b/dev-python/oslo-policy/oslo-policy-1.33.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/oslo.policy/oslo.policy-${PV}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-privsep/Manifest b/dev-python/oslo-privsep/Manifest
index 72d171a822d6..19b38e90ca5e 100644
--- a/dev-python/oslo-privsep/Manifest
+++ b/dev-python/oslo-privsep/Manifest
@@ -1,5 +1,5 @@
 DIST oslo.privsep-1.22.1.tar.gz 32602 BLAKE2B 1dff51174aaf3b8b8c2c5006e476f8b6f386f071cffd5038c9261af3696a7ab1e05e8ab400a6c15a1dc050363e991587d8234ee6a99dfacd20f10162779766df SHA512 fc71b92b9a73e9de5003bf3e9288eca6a128c8d98abb51e5e372823a8ad549aa484bec3ab2bd0ccffe527282f96f12dd02c0bdcd0680b123649ac452ad4c0a7e
 DIST oslo.privsep-1.27.0.tar.gz 32766 BLAKE2B 307bed6c5dac28eb38cb4bbb1b001cdd579ae1148c63de43aee7d740901cf53a9b6d619baf5cb5263b30b398017f3411d0ef065590f0710bf0becb85df08b879 SHA512 1a7980bb0dff17314081745b60037bb84a0ba0ac5f2784b4cf4dcadc2cc9cea0158c7c64652823c7ac2e9071db8f915cf68ae2b08c634d21ec51ff75c017a3e6
 EBUILD oslo-privsep-1.22.1-r1.ebuild 1875 BLAKE2B 55bc78f8995506b428772a81a5813468d29fec991f42f1de216d1eced89d72decee82f34257649bfee8998b1e98c1a29b6e64bce695d3be896ff200d62b93b76 SHA512 9cfdf14794e52e09af2ff35caa378464e885de9403b7a64f0e3502afe99bb5eeb9a3ec91c92825287e2333ec7c69ce67c4c5c46fb6401b4750d02dd3fe0c376d
-EBUILD oslo-privsep-1.27.0-r1.ebuild 1740 BLAKE2B f5276ed7f934a304cf9f6a6e1deb36ba08842f4b2f01b13df3713dacd31fce70e8431e2443b0fdca220706f0b39b087d0ad6a54eb70551186ec8974728a365a2 SHA512 8f573ea4cb43815ef5327d593a7e0dfbc0d5cbac213ce1d47fc5dc8f64e35981673f81c480d18f9b9d45bb034a0b1439814ba73ee4d4da85f32e89b1f8c1baf8
+EBUILD oslo-privsep-1.27.0-r1.ebuild 1738 BLAKE2B 3413885657389ef60a71b98d392d564ec4acc3e549cc1529d1eaddc752be82e5f44d77b3c3ec473764886bdf988492281339098eb5e453aaf3b505415fc09c02 SHA512 12b47da14a6349bf5b4a9a087d8f79226222fe1d2a034db75df4be658e0f6746c35ae2f2ec4b36cde27120dad284db21464a7aa65b98ac9cffd7f84248a60c9f
 MISC metadata.xml 544 BLAKE2B a76322f18a6f2b32d17934a5d8c747963f5bf647cae027babcc4508c4b15ad6c958baa30399247302aa696dcde2ade3a9ae4552de7c1538d4b0af79b3da2ce69 SHA512 f7f8a7194b5439872af70f9ae742bf8cb6e338b8100e3cddbdea34be89c187c5475d6e0523dac5cc886a85133d18bb8669ef9292228e4351d31122c73561dd30
diff --git a/dev-python/oslo-privsep/oslo-privsep-1.27.0-r1.ebuild b/dev-python/oslo-privsep/oslo-privsep-1.27.0-r1.ebuild
index 9d5c86fdc138..9be292c6be7c 100644
--- a/dev-python/oslo-privsep/oslo-privsep-1.27.0-r1.ebuild
+++ b/dev-python/oslo-privsep/oslo-privsep-1.27.0-r1.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=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-reports/Manifest b/dev-python/oslo-reports/Manifest
index a6b507fb5725..d5314196e629 100644
--- a/dev-python/oslo-reports/Manifest
+++ b/dev-python/oslo-reports/Manifest
@@ -1,5 +1,5 @@
 DIST oslo.reports-1.22.1.tar.gz 48151 BLAKE2B f3867bf3c6c7fd207b1e730e8c96098d74b42239107999194bcef295ae0a86048bed7f47498a5d4a0186d15d48f97d897850fd2558eaae7bc386b9401c01155a SHA512 c2c7f35fe80df9393cb1d9add59a7be95586ee078074548795f881c8515073946bcf3dfda02536850b943f346a6b81bfffa1d9f461f0cafdf6163da09b6d07d4
 DIST oslo.reports-1.26.0.tar.gz 48691 BLAKE2B 670c3c7205dd2ceba1559d296cbb697045aa088f7343614e82c9c5983166f34e90af33de43c55b1d865715c840ea3a12fcff697a798a5eb0b2a120a39c4895c8 SHA512 e4a8bb5cdfaf1cb82f53fc56060f2e6bfde85ad6933326faab2ce8f8181231510700712d191c1429cb264f70a79695a069fe9dae93aa4a70aafa3efe37898603
 EBUILD oslo-reports-1.22.1.ebuild 1349 BLAKE2B e6e3c2cbcf89616d6ea7a30ca9e0a622cfde35683209f7cf56aec7afb718699ea5d0cf3fa276eb24ba5cd9dc111cd6ae5784b0542f6f4510f9cc81cfc3af7527 SHA512 34a44e0e2b3feda056aaec1b61996cd7bf7838b9a98304bc74565d543f2f013ec90a2b37181884b61020f16f05d20a365326929b2b717ea84e3a3798c527828e
-EBUILD oslo-reports-1.26.0.ebuild 1304 BLAKE2B 3fdaee1a88f7b212227a8271689c97bd33dc4a4f04e41b8db5ca6625a9611a395856008df051bef5111152d14e7b1b6d5a5b25109b885e45c32e49ca71d8538c SHA512 8187d6d2b7be2aac44109a18679440f776bc3661e9e723f3ac706d43d616f1138916c06140dc5fb47aa1d5e26352647166d63879fa4c60536e4fd275e5d9c71c
+EBUILD oslo-reports-1.26.0.ebuild 1302 BLAKE2B 95958aee8ad0b36bfc3a9d6afbed135ae14807639574053af8656496be0c518d166fb4a1b64a9807c8db3caa3234c08f4dd8ef93ce33461bc8668de99081b16e SHA512 75b3555d9bc0bea15de449a88ae6349a365d77711b8b6b100750033915a433058890b003f2eacd608b1c6480005d5b3453f93a674942a3d3712950f0f28439f7
 MISC metadata.xml 329 BLAKE2B 431c4b925c3e743ab9f24b399affb6c0debc3c81f2dff9fc3e30c04af99b1984b8b8ee56d143c5f130a2c77f3bcecc0ff905d07fad2e3301ce5ca1b7920715d9 SHA512 61b44fd1704b8cee9c664efea764a36fc32e5019e5b9c7fca107b8a3a3272a7f97c525827b6ea918d0f91e9098f19fa164df62c83cf617b8125886aee633c1ec
diff --git a/dev-python/oslo-reports/oslo-reports-1.26.0.ebuild b/dev-python/oslo-reports/oslo-reports-1.26.0.ebuild
index 68cdd6bbdb74..b3a5574f2bf8 100644
--- a/dev-python/oslo-reports/oslo-reports-1.26.0.ebuild
+++ b/dev-python/oslo-reports/oslo-reports-1.26.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-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-rootwrap/Manifest b/dev-python/oslo-rootwrap/Manifest
index ae9173ffbf35..6c3ebd3f6b6f 100644
--- a/dev-python/oslo-rootwrap/Manifest
+++ b/dev-python/oslo-rootwrap/Manifest
@@ -1,5 +1,5 @@
 DIST oslo.rootwrap-5.13.0.tar.gz 43433 BLAKE2B 8d53587f63022255683d18b8ce22dca07a160d7692e9d2fcd5e6c466bb6969da11a9a1af4646809921724b9f1b63b2532728bd3ade82312354793b6b4d15f0d4 SHA512 ff716e1e5900f754617578eb8bf60c1d2794474706f22a0c619c94177602ed3c3acde42ad499a7a613f310d6dffe526339b5cd1c96ecc727dcc43e1a9afd606c
 DIST oslo.rootwrap-5.9.2.tar.gz 43716 BLAKE2B 4e455fe52c6f20824bf220a8444dfcdc916dfd85f0ff42edf8e3a6b8a065a45344122f56272943cc06f88fc272522af9914dd2a961d3c98c30ba66741419aa1e SHA512 3ad7c2d028c3052476bc26c00bf34c421b44db59cae2d45b5d1041902c14227f6de89a9b8fb36f123c9a9e477dcee42e567425439d9d3eb12a5f701c5a13be6b
-EBUILD oslo-rootwrap-5.13.0.ebuild 1625 BLAKE2B 50ecdc2aeb0a79a1c0ba444b413e4f6d6a14d8a83940667a7ac05e131c1db2b7f69a257880cc6f55638eabd616ce0df1ec08f636f54fecdc91803f59b434ac3a SHA512 472a1679af4f11b524b0c44a8ab0228410b06ab6e1c805e370bf7a960bf525e922d611d59dacaf2c0a29151ba0455d80d875cccafe91361d3aa19387e2fc7bc9
+EBUILD oslo-rootwrap-5.13.0.ebuild 1623 BLAKE2B 1510f483b35b013fb5bd88bbc9e544f78116b6c2b12ac603c57364b5e14a4ebc37834094d08fcd08bd5fbd111e569bdcbb290c2736f95b21640c0ba6d99041e9 SHA512 0a126406e644dcfc5c7559340202bc4892f2f61aa1ebcfbb5956e5b141a5662fbd116734ddbc2208c420d58e39e9e8050ea9f9f09e0089360449adc362ae10de
 EBUILD oslo-rootwrap-5.9.2.ebuild 1669 BLAKE2B 53d58d7ca0a805c8135b2c838cc0df32a2b505c02831d6a386b7809159528fe098f6afc69ec96c06af513a8004b2e811730734e6874c29f6284dc146414aa430 SHA512 319d8a02de07d5a621a0945b08db483ad8d01b81cce61171f6cd816ec15bc52f3e6bbac203b4145835f08073a792534861db938ad7ef6f44830ca41f01cc38c9
 MISC metadata.xml 600 BLAKE2B 93dce16794b8495f34be98af703ca0ba06ff4a2e378805f7f3b08d4805f01ad015a1144124e1ad32eb63e6b5c9a9378aea30a4b82eeab54b1cb9dc95280fc6fd SHA512 ad1012d9f43875065679837f787f6a8087876d4ef1e56d24fcd2aa379c85e628848dcf5fa03e84e5929cdfabc4c1b6e2f7167ac0a508f7f26b6b533405932e10
diff --git a/dev-python/oslo-rootwrap/oslo-rootwrap-5.13.0.ebuild b/dev-python/oslo-rootwrap/oslo-rootwrap-5.13.0.ebuild
index 3d47240431fc..4df559686182 100644
--- a/dev-python/oslo-rootwrap/oslo-rootwrap-5.13.0.ebuild
+++ b/dev-python/oslo-rootwrap/oslo-rootwrap-5.13.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=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-serialization/Manifest b/dev-python/oslo-serialization/Manifest
index 94b95c1ca697..67b4c7bc17b5 100644
--- a/dev-python/oslo-serialization/Manifest
+++ b/dev-python/oslo-serialization/Manifest
@@ -1,5 +1,5 @@
 DIST oslo-serialization-2.20.2.tar.gz 29486 BLAKE2B 73fda86ced11c7c6dfb1a15c761645583cee463521285dc194cc1aebd5ef100832190bb0b07f825472286dab8ffc4dbed5cf6183fd86128bd74d51c5d15996a8 SHA512 1bcf50a090a0ec74d1aca7de6cc83f7451778eae7335427d11f732120ec99163441ee0bde13df6e660574c7ac5fcafe746cdbcb421e57f02d782f2405d5e33c7
 DIST oslo-serialization-2.24.0.tar.gz 28948 BLAKE2B 8e57d14b21deefd8058f4dd677493072b0bfdc08bfb18faae2f6a09c4ab4e29ce544e479427a6c6557e0ca78fd7b525aa6a8ab3443a01c3d856ee3556f5f3f5e SHA512 8c2103409d9ec2ebfd45eefb56ed42b1ca52c0f8eaf5deff1020a67f813c8524d1bffd81d97a1ad28c80b4a5afeaebca829c4580e635f514900fd0835782990c
 EBUILD oslo-serialization-2.20.2-r1.ebuild 2121 BLAKE2B 0327f0aebd652a806fb46c3b31a89ec8398a922ebafb1398c525a73644b69f009d4969a6dc25d0702fbed1b303415c1f77e9bf456b4d043acb0f1bd995aa1314 SHA512 3dc7ad2ab2ca0b742cbef75a086584e4efbb96573b9447a25f0f456505203de2c35c6c49ea7b367bae7cd5ab087cc9c43b9cd91fa6f21dede5d09e387b71dacc
-EBUILD oslo-serialization-2.24.0-r1.ebuild 2029 BLAKE2B 07747f8c0aefc46c52fac0c838282153314c5df2ba7d9189d91d487b1e637c98d9f9cd8f0fb4302578b1735fe83e71f06198bb9b1b9ee104d67b696d931573d9 SHA512 89fc617f79de88b9f975e44ff1b873670d929f642005ad841359f237bad2c0406357394774f9a3bce3e14a8681381b4876bdcbacf8fbc3c0de7a8c07b22667fa
+EBUILD oslo-serialization-2.24.0-r1.ebuild 2027 BLAKE2B b411e051b9cb06e30654ff21da7d18b0656f29c01fde80972e7a2312de9e50b48c479a3abbfcc6a3c1bfc12ef98743411d6eb3f139ffec13f42a919c97665aea SHA512 9d797c32bccd9cf4b68165aae2125b1eb5b0e3004d19403cd261e520b5da9148cc2405aa286c6efbf44d30f210799ab6021a91e3f53d83ee330d01bcb52747a6
 MISC metadata.xml 374 BLAKE2B dc4d16d6259d728baf0c2e3427ce5788baba2b57442d67d02dc487dce353dd993b4f306d7dcb2c1a426f88db55e2be58dfe69731819082458e6305242d07bcd6 SHA512 97704036d1f08927b8c0f96604506f2a0ca3665a939f49f0f6c3e9274afb470121f93e6281a88769bd43651b61a43ff8919291244959dc1b73956c71da3fcde9
diff --git a/dev-python/oslo-serialization/oslo-serialization-2.24.0-r1.ebuild b/dev-python/oslo-serialization/oslo-serialization-2.24.0-r1.ebuild
index adad76ab9afe..fe630e7dcf4e 100644
--- a/dev-python/oslo-serialization/oslo-serialization-2.24.0-r1.ebuild
+++ b/dev-python/oslo-serialization/oslo-serialization-2.24.0-r1.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-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-service/Manifest b/dev-python/oslo-service/Manifest
index f44c63fc097b..7b208a6ac562 100644
--- a/dev-python/oslo-service/Manifest
+++ b/dev-python/oslo-service/Manifest
@@ -1,5 +1,5 @@
 DIST oslo.service-1.25.1.tar.gz 76864 BLAKE2B fe4c8ac0f52ad7dcdd5240716030cd807d7755bf6f39d949331d18c1d0ce30563609f15db0db10824712b0a22cbd5ee9d6985fa5c9a51e734b000382d0ca7501 SHA512 2632ff6ce079916e44d6250487e202a7e1590cb0ba094868bd9d8e01cea9f89f22a5336edeb74aff2fa0f6aa017aefd454159511134670cceff5112b9957ce81
 DIST oslo.service-1.29.0.tar.gz 74957 BLAKE2B b56869cb28704718952c5e151eaf0442b1a4295b8e25a422d91baa241a990d031cd408474e44bd5ea2af2b7451e0c13ec491ed4c2ccf0b07c78b65a81bec4527 SHA512 84f1b8e6abc7c8c95433da53b1a1992570695b80e182f5cb7d87ab394857d8d47c0ef0528b7a45221c897eb4c5c13112d86b8a929efc2988d22844a4c712a340
 EBUILD oslo-service-1.25.1.ebuild 2207 BLAKE2B f0b267507fa5a90770ec57cc24debd421ae9ea7949f0e590b42869717f5c5553d169507f2cbe056bf32af7a7696fc299dab858ad1493d528540e81b03a73f5ac SHA512 84d67ce2b71608204676112d4c8618210edc6d309e0edd9ac49ed583321c782118ba226a22a81fbe3dc8881302d269762fe9f64fadc0992d3fc412dec334fe26
-EBUILD oslo-service-1.29.0.ebuild 2036 BLAKE2B 2986bd96894d63e5a53345295b2d0e1e532dec1b25dc2dece721d62fc25bb75b2691166e92afae0fbce2bbbfee77d5cbb3f73a93c22037a1f3a983118404de44 SHA512 07246329763b4d206aa74bb68b46da3b9d432f5714c050c9dbff3fbf1af98dd9c4a312646249cbcd8aca5cbe88cd8a6eb60cdb7bd0cf9e5c44a96cc89d9a6e1b
+EBUILD oslo-service-1.29.0.ebuild 2034 BLAKE2B 547eb98be4375866df5d5e30adb8d8ea634a3e0d521f54ec4fd025e18700aa09a5e9b8bd64a98d432244fb47a82e98f05808d190aac6b7f4a77c0a6febae6160 SHA512 3cbe9073b9746344778a50563f7add6f8b7e50e523067509158ec1e469b591557ba76cb7998e85226d2b50dfc190914bedd758965997d740652b88eecc833e06
 MISC metadata.xml 329 BLAKE2B 2ef43d1bf3df7be8c2e2b08bf7cca10d1bc23235111bc74bf0b23ef6f9c5ac3ad05a1243b518c0d8b703e4815ec7fc92ad01c907baa77d9c4dbb622a1288aaf2 SHA512 c02f0b4e37e3dabe1dbc10ca6b5e08627d8e7df5fee71573cda34338249508586bf068c56711521aa20bf80a1fdcf94a1e89df5d17cb5eb21a07b996a071d1ae
diff --git a/dev-python/oslo-service/oslo-service-1.29.0.ebuild b/dev-python/oslo-service/oslo-service-1.29.0.ebuild
index cd089d344b57..fd152c937158 100644
--- a/dev-python/oslo-service/oslo-service-1.29.0.ebuild
+++ b/dev-python/oslo-service/oslo-service-1.29.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-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-sphinx/Manifest b/dev-python/oslo-sphinx/Manifest
index 8246c303ea9e..ba1ff6771d8d 100644
--- a/dev-python/oslo-sphinx/Manifest
+++ b/dev-python/oslo-sphinx/Manifest
@@ -1,5 +1,5 @@
 DIST oslosphinx-4.15.2.tar.gz 33362 BLAKE2B 4eacd7da4eecd25836920063c2c05f205f5c8d29cf6253257e9e56f35e1f9cbd39fb120fd69b075670bb6be334fcc50dbff6f52cb928e556f334720a51eed590 SHA512 cf8fce033f97c0334fc076568720fe3b7903e780d4b839c452f33d02378470263891d01e553e4f2463484895c689532f95f4aa81ac3dcb0d6137b463bcc7e08a
 DIST oslosphinx-4.18.0.tar.gz 32046 BLAKE2B b10b13f819cc2f4c3e769c195bc340a74545a4cab2a2e9894e56e4352f5f35c1cdd7f1d40d47c2b7449d30bc77dbadb1feae129f6ff31d54e6227349a0c31e57 SHA512 b736dbf68a3ad8c32ca6d8de72cb79e49ab4b84593c70d0165615de66a8c343ce7094656d3b0be3383453143308a4862f27529b1c9d72920c5418a3f62dbcc46
 EBUILD oslo-sphinx-4.15.2.ebuild 1087 BLAKE2B 717950bae6490ec30eb71bc05606c0821e4501e793bf13fdb57c54ccf85772e5be1af46a185d8a702442d99155c1547e68bb00afa5920ffeee0724276e96ccc3 SHA512 1bf99b65045cd1b0ff09bdc40ea00fb968664a6e83589f8aa9e2ea14d4fec1ac8ff664f139e61df43695a85d5c7941d2b917ef4e455c77a307dbb52ae4b40e66
-EBUILD oslo-sphinx-4.18.0.ebuild 1047 BLAKE2B 42c3728581ee70cdd029e1769b2cafad1c23b0c579a2f80a2b7eedf60b149f6823d58135824225f45c9fa85d48644c88cd1ef878ebf9b773cc0b3978cdef4386 SHA512 7240872d8b82daf2957803bb3f3c22eb7e0d353d07ebae93ab753a2fcf4decc26c277cbaac69a931e64cb87c3d1e57d1b240b2f6b3daa38cb4850c6daccba73a
+EBUILD oslo-sphinx-4.18.0.ebuild 1045 BLAKE2B 10c3db8b5633107b2b2ee29d82c8acbf5a2a9f941ba52e155544ae3f5d8465624594fb7916c747c7db9ef32e5b2212a80b455569f4cc8b84441ef7ed533c66b0 SHA512 eef9161ad2a0b424dba2d374135ae7c57aaf81bdee5c08809a068c5fb63c9a697daf492778b94e5891149352e41e09947739716b4615e0778ed0de132aceb854
 MISC metadata.xml 586 BLAKE2B b78b49fc66eaa7ca4a79da676895e28b397359cc8579a3e9b91dca1d933779d3ec7f9153d0789b7f44dd75c8fa8f9d866cd916911a4dfe3bd6d89435a0330960 SHA512 ebd5d188edde4955081fa7cb073daeace8c9580dab828d4fd12f10f27bb562ca7736ec77f816e243a02e808b83dc712ab53f40f70e1865cec014413514ffa000
diff --git a/dev-python/oslo-sphinx/oslo-sphinx-4.18.0.ebuild b/dev-python/oslo-sphinx/oslo-sphinx-4.18.0.ebuild
index fdb87b6aed39..a6ad6e8e0e3f 100644
--- a/dev-python/oslo-sphinx/oslo-sphinx-4.18.0.ebuild
+++ b/dev-python/oslo-sphinx/oslo-sphinx-4.18.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 IUSE="doc"
 
 DEPEND="
diff --git a/dev-python/oslo-utils/Manifest b/dev-python/oslo-utils/Manifest
index 589d475685a3..96807dc70fd9 100644
--- a/dev-python/oslo-utils/Manifest
+++ b/dev-python/oslo-utils/Manifest
@@ -1,5 +1,5 @@
 DIST oslo-utils-3.28.2.tar.gz 85818 BLAKE2B 02e3bee59576a509d5c49e6bad98eca9e099e8a12296af73d5690e6410a4e0e7bad96a0445ad19f7cbee517e7da182979c60ffbe79ad2efedcd3b057710952f8 SHA512 39b8d4c67d97c4953a980fe9c8a9ad4b64704e65831f5f34f867ae027141c644cb39d14e5297419618b4dfffa24f2d10abfe988b269063490aa8194155a19f93
 DIST oslo-utils-3.35.0.tar.gz 86107 BLAKE2B 2b4e00af5993799e43b40d63c667fb582984f8abbdd768203e0c95d2ecaf0f8ea10ba70ed520c116ed0da841dcac479d81881b4061ffe3529d8fe26917bb264f SHA512 dee75fd36b1c3fbccbb432408769c15d17b7dfdeef3b6f7056218670ca2c7e97a1e98acae3e06810f842a8e20fab1cf419b23153cde94c93e6b60e498ae2f527
 EBUILD oslo-utils-3.28.2.ebuild 2891 BLAKE2B b9f0ac7adafb648e3796f8d905e39f2478e9d05b2bde64216184c21db3679ac743b513e049f100de00e02cf2f21a4d0efad0b1456a4b3e5b6af966fd9b1ae2bf SHA512 77fb30f320d0aa2bd0cdcffef52e7fe1ebc114bddbf89b337a0b17a2c11a3cf5630e02fcb171af97a1f7d05fdaed74e085702dc3191060ad57caacf9f5b681f3
-EBUILD oslo-utils-3.35.0.ebuild 2698 BLAKE2B a70f94293b3f1d15f4573b6011e628b396dd59f238a18cb738e6e2c9c1ce163f924881aab511470ba834393f6afc1e9d3686a6f25ac36b6be791cb30e7768501 SHA512 cfd13a60a0f3ce9ed12961a5dd7e2fbf333e111bee591220b61b22c5d7c916fb6cd0ea02b6cb974594c6405ccfcab6e302fa432ad4b21520b312e9660d89b900
+EBUILD oslo-utils-3.35.0.ebuild 2696 BLAKE2B 3cf672b792c84113e5ce4701ecd01694087542d15b14bfe562f6fc2dab4af33c88d61aefd86ef2f43b39b60acdaf7aa22829a4f0a179eaf3a231976e36238fdd SHA512 34633e80baf9f70afb6da25e2303afc65185a130f7d0b27d426791065a8b4301c69de86b0e95112e4526d76c1e1cb4c8b88918dce4d3b3b20ab069c5d7028722
 MISC metadata.xml 366 BLAKE2B 010fcdab42d0fe2eccb1f10ae80b99f55bbd6aee2f8d8760512a92d4d23a81899c75496fa84e098447072ca005eb5a2d309628d6e3351370913d3e1aa2dc8e34 SHA512 58767ee794b3ff97f10711ffc71318ad02a6674731364b592f30fa95d84471fcf48fd2bacf8032c4ad28c2ec0144dd35fcbc4533d2181c7aa3b94bb2ca03d8fe
diff --git a/dev-python/oslo-utils/oslo-utils-3.35.0.ebuild b/dev-python/oslo-utils/oslo-utils-3.35.0.ebuild
index 90b8d63dc81b..98dd4b834bd7 100644
--- a/dev-python/oslo-utils/oslo-utils-3.35.0.ebuild
+++ b/dev-python/oslo-utils/oslo-utils-3.35.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-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-versionedobjects/Manifest b/dev-python/oslo-versionedobjects/Manifest
index ebef196c2106..15b5015d51a8 100644
--- a/dev-python/oslo-versionedobjects/Manifest
+++ b/dev-python/oslo-versionedobjects/Manifest
@@ -1,5 +1,5 @@
 DIST oslo.versionedobjects-1.26.1.tar.gz 148214 BLAKE2B fa449b57db3ae4148fa431616b49b83d6a1424cc5f1845546fc945270bfa1b470f376a52edb0426f1fd86783cfe25906f476fab3417b3944c5f3074548704c77 SHA512 13962e9cfd5c63d9691bef0e1b31aa1751a506dc7a8aa3031612220778ba887d3122eea205456809bed9cec12c8fd5debfdce827d59ad8fc991ff85de7f841a1
 DIST oslo.versionedobjects-1.31.2.tar.gz 148160 BLAKE2B cb63e0607f4a9447618d287e3f2c252359832a0f4c7b60a22669da25ab90ebcdb8a97f2e10f61c759cba135329eb75be644809bd424e67ff1c6d61e612c45364 SHA512 a9d31a138e2f1e399e51b509c52c10c64acd783389b596032457c0fa74c112f5f6f67944ce88c88c35623f8d2d6612c09d04009d9014d0e9efc8f65b916d4ff3
 EBUILD oslo-versionedobjects-1.26.1.ebuild 1611 BLAKE2B ea80caa853b82ab0ae6c723488c95190bad1304c3a945a1c9acf13b28161bc180a5c3933095036b3cbf5162287b66c98801c22f31dff7d908bc46abf386eaabb SHA512 87011ad8ffaa7b9cd17c6ebd1c021d262e9cb8bcc69b5a338ff39f5cee2bb92a7013315e0d8fa2660dc3a636ce158e4b805479d6f8ea42aa103e3a3486745dd9
-EBUILD oslo-versionedobjects-1.31.2.ebuild 1366 BLAKE2B 7447731c10bbc4c14ca94886e804f8ac572fcdf425ed20c54b1656b868631cdac73e1bc69b9f30d65012c08ca2709a229ca22997c79679e199710efe3d98851c SHA512 4759f79e23a2681fa8b9a6fcbdf866c2ce5333aed01f094cff541c112323b51d576aadf0f3d1a5907880dea0dc44b2605a533753c6c107c2acc39b014a9d1dca
+EBUILD oslo-versionedobjects-1.31.2.ebuild 1364 BLAKE2B 7c6f9355d8b58cbd5b77b46472bb249780e0364b7da43be56230e749a3346709b5a387b4f9ad4c4892bfbebf8d25900950e0c77ba236d175a94109606edf3e6c SHA512 7bdb39a118b11270b5396b505dc7d955cea9bde6763c53d439f9f1239a1cd893db2365af20908a29d6af6968f961fdd571fba7bdba9ecb262e5c8184d38abf9b
 MISC metadata.xml 338 BLAKE2B fa5249011cbd669973d70ec877cb0d59e5d8e6f25ee0e8f704024a879bf9d151d2425b8b253ba102a5290d9175816831e3423f77f9b53aa3dd95d11bd64a80b1 SHA512 6e0c4816549dd4f80d8c344f68148c2815afff2f84714cb570e4199c1bd6bfb4f9c5e27d230478e37890b0617fbd62efe472b37e043d8f8b2cfbe8912cb36fe0
diff --git a/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.31.2.ebuild b/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.31.2.ebuild
index 5ee7581952a9..5fcb916b06db 100644
--- a/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.31.2.ebuild
+++ b/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.31.2.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-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-vmware/Manifest b/dev-python/oslo-vmware/Manifest
index f473a6290dc3..d1835e466636 100644
--- a/dev-python/oslo-vmware/Manifest
+++ b/dev-python/oslo-vmware/Manifest
@@ -1,5 +1,5 @@
 DIST oslo.vmware-2.23.1.tar.gz 210844 BLAKE2B fd7f86e4a8e97d98e0e309ad1e3c57c5952699300c6da0d5641fc61e14cb85445b95767382ede7bac14c125f0f6fa78f7284af5d6fefd774e4a8b5543a0e2ac8 SHA512 bf0dfc66a57cfee824fe9ec4a9dea23e6d136fa04fc2e9f3455409b899fc49ce2f2979e072d25d0e0026fb300aef1d6e1f2e72113bd7ec9beef0122d47b71eac
 DIST oslo.vmware-2.26.0.tar.gz 208576 BLAKE2B 2e9df2002565d286631dd846c31551735f204771156b2c5cddc7ace1170381d10eaf647e13f1634f84fb21be674b65c29ab51076b49fdfd6787072b78c06171d SHA512 7ddb675ec252e91984cdc23b6adee7e1b13a0dddd1967f9a882935da0bc12d3c0b271f0cfa42b569802e0521d65285d80c7a3e1ef280cf405827a4e2fa2f6437
 EBUILD oslo-vmware-2.23.1.ebuild 2340 BLAKE2B 5e99ff3f8a4f3f2fb0e27137843d5ad3408a997aaaa3cecdb0a989e89c05b938493649316db4c2519e0b42ee25c1a7e8445f8f69ffc23afb779773e733df7d98 SHA512 3101e41ee0c7eb3568281d23c98dd51c4916e8f247e5f31faecc95db324be94497a896204abbe2d1e9c36da2997ad56ddeb5a417d6e93dea1632dd00713c6f2e
-EBUILD oslo-vmware-2.26.0.ebuild 2159 BLAKE2B 4131dd722a67051aaffdf451e2c8edac54a64ec827acf83055ea2ef8fcfac41945df88660cf67e87186a65b4cd1d0feaa66d507b7e17ef0fd6a11584cd1ad878 SHA512 606d934906f035b9c01216fa806f9e817245f1540d6565da1c4e8ca63f433f62a232e20afd96b7e90783059356858e8c54ea0d6dede68276a6bb76e74569a87a
+EBUILD oslo-vmware-2.26.0.ebuild 2157 BLAKE2B cae122653a20df8d2dfc80715d533c160ddcb79416cb0cdc5490d0d3100307bb2f882498f4bf0221d9141940f986d8755504da03739dd083d2b82ec2bc02b709 SHA512 59ad11e1f1871d8ba2d46681f0717f7f43e98eccdcebf821d99d78d2a0d047513654fb3ad87cd9df00d3ac1a0ce574195e116f6496dee25d9a77ad2615a3d517
 MISC metadata.xml 568 BLAKE2B e5ba6d5e5d14ace6be413a2bc6d97d8dd5f6befd0cfe683fdb6bb870cef7b673cc779ab143362b48181f62fa4f15eb827174f17da64c4d7ed539eef74e050136 SHA512 879bcc0237b70f9ab61a3d659e948e5d1289128b3b4f11f6797b0f20809c3cc90efa104a582dd6cb407fd9a7dd4f0e2330d68227dda145c9456875d44db913dc
diff --git a/dev-python/oslo-vmware/oslo-vmware-2.26.0.ebuild b/dev-python/oslo-vmware/oslo-vmware-2.26.0.ebuild
index 13e373d76737..7d68bd4da89e 100644
--- a/dev-python/oslo-vmware/oslo-vmware-2.26.0.ebuild
+++ b/dev-python/oslo-vmware/oslo-vmware-2.26.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-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslotest/Manifest b/dev-python/oslotest/Manifest
index d9393246a2ae..3920381944ac 100644
--- a/dev-python/oslotest/Manifest
+++ b/dev-python/oslotest/Manifest
@@ -1,5 +1,5 @@
 DIST oslotest-2.17.1.tar.gz 32166 BLAKE2B 49922cedc32bebda867c6633118cbd8258a08048c510333d04e0b2f8f5efd4e5dde802bfb8910936dffca76823771d3e83e78528b5fd045ae4380e02f92cf809 SHA512 558d2c220a6b1235112022b495c77881f52895cb720d67090ad096576b4e81044b228bd95b8303779bf8cca2e1205ef912b1fedd1916a34130f4c68ef69fcc0d
 DIST oslotest-3.2.0.tar.gz 35445 BLAKE2B d33c70e760fc595586c2d7b0ce6ed1f63b73c89ba078f85b70d3b6b1af1c4d115e6eb7b431f9ef52abf50290eb47a1d3adb2d014c2ba5cf7b93ecf0e46401a26 SHA512 4513291e2bec939f9734255cb0fe3f85b9eb8a8cadce58873ad4e85365a0ec27bc2084085f5b95b681b5e811b62458e18fe63aff1e022b2d8ace0ca48bd6a527
 EBUILD oslotest-2.17.1.ebuild 1784 BLAKE2B 4d590b29a50b018bbde9e0e7b92a6b0721ca1200447a9b72c03b377626e795bc74ed808d540c4efea36a11649a55cdd99f76b38cec8eef25713b03668a28857e SHA512 25acabf2fdad54fa764e3bb3911fe479f975bc73786b86e3ec01f2ebda342c385a53add740f557e8913d592dcdb2d6452d947d6b1db86d95ac7278c99b4a50d5
-EBUILD oslotest-3.2.0.ebuild 1547 BLAKE2B 39154afcfe26fe7fa061ad744cada8a7f08e0d99fcf280c08156d382cf0e9a4b97751deade6e99e4b2bed086195612788a96022f15a5c5a0fba3e267e8a8bc95 SHA512 30580b8c15facddeed10616b728d2de4aeb54da41652d9b0f6c112d88f05fa78f247f041706185b0091159e2558b9c48efc7751d2f54dbd7727fde1451aa180f
+EBUILD oslotest-3.2.0.ebuild 1545 BLAKE2B 3ebc64d4e5e1b48255fdb0af3a1717d33debbfb8801d37ff489a66fe645f77d07efe3f4fc4364f7521656a53045960411ecdca73b19947642dbe1df451335d99 SHA512 b12cd416ff0037207de486be6502570c6b64bc187b85bf577977716b11ef1c103737a24863898192573f9fe3093e920ebb67202e94c09e370713094926650444
 MISC metadata.xml 828 BLAKE2B a328982018731cc93cda675447ce2ba308e9164e8762df10a267c6b82389a717f16b5ba6d9843503e12a458f3ad5a726ce648f80e9ff781aeb429bd9034632f6 SHA512 48a68782c8ef2a15db7c73f03dbd4670b8ca25a6cfcf0c15d4585a93a75cc4591fb6edb70f7176cd72c97d1205ef8e5e898eafa9fca41ed0b00023bff93f966d
diff --git a/dev-python/oslotest/oslotest-3.2.0.ebuild b/dev-python/oslotest/oslotest-3.2.0.ebuild
index 310558b286fc..ead6a997fa61 100644
--- a/dev-python/oslotest/oslotest-3.2.0.ebuild
+++ b/dev-python/oslotest/oslotest-3.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 ~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/osprofiler/Manifest b/dev-python/osprofiler/Manifest
index bcfdca781bb3..92fe66cebf84 100644
--- a/dev-python/osprofiler/Manifest
+++ b/dev-python/osprofiler/Manifest
@@ -1,5 +1,5 @@
 DIST osprofiler-1.11.0.tar.gz 75301 BLAKE2B abad6752d9779c9f0244ef4ef279ac4236ea765ec3903bdeade771c2c41d31eb78cd4596c57120b8558200fb0fdff1b6aa0e00a76eb6d634ccd9552e755e03cd SHA512 41697a9d3bfb81f0c193bd1bd82cb470f1e7e410192e982c076877026457c9b7eb3d17b72c3d02ba4e1bda6ff4a7006798210f37c67d75ff600e41fa047ca59e
 DIST osprofiler-1.15.2.tar.gz 80503 BLAKE2B 280f96ece13ba0973692c6ab29b0ee783465b05721eaf2914eb9bd58615c0c7ece91aa3118d03a5fd57296318626d34e9c8b88f80ac6d8b1914b3a9c5d24ad49 SHA512 16deacf3163eb2bbb616ce2e7381feb0174812fff526eb18fd5a9436912b70ff331587bfd4dda1aefdcf75ed7ec21a88e04d8ec9e65771b466fa083a7a33b782
 EBUILD osprofiler-1.11.0.ebuild 925 BLAKE2B b9d5d61fbaab26d9e1d93d272bf88e5ec08c8433a385d206d8c90501d3054d148628490fdeabe582e4c4262bbc985a3d20e42638ab769e1c8e2593e935cc89d6 SHA512 f555fb16240a8ba868bf605adddfeee9d44dab4a4d9e933818d560e8f54a8b1db181234ac3bb374a15f012f7159e0180d7471a94f020d6e1bee4bac85c69618f
-EBUILD osprofiler-1.15.2.ebuild 832 BLAKE2B f23b59fbc39915e2432be9c7ec43dcede37204b2bd6411938b844a3dd59071f24d75ea121d2b27caa69b33d597cacba4d252074fc45d862a433b79c8f0e6f36a SHA512 d461accdc81ab3480ff728ab3f09a3fdd1d3a1013688d4d57c3e33a7dd224ab293f16505cf21211b21ed1f057f6f232bb5ed80196a1323ff078ccdb5c1a62b4e
+EBUILD osprofiler-1.15.2.ebuild 830 BLAKE2B a0dd77dcecc36ebe882ec1748a7b1092577d95ebe1684d0dd405976f0396b8835720439f45ad5ff99a22df609a37efaf794e013b6cc0ec92c6b2bf652117400f SHA512 bd032b8d2f7d813e8ec188e406363b0923311af7a3869e57c933e936dea58ff2ba6127cb68f0d754c6ceb63368bf73b4fa9f2b45016ced25c039a5175b227a8d
 MISC metadata.xml 564 BLAKE2B 7af0039638bc73eb560dfaee133f1990851111a2f3ab51e270cc5418bce6c044fa0b15355823fd37b54f73b84d2187096a1e29918b1e0fa073138d901654232c SHA512 2a8070a290ebecb271dec1bb576fd361c937191f69390e1477bac368eb6c9b91ddb3c9eb78af9aa4e4f6e3982a8a83f3ad2c8d5675b1278d6e7191aa3bd36589
diff --git a/dev-python/osprofiler/osprofiler-1.15.2.ebuild b/dev-python/osprofiler/osprofiler-1.15.2.ebuild
index b671a8e68e34..2df6ff1f2181 100644
--- a/dev-python/osprofiler/osprofiler-1.15.2.ebuild
+++ b/dev-python/osprofiler/osprofiler-1.15.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="
diff --git a/dev-python/ovs/Manifest b/dev-python/ovs/Manifest
index b034e3f27baa..ff801f67117f 100644
--- a/dev-python/ovs/Manifest
+++ b/dev-python/ovs/Manifest
@@ -3,5 +3,5 @@ DIST ovs-2.7.2.tar.gz 74222 BLAKE2B ecf1cfa9cde4824ba927f4fed610ca11129d221f4ecb
 DIST ovs-2.8.1.tar.gz 74483 BLAKE2B a90904e645316b625c7fddcc323270bbb6246d59432392bfbcb05ed0ae258f1fcc0afe7a3716dad519d47725a3f765c99c59dcffc30bc5343de59ccf523cfa76 SHA512 b7133f5c2ae00d508d77122952584cba840d4a22231d1a42105ba2918cf598b12b58c47408c17405bb3c9aa90d24a3d0a9257299626704e367badc982aba62ee
 EBUILD ovs-2.7.0.ebuild 489 BLAKE2B 1bec44d0fb204f45809b07343580d142f8422247e282c82c4b70691b59e71adffae4d5b186317b7c36ddb048c099e3d8deb0f5b95e9728853d8d8e9440ca4400 SHA512 0769f6252859597aa3e1cbfe7b7d2383e1ef4afb7ade578616e9ac75d62d1b8cf06828d59ddfaf45e04edbaa39a94c17fb8264445b480dfd0a33b16b1b4d082d
 EBUILD ovs-2.7.2.ebuild 458 BLAKE2B a18ed1e904079a887c57a9d2ff787f872e741fe70cd363631d4d855dcae1ab8789e768e97345e3854dc98978c9daf637115d9b99908332da47b6e0faddc74d72 SHA512 a82f4698aa8c89cef038e7a102f351dec9202a472d17a152fdcc317143194cec6e958bfef0b380b7343c88eee5f4cac8e3bca98d6fa8e9852dbcf73c48043d93
-EBUILD ovs-2.8.1.ebuild 458 BLAKE2B 200f98917252b0b1e47802003f9ccb2989f50b99766d8ac33e43e37086994e9d27b3c0995480d7f98aafaeda0ad863e6e9dbc944c41f3b553c58107a784ea3ed SHA512 b4b0eea9944cd38167555fa1a6fff11ade1cffdac62dc2353c7725806feaa42aa794f885cc8da5d701eabe38f5ad50f794c67ba22d83be03bc05e965b9b54694
+EBUILD ovs-2.8.1.ebuild 456 BLAKE2B dd00624a777a5dfaba64cc0f9ad3111e53cba057e197de54eff9533182b2c03ccfbe83941d68a01aad675bd52cadb64a5d905749a411aae2ca0d6a7c18c171b6 SHA512 0978b8400e5ee9303e4e7d11888f1d16fc3a191b9db4233fb6285851205c2399b9ecd49c9a70691b3ec30db15b18a16fccdbfb7d6c7134e6c510e6e7532c5b78
 MISC metadata.xml 455 BLAKE2B 4b3662feee3f99c83ee91117f441d7bae841764b4f6a153dfe96574e7f8181e0db9e6f94c93f59b009e419a3879f8825e2cd76699a7ca82b5c88fb9df449f87a SHA512 53fad2964967c6b5d0a17cea549a01a23b0365a22ea53aa8a82d5bc26a2491651cd0ee276566493bc497a2c033b1a2139a516865ef99ba639365d1709410be5b
diff --git a/dev-python/ovs/ovs-2.8.1.ebuild b/dev-python/ovs/ovs-2.8.1.ebuild
index 21b868616275..30f298151186 100644
--- a/dev-python/ovs/ovs-2.8.1.ebuild
+++ b/dev-python/ovs/ovs-2.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"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/dev-python/ovsdbapp/Manifest b/dev-python/ovsdbapp/Manifest
index 5e83f675b6de..fcdf631712d5 100644
--- a/dev-python/ovsdbapp/Manifest
+++ b/dev-python/ovsdbapp/Manifest
@@ -1,5 +1,5 @@
+DIST ovsdbapp-0.10.0.tar.gz 71376 BLAKE2B 3f8c79b57b68da303c11d4b963367f9c9322bda1c9a02c0f7e28d57572c3056b89ae6f859592e955a81acbfe16725504163a1d799ef4d23b0ca1d77ce9eb044e SHA512 321e3efefad6ac87f9b64ad22c3d1241d6839de8dba556f2aabdecc99209457a35b082f5d62cfba4ae67f50b265e8c6a55717fc2270470a7a1b0a1fe601bb3e6
 DIST ovsdbapp-0.4.0.tar.gz 35790 BLAKE2B ae41b173787b761eca330e159ce3f1ac2c953c18edb706cdc72a556d680c591cf0540d20b65035c6dcfacbf43768bac81a69b95f4ba5dfde968011fa0c22b46e SHA512 6eaa98745c2c438f43bfc9ce3fe00b100689a2df7564e487bf9c2abce81a725490813d969ddd9ad56b4933f0822d6d8801297e8b6a0c81db2ccff562c1ca62ec
-DIST ovsdbapp-0.9.1.tar.gz 71642 BLAKE2B 30d00d0fc77ecd54bfffe5a9ff5bc6f67c32c98d93a8b6199b13eabf0ad9f210755664a76ae803eb1281e198be60e4821b7b992bd19a99e47f13e97f175b69c6 SHA512 373dac51f1fe6332c39eea5acb555fa619a4d0389fc99833b9dca7d9d28abda36e491fc6e25c973c8c8fa87c2a7ab8eaa666c2666e4409aeaf1419e0573c2d81
+EBUILD ovsdbapp-0.10.0.ebuild 745 BLAKE2B 4de0f0a6a1cbadb277bcfd81dd8b0e747c12eca19c4c4fe26437e3474dd1ee99a222c97e76c3503c26dec8930074c4b12386ddfb094b3bd4aee8b94bd9876e23 SHA512 1163768aa9f8d8b0d16b9538a49dc30f7978127c1ffd4ee6a5d2fd0bc20327942af75902f5ce838300db2c1d0e029c011ba07e26fdcb71a36363ca20ceb9900e
 EBUILD ovsdbapp-0.4.0.ebuild 655 BLAKE2B c0786fbcf260aeeab56df42a7807e13625a3ab1c56e452e64e2e66b43ef436ffa21a3276a209686b9d60c849d2261a9b8f0790e73324b577dfb782dee77b6add SHA512 2c4605eeff18c4dce326426f8ddc694b06ca85bf8ed6b1117b6edbf345b9c6b2192b890b49aa0579d836d1820713ebb2af8ef96bc69a40de566f894b46e2e686
-EBUILD ovsdbapp-0.9.1.ebuild 747 BLAKE2B 88aa6a04da8223c6bdd7d3cc8c5885c474ec54ca4a1336ac184a01945e0b0e04459cef475d621917b144de5292cb78d228f5aefeeacd26010ce8422de5a4bde7 SHA512 453c1b346401b26337304e2062389d089f16d091780283720a052d57d778e43a523f904e7b354985749ce6edbf630d19e0333aa6f7672d55aa8aa77c2bc09f78
 MISC metadata.xml 333 BLAKE2B 1a681ac99aee289a919b530bb87037df6fe53b044ce14ce3a9da3cec54a73d7fde58cf01f12678f18397d16b56c9e5bf88d289ddec4469e343d7193502124124 SHA512 a73512d246562e6591eb9c8d13759352cede7f0ae978d02c87bd72b1fe2c9b155cc3908e8489b136387bada61f1257d8e0771e01e26d998b51f9ce13c087ec41
diff --git a/dev-python/ovsdbapp/ovsdbapp-0.9.1.ebuild b/dev-python/ovsdbapp/ovsdbapp-0.10.0.ebuild
index 3e25d26edeb9..92eb5c197724 100644
--- a/dev-python/ovsdbapp/ovsdbapp-0.9.1.ebuild
+++ b/dev-python/ovsdbapp/ovsdbapp-0.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"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
@@ -22,5 +22,5 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 RDEPEND="${CDEPEND}
 	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
 	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/ovs-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/ovs-2.8.0[${PYTHON_USEDEP}]
 	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
index 0fc02e89fa38..22e01b27b3c1 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -7,6 +7,6 @@ EBUILD paramiko-2.1.2.ebuild 1141 BLAKE2B 52ec975ac82f1921d19aa7264583a90bb081da
 EBUILD paramiko-2.2.1.ebuild 1097 BLAKE2B ef16418b1866efe37480c09512638f0c7c7aab8044b32e29d6fa712db12e87c07aec8ca968c1d8c01329492f803848497b3eefe50998e19f3f86116dea134b72 SHA512 bad70c3f687d3b3b36d62768a6aeaf3331e3311db35149677e1d85724fe396bb0782477288b39697296b35e35f2417cdd2d41ccf0e97e7eb570e3577a7a908a4
 EBUILD paramiko-2.3.1.ebuild 1339 BLAKE2B 44a32bb8dce52df056c7cca35b2f6b3e061c266af2fa407f53323dc02e53361835beb07d2fbe53f69bde631343406de855b3f1787cd8bd9f011cffcbad4e78c3 SHA512 3ef2b85785db8824078f6a6674a72c391b0736256eb2c6fb60be22597738f86229f635f4247c347c214e59dc89c1170de66898eb112da9a5a38306c8e22c72ac
 EBUILD paramiko-2.4.0.ebuild 1408 BLAKE2B fb1af640606bc28205823c1aef0a4ade9c44614ace680c3f6b84dae85cf664d0927360cf0124750876f8b5e6782fb641d65512678da2516e17ce06bcd68d2fec SHA512 80f945068118be31e6641abcfb802ae18157c00d1df190832e2ec3e276ee555ecb20207daee53596cc4ab303f0d1b198932580ec926b1a807a3d79ad03b09db4
-EBUILD paramiko-2.4.1.ebuild 1408 BLAKE2B fb1af640606bc28205823c1aef0a4ade9c44614ace680c3f6b84dae85cf664d0927360cf0124750876f8b5e6782fb641d65512678da2516e17ce06bcd68d2fec SHA512 80f945068118be31e6641abcfb802ae18157c00d1df190832e2ec3e276ee555ecb20207daee53596cc4ab303f0d1b198932580ec926b1a807a3d79ad03b09db4
+EBUILD paramiko-2.4.1.ebuild 1526 BLAKE2B 5a6ccdbab4e56439d060c7f449fa128fe0b43d2ae6ebb7c50f90d6a4961122de3c2ee474c8c44c6b956ca4baafb5a1154568d7f80aec99dff5f6f32fdad789bc SHA512 3f4015feafda6b8742864f84691eaa1cb5c261a3d80f8dcd28614ee69411e2a9e8b7aa485d24ef73306fa1b53a10d5867219c3f9c98ccf1f7d8591a8e4d5a1e3
 EBUILD paramiko-9999.ebuild 973 BLAKE2B 8699c5195a985d92b6c00a6c5197e08926fe19dc6328b1a819ea40c0729bbaac0fd6910429ee4e214e253fe2a007af0eb66f2e86cb872ab73dfa084c17e14e79 SHA512 7cfa47309ea9696805adf419c835fcdcd45e1b4c1f8b4d2c7570eb35245060c411c84ec7db7f86486b84b2ad430f4549eb6dc171553af308d8c445784df54daa
 MISC metadata.xml 1236 BLAKE2B 5b1a6c8a5694722970f07206173fd1dec4a69d0be780ab408493c5c5ac96a058cd28ffcd3308390870244792b951e8fa76430fa3b2b081902e204055aadf4b2b SHA512 5cffe7297feb05b75be333fac0259655f6992baaa04248ccdb23f82790a0a807ecf328357207507a3b35944b7062d8a1aecb2daf5353d733646bb58d7a151529
diff --git a/dev-python/paramiko/paramiko-2.4.1.ebuild b/dev-python/paramiko/paramiko-2.4.1.ebuild
index 277911f22ed5..cb6e5520642d 100644
--- a/dev-python/paramiko/paramiko-2.4.1.ebuild
+++ b/dev-python/paramiko/paramiko-2.4.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
 IUSE="doc examples test"
 
 RDEPEND="
diff --git a/dev-python/pathlib2/Manifest b/dev-python/pathlib2/Manifest
index 6be27b28945c..1fa84599bda7 100644
--- a/dev-python/pathlib2/Manifest
+++ b/dev-python/pathlib2/Manifest
@@ -1,5 +1,5 @@
 DIST pathlib2-2.1.0.tar.gz 30390 BLAKE2B e009fa866dcdb2a6f078d746c423484bd90df049d59c89427c631cd63ac11376bb5549f45f0e98da036b15c6674040ffc8844fc08b95abb1d677783dedf9e126 SHA512 5dad54d4bf7a37a2c425afeca030a23d802a8a450186292f3d80aa9ee5c2985701871a0386a2f58e2b05b4bbfd7734a238d0a73625c5839237e4f3984088a8b1
 DIST pathlib2-2.3.0.tar.gz 34291 BLAKE2B ef1768f8a9cc9b28f85ef84c0dfdbfce0b0087c1ffb6718e2b13eb007ea3e0ab0eebe946a1bcc2683fed7db46867f415ad2b52abedcdc87fb67bd45d5998aea5 SHA512 715fbd981d42767862dcaf2cc0fee31b9ec5050915ef7d909d14587609a7a5939e32b39736b586a890e7625443bb163832896fcf138b5c2863c451b71c36a124
 EBUILD pathlib2-2.1.0.ebuild 581 BLAKE2B 62d3e1f8e2705db80933876650fa594a8986cf3b74c78039925ca9dc024ddd979491ae254a7b09c1ed83cce2464fbfeccc16106724254373efffc28987aa7f4a SHA512 e14f2bb06e96e63d9812e31da3a27ce9b9d56f1405515c29df695167e48e7f4122f778688f66a20b8ef15630b5dd4fa7affea9b9946362b7124ded7ff0ae2ce3
-EBUILD pathlib2-2.3.0.ebuild 1062 BLAKE2B 7768a11fbfa0b05bb2be7ea48e633e14f3fe694fbc9e773869ec9e9e6eda5db3995f43222b9d5009c0b16eb456e41350b95d379504b45ec9c3629acbc65e3759 SHA512 9555fa34e425f610fa85df6503f53946bbcf51cb6d4c556be28dd963eaffe312afd4b64a1682c335ce0860b7aa7537a692d7373c728979dc2fd5da048b7962ff
+EBUILD pathlib2-2.3.0.ebuild 1061 BLAKE2B 7ac9bb79b4b13d1ae7f1c9bb21d18a77a410573d073a4a6eeec98588cf574993cf95fb2e84a3fc46e620a39bee93f77a7b931f50ddf8933f94c2feebf4520b45 SHA512 206f9819c97c4d5917197e5d0aa2201b61d576c9198d4a3b6621d89ff2715ea8b57aefb8991d1b998c0f0da8f599c80ac1c3f133b02d4c0179c1a494b6bc528e
 MISC metadata.xml 371 BLAKE2B e2a18977882b53d7e6588147a17a9fe2c2a1b0850946b15036941b908ece241cace91e66373d5edaa4ac2ba46935413b223ea78cb6ca01b758673ef719b76966 SHA512 dce5315fa4bc25047346fbf06a9f2da5828475bf0b36a1dcdd6ea9917f29ed4bbefc22aba699a43d7b3c5f771939bd81b3da20df54537b22aa4811a19ab62a6e
diff --git a/dev-python/pathlib2/pathlib2-2.3.0.ebuild b/dev-python/pathlib2/pathlib2-2.3.0.ebuild
index bac4a66380f5..d588dc33a047 100644
--- a/dev-python/pathlib2/pathlib2-2.3.0.ebuild
+++ b/dev-python/pathlib2/pathlib2-2.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/p/pathlib2/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pathtools/Manifest b/dev-python/pathtools/Manifest
index fac770c0f132..2116011b8191 100644
--- a/dev-python/pathtools/Manifest
+++ b/dev-python/pathtools/Manifest
@@ -1,4 +1,4 @@
 DIST pathtools-0.1.2.tar.gz 11006 BLAKE2B ad257edd9a62477a07343ecd6786c24ad2472da8844e3358980973c9daee9c52f3317976b2971f9afe33bfcd0dba1c1497230b105fd364a45c0d138abec41894 SHA512 e014cb17f3d61ce7979e36663f94a44d4f1116c35e3d2ec8c4ac207a81935dde246495ed06597e6edade1509f384b9e5729a97ffd3eec31b1d1c4a8372d1dfd7
 EBUILD pathtools-0.1.2-r1.ebuild 468 BLAKE2B 8f7f0e506ba79addcbe35071345f5d7bce6e0f19286f21662e228ab0a81988607af0b687aa4e7138f6ed204dbfa2a96fdc6e2d9fa3e2697d18448cb9cd902196 SHA512 d59439854125c40bccf1761aab8e2527d88e894e52cec2dbc864faae8abfd6c806b8819fc40ab6de1bc57494c58be08439e5360cca7d0ec3aee95987093ab23e
-EBUILD pathtools-0.1.2-r2.ebuild 474 BLAKE2B 66dbd199112831930e57f056e805ea89cebbf401fe7dcd8cf9fcb83d9aa6239692bb53a2a3c3d36b36958391ab0d7e7fe771500c9e4617a3db4f440ce0b685a5 SHA512 ad0a62c775fbc73ccec351add73c84d12b4b73265e5fb54b30310a0006c95ac482efea57f35c58ff57db3666c6aa201b26d20fea7cdc4aff7c18184f9760619d
+EBUILD pathtools-0.1.2-r2.ebuild 473 BLAKE2B 811ebdbb996b38752f46005077dac622141f59f7d10b564c8d7f2af40f9ab13952c93310b88011ea3dd35315fbd4ac08fdd5161500c09cbbae4823ade0b57cd4 SHA512 7bfc17edf475eafbb46bfa1b2fd840eacc319c2f81e5c86bd9f16518c522f2f40cb9a76ecd44e055f2e2aad52df260c33ce9591fc3a5126f5fede6b0dd4d9126
 MISC metadata.xml 312 BLAKE2B 655db0f4e05f6f22057f5b40c38a0790aa4878190ba1f2eddd703c2a13a1d8010282517cc827bdf2f48597024c9069ddff7be23a4f914899d5c432115d150c57 SHA512 f1187bfa80d1a0e64b04e3d474d8d805fa73f7c23ad412fdde4a51f347268c764d1f808d9c9b1f191c661e777dcfe6aaf0966bf13ce7ea9e8c02f6a8e5249851
diff --git a/dev-python/pathtools/pathtools-0.1.2-r2.ebuild b/dev-python/pathtools/pathtools-0.1.2-r2.ebuild
index b7e73414ae61..abfbe1472bb0 100644
--- a/dev-python/pathtools/pathtools-0.1.2-r2.ebuild
+++ b/dev-python/pathtools/pathtools-0.1.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/p/pathtools/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/priority/Manifest b/dev-python/priority/Manifest
index 44361496f9a3..a2d309419d15 100644
--- a/dev-python/priority/Manifest
+++ b/dev-python/priority/Manifest
@@ -1,3 +1,3 @@
 DIST priority-1.3.0.tar.gz 13827 BLAKE2B 8c100eb44ed42f4f624bfb37dd6f698a3da84812783bd44ba82afef565562379a7677b3cbc9e16c4ea5a5dcc91d0897fa47c341a81bc1875461a72aff328fcff SHA512 cefb13b15e99ef98c37fdd1486466c9e1d7d04b4574cbca1665fde7b7b44cc7d66964bed41184315a9b51bd6f9d0e02bbe113bfa004a754ac270170309b71e0a
-EBUILD priority-1.3.0.ebuild 954 BLAKE2B 0c12bf17dce1c1a316493741abc202d1acd0a72eb110e5fb6f62139c4142c542bca6770d463def0ff856133e20f80fc5811f2719a223535d9eb5c97c8a9f8ace SHA512 7a942e15ac4a7a1779d928bf0225e1a872ba00a13d4c123f866799ed48d0d8794d93a1e5fd0faf06de82e58edc42430e4232ff83bff5f1517630cfa666b71061
+EBUILD priority-1.3.0.ebuild 953 BLAKE2B 15a9f91e923fb64b9ad679974faf446cb537db5737359fe0ae30121d44fc012309ff0e60bf4694a58abbdf08dccf03c080f88a9c8df7e835501d6b4631c13e7f SHA512 2647a6ce2326522321892d56b98ff7648f30b7b782459bc39975e51de0fdb5360d2a6f0740110e9514be8dec46e332b4e8aeaff55478e68e3d4a37710cdf788d
 MISC metadata.xml 917 BLAKE2B c92ee27c2cdaadab26b9d68451c0b7ee055e26ba9457e5fa8dcbf2f9b4add141d07e85344d7de536db6a4a40da92d79c67862da2bb381f0bf1b384f90565f2a8 SHA512 e5daf360e9d2c4efeae4084d9a72ac975acc09f95d0064f4d2c3759ba00a080ea5a2f689f74ce666633fae26d1afa095f29b209912fcae0ba38d9fc1231b74e0
diff --git a/dev-python/priority/priority-1.3.0.ebuild b/dev-python/priority/priority-1.3.0.ebuild
index 3c235efdb71c..08a7614d981c 100644
--- a/dev-python/priority/priority-1.3.0.ebuild
+++ b/dev-python/priority/priority-1.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/psutil/Manifest b/dev-python/psutil/Manifest
index 50ec56932043..d4915d811f0c 100644
--- a/dev-python/psutil/Manifest
+++ b/dev-python/psutil/Manifest
@@ -1,5 +1,5 @@
 DIST psutil-5.4.1.tar.gz 408489 BLAKE2B 867dd9b535134ff2ef5960f774891eb4743afc5857c4e0ba7306bd4feb42f3b255a6174a092eff2814f3e2ec9d29179d23ffe495ca85dba56fc42616e67c9a8b SHA512 84d9f61cc6c51798d98ac2f727a50d85de32171645d01abf85d4f8c58bdb3b40997ab717f859de3ea21cf5b24867e1a416ee3036d6167d3fe735eca4607a110f
 DIST psutil-5.4.3.tar.gz 412550 BLAKE2B c12a8418e7a7573d23a2599c6a4df9a3aa3bbe6b9cbef9e0f48b0379944e2aa06ed498adfddc30e8d9ba8e02a08f79d4867dc1e313a62040ad3550d69d62664f SHA512 f2a0f3089c3436df52d509576795e1de14c4127918fbe63b8f116f7c097ba4d67e3b55a8da167a88c6ffd340bb443109d4887c03371810997ced4478b295f960
 EBUILD psutil-5.4.1.ebuild 789 BLAKE2B dc1b5d6fb10ea01c02c11fe02fe4fd59bfe586eb57188d2357c67e5d481e4ea228d50765615a5ef7a1d8d67574d50f1b51a5a248e3cd7c825888c427ca416884 SHA512 fd438125bea9680bdad61efaa3104e62d7eeea570ef3c0786855720ceb686df1e532f87c8442af24b9d422ce34da36d5c45d1f8d0145c22e5dec0fd222a326e7
-EBUILD psutil-5.4.3.ebuild 794 BLAKE2B 0b89b06034fc66d28c311d39ad50d2b84da6d2996e95c7d67d0620a1489777aa1dd10e47b07f322c719a52eb752661f42eb6921ea32adcfa42c1c3a8e162de98 SHA512 015bb268ca98120a67ca68ef5d01492682a518dc9903363995e1046a7ef5310d8270669a68698f1791988daa58aad65032d1cc1a00a260505cf23988181d2bf6
+EBUILD psutil-5.4.3.ebuild 789 BLAKE2B dc1b5d6fb10ea01c02c11fe02fe4fd59bfe586eb57188d2357c67e5d481e4ea228d50765615a5ef7a1d8d67574d50f1b51a5a248e3cd7c825888c427ca416884 SHA512 fd438125bea9680bdad61efaa3104e62d7eeea570ef3c0786855720ceb686df1e532f87c8442af24b9d422ce34da36d5c45d1f8d0145c22e5dec0fd222a326e7
 MISC metadata.xml 377 BLAKE2B 0e671ef95025f24d295ceb5c5295544f4d68bf94459537537e229efd273bbac058b385fa94f1fa1191f23785d2572a5960d84a1d3ece41f10316b38101cb26d0 SHA512 a28e7a1e32a0b2750a4f0956d2252c73d20b4aa9817aac2e776365febd7d03de88e88508aabdfc29ae15d8bf7ebf1ed662c000e2ca8c79e3d50a3362ce1c2d2d
diff --git a/dev-python/psutil/psutil-5.4.3.ebuild b/dev-python/psutil/psutil-5.4.3.ebuild
index 0f47dc7a64cd..d7cdccf4f729 100644
--- a/dev-python/psutil/psutil-5.4.3.ebuild
+++ b/dev-python/psutil/psutil-5.4.3.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-fbsd ~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-fbsd ~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/py-amqp/Manifest b/dev-python/py-amqp/Manifest
index ebac79dec890..e6acd867a300 100644
--- a/dev-python/py-amqp/Manifest
+++ b/dev-python/py-amqp/Manifest
@@ -4,5 +4,5 @@ DIST amqp-2.2.1.tar.gz 103599 BLAKE2B 2f0f5573bea19a8dcd609cbadf664ad8835b83f470
 DIST amqp-2.2.2.tar.gz 103128 BLAKE2B ee1513e12e1695ce2d16f72fc09dce713a5c9e7e630f8e8d2d39b580b15e254287ff49039db6a43f808f1d2c26239195c003648f360169abfbdcdab9aa700604 SHA512 8ebb8f2b0942e9b88b12cf35b8861da392190dd200d843bf3bba7b98e325afa53f52fe3f8250af1d2c1c14ffe8a071df5494d1eedc1bff974cd62fe88bc3e1e7
 EBUILD py-amqp-1.4.9.ebuild 1619 BLAKE2B 123a7ee8d0d3cb20e765d346d77e95f48aeefd4292da1349db208138891b479f12481ae79998e31ac4653c54025a244691790affd5cb1aa5c37bdfb6d45a8c3c SHA512 65b7b4a67f1122a9052a74f34fa5c5b8fc80feec372bfb906a956923bd9b37c51c49fdf0d964f637dc9b050477ceda6f714b0830732a638bb7285ab4d4d1ab81
 EBUILD py-amqp-2.2.1.ebuild 1188 BLAKE2B 2324b04a09cb652ba006792387784671280f1cf966e03db4d01a35b0ec7b00a1595a2a7823e3db15f5f480ea8a5e9a33f7d28ab1872cc90bc590b3ff0a452702 SHA512 c76b684c232a913452b43e2afa1717ebf16babea4f37270b8a4d83960bfe3ab80e42963208e5ffec76db7741f69c98be81a7d156207559feddd5bb38003f0eba
-EBUILD py-amqp-2.2.2.ebuild 1190 BLAKE2B 2d2ad44853287d084e582bda40db56169175c175a10b97c4b908e1cf06efcaa6bb8d3b2ffec50f8b48f187be55708da0ad9f89efdfb7f6d6145fb24c3f47235a SHA512 fcc9445c37e648b91b894a779964dde1ab9a9a0f3b8b4a1e0887c0da18873b7743a5fb1b24e600032543da7cb80461accc72cefd508cbcc9b02cdd9846722050
+EBUILD py-amqp-2.2.2.ebuild 1188 BLAKE2B db230892dcae4df643da800d684f335eb19c861eb2d3a7dbe1ef12b9d87df9733787be851e7d60c0b658f00bcc8004dcf79e8fbb8d242bccacb7b37013029b2f SHA512 5c0c53d62db0e3a6d281674b6d97075b64b36bed11d4e61501543221589c91ef4fc878e5a62b9d2473f7a80a069983ae91a6c4c7717053de4ea3afd92b0252c4
 MISC metadata.xml 480 BLAKE2B 43fb5084b74b3c2162cfe63a41aa8e115ca9da87aa9cd32ba135371ed1236a443b96804d5593c69b8e8189affeddafb8bebe7733369548150ce525f4d0f71d84 SHA512 d386da72715c929924505be0c50dbbb0b24fe8087f4b4e47ddf5f6d868dd6c42ac63676364837490eedd7ab32053d360e95cac9416954d9225bd110f3d1df9fd
diff --git a/dev-python/py-amqp/py-amqp-2.2.2.ebuild b/dev-python/py-amqp/py-amqp-2.2.2.ebuild
index e2f94d4dc876..fb1245f496b0 100644
--- a/dev-python/py-amqp/py-amqp-2.2.2.ebuild
+++ b/dev-python/py-amqp/py-amqp-2.2.2.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc extras test"
 
 RDEPEND=""
diff --git a/dev-python/pycadf/Manifest b/dev-python/pycadf/Manifest
index 1ed423f21188..f15ffd2fc85d 100644
--- a/dev-python/pycadf/Manifest
+++ b/dev-python/pycadf/Manifest
@@ -1,5 +1,5 @@
 DIST pycadf-2.6.0.tar.gz 249411 BLAKE2B 7ddbbcb9355502910ba023589181cbf2d6a104454ca408b604eee031ce79c547213961d10bec4d891e8ddfb00ccacaf1dff1f5bb2646913e9c0bb79abfd4ae72 SHA512 a581b54a8dae088e015d639f14eb46b3c41bdbfdd55b671e79f34b7392af49e3e8dbb2fd85a43e5f8e010cbcdba1d9a330972b5cb6f7f2c5179c00b6f135b4ec
 DIST pycadf-2.7.0.tar.gz 248233 BLAKE2B b2258e0f2027811c35cfcf7063821bd41cc83291d5ace7969fcd48d2e76b4f1a24e8a09b60f996f2edc7e9c37c1578cda40bd2bbd0a1ecbfc889a1d9bbab6ca4 SHA512 093c633c82345154c45c7b8b3dd38ef8101fc6a6aa980a44fc69887409a8facd987a960f403150401a64f2186113bdf5e8c05a3996f3ca4c55f9dc40ab8bfa8d
 EBUILD pycadf-2.6.0.ebuild 1837 BLAKE2B 6bbdb8b2d15aae831a175f78a2b5ed25570b104cc4f7f1602e68a9d507403c591442628e6d7ed9fd4324f1979b508fd9fc8f0c96894592568a343b1fe8a32241 SHA512 011383ccc23ec4009d3317d2139e6fd17ff15517bec8a7ad98312b092c82169fb3e2e5eec15e66c262a78d93f504a77e892f6b3d720a0cdbe8fe2ff02e027de7
-EBUILD pycadf-2.7.0.ebuild 1861 BLAKE2B 2ac5acb06cbd02f45743d77be2599079f00eab3eaf09c9247f9c845cd634c7b356e8a250b7bdcc9752722add7f7e83c8710649126d09ad86631f54d2c4b6c771 SHA512 cb54a1e55fb9b186631dea347f335c8891438a6bdce9ee64ed84ce40425dae40c3052c4f72e092a680d930f6e1ed7ed05c3d5f272efa9e3cda688c82323cca5b
+EBUILD pycadf-2.7.0.ebuild 1859 BLAKE2B 14980934fbc59516b6c0ac58a288917e9c8bbd12fbbdfe351e49d1434b49ab794ec69170e8c679ddb80391afd7cd5a2417a6dfedb3d9f45900ea454312f6f520 SHA512 52f532086141cd2cc9e06d63ce421c9625c34e2e48b5a7a6e2a91b493996b6705d73eea84b6892a38eee609be7f5b4156da0a27272605095d9dcc458259bd1d2
 MISC metadata.xml 555 BLAKE2B 87869fe50262ccda3c9f08312ba7d4017e655da6e4e18e31bf8dd99cfb552ea2a1a13cd71793bc00feb6d6d362c19bbc6fcff9779ffa7334db96833548b567dc SHA512 370b97a8a71e49aa553cd6d56b5060074fbfcf366e84672527e8ce49e086c3393198a6afc7d675ce7db71fb8c2abf7bbd4921140da3180f78eee687a2edadf0d
diff --git a/dev-python/pycadf/pycadf-2.7.0.ebuild b/dev-python/pycadf/pycadf-2.7.0.ebuild
index 6b43be8f645a..448691143d11 100644
--- a/dev-python/pycadf/pycadf-2.7.0.ebuild
+++ b/dev-python/pycadf/pycadf-2.7.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/pygit2/Manifest b/dev-python/pygit2/Manifest
index ac63243a85f1..9b29124cbcfb 100644
--- a/dev-python/pygit2/Manifest
+++ b/dev-python/pygit2/Manifest
@@ -1,5 +1,7 @@
 DIST pygit2-0.26.3.tar.gz 462080 BLAKE2B b3c4b9b8a6aeba22a70a8d2ef1393dace3a065a3625ee3574058e333bca4ba1d60223939f412eecf5ae9d93a81fb81c4a536af46aa047c2c82a48bd81afe4cf9 SHA512 6f727686221d4e8c348f836b7ad278b48a4b971a121b9953c2cf7163bf093936d838aaf83e9edb8628757624ab27e8345a2fb29eb1a79a30e06c0ab0a77e4cc6
 DIST pygit2-0.26.4.tar.gz 477318 BLAKE2B d17ef799ff3eab3629194fe0fe90dcc335e40509c13f53bc8f8e0b01e93dc838ca474a5e4ef44c9be2eac7d08e98c735820e936cbbcb7f398f76f9732954bc69 SHA512 e459e47bfa8137421625633a731d49882d95a52d4f2d672f2c8efe7cd6cca4b33335ee77777a353b309df4917d9b29b30c1f9a96b7e226e3e7fe0cd34bbefce6
+DIST pygit2-0.27.0.tar.gz 477427 BLAKE2B b12924a36ebbcd269e5acbba193b734cc5e6a804fc71c0b322503ecdc6628059cf0f12db867f2e335026bb0f4edd089e9a46896049027c9514b0e555f6e2a881 SHA512 e19363cc8135b3f538748f07ec937dae6668f22e5881f914e9406dcdabee65ed546caba27703d19fffb146083e492e51837fa93af414a35006cf1c81c36d9356
 EBUILD pygit2-0.26.3.ebuild 629 BLAKE2B dbc3175935de2fe72cebb7cbb4e5e18769f921c013fc42c093ac47cf19fbca8d582557f7ad0af5d273db7882137a873314be3616d53abf875adfbf35d7ecb61d SHA512 52cf3c56b1d268b0f39c88fb24fd9286215e722aaac6519a5eadd5fb30c17abebb63107a2991f9ebce0b5b8be5933eca603c63599944794a2958785c42a27ca8
 EBUILD pygit2-0.26.4.ebuild 631 BLAKE2B 62288ed0b0d944a2d0e4cd4a4528659ff99b66bf548befbfe7f55b6f211544db4335fbb3ebe905196fde60c3690c62ac1123f20a126417b39f7d58229725b5a9 SHA512 22f40d281816744fedf18a9418a1e4d1c2fce7986c9516256cce9fb4976cd44208e8712ebddfe9b513222a234605257338bb77e313f395d2bd5cce9393c5aba9
+EBUILD pygit2-0.27.0.ebuild 631 BLAKE2B 62288ed0b0d944a2d0e4cd4a4528659ff99b66bf548befbfe7f55b6f211544db4335fbb3ebe905196fde60c3690c62ac1123f20a126417b39f7d58229725b5a9 SHA512 22f40d281816744fedf18a9418a1e4d1c2fce7986c9516256cce9fb4976cd44208e8712ebddfe9b513222a234605257338bb77e313f395d2bd5cce9393c5aba9
 MISC metadata.xml 489 BLAKE2B 3733ff314640ab2cbfa07e0ea67041ddb3635b51d339070abe97c95b5b358851b412cca5d8996dc1f25abb986a03095f19e8a50cbaeab7eb156c6b9107108cf6 SHA512 d20b7ebbdb3ea2ec72c3c5ded9874b7506b3ddabb43dbf329891478fcf5d7c4b9487ab0675d735733f463dd897dd5cdcc28080ad597f4f838bbcaa565c26915e
diff --git a/dev-python/pygit2/pygit2-0.27.0.ebuild b/dev-python/pygit2/pygit2-0.27.0.ebuild
new file mode 100644
index 000000000000..64a6fc92b351
--- /dev/null
+++ b/dev-python/pygit2/pygit2-0.27.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 eapi7-ver
+
+DESCRIPTION="Python bindings for libgit2"
+HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.python.org/pypi/pygit2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	=dev-libs/libgit2-$(ver_cut 1-2)*
+	>=dev-python/cffi-1.0:=[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+python_test() {
+	esetup.py test --args='-v'
+}
diff --git a/dev-python/pyhamcrest/Manifest b/dev-python/pyhamcrest/Manifest
index 0e49109fce2e..165c61418366 100644
--- a/dev-python/pyhamcrest/Manifest
+++ b/dev-python/pyhamcrest/Manifest
@@ -1,3 +1,3 @@
 DIST PyHamcrest-1.9.0.tar.gz 376623 BLAKE2B 808c74aa4dff89467c126cbc0e18029a9504cb27bbf03662a90666f85c76d7d7617260f50d35acde3a8e9e437b846589423cbb3697f8ceb86d0b5b838c586ebd SHA512 3b8393d0079b619b208ec7f06ed5133c4ff9d9dba050f818adf56347fc2225fd1c85d60f3dc262b7b9722061f0b8e4966180b6b96245a371e578d0d51633b4b0
-EBUILD pyhamcrest-1.9.0.ebuild 1228 BLAKE2B 0532d437d45703650496ef3802dded6cf10e7fc48572f14655f6b93948e21dfa183f6ef8456c19b199f182b7637bc9d412a472d8f12f85661b2136872de16c6a SHA512 47b473c3ce3088a2313bb77716ef64e7ba31316dddbf8fa3f7e9b13a2fcff053f72c457440e7711308fbfb39c45d503169d753c2e0e784f4ff8e8ef6dd09353e
+EBUILD pyhamcrest-1.9.0.ebuild 1227 BLAKE2B 173ad0e42c44e083043203c40435865697bf5222e7bd4fe907db296fbea627aa06de8a99dd8842f259073ecedbd902a4bc7c9eaf7b74540e1afe53d85832612d SHA512 4bca028ef12f224a122978f6ca9ed259306b7817f5f6182cd462d366b944458bf2657ff7a25f2993582d69cd9e5780004b65702062c2f6cbe429f6c39eefb81d
 MISC metadata.xml 271 BLAKE2B c9035b9fb7a0fca1355aeda317feceecac5790bb6723360063b236d6633a040a594eea8f304c3b5bc8e918b1781f0e5e887ec15225d51a021592391195b7e8ff SHA512 89f447b79dadbb441c4c51527f486fcf7110b67c0a86c9fe6413c563463be57089faa1ddb36701080c368ff0a8442532bc774602e0120cd5466a4d7fb6bb6e0d
diff --git a/dev-python/pyhamcrest/pyhamcrest-1.9.0.ebuild b/dev-python/pyhamcrest/pyhamcrest-1.9.0.ebuild
index b8007ad5a05f..596f8cb84574 100644
--- a/dev-python/pyhamcrest/pyhamcrest-1.9.0.ebuild
+++ b/dev-python/pyhamcrest/pyhamcrest-1.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="doc examples test"
 
 RDEPEND=">=dev-python/six-1.4[${PYTHON_USEDEP}]"
diff --git a/dev-python/pymongo/Manifest b/dev-python/pymongo/Manifest
index c0cbad8a20e9..4197f71d29b6 100644
--- a/dev-python/pymongo/Manifest
+++ b/dev-python/pymongo/Manifest
@@ -5,5 +5,5 @@ DIST pymongo-3.5.1.tar.gz 1332463 BLAKE2B d581409a4b6cdede3e126e31747d34ed0e2389
 EBUILD pymongo-2.7.2.ebuild 2786 BLAKE2B 279e6c0f5c60d8cece7a7b2b25ccc2b76ba8e9879f40bb5fab95e3044f0344ba780611ea9e9b6ef6e98e80688d23a8614b94d5a87e5d7a06669cbbe94703aa3e SHA512 b15aaf5a063d4525c5c7039fd875336aeb86d9a859ad71de2a95b65c73e572218aac9b1967c0cb6b8e7f6bc6a56f53c12c62abd669a5705b960ba2bec89a3c71
 EBUILD pymongo-2.9.3.ebuild 2982 BLAKE2B fb41373466049625d26913a571366ddc1f8b314360b4fd7d9e1b47032dc84e5b3b617fc94aa584cf673f12fc6fd3881b59502b311db2da9e404c626d806bde51 SHA512 d10266fcc7e39e55f1bfccb913cee46c4ecf71a36669b4716c7d776786b27d6574fb101a027546f5996abb8238f4a2ad98ae7d21fb02d729e77678434ad50457
 EBUILD pymongo-3.4.0.ebuild 2786 BLAKE2B ef2ca220e2884f88b51151028fd4cc0a30a6351d3aa16b2f7b40c027f171c91810d6bd02c08a9a5324e47d4e1ed50a98b377a84de42c5a966e1d70b5e01dfbf0 SHA512 de374b5dcf5e511f45afb4d47ec6953702e0c19fae4636b0760d327ed24e9c03dd02f25af0f6125d666ba8d492875e3ecd98067f4b14a58716e72b4f3bb9f27e
-EBUILD pymongo-3.5.1.ebuild 2795 BLAKE2B d346fca965baddf219080c4101845f900d30314022aaa939fd50421ac6631ac1cf0537c367fa4507cea583b29eeda5945ce47e1478dcd15af1d2c82801d0d73f SHA512 e25d81eac1fffcc9b9bf0df249a37a9bb1851ed78676e7ccd5e6921a916e1f67675c19001769ace50dea6ab10a64f3a3ec92933833a70b935834a073a59f0391
+EBUILD pymongo-3.5.1.ebuild 2793 BLAKE2B c755f0df2b804135980a5e9a7030f32d890b3f70946c6985707bfbdfb17e46ceefbe04f979ea5ebfe6642986b0e1d2dda86497fbe66da9705b1192bf928f596b SHA512 1101e718c1ef5d596ca4a157aeb773f0b96bb4b6e3fb4160eadfa22e15526b4a7ed80a8f0c292e26c19ee18757d130ed3df01b5d377b6bb267e3f2d0ebfdbf51
 MISC metadata.xml 890 BLAKE2B 74f3efc00408cdb34ffe6f5c87fbe3639efe3943d62ead2035cab877fd229d6eb9d5a9b8b1086da46df077925fe6c2f75c5d21fd56dd17dd2ffd7b3abb525a00 SHA512 719bb6618d0fce78dba2270ffb288c6962b1f4d48645ca4596c7d4e879dba9de78cd008e0220f31c1f3cc86cb520ccccfacb0aaf03bf56c9198b1fb123c73da1
diff --git a/dev-python/pymongo/pymongo-3.5.1.ebuild b/dev-python/pymongo/pymongo-3.5.1.ebuild
index fd2f7a98cfc8..1426c33c1fa2 100644
--- a/dev-python/pymongo/pymongo-3.5.1.ebuild
+++ b/dev-python/pymongo/pymongo-3.5.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 ~hppa ~x86"
+KEYWORDS="amd64 ~arm64 ~hppa x86"
 IUSE="doc kerberos test"
 
 RDEPEND="
diff --git a/dev-python/pyopenssl/Manifest b/dev-python/pyopenssl/Manifest
index a1bf831b71f0..0fcf13ce0c1d 100644
--- a/dev-python/pyopenssl/Manifest
+++ b/dev-python/pyopenssl/Manifest
@@ -7,5 +7,5 @@ EBUILD pyopenssl-16.2.0.ebuild 1596 BLAKE2B 2fddd33669aa0bec3680851737fef5be19fd
 EBUILD pyopenssl-17.0.0.ebuild 1606 BLAKE2B 170a0d141beab15e063bf6137e7ffb052265676e9ab9134748f9cd608a1af8c1c30354e0b9f29ccb576a7449ba7f96bde4900b93a220ef04d7e9c31110e152bb SHA512 e8f73d81532e7ccecbd96f6958ed65ebae636efc703bb02543ed27e136f6a48b086b5e3a230685d1ea8a7b19ddbd29340b53e908b9eb8756644645a0fef2fb5f
 EBUILD pyopenssl-17.2.0.ebuild 1573 BLAKE2B 178c8cc77f28ad47c854f60689bdc25378c32dc3cedf8bf4ff1c1692545a8a49618f2b19235c8d60cb3c57520d0e183c2466a85b594902d9cb9fcb8539e26120 SHA512 927ac59c13d8b688a27f49a56ca719656755930eee39de29ff84e3206af271e8b0bf30b3aa3a623aa9d14cbabd4cc03cf2724646161834d2d713d1c00e98b4a3
 EBUILD pyopenssl-17.4.0.ebuild 1581 BLAKE2B c47967dd1ed4946e54f04e71a81b153519d6fe00374102c6ccd8b1e26704282028da7f262f8456496b271d777503adfb2fbd5dfc6eae6357860dd41453a23155 SHA512 11704f1b6207285e3fb3b58ac3d8591b96093eb3a669631d057f9fe5d2322a681efa46129f5c10ce0be20ad614fc758f5dbf80f86407c8bc0f5ab2429e0d7733
-EBUILD pyopenssl-17.5.0.ebuild 1602 BLAKE2B 9f2c001bfb157c321bd313be050710ebc5fc8055875cf35313f47fcf25f16aafaa937bea3cf51a10203dc3d39f875dc27dac1568412308e5a5a5f96c9038bc02 SHA512 76707118753f9d065e22351cb19c1662c952344fd0a7be80ffd522e9facc4258189dea7c7ebd9aae65c7f9031ebc4c49283f3a4ea18316d419ca6a475ca584e4
+EBUILD pyopenssl-17.5.0.ebuild 1609 BLAKE2B a8de3adeb8c91be310ed8f393844d85dc1105a139aa5faa641c453ecdb390d63f25a29eb269da42363dd7cdd04df329868da4259719d11cb98d6da721a899697 SHA512 fb990d1216404ac00c330348ede3113c721c6204e511f1f5a8b6dd6d4872532590d64c325483496a809b0f5d586b2a9561651d010aaa157e903fc01199ba599b
 MISC metadata.xml 418 BLAKE2B 69f135bab3b0cffa47cc8e807e1f537f7fa0bd599bf3309ab92ddf41f894c21ab0e3f793ea4caa65d272043d2dc0352fc54c7160b31fccabbeb165775a895d97 SHA512 5cd4b0381e79245626500a2a38b9f7bedcc8e4742445ac16f12a96133f1291ec49592f2259294f153d5f1b27969cd6f7f364d49f32d0793b12b2ad38b824f441
diff --git a/dev-python/pyopenssl/pyopenssl-17.5.0.ebuild b/dev-python/pyopenssl/pyopenssl-17.5.0.ebuild
index 53103be665c2..bb8c629191cb 100644
--- a/dev-python/pyopenssl/pyopenssl-17.5.0.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-17.5.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE="doc examples test"
 
 RDEPEND="
diff --git a/dev-python/pypowervm/Manifest b/dev-python/pypowervm/Manifest
index 50d45638268e..9ad0c49db7c1 100644
--- a/dev-python/pypowervm/Manifest
+++ b/dev-python/pypowervm/Manifest
@@ -1,5 +1,5 @@
 DIST pypowervm-1.1.10.tar.gz 887266 BLAKE2B 61767773e870fabe2b2954b0e6d13488e7eee83360e7e575fc4ba330148a84f46445c4107929f2e9a2d5ef891195de6374d9c75fd0ee624c71444c338405c8da SHA512 9879b685e46efd4a15f463112bf800884d0e1bdf43ef0fe790bc65334b2f1eeea1b531a0796e1673f4114ea8727c3f3a57bc467934aa535daf17189d0068e253
 DIST pypowervm-1.1.6.tar.gz 872456 BLAKE2B 02afd4c25aa5f0b005e621fe190decb2724ff289d6f1330744428bd6616a8b784e79486e4e26b46ee76a3e6346f16100cd788f705f264ca9b29b8522a2c8bc9b SHA512 31211b93f85cda9067e29700794daf9aed5c43478c27eb6dd5a150120282a7d46d4fa4fdf5fa038023153b02aae85f236d681e66646912a464bc3d265c87fefa
-EBUILD pypowervm-1.1.10.ebuild 1352 BLAKE2B d9cf6fb434b04cce000c81f3eb7188a10f00b56eac1554418ea1fcc48eebdf05d869521a8e3260baaf8d24fd30c56256c432c71c789467f27c47eec7cc03b000 SHA512 0c0ee6080495e2a4bf4a294a12335edcf49286c76d1b1c85888a618a07c347f902bbb5bb900618aa9476a652a68fb7b9e1d79a5d5a22f4d7ff9af0399c0238da
+EBUILD pypowervm-1.1.10.ebuild 1350 BLAKE2B 9fed125e24ca3a5fd5d5d4a70793ebcbb92ef2530fdbdd6991e9c41cc77e42f2025299a588b25a6337189f2053a8661056d5e1d693dafcfbecb388b386620c84 SHA512 b4b72fa9644ef288f5a1c1a92cba8c50924263622b7f8736b60db6322151875199bf4951e1fee2ace3d8f04009d6467cbdf30b1a59a384c40b4b2f79b1d9539b
 EBUILD pypowervm-1.1.6.ebuild 1260 BLAKE2B 9086f198a9f8cdff0a2bdfec11202072a292365ca739ad98abd49ec56187b4e7208b17108da3dc81ccf31d493c1327a7faaa4cda0b1eed42c0f0d2d8f935f3a2 SHA512 bfebdd378fe1c27fbce70ef65b4ad368ed976ceab474a95ad410adad5fdce5faa7a69b2c926c044180bf0fe285d8be74dab6511d9531516adaa40ebf82936e8d
 MISC metadata.xml 383 BLAKE2B be09e21c8e64a738f362727e96417344afd5a4af5e99314274cb2e77f2c7b32c8c5d68f7e8d44b053297aa597ceeb6a1e4b41d1a30954691920b976694416d8f SHA512 e06a03085a277a53d5a04e076d240d59cd81e83d40241856a2878776792366d50bdf3e9fba2dacf2931de17234f87583b3114f3f696db1254d8a185a9da06d17
diff --git a/dev-python/pypowervm/pypowervm-1.1.10.ebuild b/dev-python/pypowervm/pypowervm-1.1.10.ebuild
index 45d8bcbdefd0..6e649c6a7a17 100644
--- a/dev-python/pypowervm/pypowervm-1.1.10.ebuild
+++ b/dev-python/pypowervm/pypowervm-1.1.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=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pyrsistent/Manifest b/dev-python/pyrsistent/Manifest
index 456285ce7aa2..931c97891a3d 100644
--- a/dev-python/pyrsistent/Manifest
+++ b/dev-python/pyrsistent/Manifest
@@ -1,3 +1,3 @@
 DIST pyrsistent-0.13.0.tar.gz 96326 BLAKE2B 47388d7d48841c3a093c5309e20e92619b16c9f7c59a47929b8504a7e6aed803cb1fa07260ef8fbc5ebb4b243a52329a5a9976ca947c00243fc5dd3bc9e34e8a SHA512 6bfb657841382c4ad402c383cae5092b83e93a3dde0b905f6cb8ca8a50b8acbe0f3241e9cc50cb83892c0d59b13145764faa2a3db1eabecbe6606a35d07bb5ff
-EBUILD pyrsistent-0.13.0.ebuild 925 BLAKE2B 725c039aba228d461e816489d2cc484c497b1baa856c829376e0db58d0e09f3a98dcac2efae84fde0a670402559851e48f07aec53805e51ebf65d0694c04c160 SHA512 d4cc596cae4c7a5019bf312b4b3f7678d2ba72d2069a9ab699b3b0d01ff6622c68110d8f0c7ded44154832624d92ba1af87ffce69b63f0ccacc62ab9bdd0770e
+EBUILD pyrsistent-0.13.0.ebuild 924 BLAKE2B 9ab6aaad9e4e3570fcdc0ec3c7fc13c82a4eb5b4671bbf4dd46a3ce7210d45ea8986341833db0d4689e27d4e59ab17fd2d39add0ef503666fd379de8b0a6076e SHA512 4368d8cb8bdbd489f8e4ee68c9e9909fdf59307de98a48536b92cf01fa8f81594441a0e29dd99653b62e1fbc9fae757631f14a954c27fc24b818ce226d5b0c45
 MISC metadata.xml 521 BLAKE2B 0081a54c9db451d020647e808b80c47e590530bc952c40d3dc6c11e187cb6ff4c644c9c8c448b206ef3036a3a0ae07760e23ba88d41938667b0a83ab2299cd9d SHA512 16d13966bbf6d52360d9438a56a949e6e31a9d2ace85e319db27be14f85c8446ee28e00c6bafc9232b3608e3a209396dc601cb3ce193d3cb4e8284cc8b3cfef1
diff --git a/dev-python/pyrsistent/pyrsistent-0.13.0.ebuild b/dev-python/pyrsistent/pyrsistent-0.13.0.ebuild
index 5afbe9d3f267..00607ac254d9 100644
--- a/dev-python/pyrsistent/pyrsistent-0.13.0.ebuild
+++ b/dev-python/pyrsistent/pyrsistent-0.13.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pytest-relaxed/Manifest b/dev-python/pytest-relaxed/Manifest
index e8a920c7972e..ec05836e13b6 100644
--- a/dev-python/pytest-relaxed/Manifest
+++ b/dev-python/pytest-relaxed/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-relaxed-1.1.0.tar.gz 25942 BLAKE2B 6dd34044ec3ae0b5c85f0a76102aaeafe3dad8748c0cf34666dd3550162a2968191efb8415467259a4f072905af062aeabaaaeb475ab68d47aa8d79e3cadd3d0 SHA512 010e37c4d0c63bd00af8851bb50e52af7f8f17769be042e4941e8d8ba451920c24dfa6cdf74cd1b3ca4b3e1c71cd5e1ac34ffae855fc261cf431c212f98cbfff
-EBUILD pytest-relaxed-1.1.0.ebuild 797 BLAKE2B 261ee67462802f94ce962dfc4112c45c0b9eb9969340d49303966ab2ae4efba2e53ccb2c7f5f2c3480d12fb643b05c87330f746760c830a1f70326d9ce9ffc3a SHA512 582992f8279ac8003f62dba0e4b94eb275e0251809e91eab688b1931a08ba133751848493ef5417e47c4ba0d064d30743c954f1b6e3c493fee30f1b2b995f3ca
+EBUILD pytest-relaxed-1.1.0.ebuild 921 BLAKE2B ad8e3c39a687205a5973262c8bda0490d3bd6986123c3920f574c0aa3b1205c0f2e8b0166b8bc37ae7711179d85a61abf568f379200ad1024c2518971bc4a5f5 SHA512 1b5c2559af7e082aae543710e78e8405fd3c92823753eb5556420ac58a62d97619633be0cc8d0224ec54227754241f72cfe046a1ba657cdee33ad6b134cdfb9a
 MISC metadata.xml 382 BLAKE2B 858b2e05190a45c6842f93638cc598f3b97b3481a361438789a2f1e4aabfd474da056d5a3396927e555d4395cd1ac13393fbb0682aa3fdc6c734b718c0451ebc SHA512 9a59cb814efe45123a5d8fc8fe8b81d068013c58fb6f4e04bd9c0267c4c5ec1f1b254770ba6f5e43a645093c84a477d903e5d981c89532732c840e2026ba40a0
diff --git a/dev-python/pytest-relaxed/pytest-relaxed-1.1.0.ebuild b/dev-python/pytest-relaxed/pytest-relaxed-1.1.0.ebuild
index 43eb0807a7ab..948d62c8ac3d 100644
--- a/dev-python/pytest-relaxed/pytest-relaxed-1.1.0.ebuild
+++ b/dev-python/pytest-relaxed/pytest-relaxed-1.1.0.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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~amd64-fbsd ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/python-barbicanclient/Manifest b/dev-python/python-barbicanclient/Manifest
index 1bf52065e6a6..3347c0dd05f5 100644
--- a/dev-python/python-barbicanclient/Manifest
+++ b/dev-python/python-barbicanclient/Manifest
@@ -1,5 +1,5 @@
 DIST python-barbicanclient-4.5.2.tar.gz 112008 BLAKE2B 1ab2f361685809d5c87f52ec420390ba83c63c5357c9a62aff4528d0161766ab92dbb2934a90a70d810e7785f6cdc420347aee199b4157dd02a60553281bf762 SHA512 23f6b9d90d9488a9f072092716bd65f8fe42b01b0889061784df909d5e169fb264f1b71f11f8a3f48853522f3d17428e5c4322712e41a57059f7dd45d0d06213
 DIST python-barbicanclient-4.6.0.tar.gz 108979 BLAKE2B cf037b7818dc2ff5a04637a35760e7899c680abdcbd3ad87f432813b5fcae5bd878d2fe60a97e1d554d9001e29e6032fe23e805e09be2b719f3e31a4b5621746 SHA512 c114dc4b706eda9ea3efc961e1c30471f64e90f6e0b39271a5670e4e086e3e9dd26afcaa5fd3695187c60c30878bb75d10526d10a809f71e0310a2c05268695a
 EBUILD python-barbicanclient-4.5.2.ebuild 1009 BLAKE2B 83e2b251e1d7365245ed040f38a0e56500e0efca9b2f0a80c1c9836533d64654f117741b2bc89153f4b8b47d820f94d2d0ebfc3923c36579a6ff5a34ca0f41fc SHA512 e1608db93c75478c22036053209046debe2e7a6a070b1e875c3b3f3aa7acaab2675b7fbcb5111a55da70ab57bb92ae699b78ef3fd5c3a977dc59839370ca7cdb
-EBUILD python-barbicanclient-4.6.0.ebuild 1012 BLAKE2B a8e131baf4178b63fb1f044b11397b899a67b3cdbab98756c9f8e0e44b63902905fe81497fcdf5adaae6a0d80bc2640e688f9c16fde059777a7fa0cab0e009d1 SHA512 d166e25e4dfcb04a29aefcca344e64a2ea5fe8ac7bd1a8e5d85663a73c2cc555bcc36366dd4c1d10eba4a6d9edabc23b4d185dd17a2e22b3ea2ed3a7b491e3a1
+EBUILD python-barbicanclient-4.6.0.ebuild 1010 BLAKE2B acda94152846346dccedf7ed93f2805958879c59aa45af077a09dd0bd422760366e4748aafb65f6b2005d8ea4014e6435ffd346ceebaac0442f3957aabffb609 SHA512 19a9d0bcb159870835147af780d5896c41cc69c3c710d7564801ae6753c09a666da1beaf10faf3ada042415437d3cca9e5cb1b305bfd5110433bbbd6a7b3791e
 MISC metadata.xml 586 BLAKE2B be3884c7ffa487cd45252e4737bbbc3cd460a0e6075b2ed38439d74c66518832c2739e1826cad8184bc794ac0af6441cd900c7e3f88fe8d41361f21796f6f87d SHA512 7e03d93945bf23a92dce98fdcc0fe7f65d4b709ac5105155cffe338e979802c55c9e6e59b876e9f77cc9719c863b0ee18b2dc94e04be1230d1841e525a019cbc
diff --git a/dev-python/python-barbicanclient/python-barbicanclient-4.6.0.ebuild b/dev-python/python-barbicanclient/python-barbicanclient-4.6.0.ebuild
index ec9748eaaf8e..2ff913782f8a 100644
--- a/dev-python/python-barbicanclient/python-barbicanclient-4.6.0.ebuild
+++ b/dev-python/python-barbicanclient/python-barbicanclient-4.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-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-cinderclient/Manifest b/dev-python/python-cinderclient/Manifest
index 1ade7e50fec6..447516c544c6 100644
--- a/dev-python/python-cinderclient/Manifest
+++ b/dev-python/python-cinderclient/Manifest
@@ -1,5 +1,5 @@
 DIST python-cinderclient-3.1.0.tar.gz 278247 BLAKE2B d5fb6b3f74c70fd58cdc8a2cf2ea7a57935fd3246de035ebfc84d1acb037ff309ff1de2954c373a453f623e78b6c84bfca194f77273420eaa46ee291a2a97c28 SHA512 6d828a96802d9a5118ab3b463ed9c8619530a69a1ca153f0c3d737e26bd692864ad2ba4c79e74a18ebf820222a75b81a9735f63c989817797689d8f399f76394
 DIST python-cinderclient-3.5.0.tar.gz 284317 BLAKE2B c231b2d67071dc01521e271cdae19d0e1bb8af387780b4f855631ae248e156110888eddd63684102d5b5769840d31e622d9db1e24ecdb90ddda06e803c6586fd SHA512 0ee11c19b404c5f335422a5a18d01529330dc8d39b58c5f8b6be28a0e682858f1fea5f21bfcfc2a272a556f1a3a61fa6a0379fadbe79b65a4ad72cccf42a6223
 EBUILD python-cinderclient-3.1.0.ebuild 1267 BLAKE2B dc19312fb6b9316b45f971ceb5f62d63605bbe98fbd66a44a6ba5a73d05138b2fdae7b77a1be6ac98d7dce1b9b17584eefcd6aad542a6600bdec0818391b9080 SHA512 ecbe8642de0f31747543bf815008c29202f41c85b26d15e885a8cb0aa6552d6bde3331885e1b8fbfac7ed4624e4e1a5f2a6fcbf7a4121d0b017af838ec086ce9
-EBUILD python-cinderclient-3.5.0.ebuild 1126 BLAKE2B 32bb010d019e5ee201d601fe433e17ff3fd8b68ca1101d91ec053e7f6d73508515e6c3f66d13de56f1b96affc6778d86c8a598ba82272e9d06a4f3930d33aaee SHA512 6d33ce5e5383c40605864203bcdc7fcd870cce1828196107de30da352b6e9053be916cc81da45eeeffcfe38fc0f433d2aa850d86d8cd8f1313e999e114326e89
+EBUILD python-cinderclient-3.5.0.ebuild 1124 BLAKE2B 07e5d1bedc925bb15137b32bd013dbe100255ce3d6251bf4b0ce1091cba1418fd336becfd3ef67f764c253994a12f786d74147da9f1612f29d8d1623ee13134f SHA512 6d6baa9cf2a381c0cd9988eeed6d8705d7c54e76df0dc5428ccb63b19595544524020413c356b5ddb237475fff28c846f91518fc6140d541f55a9e2462ecc45f
 MISC metadata.xml 625 BLAKE2B a9011769fe7ab23b5b00cdfe6e209e92186abffd4a32e6b21e2741ea8b58848b3aee384d301c3bfeeaaea3632becc5db22afcd8d6b149d17db34198a89e86ca6 SHA512 397ec06d3fb289940f654600dd452f5450ab6a87b4584f5486196a5467b7b5b9251c241c28b92a17b92da9d0a094b1a4d4ec303fe8eb3087c50a560f423bf92a
diff --git a/dev-python/python-cinderclient/python-cinderclient-3.5.0.ebuild b/dev-python/python-cinderclient/python-cinderclient-3.5.0.ebuild
index 39e006ff9189..4f31f3289bfc 100644
--- a/dev-python/python-cinderclient/python-cinderclient-3.5.0.ebuild
+++ b/dev-python/python-cinderclient/python-cinderclient-3.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 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-designateclient/Manifest b/dev-python/python-designateclient/Manifest
index 18ac39e62cf8..deb9996e8920 100644
--- a/dev-python/python-designateclient/Manifest
+++ b/dev-python/python-designateclient/Manifest
@@ -1,5 +1,5 @@
 DIST python-designateclient-2.7.0.tar.gz 82808 BLAKE2B bda8ff688267ad682c0e7025f5e801f99ca7e40b8bce2a49789b18014e22e040036816638feb4cd96ce2d2ddb34613f5812a94f5158390169d2fb0934042ce45 SHA512 521399ea4b5da617a3fbb7e291215f4a17d7f0f54f11708d5d3467b43376123abba90586d61a740876770017c6d77a14ef2152ce50cd1816e931d04189ce6b23
 DIST python-designateclient-2.9.0.tar.gz 82386 BLAKE2B e36b3f66ba37b5024170c8621e293d3f1a9c50ec7ce76b9d5411e0a51b8c850fb0d104a6ee82c3f6c0dba962c05892650cae03d675e241cf17f0894eff8b2247 SHA512 04460395cf1b76d8628001e185e9301cc4964e06a61576268beffe5fbc42196e1c4015d0f273357fb93fb7b5079975e356eb25fb144cd4c1d355e704a1948e9c
 EBUILD python-designateclient-2.7.0.ebuild 1125 BLAKE2B 041dad38136d6c69f4fea0fd26a407a0e6ea3da0cae19e55e19e0bee394965e216a8552c80712397a39bd96bc14d3e23bfd03dd9432f230c0775242d8cc0513b SHA512 1a6e1dea44b059055f00fa2d09696638e59e1027215c8074cf72becc4d87d78b679fecba55078a0c104b92d1e2072394e4caba1c1615e7ee24fbe2cc0479a037
-EBUILD python-designateclient-2.9.0.ebuild 1122 BLAKE2B 1a182d5943e743e04964d8d685e3482112dc1625924809b318748be27c768e647f65044cc7fbaee6b6f231cd6ef92245b64d919cac951139684e209413e94e26 SHA512 43d10d4114f7ff133bdbdf7fe6b3e97ad33dc7d5f6a2f88140e08faae53a729b037d4758fe778d3d21e3d9f3bbb76af87d39a07a1cad33ab5483808b6ab7da59
+EBUILD python-designateclient-2.9.0.ebuild 1120 BLAKE2B 6adcc34c9d32250001168f8699133e4afc54e4c7b74a61b085e0b0ce7b83375988defe72c26823e7ea406bf5e29419b6bf469767b9df6032c666513f7f0842b3 SHA512 f6d4d9b4f00575fb9df0162af36435f95a4cab914ec8c3f95a10a2e32d67ab591db43d18572bcf2b924da6465e253961fce9da3d1825cc70e24b49499d75371a
 MISC metadata.xml 620 BLAKE2B 5fa33f0a7ce50185042950605d92a30c786ecfbcf0cd6ce4b948623dbf9aa18192d832f9931715d898802f644b814b11940a44d8a18a9f659453ea1304f27ddb SHA512 b42ad7a3863003103bfb4660e9b2ecd02a4ea927337c0ddcb6c3cf0f04562f86f09174218baec94df52f082b0f2b4c8fcf94a130c4cb08ea6f7cb70972b4ba9e
diff --git a/dev-python/python-designateclient/python-designateclient-2.9.0.ebuild b/dev-python/python-designateclient/python-designateclient-2.9.0.ebuild
index cdf3ddf407ec..efd89688271a 100644
--- a/dev-python/python-designateclient/python-designateclient-2.9.0.ebuild
+++ b/dev-python/python-designateclient/python-designateclient-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"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-glanceclient/Manifest b/dev-python/python-glanceclient/Manifest
index 7ed04f506ed3..9846d1da4ba5 100644
--- a/dev-python/python-glanceclient/Manifest
+++ b/dev-python/python-glanceclient/Manifest
@@ -1,5 +1,5 @@
 DIST python-glanceclient-2.8.0.tar.gz 177172 BLAKE2B 0772b7e2b788b63bb590c8354dbad2c4e0bbd731f790f36916aeb154a44474f979961195d307e45149bccd2a58e1df72c48aa0593d6972c606b393f1202ee440 SHA512 257eaf1d548a3a6277b9c80e8b23b9ae4231586307c43a064754c227f3e3c872451ec0469aca931638ea0f7c9920892878c677b144dc72bad215c38d375a63d3
 DIST python-glanceclient-2.9.1.tar.gz 175836 BLAKE2B f559bff0b4ae1d1782bb06f9bb8b0188d9e78b83afb52a07245f8d9694bfe88e52718d3279f8b2b7d32acdd3cc86d507154bc9bcf716206696144345f4766249 SHA512 0dae48a5673ed779c0a4136896f5e74dcde489a5dfee55295f65d4b74dbe4680b1669570d0fe5011ca5282d0b6057ebc9261e5a06cff0b09fe41fa88529c3947
 EBUILD python-glanceclient-2.8.0.ebuild 2612 BLAKE2B 844e6ab91a070f9d20fd4418be7b63776eedc900c568ccf89f7c78f52f03fe6675e06249dc0eba5f56fcd70402d133192f77da1bc65ed1f71603852565b8f3b1 SHA512 ff395ab1c060e51278a7e5b6cb283827776a7a7d3e008d1fc0932412f05df0373f6d3f0bceec56e0d1e55d93d5256e59e6da6a15171b6f45bfc394a8a6f7abd0
-EBUILD python-glanceclient-2.9.1.ebuild 2443 BLAKE2B 26009207655cf894d8ac47d856429f9cedc8b85d68a1e2c5315f44c2e5705ebafa0d6a5ea7ed08d96aff2131d28c3d34fa276faa937bae06734907c97e92dbb7 SHA512 c6ae1faaf0c23f8885e71598bd83cdf50c13ff22a9f213f092d29f098c9b9013804d78341b63dfc1bf32270cf112d8beee7d6cbb592a7139a6217109fd550bc7
+EBUILD python-glanceclient-2.9.1.ebuild 2441 BLAKE2B 50a79c1fce26ab8cb144944fff87afd00f8b83f63748bf01cac0ab84dc425acd9148ba0e5577fdaaf48dc430d92a9852073a9935d045b12166397100e54cedc6 SHA512 3b785c8b08d165b61ce665f3e41655afc9025c5fa8f58a297b4f7b673be82b366ab5146bb158a7bd6e412240f60584c8c66500faf9d291ef0715d9bc1befdcac
 MISC metadata.xml 632 BLAKE2B 69885578505253d6ec3d0245779a89ebe5c75ab8a8e9fecbf95c29d4aa17ba6864e69c1806a01cde0e92080a86ccbae146bdb2c003f50fd3dfd32b6d2186536f SHA512 d807a9aadecb131f92d6a476a8bc0b0293d46c6ac761a2d1ddb596ac219c6c8ac349402e3f56d150e78ad81c5d2838a33b3d35222a18f9a416f969f6d6208d8f
diff --git a/dev-python/python-glanceclient/python-glanceclient-2.9.1.ebuild b/dev-python/python-glanceclient/python-glanceclient-2.9.1.ebuild
index 32391f43045c..ff874e295b73 100644
--- a/dev-python/python-glanceclient/python-glanceclient-2.9.1.ebuild
+++ b/dev-python/python-glanceclient/python-glanceclient-2.9.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="doc test"
 REQUIRED_USE="test? ( doc )"
 
diff --git a/dev-python/python-keystoneclient/Manifest b/dev-python/python-keystoneclient/Manifest
index 2fc01742c3f7..01c8e9a3cef0 100644
--- a/dev-python/python-keystoneclient/Manifest
+++ b/dev-python/python-keystoneclient/Manifest
@@ -6,6 +6,6 @@ DIST python-keystoneclient-3.5.1.tar.gz 300839 BLAKE2B 7ec1f354b016c79abdc54de53
 EBUILD python-keystoneclient-2.3.1.ebuild 1840 BLAKE2B 85b84aa1312481290cb3eeccb5e649530ad46c52ebda91ce9ae7af15d032bd886c0bb761e4f292065194a1321832ead750ba6fec6b1afa101bc9393fe2bfa4c6 SHA512 12b9f16ddd0e0ea590431e717a94b99edf7dbcf7cf1bb50225360f876bf6aafc0b064a31580289d3a2aa1f2e5396d2cb4c07a3c0587e5dfff888018700f49de4
 EBUILD python-keystoneclient-3.10.0.ebuild 1289 BLAKE2B af2a9ce96b2e6e7d1c5b8c13f81b6a8856764f0dd0de6cc1888c27e082fc26f5fbd2c582efb8e25de82398bf70891133f56dfb2ebbc44ade698247398487a14f SHA512 2d686e5839d57eb5a0a871ec309cf1f15aeafd01cd5d731337f44d1e46020dc79ec5b0e324b2c0dead8f919106312e25f77741ba60c67457cbd48b7389647de0
 EBUILD python-keystoneclient-3.13.0.ebuild 1421 BLAKE2B 1a765586638fa85c65fd6a978152faacc04d7487d0469f98222ab49ed1fbd2ff634f50af3da175ca3d7e438a7dead571ffb8e9575d8b132caaf5920090cd7947 SHA512 0bab532fd59cf853fea2cd109bb0bd79d13102d287a8e3162d840371a4bac7fe0d9213c272989a67570d220a23bf4e30352d3144d6037c5255fa8488a9c28fe6
-EBUILD python-keystoneclient-3.15.0.ebuild 1227 BLAKE2B 864a315f71a6d3e78f16b394c5933baf64706c40f368a1ef7b87b15b6896b9950548ec7e1dfc48944c7f6258398a32c4deec200c06e4b8dce2088d040eac04f8 SHA512 2171d192ab6a66b3b8aeaf2ff4292277bba5ff7f03e9f8ef17c365496de631a6c4070e4f187c89f7f3c47ef574b3abbd6173e07d871bf3d3f71bc0abbc02a1b2
+EBUILD python-keystoneclient-3.15.0.ebuild 1225 BLAKE2B 4a8c9582469136fc94121231931e6f0763a13d3bc995fd0cfa019a81d50f6edb6d75a4dc898ff990831ae3b0cdd20a21fd02ddca8af87f90d179c4685c46d5bf SHA512 d96984f08aab28a90552304079e47843216582c87b052078dc77e6047207ffb6b5271c0298b178938c4297f3b0a87ead21ec2e15806309999c2d55c63ed15f2b
 EBUILD python-keystoneclient-3.5.1.ebuild 1539 BLAKE2B afe70703f7971158510f6605948ba9b78f632e2acbacf7bbd32be41fdb8322b3e68d812682e67f3c3c25b90c0ba9253355a8a6f06ee10e0cc154dbfc5699e5d8 SHA512 9f5ba985987ed6e23f13a2f4a78fb0cab20033910d4b54192715c57511bccd32a81fd355ef2950ef1acb52ce97b47bc729ce7e9a7dfa64252be2500f6854a8cb
 MISC metadata.xml 557 BLAKE2B 83a915231d68ba03af636bfafe7a052f567bacf3d746e37093855c78ee1a2bcb11e919924f9aa4a721df0da9b22463ba732de9f9f105cc1ced03bc19ea1fe980 SHA512 5ec4344a761069fd31f8d86351548d0316c421e9a6795b604ece495883587cd8f579f535076cf43eba2114a4cf62eba77a6f96f49bca3a51acbcee6e3d24a718
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-3.15.0.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-3.15.0.ebuild
index 39fb0010e1d6..aade451bd35f 100644
--- a/dev-python/python-keystoneclient/python-keystoneclient-3.15.0.ebuild
+++ b/dev-python/python-keystoneclient/python-keystoneclient-3.15.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-magnumclient/Manifest b/dev-python/python-magnumclient/Manifest
index 9585d75b242c..a3aee0e272c5 100644
--- a/dev-python/python-magnumclient/Manifest
+++ b/dev-python/python-magnumclient/Manifest
@@ -1,3 +1,5 @@
 DIST python-magnumclient-2.3.1.tar.gz 74501 BLAKE2B 8262d8c172018f1174c7462554f901e12249ee825d067913fa269e6fffc265c5a2a885065aa6a6b44ee1940d00b3308bd2502a8290bdd056bd50457e573be472 SHA512 17af04eeb22d386bd43d7d8e49a418b7b577847fd7ee5751880ac8706fd44993c5af43bd347e0a431013fcbd6ff220e4f38818f95ae0456f7f6cb6ce8de606e3
+DIST python-magnumclient-2.9.0.tar.gz 101660 BLAKE2B 528b9cc02832a91edab1b9f5f983637544688e35d5e01880294b8348bf3ea9889a23c4ffbe0a8fef8f57efdc0dcb226b427140da8191bd57441fae76c99d021f SHA512 2c320d20e7914081e93fa19b23c483b2454fcaec19868976e4b7f489e997f0550f1d7dabb4d58fbf7ff6f23c0c2e0962ac968ecb3a356dd995e4fbafd12520f4
 EBUILD python-magnumclient-2.3.1.ebuild 1665 BLAKE2B 881fbb5a254256153a5d04ff169ffc2fb228997b77b6348a149b4a190d06b7a0fefbf384f82f42bf780e15a611c1acf3d154574ae67c28b5b640d4d1932c750d SHA512 751bf90dc497a42d79853d0e7fdf2e9656c3ae1bc591432e899f71ad1106618e9a5a4bdb3101a298e48fd0acf439428bb786570bbdd64e322b2c1b914255da24
+EBUILD python-magnumclient-2.9.0.ebuild 1628 BLAKE2B 237be4fa31496e52ea01f8ae7005eb9100d116a31c045b68b9a12ecf14336c4961694c56967c456838538f5842a5ff4c39861c6d6a33250e274d3c0a43197300 SHA512 235debfaf0cf6c60bf764a523b58877fbf0702ad5720e6d69d2c8844cabdfc8f10fa36f49d4c8249f7a23f6fa32487b0b9b48819f89740ebcb8be9aed1a84d61
 MISC metadata.xml 610 BLAKE2B 532ff58caf9789485db0e81caef4e9bfe6332e0194b15cc9058084810604a75622e405eb4199d90ff9b9f326a51fce96757772ab722dc683b65648168e6f3090 SHA512 598aef60abc1d45b3c6dd00f3db16a6effc1dd826e98d349348b422c9a4f1926f79531e9f3ccf106f934d59fef499bb0e5a1b3571d702e66a8d78dcbb90e3e0a
diff --git a/dev-python/python-magnumclient/python-magnumclient-2.9.0.ebuild b/dev-python/python-magnumclient/python-magnumclient-2.9.0.ebuild
new file mode 100644
index 000000000000..7a97092a0db4
--- /dev/null
+++ b/dev-python/python-magnumclient/python-magnumclient-2.9.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Magnum API"
+HOMEPAGE="https://github.com/openstack/python-magnumclient"
+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"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.3.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/os-client-config-1.28.0[${PYTHON_USEDEP}]
+	>=dev-python/osc-lib-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.9.0[${PYTHON_USEDEP}]
+	!~dev-python/cryptography-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	# built in...
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/python-manilaclient/Manifest b/dev-python/python-manilaclient/Manifest
index d8ece466aa86..47d293c5381d 100644
--- a/dev-python/python-manilaclient/Manifest
+++ b/dev-python/python-manilaclient/Manifest
@@ -1,5 +1,5 @@
 DIST python-manilaclient-1.14.0.tar.gz 193535 BLAKE2B 33052c0c601d1a51f6200e5a05ddeeb96e57a174bf8adc929b848e99bce05764596ff5bf79922757d9b9d2785eff8c81681751f1b7bb6263d6d1eb88f8502e29 SHA512 9cfeffa8919af788b50b2753d722ee5472b45332a8e8dcfd290719344d1d6e7c7880ba0166ccc1c39b1eb15adaa1d8b012d923a04f4ba5b3a2a9774af981bb6a
 DIST python-manilaclient-1.21.0.tar.gz 208720 BLAKE2B 62249b9d3ba22e77d59e060e372901fc3447f44e06c91236c74ba9c16b69bf52ebb8a186405dc2906177bc974df979507c8c9b085a81b8da61618cfc0a07d1fb SHA512 bedaf6d23968a36498e7cd4500f02540debe2b8aa1d7eb73b654c09f1da6a0e397fdd68b978c5e7706365354dbb42f7ddbcd0b2801f3ae706aaa7c2059a16c62
 EBUILD python-manilaclient-1.14.0.ebuild 1339 BLAKE2B 4f425b82de383baae7614950c86bdc6cde2f51e264eadfdbfeab0112832bc01e69dd90bec0492901bf0ff9584b5d97fc5158c56efc996d0eb3d18738097b2af3 SHA512 9c92f935951a86ef8c934f01c050d891061cdfed8f341cb5e4eed62533c92dd9f42c3938200935f320d4f6758610e435c009fa3d3939248706b010a41b3adb4e
-EBUILD python-manilaclient-1.21.0.ebuild 1440 BLAKE2B c4bd7c0d68ad433a064a84535f787395844a0c24dd6df31e5408d67974e9d95733170028ca365bf00176d46d3340b47707582e777e4a8fb77759a0269bcdce17 SHA512 94ca246edbf3f3d9a46068e706bb0341910b1dabe6bbf621a62c21d6781d655691484d4b118bda2e42147e1d403c83dfa8c3f23b59fdc0d1ae9c9550a409c62e
+EBUILD python-manilaclient-1.21.0.ebuild 1438 BLAKE2B 9571fc72196f257d3b219c18b7eb66b55875f43cc143d1641e212d666d1d6b914396fc816c2b9f76092c6a01b57717f046413d45b3ccc5bc7bc70c1307181932 SHA512 3858d1c18986674bec221400f4d619449eea5e624b80301074ea1794579d650126643dbb9997ce246f3e61dcce4f0072c50bdfdfe93d9033e3926d9f70ccce3e
 MISC metadata.xml 610 BLAKE2B 9ff81f126608795602d31173afdff53356b7dd97c211523dce93af86ab9dc0d57c84117401a72fbfc2c2fcc6467d0e1a0adceb7c1616c6c0cc9294945fd987f8 SHA512 917b1ad570615b9d3a509c55e7ab70d88f47cdc7efbc9cf0f141be5ef5316141d0327050b61f8a64a87836a409b08ae410886a8634a8df137cd032bf1c205208
diff --git a/dev-python/python-manilaclient/python-manilaclient-1.21.0.ebuild b/dev-python/python-manilaclient/python-manilaclient-1.21.0.ebuild
index b80c71a39b8c..103bd80f30f2 100644
--- a/dev-python/python-manilaclient/python-manilaclient-1.21.0.ebuild
+++ b/dev-python/python-manilaclient/python-manilaclient-1.21.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/Manifest b/dev-python/python-neutronclient/Manifest
index 7a26f8fc0b97..d7adf816ea82 100644
--- a/dev-python/python-neutronclient/Manifest
+++ b/dev-python/python-neutronclient/Manifest
@@ -1,5 +1,5 @@
 DIST python-neutronclient-6.5.0.tar.gz 255893 BLAKE2B f7e6f6225e476c200b82bb4ca224b500078bd8357377a7d5d8a331531647ddce9df4bbc42e9d9cebee689d031bd47216c8fc9bce0ad2b3228890b8cbfd8979f8 SHA512 77d4f86f2bc066026c903c9c694dfe2de747dc7caec268853a3d2ae8e27a47b39695b33bd81b182334717fbab7817873ae468b928e85622204c348e5b18e0930
 DIST python-neutronclient-6.7.0.tar.gz 286482 BLAKE2B db64746641ce58cff379ea131f05c37e962cbb64323d4e76436f4b0b9169a954396b13530894e0c09c439072d7d040286f0face1e12ae537b417e7e14ddc600d SHA512 4201ce10173c91ade8b4699d54136e583da1cdd74ac340cad9f419c56d71e0cdcdb78a70795e69a8c5e13d2feba240315b976f32fd96f6561b696425f3c69885
 EBUILD python-neutronclient-6.5.0.ebuild 3520 BLAKE2B ae0899bd61670e99895f2cf9be92808d08419fe2cf78264a46081540fed837013539de70087602a7e5446b67ec1a66a0dbc97a6f23d45cbf129f06b9762a0448 SHA512 16699805dda247b841832c04a72ac940405cf623bb40a5560f421e8495ddf70f7ea32da24c54d8b0b877528a55f6641aed4f8a7ddde670876888c211dcface95
-EBUILD python-neutronclient-6.7.0.ebuild 3366 BLAKE2B 4ffabc7e0f830bead84150766aa2a78d269f799a8115ca3136fd1f65e4c23735b82203f49646100dfa21cb9ed27bc4da2136248625cb86f3c34d3c647c70b02f SHA512 5b57f9d7c2e8ddb94c8f70c6240a7c711a2ce7a6a60938fcdb67a2557f88dcbb730633d6b29a16a6af6c856d80bdc4958a84fbef55523897ef0ea191a3c73e87
+EBUILD python-neutronclient-6.7.0.ebuild 3364 BLAKE2B c205f4720e273889a90a692b645f70aad37af77b084a6265b4d24a3fdf344886ce0062ab45c64fccd47050a1496232d97324793bde5cdced916ab52847f5cb43 SHA512 d6043d1add028dee7881b92252eee3f1c1bbc0995af39329caedf116c162beb3b50b43c9c8d0a39df4e78933f9a46b2982783334c12235abab5444a50d27d9eb
 MISC metadata.xml 619 BLAKE2B 441c1d5a2f0b4d0cd6469cf8626e6895fd4dc36dae8db594a2f2364abcd1ea77c9f51f0c85b2deec8ae51a8464eddb00f71c57d2d11558523720caa8fb317dd3 SHA512 d99562185b29417c559143d8fe8102a062dfda0cd7c07f9f01d1c5f11a75eac521e98c9048a23ce74ed34e198ed06bbe2a40990651caf7f9ecfa98975a8fb91f
diff --git a/dev-python/python-neutronclient/python-neutronclient-6.7.0.ebuild b/dev-python/python-neutronclient/python-neutronclient-6.7.0.ebuild
index a56e95703e10..48fcca580d5b 100644
--- a/dev-python/python-neutronclient/python-neutronclient-6.7.0.ebuild
+++ b/dev-python/python-neutronclient/python-neutronclient-6.7.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-octaviaclient/Manifest b/dev-python/python-octaviaclient/Manifest
index 48b6b5078b9c..bd45a20e3ca2 100644
--- a/dev-python/python-octaviaclient/Manifest
+++ b/dev-python/python-octaviaclient/Manifest
@@ -1,3 +1,3 @@
 DIST python-octaviaclient-1.4.0.tar.gz 50495 BLAKE2B 726032aee6d37b050cd9f4d1fa276daecdeae107f05825f2eec37236a4a4eaf3ab70143b5dcd3cac8a13fbb9655027c3d78b474771ba8b205be0a566991c54ab SHA512 216bfb56292bb479cdd8520931a509208454feaf8b1d5664679929bde570a4a99288c99cb195e6e9e81b8599d27a4bc68b8f24e5a7cc3aa1a82c22405078a6aa
-EBUILD python-octaviaclient-1.4.0.ebuild 2073 BLAKE2B 5854b63fb277759e9505464ffba1d0b51f1d5d4614dd5178b382a1d33b4fb02ba9a1f2e6e0b34ddbc660b01d40a40a090906a1baabf64e9d0bbb98a5aaa24ccd SHA512 a50cafe8c5edf63b436d24a994f3bc6425f448384e10249a8498761197657fd50260144ffaf4a0a35615011d9b589f1a6bc6dafb993800855ba978ea3b5aa9b8
+EBUILD python-octaviaclient-1.4.0.ebuild 2071 BLAKE2B 9c0b972cca023f6a2ccd6f82aa1a20a4536dbfc41d80c71fda31df6e38018d926a67ca3c6f8743240834729c475780cdbbb147a7b94b6ebfe0fd2c665f1567b6 SHA512 593dc3bb1cafdd6a0fad71226f1799f8f995ab079fbe0f35cb5df028dfe8a62858cf6358c37bb6221c322589448400e9db707f7b2b3e798eb6162ed706e27e28
 MISC metadata.xml 333 BLAKE2B 1a681ac99aee289a919b530bb87037df6fe53b044ce14ce3a9da3cec54a73d7fde58cf01f12678f18397d16b56c9e5bf88d289ddec4469e343d7193502124124 SHA512 a73512d246562e6591eb9c8d13759352cede7f0ae978d02c87bd72b1fe2c9b155cc3908e8489b136387bada61f1257d8e0771e01e26d998b51f9ce13c087ec41
diff --git a/dev-python/python-octaviaclient/python-octaviaclient-1.4.0.ebuild b/dev-python/python-octaviaclient/python-octaviaclient-1.4.0.ebuild
index 86586098b5dc..41215dac2299 100644
--- a/dev-python/python-octaviaclient/python-octaviaclient-1.4.0.ebuild
+++ b/dev-python/python-octaviaclient/python-octaviaclient-1.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"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-openstackclient/Manifest b/dev-python/python-openstackclient/Manifest
index c80aaddf9fea..03ac57b98ada 100644
--- a/dev-python/python-openstackclient/Manifest
+++ b/dev-python/python-openstackclient/Manifest
@@ -1,5 +1,5 @@
 DIST python-openstackclient-3.12.0.tar.gz 617159 BLAKE2B 755420f6e42c6600b04fb6899c533e8c08caa9d8e4f77d214ccd6100d558e6651ae986b0b3a131b3637dd1e9424543a6127fa4588f481fe41a29dcaf6ec3ff71 SHA512 a36c17d2ed138e984af978b436beaca3ae8efddc089ddc6b9fda9e51bdb4c8fc1cc645a68225cc08709acd368ff7d2a70f748f7be752ad8e68fe59b4eb36802d
-DIST python-openstackclient-3.14.0.tar.gz 668430 BLAKE2B 2bce52f1977be0b17c53ee0bf6e1dc6fea36f71208c6a839feadc2ce33d302d31b870d21ece6daff8efb970857fbb547e7f20769abeaf22552b89c9732494bbd SHA512 5790e48d0dc81ec006e5f1870c730a8b514590e10e5f151ae128005d243387858c22c9266b50bcfe237bc9a6d9f07f82209cf813b4cbc25fda431cf88799588e
+DIST python-openstackclient-3.14.1.tar.gz 664808 BLAKE2B 7444a33e494f8185ae604032e8082cdf1719ca51cee998e3006edd880053e81b78d07c87c1049392ed7596d9f13fbd351eb0885f4dfb570ac213b04108e6c40c SHA512 9b3e6032dbebd2be32fbd555bb50e03a435941c96337261be8a6e0478122f1f5d4094d47c9cd77e2961f7e9d2b1c35e7b812928a431c2dae9de257919df470a3
 EBUILD python-openstackclient-3.12.0.ebuild 2583 BLAKE2B 64f476aeddd3da1e98afb9ca83488c4de94f79ce37e4a240cd5c3301b4657337131d23d0fe509392a67b5def31c4baa181b59689cb8ddb0a798e930e582e4c21 SHA512 b9bec6ebe556364d05436f7b13324df99131bcfc5e105ed8fce7a3f3eff67c6b50e94a54851732e03db549fd1dc08f1b415a3da4148f2f993bd2f566f390237a
-EBUILD python-openstackclient-3.14.0.ebuild 1300 BLAKE2B 11612bd29d2cf13febe72c13d0dd421818b58b61371f50d3f30b2ea382b6b9c9798b0044bbe4246a6a6cab9358493b071f44ddd32daa4b6f3addcedc5e272ab9 SHA512 5d173596349cd8f3a6fd0c9aefbf8bdd24582efcb87105cac4988654466019a0a19baf5b62cee386ed4bb99abaaafdeb6de38a4dd80a5d8c03aaf939939a715b
+EBUILD python-openstackclient-3.14.1.ebuild 1298 BLAKE2B 64876c5971455997995fd157118303d4f6a5b8eec4445ab7a57498424b153132c2d1e4ae75b4bf7ed59b085cc32ae97b86b38239e8fa690f6378ae9f254b111e SHA512 7639cf71b60b25c224e224702a746d41d65e65c452a5739f7bbff0c2b0c82539145d03155d0db5c5f796aefc1fc94a102469f8bffb9406af32396c9cde748756
 MISC metadata.xml 632 BLAKE2B 4e989558d44ee733b380fae3f269ec9ca0c511caa1fd8259cac90dd3ded82f4137444f32801efd2440da95b98c2864509c5068432de830591ccaed2072029c91 SHA512 c37cb6d5ee55b8f7184a2db66dab3e6fbc3627b1869487e9d4e00928cdf1dbfb5d3d28a2d7f72290503b10b393a193a9849c497df6438ce230e418b68fd3ca4c
diff --git a/dev-python/python-openstackclient/python-openstackclient-3.14.0.ebuild b/dev-python/python-openstackclient/python-openstackclient-3.14.1.ebuild
index 303907280d1b..c688b057c97b 100644
--- a/dev-python/python-openstackclient/python-openstackclient-3.14.0.ebuild
+++ b/dev-python/python-openstackclient/python-openstackclient-3.14.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=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-saharaclient/Manifest b/dev-python/python-saharaclient/Manifest
index 0856e74dd5e5..48292448a0e8 100644
--- a/dev-python/python-saharaclient/Manifest
+++ b/dev-python/python-saharaclient/Manifest
@@ -1,5 +1,5 @@
 DIST python-saharaclient-1.1.0.tar.gz 81664 BLAKE2B 8bfc8ed2bcc4cc13e6894d7776f7cb99c8a72632e132801df689832ef847c56b7cedf39abb112223a2919ea3ef52fc99e31290f7acb555f76505e11f195c48db SHA512 0799549d68bc65792cdf0129f3590667a1a87697182ad24c5c41e9c01abf5e133a16a60fe0331f313da44017aaf0503bbc131e8a62536a692032af36ae9f1386
 DIST python-saharaclient-1.5.0.tar.gz 94824 BLAKE2B cacc3f2e8a1df5f7e50f5b5c004745333ea4b287c0a86792247212fb873ec55329719f16472c3c7fef196f2ce8fd05c760e8db33b84e0ea949f7e89997c0f960 SHA512 8b845ad0eefa05b564659dea9e619a3946e0d62a981b46a4fecfc2d4aab785b8eeb2e18266d5467efd8e0ca31c441af7da41a816ea42405a8cd137adeae2793b
 EBUILD python-saharaclient-1.1.0.ebuild 1842 BLAKE2B 9d511aa66b3661003bdca93728df0ba6aef555f9b8edc0a15cefe1c8c15c14f13048ac93ef999d9d9342eefdee07380f3c651483c6846621b7fd5897fa5f1104 SHA512 8c59dca5e42f64c89b94496e7cdea8ab02ef332d15591f2c41ad9633dc6d64fc658a82b70e5317b1dfd9b9ef72e05ca12fafecb74257fb30ccdb8e15b2c9c438
-EBUILD python-saharaclient-1.5.0.ebuild 1998 BLAKE2B ad26aa7d6f65c7669a662de5e234084c973f012bf21a24097fd4f0cb2f16cb433fbd707f01fcc4059680f4df4e2546e8e4877d069f6987fa99ac0ec7e2ad6b95 SHA512 a48ea84fede2d17db7e725b9f8d4cac66fd395ecb425a4fb4a064bab38cb295f6caa9779982c0c13de15289e316920e1363ad0fbaa7a274db11fe7182b280a00
+EBUILD python-saharaclient-1.5.0.ebuild 1996 BLAKE2B fa94887c75fd8fd1f700db6efe7cde6731a13bc201dcbffde298d40cbf62feabfcdad008c61753ed655747eda4c6519e367a23c9a46627fb85c054429bd7691d SHA512 0fd6a54511c71089cd1d6ac022058deb2409888e25935bd8223c62cc8dffd5f2db978f129ca28c0872dd8980be4935ab570c64cc130e713a5448c57ae7b8a458
 MISC metadata.xml 643 BLAKE2B 2a3c45ea4f9fa3c045cb88796e093436e66719daf71739c7679882f11123f2ac405926c8405046aed4efb55328d7235619192b9b7f978f7571c673e306953834 SHA512 4ab105b6287560e19a7b6ba8e999da16bdb520ff8f1a812e0e17ebff9c1edd2f7ec1475978ee478c556d31af8c201555669c92ff388de45a206b45005ec95d2c
diff --git a/dev-python/python-saharaclient/python-saharaclient-1.5.0.ebuild b/dev-python/python-saharaclient/python-saharaclient-1.5.0.ebuild
index 2decbd698ace..b09c05d53639 100644
--- a/dev-python/python-saharaclient/python-saharaclient-1.5.0.ebuild
+++ b/dev-python/python-saharaclient/python-saharaclient-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 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-sqlparse/Manifest b/dev-python/python-sqlparse/Manifest
index 51386fe2e9dc..39d2c805d61b 100644
--- a/dev-python/python-sqlparse/Manifest
+++ b/dev-python/python-sqlparse/Manifest
@@ -1,5 +1,5 @@
 DIST sqlparse-0.2.3.tar.gz 60742 BLAKE2B 38d3f17d196d3a1d50ea75810b5bd3a890c6f4b12195621d571d62b8c40e2e2d13034deddd95288df37a15daba28153a5ca9221b78bfff1c0e3bc37eddca2dba SHA512 ec654e680f8ce423a89da92c4c74f85e652bebb19e9a40ab0b8067f61803897e49e1e6f8dd1ab454b1ed130974d76b4f973c799264fd4bf8a87f034ba9c44835
 DIST sqlparse-0.2.4.tar.gz 61614 BLAKE2B 2462fa5d77ca2c3028aa3539bedc3cb2d7abd35db3c736ffd8abad8626a33174787f0079453ec646739749c8860fce0f1c7d815e6a8485c24b851a40b5bf3b87 SHA512 abea0f084778976f2d1086006eaa88e1fc1d2580654d063b35557a44d9d9727b410a022e8ea06ae3b265f2829d49c48d347dddc61f2e56be9c3d6207104712b2
 EBUILD python-sqlparse-0.2.3.ebuild 1331 BLAKE2B b2ecb2330cf5b911037b1e6a8c8f01c53d27b927135069e7a3c8d30933811cea92b7003212eff8a334f489bd938933e41940b57ad7152a9c8d6339bb7f5479f3 SHA512 b451f3f61c3831333c59238fa1bad6c03ce9baecf430030b3f55a31939842823b2a30b2004e15935b29621db70f4b20d41754d1e5230f7eb207ec765fc78b921
-EBUILD python-sqlparse-0.2.4.ebuild 1340 BLAKE2B 977c0a499fcd503e4feece3421a1c4f3adfe1c53eb3f93e9aa5dc6910d778c8a1707b8ee20ce2d15d4a38fb30b555eb3781911d0eced85e2212d2307fa057b80 SHA512 ad661a5d94cd20ac16bc0a120abb1994c54212554a8f878e65581d5b7c37d4e17715c5d30f087b3b5ff551b98503a61a43bd6df74d7d80855ebba7900ba158a2
+EBUILD python-sqlparse-0.2.4.ebuild 1331 BLAKE2B b2ecb2330cf5b911037b1e6a8c8f01c53d27b927135069e7a3c8d30933811cea92b7003212eff8a334f489bd938933e41940b57ad7152a9c8d6339bb7f5479f3 SHA512 b451f3f61c3831333c59238fa1bad6c03ce9baecf430030b3f55a31939842823b2a30b2004e15935b29621db70f4b20d41754d1e5230f7eb207ec765fc78b921
 MISC metadata.xml 453 BLAKE2B 2b04f47b565bbce71b1ddf27bedcd903f123751e7524ca62ea280b96788dbd14ae18513fda8eaf563d927c09dff7094b6a5c0d651c0530f2d3e07ee1d092c946 SHA512 5bb3c69c2dd5bc8ad2bc8c4a174be8627ed54ba0055bc153d36733f964ee289d71d0b392ec63127482a87f5f56fee9cf2900a2830a0ffbb733b1119be4abc0d3
diff --git a/dev-python/python-sqlparse/python-sqlparse-0.2.4.ebuild b/dev-python/python-sqlparse/python-sqlparse-0.2.4.ebuild
index aab80324cd45..c29badf7f599 100644
--- a/dev-python/python-sqlparse/python-sqlparse-0.2.4.ebuild
+++ b/dev-python/python-sqlparse/python-sqlparse-0.2.4.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/andialbrecht/sqlparse"
 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/Manifest b/dev-python/python-swiftclient/Manifest
index 2662f1a68822..4be3bd196f99 100644
--- a/dev-python/python-swiftclient/Manifest
+++ b/dev-python/python-swiftclient/Manifest
@@ -7,5 +7,5 @@ EBUILD python-swiftclient-3.0.0.ebuild 1889 BLAKE2B 2c81d296ce64089e36006e927573
 EBUILD python-swiftclient-3.1.0.ebuild 1765 BLAKE2B c95f639d9c10bb7ab6086a412b90672434a2e633402aa7b00111979e8472408d3e9f31eebd78bf11c2bfb9a81d3d00c53e500518ea66d415293c1285fda3e20b SHA512 a191106f8358c92a20601d9bec8ffefb0f4743a66860f83fe6cf0cbcc4b6ab7e52a6c97faa7798c9882afea1cf96590bcae3be1210c166cdbeae2b5428a6b725
 EBUILD python-swiftclient-3.3.0.ebuild 1781 BLAKE2B 1eedd613cd6d8cf615aee87deb6bb8d1b16e0a75e5cac014a49996d86c5a69f72e9fc9fb80953d7fa7d01104da2629d48836786fbb066d1a518b16b9b30d4da3 SHA512 dcaac24333ef96ea4a9c4c680d6b8cf588ce8b42b5887ae69c15a08e48c66d5c806697365d7a43d81705bd48c959067387f68fc3eb5558b886c5eaed3c063b0d
 EBUILD python-swiftclient-3.4.0.ebuild 1781 BLAKE2B 1eedd613cd6d8cf615aee87deb6bb8d1b16e0a75e5cac014a49996d86c5a69f72e9fc9fb80953d7fa7d01104da2629d48836786fbb066d1a518b16b9b30d4da3 SHA512 dcaac24333ef96ea4a9c4c680d6b8cf588ce8b42b5887ae69c15a08e48c66d5c806697365d7a43d81705bd48c959067387f68fc3eb5558b886c5eaed3c063b0d
-EBUILD python-swiftclient-3.5.0.ebuild 1886 BLAKE2B 7bc30cc54388d3e33be6bcef4a91289e8f020f0928d6aed7ec834a21b39ec4bf86a331aec8b7b65a5bd5d7456b4060151684e6c8ebcaabb44c9eb8abf629f76e SHA512 14d0b58ef67a4754d6efc3d6191e9e107765cfbc2afc1bd0ea4a60807d565bfaab301ab0a4c1911d6feacd782d873df46851841c9dbb71d169fa442899e7f72d
+EBUILD python-swiftclient-3.5.0.ebuild 1884 BLAKE2B 6cb4e4b26900c74276c44e2c11fc305899307be8db3e8387fbeb36cedc3272bbcc45bdc49eab0d2fc1b7e5821d32df37151d3e78e3da7ec2945427f6819e9a76 SHA512 46d5a2bae4f4a22121423cb70ca81e3d1a1410b2e32d08c946519eea8cf56bfb2642f0a9c8fcea0c4e4a1e0364f987a1a932e77b11a83abd16d3f90392cb5c81
 MISC metadata.xml 597 BLAKE2B c32e50a6b0ff995f2c237c4a6e7ca80636487a9ca4d412c74e6032a32230141f36949fa42cd39ad293a456d8961cbe14e86d6df3a772f88c76283956c46830a5 SHA512 fdcb820e96b82093910b251aff11fd5831253b86972435fe6456bdbfbeba4cc0c9d0dcfe10078103d5e7b7f29cb84e5f379293be94c30ea54fe4af741e097435
diff --git a/dev-python/python-swiftclient/python-swiftclient-3.5.0.ebuild b/dev-python/python-swiftclient/python-swiftclient-3.5.0.ebuild
index dd552a727e72..8626261c7067 100644
--- a/dev-python/python-swiftclient/python-swiftclient-3.5.0.ebuild
+++ b/dev-python/python-swiftclient/python-swiftclient-3.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 ~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/python-zunclient/Manifest b/dev-python/python-zunclient/Manifest
index 6fc931c3edb4..5f723f0e4d34 100644
--- a/dev-python/python-zunclient/Manifest
+++ b/dev-python/python-zunclient/Manifest
@@ -1,5 +1,5 @@
 DIST python-zunclient-0.4.1.tar.gz 81441 BLAKE2B 9a8f1b21b9906d1b3e0cecf9525a6d5e8eae05aa8999a191625aac2701dc6997f53f2320f214e8e62b6be6357cc00945792ae7baf19b4be85499c5b1099259a2 SHA512 4e32f569d460fb1ef9eb0faef278b0842907103e6a56a951caec04b3b1544b093261db303d7f62b429c3dbfff7a97b9349b709e7cf62fbff9ca90ca9bb098ca1
 DIST python-zunclient-1.1.0.tar.gz 93906 BLAKE2B 7be9dc27b074e60ff5df37c406b96f3482e1737f338de01d3bcf5e46ba404da71b6e803aafc981f92dee416b764bfc2588652a61440258d0b155ecc7a3bfba40 SHA512 4a419ccebd7b0f924d549776c96d04cff5ff4507d9ab9c5c6a3aa71adeaffeba686ca28043726c96979760ea9670d86d973810543609fc783d401b23cae1fa2a
 EBUILD python-zunclient-0.4.1.ebuild 1066 BLAKE2B 561e42f577c1df3a270186efbf05c060de2a93b47310e0723fdef011f18e71fa41c660f179221c9d4ad943c133f0188bb250509ec8ff668e8d456599e798ffcc SHA512 5b1d91bddf3c54b23bc7682bb47c2fe970f1fa9bfc4cf33085b205bed73518832f99dd4a9907d9d7bf6ca0b89d49a4949e656d7932b9625dff4118f504d30828
-EBUILD python-zunclient-1.1.0.ebuild 1119 BLAKE2B b219164f4b4a3a2af0e3239b141aa7f7b516043d6f792cd8eeaf9741d73c5536c08f5fb8ef7d4891ceeb1fb8db75c07602851474f8c0fef92fb771651a28e58b SHA512 022c454b0ff1ccd502ca4194138b71c057633e362447bcbe250f21b1b48ae7ca80eea6dde9849e348e4f6fc046d8796b65b80c2b6330cb76e89ac83e64ccd720
+EBUILD python-zunclient-1.1.0.ebuild 1117 BLAKE2B 4746ef41e0b66e15c220c187f02cbe203eadefbd0a176ad66a05b7437d6e2a939602432a85154512f11314cbae578bfaaff49ae9403d8e5ecde8cef5bb0f8e6d SHA512 b269ea6c8af5edb35c31853816862698308b230e137b89e0e2045b7ff31438215b998ae79ee51daf3b8480614783d5efb071df939674582f763e058a0c277f69
 MISC metadata.xml 333 BLAKE2B 1a681ac99aee289a919b530bb87037df6fe53b044ce14ce3a9da3cec54a73d7fde58cf01f12678f18397d16b56c9e5bf88d289ddec4469e343d7193502124124 SHA512 a73512d246562e6591eb9c8d13759352cede7f0ae978d02c87bd72b1fe2c9b155cc3908e8489b136387bada61f1257d8e0771e01e26d998b51f9ce13c087ec41
diff --git a/dev-python/python-zunclient/python-zunclient-1.1.0.ebuild b/dev-python/python-zunclient/python-zunclient-1.1.0.ebuild
index 4925fc55ed1f..b6109fbb7abd 100644
--- a/dev-python/python-zunclient/python-zunclient-1.1.0.ebuild
+++ b/dev-python/python-zunclient/python-zunclient-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-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/reno/Manifest b/dev-python/reno/Manifest
index 67071e14e424..66a3b255fcd5 100644
--- a/dev-python/reno/Manifest
+++ b/dev-python/reno/Manifest
@@ -3,5 +3,5 @@ DIST reno-2.5.0.tar.gz 62819 BLAKE2B 1446d1289749df74d09c123af69dc6cacedb539b838
 DIST reno-2.7.0.tar.gz 65269 BLAKE2B f3ba0e33246d40f7f16739f367ad313ce440cd33c6f03de268f2e02293446e0d3a043287c36492d8cae44b65c682c09d13ab0e2c86beffc23a85184ef27a751b SHA512 daf32dd7c08f9f75a9a334db8aa9e8c4fdad266bd5e68a43a87920751cf57549fba7906da26dc6c8f79b97bfaf51ad481f80ce99168cd65cfbd62848cb3d0cab
 EBUILD reno-2.2.1.ebuild 749 BLAKE2B 1005de7b1e8ee9688722577dbfc0931950861aba0c32cd7f4e56173b1fc595708da272018cab6a2962378fbc3cfbfd840d6dd54aabac5a3301e62779729b14ea SHA512 ab28318780ee62037b394c1e979a63c1fd54d1c14e071bd300ffa8156903c381c73ac6fe3edb7d734060257771dae8b3f9b29fba8d8ea4f79ed1e7cdec086761
 EBUILD reno-2.5.0.ebuild 707 BLAKE2B f3d67f73b0bc43d074e11c2fe69ee391335dda0a347578a805395cfdea5fb57da9c8e5badd8b7c31e8926f4188e74640f34fc9dff84c7078dfea79fd4527b869 SHA512 0fa946149cce8b25a45770d18cc4950a3746403bd517cc5d487a80a73a14e4cf2f163bb23895c2527f7d697c01b2e9bfb32c33917f70f0410704e28462250d78
-EBUILD reno-2.7.0.ebuild 710 BLAKE2B e5b7a5769812175493c07cab1ad0efeab9e85572c51cafe3abaf746695e7a06e9b1e95210a1c33168d76a5ca6bc42c670e5fdf09f35931e2daf2216f7c3916c1 SHA512 fd9fc7a5141037325a4cfb01e4c348f0fc2acb29e67410822cc566466a1d2953a1208aa4bd41a39f706aeab2be5c60588ec62c1cd8e3b4c428b7a29f4e897d94
+EBUILD reno-2.7.0.ebuild 708 BLAKE2B dc6878f47c15d216b56ef6880d75c9c852cd136b65e33010cd7482d0b0ce99bb95d6b415065934bc71672d4c95faa5d9e6f24cc19f597f6e2ac0e540a44fb735 SHA512 633693c1abf42c9b8736e97e5d9a5166d5ea43137c045a1ccc9ab97bc86999c40b6d33aa08fcb82cc5e80a4e6ad8c3e96d9c16c05c4b9d08a018b431f68ffc68
 MISC metadata.xml 321 BLAKE2B 3b8c9d905cae94a3bc7282b1a0fe9ac0471c6cd319e0e6c29ba9159e7a4a0d95f3eefa370a85c0741576d215719be3859e491af4a76bb4e494b84dc176337387 SHA512 fa7cc33d444469e942598d32710f8fba3999cb738407d96243fb0c2efa0573b330e5dbe38685a5cc8a7c0848ad89611c5ac11d2d9d1a693f9a7674bc8dc0a4f5
diff --git a/dev-python/reno/reno-2.7.0.ebuild b/dev-python/reno/reno-2.7.0.ebuild
index 3eb182c0edb0..0bcd83890237 100644
--- a/dev-python/reno/reno-2.7.0.ebuild
+++ b/dev-python/reno/reno-2.7.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.4[${PYTHON_USEDEP}]"
diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index 7498c79ae9f7..0ce8fbacc32c 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -11,5 +11,5 @@ EBUILD requests-2.11.1.ebuild 1429 BLAKE2B 9781f370f3a2b452dafc5d3ba5119b8c8ba52
 EBUILD requests-2.12.5.ebuild 1478 BLAKE2B 736724ae01c08869627d515b0f4be038fdb76069393fc45ba973c27020e70da5bd7374be84b30992ba1aeadee6c676d114fc44e7eba5ba27a04ac5b5769d8fab SHA512 6f7abd60817cdfdda8b55b960c4ea82923279f4f6d49e3b306f4f46f0a882a2362dc8a92cda77a65322b6654c822ee90c736f79d270ef9b2866b8567d46a24e4
 EBUILD requests-2.14.2.ebuild 1451 BLAKE2B 7e112b00fa8b0e6355dc2a0062be10beb040f420e23bbcfee8915c1132b1f8af666cc4bab470684bda021c18549e368bf2e7e8364eff78847c6a6f880570cc10 SHA512 baa8783bb3cd9d71d6e783aa7ae350373efd8b77eb2fe4983c1af7c082c402012ae6bc596afc8048abd1298ce718c73b986dbb063a34dd84928a99b0d03a9d31
 EBUILD requests-2.18.2-r1.ebuild 1353 BLAKE2B 5e22b3b689a912e2212308ab1be3ea61df6fa0a00a027d14eb7cf146a0027552b901797a3e857d88e7ba4843814b51e660aae9847af8c6ea3bd89f1978ee54dc SHA512 34faf6a32ae3ba7e059642c48ab8e44e3d6903686728d50e3c8216858930bdbffd811ca26450bde773852aa9f8a865931cda04037d462a768647aec5be78283f
-EBUILD requests-2.18.4.ebuild 1426 BLAKE2B 5f8c26f76c878a393f401e15c8e430f55ab319c2a37f7cb24fd6b847b019cecba2bb1cf6bdeb97090c483323e927900ff08517b3d14d1f107901f9969ad32ae3 SHA512 6f48ef27c9242525a3cd91d1afee8a342c86a1548b35613674c1ac661d02d126e50494a8f485da6a8d1f527f6d832f24f13aec7c85edddda7f58754a315c7b27
+EBUILD requests-2.18.4.ebuild 1413 BLAKE2B d6ba12b93813c0131bf291bffa4e98dc01d7b111a64b32e2754d961d44f319758312fb890da2366daab7c4080745536129014445e6635cd4c0f8f489475bb9e0 SHA512 f35e11b86d7ffcc3228d8abdf5c3cc8288dacc1d241e3f20635e1358c7dbddce8d30c46572b4ba22f105d91fbb54e8c54d58621437ebae39d37291d30b314736
 MISC metadata.xml 674 BLAKE2B 8670395eb334921eeaa21367eaf1c7d3770c11a166dc680bcb9b99a05da91d797baec8ef3c0596c40143f732e427c322a75ea75da1a2e7d99e56426be077b35e SHA512 7aa5c27d949a076b09b4c2b9e905124047d9ececc40d9c3fd225c6405aa084db96cab585956db9885b115cd24c6c153ae853187872e77e7d44ae5790c323bac9
diff --git a/dev-python/requests/requests-2.18.4.ebuild b/dev-python/requests/requests-2.18.4.ebuild
index 6b0053010ce5..34ec9eb0f53d 100644
--- a/dev-python/requests/requests-2.18.4.ebuild
+++ b/dev-python/requests/requests-2.18.4.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 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="socks5 +ssl"
 
 RDEPEND="
diff --git a/dev-python/requestsexceptions/Manifest b/dev-python/requestsexceptions/Manifest
index 4ab2bf3eccc6..11feeae577a0 100644
--- a/dev-python/requestsexceptions/Manifest
+++ b/dev-python/requestsexceptions/Manifest
@@ -1,5 +1,5 @@
 DIST requestsexceptions-1.1.3.tar.gz 6606 BLAKE2B 7dbbdc095ba1ec20b41a3c7a0dcef5f10fbcd8d9f6bfc9082bde09a23a9d75f1be96f79b74551691d038b758a7d7bd1568842be9fd139a4c4d3279e63376db9d SHA512 33a848b04db500b3481b7df2553e244e1967e5124de1606f73fb38f0b2681253ca2bd921386ce50f1144a8dc8d6f8e07be058a3d9f13c7831f77cade0a42fd38
 DIST requestsexceptions-1.4.0.tar.gz 6880 BLAKE2B 7539cb7993de817a9d22db3f2e1121b65850cc80723c149243e6e540df7f1229abf66a5a443ca41eb855510caa3f10ca6829d89ad39745fe8180359a92037cff SHA512 f631fa650a969ccc74eebfe7522b16e969de4bf48b6f7140eba46a301cfc5a56b9a8354785990daabae025a8175f6b62bf0870d73468d96ba92fa09f4ef3c566
 EBUILD requestsexceptions-1.1.3.ebuild 571 BLAKE2B d510b5432921c280df576dab2938c677e4e8a2cab2761ec500bd8711eb1e208cd4c6d5078e20a9dd64ca365f6c068555298dbac2f2513aa107e5e6852c8643b0 SHA512 c64495bf3a1f3f344b5d436e18b65449177db3ed08f417ac5328e4018c7b57474d981783e0ce53c509999cb98b4e0cef3607ee94f46b1aeed7f70308e2e1d164
-EBUILD requestsexceptions-1.4.0.ebuild 573 BLAKE2B ffd63370382875a70571e7d3ccb0f534ffb761d3091d83d9ffa068f82913847c3b08e8bb2cbb9c5eb2f87a207afa366fe12c9f3305827d2b70d593253849e7a4 SHA512 cc4b936f9573a2c3a040642e11bf7e7d4b79c70e2e16d4704deb3f18f1380bbbcbfea7a542232df54ec3cf01f9b3e33e84afae1e1c937358fd356db3b7501735
+EBUILD requestsexceptions-1.4.0.ebuild 571 BLAKE2B 4ef6326a2f486081e9bd1132648c329e1b85d72b400782aa1b986ca798335ee0d8241782a3dfc89294784e4bc8ed0d8c76867ca304387209ff56886878f66467 SHA512 b0bbfd2bdd5be731d55795995b83607cc79880ecb1c0cacb490f5b0267c5e22c1ef5fd9ece271f04a1a433bf35f0dadd3a49cc44920e54cbecfcd2130a9e02b7
 MISC metadata.xml 846 BLAKE2B 976db0a8f9189f66aced98438f40a832c3e059f5c4d5be2466d5de2baa99fb4420a6fac98948801b6d5d363e8884b7f3110e8005323eced4c01414358f2d3da9 SHA512 d2ee4202dd7751d3caddc2c90b3d3c309b29ba1c7caf3427853944a7a5bea1d26a171fa59fff4f80e07235b3853990faa9dbad24ac0075fb813c4b91ddc4ab08
diff --git a/dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild b/dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild
index 8161b92f7bcb..48159619c789 100644
--- a/dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild
+++ b/dev-python/requestsexceptions/requestsexceptions-1.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"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-0.11[${PYTHON_USEDEP}]"
diff --git a/dev-python/ruamel-std-pathlib/Manifest b/dev-python/ruamel-std-pathlib/Manifest
index 3e53d5b9b243..638c2e3b977a 100644
--- a/dev-python/ruamel-std-pathlib/Manifest
+++ b/dev-python/ruamel-std-pathlib/Manifest
@@ -1,3 +1,3 @@
 DIST ruamel-std-pathlib-0.6.3.tar.gz 19520 BLAKE2B b403338cec80b38104f012c2b2626d473f12d557c2300d606462f2eb009bac72cec65b2f4e5a88192832a99dfc28573ea9ba8e7b73078ad8bac77136dd929040 SHA512 1210d8f7ae77c6358fc857c3ee447b2eb9802eaa31a210804acd74ec23dfd6ac9dec90dd7b21c79dcb4845dff4ad3614dd615c4798d3d7a39cc3a877cb9b63b0
-EBUILD ruamel-std-pathlib-0.6.3.ebuild 933 BLAKE2B 5a18a7f4cc8d4d3bccd41e795e7f253dcc5747c4652af028fead7abd22e1e9a10c72151db04f6a2b645be41e86742edb65101d4bb43fd34c985d857ef573d535 SHA512 28302734fd68c31daaebe280ec04181f46cfe292e25a6e21992b72691e6eafbb5116f02be1e747734f731ce44befc4adb303f709855a41fcb0567dd9731e2043
+EBUILD ruamel-std-pathlib-0.6.3.ebuild 932 BLAKE2B f0d14fb1023717a727435ac41b03f02cd223666a9c4d75731f1f9c8aae3f0b8720b812fbbd6c92ebaba5ae5020b54591780964d08753b28aa1856b2eb8ddf6da SHA512 23da68fa97c8fe0e539ec00926d0686788a0197491fb2f8bf4278133b9df98f4db47f7dca60e0a424015b81c44df6792ac8db7ad371d847e9912909a6c6c4cf5
 MISC metadata.xml 501 BLAKE2B 88f269dd28386ed5c49fa217cf58c68148fb67a8b33c630ca497e8c8ca328a3d66e9a04fc4d5a18c2ac0133ca99ca2903a22d05106f024034480dc72a2fe30b1 SHA512 cd00a071d94fa16a83e00864ceda1d2c15d6d3d0b581cac9dc3a2f35c794c1edc4d6049fc074a5ff1695555b7a398059d267df9cb0e9eab84595095eecb34d2b
diff --git a/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.3.ebuild b/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.3.ebuild
index 39663517d757..b222c6ccf5d2 100644
--- a/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.3.ebuild
+++ b/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://bitbucket.org/${MY_PN/.//}/get/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/ruamel-yaml/Manifest b/dev-python/ruamel-yaml/Manifest
index 5390b6fd826e..d43eb0add76c 100644
--- a/dev-python/ruamel-yaml/Manifest
+++ b/dev-python/ruamel-yaml/Manifest
@@ -1,3 +1,3 @@
 DIST ruamel-yaml-0.15.35.tar.gz 344241 BLAKE2B 3e77f5da4e2a7f64099da1d79a108adfb093c5e47baaf11611462637ec6e29091924088e0ce261b21283a0ab07123da45a1ea7b0c522692d1e96cdcc27502541 SHA512 9e335d627db20b85ec0384f16d7ea03c310c01e84517e7b9bced1af9289fe542b87eb31da8ad960b17d26f35f2cc33a87a5a5b976e0e5ca587339b21b4b53fca
-EBUILD ruamel-yaml-0.15.35.ebuild 1083 BLAKE2B 6221af21420a4bc24146b98add92b5746aa7091bae451ea3196c366d4a8dee77f044a77742dddb156d475e205f0c4fb1b92925868e8c7531e8e625534e9d6838 SHA512 20d635c6f78038905dc4d0d5591c3923de97d85924516d69896b511b2ddd26854945c2183d4d203d1e48e127d85b676ce5740754823b2fc9359750b86763d810
+EBUILD ruamel-yaml-0.15.35.ebuild 1082 BLAKE2B dfe7963ac911d0f815d04a408e47c975fe74d3c2b0b8036bd14a4e18142b91880e4fcdfe5ca701417e7c89e85d9408c7f9e3f9f71548fae701dad628dc5150c0 SHA512 9b6debaaae21b4fa430e42b856f2553a05452c9e246d2709755d4a43f298621c3cbdefc428557446602274a4338a9f458d7f58b1fe90f7b30d1c475e19da5d77
 MISC metadata.xml 487 BLAKE2B 3564fcb4d8426e84f8e597771f9d5c8fb89a770ff6324f1af2112ca4e589cadd4f83503c9b9151ba5fb983b3afd837403fae0b0144da9ed3fb9677c0b5cdbd86 SHA512 d0db6519618ae2dc134a7ed8840a7c1dbf1e49c43fe781ccabf8ff8508ac6dcc7fab92e61b8e6cc6179f30aa5bff2c772721ca09fad15d57734a16d372c6f0fb
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.15.35.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.15.35.ebuild
index 47cb54173894..f7caae762f75 100644
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.15.35.ebuild
+++ b/dev-python/ruamel-yaml/ruamel-yaml-0.15.35.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://bitbucket.org/${MY_PN/.//}/get/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/ryu/Manifest b/dev-python/ryu/Manifest
index 5e2daeb69a18..0bf4ebd84866 100644
--- a/dev-python/ryu/Manifest
+++ b/dev-python/ryu/Manifest
@@ -1,5 +1,5 @@
 DIST ryu-4.14.tar.gz 1492205 BLAKE2B 2a4135ebb68fdde9346fa1e6431a0581138bdc7ac62394b7143326e001bed2039daefd79eb7a6f27b32ee23c7eb10b995ad2441b6a67fcc13637512dc17f2f6a SHA512 e3fd7dc340c4b5cd191b8013bfcd8c0d6dd81489032dbb842fd1bd9f1adddddb715d8c8b92e59bf83fc4adeb7d36b9ee81bdb79caab1f4f10559e54f4da37c76
 DIST ryu-4.21.tar.gz 1513472 BLAKE2B 814db9cf5aff130c1b1cebb4eb2e3bcf2a868cb20a004fde9cf11c82869ac710834c8ea10d27c5bb542cce34145e5932148a10dbc69f20ec521dd1799bf21100 SHA512 03001eb2cf03e3b2051cb05a3be16b9c9c5f9c15e549bb7490f67216e62ecf21c229016c97546477298c4475866cf295bd706746ba7b5a47599ead2564dbcc5b
 EBUILD ryu-4.14.ebuild 506 BLAKE2B f977a93749295151302fe1a276429b5f3a2bdfb442e11e10e960e001b8391b9db6e04026e5ca1d6bb901c06f3a2056815426e3afffb9ee23303fb59dbf693b85 SHA512 0f79562cd1872255efa837a090e6f9f259e60c2d386f514fac34173abf7d82bdac57e8caf4d7e668c3616f16f210e47a85b4ba19638f5c7d9910af630d973563
-EBUILD ryu-4.21.ebuild 508 BLAKE2B 9a97b870c0d3143e69cc566fd3add2d1c76db8a8dce8f0d258a3535a18adefa4818013c0c6eba4a8c6bfee9d5cfa660b7a15360fa957c67bc7ccf3e8db043d88 SHA512 32976e12a5c7538dc9ee21c1625bc617a7fcf058afa2a88e748ec36d6d72f8e2df225d5d52e3e26a564330471768f2e09cd991634ba9a1ab11df67369734d3bd
+EBUILD ryu-4.21.ebuild 506 BLAKE2B af35584397f059335e09d2c8c30b3864403d6fd9cb8bc5f4fe1632a67e7c1ed10547055ccc51b034c7e93ed43dcbd0d5d97e622f2abb2e82fb857904cbd3ac60 SHA512 8b07c1ddebf2d35d517c79d279d402b95503138c04b0e12cb489c98d1c87f563cbac49c8900c6458bcd16877983578eceaef43b714f291e9958d9944605c79d5
 MISC metadata.xml 320 BLAKE2B 53cf3eb4dc8485edcfb30a28d51e9191a4c24a3770fe376e3df73534e0ebf7481b5eac783a3bf8d8ffcb6f963c5ec22ca49a568f66c983a6d619b8505d2289c2 SHA512 44ad18c381ba7c542ed25119d53ebc3ef8e6a2cc46cdd4bfdec51fa07d6250e9a59212e8ce3176f0f6b219726fd869b706f487ac86f5d3b8645ecb485ff68028
diff --git a/dev-python/ryu/ryu-4.21.ebuild b/dev-python/ryu/ryu-4.21.ebuild
index 8c7fd2dc9efc..b6d95735da91 100644
--- a/dev-python/ryu/ryu-4.21.ebuild
+++ b/dev-python/ryu/ryu-4.21.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/simplejson/Manifest b/dev-python/simplejson/Manifest
index 248b49269937..98aa118b1888 100644
--- a/dev-python/simplejson/Manifest
+++ b/dev-python/simplejson/Manifest
@@ -1,5 +1,5 @@
 DIST simplejson-3.10.0.tar.gz 77953 BLAKE2B 37c23259c7a5be2cb9081feecdd693865dfc98eea90d84c6b4627a081512fc1f66c3a0f5136aaa53be6b5269461c6bf72f62c72368fd68e2c96338f6c9a7f6e6 SHA512 c8782fe434f3f1e29562092fe81f46fc272f0b83fdb3ca31fc03707fe09f4d30696ad7ec07a33de873bd08a41b19f97b9d09e3079658952e5110cf8f68eb53c6
 DIST simplejson-3.13.2.tar.gz 79735 BLAKE2B 5feb87611451054ad8e856e55a4a6bca50470f7f72692de9ce5abddf9eb214e29505124634d4d5a4f825366afe9a97614c66cbe14a73a4e57a5f2f62cac876e8 SHA512 ea29bc615de7fd0eb2a98f5dbeea74ee49b6fed6602396e77baf4480c86f975eff7fd868ac44f62a1c2f3721d4fa5b807b74109e5e28810df70dbad758110f41
 EBUILD simplejson-3.10.0.ebuild 874 BLAKE2B f98e008de70cbe1704daf24200432da9536b772ce5e71dae23e053631360e02b1a755c79d7bb9fd9a7c72a5740c07b754fab536372a9c40efcaf0c8a57d98469 SHA512 726a6de9c147987a57f9c9378c1815b0f7ee66395e09baffdc15e00619a2ce6bbfece3b7b24fda4900002e877a84b08b1770655b8ac801dafcd709968d306ac2
-EBUILD simplejson-3.13.2.ebuild 884 BLAKE2B 09b8c0d88efe2b202681d770054b92edb4ef4337c552cced552f1a7369adc9041d35363b29ab445f836c955a945ad92322898895d26c2450324c9f5f6c41b61c SHA512 1bc29bebf6acfa9abe94b3fd5bf25e043dcb952336fdd202d0d35e8cf80fd7444a7c8bcbff74d00bc609a124d82dc54d9700fd2f7ee7dc4dcfabd9d04311e8b0
+EBUILD simplejson-3.13.2.ebuild 875 BLAKE2B b3e2288cac9f16f1d8c73c1e3a8f7d6ec9ffd0b5785c3d5d7152014c6a58009e7ca36d7614596d12a8dc693b1f49ce60372a05561ce4817f7531790c41e1f27d SHA512 f3d80e1efe2b943f020eac22327943ff516c2177edb9aa266ba9db3763a9557484a84b08c992d1255303d98ac52922ffbd6a9f4dec8a6025ac01e4228358f41b
 MISC metadata.xml 323 BLAKE2B c21be649394bb8a261a6169a710fd3862f1dd539505381a15f99611f323ea1e5fe4e6e54f1ed73d28bdddc2459812f13e40658ed99c09d0ba0f93f724b4bcfc9 SHA512 7db760ee80a6281bcc370303bafc40aea566465bf3264381336222c6f6002f573bfac205f2e42cca557c7b31855f082e1ed29ec9ab3b1125e455cf84bdaf54ec
diff --git a/dev-python/simplejson/simplejson-3.13.2.ebuild b/dev-python/simplejson/simplejson-3.13.2.ebuild
index 63006c9caf2e..0b3bfb940afe 100644
--- a/dev-python/simplejson/simplejson-3.13.2.ebuild
+++ b/dev-python/simplejson/simplejson-3.13.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( MIT AFL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/six/Manifest b/dev-python/six/Manifest
index 2aaecc7eebe9..09ba2427d1eb 100644
--- a/dev-python/six/Manifest
+++ b/dev-python/six/Manifest
@@ -3,5 +3,5 @@ AUX 1.9.0-mapping.patch 561 BLAKE2B 281a893fa6d0d589eb768c595e8931e4d743be9bc7eb
 DIST six-1.10.0.tar.gz 29630 BLAKE2B 1f380dbc7a9e746b4a7909de54a58a008a73d7b6c582611b2481475d5d9971c936b1742ea0821c65150694914af72f43155caa54616268735a4bd2447d5b4ba4 SHA512 9a53b7bc8f7e8b358c930eaecf91cc5639176a699830153f586780c3e6d637f1bd31349a69c383574f99da19cb3a36524e7733a318f3572b27aefb69c6409c2e
 DIST six-1.11.0.tar.gz 29860 BLAKE2B de4886ad9af7aa906f9eac213544c99323d74c1988d9abff96ce6fc3eea4464e577511f7c52328cbd9e6989db2128fa8d1ee57f9ce7bfc36b83ff655691b46c9 SHA512 33f246a2e987141e17e5edad9d3537cf3aba0cbdd0bc2a907ea52ce0d674b1474f29c3dd5cc26605fd960396054b189ca5f501708333cad234c223131483fe24
 EBUILD six-1.10.0.ebuild 1820 BLAKE2B bbbae2233c95397a63029aec8b8f3ae2d161dea2406e9f9beaff577a42c11a3080e794a86d5efa55951a26a10902ee5b30ee0ddb8df2813a5a1a47a8bbfdda64 SHA512 4e68661a0b90e0f2235007aa98c1428f534080fbe593c52cd5400bb86dce440e5aae8a2df739f70ab8860fb2950cec895302800cba576377231657804373e2f0
-EBUILD six-1.11.0.ebuild 1095 BLAKE2B 6d6095cebcb5e05101a72f3f41042c71d0989c2037881bbcf733d673f87de56e07cacdad3b199d994ffbaac45171b162bae49284a0d8bc8b876e45696ee683c4 SHA512 87da6beb6dab97b5f20c6c84a69a7fc23a5f005958dd413ef299281db273691a6d97a3822619b12b5ca1bd47d36d0a9ba6ffa5c5c39703831709a660d61f16c5
+EBUILD six-1.11.0.ebuild 1082 BLAKE2B e1f0d636105516862a9c997b360959bb82288ea8bcc04eca1d9b8b27a05c611a2bf75e098d8cc65750a77f294490b0a3e0b570f8670fc7137bd9b98eea39e31d SHA512 7bc92bd24bd93e9d0892ee85058b7140eaef485ead6c57f57971b9fe1afc9c1d6ce4bdc4b73d8d3b4086884f7f48908162a73991ef8ae940005948c425b2fe17
 MISC metadata.xml 371 BLAKE2B 475b717d4c4bced0454ee0244b5d30f178098ff45b2fc7d168b41f446c4e8f3f2dc022ccadb953d6f4e905f95e38769657d42fb4d80157c816d6e7b5eddb33c2 SHA512 8171125815ab60f7c9a2756367ee6532fd862c5f411ff828b6555e4e21e6d43672f2c764f92134f6625abb161380bdbb739af259ba88c974cf3583f35af76a91
diff --git a/dev-python/six/six-1.11.0.ebuild b/dev-python/six/six-1.11.0.ebuild
index 62c67ff19017..579065529a74 100644
--- a/dev-python/six/six-1.11.0.ebuild
+++ b/dev-python/six/six-1.11.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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 m68k ~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 test"
 
 DEPEND="
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index 603f95f58cf3..e112425af20a 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -11,6 +11,6 @@ EBUILD sphinx-1.2.3-r1.ebuild 3110 BLAKE2B 29121955619c85d730603480ad19f92e5f17b
 EBUILD sphinx-1.3.1-r2.ebuild 3466 BLAKE2B 760757384a5eaa95142b7013a5badffe9c7f729b49e0f2eefa1bf39c069bb8dd83ba9c96e7ade1c72991683d771bb068af46140c0c5135dfdbf6d41fad5ed403 SHA512 0705fa10d01ec6a215e25416d65c96e407f7230c33c1e2f81ab87f55f0a162bd6c3ceb6ad5bba343eaa3cf407f97d1b570b2f7dadcec0bce2f1870f03a739eb0
 EBUILD sphinx-1.3.5-r1.ebuild 3580 BLAKE2B ce19b68c70a1a739e31c3e9dda9afe612df66a8f98f77d8bbdc22a8682cf1c1bdc2374a0a42f6bb06fba437b9f4e9f75f5f15350c34df2ab3fd49f0f322b9288 SHA512 5d7a9b3e083b0f28e4774c5a51895cace0287cc581984ce5b8d4403670663b6bb79cffe1c0d516dcbf57fee8752e3723b1e18c80e5a495a7add224c2835957e9
 EBUILD sphinx-1.6.3-r3.ebuild 3422 BLAKE2B 8aca39ff63500a156c87677f94a205fcce22eb6e42a1a75db9cd994ec150165b34e40c85ec7eceec395916a7dffb932ac57833a4e4f196b6ddef35b48b6602ca SHA512 bfa29c4f9b17c4b2f18ad9c85d40d3f19dbdb974c5d056347ab992d476e16b9f685c9efe4060f2ff5d8547bc71a8321904984b9438c4b5250c76a98591c01343
-EBUILD sphinx-1.6.5.ebuild 3444 BLAKE2B 9d8bc4b31bb4d08f034ffe56ed1fc8cb95ebe6b61c51c852981ab99bd0eadfe4f33b6ce28e54defff96482b2c9fa474fbbf63843f4ea3506d8261f5c37ace6f5 SHA512 5e3d1bf7e990670c530992ae8c9b6fcae7604b2cf6ccbf8e713ef60f9c759f8d62d4b8961add93b1e91b48cdb026f9fd29f9004def4054156a77dc4cffb5e09f
-EBUILD sphinx-1.6.7.ebuild 3450 BLAKE2B 9de3022027ebabc2a86639fa78711ddf979204d3346d7805ec5b3a8a7395b1fd4e7a1eff56b0906c9fd026e264ff6b5c4ff94342b20559e3119b07160c2adda2 SHA512 46098f328365001cf10713ff61acfeff6118bf915e0feeaaafdeec2c582471e170a0e9a1a89ab7752d5cc940c7e32de7fa2d58345e811c1de800b4c41649e7a5
+EBUILD sphinx-1.6.5.ebuild 3493 BLAKE2B 8c4a6952995cc162c337886edde254d58df95d93a24753696c80475cb89bf79202f3b49f01af6b9e1ab90d8abf68d9eeac8a02b39ed7d6d9f6082971d1089250 SHA512 df352b9deeff96565bba0eb8d201a25f3d6f29443b8c84f64ba6639cd6c914c6150a8326fdae28586abb6d61a60b96d7084e670a3bfd73e160741022e8f3b358
+EBUILD sphinx-1.6.7.ebuild 3509 BLAKE2B 62057a6ac52321ea4f7133b51355612b57226edd31d296ef1a971617679f3dd079927c432aeeb80ecb1619b41e50e840f5dc4605192057a33046eb746dd8248d SHA512 caaa45be815893eb08181d69e93512dd50dd21c855f8cc33100f8e16710f545664bf4ab25ace03b4e57765ff7f4fb6503ca66ec76d33363188a794c51da75839
 MISC metadata.xml 556 BLAKE2B a2689efbe3d569fa878296875f4145fdb4d83b4c4821aa636d4006b1823e5646b9cebd5341b4bc02de30985191b83461363cc892aca638e678f86a6e314dcef3 SHA512 bff6813bf9c5110c2e4f5764f911309325923cb58300c19c079d1e6de3d6c4c0bcaf4e206fa4bc11ebf54b961c7e09217310b5647029350d4f9602da6325db0c
diff --git a/dev-python/sphinx/sphinx-1.6.5.ebuild b/dev-python/sphinx/sphinx-1.6.5.ebuild
index c152f62da5e7..7e33ec6a6ee2 100644
--- a/dev-python/sphinx/sphinx-1.6.5.ebuild
+++ b/dev-python/sphinx/sphinx-1.6.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-fbsd ~x86-macos ~x86-linux ~x64-solaris"
 IUSE="doc latex net test"
 
 RDEPEND="
diff --git a/dev-python/sphinx/sphinx-1.6.7.ebuild b/dev-python/sphinx/sphinx-1.6.7.ebuild
index 96134b056cfa..c00c5313640f 100644
--- a/dev-python/sphinx/sphinx-1.6.7.ebuild
+++ b/dev-python/sphinx/sphinx-1.6.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x86-fbsd ~x86-macos ~x86-linux ~x64-macos ~x64-solaris"
 IUSE="doc latex net test"
 
 RDEPEND="
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 38721d63e358..8e803e6a69ce 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -16,5 +16,5 @@ EBUILD sqlalchemy-1.1.12.ebuild 2132 BLAKE2B ae129735af5e63d77c9f1f5651588893aeb
 EBUILD sqlalchemy-1.1.17.ebuild 2184 BLAKE2B 4cded77193c854e0491759ce026b85a1560a01bcb91a58fae635b5c36725377f1a99df3f10e556d09674f798469d267b8148b860dc4783d758e9abadcedcede0 SHA512 4c4b1dcc6b4df52ac6cc66d7bae76f350a68986f2088047c7c07b3fd169f859f5ce4f76f2680cc88c90a5085ee8d665276821d05466a5dcf3fac25cb0b2a16da
 EBUILD sqlalchemy-1.2.0.ebuild 2158 BLAKE2B 1a243d220617b48749029673f95cfcc7580df1e9933dfa6a7e619d4606e66713123ed182d2823dcca73abafc85474d5b9e456e8f71ffffe9042c455f5c5d2b10 SHA512 b10f9d3bade8f408fabbd1173343162394762af7341fbf4f28682a4e051bd504159fe880a7538a1b68c1bccac563cdf17b78d307f5a579a4f91c873d02f3a2ce
 EBUILD sqlalchemy-1.2.2.ebuild 2175 BLAKE2B 84ab6e0a1a03ec0252f2a820864e76a422d51147129eb97706c31d08f616e41d0eae7c4fba833f8e6ae8e6aaf7404439e2eb18e3e19f2106f10290182178da6f SHA512 e9d7b1c97d40198e7a17ad8cd685f1a562cd99734262d57e576bfdf16de4721e467ff809dcada54c28519c0528dcaa6e8788f17bed4b63ab83b35791e867f7fe
-EBUILD sqlalchemy-1.2.4.ebuild 2219 BLAKE2B 613c30682d502aa12a8663d111f1a134b11ea1fa1849380a969e94d027cdc2ed1ffbbae701254f9236754f4fcd72e027ff13ecf1b9acbdcaef6ab596d35e661c SHA512 e87718e5755f77299ccb46635b5239d7f0441d0af1322c71da2ced699c8fbe2a00d4ff61eac7ae928021d9a389a7e4d7dab8b6d7cc0f16478b4f4e4d6ddfe7c6
+EBUILD sqlalchemy-1.2.4.ebuild 2209 BLAKE2B 3b819411cc1d2ae2d4e55555e76eb97135d5c054698513f3b9abcdfdb8237afe5ea807bb46ecc1ec1381957e904105c56d35e3ac90809f3cb939ee6482c45a03 SHA512 b3e142ef6552a15d1e29f51c69ca844b0584754be49eef911c83dcfcd4392586fe3b7612e8b111536c42099f78e0de35858971bc639613e8add8fbfdfe95bac6
 MISC metadata.xml 313 BLAKE2B 71212a9a3076b472b488bdb4e12fef98e16881a32a8383c5fa6a9008353d2e043dfe64cb536ecef145ba74ba77ef3a6c43d705d5072d1b56e11eacfadd1d0edd SHA512 ef6298f9e38312117a0d1ab1e63f2fb21ae51ff149053603c19437b90d954827858579ab8f021cb52919aff4474a27f5a598d8515a7e5a9f2e7e35aee53c5326
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.2.4.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.2.4.ebuild
index c4058b248707..238108b55c07 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.2.4.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.2.4.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 ~x64-solaris ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="doc examples +sqlite test"
 
 REQUIRED_USE="test? ( sqlite )"
diff --git a/dev-python/stestr/Manifest b/dev-python/stestr/Manifest
index 47487ad5bb7d..d0043ce95bad 100644
--- a/dev-python/stestr/Manifest
+++ b/dev-python/stestr/Manifest
@@ -1,3 +1,3 @@
 DIST stestr-1.1.0.tar.gz 95353 BLAKE2B 70435cec22d56f38fb9d87484b261fd73d79f8ea719ffd67861e2504580d6e2932b762839e44dc4c9e348e448693a80e8173850d800374643bbce15374137c37 SHA512 7490f0982c77190adf97daae965a957fc40d0e418a64fc38ccb50817a7266b06224e61f17ae9c84edfe200417eaab726cf834646bfa2efbac67ea029dea54df1
-EBUILD stestr-1.1.0.ebuild 835 BLAKE2B 15d74fd4adf26c344bc309b9be0ccf3bec760a83886e9195dbde5b769d901431e24d7fcc3371d7756fc423904c377684a4fc717f65574231e40f3cc46b38fbcb SHA512 e204b2e1dc4747c48e2b41a01734411372eacb1dfff3d98c6a8eb04691a3848bcadb6ba7b252f64d8e55af62073bacf591693e625ff5fb88b82dae561f9b8338
+EBUILD stestr-1.1.0.ebuild 833 BLAKE2B a4282cf93626dd2c91b2e1a7397f84c8c3da4c761f21fe28830b8ecc363ccc15130028d4b8fc1c56b10afce9885eca83f6175a80ea9851fad5bc2e18e0d99091 SHA512 ae04747dc2439e1ae91ba89496b9400f22844ea703d1c11337b0f0436096ab31115625a424e871748ba72a60e3c9ad8ae82dd0efc13b4d83024349a27af073c2
 MISC metadata.xml 615 BLAKE2B 59ec048ea712845ca6de6e55aa4ca514da16e6c6387ce2324effc9e6eb82d99aa5d3601914fe78398fcc83be14c752a1ff4e546f36746f8711e36aaf4cdc2846 SHA512 d13186ab5353fe9b9310ed047a828b65f179b173c7c220fbaba5a80e36bda817dd44ccaeb4a9272b342de6246e44ead8d959fdc7a4b4e7f00c52848eb0a613c5
diff --git a/dev-python/stestr/stestr-1.1.0.ebuild b/dev-python/stestr/stestr-1.1.0.ebuild
index 6199497da749..499a71fb2421 100644
--- a/dev-python/stestr/stestr-1.1.0.ebuild
+++ b/dev-python/stestr/stestr-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-2.0.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/stevedore/Manifest b/dev-python/stevedore/Manifest
index 1a736224ebcd..6e182bdaf625 100644
--- a/dev-python/stevedore/Manifest
+++ b/dev-python/stevedore/Manifest
@@ -1,5 +1,5 @@
 DIST stevedore-1.25.1.tar.gz 509014 BLAKE2B 22580ac0e5af56eadd81e7521888e3b2458a1c03a3bdac69df1f2eeef20248f1ddc1748447e3e961b61cbe62ebc939e36c04ff011b7845b3278e18a5fdc9e14e SHA512 f3d2a7360e783c800c3c2488f6adf6f9f76e34e4a4e6f3fc53d2f1114b889c443c13fdf217ddce65a41922dda2c782f19b2077847807c70e732a522fd2166ff0
 DIST stevedore-1.28.0.tar.gz 504872 BLAKE2B 6a9ba88ab950f17898d2dd76d75cd7bc7031cbcf441523863520e15916bc5c255fe6a62444f46b6d9967ec1f5f716420b36cb114995907ec8e2c39110ae7918a SHA512 e148560e255a362a51ce91e8bc2380828ba9a41e1988138bcff2d5b270097cadffdee30f3c98e123d8ced9f6f0ff350b52e793fd400ce6b45095860788bd6b86
 EBUILD stevedore-1.25.1.ebuild 1639 BLAKE2B 2f6c27753ce64eca38fbf2366221083cc5ba769e6710c4c5eecb26857840a7f053755dcd71a0171189e0e290da03609d7357cade71faff7e0a41b43c742d5805 SHA512 b59f45b9ee53a0b7c994af7b3f2bce12f1cab17a66b4570b77ecfbb702bdb1b722fa7d3c034f9bd1c716c7ff94fe4ccdc22510d9d989910c21ad9daf4318e610
-EBUILD stevedore-1.28.0.ebuild 1642 BLAKE2B 27ba8720ddbbb041d12eea354feeeb175d8b8677c9d3035c3910184e925a9bf0bcf383c9917f6c7d83a2008544904865d93b80df8e59ef98a7a6279b37ba5ea0 SHA512 bb71cbdada1584ae2f1143bc66bd94b2248be50205d3456383ea4d743e077e405e9cda6e457040a589b2b5cb38ba6fb54f19772a5718fe11bd939f3fd19205f0
+EBUILD stevedore-1.28.0.ebuild 1640 BLAKE2B db11ed8218434866c87ca373261450b1fa5c5a20bed4296846eec1a21f6159d39e9c73ae6f6e7d64cbe2c7296b6eef3a26e9b6ea7a687e6db490e3cf2bc1da94 SHA512 5c11aa0d1198866109fc7b660e2dab137e57ca1a0b8b2541de7f707c60bcfdef7c15ab77a18c15b0503758c620a510ecd837f301b7f29fce1fa3235f9b8a4a7a
 MISC metadata.xml 496 BLAKE2B 4de4391203bfd30055b9b6399abeb5b53c2a363779c895d4e0efb1de2d929510a0d7e02541290000a63526d44d32d50ea7c41728a4ec1e5d6ab41a7ab57414b4 SHA512 569ee9efc45e2445b71ffe7201ea92a7bdae048de528664d2a908b94c3fb23f6632e2457623c5b0d961dcf7aac2d96c6385d225628a3c5234363159f56961f00
diff --git a/dev-python/stevedore/stevedore-1.28.0.ebuild b/dev-python/stevedore/stevedore-1.28.0.ebuild
index 60311256947d..f2d29eb2ba57 100644
--- a/dev-python/stevedore/stevedore-1.28.0.ebuild
+++ b/dev-python/stevedore/stevedore-1.28.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-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/taskflow/Manifest b/dev-python/taskflow/Manifest
index c2f7d3c828cc..36aa8e13dbc1 100644
--- a/dev-python/taskflow/Manifest
+++ b/dev-python/taskflow/Manifest
@@ -3,5 +3,5 @@ DIST taskflow-2.9.1.tar.gz 1061514 BLAKE2B abef1651311da6ea1f475510e293e6b1eab1c
 DIST taskflow-3.1.0.tar.gz 1062425 BLAKE2B 8aa5ed0bcc52db3032d6abee03a48327d9790321fd927488cab13176ac10aab46cb57e29b9df81337fe9a7789816148d9f1f9f5f8790c152099c4fbf87ecb72b SHA512 fe37d8eb2a4c22fccabb2779a7318e5075617bcc692dd36460169b4dd75637cc753bf7abb117322d77be8e74b40c260c64032e37cf8d51ef11ce99fa7cbc72ab
 EBUILD taskflow-2.14.1.ebuild 1551 BLAKE2B 65a65a4002076ba9bb134c94c5c934bce3eee75ec2a11a7aeae1f0f2829d785640398f1ab80573e72ece8f26ea510fc5d3e9d11dfd882c435affd6693430bcab SHA512 b942ed1b6078541f83415b6b69e5af932d37f40b88e17c289e71ea9d1b534ca1fcd6044d0f817d6225319a286b28caa2560f55f71c809e4e13f8504ab3b9ba14
 EBUILD taskflow-2.9.1.ebuild 1467 BLAKE2B fc869838c7b329603550dc0f8d514aded48b117b1d13c39024374cc31cb37f610ba73eb559789c01e00e0de21f257aba7ffad3a4ef99621887e9b1e71b5edda7 SHA512 4d8706e9e2890c6bbdad6eee6c082c0cd62ecd036c74b6774b4564672b6669b74bc165faacd610d7c749ec126a656d287022c9f0d8283b679a183cf7731685ac
-EBUILD taskflow-3.1.0.ebuild 1502 BLAKE2B 60395847fbca47613cbfd7c4149e084524404c95a74cc795676dbcd1dfc39ae857f396f4f60f833206272d8b4d303336f59517e100c814f7ea6331236787e98c SHA512 c0f7093811b11c136c78c8d98a8b6af7dde7f3f0148ed04d6f72a039293e047c99f48e82e9fe56eb8a038f3abb1fe9376af85b608e9b9aecd2c14ad46f33032a
+EBUILD taskflow-3.1.0.ebuild 1500 BLAKE2B 382247e3c5041397589f7827c63f3be1fb4a0d14445c386e45352c9a193a5f0193ca9a9e748d401577aac62c2ce366e8c6438cc4b153e64621bcb018c730952e SHA512 d35f0b6d783a9d8e25553b9e4acf524356758800f683dee0cffdaf36883bb1f849936645554b358388df4e794114b20cf4e1f5f811d7c0fe405761433dc8ace3
 MISC metadata.xml 676 BLAKE2B 32a696fc754d94e1d1f37e67ec09de6c588f9ee3eb151dcf81f955f7b0632c522796343131a5acbf73e852ef78f89ce7bca6060c6fb83b9611e084e20a5df3e5 SHA512 c274ae9882c74b8bcaeb054b9feade463c1fa7f2f6ac559091a4bed85075198873c4b994cca1f28083b682bbcf66dbb31971da97f9074a1b04a57a6eb0a612ad
diff --git a/dev-python/taskflow/taskflow-3.1.0.ebuild b/dev-python/taskflow/taskflow-3.1.0.ebuild
index c4b3f68bea61..45343fd76488 100644
--- a/dev-python/taskflow/taskflow-3.1.0.ebuild
+++ b/dev-python/taskflow/taskflow-3.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=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/tenacity/Manifest b/dev-python/tenacity/Manifest
index 796126aacc70..3854d7b70540 100644
--- a/dev-python/tenacity/Manifest
+++ b/dev-python/tenacity/Manifest
@@ -3,5 +3,5 @@ DIST tenacity-4.4.0.tar.gz 26133 BLAKE2B 1f23e3cd4cd3caa73b5e1c1f3234ec5915adc0b
 DIST tenacity-4.8.0.tar.gz 28057 BLAKE2B 31451b061c594a47fdf4e6ae97e09c601d95ef76afc805d6f746624e3cf18a0f7c288567a5fd5ff8c264d00ce55a635afa2920799c256168dd89ac800f0d3ca3 SHA512 4662a92325de6b2dd7f6dd8823cecfdf0cc2f1390d054c8ba14f84fedb917cf5896d5c26aaaba9816303dea06ad7f922877c8a09e248319317155e2d6f509873
 EBUILD tenacity-3.7.1.ebuild 633 BLAKE2B a2bead3c6ef969c0cb079d009143bc4d42b6cc2453a2c9c966b47f2864842587eeb65e8a96c2c39554012dc3d5c4a75089d4ca4fc46ba8049baeb474529a9ed7 SHA512 e5272ba1165543af1d3d09b3a4c97b49527c022da7ee408a0d15e2b58800f7635c8b418913d2e668adc3eed25b0d2416c657f998937d7c3fd4c05a07c893cb63
 EBUILD tenacity-4.4.0.ebuild 623 BLAKE2B 256f3f3b16b6f0fe8144ed77a84eb83d571e29d1017fddaf83e6f047408d8ccaec4581a4e35e1f347d268a2c89c37e6dc91674265b5489e54e73ade8027f113c SHA512 e3058bbd3c3a2103f245b98ddf4bf77c4bc2e422bd6a0af56dd9a7efbf773069f0cf89a3bccb155d7e667e16b533793b68e2f4f7aeecf74f29d136d5ebc26e38
-EBUILD tenacity-4.8.0.ebuild 622 BLAKE2B b84d4ddb3bcb7d5f9fbe33e88a1b54e9e0460d2845f7f2217018c710c260acb153ab3cdfdcaf44f8b054c912068f802e59f9638606a82ea0a6be59d1e476c432 SHA512 e2011f190c373a96ba0b2668ef45c1c808ac37c6329784103e131c5641233ada3ae6d8a31b786e01e8822879e9a70e267e1c3c2d0ea2a699c81ed1fcd3419058
+EBUILD tenacity-4.8.0.ebuild 620 BLAKE2B 36eebde5c34a0f615d04cfd65fc285bc5a7dd7fd336adf2df77214ebb74e668a916c04d225a5e3a31f382d836da3dc686b78236045e27b568fc5be657798a6c4 SHA512 58a7e3de4e72d20b2352b331d034b612743d84ad9fd54438192bfa70ab20213c08b9e0ede84aa48eec75544a820884a91b49328497001ec4a406e429c3ab5b04
 MISC metadata.xml 730 BLAKE2B 11af1697135e424eec2e9a719f67a747e3888cf9e501fc65b99ef1eff28a153b47dc5e827792197dc9a19d1ff16c03a8c0b95ce44c177135ce44452ae3e097e1 SHA512 0b355562b481aebb7daf0940cc5548dc33e8252ae39e8bbd811f957f6253aa481c0fd02fefb7b30672392af50d5aa69731767915d47cbf83b71788cf8f5a6144
diff --git a/dev-python/tenacity/tenacity-4.8.0.ebuild b/dev-python/tenacity/tenacity-4.8.0.ebuild
index c75e8a9b7330..df4eac1bd9b5 100644
--- a/dev-python/tenacity/tenacity-4.8.0.ebuild
+++ b/dev-python/tenacity/tenacity-4.8.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/testrepository/Manifest b/dev-python/testrepository/Manifest
index d6044d1b1314..15d175cd5615 100644
--- a/dev-python/testrepository/Manifest
+++ b/dev-python/testrepository/Manifest
@@ -4,5 +4,5 @@ AUX testrepository-0.0.20-test-backport1.patch 991 BLAKE2B c6318f8bc90195d713043
 DIST testrepository-0.0.18.tar.gz 84886 BLAKE2B b6c0161c55271722644eddd5d620ea67b67774e92d2de0117f645fc1016c9de209de6a9557862a27e08850a3ade5a2406ea5eaa410a2ce4d44fc26c8121ddecf SHA512 4e90db6364f77f464ae063020b016367529588f581af001c2564bf4babb264fc37bb7231413725211c6d483a269360d86201f81d2b24d7eb162dca2463d13c92
 DIST testrepository-0.0.20.tar.gz 84956 BLAKE2B 9b9a8e0c21754fe8ba019b58024f137e72b4341cb368fb48dc48039f512b232ca4f03f16c2596aa34b428d69097db939e5776417a7d26f5a8508c8f0c1f1a5bf SHA512 df14500e2b27b6f39d9d4c4f42961efd63dfe25186e561eb1678952a8ab9311f17c36b78819fea33e0ac879c47a33d45c31ff58be017609c8a6157905ee712d6
 EBUILD testrepository-0.0.18-r1.ebuild 1264 BLAKE2B 3c5a2f064654840ca87db24932e4cb5b1bef6e2a485a030d2ce84e21cd444ebb4cc6832c5ad8426c1b373c883e011844910158652be220a51359fff143ca8f68 SHA512 8c6d2b3a20fb4c58a78e466c61a153fbfeb663425978facd849987e6c8b994a9e95c944787cfb40acd88a3f46dde12609ce8610242c790e8e9169e36526c8153
-EBUILD testrepository-0.0.20.ebuild 1278 BLAKE2B 510f370c0b444ffaa544042fdb5b8e90e0e6c6b2c8aa675eb78a9a33282674a8d35151944e73838a0ed9d998368946e4079628b7471abe4925e0d8cd4cecff13 SHA512 67dc3caf9f62cdba0f7fb4de21e03bc5b2f5bcfd4a76a1fb9eedc318937acc78060021ed6fe8c8c05afa4b416f953cc249a003aa2b501c940ba3d187ca838f1b
+EBUILD testrepository-0.0.20.ebuild 1268 BLAKE2B 2ee2cf75c7ca348ef836903689356f378cb7b20edb703d918c101ef51e4a38852f322e54ebad4326c012a826a8f3320c78289daadd1409c70085c6b447e005bf SHA512 cd2bab3038f0fa5753b557305ab35a8bdf725a215bffe21ae5e57f2096931f70617d7ec8e7edd3f11ca7fb974929bde6dd8e78421f001986cd4db896fb56bf5e
 MISC metadata.xml 575 BLAKE2B 7a1c9930c814a2bd60788a38d12909871d068def9c39041ac346466bb2d3940a3df3dc771fac6b2bad39e2a85b20f2b4fb8dc269af4e7853f02206eac9044e22 SHA512 36f0681e6b41a80ee0f3cdbac0520640c67a5612e73baae30b0b5917576d343db3327e03a40e20b23f23b0c76ca797d5ccd09d8dd339dfdb5af6029a4f4d79f9
diff --git a/dev-python/testrepository/testrepository-0.0.20.ebuild b/dev-python/testrepository/testrepository-0.0.20.ebuild
index 53ebcd1c2dbc..59fbcc1f08b6 100644
--- a/dev-python/testrepository/testrepository-0.0.20.ebuild
+++ b/dev-python/testrepository/testrepository-0.0.20.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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/testresources/Manifest b/dev-python/testresources/Manifest
index a7d6c10107b0..0a4fd98a4554 100644
--- a/dev-python/testresources/Manifest
+++ b/dev-python/testresources/Manifest
@@ -3,5 +3,5 @@ DIST testresources-1.0.0.tar.gz 44501 BLAKE2B a10cbf562241ee2a756a5de6a9334ff664
 DIST testresources-2.0.1.tar.gz 41948 BLAKE2B 81f597099eb17090cfa759c2fc4e30be2de3f749760e6a0e88e4c5484c91fe6a00d1296ec6ba7dc5aea1bcd0f9239989fab8fbb4f211b6c5bf031ff1be4b803b SHA512 0b23432b019400fe378e957d14a91083eef7fe1130a494b567a5274d69e4e8e09ab75861e5453c3f217507e144cf179c908f84dd1a807992d4bee0b8d32cb0f4
 EBUILD testresources-0.2.7-r2.ebuild 954 BLAKE2B 68f44e4a075a0a4590bf8103e8b3f39be78beaad78620b04572f9f5760f2147597b38c4322c371d267e167ccaba72e33aedfdb9caf4de176ec4fb47a13b6c20f SHA512 3de787fc7370be231f24129457eb4bbec638daa164cf5cf38b9f1515b333537735c43904ff06ebd70d04c5fc1600450d35aa910e84e235480eb618d39cbc7b98
 EBUILD testresources-1.0.0.ebuild 960 BLAKE2B 12ad5929eabe11a02960f152101a92f4569d7eb59f20caa6f574f96291d8e4e1b32918f8eae36c8b1ba9bec16b93c5b7bf60fc31903efb43f8b60c5499cb1009 SHA512 4d28c3846a1b5146c9ba2402e28b1605b407d42fbdbb7b24f9061e69560039fbc7ab1c9f96fcf5b5ad1217e2a98d66621a9d258a9ed73234dd71a316b962be4c
-EBUILD testresources-2.0.1.ebuild 972 BLAKE2B 7ddc88e4e2b129befd3785a8b7872bd7c00eeb00ac043599449f75309c5849d06cf2c0b0efe5301198c110141a5be4d30f7e17c102cf809a123ed2a0eb442943 SHA512 98e21b1bf70890061b2a62ae949294073767f92ec6870b95659e3911b004154c73b3b39bf52dd61f8fc3d43894fd9086804998ada01a2c5d860ee468e77543b5
+EBUILD testresources-2.0.1.ebuild 962 BLAKE2B e90145923d4873aebe119174dcd0523e88b4422dd3f2906ae3110b46d8dfbc78c977ce5f693a0b030b2ece95d8eb82e3dd4a943c10e5992845349e35742898af SHA512 70553617f3e2d267680e8a2795d8ca8e59c8db0399f5100c1da726b91f39d0911117c2c48258e8601546d078488e1c455634e2ca70dd981f9fc2ef7bad00e581
 MISC metadata.xml 939 BLAKE2B db25bed8c4a747daf38631903c47491d4cd5ceeed168eb14c68ca0894c271d866616d9a2704beb446a1316a710c98b73a5e224afee7d1e6ceea092de834b958d SHA512 5962ed430ea8163666e9cf360a456e48b38bcba0b85466d01a54fe4d2aacfde98484d4c0740f5ec29393d6291ab14c4da897976201667d22c76ffa56aac402c5
diff --git a/dev-python/testresources/testresources-2.0.1.ebuild b/dev-python/testresources/testresources-2.0.1.ebuild
index 077b955b0164..04723145fe6d 100644
--- a/dev-python/testresources/testresources-2.0.1.ebuild
+++ b/dev-python/testresources/testresources-2.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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/testtools/Manifest b/dev-python/testtools/Manifest
index 30c7dba9e3b4..ffa7bfdd5a7f 100644
--- a/dev-python/testtools/Manifest
+++ b/dev-python/testtools/Manifest
@@ -6,5 +6,5 @@ DIST testtools-1.8.0.tar.gz 207976 BLAKE2B eaa651436f289710f84910ac8229f8635db4e
 DIST testtools-2.3.0.tar.gz 231559 BLAKE2B 6ae098e368cabc0bfe45736324819687a6086eccf868de7eec312caf7c64b5d75a3168f3966d5cd0b05ad9295957a7aa1ee3c1589f076de1f5cb619b197ba08a SHA512 558fe6a1bdce7215f9f6f178f469a2b76948dc7ff0ce27400482a16683474edb81d9bf90ae48b6fcb8df9eb70759341b694aa162ed3d9d4abd372981cdcd8a64
 EBUILD testtools-0.9.36.ebuild 1396 BLAKE2B 585d17a4db413463225765a91f87a114f6cb4b1986690968560874fae0fbcdb9533549fabeea063c6e11787625fac11c2fe17a0b0714a017fffaf6539feb7a00 SHA512 665a208a495eee6a0e9e48e426da16fe33d2925fc4650f548b13487794d818083d7281493c263555143e26e89d924e059ae2cf1f20ef10f66d5c868f381ebcb2
 EBUILD testtools-1.8.0.ebuild 1347 BLAKE2B c7e33b2ccbaf141df6c9174fe48a4a120eea37de0756222af51acecde1de89e3ae57cdbd0e7672d61d1f47739114e47f4f2b8fdfacd9a476798a8f26db5392d2 SHA512 5055702fde3ba89117d7d5fe872cf77c0e2bbdd48a17c397df7048ba4228be219f950b5583ceb21be38aaa9fab3cb09925dc55e3e82637ce6db560d1bd4388f6
-EBUILD testtools-2.3.0.ebuild 1479 BLAKE2B e9be235868e9418ef607afbfcba6aa9d38e28d6b7fcb00adbb70ca6dd5b4b12bd644a347a6394414bc13821445a3d4865e293eeb58323401112e38295ffd13d5 SHA512 4b0d73ce3a4541574e48f4d7fa2325245c295aa1d499c4e911ae0f5b6529e38e4cb2149a494dca97c41311dcbe89543ccba99a4df1a08f28ca709cc120024b1d
+EBUILD testtools-2.3.0.ebuild 1469 BLAKE2B 18d460db7b3b06f0a4811a60f11a8ea26aa78172af0c2621c7359f545d7a3b4fded8cdbb36e338a9ce3df55d63c641f7b6c712fb2da6e7c3341fb4c9aa9dec2b SHA512 37b1ae1a7cf12b0d7ed92f908e9786a2f61eeac2ef52c923db3b07a12a11bae2587b47badd0b0eb0e88dd54d7cab976f38e9029d45093868dab9635f8019bf8d
 MISC metadata.xml 554 BLAKE2B 251f32aa81267f470d8f5d1f22bd2e2354fc39ec79ac326dd64333e73e5cc8ab35d6633e1ebce2bad5086d55f838fb129d7cbde2e1d36cf77945527e6e786157 SHA512 ebe5defc73dc62044732463b2d295c08ca24573c34b689150f3865247b34ef6d925437a0c97598c3260ec037c4ed3644017601fd2b7127521c7c352edc1e6384
diff --git a/dev-python/testtools/testtools-2.3.0.ebuild b/dev-python/testtools/testtools-2.3.0.ebuild
index bd556b22d4a8..0ec501a3f0e0 100644
--- a/dev-python/testtools/testtools-2.3.0.ebuild
+++ b/dev-python/testtools/testtools-2.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 CDEPEND="
diff --git a/dev-python/texttable/Manifest b/dev-python/texttable/Manifest
index 21bc7fa6dbd4..ad775f3c0680 100644
--- a/dev-python/texttable/Manifest
+++ b/dev-python/texttable/Manifest
@@ -1,5 +1,5 @@
 DIST texttable-0.8.3.tar.gz 8569 BLAKE2B 83b64ba6792b4243bed042f90e643272c045f39eefdd2ea33c9ed506f1cffbb8c683809edfa2061e7f5fc8815c6bbf67de0c8da7a90c6e77fb0d89b57fc41288 SHA512 d9a50f6fd9cd2a6d55afd5e686ac8ff2b2ebcf8c8041209ffae3e3864529c54a384840a65df2b87a942528005ca864d00bb01dfaeb33308843c01db7471931c8
 DIST texttable-0.9.1.tar.gz 11074 BLAKE2B 465738a7b980f2a216d63b268044c1a1b8c0deb986fd398f0ba0ae30ab84020ac6f179b5314a2071592c38443f9cb86387b9ed573342533af9e825000472ebe5 SHA512 7ec37336ef4b253879d0232dcdb4500cad33ecce1067dd7ea26c221dc2c003ee56360bdbd1dd1e00133301c51c67fb2fe9b1703628804a65f2a6ab8a1e830e50
 EBUILD texttable-0.8.3.ebuild 395 BLAKE2B 8b41b19243fd5e9d0ad75d053663e38877ef635d26a239ac13af66b9ba88c000b41bafe2f40bda3ff808dc8e50bf71ac715949f28b9254a0e8404084eaa7f612 SHA512 edf762345583fb76357793f1bbaece0203ea3ccf0e58b00fc302e805905c863f5af1f9ff79747eac03895766b4bc60b5f9e78c82b0c641b47fd34ef11c9c2adf
-EBUILD texttable-0.9.1.ebuild 434 BLAKE2B 22355a2b822ca2e9532d8afd633a01e67ced732225494446426ea82be1f82d622a1efb58da920f9f8d6ad27fa48c43f3f14c889b3b7dfc2d83a642859fdd2e6b SHA512 fb419527cfcf4aae500d38396ccbd77e921f2950f88c64f8ce9da245b1d7549588bad3e9b0701341dce397ccdb8659b926e15def77a17607dbe39303ea803a03
+EBUILD texttable-0.9.1.ebuild 433 BLAKE2B 39f373d4876fc255d750d3be892e9f8b720c9f136ca9d89c6f46a3469860b640158c836fd21af37d3853bbb004e46bece4b4a103189d9f0e94c1dda6dfbb1b9c SHA512 ee3e2d6576e9bc93fcdf81e33d0a05d772397e3f662bf6a1ac0bf25e030a844ac7278bf4e2b8873360f0ad3e1ad0c3210f1bea9ea215416d32868d5e2aa9c552
 MISC metadata.xml 211 BLAKE2B 8e45befe5fa863b3788a0e56b3bdbbb3d52eb33bec7a02146badf2f69b83dcb90164944c07b6bc32bc435038de6a054aa4a04415757d6542a8945cfb674aaf39 SHA512 a24adee1a3aa9efdd121d0c04b5e5aa4c7c030e70c2a1b2e82c98ec5bd01f7c26182b7566980ea8607fbcdc699911f019dc4d590a5ed4fa65ee28d80f39e7837
diff --git a/dev-python/texttable/texttable-0.9.1.ebuild b/dev-python/texttable/texttable-0.9.1.ebuild
index 2f3f4974feb6..57830178b3ae 100644
--- a/dev-python/texttable/texttable-0.9.1.ebuild
+++ b/dev-python/texttable/texttable-0.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 python_test() {
diff --git a/dev-python/tooz/Manifest b/dev-python/tooz/Manifest
index 501d6294a28d..2ffbbe11830b 100644
--- a/dev-python/tooz/Manifest
+++ b/dev-python/tooz/Manifest
@@ -1,5 +1,5 @@
 DIST tooz-1.58.0.tar.gz 81688 BLAKE2B 06e282850c549261a312d5381ac9004d13c96a90b10b3f682f2edbe3df5a1b4516a2e618d40d4625242fc18408bb38de56d1c9a58a998b843dd5c98f3d89917c SHA512 44886aed3b37e2a9cb2896fa30e22c7101f19fa766c75a2d7c82c9bcd13b47804ba6d140fe65d2b7c7f3ce3e12bf2f19fa1e92a8e147103204a608aba28f5ccd
 DIST tooz-1.60.0.tar.gz 85364 BLAKE2B 7c1f8cca02830accd5c72d09333f027a02d79944402affc80bb645c11a5a6ecbf94dc8acb62a1d1e98773458763a289134fe8603291e32b25dac507c68571a7d SHA512 610b7d30ce68954a687237c02d5529e93c1babe79bcf16de3674ae3c1d395202738a01dea91f8ffcb184717d884f777300152f54e6f971a4a42fc8bd500ad982
 EBUILD tooz-1.58.0-r1.ebuild 1263 BLAKE2B ca34f0ecbf42876e1a4a862abb48dd2aa7881ea64f3d3dee11a9746b17b9ace9da37001b63df9b3463ea0e1fe3d6f751d824a527d4be178d0c18f57da4798eb7 SHA512 a6f2d3710582f9de384c2e95f8dab9ad91a8233db536b32a21e94ff4e0655966048ea8394a32daf5d20b4d755ad6ddae8c0e778bb69e6c9a429c64bca0f7e1be
-EBUILD tooz-1.60.0-r1.ebuild 1264 BLAKE2B 3e6be13bf6fe8ca059def056bd0f6a353580b516bfd2ad218eb6d3ae0a59e0f07f9ecdabf11f4f54e78814c04be231ca50914342afb8f82fff453000e2a58577 SHA512 0e68d141b012e69de7c732f87a9da91cc06ad42e10821ed01d0cd83576396df93cd1579d39190a542e19f4593042154c5d43da24ed228624b815ccf45f44e700
+EBUILD tooz-1.60.0-r1.ebuild 1262 BLAKE2B 9b4f3eef111a70bad4d4a953453f9efaab941735b0dab0dcede7bf93ab596c62adf4b338e85c0f2f5a23a46268a59f3ec615f299d01538175c24ca76edfc7b34 SHA512 fc6fe0d66d328ad283b56233f7bf2432d29b10b2123ce26e855fb0e44042c89ae3158488b8334952d395cc6018b578998a74a48ff8abe931f9b861b666720a78
 MISC metadata.xml 614 BLAKE2B b93f65d4b322a9cdd753886cfa8d506676fcbea6c8ab9656c310b245b42aa296667db500584fd19295fa978543834724c17358591f8450cf761907a83cd04d22 SHA512 2185ff992babb09b9c51b350c94237ac4d48e3b10ee118871f59aeb2a265f34b86f798b46c272db76a976d83f1cd005a01e4c965476227334084b0e1ff10d1d6
diff --git a/dev-python/tooz/tooz-1.60.0-r1.ebuild b/dev-python/tooz/tooz-1.60.0-r1.ebuild
index 1d97d2da6418..053a5c908901 100644
--- a/dev-python/tooz/tooz-1.60.0-r1.ebuild
+++ b/dev-python/tooz/tooz-1.60.0-r1.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/twisted/Manifest b/dev-python/twisted/Manifest
index 9387ec6fe9df..ba1b6bf281a4 100644
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -11,7 +11,7 @@ DIST Twisted-16.6.0.tar.bz2 2979747 BLAKE2B 898e0a0fa3ae8547a801b09118423ec8ad80
 DIST Twisted-17.1.0.tar.bz2 2997334 BLAKE2B 54bd9813fb265f3561be7bc42a3ca6fc36aa5f8553ff0f40fd4ba7939947015632ef91c011a088b511d9f3f262aa0a785467ad3e4fab00cc97cb85bdbd93a726 SHA512 e5eedc9a70b7e4d0ec18dddaa82aa9a784e96fd517db65c278d822d15e8bdc65a35307a5a0474eb68dcb73fcd5508086bec605580a9f2f767bcbe27d714b4966
 DIST Twisted-17.9.0.tar.bz2 3019243 BLAKE2B a79fade6c84a99303df803ad80f02c63562e7064d5b79db39c08bd0ac9a62d61f1388932b36348aa106aa409a51b2d49dc0eb5b1007ce10f196a34c2f963b8e5 SHA512 0fb854db1044bfdb208594a379a0f8df0193326a9974e193266e82113488d49220648d4a50b323fa144654e94976f5848e1d60efed13ab2668b02cc795720345
 DIST twisted-regen-cache.gz 911 BLAKE2B ffd3fcda6c67ffe6fd3ef581c8d507548396b66ed0708e9a5c790095e579c0d5f0f71596acf05712989da2ddef2b8d437eca973bc4d80ef8a9fa852915f38305 SHA512 95a9b931c73017d16d1b5e6b41345dddffe62b6af1a8e93b5e40d06d3d15be17b0dd0181c767ffeeb791534d463764ef9e066fa6c2ee2ac4b53c86d1da8fce03
-EBUILD twisted-16.6.0-r3.ebuild 5711 BLAKE2B 47d929d8c21ccb1f37f048842076fbb3813f4b5df54c075fd4124a67ebf06372edf9954755e75b6cef7716b9ff34072e78f695802806f9f29f41975d38b2fab3 SHA512 f337af3be8208030efd63202f2b957fe1c617296fad3d625457629a527d4c948fef11e3bb385169c6b4fc5f9c000cecfe221db9c5d016cffd8bb3a3c4309e70d
+EBUILD twisted-16.6.0-r3.ebuild 5710 BLAKE2B 4546f6bf699eb003537e9c62959aa2c10fa2241069058949bc20aabeefd0e0758db72db46fe465a0d4215f83ff4deffac4425498911644913f278dd03c39ca6b SHA512 bdf83812e1bfae0a09dc8ec1783173a1ab43689fbe1b2421dea3289a5df7181c3d54aa010e7c4906dd056522faee7c49b1ad43426f3b146c3b35d58da9f0767d
 EBUILD twisted-17.1.0-r2.ebuild 5740 BLAKE2B fd9fb6bda70198bbd29b94445e67ebe6406e2d478094c20b012493691854d68bbcbc08bcb2777b1e29a54811dc159142b62982836530e3a842518dac16cce67a SHA512 7262676cea7fcb550f60c856ff0a1e864a9f6f3eb913d6b8f7d0ef1267bcd3973101cc531237e4de458152140878618dbce3837aa9129b4571ad9f5fd6851b65
 EBUILD twisted-17.9.0.ebuild 6017 BLAKE2B 98d5b9890447814a726fac7ed8071d52d2fd1276cb8eb42fba1110862dcf5218d873e416490d45a76408b5b38ff3d30fedfb65bd284ab081d94a749b26126c36 SHA512 270140ab20064d4ebddb1b5c4c2d3771efca222bf6ccffea9660256e1c640556e3f19362c0126c8c6bc4c97ff15e34d23caee9a2f3ea004cafe8fdeb553af15c
 MISC metadata.xml 1429 BLAKE2B f6bf7279da38a837c80fff9f9319d5c2d3893fb4a5a17d731b170153d1c4e10479b58a6576d84fa59ae653794aa017862a4fcb11bf1bc6ca85c374e3b9dc7cd5 SHA512 1ddcc6bb727f97eacb712badf834ceca15a4544e340090622774bc0e781f2ce1a20a96f8b5018535998e9865204697a25ab84eff87c480246fe14e39ef9411ed
diff --git a/dev-python/twisted/twisted-16.6.0-r3.ebuild b/dev-python/twisted/twisted-16.6.0-r3.ebuild
index b5cf40e4777b..069753121ebd 100644
--- a/dev-python/twisted/twisted-16.6.0-r3.ebuild
+++ b/dev-python/twisted/twisted-16.6.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,7 +19,7 @@ SRC_URI="${SRC_URI}/${TWISTED_RELEASE}/${TWISTED_P}.tar.bz2
 
 # Dropped keywords due to new deps not keyworded
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~ia64-hpux ~x86-interix ~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 x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 x86"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/vobject/Manifest b/dev-python/vobject/Manifest
index ee4492ac8fde..0ed76e29a360 100644
--- a/dev-python/vobject/Manifest
+++ b/dev-python/vobject/Manifest
@@ -1,5 +1,5 @@
 DIST vobject-0.9.3.tar.gz 57744 BLAKE2B 01a9083faa7f2a84e2f6f09d9f9f14afb5558d86aefb1a9d5c7e3c8f0e664d6a292f79a340c1a32e510637784cdfb0f02d713e0bcdbb99d1531c50e742192063 SHA512 d77dac2e885ea752e900a2f6e3d9cf24fdd3365d1e9e2ba51c5c38b2889a62aaa61e5562799eb8063b5d4ded0bcd43108cd7e5d028cf7dbe72008b208b8e2e76
 DIST vobject-0.9.5.tar.gz 215577 BLAKE2B 0312a0c1377ce8141e32422fbf9b4dab253398ccf83bb530929ac052537213b065d7550cd0d926a52a00e27271faa942797b65899fcbe3b8b955ca15c6a114a8 SHA512 087b394ad6c48c359ee1cabb90cbc85cb305ed9e65199f33c19f386c7075b70273e5fddcf7fde5356b140ead7a581efd917594e4d493e720c4e1a632f797acc7
 EBUILD vobject-0.9.3.ebuild 784 BLAKE2B 4296e4516e0c0d4a57c09c78362c6cf0b282480a9b20bf502ad2eb3c00dd4b27e5193aac0000b3210b53ec5405f6d1c2c9a2541024d9d2d8b7a571bc1e16aa52 SHA512 b5ea279b288290184a0eb28ff7de1453b26d23fb125ae5a28ae133bdaf808cb223fa73b4797578b530075516bbd36e63fbd4c9c9933ebf5e61e98cf3dd3a1380
-EBUILD vobject-0.9.5.ebuild 791 BLAKE2B 2b2f0b443b3c8494daace7c77e807a4134d7e432495366188a85038341515e6852e86466589918f003e79d2fc20977c2b9d0770df0e4a9f3b844602c1f5a9776 SHA512 d76f744ab8bc815e67e1fc514123d8adb655082725d4be5b8f42401dba63eae92f93005e18f94b80f27383a12c3fe5a37954d7de1a9de76cac2f6d4899be09ae
+EBUILD vobject-0.9.5.ebuild 790 BLAKE2B 4d092ed16b1f0b485a146b72eb7a3d496b30be69cf5c9937275e12f4a019f299c0b17caf91793cc641aa799c9b734f78e560a6ba3d972158f322451a141c53ed SHA512 b17e72979bc2ac21c8151822aee0801f27e7e2b232b60d2fe73fdda162fa9f0cc86a1d9c0f3562931847a8d9a7802cf96e1b79cf814961401b088cf2465323cd
 MISC metadata.xml 322 BLAKE2B e0e386d11610176cc9b83ec3e1c6cf3d53306b01dbe272be61538592057e125ae6eb196e60e8c6588d80a3f8413f9f5bbe9e373f7e6670f1bb53bd043cd9be39 SHA512 d50380968c2886e5fb7971f90ee38189b9f325513eb0e0e039638ec0b466b3c54c20be5ac056a49fd28923e061d658200898f26850dcbe2c0d58114c0b732a02
diff --git a/dev-python/vobject/vobject-0.9.5.ebuild b/dev-python/vobject/vobject-0.9.5.ebuild
index b13153afb95d..18b00caafacc 100644
--- a/dev-python/vobject/vobject-0.9.5.ebuild
+++ b/dev-python/vobject/vobject-0.9.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/eventable/vobject/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND=">=dev-python/python-dateutil-2.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/voluptuous/Manifest b/dev-python/voluptuous/Manifest
index c926fca3c767..d2867257e4ae 100644
--- a/dev-python/voluptuous/Manifest
+++ b/dev-python/voluptuous/Manifest
@@ -1,5 +1,7 @@
 DIST voluptuous-0.10.5.tar.gz 41436 BLAKE2B a768e519157ed6999a67e7c759588c4558d3e694e4c5d4a1da0567737d249664e985661b57f9f8595fd7cf5f1b0d05d511616d6d44604443b948bd414b334412 SHA512 2024121c56a91cc3bf5102ca68f8347461b2041da9a352eade0e0ce3657d9a477a60a7a5823e8f3628eee7b327840b5c4eba13c106ea49ea91a553d6b5edd363
+DIST voluptuous-0.11.1.tar.gz 44346 BLAKE2B c0715293fbde6ce9008916d6e016d52920eda1906dc2ec292deee4b6b9f596f2d50592486b5a89df6a90e0512973e12cd69482e55f6c3a96ea0cc4b3e52bc77d SHA512 7e2f3ea122f739944a7820a536551abc45df9847a0c3daf5527eabd781b904706ea708c885d724828cfdaaac66774d2f8e7b42d3376de1c78ef2be9f535fd58f
 DIST voluptuous-0.9.3.tar.gz 34097 BLAKE2B 801e11f3318ca091909a0b9fd6085bbbf2d85e6a492bfe957868a8efccf98eb1f705aff8beacd8189381d814f20b1a34cc783098ada17b27794ec663c627a995 SHA512 1c82f9fdca1751fb3e5fa1a0c956e40e3c5ba76623a97f38dee7511c4dac430432f8f0469e1b08d6057056905643f98cc5b19c040386eb5c897dec1940c4eb45
 EBUILD voluptuous-0.10.5.ebuild 526 BLAKE2B 88924b75d02810542ac9336dba0243598b266fc8d6399db1c8ee13d48d9a8aec67b3c7e51eab682ebcc93cbc35c8735eb9fe7db3f1dc43b947c5b1e2c00a8ce7 SHA512 72af81709edde0c895c8572370fab008933c8c3a00ba37883be2a38c0fb98b5159bcf86940e0d4ae93359a7a5a996fb55445b86aeef1caa5483ebbc1a4ff25ae
+EBUILD voluptuous-0.11.1.ebuild 528 BLAKE2B 793c060d06ba20d763a7fe734b6ce8c6557aaf48224b4b5eb22cbba408f3ec725bd1dce587f1c449329405ed06c6d45aa004f8484c0554729b4e08023a27af1f SHA512 f5727a683acc7755168b74ab238b0ea00b0eb824d3221ec0ed0c5ce7d45eb2f491e47b2ba764edab6a3d59ac3b53a1c6f5ccb2a779e6499e426146a6aa018b62
 EBUILD voluptuous-0.9.3.ebuild 526 BLAKE2B 88924b75d02810542ac9336dba0243598b266fc8d6399db1c8ee13d48d9a8aec67b3c7e51eab682ebcc93cbc35c8735eb9fe7db3f1dc43b947c5b1e2c00a8ce7 SHA512 72af81709edde0c895c8572370fab008933c8c3a00ba37883be2a38c0fb98b5159bcf86940e0d4ae93359a7a5a996fb55445b86aeef1caa5483ebbc1a4ff25ae
 MISC metadata.xml 590 BLAKE2B 6d6c101d04be60962c428dc495959500a2a80aab39b7353cbd2694d27794645766c1b92b1ff09f9d8c72c5cedb4f07472a94945e8a48263d44b0134a6a0eed2c SHA512 ff4732c5a379f2607a97a45c56def4955bc542446c5545ff807138eed3992d71ffd4b3638f122accf1a272537c071ab0304717a43706efef191dfc7b35422bab
diff --git a/dev-python/voluptuous/voluptuous-0.11.1.ebuild b/dev-python/voluptuous/voluptuous-0.11.1.ebuild
new file mode 100644
index 000000000000..3b1c08000c52
--- /dev/null
+++ b/dev-python/voluptuous/voluptuous-0.11.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python data validation library."
+HOMEPAGE="https://github.com/alecthomas/voluptuous"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+python_test() {
+	unset PYTHONPATH
+	nosetests -v || die "Tests failed"
+}
diff --git a/dev-python/warlock/Manifest b/dev-python/warlock/Manifest
index 08d7331b0e79..b9c4fc7fd47e 100644
--- a/dev-python/warlock/Manifest
+++ b/dev-python/warlock/Manifest
@@ -1,5 +1,5 @@
 DIST warlock-1.1.0.tar.gz 7879 BLAKE2B e132cad7d2d89845f255dca0ab16760c403c375ff89c2f2e465047dfdbe56677c5e52490dab056af6b8131758eaf9abae80c779da96db697de1173901ce4f143 SHA512 57353cb21ee7245cb27f29193d8c0987971535f1bc9f7a8914738ec15cd5712cf7001eae379041c0188e489365f23b0190dc13799b57a117b0bd3ed62cc2e30a
 DIST warlock-1.2.0.tar.gz 8210 BLAKE2B 61e7dc9e033d0893b93eb2e9e82310366dfbc6aa37a15bddbe72cd3a48329be6d5a1b44dd095235f8f828a4e365dbb9f6964e064ef2025c91ca46e6bf119ab91 SHA512 775362a80be7ab37d3a856947cc930e6be74d2b86e59ce44c9e24e54e111288dddae17f7d8b8885ea3d4cfa5674d327149d725a3acf4fc7bb48b2f63f5db63dd
 EBUILD warlock-1.1.0.ebuild 1019 BLAKE2B f70e76dcac96f704588001ec47ccdd55f25322c0b7b7e299a9b1804eae5289c255a9e7801c6ab0285a7875bb501f95b31f201b4e48aa0d5d728f229c1a1049f9 SHA512 5520db2be5af8ed45cae5fd2490be989d224eae9546fa3f43872b63328f521f2b1cd5745b778ffa4639dc5676dc2fde156e3899c2308b7fd387806e4dcff9160
-EBUILD warlock-1.2.0.ebuild 1021 BLAKE2B f3649bcf26cdd95af3b2ce019172ea83115ba240591efd6ae89f3be15029efdefcbed45d2aefe876f958a6cb40e84e58321df06574dfa1ef20a6f1f0863f7460 SHA512 3e64d818893b0923db0136e4b916c451b9812f33d994779b3ecbcbf8ff2c2aa60bd3b014a65695c9f61740360d0088987558bfa9a2829808c48f0bd77c597331
+EBUILD warlock-1.2.0.ebuild 1019 BLAKE2B f70e76dcac96f704588001ec47ccdd55f25322c0b7b7e299a9b1804eae5289c255a9e7801c6ab0285a7875bb501f95b31f201b4e48aa0d5d728f229c1a1049f9 SHA512 5520db2be5af8ed45cae5fd2490be989d224eae9546fa3f43872b63328f521f2b1cd5745b778ffa4639dc5676dc2fde156e3899c2308b7fd387806e4dcff9160
 MISC metadata.xml 589 BLAKE2B d4c6019cd5e0683baa797b05835a7be6f335b5ec5fc16464e910a8cdd777c21678a319829b4893710a44a82d1194dab59656f9138cc792c7eef285696668c8e0 SHA512 35d027f2d7bb036d8b017e1c171839e7cb926d5764da9e61b3acc72a94419e850c87523a8b9852639d5cd6a6cef1e814dd65192a562da0a45c203968d5f152a7
diff --git a/dev-python/warlock/warlock-1.2.0.ebuild b/dev-python/warlock/warlock-1.2.0.ebuild
index 32efb1044c2f..603f73882af5 100644
--- a/dev-python/warlock/warlock-1.2.0.ebuild
+++ b/dev-python/warlock/warlock-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"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/watchdog/Manifest b/dev-python/watchdog/Manifest
index 435f1f61f860..c7bf947dd549 100644
--- a/dev-python/watchdog/Manifest
+++ b/dev-python/watchdog/Manifest
@@ -1,4 +1,4 @@
 DIST watchdog-0.8.3.tar.gz 83154 BLAKE2B d5d0635e83bbcd31544d5ea5811c2f202b0da76bd7a4086e8fc61e3293640e701b04599f95decaa82bee3705dbd6b91ad24b9dbd20edcfc329913600c8a3c932 SHA512 61f1db886e8e9a6d78b569329f4d5944c296778a5a34f94fbf115a748fb4c3be422bf4d3cc828e22fcdcd380fdf9009f5bd91a8a5edc87089afc58297a0b946f
 EBUILD watchdog-0.8.3-r1.ebuild 856 BLAKE2B 9c906c5c618f0f2649cffbd79e5b289108ded726af922a3e649d3fe82bf320943409fff5e7dcfee1d0a5028c799bdf41ca6b593019fe02776b1cdcfa08091f02 SHA512 023d639b51945dca4f7b42e439b3f2e4844f1f6d22c49ef91182bc2b899947b133c1703ad0ecfd35f7e519d724ba77cb635102871b8c08514a2ed4cfc23794e8
-EBUILD watchdog-0.8.3-r2.ebuild 860 BLAKE2B d87ed1c6f653a517cde300e9ec684e3441739fa601ad87b8eaeeb926970af7a0a6da3ecb9f704a4a45f3c87e023d1c42770b69b8b445ec639074182cddc86274 SHA512 2118bda05d3ab36baccfc6872909f0267fa02a718d63cca6aaf5767a20a91119ffc5fc4b8219ef5d71897d7a10e8864c1a8199900c562276047fa2507e80d65b
+EBUILD watchdog-0.8.3-r2.ebuild 859 BLAKE2B 16b099331686416d7707bd402de669a7e613620bad0da69a5df86069e470a60fcf33c475e610e3c694ab3753b1f994d1d00acb18c5006a5e350b362fdc035188 SHA512 ec427dfbe7fd821fa81bd4aba8af9c9d8c1ef2b5c46a2ccf8db9e802b8cc14f3001afa67907bfaf7b30e07f2f4868d1c1d17cd3e7f0904dde2edc42cf77c2147
 MISC metadata.xml 384 BLAKE2B 4aa02b5d26bb82f0f0ef9d7369f984114d6b0de77f662ec150e6433324f4500b5b5004b626e7ce3558dc1190a31cbe788793ddbeab4a10f13d2b9be5de36e77e SHA512 0883ee5d6169f36b061be829e7b2e4a69f7efada9f7a2b446a9baad15c8e119d24a7bb3d80bf253a760332bfb8a03ef06b3bc91cb97b7a86d0773252fbc3db90
diff --git a/dev-python/watchdog/watchdog-0.8.3-r2.ebuild b/dev-python/watchdog/watchdog-0.8.3-r2.ebuild
index 3c4516b250be..0a674eebc4b4 100644
--- a/dev-python/watchdog/watchdog-0.8.3-r2.ebuild
+++ b/dev-python/watchdog/watchdog-0.8.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/w/watchdog/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~x86"
 IUSE="test"
 
 CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
diff --git a/dev-python/webob/Manifest b/dev-python/webob/Manifest
index c04ad169a839..45d69a938dbb 100644
--- a/dev-python/webob/Manifest
+++ b/dev-python/webob/Manifest
@@ -1,5 +1,5 @@
 DIST WebOb-1.7.3.tar.gz 216028 BLAKE2B 66af12ab34dc9a18555c6e480099a2c9b9f0ba8eb8f1e1066d501dea9ed2ff541c064bc40bfc74c284fef5f06281178d4d631b33f29c04d43da9c8e3bd138d0a SHA512 23a51f184754c525dc293b8b71855d40f52445c0df5434af7ec091219e0ea81be162623157b6ec67214cd151b25014bf86991246785816ebcb5a0d1eec9479a1
 DIST WebOb-1.7.4.tar.gz 219331 BLAKE2B fe046905bf127dc8fedbf2b993e83b3614cd62ef614add939d54e241ecfc9a9ed77cfa5b961b436105c72cab36e885f94d604cd90909cc4ada9283c7a098a8ca SHA512 43685daf6dbba5daa99e4fabfb930495b8c2bc976e968d93af7681284cc127d7012f8423b2986dd7daa10cbf7b3803aec442c1ef88102e16cadf07efe6714d1a
 EBUILD webob-1.7.3.ebuild 1077 BLAKE2B 12f6a8e304b0678fe15004a4b42724100265008531dd1ebac45e1d00665010a471f911d59ac34ef1220c81b790d237c0a0beac8140334e9ea06af100a54ae5bf SHA512 34570cd82f3148a464fe96c133d9d9bd4f502b7f2f3d51c94328735bb95d24458aaecd548203fd4b987dea3a143d455cca569933f1a4d4072bdaf4f010b65e58
-EBUILD webob-1.7.4.ebuild 1086 BLAKE2B fa41fc836a24f290028064f17c2d56956d57a5ae9dff73b62db0028f62a0be13246dfdb81d11394dbc8a2f5a85e2d4976d3bf3e2546c93887b38c227dce90666 SHA512 59f6b81474005b647c66840494927aa597f2ac06e06b915556bafca745eb1b7f702f2729053db68357a53f05607da93e58a2d08bce405a7b5ad3cd6c19f999a8
+EBUILD webob-1.7.4.ebuild 1077 BLAKE2B 12f6a8e304b0678fe15004a4b42724100265008531dd1ebac45e1d00665010a471f911d59ac34ef1220c81b790d237c0a0beac8140334e9ea06af100a54ae5bf SHA512 34570cd82f3148a464fe96c133d9d9bd4f502b7f2f3d51c94328735bb95d24458aaecd548203fd4b987dea3a143d455cca569933f1a4d4072bdaf4f010b65e58
 MISC metadata.xml 308 BLAKE2B b14e4d8d46fb386647015b3ba5028f737f440f53e8a13d3afb4b9f418fccdb902f81728c825f65969577d765140230ea623ff66814b12789d45f22e53ae48534 SHA512 cab03951839671b7600ab7903e1b27c98a02101d4a5f34b6a2382ad8f925049d82e4e4ff32c904d4dfcd7f4865124d7adf194933a5d2790b9f3ce1a9478e8234
diff --git a/dev-python/webob/webob-1.7.4.ebuild b/dev-python/webob/webob-1.7.4.ebuild
index 81a696118b19..560db4eeab6a 100644
--- a/dev-python/webob/webob-1.7.4.ebuild
+++ b/dev-python/webob/webob-1.7.4.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/websocket-client/Manifest b/dev-python/websocket-client/Manifest
index af5abfc3bc17..aaee8a06e4c5 100644
--- a/dev-python/websocket-client/Manifest
+++ b/dev-python/websocket-client/Manifest
@@ -1,5 +1,5 @@
 DIST websocket-client-0.37.0.tar.gz 194246 BLAKE2B 805482524b603fbfeb1039bcd99d761d125504a0f8d1a69766d4f586da241efd9d07ade030152fc51228a7333c97313fb98483de95808f81cfa23e7c3b0ff1d4 SHA512 b72f18c91d9a51a1943fc798601bcd9eac8b1ce807a2abb72b7cf897da30de808160645d9c7f3eaf2430e739cd0c6c01046c452f43c61af63afe7d31d801f9f7
 DIST websocket-client-0.40.0.tar.gz 196203 BLAKE2B 303aeed5bfc84139adfbef3f3198512172220d2670e38683d660def19dcd82015bf85edd26a5aa029ba021c1f9496dca33e5ee8afc790b87eb1fa7b7b17c9aed SHA512 b57593e14087ff36ab2133fb8077aa207bcdcc04fa82d00eb8fa3b86bdf7fa949c8ca25317a7fe035ef0f36d2c996e036d2b715399813604d5593584d409a5eb
 EBUILD websocket-client-0.37.0.ebuild 813 BLAKE2B 8d81381517db67bdda79dfe57ceba323705d919e4bb3ca261d678a76e30c628ae3ec818e6b43e31c36634c80c7b9b07c5bd9e9f4baa0d1eba442d6df3c21be74 SHA512 f3e7b1d8105ff0100dc27ff772cd08659714bd62f737e0dd9824e10e534b4bfe193acfc1970c3bb235a5a5cd7cf0a72884862a5fa043ade1ea33f8f7d7f561cb
-EBUILD websocket-client-0.40.0.ebuild 815 BLAKE2B 7181ccf672b096d9afcf7854e90e87b78dd530ee8dba72c0eefdf07363627e73ce9e0f73b92b668d177771decef3b100ce41026884eec8150053d7dd3f156b7c SHA512 3baf65b9d3aed56a3e3e35926aa19a0abb9cc021874c8ab2469eaf622e4831bc6c12ffcc9cdc2f7ce1a6dbefceea8197881f634b9e8b155e72e5e0aa7eaa154f
+EBUILD websocket-client-0.40.0.ebuild 813 BLAKE2B 8d81381517db67bdda79dfe57ceba323705d919e4bb3ca261d678a76e30c628ae3ec818e6b43e31c36634c80c7b9b07c5bd9e9f4baa0d1eba442d6df3c21be74 SHA512 f3e7b1d8105ff0100dc27ff772cd08659714bd62f737e0dd9824e10e534b4bfe193acfc1970c3bb235a5a5cd7cf0a72884862a5fa043ade1ea33f8f7d7f561cb
 MISC metadata.xml 381 BLAKE2B 38376251dfd5b2c36da7d0eaf8ba345c19fbe4d402d289a3d694f7278ec51508b1b5942c4d21f01c70243015a275dff8cb433bb45112894070d710df893e3d17 SHA512 605cf450fc8c22c4280f98fedc9c60d7764fbc9abbab6f2203428f3040a436813ab6f8d9c9ebd4b978f984e63c1de2e3c70e51fd701d4c03686236142c2cf6b8
diff --git a/dev-python/websocket-client/websocket-client-0.40.0.ebuild b/dev-python/websocket-client/websocket-client-0.40.0.ebuild
index 42f290186c23..112cd5b33c35 100644
--- a/dev-python/websocket-client/websocket-client-0.40.0.ebuild
+++ b/dev-python/websocket-client/websocket-client-0.40.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="examples"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/webtest/Manifest b/dev-python/webtest/Manifest
index 72b60d05903d..4056b1ba31f5 100644
--- a/dev-python/webtest/Manifest
+++ b/dev-python/webtest/Manifest
@@ -1,5 +1,5 @@
 DIST WebTest-2.0.21.tar.gz 66866 BLAKE2B d2830fcce7fb4b91029838806952e3e9c6916c3b292c7142138f30486d936b4a1f0c2d28a5973b0c351c64e499f343f3711296c6e37c38548e3a81b108163a17 SHA512 21f58ee9192fd0eb0eb2d88179ffc015aa5cf04c8004db251bd65d13d54c34b9e6b5fc9fdd8e9fcbbc18fcfb2be714c0691b2ef034318861262f8705b4a44610
 DIST WebTest-2.0.29.tar.gz 74620 BLAKE2B 7fc68f1178b1abb0a0f126112b846853762ad78cb060718bc340f5ba17517180b7283f384503ff77a2c7396645ebe2d5528dbc0f027c5d44beb002c4204bf894 SHA512 319700d1444f6a681f8ed8a4ee8661ba0462b3f4bfeb7510232f58be92e017066da3bac494ebe1a3c5b9f2d06c025e08e6193277e13c6113e9485108d4ccd2d2
 EBUILD webtest-2.0.21.ebuild 1809 BLAKE2B d8d055572c11fefb4ee45b77b78824f7e83b08e9afef65dff29ab1b4b9eeba732270eb96b3b7cd3e923520d8f1410e0e6f49cdc40bdd4e356d1ac05c64d0eada SHA512 b15ae56321a6202bbf1043349f52ab2440ce755cf04c634bc1d5a4181f14c85702b4d7187024e0bfebdbd8c7c513cea01e961f147efe82560322491a4acc0700
-EBUILD webtest-2.0.29.ebuild 1781 BLAKE2B 2d6a197825c7a15d2477482bf34a3886f43c27dc336c79c603851794358281a8592067aeb0667b63f0fa181d13fa42abbaac4511ae3343c3e46b15cc926a370f SHA512 402f445f9657b263f26edd4760a5b7788f6ede34cddc45689344020085b6399c8596a336aaa8c6d3907693e3af132d0cb027427587ba69a9d9c15bb935217381
+EBUILD webtest-2.0.29.ebuild 1774 BLAKE2B 8488defe724dd88d29e721aae53e5014678bebf01978984b855182f1a27b74457ea24049ce4e3bb993055159e0fb3ee59faca080dcc98303156c5de6af66f3e8 SHA512 120c9eaa39888bd2c7813444992a5e44ecccb50d9c2594fc0cbc6c0532bc598645fb39dea9cac647230bcc5a588b9b4a4e08af646b3fc4c347e60d46baf38961
 MISC metadata.xml 310 BLAKE2B 34f814fb04671947a228986ee91f8eaafec5a2931cdb87c63b8e135130dc60eff1a2fc2d15f0aba767fac07d853ffcdc339dfdd02495ccc40830b5452b6173d1 SHA512 0fb6e471cf00fcbea309bdb63d23c5917250f2de2e3e245a91d6ccf1258123ee6f0a8c3f311c526b7f9062c6ed93df1c89f44abf16879440dd1dc81c7fba2743
diff --git a/dev-python/webtest/webtest-2.0.29.ebuild b/dev-python/webtest/webtest-2.0.29.ebuild
index 179c42060fc0..a891f5791bf4 100644
--- a/dev-python/webtest/webtest-2.0.29.ebuild
+++ b/dev-python/webtest/webtest-2.0.29.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 ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc64 ~s390 ~sh sparc x86"
 IUSE="doc test"
 
 # nose<1.3.0 appears a leftover never updated in requires.txt. tests pass fine with latest
diff --git a/dev-python/wrapt/Manifest b/dev-python/wrapt/Manifest
index edbaa84eb62d..d9b253829bf1 100644
--- a/dev-python/wrapt/Manifest
+++ b/dev-python/wrapt/Manifest
@@ -1,5 +1,5 @@
 DIST wrapt-1.10.10.tar.gz 122052 BLAKE2B 216c3cf5ba3b91d2ed6c71c3a131242e8e668394b429e13d1a0ca3a0f806d380ca4e1a1a1d17ea029643fbc0d56defdacfcc9659a9eb1df67771dc03cdc7d292 SHA512 e18283cac7bbb137f43fa8c2839fff14072db1fdae57da2b393a5db4007656706838b64bc6785cea25602205b595fc4e7fe033e580d2fb484fd8c77351e046d1
 DIST wrapt-1.10.11.tar.gz 122499 BLAKE2B 1398bc84e3d5490ba6e6f6f386d5eb6439ec750a2a1c5c29acf91e87a9c9405b11ff10dcb56e4aa28d07d34f7a56fbe9154d2f30556f5a2ae4f1a0986033e05a SHA512 cc051749341bcd6fc1a950607fad94f74334a00acf0366129470181a5af7a3af32a26e5c5deee9242ee12bcc7e4c47dacb958c514aba8a764be3bcc662845b98
 EBUILD wrapt-1.10.10.ebuild 1005 BLAKE2B 8a6a13c76f4294ab4bccd5e990ea3a0c3e8ecc78dc19a43eb83d0b0789ff6128b9efcd19af7047997cb105e1f0c739d872dbf122778be032d1b639926250051d SHA512 1dc3a85bf196351bea5ed15cedf09e0c13ae3d22bc3e6e0bc5847fedfc63fffc171e0f0cf81dc859763262f9d10a25f870fa96acec20fb81ce2341b0133b894a
-EBUILD wrapt-1.10.11.ebuild 1046 BLAKE2B 2999993e485f2dcd9a144b93527092c94ebb3b428e2ea7b07416979282db6080f3517d8d39a2db80af09df4deedd0f424888d7314176734c62b9c2f6ca7f1ca8 SHA512 4b8481c99e9ae070f1484cb503a1e81ff16ee7f93063afad2fd06c3fbfa6e896b9fb8e95c626bbf71d2465b800e5b4d63bb4265eeb15879cb0b5e4fee8e4944a
+EBUILD wrapt-1.10.11.ebuild 1038 BLAKE2B b40dfdbbdc99443c6879ee66be2043301d4737873d8b70465a01853bc9b57d9c71534c1cd9d821ffd6d1183e9ab6ffb9c804ed3cfebb03c5998613e8a81647b9 SHA512 023bbb8d8003d0042154fb629886239afa2cd3ea210956e5f326958750a59a2af2e92939cd89e07414fb684df5019d74f06fac364c6e4343b07fb59865882bf1
 MISC metadata.xml 369 BLAKE2B 6a901e590d47a47fb9fe27cafa1708f61f0a3285b651ddcb138ee1fe1add01a163a031dfb9f37b6706fe1712a9da42903317a7560915be98524168e7dfee438c SHA512 2e999c320cf8b1894ef8efea6262304c7902e37692cefb376c36a16cf457133255a8f7c709e329232614fce918d65a82b61f2f340fdc277ae8d1b37c6d60a3ad
diff --git a/dev-python/wrapt/wrapt-1.10.11.ebuild b/dev-python/wrapt/wrapt-1.10.11.ebuild
index 2622cfe2fbfd..755a87a641e3 100644
--- a/dev-python/wrapt/wrapt-1.10.11.ebuild
+++ b/dev-python/wrapt/wrapt-1.10.11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/GrahamDumpleton/${PN}/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="doc test"
 
 DEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2018-03-31 10:55:17 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-03-31 10:55:17 +0100
commit	75fc75ae1f0481ffdb78450e801a9b443ba641bd (patch)
tree	cef96ea0860ae39a202bbf1e226100335209627d /dev-python
parent	1173ad5704ce725916e0c332416aff326d850d06 (diff)