gentoo resync : 01.10.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-10-01 23:05:41 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-10-01 23:05:41 +0100
commit: 2e34d110f164bf74d55fced27fe0000201b3eec5 (patch)
tree: f00ae60197c58f84ad51f60b210738d9b70f555b /dev-python
parent: f70a1bfc721336d4fc7dfb711c2f518a6b18cf16 (diff)
90 files changed, 390 insertions, 524 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index d58c6a5c3540..8f807469c58e 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/aiohttp-cors/Manifest b/dev-python/aiohttp-cors/Manifest
index 84e1fd023857..53705451c388 100644
--- a/dev-python/aiohttp-cors/Manifest
+++ b/dev-python/aiohttp-cors/Manifest
@@ -1,5 +1,5 @@
 AUX aiohttp-cors-0.7.0-py3_7.patch 991 BLAKE2B e2a08dab701bd31e4a9008c8f89ae97508fb6b99b89db69a05b731849e09c6f04e8b148d82d38f2093e00bb9bee03e45f230cfc8eff4b71ca7797a95524732e2 SHA512 efe7c488d9f30da7eebbe355d86c603657bddc75c88f5cd1bb4b0e76b17f26f5827cc2f42ab8766767a4ad16c08fa636a4f61e50a8c478e7f32eb2567e26427c
 AUX aiohttp-cors-0.7.0-tests.patch 2422 BLAKE2B 4660be793987dd0cd5c945703aa4d6d4b499ba0ab1c305b80e26bac9cc87d811131f6ab179e402821740f193bbfc86a384b58e35aaa453fdfd5d4db3bcc44b23 SHA512 b3fa463b87a112529443f516fe1c37ffda092e8a0133a6d37f407519e32842f65773c87e939082591edb969ee243170be3a4828896ec5ffc1150c3f43aedd9d5
 DIST aiohttp-cors-0.7.0.tar.gz 39728 BLAKE2B 747499856272f551cf8e2e0911ff7cbb2c7cb8a1f3159327dd8f0d40cabbbd9713a1a9e30ef9c99f3f9642567c99025e049db837c89f907d6698a27005ac2632 SHA512 72e0b365b952c08a02c1123d7672cfea01063e2ff01743a71e10f804d22178edc0f1c6b7f87b7ed484ca7c24e89a32de90d0d279f2f5c060427319182f9bdd3b
-EBUILD aiohttp-cors-0.7.0-r1.ebuild 964 BLAKE2B fe0fda2af78a6440fe20ae250c877af143ca72f630d969f980c7af4469a603ccb20c1e416c146467835dbc85e6380f374e5dcca52b68b36dd2c8e8dccab66379 SHA512 2bcc8d751b266a133ac4002b25ae250000ab5c57abaf22a14af3a17c90d66e07043d7a8370cccf0899258a4e3abc651559905b183897747ba545502997c07806
+EBUILD aiohttp-cors-0.7.0-r1.ebuild 963 BLAKE2B 8d4048a18c07da623ca314449dfcb8840274269cd547685d620686623e0d438bbb646f1fe40418573c4913c1d5e436503107b8d5ce56ea4d9747691b6c6a5a7a SHA512 ad763d456cce896a7ac04cd89f344132df8ebc4211430521c6a66d9c80446f41c965b8b3b0a2c6784c496ca6ff453a89ee65aae5ea6a9d78dfa093f223fbf519
 MISC metadata.xml 453 BLAKE2B 425da23ceef20765f00fd1f15b34bf99166f66dc7d6cdc0ee74a7d6439ed912ebf79c365daf9cb50a918802706aa8782d88cee3520b1e37bf3e6505579521263 SHA512 690dfd58364f19eb58ae3348b9b2a8d64fdf4324dd26fb63cf563762f4f8368437fbae1afeeffeb0ccaeac100d793008e28b66309139e27418ef5cd70daf0d8c
diff --git a/dev-python/aiohttp-cors/aiohttp-cors-0.7.0-r1.ebuild b/dev-python/aiohttp-cors/aiohttp-cors-0.7.0-r1.ebuild
index 7b154442adf0..89ea70764b76 100644
--- a/dev-python/aiohttp-cors/aiohttp-cors-0.7.0-r1.ebuild
+++ b/dev-python/aiohttp-cors/aiohttp-cors-0.7.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND=">=dev-python/aiohttp-1.1.1[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index ebf40d1be47b..882d496c97e3 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -1,3 +1,3 @@
 DIST aiohttp-3.6.2.tar.gz 1076923 BLAKE2B 14327a0bc5b5fffdf436a4c3525e4c25d80100aa464ed652316f7724c2bea6de4ace6c27e8a2a8cf9d895673ed63ed52e8c958ad611636e1e524a4e40efa4735 SHA512 49bd3089158c05ff6312420190ccd7fed95efb4a18b8aff7497d5507c71c692080d6949801edabdcd95379ca8e6614398408118d72ff1e782399e059e2cfc1a8
-EBUILD aiohttp-3.6.2.ebuild 6768 BLAKE2B 6f4d67ce941d1c548272fe49ed8e2adeea5d080a658f15841c108692b2264cd18eaaa8c54bb52bb0de62e96ccc9450f6e6419d222022d2d7f8f365405069f19e SHA512 00fb1fa28f9e1cc71d4cad57bccceff967a055a2df264a09688bc4ac4fb68810295929c8103ab4a2c47971ca6c911693d21eb9818ecfd9fc135fa82628112746
+EBUILD aiohttp-3.6.2.ebuild 6767 BLAKE2B 0de8d4b42fd6887d14d653a53f625445b4a82bbda1013c0cf307181b62df189662f7184295e71e0e39a37bfa31e5ae3c7ab44af46f232567a9d56c5be71cdf45 SHA512 e4873b0859efece0f0fefc5d1e5ea197f13264f8a2c9990d4882f9fe2fa3484f76366b47912e979c9abbf1ef555154ba098d9fb5a22639e7b1951c939b6a854d
 MISC metadata.xml 489 BLAKE2B beb80da34848dfe7b81ed65d75923480644ecf42e2c5ce04a7f66f3e729651fdc6035054482aff966ec9f03cfbb812d3be0afd783af69e37f1002182e4885473 SHA512 d8c9e2edb8a57a3b6b02bb5314aef77dc266af6e80fd0300eb0652c59790232017d0062f5b7361b059c382d1c904f0f46cd0e672d1963e9595f3d4dc7514f182
diff --git a/dev-python/aiohttp/aiohttp-3.6.2.ebuild b/dev-python/aiohttp/aiohttp-3.6.2.ebuild
index 8576aff21c99..cf889d96ddd7 100644
--- a/dev-python/aiohttp/aiohttp-3.6.2.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.6.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/async_generator/Manifest b/dev-python/async_generator/Manifest
index 5f39e0601d1f..2ee2600d57f4 100644
--- a/dev-python/async_generator/Manifest
+++ b/dev-python/async_generator/Manifest
@@ -1,3 +1,3 @@
 DIST async_generator-1.10.tar.gz 29870 BLAKE2B 7f1bea82b1ed9ed87774f1fb42af2c58d8f9e34a02f067fad018680d46c94b811075107396b29e948fa5f72131c79f3b45544fae5aeca9f990e809db85bb28dd SHA512 3874b4e474cc7febec981f704672e233512a999e00e1672e46fe3a18e45168373fabc83142926763b7c6fcaf16948e031702d5854694aab4b5cae96b9b1ef819
-EBUILD async_generator-1.10.ebuild 692 BLAKE2B 6b41e4e7b7dde7bd455a5903923a625df428a8e85268682594f662e3f8401c880911033581ac8f50fb52c78f79e70500a2e3789b0648f6d899700e651a6cd9d8 SHA512 4f63a79843a4d43522dead01420c4e0d6e9ea6d20d9815b95cf01073496f2bebeaca0054340fd66ecdb6a09314a6bb9833ee3d00c297b4346e3b0506f7405490
+EBUILD async_generator-1.10.ebuild 691 BLAKE2B b2a88fc35f15f139c749f051abe7993072f400e3fff330040a2e76b8bdc7cd0655ac0862b6f819c05c077f83782ee4106001c66082806ac8bdff80bf5977aeb4 SHA512 8eb64b0248bcf4998b4113e6523d34bbe40c48b88e73d851dc2207d75b12b5f25e4c9bfd7c939ff5af12b452f05dce73ec17b5c704cc8736586b1d058301af4e
 MISC metadata.xml 442 BLAKE2B 93ff73ecbd80ae38cb18b2ffe11bb60c411b7f3ce36b196566e230fecda350a13d19892e672a65fd278038feb53273b39ed7eb42809bd397bb71b8eeb4baf5ca SHA512 fdd4036bac7d48e387e8ad059be940d3eb3cebcf1d6a6079cf4effe25265c3a52d360269fccd8e45f67374d2ce4c2b67245e75fd59656df92a36744265494f07
diff --git a/dev-python/async_generator/async_generator-1.10.ebuild b/dev-python/async_generator/async_generator-1.10.ebuild
index 328f79e69dc0..0bf49da1f44c 100644
--- a/dev-python/async_generator/async_generator-1.10.ebuild
+++ b/dev-python/async_generator/async_generator-1.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( MIT Apache-2.0 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~riscv sparc x86"
 
 DOCS=( README.rst )
 
diff --git a/dev-python/async_timeout/Manifest b/dev-python/async_timeout/Manifest
index 4a3c777cf635..e38d5828b5d1 100644
--- a/dev-python/async_timeout/Manifest
+++ b/dev-python/async_timeout/Manifest
@@ -1,3 +1,3 @@
 DIST async-timeout-3.0.1.tar.gz 9724 BLAKE2B f18ae75969b7048469fe22949f25ea25da3fdbf08b98a16b5d5ffe823060a75e6de9ed764727e08d4344c79426e9c89013d49522f20ed62e6fbe912b5c7a8787 SHA512 fd30842671a79edfd52c7350e7fb2120533a6d97b44975f7b071ce2cbde43443bd5bbe1f2ad0ad3ab2156e1987b9e58e0c149b0ecfea8674eb0cb78eee79c986
-EBUILD async_timeout-3.0.1.ebuild 1011 BLAKE2B 96762976a1ed2b2a794bb3fd80092756af5ced437fb5671804ba03d7b5a23f280781f84448c81109b0b16c062ca0fd697af6a66e97f28e8603465b0524667a58 SHA512 e1761c9a050f9e05a8dd8d5619333607f233c1299f0f86f777a24755ad4ecba2a19543583698d00ce4a45de18621b761a7acf67945f29637402487209622b3bf
+EBUILD async_timeout-3.0.1.ebuild 1010 BLAKE2B 7bd01071579885750bd7ad8da1cf2ffb9197bd2800f907fd1196fa6c5e0114b6f9859227063034e508a0917afa62f76a23d73695f5ac43bbe7096c81afe40ccc SHA512 45c92992ebd0772e02ab511eace30644049fd1d481e837aeffd09685741fb502006f7c9ec7cec2eb998030c1fbb0126e526d49c6b1a3f7ff50224bf2ce9bd6cf
 MISC metadata.xml 435 BLAKE2B a3bf9896730a3f697c6a41257e9f3c168154760ffba1cc5d5660a1442a3b5f5f8032d48ae0b069a412e3ef2e792376e29d3a0867a46576bf8b412acca0798388 SHA512 a7a43ad3fabf98be2d846d8a4bea1ff2a867f934e27d9f88b1c76daaf4d4195f8ffc6039f283313dd009566c732bcb0ab8a847e0b6424afdce902539530637dd
diff --git a/dev-python/async_timeout/async_timeout-3.0.1.ebuild b/dev-python/async_timeout/async_timeout-3.0.1.ebuild
index 618cfd9b570f..e89294b1863e 100644
--- a/dev-python/async_timeout/async_timeout-3.0.1.ebuild
+++ b/dev-python/async_timeout/async_timeout-3.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 S=${WORKDIR}/${MY_P}
diff --git a/dev-python/black/Manifest b/dev-python/black/Manifest
index cd8b776a05ee..58ad700c092b 100644
--- a/dev-python/black/Manifest
+++ b/dev-python/black/Manifest
@@ -1,4 +1,4 @@
 AUX black-20.8_beta1-setuptools_scm.patch 467 BLAKE2B 4dd16dde09bdb9c9b8480eff2542f11cbe712919dec6678193fae1dd2d58c646c76ecc4831a6bcbb54ed5a7f3692f61953bbb8856e8dcf6b64918ccbf32fe69c SHA512 47df09f60aae9ebbddfdf513d9b6caa30aaf60d65cd21027e965b0544085d63312dcbdc54906a0d1ef0edfaaf00f3cc753a7af3c113f4001ef4b48ca53e04c6d
 DIST black-20.8b1.tar.gz 1092546 BLAKE2B 5a0a755222617d8d551b627c91670ecc32a9330cc1197900a9d21b071d0d99ddd32e09786becfc577407ab402f6da3d8683a59a9deaea1f6b4f07b9e1e4ecbed SHA512 53d6f6a6f47027e5bdfd3909471c993480034c8aa8ae395792565b8d79fb4e3a44299ea529652c0ccabf4309d645db9179bf54efc06fee20517f479e91cec838
-EBUILD black-20.8_beta1.ebuild 2203 BLAKE2B db78e9b9cbf8f289ad0284155e20f766bc2952958834eac0dfa61568e8865e0d2fcf9e208c9574e1aeabb580283239955a937858849235c3fe034450532ab915 SHA512 2e683fbc67c51e18dea4424cd6f794796fd07ba84091c105ab5a025b83e93d1d51ff9de8258c7b9f01c364118b7dc2ec84a56a512300c9f428e887a2f257b37b
+EBUILD black-20.8_beta1.ebuild 2202 BLAKE2B 5f8b27dca69aa094f5a0e1e61e7b18005905f0eddccd06e4e05f9e0150291210cb688a60748e87a8d7a088a44509152b3c65892aa71e9cc88218653ed0727fcc SHA512 65a3c5275addbcf968f3e8a17602a4b63b2ea77f216410d6eb2a3558582f7311b22fd204ddd7ad282eec5d0fdc252748f3433865e3be7caf80d11fa59b730043
 MISC metadata.xml 255 BLAKE2B 2bb3830b8cec850703f7912f4c22f5b0abeabeed0715222bc56141779d02160773cfd0f85417c553c1cd8f2738bfeb78c56dffb8e648e572019319657646d1ba SHA512 522158915afe67937f81ba572a918a2de8ca1f8591e097da56799c97870d7c44756c1acd8224d63bd3375c2b9ebc0e1ce50816899117948a48065a27804883bf
diff --git a/dev-python/black/black-20.8_beta1.ebuild b/dev-python/black/black-20.8_beta1.ebuild
index 68248b52a45f..a9da674934fc 100644
--- a/dev-python/black/black-20.8_beta1.ebuild
+++ b/dev-python/black/black-20.8_beta1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/blockdiag/Manifest b/dev-python/blockdiag/Manifest
index f3dcefc2e52b..a6d1689e9ef1 100644
--- a/dev-python/blockdiag/Manifest
+++ b/dev-python/blockdiag/Manifest
@@ -2,5 +2,5 @@ AUX blockdiag-1.5.3-py2_7-test-fix.patch 551 BLAKE2B d7e44b823390b6338bdb2d33cbd
 DIST blockdiag-1.5.4.tar.gz 2693073 BLAKE2B 8a825742b4144667153af00d5e334325f8a3b49823355787dbd577729da8b0fc221ead14ab899ef8aef1800bbc2cdc47f060330bf0a2f2f1bcd055d172d8adbb SHA512 0eef8b3837282ed611e044ee618abca1f799b4a151bc2d7cece140c97ac728b2f3b9a3bb6877d3fed42a74e0173d0cbfd2966521c4dfb21c266975b4062405d2
 DIST blockdiag-2.0.1.tar.gz 2694776 BLAKE2B 289bbeab89dff4e8274efb9e2061b1e412e29bfbd663f64b55346ee09d09279e0813347c51b6cdc9e547b417eba637a85f7cb37f48006467bfa1c9875a113971 SHA512 07690882b05d4cf7be04245e183a7c54d9cd4acab3bb4b5e170b7b0f9229d6ea42eba4dc9fab47604c1572d3c4b09de96cffb610c0c31882b9c0b150f0e76d89
 EBUILD blockdiag-1.5.4.ebuild 1750 BLAKE2B ece073452af02fe443aeac91de5684691fd0f7cb61a59d3ffb115e68c9a4c450c652ba9ab6d0decef9bc37d44ccb4e723ecfe9702eff91a975d7e2758debd854 SHA512 14d788ec56261ac0ee8d7c9c64bdc3e57ca04e5ae1c17c114ee239846cd0e1e0fb8b1f071587207968abb4f4d34f67a7ca481c2f2d6cb5bcf8faeae211744fcc
-EBUILD blockdiag-2.0.1.ebuild 1704 BLAKE2B f0400d6b774b1b439f8de14a7633caf04847b3e99937f6926fe408ee724c9a739bc91836eebaaeb0162a4c3686e801eff95dab354bd915ffa53635d45d9ce4c4 SHA512 4dc538e420e1fa2e5089755da3fd323d183b4f66e4b5736e6877e67c654cb409cfb91caca519a10fdc4744d45771cfb939e918d97deae6df3459c547b652a37e
+EBUILD blockdiag-2.0.1.ebuild 1702 BLAKE2B 55b2a2251fc83b0d549b6e95e6d8db6010c6f124a264df1828b5414bd820f4e2fd73ce81d6567b9982545e83c4328c4093246847cb6e583f955837ffa5a6da12 SHA512 943c8b3a7db67b780db10992e30aa925639de9408cfe471f5d6a6b8d2a95802f127bd7feb0b3c556a2c74c4908652782a9f21385dd0b2edc1502e658682810bf
 MISC metadata.xml 773 BLAKE2B 898f9291909c30bee45f6b25bfd9c2746d536eb9a238535cd7b7770565f64a6a91590fcf51f52fbc6a77cd4604014c3c9a8c66667b04359f7a686a284b8aaf41 SHA512 2d7ca8b92d199ed60f2035868175afb50a01e634da31cdbf0b6d583ca75c8362d186a613edcad83f42172c5abbf42063316116b62a4e6a7513493a734f51309d
diff --git a/dev-python/blockdiag/blockdiag-2.0.1.ebuild b/dev-python/blockdiag/blockdiag-2.0.1.ebuild
index 2a481caaf805..5aff478f9656 100644
--- a/dev-python/blockdiag/blockdiag-2.0.1.ebuild
+++ b/dev-python/blockdiag/blockdiag-2.0.1.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 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~ppc ~ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 0376e42ff109..9ed88c703053 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -10,6 +10,7 @@ DIST boto3-1.15.5.tar.gz 335536 BLAKE2B e4476272346dce929be52be220ac7da2e258bc20
 DIST boto3-1.15.6.tar.gz 335618 BLAKE2B 6f3816b6363757ea1dbdef4bd710a68f07b513d2f4b6a7ad05769e2417e8b0a6752dcff8f3600f8bb419f074a24b32c9386c9f11dc549097bd963c32d20a0d23 SHA512 7357f8ac98ca1bb1983af22537d1ed939b1e51371966a7c312ec748f6acf9fbbb102335965a79cf44ebbb2b0b4db9ce859c4470f542d19ceea4513d90eaba274
 DIST boto3-1.15.7.tar.gz 335640 BLAKE2B 01becc9a36fc03937153fc7d4a37b5630bb1c1d6f72ff9420de73a05f4ef7e5e39561e4175b6f652241d15efae708123b41673d9d69453b9b902c0f1568282b1 SHA512 4b612fc51e453af77e84ddbe5d3ee8e03e25be37a2b8fe65a960c22b8ee3423b1ddf0a482a189378e470500b3fe78af615571f15f9fb8fa86147a4334ef22ffa
 DIST boto3-1.15.8.tar.gz 335724 BLAKE2B 4b034d21108bcf7fc100f71e534e348dfd72cf1ffea7e4ae53fa420e05c1e854216095e3179c4ce16c893a5bd32665830fc5ef3c3a4f0a011797b227ac53501d SHA512 dc6b9816fe58401a391aee2843698d8245141cb9735cc8b3c27181388ce8df070649e15d437ad96bbe3948061c97b0285e323c48e298c57271cd83d11180c768
+DIST boto3-1.15.9.tar.gz 335977 BLAKE2B 9c0e1bfd11408085fe758552ace077dd2db01cb29f038d1f1559f41c6c0921a19457bfc818502d6a36ce9f7f931b75a20a0f0ba8d71bf93217c7b7f1be973c56 SHA512 0d0eb897dd526c5a19308150f28482c8f84ecab6f66d0cbf2c169da44bf55765cd8ee853360867788cb6a99784100e773104fb8c35511ad18d3a058843c50438
 EBUILD boto3-1.14.46.ebuild 1353 BLAKE2B acf7d5909ffe2c1b58d3c2438b8ce995f98e092b2a76977674ad1c0491b4e2093ea53d8a1cd45b225e3577ed28847b60319a1a682d1af74c71acde7a822c4da2 SHA512 fc2ac14ce0c1ce9e7ccac46bdc9fde2e84687a7c634a784cc0ac7e99556b84f4ef3d2d27e546c445b687b93dcc293b63a5e3716ae645b01a60d8550fda591c4c
 EBUILD boto3-1.14.59.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
 EBUILD boto3-1.14.63.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
@@ -22,5 +23,6 @@ EBUILD boto3-1.15.5.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a
 EBUILD boto3-1.15.6.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
 EBUILD boto3-1.15.7.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
 EBUILD boto3-1.15.8.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
+EBUILD boto3-1.15.9.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
 EBUILD boto3-9999.ebuild 1350 BLAKE2B 32d6cf48455240fb127d359f94ab09e45ec78655fbd63a5a1f29cd5a2b3de2941599c7d7068abc186b6e25baf13456b5e52958879871a5a8fc338b87e087fceb SHA512 58d3f3b2a1c04252e9c7527ccb094ec7ca41c9191de1aab85b4f6b2c6babe0c95d43f189031d2c8d1da2b35689d3ece1c27cdced6ecdec596a286893e05a5f55
 MISC metadata.xml 668 BLAKE2B 0fd93bc75c34b2348e49e39aa58d6404fc0bdeac1129a1c5644262973b08fc3f9afe371fdf9ee87ff00fd0aaa18b86bfbdbf86394434661b5253ae9b5b9dacd4 SHA512 ab5ea5b31b95ce548c12ec80f2261b98fb0e51b34218c23bafbe7cc0ac792b0680b5886062c2a016bd58ceaf1cdebc7fabade37edae756851895257b1ef1fc59
diff --git a/dev-python/boto3/boto3-1.15.9.ebuild b/dev-python/boto3/boto3-1.15.9.ebuild
new file mode 100644
index 000000000000..ccc99e1c2415
--- /dev/null
+++ b/dev-python/boto3/boto3-1.15.9.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 84255414be87..8ced35111b15 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -12,6 +12,7 @@ DIST botocore-1.18.5.tar.gz 6852318 BLAKE2B 3aeca749a143cba59ce637935a711df14351
 DIST botocore-1.18.6.tar.gz 6854270 BLAKE2B d5d8a321adde9c16706768633a8ed32d4db086ec2634dae8e2057c2217b2e729bfd02e2968a9749d660ded41c883ac153a80083256a27496b4b59013b57520e5 SHA512 d4c3f79f1531f85f2ab793bcdeb13f8f51c333e704f404415e49f50d310a715f752f19bc4bc7ce07c5b20f19c5924008f47146f737c318b9204d8a4af4f6fe8d
 DIST botocore-1.18.7.tar.gz 6854828 BLAKE2B d4b3095d29fea7157ca8b5499726886527941e04e0c2f274eba3573acc8a8c6ff26fd734f144335e03b9bb25c9fba128bb817a68178c284406a232c1d8881050 SHA512 c94ef62d4cc89317cb13fd96f5661de8ea3b1478c4dbce039d6e3b6af6ac4e58e3e5cf2d7d62c90e5b6b046303fc1e9273041640ae4907086591213ba3f79877
 DIST botocore-1.18.8.tar.gz 6865779 BLAKE2B 5b67b67deba73a0a69d4b413bfb105b3eeae5d62a38b0f109d172652270e490eed55b42c8a67c14039aec3f8f0b8b1d1dd9d6945bf9c86d1466bf69d4dc4237f SHA512 467b8ac3c3860777efbf37868add24fc56eecf65003c03692f45669e4ece965c129e18fe3ee0e1ed75b02c886f5762186572927c5e99b3eae85724d7443072d4
+DIST botocore-1.18.9.tar.gz 6897783 BLAKE2B 7b449d58febdf3ca3f04bd75e30c3953d6701e5204578a99ce011cce28c5fb30341da5120d2c105b1240ac20dbe80fbfe958d2c5055a04b688ad099fb616342b SHA512 2cfc6c633a216ad091f02021966b3233bdb41f3bfd46c8c6f13bc7ab653024aba21eeb310c87112ad210385fc2316f77117c9ddf26ed0f0df82971b53dd7223b
 EBUILD botocore-1.17.46.ebuild 1609 BLAKE2B fce27c888fa414b4121f897eb9745f7747f70ce1968a3552c2721baec6e8a11169ce366acda929565eb71192fb2698b4e2e48a7898e1daaaf60e69574b4dda1d SHA512 dab881e9279a7125f3c478608664b198d57bba5ddfc7f8710fd84f5b965a5414fbf931dd8e931a452f1a31f0d08bc9b8ac6915e561e9062e4df0eff19239f1b8
 EBUILD botocore-1.17.59.ebuild 1611 BLAKE2B 3b63a581ad997b3d17ec4c2124b391537420fd0ef91f18f0071be34cfe13d70241006384d64fa577b1088d8e5664a8260c008959a6ba102bd13c68117618d010 SHA512 8c7cacf4ed5b422db3a065281bc26b7e582c852807df75949e8324127c93a230106a71c3dd96f09de00ee4d30f31ee8a77a97513bf7b76c1c39bc4d891748303
 EBUILD botocore-1.17.63.ebuild 1611 BLAKE2B 3b63a581ad997b3d17ec4c2124b391537420fd0ef91f18f0071be34cfe13d70241006384d64fa577b1088d8e5664a8260c008959a6ba102bd13c68117618d010 SHA512 8c7cacf4ed5b422db3a065281bc26b7e582c852807df75949e8324127c93a230106a71c3dd96f09de00ee4d30f31ee8a77a97513bf7b76c1c39bc4d891748303
@@ -24,5 +25,6 @@ EBUILD botocore-1.18.5.ebuild 1487 BLAKE2B 7950b667f687c23796dbaa4da135ee890ad7b
 EBUILD botocore-1.18.6.ebuild 1487 BLAKE2B 7950b667f687c23796dbaa4da135ee890ad7bfc97b0b4f71c393531095850d40d69137153e0e3abb2db2f017db1b7277228b2a341edcb5a164eeb7da6cdd91f1 SHA512 808a83af211652d25c6b4978f51548efe5074e1fc2b03c7193072d93371c58bc52b232db4d0c2bc3ab73313c50bf2d2412f52a6153a52d9674ef322079243f9c
 EBUILD botocore-1.18.7.ebuild 1487 BLAKE2B 7950b667f687c23796dbaa4da135ee890ad7bfc97b0b4f71c393531095850d40d69137153e0e3abb2db2f017db1b7277228b2a341edcb5a164eeb7da6cdd91f1 SHA512 808a83af211652d25c6b4978f51548efe5074e1fc2b03c7193072d93371c58bc52b232db4d0c2bc3ab73313c50bf2d2412f52a6153a52d9674ef322079243f9c
 EBUILD botocore-1.18.8.ebuild 1487 BLAKE2B 7950b667f687c23796dbaa4da135ee890ad7bfc97b0b4f71c393531095850d40d69137153e0e3abb2db2f017db1b7277228b2a341edcb5a164eeb7da6cdd91f1 SHA512 808a83af211652d25c6b4978f51548efe5074e1fc2b03c7193072d93371c58bc52b232db4d0c2bc3ab73313c50bf2d2412f52a6153a52d9674ef322079243f9c
+EBUILD botocore-1.18.9.ebuild 1487 BLAKE2B 7950b667f687c23796dbaa4da135ee890ad7bfc97b0b4f71c393531095850d40d69137153e0e3abb2db2f017db1b7277228b2a341edcb5a164eeb7da6cdd91f1 SHA512 808a83af211652d25c6b4978f51548efe5074e1fc2b03c7193072d93371c58bc52b232db4d0c2bc3ab73313c50bf2d2412f52a6153a52d9674ef322079243f9c
 EBUILD botocore-9999.ebuild 1606 BLAKE2B 15b1624c806724dd4cf8f86099a4f9049214ab9c0afa47f0211c0a5f66fe37b6ecc03db5448bfb3b4764f8eda23e19ab9f37bbe1461837bf0dccfae7da17faa7 SHA512 b5e16cf97b370e96e814c413d80793684a1579d293bbaf16b435de83af274efb299dbe42fb824c955b28099c50841c46124c8212bd539861ff01b278e6a7ee3d
 MISC metadata.xml 717 BLAKE2B 6b5923518aebfebb4ac5de56ccc51b6d665b81870d4cdd915265ddef063db42dc9b0a4814c8cec71b44cb1aec7050797f6e2ec8f2a499b6c2e16d9cf312f7fb2 SHA512 fef7663fe63c373d775e419b5b5cfc63a896adf32a177e856c42ebf1c7574b3956fa989c30428d9ce69b19ecf68e553f19885fef46cbcaf7b434e27b15022b54
diff --git a/dev-python/botocore/botocore-1.18.9.ebuild b/dev-python/botocore/botocore-1.18.9.ebuild
new file mode 100644
index 000000000000..ba67bf7ac94b
--- /dev/null
+++ b/dev-python/botocore/botocore-1.18.9.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/cbor2/Manifest b/dev-python/cbor2/Manifest
index 54466cacac36..9e927755c33f 100644
--- a/dev-python/cbor2/Manifest
+++ b/dev-python/cbor2/Manifest
@@ -1,5 +1,5 @@
 DIST cbor2-5.1.0.tar.gz 72328 BLAKE2B 22737f1ce152eb356fc937199ba83e9558b68900f8183ee8acca52312fa56499812d6b26aaaa629b6e2cfacbdfbb72f65cb7fcbe93a010320aff94aec8dc3978 SHA512 0df4f0c5609ae8d73627a64ee1544af88461b2bf829538f23d912138cf47ae8d03193644c7315e2a77318e58fd2bd61c4cb103d94ed0710db0ae5c2cf4df60b7
 DIST cbor2-5.1.2.tar.gz 73247 BLAKE2B de033651c0483aee4bb3bb31f9a997bdd6329c2941dbde65acabe7f7a3bfde37ab0322085a3107fb581e36cb6792cfb4fcf07cdbedfcec4a18a907582081d141 SHA512 81e4c3e8c727fea6db8bbed657806ace8777d8ad157395de3db7f0dab369abcd7f173f0cfad538c325a49bf90b450eab16ad2f4aa4f69c324dd0807ae0ab556f
 EBUILD cbor2-5.1.0.ebuild 793 BLAKE2B ba87377c387ec8f77e743d8238b00d507a2cbae2b7e268f35c0c663b51abb27eac8bf237dcca360176be001d1708ed3b323baa5d4893bd89d19f24cefba1ce23 SHA512 197843e9efb07fdd5ca872772ef0ce60303780a33bc6cb8b7f767158c32d2e1998ce695f9679205442710d07efc229ed0336adbb1e0a80e2e7aa4d68950aeeef
-EBUILD cbor2-5.1.2.ebuild 797 BLAKE2B 70412aa3a3404090064f5793e65d0e47acfc7b7e25de05c59220e66102f14f7e3ba1cec522e5abf1e710f70bbb1823c37d0b2284a85ca74562afe01185f3f3d0 SHA512 6af963b51a4a03403dae1cc5d3741115f528714688da6874445ac379ce4d4ff49c607a980517f82f144a90dbfe327a28dff53976b6514e483e82613903ea3dba
+EBUILD cbor2-5.1.2.ebuild 796 BLAKE2B 79259982068da5aeb4da705103a299c97f7fdee3e1bc71cd1b9767e6822997c4da8cecfa2e8ecdd66ce3ce51c3b3a29f4277a4fa8e65b69bddd8d0084010133b SHA512 58f24dd9ced093b8153af3462659a347b38b150c1a14e2e7d01a6481ebaa871e66ea1e8b32cd3343e0a3bd9ad89fc3fa4faeb525c7accd0fb1bf83da2b4a3b56
 MISC metadata.xml 894 BLAKE2B b6180631eee31ff627a9ec598c98db018c8445bed530477b2c40da412bc61cace8a22073b1b386965a8817c7b25a976b1ab535f31d99279813e4a4ea0a7b5fb5 SHA512 1ab12e51dc2a38646f3a8ff334e5833a0e1673664e9ba26bc8d9f7b0feb9b69d0b32ff232ea363d804483c18a1b23c9cd1a8dd02a18b7f796db80f383ff55c09
diff --git a/dev-python/cbor2/cbor2-5.1.2.ebuild b/dev-python/cbor2/cbor2-5.1.2.ebuild
index 0ab2f141e004..87e76d603e39 100644
--- a/dev-python/cbor2/cbor2-5.1.2.ebuild
+++ b/dev-python/cbor2/cbor2-5.1.2.ebuild
@@ -15,7 +15,7 @@ RESTRICT="!test? ( test )"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~x86"
 
 DEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/cliff/Manifest b/dev-python/cliff/Manifest
index 93e301190fc1..aff05e8f7f4a 100644
--- a/dev-python/cliff/Manifest
+++ b/dev-python/cliff/Manifest
@@ -1,3 +1,3 @@
 DIST cliff-3.4.0.tar.gz 78990 BLAKE2B d7d8209e2fe24614cde6d3e113eb0dbbba981addef045fe318143e71f9a240188c0fb74e831d868b31b6dafb4289f7beabfbb5fe1dade1df196f670c53a55549 SHA512 d625588f4eed0aeee549b4a21e604f1cb886b8c10a12df7c546a5292223ec5bf9067352b4d326d5710673dab56eec47e2fb46c9c5d5df6e9fbf026d030bcde1c
-EBUILD cliff-3.4.0.ebuild 1180 BLAKE2B f93fbf092f3a261d13b66c6b63b6df4cc695d755027c8d3e4b0414834a4223a71176d4f086aa79d97765932de78809e53adcca2025a943e7f54bc69f571cccdd SHA512 1665f0121a8ac9b984088682182402ab40fdc6a134c8509763ea19c97fab03910857713c74a250d977bfc0931c74d673abea40fd5d6e0e6ae700d8f7b7e95bb7
+EBUILD cliff-3.4.0.ebuild 1203 BLAKE2B 4bac1690e15c736c6ca79ed940a0459811e05e6264949aae242807d266c988fc09e2c0fcd69c8606ce5c54cc260b7b50a8c40cd15234d56f70ccc6f367a902e5 SHA512 26f04001fba369a2805f3e4c33ffc69953a8e1d921e88a1c63c861cebbcd1dc42204e629a3bb34b6afeeae04fc72e196192ff6b944b387299ece48562c29e9f7
 MISC metadata.xml 734 BLAKE2B cdfc9f839d8dd599e27c78314ca5688d94dc52b3128d0aca7c6ff11d8b7f5f9de9d2d43f6690543d8e44b8483899d0cc21ef7273dbbdbeca0b498b2a593279a9 SHA512 6103b640d65a93bbd2cd9cf6ca6ae42a12a0fbfcdc26dd164494b777bc976d14d7e0bd94372b84ed30f7eab3e1acb54787671d90f165cbf6b0b160770cdbcfff
diff --git a/dev-python/cliff/cliff-3.4.0.ebuild b/dev-python/cliff/cliff-3.4.0.ebuild
index 2cb3eca1cbe9..8a9b0147ca33 100644
--- a/dev-python/cliff/cliff-3.4.0.ebuild
+++ b/dev-python/cliff/cliff-3.4.0.ebuild
@@ -4,7 +4,8 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6..9} )
-# pkg_resources is used even though the QA check doesn't detect it
+# TODO: revert to rdepend once this is merged
+# https://github.com/openstack/cliff/pull/3
 DISTUTILS_USE_SETUPTOOLS=manual
 
 inherit distutils-r1
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index 8e88b0cb4340..39a8ba6133ce 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -7,5 +7,5 @@ DIST cython-0.29.21.gh.tar.gz 2088511 BLAKE2B 7a4ddabb65a519d3c71454ac8417438a3a
 EBUILD cython-0.29.15.ebuild 1952 BLAKE2B 6369461078d2d1c3b33b47a05911bd019751f60fd1a4bf9df14302e0b699bfa3265d5449b9f1e669303958141a38d0afcba0b94fd1809b8e94fd99ff8eb930e5 SHA512 78559785f85582572c633f75eabdc54bca756461ac94c7aa7a2771862abda2c5c114d776edc0e6efdd04bf76a8136a132c627bc77b67282bff86ad703ca87dcb
 EBUILD cython-0.29.20-r2.ebuild 2007 BLAKE2B 5697ac1ac8003ed42aa63c72bca396bff005570be18f52b1a796a82dabfe0e684cd9f89c42f4268e995df24e6e25ac929c8af4543c87343ed95b62eb36f08bc0 SHA512 d40ac7f143feb16f357327be4d1d29771deb488f1dccf91d42eb1170bfe05631b83de35c74b713480c4533aa443a3c68663f595c99bbc4946bbbb54d15949b8d
 EBUILD cython-0.29.21-r1.ebuild 1812 BLAKE2B 24bc7484f50b8774fa9738f97afb777c21e7bdc83e20e34f4812e6279fd72ea4f12a805c98a28233dcdfd22a8f66ee8c266230524d7098fcf031fdf6bdaa81fa SHA512 3432f5e5ab4f7539184f98658163ad4adb6b5eec198c34762fb5e432c84b786c62b42568e3151937b9236f2bdffada419ac8c7355d1801fad2bc7f502805e908
-EBUILD cython-0.29.21.ebuild 1965 BLAKE2B bc1fe06112e8817406fbfebbe38628fb977d8c244888e9545ba1d2fc28ef7e5bbd2cfa47678c66462c74185518cfb6cb6eadb8ab6008ef014a45c070a20c8368 SHA512 e545e4ecd8e555934468ef92656038a4793fbb2a892d0b2c9ffa74411b2a62a6da2635d89a826a1bd51e4bd15f637e1736a6d4e94c09f5b7d6d66a350ca57e15
+EBUILD cython-0.29.21.ebuild 1963 BLAKE2B 754d757ba3de1e22523b7a340eb20069aa103c79030849ecdbfde82bd0e8fc40568c46fde0f0603455ff66dd4ddfa8c19e10c69b803e49127e9914e726b5ccf0 SHA512 1c4da4cd10aac6720037bf37f9f80c13f290f13c1a21b839fa3061cc4767cbe6fea6ed1bcefec5fbff9ff52fd3b2a9347a502b36089097ce6beb533c971c3165
 MISC metadata.xml 570 BLAKE2B 078d948ba14cbbfb98103ee3746f773c12d35c91e64358950aa0ceb78695e19d8ca4c0c33b388c2c5cd54b83856430a8934d8a40aec74c3aa0d761e0a4a03add SHA512 73c65ef6b088cb50125dd662f263fb1aa1d60c3631aa8453b9ed2ede6bbd839235c6b37c3f8d1a17618c167874d64a3aa6f95c9141c8b6c921eaf4c1c4d68dad
diff --git a/dev-python/cython/cython-0.29.21.ebuild b/dev-python/cython/cython-0.29.21.ebuild
index 4dbf7fe71f2e..765b801e1809 100644
--- a/dev-python/cython/cython-0.29.21.ebuild
+++ b/dev-python/cython/cython-0.29.21.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="emacs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/dataclasses/Manifest b/dev-python/dataclasses/Manifest
index c761d80daba6..b657ccd0d219 100644
--- a/dev-python/dataclasses/Manifest
+++ b/dev-python/dataclasses/Manifest
@@ -1,3 +1,3 @@
 DIST dataclasses-0.7.tar.gz 35690 BLAKE2B 8d3c60d1e2ad4c9ceb3c502fa74f8fdae75717e52c698984b6def96e867cae633864de711856a69992df6a207617d17d7116f5e0daa7d757076dc8b97d7e0e9b SHA512 ff921237a99bac21e091ff253824eb07eb09be7e7ec02b869da9c68c35141fc1bee526b3d2942963bac7762827438ea8fdc89fa72404991b78d1d063a3c18661
-EBUILD dataclasses-0.7.ebuild 557 BLAKE2B c7659b1f18e0c2af9026ddcce77e9f0f385a368f61266e1176a55ed839582e02a04a615f183f82bbfcc23f981b80e3e2d0968ce957171e11466283742fdbed25 SHA512 f68b196fa786dda9a6e100f80d218ca6042f29d427e474b4faf8481436c73fd15559546f79f6e559415eca9d0ee30a4421b942878229156d0c192591b39c5825
+EBUILD dataclasses-0.7.ebuild 556 BLAKE2B 7825c31d88ca369b39f3c0b6673f71bdbad5c4177748336dae98b48a363f486d77582361c8f36f2b7517a325cbea5d29eac37a0f38893b11d1f3da72af9a437e SHA512 b6d6ca2b4ec933f9b7a1ed6b4a7d6926dca7499c63f3d9312be68eeae9a7f6bdadf0816c2926972db2d64e31a7f8ab9ec957376f9d4dfa46eb42dab15bbc70a3
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/dataclasses/dataclasses-0.7.ebuild b/dev-python/dataclasses/dataclasses-0.7.ebuild
index e76e64feb12d..1004469d2c0f 100644
--- a/dev-python/dataclasses/dataclasses-0.7.ebuild
+++ b/dev-python/dataclasses/dataclasses-0.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 src_test() {
 	cd test || die
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 721218908950..0ce94d5e980c 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -4,7 +4,9 @@ AUX django-3.1-bashcomp.patch 2085 BLAKE2B 36a0aa4d3413f13089ac104f5d3f98ecbb152
 DIST Django-2.2.16.tar.gz 8884774 BLAKE2B e65074c44e35921f6c40ca9e2a5fee53ce9a956a7503b96a33c8dbb4588bb0928d2e2b605f1117c3c75cdc84d6c7d1bfe52f4e7888fbe300adb5411a55b0ac27 SHA512 eabcdfc17e27c579001e4739268abd13bebbb018db1a7dbe4fb8482d32320b85bd16b3b18428084c0df947094f23f7cb4b12a3a55bc370748d7d8746af22bc3b
 DIST Django-3.0.10.tar.gz 8958332 BLAKE2B 0ff17da9d9175b080d81e334e46ec6daaec5e4cd48f5d9a614c84b448a6d4b93d304b3fd25bcee665d65f589a8f94cf83f002bbd7a27975d23e3516286784e01 SHA512 fcce2815f966a5eb0f7986c16d065b352c73ea2ea4fc1422d440487d84162c5a93aa45b9173ba5d62d6caee2e976a9ac818f228b47ed7f4f50deda27bac995e9
 DIST Django-3.1.1.tar.gz 9250616 BLAKE2B 220c53873a70bb30f0ea9b48a70ba71b2de517c11f238e6dc2be20b0e85c99dfdb2ea3b9cfe7b164c7141e0857f19d9d8f93390d7ef36bf34e915ccdb449e8f6 SHA512 5da4282c2ae712ecb2da654a99d46cd60c99aced90f75e681d5a0765b8c08669f27b6c38287bfe7bac028f12ae0643e2be06742752bdc83c62daf82fee60281f
+DIST Django-3.1.2.tar.gz 9387482 BLAKE2B 77e330b4b42f85ef416e90a2690c6315f2a8d30b5705f64b86f62daabe3ff60b24d9fcf8a1276e7425e5cf0e03833a5ca601d15dc3e1aa32f7b5d7a9792302da SHA512 39115e942c26c9af27c4079f590e15caa86cc5c0e012873d7be23809e39de178b2dd935919dee21bbee153bccb17463abcece1db3b1f7dfa95b7b55879488876
 EBUILD django-2.2.16.ebuild 2418 BLAKE2B 7e68722c3f2ba98ed45f231a845e6b0f0d236d6848301e154b1a15a24018931a0be015a5d229d4435ada444ce79c121b4fb6b90f2895fe1a4ca4c0ffb5551465 SHA512 ef392582dab3f7d47d874946afd93bdee2b9b3c60100c70886e096761cbb0a7730ad441e062829aaf23da82295dd7e8d492bde2ad19094561edc21d47cb4b7a9
 EBUILD django-3.0.10.ebuild 2399 BLAKE2B 2c5359a434b0d99e856e4bd2a52d7a06a85e0327180d7587024531c9624e9cfd52066fa5e1340f028562b55e2e60071cd6a6e880be833ffd174d7257ad725816 SHA512 d6bd98b753eeb2d8624d976d124a19a4774ef9a7f81c8bf504ad1e4515780aa42ed996d147b62835e0c580592aafe2e813bd0d13b16cf64ad3f8912e52fdeccd
 EBUILD django-3.1.1.ebuild 2404 BLAKE2B 73d81ca180cae72f001d6da7c1b2fad67f348170b9b906db8aea79731c6ca6764620845d9b4d6878df169548bca3e6ee23044b9545f32c70c263862b06fb2a1d SHA512 16f576b4e1c18c367c6b758ec4010656b39bcfabab96d1d881d86e715838235f38206bd0e2906040e40a7da5d48ef5d13d5d1a7688167d98677cc8410120c570
+EBUILD django-3.1.2.ebuild 2404 BLAKE2B 73d81ca180cae72f001d6da7c1b2fad67f348170b9b906db8aea79731c6ca6764620845d9b4d6878df169548bca3e6ee23044b9545f32c70c263862b06fb2a1d SHA512 16f576b4e1c18c367c6b758ec4010656b39bcfabab96d1d881d86e715838235f38206bd0e2906040e40a7da5d48ef5d13d5d1a7688167d98677cc8410120c570
 MISC metadata.xml 399 BLAKE2B f49845f5a6476a0b43cbe47ab11b298f53703d850d145a31967f512d9402048fc1b1891606ddba7342ea9613c27ace3986f6b508ed83f0c5eccb26a13fd49f85 SHA512 92470f2930b1c940ccf3478b11157adcc4b84924b0cab4e1fd8aae98c7bba14e995491ce44810223eeb3802967be68c867d0ee4ac0df9f49b4234efd1a7ecfa7
diff --git a/dev-python/django/django-3.1.2.ebuild b/dev-python/django/django-3.1.2.ebuild
new file mode 100644
index 000000000000..e13533790e62
--- /dev/null
+++ b/dev-python/django/django-3.1.2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 optfeature
+
+MY_PN="Django"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
+SRC_URI="https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/asgiref[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
+# gettext: https://code.djangoproject.com/ticket/31850
+BDEPEND="
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[webp,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/selenium[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
+		<sys-devel/gettext-0.21
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1-bashcomp.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	elog "Additional Backend support can be enabled via"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	elog
+	elog "Other features can be enhanced by"
+	optfeature "GEO Django" "sci-libs/gdal[geos]"
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+}
diff --git a/dev-python/djangorestframework/Manifest b/dev-python/djangorestframework/Manifest
index 284ded75e080..36f9ac56f019 100644
--- a/dev-python/djangorestframework/Manifest
+++ b/dev-python/djangorestframework/Manifest
@@ -1,3 +1,5 @@
 DIST djangorestframework-3.11.0.tar.gz 791688 BLAKE2B 5a3cb8a25bd400d4e030bf960d227a2cfbf4fd306b0aab6f0f6bfec4dcfa59d566c3090ab660726a15f5fc36e0c93d3163008f7a64576af91448df7d1e3f4d87 SHA512 87f02919df6a136198e6551c6d525b3cc57299581f6c098258f81d7c9096b851b9fc2af64e8ffc161178ef811f50eb0d3f068697702b73601036ea33202bbee0
+DIST djangorestframework-3.11.1.tar.gz 804357 BLAKE2B e069b7ccf60d124281f37e5533dcd28b9f4402ab7b875ff62d3c0aed72060d0ee40c5905f09225367da91a812b3be1d4bec47343b9643380c4f583ee70d8ea98 SHA512 3063441f965a98c2bdd8279d3fc300d45af032094590b097cfe31a28fdaaf1772391ae023d5229537c1f6e7ff01405e604123bf9c665cd902a26e1cf94a8785f
 EBUILD djangorestframework-3.11.0.ebuild 469 BLAKE2B 54cc48d1cc2a4cd5ea21b950d1bf3900934e7ff24c57167a3dccbb5b3a40ae045fe72ed60bf3fd3795495e313f4decb96352ca96b064278a95b03bc8b15433d9 SHA512 3f21c9748ec6b1c6bf8db5bd8306d9fbf864106d5097927aa5eed351058e7864890f2ec2c6a9cd32b97a298165e68850c1f9820f7480d25fbd409bb57c79132c
+EBUILD djangorestframework-3.11.1.ebuild 471 BLAKE2B bfc61068d374ce32592c115826b2196baf570388691096f7da502e371d57100e0255fa02910cf5f2c2fc7e6489a8bdeea56d02182f2a50d4fdcc14686171e194 SHA512 ff6f4f5deb67ec915f62c619232ff577168911cdb578aa92905d5edcce569d80814b8cb28284b311cfef0889154a18614c852c325894fa2d34b2bfc860af41e4
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/djangorestframework/djangorestframework-3.11.1.ebuild b/dev-python/djangorestframework/djangorestframework-3.11.1.ebuild
new file mode 100644
index 000000000000..def354feb678
--- /dev/null
+++ b/dev-python/djangorestframework/djangorestframework-3.11.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1
+
+DESCRIPTION="Web APIs with django made easy"
+HOMEPAGE="https://www.django-rest-framework.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND=">=dev-python/django-1.11[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/flask-babel/Manifest b/dev-python/flask-babel/Manifest
index 39c4f4976ba5..7837ccc0e1cd 100644
--- a/dev-python/flask-babel/Manifest
+++ b/dev-python/flask-babel/Manifest
@@ -1,5 +1,3 @@
-DIST Flask-Babel-1.0.0.tar.gz 49680 BLAKE2B 29adeb7b4a6892fabf6e85da9f2fdb72f3871e3c3728c7521e06ffd80d8da505045eb1ef7a30223d8ef40064bc78514f6fc9acd1b8640232adb203ea55876e93 SHA512 3624b2e4877821551267e2719d76b714bda0a1da24e5a3c36d045273039823c4f3bbdf28cad5d8e0d4f0c896578248bfc40aebee720b543e500edf6de607ad8d
 DIST Flask-Babel-2.0.0.tar.gz 19588 BLAKE2B dbd5d6f3af38fad15a4eb6d674222473d673a9002ced21ce09a913e0bce3285b1eac9a5a85ce53c1dcebf648444164f33a5c790039a7d01184d45c7734dac05f SHA512 2ad8f80b450db0cab7dd57f46158e7e653556d60869acdb3c2469d42dceca3fa97237cc960986655091c84a1a67a057d72ed510787ccb065d171e6f35764cb1d
-EBUILD flask-babel-1.0.0.ebuild 947 BLAKE2B 830deb1ecc673a4609257766ac430a048d4850ba64f67330785a8e96b405839c14b47052f8a5dfb355c95c1f0637b6a365d3cc81fca9a50e83d37bfcad07c4ce SHA512 877d3a3a50810465f059ab832916405b580c244b79e12c42e4879f9ee6f11232750cda2e251e2488e172fb8be5c1510f7d237627c000b17529770f487b6bb328
-EBUILD flask-babel-2.0.0.ebuild 925 BLAKE2B d3b5a3f1251d4159d2ee1f36869d5a162b11880e49030b4af22f9074bb4d6a3ec59728d8968a3cf3d3bf1c5d53cca525e90988d10979ed8cae52f62baace5d38 SHA512 fb0ace5636a8a2d68da208744bbdb77319fef308be985ffa32a1a16e7cbbfb452ddb58980ab386e5e0ab8e13959a9508a40251ed44d2fb63cd1030b0292edd7d
+EBUILD flask-babel-2.0.0.ebuild 922 BLAKE2B 6b92795df633b5c1f457938c34a6c7689b1d02166ba1d6504abef68124a90f66d3968bacc704c49db6b54b535b9eebb038f7669bfb6509eebd2232854a976088 SHA512 b98009b107147fd24751a6cd5d4bbf0dad7ef57b7bdc77e9c8c3b9d03c271abadb459c66dc5106e212f3442f66ad18a1f99d6a308da43360edef7b19c6187c1c
 MISC metadata.xml 474 BLAKE2B 36e79f81c6890109b98f7ab2da037e18fd85cc34f1cbf6f8ecaac683284b3385fa15848922d725feb08a063100005dc2d159066d8ff37199cfc5778474d6e442 SHA512 a1f2ada6b9ddd886fa70b3d79c6afd3c066dff22ffb7bcf8ad8b8e02353a0910b96c25c8320879e5f3c137c41bb52d7c4249cb3fe486f13336e725f98df25f2f
diff --git a/dev-python/flask-babel/flask-babel-1.0.0.ebuild b/dev-python/flask-babel/flask-babel-1.0.0.ebuild
deleted file mode 100644
index 3ad5aeec4a4f..000000000000
--- a/dev-python/flask-babel/flask-babel-1.0.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{6..9} )
-inherit distutils-r1
-
-MY_PN="Flask-Babel"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="i18n and l10n support for Flask based on Babel and pytz"
-HOMEPAGE="
-	https://pythonhosted.org/Flask-Babel/
-	https://pypi.org/project/Flask-Babel/
-	https://github.com/python-babel/flask-babel/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-RDEPEND="
-	dev-python/Babel[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.5[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs \
-	dev-python/flask-sphinx-themes
-distutils_enable_tests unittest
-
-python_test() {
-	"${EPYTHON}" tests/tests.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/flask-babel/flask-babel-2.0.0.ebuild b/dev-python/flask-babel/flask-babel-2.0.0.ebuild
index 5cac5c6bc9da..3bed7be9bdfa 100644
--- a/dev-python/flask-babel/flask-babel-2.0.0.ebuild
+++ b/dev-python/flask-babel/flask-babel-2.0.0.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 RDEPEND="
 	dev-python/Babel[${PYTHON_USEDEP}]
diff --git a/dev-python/funcparserlib/Manifest b/dev-python/funcparserlib/Manifest
index b815b1ebff45..30ffa3da9870 100644
--- a/dev-python/funcparserlib/Manifest
+++ b/dev-python/funcparserlib/Manifest
@@ -1,3 +1,3 @@
 DIST funcparserlib-0.3.6.tar.gz 30401 BLAKE2B cfce97cf08914f67ba3bd743bd3d6e7e7a03599ddc00d58a884aa84118d197d92bcc67a93ff1f7a2ab2074d66704078f5392c1d846004a5cd6eed2a423ba6b61 SHA512 efa52f788aa902b099660cb8bc60a025085a8c383e52bd0824a0c3ae28a6c13804a0659de0c80b4dcd839ee70491805d4eecda6cea221e35c3750ec569098c24
-EBUILD funcparserlib-0.3.6-r1.ebuild 727 BLAKE2B f181e6cbef4b017cf5525aa405d737a622d63b08eaeb1f7616b622541a77445d54a8a942afb2ddb7bdd127375851f9489412f191b717fa8ffc439a7f4826ae05 SHA512 4fb9cfb3995fb1e18a472c755799e4dc04e570c337e88683a81c1240d2b60c8e022b75bda7bbd3f3cbfa36e98c1c9c82e4e943834dbd2b74babf8d66a8c6a7f3
+EBUILD funcparserlib-0.3.6-r1.ebuild 726 BLAKE2B 9ec0258d0ae5568bd59a0c08450f149901a1182d23894c2c28621cbe8bea5c74fbbcb941d4f697b8fba725811f612b4caf8f469cbe1a0524703ff95463e59de3 SHA512 49a546076f86ff52360f4c9ad8bb2e74e672d621d17b01079bd3a65ec78d6844d371c2c5796ba752d197c172e8624c8d8738bd94e91322f3afff2f108c4ccd53
 MISC metadata.xml 316 BLAKE2B 1899ee4255eb25643967fafb8aa09ea4b8e6319074de967e512d98ed182c2c7f7992c11c6689000f7bd2076b7296fc544fb8aff86fb03c86d661ce183a41c9b1 SHA512 9fe54328f405d097056ad5e3e0795ded4e3eacd72381dca3298a9af0e7c78f11eab97548b251c6bfaa9144dd0b00c00ac4292ad2ed5e84c31ab6c593a26b8caa
diff --git a/dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild b/dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild
index 6ea59ec4dca6..0aa5c2561e0a 100644
--- a/dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild
+++ b/dev-python/funcparserlib/funcparserlib-0.3.6-r1.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 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/glance_store/Manifest b/dev-python/glance_store/Manifest
index 745f9109175f..d42cacfde751 100644
--- a/dev-python/glance_store/Manifest
+++ b/dev-python/glance_store/Manifest
@@ -1,3 +1,3 @@
 DIST glance_store-1.0.1.tar.gz 185244 BLAKE2B 4841bf9db07df06fe4f0dedc9f06e6aa768118aa363946b3145c90f7d58f452c3b1f419bd3545681161481d88566922f8c3f4eb0612c77a0679729fc460d6169 SHA512 77144f41996e8fcc7b5ec3e4246305e6887082a8f62a84c73d0b546c9f635e8f43b95e45a5e3303e504c01ed3608de6358398eeffee226f640035df2f792dc8d
-EBUILD glance_store-1.0.1.ebuild 1661 BLAKE2B c9579444d5f9c46609e03fc3819a3ea365babef115dc23a83d364c023ce322f9353963ffa64cf7e8f2daed45b16d1089445c3429af2b3b9ab987a856c344c041 SHA512 8fb72b5c20e4c5504b618165588d290c6a4f7ce4749b12ff65ed1c71e42028c48d87f6b77947d5be3b1cc1bc9bb5f5fa80d2cb2102b981784721d4d16379bc67
+EBUILD glance_store-1.0.1.ebuild 1650 BLAKE2B e1fa2f9adb22fd6f1ebf87fcede37ef8f88088348cb740bc21b665fd8fda0de1a4d8b9c22bdc3f264c27b0f077aed2f9c784d37f3ff77a85821fb0fe2ee5b329 SHA512 9976022de10c8f91491e61ec4d3ed3658e58d8ed53b988afab7ebf8efcd8cea1b2c5bf6c2e0f8207bb7c1d3e6810899cfd72a1261aec16f88de63fe7aa3a8d65
 MISC metadata.xml 732 BLAKE2B 848d5250b057da4f922d0839d1ae304f6f7e921e6ee673a6829bc8a1c09db6829877c48a36b8e2db54d5f7964a18e380430ebf82dfa9652f30f28876296677ee SHA512 7c7b9c80d18fdf5ff7b7d9587e6cca737cf4b0e2ca89845087462dfd18acabf14e2c89e9b6d62c80e4a488a0e6a9364e50d15e034cbae6494d41d1b731396862
diff --git a/dev-python/glance_store/glance_store-1.0.1.ebuild b/dev-python/glance_store/glance_store-1.0.1.ebuild
index 57415e7d4112..1b21ea54f649 100644
--- a/dev-python/glance_store/glance_store-1.0.1.ebuild
+++ b/dev-python/glance_store/glance_store-1.0.1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 PYTHON_COMPAT=( python3_{6,7} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
@@ -16,10 +17,7 @@ KEYWORDS="amd64 ~arm64 x86"
 IUSE="cinder swift vmware"
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-"
+DEPEND="${CDEPEND}"
 RDEPEND="
 	${CDEPEND}
 	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/hpack/Manifest b/dev-python/hpack/Manifest
index aa0dff988889..07bab50b40cd 100644
--- a/dev-python/hpack/Manifest
+++ b/dev-python/hpack/Manifest
@@ -2,5 +2,5 @@ AUX hpack-3.0.0-hypothesis-healthcheck.patch 549 BLAKE2B 6177deb0b6a4de5fe5f2c65
 DIST hpack-3.0.0.tar.gz 5305971 BLAKE2B d1df8a1b2a1ce8b91e63cab475d3957f937fb74c0bec343d342971be1bb7cfbc929c53cf041845df2965cef0cfb098345bf0612acabc7ef3e5e23f6f0aa44f2f SHA512 7b9cf5e643dff2a6454bfe419b797c8ed1a0fe6ec3b725d2696da5a820ab96fe87a64e600b1831c7024bd82616b155a0aa058301acb32172155b6538ba0a73c6
 DIST hpack-4.0.0.tar.gz 5301419 BLAKE2B 0164f6aafc0d1f17f6c397efe710503a22501faae3c7dbba4e57ca2dc76e4d373bc5e65bf55acda8bc61975d12f8a2084de0e0c4587539e5a3102e3cf66d562b SHA512 f482d086d7a82649393e3cfea55c98966ce57055cb1826bc4dec1ea334661c02708e7903f2e8e588ee1c30df41373e1de9fb960c2e7bbc18d0ace0b8f97b195b
 EBUILD hpack-3.0.0.ebuild 1141 BLAKE2B fa5b217246a531245d1b1c93176eed6918058252cb1d0bbf0aaed7e4575d53b87803d372c9865dfd6aae0874923d243506b2f1173c43d94a34e99b7696ee20bb SHA512 c6628c614799fda7f861d72ddb0d9768c0f877f392b8652ded30d354506711472076aa12af116de4076eb10682c29df2e5d361571ab6bf26ccf5a52b108bddd2
-EBUILD hpack-4.0.0.ebuild 711 BLAKE2B be6c7d6abc49435921f4c74101e2984c278d96e46928aa71a17e0a87e3628e6cf1eb596dee134b0589fe09cad01fa94e7c2b8ba892554826131ba18a8e046732 SHA512 f1a90de9e64afad82cc782293f7d6bec90bbb548990ad0f5ebce91d680a41dc5fd6f3b26bb44cd21e3399fe0ca59ce290631d471feaf652950c72c64fd94dcb8
+EBUILD hpack-4.0.0.ebuild 702 BLAKE2B 2dc02a72eaa5c70c7c228ce21bf402d0f6f9bceb9959eb50284d8421c77669b3b68dc2d289924c563ba226a90461edc39b02a8d419ac7fcf83e51be0ca0b48ed SHA512 d54e42ba8ca329d9ac76e861f2ecc72b5e5b722a92eef1230ddd63e82cc3fa92c437e802f79e9819897013e149235d621c44321f466f298934a9b2623010d719
 MISC metadata.xml 701 BLAKE2B ddbb1fb2ed0eff9436e212933ba3a6d91a3b439c3457bc613d00c0f8ec06468df44d4476f19a3bef9daa163938804ab2ef9ced38b51ef29a81f208a704599c4c SHA512 f464fca486d271112fe08d65f800858427269292720804ff620127bb5ff3aa920e334bb1155f1788feeeb98d02d0e60114d2801d97febd77031bd524758c4184
diff --git a/dev-python/hpack/hpack-4.0.0.ebuild b/dev-python/hpack/hpack-4.0.0.ebuild
index b0734a0afcfa..d62e5f28b8a4 100644
--- a/dev-python/hpack/hpack-4.0.0.ebuild
+++ b/dev-python/hpack/hpack-4.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
 
 # dev-python/pytest-relaxed causes tests to fail
 BDEPEND="
diff --git a/dev-python/humanize/Manifest b/dev-python/humanize/Manifest
index ff4b7dfe9cf3..e2f7622560bc 100644
--- a/dev-python/humanize/Manifest
+++ b/dev-python/humanize/Manifest
@@ -1,3 +1,5 @@
 DIST humanize-2.6.0.tar.gz 53753 BLAKE2B 7908100cde103846554264df887ddb54223900cdbf1e52b2a19f029084b2997ab7a02e275f437d0cc04c3c42d6f8c371fbdab23468cdeb8f98a8cd6a64c1c288 SHA512 d1e57672c80ccabc48dadb2bafe65ac0b5b23de13907d7d51a06b6a1f2f01ef254e36afa203c9393420ad3bb5aaa22616a0d5c4c71cc53cf47727436be0b1599
+DIST humanize-3.0.0.tar.gz 53458 BLAKE2B c75ddbeed88aaef0019b50691576e6c8dd8ffdbf0ed1f1d1221c40ebfbaa502176f2db463afea3c8384f1b9acea7daaeca1e81f72919dbe2c476ff9d95db166b SHA512 8d566b4fba6b1f7f025e30d5d0402cb7ef7bf4881fb14608b011474d3e6991a0a058d444ccfdbb796205d959c2c4192e0eb98c6c15c31ba9e304f39a7cf8d025
 EBUILD humanize-2.6.0.ebuild 893 BLAKE2B 3a9327961a1bf54a9a0dde40899cd98d9921be34e08fd1f7c1cd4bc8b6bec2f038c4ede281df464b1e2072750875022609a28bb15f6200878806eaa4d492340c SHA512 4961313fcd5a31b0177cea9edda63bf5bbf7ccef811569bfae5e993435ea3da04ba50a0c9b37a210f6f81d214afd4247effa718090e41b200505bc6dec98fa0c
+EBUILD humanize-3.0.0.ebuild 698 BLAKE2B 0e082d4d2be3e4163949117c2fbab2ace3e54557667e696484a834e7ca2bf7b038d903afc012af61bba78584dab05d0173e959054c86ecce14d95252f3e864f7 SHA512 491b636732bbb63285f74aea67c869982af66a85aff2f5814101fcaea3336ee86b6a82bf86461bbdf18d2af66b52db8e4e319956a6201098a5d1c26a05159832
 MISC metadata.xml 561 BLAKE2B a7919d3646edc6a4e7c2e13d74b1ae4eb18e16c41d33f27adb2841e80ab12e5d85f42bedab668c1096740e7ed1323e5accac1ba45a78290f0979c55e39c9d682 SHA512 b31a4947368fcbfb0edf93b48f843c49d5209820cf9da1a8aeb8666ab4fffebac765ca4aeb3cf2523837fcfc9c21d858cecaed65002ac23bb9d946a8c818f113
diff --git a/dev-python/humanize/humanize-3.0.0.ebuild b/dev-python/humanize/humanize-3.0.0.ebuild
new file mode 100644
index 000000000000..94f1f6012cd1
--- /dev/null
+++ b/dev-python/humanize/humanize-3.0.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Common humanization utilities"
+HOMEPAGE="https://github.com/jmoiron/humanize/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# The package uses pkg_resources to determine its version
+	distutils_install_for_testing
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/hyperframe/Manifest b/dev-python/hyperframe/Manifest
index 462e6367c1d1..69ca7f72e925 100644
--- a/dev-python/hyperframe/Manifest
+++ b/dev-python/hyperframe/Manifest
@@ -2,4 +2,4 @@ DIST hyperframe-5.2.0.tar.gz 19115 BLAKE2B 6dfd7c6e7f07eb52a499794709fb498a30bc4
 DIST hyperframe-6.0.0.tar.gz 24640 BLAKE2B 7b420c8bcf54510b9dabfca7c7e8718c0c547109874671d11528709572d55e463c91bae14b8cbf6db1eac99a9cceb1799050afc54b709805c9850b3083b72679 SHA512 54812dcd5bc92ebe8333e6976c2edba7309cff9921fbcbae0eda7666bf7de7758b3646f4738404bcbd069c4904e57710cb312c42ef9b6ae1d88a057b0bd0ca44
 EBUILD hyperframe-5.2.0.ebuild 535 BLAKE2B d1a96fd3469b9fbb2c64a32c38a031a4218f393a55347824c8fb2d4ef953a14f663adac1b338cf7eecd4f8a65a1b21b2de476cc6fdc801a151310ab05710e1a5 SHA512 52538c3306ca471807bcc890ead257ff37cb0f1678ff4abfa31e28424edd08b27500f7a78417120cead0fe26989a986fde17abf2677df69c019e02d0b74e002f
 EBUILD hyperframe-6.0.0.ebuild 544 BLAKE2B 9eb807c6d4875aab7010b80224741da81ff12270d7e655e63c029f6be44a482aa25f2373adc3adb38259a4eb87ddddf25a4eba028c8ad94920b4002e8ce41e63 SHA512 f4f269d7e439c148ad528ac3fb1d5b2225bcd8f70774893e128d156f105e8d67e454fe73fb782254504274f16ef750eb2c90354c3fa0698242e6771e616a1354
-MISC metadata.xml 624 BLAKE2B 8c5eb7949a6b19a3341658ac90103bfa5829ebfac29aea3c5b1bb7861a0abe6d562ef304b3182d31402a45ad142f772c2887e5969f93ab4c8301abbe0d65cd44 SHA512 11667c2401c1c98563d96e63e08f9a013330c29688219dcf502afd751cb2259c688c55cae250f5ccb676c00dcd8bdc59988ec9bc9f8f92a25a985a784031e562
+MISC metadata.xml 648 BLAKE2B 4d545280fbd8a57db9b0b93735e0b620bac3057513200e6e2cb06a5b3a52b9e4ba87e63e5ee99168040caa956cc5bc6ed845a393e9c794572cbe00535923f81c SHA512 01212887790743320e5a51451d9dbdfe8807b7d219b164375ffc04e09ecf98676651de13b138a7b43d16f97f8883c5d4b1ffe4d4c3bad2d6aeb5fa7f11a46c2b
diff --git a/dev-python/hyperframe/metadata.xml b/dev-python/hyperframe/metadata.xml
index 3cd8a5d5e644..3734e16b4ba4 100644
--- a/dev-python/hyperframe/metadata.xml
+++ b/dev-python/hyperframe/metadata.xml
@@ -12,6 +12,7 @@
 		</maintainer>
 		<remote-id type="pypi">hyperframe</remote-id>
 	</upstream>
+	<stabilize-allarches/>
 	<longdescription>This library contains the HTTP/2 framing code used in the
 		hyper project. It provides a pure-Python codebase that is capable of
 		decoding a binary stream into HTTP/2 frames.
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 06d0a4121457..f2d5db704a5c 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -5,7 +5,7 @@ DIST hypothesis-python-5.35.4.tar.gz 9084892 BLAKE2B 5545f2b1f3e97eafb4c83d7918f
 DIST hypothesis-python-5.36.0.tar.gz 9086288 BLAKE2B 9deba5f50168185d5e9ef35a47bcb0dc6dfdf38b7da7a2aedee0a6fe18740fa9a353b0985e25a40da1a30d26900c6294161a1dfe03e5c7c9c31f74aa1b2cec9f SHA512 e7324f98ac8609c1ce7ed957d0ee0280d177e9a6d369cc3bdb2cc8bde7f5e79d8f19b53c6b19fdfc732c9f84e4cd7dffa9c2af3cc004b3b5dbe703d73ce64009
 DIST hypothesis-python-5.36.1.tar.gz 9086877 BLAKE2B 4b71daa1e9417d8249364292ca1dcbdbb31d041e2f5627776bb2d2d4493be82c85201d000e187e5cc445c79612f5918a5ac71a2787bbc0c21eff83d4c27b0dc3 SHA512 97d0446ba5660c189e60b47b8f782818525fcc1c5c1d64eec997b85d5ae47fc7d52771439b5c249002380ffe7d95696728f81efe513993ff90c8e192e2ceca8d
 EBUILD hypothesis-5.24.4.ebuild 1608 BLAKE2B c52cd842682347491245d4560fba737a85f8dd46e93416047c2bff5ff4dcde85bd337d7e7c65556e61d97bb1c2a1270652bf3dec8126049daa01215ed1424b3f SHA512 7d3450fa374c88dd6206663341a1437d177a7cfe5b0eb99161a85f4e62b97020843e052d28ae0975628d8c299655a35b86ba51cf67bacd296e839d949c06f785
-EBUILD hypothesis-5.29.4.ebuild 1789 BLAKE2B 675098e49370053498baf2a181d31e1beee829d19e94d0f95ec2bef24dd62cb9fadac2a8f7bee68bd12f5aee489857a4365c794d5791a5be46a91596b485e552 SHA512 36484ec011a777aac0aa8c14e06365f18ce2261cd7d49124e69fc04e634dc2054949ddd626eab4c95acf40190eadf1fe9dbe2b4da54bd79ee472cd6b708e0c37
+EBUILD hypothesis-5.29.4.ebuild 1788 BLAKE2B a8fe7e8620f48cbef663ca21347d3ceb334ef6b05cc74772a3ab6cf00d6c4a63cda9efed1376cd6eec4d114e46ab0810eaa457fe89c84ebae4258783acc9f902 SHA512 c2f2e6518028a77cad4ccb6c3a9b7c373ac9826e1c284af93b60dcb03dbf5ebade23fae35ca4f8d4c1d2f1f8f9d88aec42acddceb0c6fcfaed548cef158ce45e
 EBUILD hypothesis-5.35.3.ebuild 1796 BLAKE2B 3962807fed780a205f7ad0aa29d18c19cfe3b15ee2a96a6581e420cd67deb9b81984cec05d3445d27e689a613161a7bc03526c801ef6888a086b882ade089e54 SHA512 5555a953cdae1e0c70b5231c9ea9d14385b083135c585a2cd9cdf6dcd68d8ab051c541ef7c5d3c91bc5186e31c45abf485783ab00a7e3ee17338e8554ea57e33
 EBUILD hypothesis-5.35.4.ebuild 1796 BLAKE2B 3962807fed780a205f7ad0aa29d18c19cfe3b15ee2a96a6581e420cd67deb9b81984cec05d3445d27e689a613161a7bc03526c801ef6888a086b882ade089e54 SHA512 5555a953cdae1e0c70b5231c9ea9d14385b083135c585a2cd9cdf6dcd68d8ab051c541ef7c5d3c91bc5186e31c45abf485783ab00a7e3ee17338e8554ea57e33
 EBUILD hypothesis-5.36.0.ebuild 1796 BLAKE2B 3962807fed780a205f7ad0aa29d18c19cfe3b15ee2a96a6581e420cd67deb9b81984cec05d3445d27e689a613161a7bc03526c801ef6888a086b882ade089e54 SHA512 5555a953cdae1e0c70b5231c9ea9d14385b083135c585a2cd9cdf6dcd68d8ab051c541ef7c5d3c91bc5186e31c45abf485783ab00a7e3ee17338e8554ea57e33
diff --git a/dev-python/hypothesis/hypothesis-5.29.4.ebuild b/dev-python/hypothesis/hypothesis-5.29.4.ebuild
index 1b73cd15acf4..ffc3f8134783 100644
--- a/dev-python/hypothesis/hypothesis-5.29.4.ebuild
+++ b/dev-python/hypothesis/hypothesis-5.29.4.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="cli test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/idna-ssl/Manifest b/dev-python/idna-ssl/Manifest
index 301fd24741c1..6b478df53c94 100644
--- a/dev-python/idna-ssl/Manifest
+++ b/dev-python/idna-ssl/Manifest
@@ -1,3 +1,3 @@
 DIST idna-ssl-1.1.0.gh.tar.gz 5267 BLAKE2B 07912379da74e4711f291a54bd0878e08d8820005b055f9b978a684b8263a801a7fb9ccbbf395aa226e009b3ebfe4a7cca11861502a9b859446279b111911209 SHA512 01e58e9f32f7e02ef203edbd76e199916ea0b16d01a929ca2fb272d83988483c17e9c36e131f47bfba7f7b657bef9e2be222f81800716a5b87d5847c27cce34d
-EBUILD idna-ssl-1.1.0.ebuild 864 BLAKE2B 86dab263deabac9d1b6b9702655a9a62ea7187006e30153762cf3d7ff637d6248f83507a452ad6e67431b486b3da46972739420f277a2252cac8d463b93816be SHA512 4a30545c29d38c21b1156769db5d21f903454ffefadd32173d98ee83b72fac4e3c51c24411654fb854f4467248f21331394d5b03a1367c258b0454287b67a1ed
+EBUILD idna-ssl-1.1.0.ebuild 863 BLAKE2B ece4f9cc4f90fa70e375476c83ddcbc2e7eb020e77046d6b5a5f1b64cabbc39bea854dba6677e5633657b0a9255084bd906840dc4d46673f6cc5ca72f584f467 SHA512 89feaa7ea05739dd031cfca57f2373b24cbeaa49f700744dcdaba8652dea3eccf0bd7fa4ca15f984d2d142b0bb95b9af326f8127e90c6f1b456fff27f021a088
 MISC metadata.xml 368 BLAKE2B b2f78fb9dea9edf6f2b2a7fb72412302b014e8b1b536653ae12fcd2bc8fa94bb253ff780aedcfd32fcddfcc2030b363e12440dfa4efef1a886e99b8b0acd8dba SHA512 531bbcdb7ec492aa4c38f4352cb0a93c618c60d9f8920ff476f6f8b7991744ccba2188a9e441e696a02d1c4ef4ea9af3afeb2c81a0d046e700796ee45b7f3888
diff --git a/dev-python/idna-ssl/idna-ssl-1.1.0.ebuild b/dev-python/idna-ssl/idna-ssl-1.1.0.ebuild
index bfa486ba3f29..f7b40976b3c2 100644
--- a/dev-python/idna-ssl/idna-ssl-1.1.0.ebuild
+++ b/dev-python/idna-ssl/idna-ssl-1.1.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE=""
 
 RDEPEND="dev-python/idna[${PYTHON_USEDEP}]"
diff --git a/dev-python/incremental/Manifest b/dev-python/incremental/Manifest
index 49455157d3a6..46ed9b94990a 100644
--- a/dev-python/incremental/Manifest
+++ b/dev-python/incremental/Manifest
@@ -1,3 +1,3 @@
 DIST incremental-17.5.0.tar.gz 15527 BLAKE2B a967ba891b69e91768db213a9692da10eb9987bf962bdbc3b6fe70e337322686d58901878b72934a5abc8d9b0c9884d6e03de5b8912067f07b7562427bcba38a SHA512 91443205f7c92ec8f6502f38379c5ac2fe441435ff9490af01e5420d6bb05bb1c666dd612fc45204199a34afd533fd3de1390ca482bb554dfec7d3a22958a4bc
-EBUILD incremental-17.5.0.ebuild 580 BLAKE2B 4207be344127bfe2141adc90e95cc1253582fa5b2ab4d55f604679e3afd2e4c51b695566f7e7c2b87dce1d3c52960ca4cee70aa6596938c1dea147d66902c604 SHA512 a1251cae48f64fe6c4d3e7f79061e634a87eadcb5b9e967a2f1bde99f10cfda5f1741dcd286a1a1385c267179b4841513ecd347656b21169efcb34c5c20f47ec
+EBUILD incremental-17.5.0.ebuild 762 BLAKE2B f896e53d70b540f26a2dbf0db8ab36327820c2c85c50affb27d2b449f9a6f2c27673238ad9b68120e5321761c2603ad4612369a483763628a4742a5d79b5785f SHA512 3946102896dce62aaebc70cd66bb58fea4bf150c06e2774fefcfb96d519b326b861808f954597343d778d86db9842081bb97ff18b6c39400cd6be1edb7b2adcb
 MISC metadata.xml 476 BLAKE2B 854207bdc5352a730881f6f6a820bed4648e839e64601274f0c249e805bd8c1aad5066ee970f2f45e8c8cf532fd4f07ab0956ac8656da5e8947246fcdb618337 SHA512 603906b5876ed9cc69aadcaee6d9443d20a2d134939ac79a41ca23f8ef010563ba3f56c012219cabb812eab0eb7e6bdc19cbe7763cb406e948713e49f1bb13c2
diff --git a/dev-python/incremental/incremental-17.5.0.ebuild b/dev-python/incremental/incremental-17.5.0.ebuild
index ca490e4d58e0..f3d37dbbc21f 100644
--- a/dev-python/incremental/incremental-17.5.0.ebuild
+++ b/dev-python/incremental/incremental-17.5.0.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=7
 PYTHON_COMPAT=( python3_{6..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+# TODO: revert to rdepend once this has been merged:
+# https://github.com/twisted/incremental/pull/59
+DISTUTILS_USE_SETUPTOOLS=manual
 
 inherit distutils-r1
 
@@ -16,4 +18,5 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
-#S=${WORKDIR}/${P}
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index 8531c73eda15..7a1d48418c45 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,10 +1,6 @@
 AUX 2.1.0-substitute-files.patch 1017 BLAKE2B 70577eb950a18345804a2a4b750bd233dc6a0b6bbdb524dfc66e0f4a7c69b0eeb2d35efb9d1845d567a11d1afa7881068b4757e42b9baf24dc01ba3026608a38 SHA512 fc4c9e12267ac5f04a2e16ad27334a093638538b8149ff380099fcbeb674a276ab9eb624a508010e37f82c05d5f7ab527a80e386b3e7b61c123ecb8effd9d542
 DIST ipython-7.16.1.tar.gz 5136303 BLAKE2B 9baf42c9befa50d78eec29d012aeae7f01886f29642a01845afd4a96d0efb7a4df5b14b68aeeb22d1d621e5427b219f717688a1d5074a6e70ad0509c7ca73a46 SHA512 60259fd6270b0355be67b4f620a58b56ae86e69e14debe2df86df6118548f2290ab3927b8dfab20db1ebd675df697d05eb6994b93625a7b8b6ea07112ddf63bd
-DIST ipython-7.17.0.tar.gz 5139470 BLAKE2B df7dfb00ed81d5c3db7ba1408df6a4e26ac8439d6d58c7f9214ae89e446951eadf3f0d4c2be0654acebc0429a77773972b6dd081ef8c009a9d177924968e7b28 SHA512 0dabc6f4079719d2dd75c5ee92e4523b016b4a790776ccc7130a60bdd4ca1b88bcdcfb9ddd192f9c1a4397c27a27e7f7297540275d06832f870af347e2f14dd9
-DIST ipython-7.18.0.tar.gz 5138647 BLAKE2B cb6e81468ff7b0d452bd4666a8dc47dda7a7ee7b4685391f222a84db6fddcffa3d41514c1d8a346f07e0c3a89a942893cc7e16ac5888e1c35cc2603698527846 SHA512 2c1cb414d0125aba54dcf98221011d3024d7db0779b2ba79d7c283e2fe918822b59a7771f67e45bf3a60d1a2582862ff3a97475163278961564644373b416029
 DIST ipython-7.18.1.tar.gz 5139337 BLAKE2B 936759db4377767537766a2baf0bff2adf1a95d17438899e1e1611d725e796d8ab78fcb8f1ca14d8d41171af64fa67abe9fadf84c6ca3cf17bb1d83fa2ba4268 SHA512 71f495021df56bbea97fb26b9274e54f7662875b7690a9493bdf682635e048d9ec53a947ee9b0d487634a3a8c639f0d93c6639b3a0dd20bdfefbb4c53fb53799
 EBUILD ipython-7.16.1.ebuild 3652 BLAKE2B 70be8a367fb2c221e9d9b176445d7a3c2d8e9f21e7f5c5c3e395d6238bd92ff00aae8d061ff384d3da3c5635dd09c79965d1c755074add0d101f26c9c3570c8e SHA512 7281469503c7e301048343ad8ea65784026b6822382bdf08a02490c0ef1f67c2f5d5aef5bf9bb731aaffedca60472dd9af99ae4de4489a0f262b1de195e75843
-EBUILD ipython-7.17.0.ebuild 3652 BLAKE2B e71ebec6aaa62a267a206476efedaaf254dd1f6343212b6b877e18bfc1db2e19887814dc534685e8c59ef16503dc8de2ed89004dc6eb5b5ff52669380187a3eb SHA512 b85b4d7cd9e022001dcd8be117273766596c19052ce313e02ec41133eb4ade08bf62fc3d60448963f63689406e03a367126e402ed047e65bb35a65601d3ff224
-EBUILD ipython-7.18.0.ebuild 3632 BLAKE2B 35bdbf8f346234842e190488cc1758d437a30a2b3277c8dfaace904ff827839bb64e45f81e89923ad5773cae461f07498ea300e206b0b8aabcd4571a9a4696c2 SHA512 60aeee5ba4077b6de0a3835c65e4a72504f37ee24841ac882da38f331fed768dd147d408ebf10215341dca387c906d0642ec380e78b00abce8290c9079906598
-EBUILD ipython-7.18.1.ebuild 3632 BLAKE2B bde74b79f32a8459345d458a7b50aac5b5c740d2f1ce162808dac9ce3dd6493695fe448427cf1083c5e9c657ff3753b7dbf6763e57b2db80d34c2e581f85694a SHA512 f5ffa961c13fe5bbed5eb5eab8b711865bbb2776880cb1da9d04235041b2afe663eb17d585cab5741426b5debb35359ae4d1746ab0577e8708150d12b1f4fa9e
+EBUILD ipython-7.18.1.ebuild 3628 BLAKE2B 941070e41b31139e8201c75da4e518653f2e3d78e41b8d0b41e2fce5ff0d036dc437ade7ca68639030732f0249d8682b6088127b149787066b8db9f53fb70746 SHA512 ba29ffc6ec8393397212934fc55a333a144f42875b6c1d7bf4d21820b317a953ae3ea0a27c270f5ba5d114356428d55dc0e47b17e2ca5a15028b170f516edc98
 MISC metadata.xml 2882 BLAKE2B 189477b4ccde9051b61d2a4ff5134907886795f97c5201fc2bf9c012526333151931a1445b6315f286474b71af84253033cbe9bf89bffa7813bfa49a4a07ef6c SHA512 f54fef4552d09a03a8d186c45f917c091928f1de84dfbdd80f1db80912d616d509f10c588de533916d9c494f5b3ca5e6e50a6d8b8c59ea47781311ad4319442a
diff --git a/dev-python/ipython/ipython-7.17.0.ebuild b/dev-python/ipython/ipython-7.17.0.ebuild
deleted file mode 100644
index bdb4b91bc9d8..000000000000
--- a/dev-python/ipython/ipython-7.17.0.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE='readline,sqlite,threads(+)'
-
-inherit distutils-r1 optfeature virtualx
-
-DESCRIPTION="Advanced interactive shell for Python"
-HOMEPAGE="https://ipython.org/ https://github.com/ipython/ipython/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	dev-python/backcall[${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/jedi[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/pickleshare[${PYTHON_USEDEP}]
-	>=dev-python/prompt_toolkit-2[${PYTHON_USEDEP}]
-	<dev-python/prompt_toolkit-3.1[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
-"
-
-RDEPEND="${CDEPEND}
-	nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] )"
-
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		app-text/dvipng[truetype]
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		dev-python/nbformat[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.14[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-2[${PYTHON_USEDEP}]
-	)"
-
-PDEPEND="
-	notebook? (
-		dev-python/notebook[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-		dev-python/widgetsnbextension[${PYTHON_USEDEP}]
-	)
-	qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
-	smp? (
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		>=dev-python/ipyparallel-6.2.3[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# Remove out of date insource files
-	rm IPython/extensions/cythonmagic.py || die
-	rm IPython/extensions/rmagic.py || die
-
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C docs html_noapi
-		HTML_DOCS=( docs/build/html/. )
-	fi
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	distutils_install_for_testing
-	pushd "${TEST_DIR}" >/dev/null || die
-	"${TEST_DIR}"/scripts/iptest || die
-	popd >/dev/null || die
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Create ipythonX.Y symlinks.
-	# TODO:
-	# 1. do we want them for pypy? No.  pypy has no numpy
-	# 2. handle it in the eclass instead (use _python_ln_rel).
-	# With pypy not an option the dosym becomes unconditional
-	dosym ../lib/python-exec/${EPYTHON}/ipython \
-		/usr/bin/ipython${EPYTHON#python}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-pkg_postinst() {
-	optfeature "sympyprinting" dev-python/sympy
-	optfeature "cythonmagic" dev-python/cython
-	optfeature "%lprun magic command" dev-python/line_profiler
-	optfeature "%mprun magic command" dev-python/memory_profiler
-
-	if use nbconvert; then
-		if ! has_version app-text/pandoc ; then
-			einfo "Node.js will be used to convert notebooks to other formats"
-			einfo "like HTML. Support for that is still experimental. If you"
-			einfo "encounter any problems, please use app-text/pandoc instead."
-		fi
-	fi
-}
diff --git a/dev-python/ipython/ipython-7.18.0.ebuild b/dev-python/ipython/ipython-7.18.0.ebuild
deleted file mode 100644
index 634ebd345b96..000000000000
--- a/dev-python/ipython/ipython-7.18.0.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE='readline,sqlite,threads(+)'
-
-inherit distutils-r1 optfeature virtualx
-
-DESCRIPTION="Advanced interactive shell for Python"
-HOMEPAGE="https://ipython.org/ https://github.com/ipython/ipython/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	dev-python/backcall[${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	>=dev-python/jedi-0.16[${PYTHON_USEDEP}]
-	>=dev-python/pexpect-4.3[${PYTHON_USEDEP}]
-	dev-python/pickleshare[${PYTHON_USEDEP}]
-	>=dev-python/prompt_toolkit-2[${PYTHON_USEDEP}]
-	<dev-python/prompt_toolkit-3.1[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
-"
-
-RDEPEND="${CDEPEND}
-	nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] )"
-
-BDEPEND="
-	test? (
-		${CDEPEND}
-		app-text/dvipng[truetype]
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		dev-python/nbformat[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.14[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-2[${PYTHON_USEDEP}]
-	)"
-
-PDEPEND="
-	notebook? (
-		dev-python/notebook[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-		dev-python/widgetsnbextension[${PYTHON_USEDEP}]
-	)
-	qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
-	smp? (
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		>=dev-python/ipyparallel-6.2.3[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# Remove out of date insource files
-	rm IPython/extensions/cythonmagic.py || die
-	rm IPython/extensions/rmagic.py || die
-
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C docs html_noapi
-		HTML_DOCS=( docs/build/html/. )
-	fi
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	distutils_install_for_testing
-	pushd "${TEST_DIR}" >/dev/null || die
-	"${TEST_DIR}"/scripts/iptest || die
-	popd >/dev/null || die
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Create ipythonX.Y symlinks.
-	# TODO:
-	# 1. do we want them for pypy? No.  pypy has no numpy
-	# 2. handle it in the eclass instead (use _python_ln_rel).
-	# With pypy not an option the dosym becomes unconditional
-	dosym ../lib/python-exec/${EPYTHON}/ipython \
-		/usr/bin/ipython${EPYTHON#python}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-pkg_postinst() {
-	optfeature "sympyprinting" dev-python/sympy
-	optfeature "cythonmagic" dev-python/cython
-	optfeature "%lprun magic command" dev-python/line_profiler
-	optfeature "%mprun magic command" dev-python/memory_profiler
-
-	if use nbconvert; then
-		if ! has_version app-text/pandoc ; then
-			einfo "Node.js will be used to convert notebooks to other formats"
-			einfo "like HTML. Support for that is still experimental. If you"
-			einfo "encounter any problems, please use app-text/pandoc instead."
-		fi
-	fi
-}
diff --git a/dev-python/ipython/ipython-7.18.1.ebuild b/dev-python/ipython/ipython-7.18.1.ebuild
index 306f35fa3ed8..ec8488a4d51a 100644
--- a/dev-python/ipython/ipython-7.18.1.ebuild
+++ b/dev-python/ipython/ipython-7.18.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index fe2ee71204a9..f48a5d3f5f90 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -1,5 +1,3 @@
-DIST keyring-21.3.0.tar.gz 73120 BLAKE2B 6124e29e4dfa0b4c1f4ad3c1262c282935f860c0aea796a9e66987e64e4737d7f746c9c832b427e49cdadb87e61a33f7bfbd956299400311ff08e59f643cf6ff SHA512 85119a13aeb62456f8b9409990c3f5f6e0c83e9850466ee3b7a3d10e879e3b7fd6d723b2b683a8904b5d20c76fc85471d16aaedbd7ce04d8b88f1d1dd265f0ff
 DIST keyring-21.4.0.tar.gz 73591 BLAKE2B ad8fe71a6a8bd3180b01ce3ca0372f9d1dc493d3eb58ced707d1869284d21ceaffaab314c1304b58461d771fa1a4a5981ec8fbcfaf333d602bdef7985d8799eb SHA512 149f1706296c830605d0ff2eddacf3d531c3d80f694465785d83e2af1d55a49204a2112db840522d4de10cd012073cafe571638e2c39a2f61c308821fe5ec901
-EBUILD keyring-21.3.0.ebuild 1273 BLAKE2B 6edd2f19198f9dac1950043b0149e5b69cb8aa1fd718c843d5ec0199d4ac82f50f12a97744f5506d2b6d58eb26e8b33502e3d1d149885169cf862ea34e53b4b2 SHA512 5a3a91255b0dc31176a1833bdd2f150ebcf7f762f580d0b7e7887252266290d920142232100839cd8296486fc7fd2a2d8a210c343128bafa5df6947b1a9d26bc
-EBUILD keyring-21.4.0.ebuild 1164 BLAKE2B 8b30b9f248e9517db0d4831b6d0d05744ca6d4b2862bc8066bd0ec9811b05d3f3bda31056064416057b9cc17a442d6140c0e348bad302f021d255fe27a50a964 SHA512 3828e321691678d215dc54ce441f7b9a36c4760cca8b7989abfed7d91f6914a49373bd163e7d05ff7bfcb7e73594ec050a4c9dff05f7a7222043cf91a8a86b0b
+EBUILD keyring-21.4.0.ebuild 1156 BLAKE2B 5746ebd36c32f8a05042b1b89b05ca2f5b71857c69e1325ae20ad3af7924d4894a92846dc4912fbfdab2bf3d69f13137503624b632e60e64a1534e0ede08d255 SHA512 5836a15a5247c525f3f839826cc5685461c3282528f4f44c136ce6ae3577a106cb92ab97e87321b994b2702a5e91d45786a00cda37f3ebb114770db5c46bb136
 MISC metadata.xml 610 BLAKE2B abd4cf8986ea009081e0e21d31b8bbdbe7b2e99fb332bda41d666c97feda8974cabcabdf6d88e4d8d9a2b9aefd250ad06bfcdd8888513cc0a10cdbda9c93c981 SHA512 931f5d607bc5d9caf329f0b7a010ee055f3c962e67e61c8f4e7458f5325a89bd91678c215fbdd63160eb2d7f34ce58b0a30b144e4159fb426c243efa1dc12d05
diff --git a/dev-python/keyring/keyring-21.3.0.ebuild b/dev-python/keyring/keyring-21.3.0.ebuild
deleted file mode 100644
index 8c9cdcffe088..000000000000
--- a/dev-python/keyring/keyring-21.3.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides access to the system keyring service"
-HOMEPAGE="https://github.com/jaraco/keyring"
-SRC_URI="https://github.com/jaraco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="doc"
-
-RDEPEND="
-	dev-python/secretstorage[${PYTHON_USEDEP}]
-	dev-python/entrypoints[${PYTHON_USEDEP}]
-	dev-python/jeepney[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' pypy3 python3_{5,6,7})
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/jaraco-packaging \
-	dev-python/rst-linker
-
-python_prepare_all() {
-	sed -i -e 's:--flake8 --black --cov --mypy::' pytest.ini || die
-	# relies on cpython's gc behavior
-	sed -i -e 's:test_traceback_not_referenced:_&:' \
-		tests/test_errors.py || die
-
-	rm tests/backends/test_kwallet.py || die
-
-	distutils-r1_python_prepare_all
-
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
diff --git a/dev-python/keyring/keyring-21.4.0.ebuild b/dev-python/keyring/keyring-21.4.0.ebuild
index 669cfb619df2..ced5c71c1408 100644
--- a/dev-python/keyring/keyring-21.4.0.ebuild
+++ b/dev-python/keyring/keyring-21.4.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jaraco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="PSF-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/more-itertools/Manifest b/dev-python/more-itertools/Manifest
index e586a76873b7..b723261a41cf 100644
--- a/dev-python/more-itertools/Manifest
+++ b/dev-python/more-itertools/Manifest
@@ -1,7 +1,5 @@
 DIST more-itertools-5.0.0.tar.gz 67359 BLAKE2B a2448b218eea4442cc4739a4df414ba69e0530cd6206a13c5c017a13daa297d00c08a94cec8aec0639d8b03663f4b698702f5e700ae118ae9fb5854a6d105b36 SHA512 f72c8d6c75799c39708443ba75862801ddd3fc0382c9eee7ed24ecf04cbc7d9ff6a8e35b6fff1eaccf45ddd470c2cc8959532eca32c2ff50b0a12588727c68b4
-DIST more-itertools-8.4.0.tar.gz 83626 BLAKE2B 84370e495a6f32c856f751907e45c6155cb5d6331a84607eba26842ee4e964f8f0a01d2c16d4c5446e5e51cc24aaea619105ae24b067b9fabe3fe8741de526dc SHA512 70bf72594cb92b165f1bdc5050bcd3d7d37eeee65db6c631b636222005f8d7707d0c6ab09a229e9f1a23fdcf2be948e96d0882f9fa033f29b7a472ec8441a4d0
 DIST more-itertools-8.5.0.tar.gz 86861 BLAKE2B 6c5d7e0e2bfa89b65636115d5539ca5a36de24b7e0971638721d8fa13f6ad84f0fc64b297b5c3c30d380f78e271f6b6622d72a41ffb8f1941945d5918ec6c78a SHA512 f11a4443d4d5e79fe241fc6e170ae51b08cfb1f1093dddad036e1ba043c30d03c53ab9fccbfb4de97279862c6cfe44759ae88ce6027d871515b032e7d9e435e7
 EBUILD more-itertools-5.0.0-r1.ebuild 708 BLAKE2B 3a3292b5909ea18fdf9a209f6c3270d974cdb0611dacabeab29d9037e1a84b58a37a2f35fe492b9f351b044c36bf6e16958a0105980e9d9091d9744c64ca465e SHA512 dfc434e3aa6d8e92cc49fb38b5d5c533ad389bbc0c97265a8c99542cd03dc77abf64715ea95ff8c18a340d6c4b4e9b3038dbcdb5f396b7c078152b6baac1828e
-EBUILD more-itertools-8.4.0.ebuild 660 BLAKE2B 9c1d96501f32515dfffb61e65baaf2c81daa7a8a9f94a582ef341ac00b2bb160c72200a9ef415f2e847e37d1dafab6032df192c1f48a429826b3a49fefc05f33 SHA512 31a0b198d7bd5533c49301b6abd83d2a5cb029dc3e4fc0ec566cb85a6c82bd648ba843aca19fc77275a7b1f6518dabce727493c716f2f9fb84173b92130a7b33
-EBUILD more-itertools-8.5.0.ebuild 676 BLAKE2B 27451991e55f4732f675bafc01b5d3dc4558e31e55194ed8f6a228129200f56b914e7e513504aa66f09f4d39c61bf1128b8831059ce74ba0afbc512a1eca04d6 SHA512 f69c52f49c34965ac6db6ea36ebdcc2abbfb61da5e8f13ac27edb29406fc4af38c118a2f308b1a39897d0a0e5a8c650c3c17c0950711f5bc5dc9923fe72ca0d6
+EBUILD more-itertools-8.5.0.ebuild 667 BLAKE2B 5f27ed477db780fe6ebc3f1688e73dc25b7ffa233e19af8303e9e02efab75f9c4d908d285023d355af84f2ed86352a19819f0cf075b9d2dbd28bba6b38eba7fc SHA512 4461d23de5f7936a6b7aef06b36508ae19260b6dbd40edb83e5e3685788180c9c04690d064a365bed330322c22c222931f8e9fcd92c2ff83ce754fe12cd77e95
 MISC metadata.xml 475 BLAKE2B de5a09fa0987ae45ca73d94cdf2ecaaee8b0f697e1cc4e1b535fd16f50a10460cd5a3293bc1a0633ab099c3ef07fc1ae0d99a2faebfe4117f0a5ab53837ac94f SHA512 3cccec99e9f80ef9751d2e19fc196a177f62a6b72ada30859fb8cc577fd362cac9b8261869b59a85ff1e8b4d9716daaf190cc97b3733f63e014d2e2c838d00e4
diff --git a/dev-python/more-itertools/more-itertools-8.4.0.ebuild b/dev-python/more-itertools/more-itertools-8.4.0.ebuild
deleted file mode 100644
index ef2bb6f5b256..000000000000
--- a/dev-python/more-itertools/more-itertools-8.4.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="More routines for operating on iterables, beyond itertools"
-HOMEPAGE="https://pypi.org/project/more-itertools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
-distutils_enable_tests unittest
diff --git a/dev-python/more-itertools/more-itertools-8.5.0.ebuild b/dev-python/more-itertools/more-itertools-8.5.0.ebuild
index b3ba108b1290..85c32afd0d44 100644
--- a/dev-python/more-itertools/more-itertools-8.5.0.ebuild
+++ b/dev-python/more-itertools/more-itertools-8.5.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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/mypy_extensions/Manifest b/dev-python/mypy_extensions/Manifest
index 33efde3715c8..86e76694f808 100644
--- a/dev-python/mypy_extensions/Manifest
+++ b/dev-python/mypy_extensions/Manifest
@@ -1,4 +1,4 @@
 DIST mypy_extensions-0.4.3.tar.gz 5545 BLAKE2B 8f1f988562390ee1ba3d90cafafec73c6fe080eef6b4321252d3b3aeffebf1ad13bdcae7ae75c69eac7bef91dcf3f846ae7f9a3f2ad6bad9de2bc8cfe5eed29f SHA512 22d8dc538cf6f77d97f4113dd34fce8095dd98944c7613fab2b3e71a3e9b7df1374654af41ead5c934f789ef1b72f54d980ab06f3ca28b8b4c6bb14ba1ca3ce2
-EBUILD mypy_extensions-0.4.3-r1.ebuild 818 BLAKE2B bac262f89661459cead7dc27743d369a940d6e8102b13256ff0b09e96a9b38a36db9336d9cd6d588c8b461fe79ab108241c9c7f631be856302ac38f32bdc3aa1 SHA512 9189edce03ced6534d1097d1a4ac797e7c7d5511e48ea78de66666790af60e6c235920894df0ac2adf5dbec152fec65f8080ced53f085eac88e1cc3dea15dd49
+EBUILD mypy_extensions-0.4.3-r1.ebuild 822 BLAKE2B ca0589a02619f8fffc4c03ad2888169cdaa3f313160c7e873c901cd105ef8191b3b63900a3780501706d150795b253c3f665283fcca3b1591bb6e8c341a692e8 SHA512 ce220756075026974cd8a2cec100666148ff4cbe9cebd2064d1b7769f889d8ea7c423249434b8317c433b6046eb227d12a6ca7babe4c09612e578c5b2a7d7a25
 EBUILD mypy_extensions-0.4.3.ebuild 1025 BLAKE2B 6e531146c9e8c331c64453e6701842bac7d4fb80330a103bdd897d11a10618202cf291a4ab5691b5e7f6ed7dd3c9986f66f9b216f9185b95e284e7784e6a419f SHA512 770e6c1ed105f69d7f8bbb33b6e16b9b5a906962ff81c65efbed6f5a2639cf469a49f09bb284aa1f078da36d7b7cc752e2410cae91d8c18fd979c40ee460c2c4
 MISC metadata.xml 352 BLAKE2B 932d22dee01e3a1e586176e5e32423d36100c8d3116cf6b8eb1268665ac7a5456535fbb6b855a4e6849767d31dd6c2066eae3d08868662c211596d7c02f39ec7 SHA512 2eccb85a7150b8592717ee60ecba338f59563fbdc12c172924f8d7743d33c1a32cb9a0bfb41f150e86bfee3748488f32ae9d57bbb240cb7fae4b9f3a00621e4a
diff --git a/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild b/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild
index f8af82c56a72..ac824f711934 100644
--- a/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild
+++ b/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" =~ [9]{4,} ]]; then
 	EGIT_REPO_URI="https://github.com/python/${PN}"
 	EGIT_COMMIT="master"
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index b6c1f2ed2aa5..690c6a13eb89 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -6,6 +6,6 @@ DIST numpy-html-1.16.4.zip 12097069 BLAKE2B db1f897342fbc80a761fbaee7b0eee3761db
 DIST numpy-ref-1.16.4.pdf 5176571 BLAKE2B 9a875ebd1473b241d463d810a6d191581aef961158f2f82959671b554ace3ad482795e4f3e1cb7dd4632cff926c1e864c675a7624fb0f4e4f297948bf50f0564 SHA512 983ba0f34a70c011886bdbc9fd8f3f75a3a967ca29217acc76fa46e7da391296a5628c9a557ac76efb393271abfb8ee4f376d401c1cc1e5c30622e54b9325d09
 DIST numpy-user-1.16.4.pdf 596203 BLAKE2B da3ad1f0ec1c965d20656f73a970911cbb58efa73a5df89e2e6485e0dd763f483e35eea1395ac919bf35d496fb216cee954fc5d31edebc1796a24a2a7a2d12b9 SHA512 3083008547213bfa98ffa5cd8e2cea13f6947f42d83aef61502a2a852b0d5f27d727c76b42d281d7a2f4f76c78e88b12ee3d9b164b39fe1f0213ace7097357d6
 EBUILD numpy-1.19.0.ebuild 3726 BLAKE2B b7ff98d3782d037656a810490a46f8d6a1f9ffa407577b910fcc7a06ce900390d341a06213c5f8d3b6073c7b20053f151f65636beccb07cb055e4dd5a965cc9c SHA512 36ef418f6e17a0cb364bb0f5cef4890fdb84d3a2b748733e35f576574a84cdebfb1e086b8764aa6a14ab887d1730f12cd7f6550a70a792d942622b7ed8602407
-EBUILD numpy-1.19.1.ebuild 3740 BLAKE2B 7bc7ee8ad4958aa64a38cd89093cc2d866f37e297174eec66d2a131b70cd532c2eedfeb50656055ffa75756c1d701a59aeac99a9e57d107affed5e4854ab940f SHA512 8fb7b254c41c38059532a7ab897198844aab6da031de67c7166c87074bad21c426751f8d0b35d274d76d83eefd8825dccba05de69eb6f46ce0f5cacbeccb9006
+EBUILD numpy-1.19.1.ebuild 3737 BLAKE2B bd8f8cfbe1bea29288f99fb57820dd4fc851cf166ca967905f72986b640a6a21ba2b39d870ec6c507a2502caefbb51baea37ce46bb8770fa3534670ec97d5207 SHA512 b5eccb5f0f15c093aa8caa6985e18edfe9f5bc391b1b293c8d40d40f4ccf860e50148af9a21fbb93bf889c1808ccf3f3c6dfe2ed7ea753abcdc39675d1c44561
 EBUILD numpy-1.19.2.ebuild 3741 BLAKE2B 3d16e9b26a02dc4c6a5a0d34bb5734aa73e161e198cc7e4311de287676c9b4cfd1d4fd982fe6572c71553d284be16978c06f5b170a9674dc747c3c99eb3728b0 SHA512 984cf6adc67ae4dd627ce0209522080f84a12cabac4c809fa17589e5acf1cc59060753d3a5f11cf3e5139904e3b8eeff2aba3f3490ff4551da23d0551756c235
 MISC metadata.xml 876 BLAKE2B 5e257d6ea3c59c5819d854db7b7db3ebff53b5c87b5ce9348786085f09db12aa6fc8fa86393b9e6c06760ac0d9f36a52fdfb1865c9d1d9ad5526d74d3d53e8b1 SHA512 d35d0954ff8f21e370edeab3ce3e5ab501bf216c93399e807ede6f1910ba0ea41359425bf894d813a39442fb92a724fe83ec8a5c64e6bd97de9422f67700d549
diff --git a/dev-python/numpy/numpy-1.19.1.ebuild b/dev-python/numpy/numpy-1.19.1.ebuild
index d550852de8d8..9757c73850a9 100644
--- a/dev-python/numpy/numpy-1.19.1.ebuild
+++ b/dev-python/numpy/numpy-1.19.1.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~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 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack"
 
 RDEPEND="
diff --git a/dev-python/osprofiler/Manifest b/dev-python/osprofiler/Manifest
index ef4ad95869bc..086d5e7ad5ec 100644
--- a/dev-python/osprofiler/Manifest
+++ b/dev-python/osprofiler/Manifest
@@ -1,3 +1,3 @@
 DIST osprofiler-2.6.0.tar.gz 80518 BLAKE2B bc45f9bf3378b75a8c702ab1bf9ba40e9f6d77bba808882c7c504adb4f1c295449ab2cc19d128cdec7ebb3120a3d0c49eb77e1769625bafa216e32b3304c6f1e SHA512 3c911961b3107f28bc7b625738d6afb0098d87b891603d1a41be5cfea2b21eb0a3358f3f2fc5cfa0f9b32287f59d732c4ade8ae3436fe46095fa220b5bfb7a15
-EBUILD osprofiler-2.6.0.ebuild 921 BLAKE2B 2cb4fce4efb47ac2b3e4286bed75282328c915f49781811d23f2300024f37dc24302053f46c3df2c9ee071ff272931b8b34ccbdafdecab5e455e9006c8170d03 SHA512 e6f770eb6053b5e84cf4fde7a4a807caa32d8057506be9989481096b64957dfa588bb3da82e0c1b99727d56624dc2a792c0747275be4f34ae5ee25bf0d55badf
+EBUILD osprofiler-2.6.0.ebuild 910 BLAKE2B 0b99db7c506be81d70b446fbe0057cf0b19fe2fdb84bf7b9150ecdfb4ed9792bd0d6343597b1a570386e98a538c5d3ef293f1014e71841a276a2653c0ba062f6 SHA512 b0277919204be96126f61fa9c33183786cfd4e81a8e077cd691eaac8ad07fd39576ca162e98676b24401c07855c8a16d2ba90663673b7aa9da83a68babce5494
 MISC metadata.xml 487 BLAKE2B da94dbd7ac99177ce1e967c3e3383dd44f75afae03e5638c7f02663601e4328082a72c1d2bdb2a85ad6829d9ced39d319c513530a3409a7f0315152707df2536 SHA512 cb2b515f507c6c5e4cec191800ca344f273e7fcdc28c61747d3eac8b7903c03bfd6a76f2bf1b2ccf8f2870d0c4525009ffb31cad65c999f5756046ca40f47dbc
diff --git a/dev-python/osprofiler/osprofiler-2.6.0.ebuild b/dev-python/osprofiler/osprofiler-2.6.0.ebuild
index bd5a2632fec9..0a9777cb8580 100644
--- a/dev-python/osprofiler/osprofiler-2.6.0.ebuild
+++ b/dev-python/osprofiler/osprofiler-2.6.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 PYTHON_COMPAT=( python3_{6,7} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
@@ -15,10 +16,7 @@ SLOT="0"
 KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]
-"
+DEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
 RDEPEND="
 	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
 	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
diff --git a/dev-python/prompt_toolkit/Manifest b/dev-python/prompt_toolkit/Manifest
index 487eca5f9ae1..df5120f9cc5d 100644
--- a/dev-python/prompt_toolkit/Manifest
+++ b/dev-python/prompt_toolkit/Manifest
@@ -1,7 +1,5 @@
 DIST prompt_toolkit-2.0.10.tar.gz 347981 BLAKE2B b95cf000d5249da3710f9b51f72d41c3d552f1d3a35dea5493f565f0f62998d890bf2b81b3376140a4d16a19f2c5fd60eb0cb5f2f58180c176ef1543c6fc4ec2 SHA512 b91292cf43607b3a7018ca29827f0aa9bc90efc064c68faffe02ad28e4bb60f45fc2d25bbfd9a40a383a815cb08596975f08237a498f94a5c088d56d3a0a9803
-DIST prompt_toolkit-3.0.6.tar.gz 369730 BLAKE2B 84f5f578a6ae5b8dbbf0ca244a2d3dcb9ecc858ffce3ca5e657f85705c9090d32abbdddcadbb8e139d980d87f279d998db874551be93c47b4a740cc3d2e99c5b SHA512 44c47f8f331b7fca3fb9449cbb9ad6b2703fa83bff30274cabfd888c1d149b1f2305f3a08cf53143c86d9889096775e776272ee56aeb1f3664a8399a4eecae08
 DIST prompt_toolkit-3.0.7.tar.gz 3018359 BLAKE2B c1d1f897a422df599d2bfbbfc53851489bf9f41a7ddb57fb1a03cae8411a7468bd047423922a5e95dcdcfb2730dee38029bdaa15eb7dc92ff47066b4b6edc6cb SHA512 3ee4cf65f175343273eb2c1b76250b35430ac3f3ee7cc61bfbcca86a717fdaaf74c723dba400d872b47b06883bed959b166df33b8960173beb466edf9266ff43
 EBUILD prompt_toolkit-2.0.10-r1.ebuild 595 BLAKE2B c30f5cbd5592319af4dfa452e8c7e54dea3996375710d0c63cabe9788728d2f641e815f89671ca8cd465a8c97cecc07b8cc446c6762fb1411347aec37eddd05c SHA512 f720ff243b56d393ae3e04c02375f4c5b9a25c2a0f0db3dea33938fcc1f30f83fcf467b33626a70f67ed3f85519d22f7030dd13a6d9a01d331b7ee554ae36109
-EBUILD prompt_toolkit-3.0.6.ebuild 594 BLAKE2B a66ab8284b0d700727220737c34176c50d54bebbdc03f0f1f6c0ae3d536b07a9006a1f5af308bee829c66ddb577c92a1fa3919570243696006b7f9e82273247d SHA512 1ab3fda1b4232ebd0dbdb0aa24962de97c467ad96477d8e5ae9d343bb772b8ec66f983748d97852d03f0abe2ed18e53cbea4c76a3460f3a7a68f002191793e1d
-EBUILD prompt_toolkit-3.0.7.ebuild 598 BLAKE2B c1f6330a4ed45ac7a7a0261177ef49d58a82b01caaad41809597458e9926c8d9a24babcf8ec5ccd1a80f0b945a5b4902a69a30d7db566674377dfafcd0286296 SHA512 3aa3fc5300ec41bcc04bf58db1db4c29f8ae43372c0f482aa549edc10c8e44f9993eef0ec567f060fa13a0a1de2a318755b988224fb46e832be3f1e958b87d60
+EBUILD prompt_toolkit-3.0.7.ebuild 594 BLAKE2B a66ab8284b0d700727220737c34176c50d54bebbdc03f0f1f6c0ae3d536b07a9006a1f5af308bee829c66ddb577c92a1fa3919570243696006b7f9e82273247d SHA512 1ab3fda1b4232ebd0dbdb0aa24962de97c467ad96477d8e5ae9d343bb772b8ec66f983748d97852d03f0abe2ed18e53cbea4c76a3460f3a7a68f002191793e1d
 MISC metadata.xml 430 BLAKE2B d305130506a3f60dc1310ad008708b382100142ea6cbb50003b627858b85c86c151d2ba37e32b81f228c4e666be9b6a5d6ce499ac43a3776b113cec43c6c8470 SHA512 8b7f1d7f5a4b9bbbed80f1db3e4d79a7c9142e73790b4723d4ac4000eb3601f75310bc80436b4d1fe898e3468c6f695dc6d88b6570068e7fcdbfd00d19195d17
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-3.0.6.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-3.0.6.ebuild
deleted file mode 100644
index a280a736898f..000000000000
--- a/dev-python/prompt_toolkit/prompt_toolkit-3.0.6.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6..9} )
-inherit distutils-r1
-
-DESCRIPTION="Building powerful interactive command lines in Python"
-HOMEPAGE="https://pypi.org/project/prompt_toolkit/ https://github.com/prompt-toolkit/python-prompt-toolkit"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-3.0.7.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-3.0.7.ebuild
index ecc349bd3526..a280a736898f 100644
--- a/dev-python/prompt_toolkit/prompt_toolkit-3.0.7.ebuild
+++ b/dev-python/prompt_toolkit/prompt_toolkit-3.0.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/pygame/Manifest b/dev-python/pygame/Manifest
index 0494d5ba2f51..a49a374f6a31 100644
--- a/dev-python/pygame/Manifest
+++ b/dev-python/pygame/Manifest
@@ -3,7 +3,7 @@ DIST pygame-1.9.6.tar.gz 3223131 BLAKE2B a4d04c933fcad244d32bd512ef8717e60ec923f
 DIST pygame-2.0.0.dev10.tar.gz 5567274 BLAKE2B 7d78f260318cfabeb33f1073ae210f890d2f772e3ef302f243cca67724c6012355644ba60d4cae6de72db6dd61d320177deff6ee83dd355ec4cc33e841b565f7 SHA512 4cee7599fd8a6d31ddd66bfaad3bbb67cb167c1ae339f37e83322d810fea8746e81a191c224a0eeb6cc43a64bf1730ff0886c82f1a4f642e2e656ca9a837bf9e
 DIST pygame-2.0.0.dev12.tar.gz 5598471 BLAKE2B 339e96ed7f01070c3aa4b31b587a793b43b99ac476d72a431dff09d98b95ef48c6b0d4faa20301e6db43cb2b35b13245253d86859c16d2befbd3795f8ed48b7f SHA512 f732056b3c8377326caf1d6ded6c59e8665de2ab2f6233d6d95dcc26137d67d180f8c5dc92fc22578ec5ce0ecf5a1de5080c62355d15035ab248d518cd75180f
 EBUILD pygame-1.9.6-r1.ebuild 2294 BLAKE2B 1bf372a3814f5d28db059250e0adfd1f039d7d594801b5b319b77e5137c25957658c6db0a963888f5737dc5850e2385fe4819bb711dab7f0fd021bdbb8375cad SHA512 23959b2a00d38297e146d11a803771e0b18a48ef605e0696f008c23c64e134e8a170f79015169de8652c1384440a7648915a44840f5ac6bcc9f1a1b74689e085
-EBUILD pygame-2.0.0_pre10.ebuild 1916 BLAKE2B 48980667d10d35d8ecccab3338f3c6090f25911289a3dda92ecc11b810afdfa297b574c63a4ddd4ca6e4d5c4e688cfe49d1786f2b38865738d81d9582f120f5c SHA512 5d8d2f7679f69ead0f7070be482ddfa68aafe42be4ece4ca902489511211a6603068d4791007fb8ae238c45803dc6286ac90878e5c33f558f74364e74b1fbccb
+EBUILD pygame-2.0.0_pre10.ebuild 1915 BLAKE2B 7e072dd3f1f5df48f53694e4d008b19b029e510aec1cba87c9da37a646f702e4e4ff8612f37eb0cc0e5eae9a18bd63c65e3055173eb891706b7ea03b41688e97 SHA512 db2c8170f17c35e18a098a88c23085e575abe70607bf65dd0966148b2cc218abb77333bfc65852bc367d22b8d071ad66eb13ecc12436fdbd338e8a909e2007e9
 EBUILD pygame-2.0.0_pre12.ebuild 1993 BLAKE2B 7d03da256caa54c1a6c653d36b18b4f2109a844c5b70300de5820f44746b1061309c33186521019cab3db6f611bf8f7384ca50f32be69ec5d7088cd7552b889a SHA512 d6fd335dee453927ffa70ba7c43cf72bccd7a520b112afe498cdd50390982966aa885a8d81a5c90586eaa580ec0856924568fed08193ee3dfb2c3e97430261ec
 EBUILD pygame-9999.ebuild 1720 BLAKE2B c08896002640462a1fa0976d69e4d1e287701d8df12a2c878062ca740138568bcff58e93813d182912a838a5a97701f178f8066030e548de3cbd7fd8ae9d563a SHA512 ac2fde281f74e87da86e1bdbc33c7f3e7c308cac506452014650d0cebc6f6f9a84d011efd6fc98c6fa204d7c148d28b23be85c1da1f0e8e8221a1fd1347175a7
 MISC metadata.xml 408 BLAKE2B ae371ef164069765d0964da714a83c9898ddc190ac295c5ad5bbb6a3c45db5aa415d84ff21dbaa510e5c9852397e6b6b389684c54b67d83d675afd9b3d9a697e SHA512 a6e06c0bed59d5157166577a2dafa53f28a310c56f251bec36af077a79342c6f954fa63a3fa8d3546ca03cc9358e75eeb1ef04c6e0371e43e0b7bff51ffe35dd
diff --git a/dev-python/pygame/pygame-2.0.0_pre10.ebuild b/dev-python/pygame/pygame-2.0.0_pre10.ebuild
index f1da10c2c2c8..914133a5646c 100644
--- a/dev-python/pygame/pygame-2.0.0_pre10.ebuild
+++ b/dev-python/pygame/pygame-2.0.0_pre10.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="LGPL-2.1"
 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="doc examples midi opengl test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pytest-aiohttp/Manifest b/dev-python/pytest-aiohttp/Manifest
index e9d72c58460a..9428ea15b5b3 100644
--- a/dev-python/pytest-aiohttp/Manifest
+++ b/dev-python/pytest-aiohttp/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-aiohttp-0.3.0.tar.gz 6884 BLAKE2B 02b50fcd14192d23a4b257c2b7cb235966eff52b1c0ac87a4c61a20bc0babdb22eb999938c63e267a797d52ce57c9fb471232db3d0bc6566168a2d73f6404cd4 SHA512 4164166465dc40ff78a86304d1bcd4db9fb3f7dad3188f8ebe2ff151ed51eb0bf9c1b7a608d94cfe3339ee3b6efd4d5abbaa0691388460d5ac95635afa14984c
-EBUILD pytest-aiohttp-0.3.0-r1.ebuild 537 BLAKE2B 6b95e1fe3ce5eb0ef521eac7fcd3535d5d69683ae30cfd4bd9b0914fbf3dc4068d45a86731ecfcbe5f37c7769a9c3385d42d8a26bac43935abf588e94fb2023c SHA512 5a54903ed2e0a08a72260e2d3b9d0b30be8d88a34f735be73b999a55bf4022ebc19c6e131a235f2857bd5b39c51be905852556a16f468289b14f4025543c1641
+EBUILD pytest-aiohttp-0.3.0-r1.ebuild 536 BLAKE2B 6061066396169246ad2b391716a4214cf291d6d19e442e2b5d3185236a557fedcd7e92dbd1f9a2e3750e15c9fe15d1dd6f1ff922c90539e6cdc62a436e7c2add SHA512 8c73b5f1f40b8f550880f668dcaadfde6964dd5984e2ba26d151492920c773dea92508d4016743a987cd60f0d6d37d241e150b59d95afeab45639667b8a1adbb
 MISC metadata.xml 382 BLAKE2B 24ac18217bfebed19f5049bbaca9955da1a0eebe08b8fd3f8f870db50369ceec3e68f4fae68604a399084122a3e3ae460481f855e4a4a3c419e494103d452c56 SHA512 73da71aee91bfb48dc637ef0e4d47a4693ba602f8cb15d0056cc0a14f4bb74d11cad7edcee8a1e892eaf2c3cf1d85735c9f5745ea0ae8d5026a7776c0550cf3f
diff --git a/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild b/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild
index f3e488461a08..1965fe661863 100644
--- a/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild
+++ b/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/python-barbicanclient/Manifest b/dev-python/python-barbicanclient/Manifest
index 942fa0eb1f87..2ea3774a5178 100644
--- a/dev-python/python-barbicanclient/Manifest
+++ b/dev-python/python-barbicanclient/Manifest
@@ -1,3 +1,3 @@
 DIST python-barbicanclient-4.8.1.tar.gz 118919 BLAKE2B 0c29eb4fb3b77d6ef69051a956db1aae8cb151d07156e4c888259888f1a9a6eac0be9e5339ac9a3dee9dabcb1c06c6e835312b47bec4338b34842e71546e3e75 SHA512 836b54156e72faf7ec590d6f11ccc2ca61258da38368410fb65f448b8a0e0ea272d224f46f5c6f08afc7477197a090be77720e07e3a4cb60ef71982367dbfcdb
-EBUILD python-barbicanclient-4.8.1.ebuild 855 BLAKE2B bbb4b95739df3d82c465a747c79c4c4a76e4c7e9b132eb009ff935b8ed95090a3cc2959e237bcfca63091af1cfe60084476b448b90c782abe7229cb267f155b5 SHA512 64282dfc6743d0074594e5285801a1bbc84b965eb265380bc6b11169f7a51d05e3aecc3fe961b1d2060aabde704be06e666bea400ac5fb7bff6e5b45b3e43d15
+EBUILD python-barbicanclient-4.8.1.ebuild 845 BLAKE2B 9777bb90cfa803870746142fb048fc8501c4c4213f602d9922d9c055be62d0a976ba69f327d92ad79276e0475f1781492f6dd296facd24f4f390a0f971c0a25b SHA512 c16c5b6dde72521f2558ed246d35c62ab103fc34c4b399cd7c1cdd1058760d385f3a827738b33e50a4607fe1d4d53171bba3b36e1fcbad6731fb589c6308e2e0
 MISC metadata.xml 503 BLAKE2B cc7d84978dd3c22fd1146b3b77ea2041a96652643e96fce2429c42599b232e98291da14285a88dbdc0039c293883d6151393f09d45b5dc3d35962403235bc620 SHA512 02a04551a97b8317268a1ba7a5e1b069ddb938db982d0a017596c1b70015e137b23da758a65f2ac90860ef30a12ed014df036ef426086e61befa41bc29f28832
diff --git a/dev-python/python-barbicanclient/python-barbicanclient-4.8.1.ebuild b/dev-python/python-barbicanclient/python-barbicanclient-4.8.1.ebuild
index 14baebe6eab0..14a7cceb7e32 100644
--- a/dev-python/python-barbicanclient/python-barbicanclient-4.8.1.ebuild
+++ b/dev-python/python-barbicanclient/python-barbicanclient-4.8.1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 PYTHON_COMPAT=( python3_{6,7} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
@@ -15,9 +16,7 @@ SLOT="0"
 KEYWORDS="amd64 ~arm64 x86"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
+DEPEND="${CDEPEND}"
 RDEPEND="
 	${CDEPEND}
 	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index 439868c085d7..d5194c4fcfd0 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -3,5 +3,5 @@ DIST pfbfer-20070710.zip 677333 BLAKE2B 100214476a361a5e5d1f3da0999591345f6e3a3f
 DIST reportlab-3.5.42.tar.gz 2883081 BLAKE2B 22f4e7ebc233895a036eeb94c5beb9206be561a8a44895b36291a4f840603a2fec90107ac60e749f99be629202801c63ff67d5034d19b42383f2df12d457104d SHA512 f52717867190bf7812fd566d9ec3044198db809cdd0f53cc9dbfa92503a202540db659369e20bba3de07cd28eb10515d03b85700ac138c9394dc9eed1f08b8f8
 DIST reportlab-3.5.48.tar.gz 2890211 BLAKE2B bf0cde9b9e80459caee37949dc90a777a56da5d2c8e6dde09bddbdac2f2c55031d92b3c7c6346b6f563904525020c0e4f666b5e2effdd761c81412df21ec60eb SHA512 ce31cb7e9e2226cb6d59d446f90c1df94f0f84077d298f7ba862f5c75995afa20fa077b1ee1ab9a145c9276cee0d75fe61237e001ad0e5b96dfb0027adff3db7
 EBUILD reportlab-3.5.42.ebuild 1346 BLAKE2B 3ae7be7013162aed337129dded6b65fe4b393ae0a90ec389d4cd3e8ad5db6b9c93ccd4191d91846e97397976a18c0832b0b5ff60c5cea8efc7c6acac195b486c SHA512 08bd12dd05d8ffebef0b43987620ede57e4da21de8326f428ae18980c9698b43c20309d1756a59a01df13932eb2629f73e29f6bc1342d0c2e471dc1a3ba6371f
-EBUILD reportlab-3.5.48.ebuild 1432 BLAKE2B 64efd690d0e84e5124b9927fe69ad24cbd1cbeec9eb5d13a7bc83c908f5819d2b1ca6e867f9dd9cea322088baa2ea73ed6be801fdfc89be202755645aef34a4c SHA512 c2521bbe253470321c41409bdb8911e6acd372eb6fe0bd7404d37e9ec60570336dc74d28e59f3901b1a10b8d1e44b4c9323f8cf3628b0d99aa7b1088b432020c
+EBUILD reportlab-3.5.48.ebuild 1431 BLAKE2B dcf9312a88dd385560af1103d03cd62bf21b08c915f970e19abe11360eab83fc4ac34a45c3dd4b99ec9eff37498651d9797dd0e7bfe29fbb7c1707bd4ad47e82 SHA512 1f46ccfcfbbfea824536b8d2d289cc38944dab186de604fcdf16132bc2ad4125cf4231d7607ba18c1e735243e207e88fb745b9e1ee2e54eb9b574a6904e63b65
 MISC metadata.xml 322 BLAKE2B 64b99a95cfa082f2ae8e3a778cf44d3598f4d3f43f03d58eae011aa4b361af042e1b650eba9eb17421c8c154e654a8340d4a85d60891aa89666861a973a49d15 SHA512 cea3f16d94fb50eb3e505756952d9ee14e170e5354e5a3a186c24dc3a253ce96d6d275505e71586ef360c71e080a9eaf5fb461d8aff4fc18ac6122912bbe1976
diff --git a/dev-python/reportlab/reportlab-3.5.48.ebuild b/dev-python/reportlab/reportlab-3.5.48.ebuild
index 02ea3ac4b79b..98a10d1983ea 100644
--- a/dev-python/reportlab/reportlab-3.5.48.ebuild
+++ b/dev-python/reportlab/reportlab-3.5.48.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="BSD"
 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"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/sphinx-aiohttp-theme/Manifest b/dev-python/sphinx-aiohttp-theme/Manifest
index 0fbb1cf08c62..75f58d02c179 100644
--- a/dev-python/sphinx-aiohttp-theme/Manifest
+++ b/dev-python/sphinx-aiohttp-theme/Manifest
@@ -1,3 +1,3 @@
 DIST aiohttp-theme-0.1.6.tar.gz 10921 BLAKE2B f1a5a0b82c1a99e0afa2fa118e9b2a13d59d742634c8826c0f67f45bd049c96851f1ac694cb6ebfcee1f66b1e03d445b4a3eef676135076af99a1d30541a0a4e SHA512 58b3b595eed97de546484dae562172c7751a3d4d90a6a1ea885e86a44b78d9017834372179d2881e048c4b2916f2b53d11ddb9368a5474462ac9ef7d75925b7f
-EBUILD sphinx-aiohttp-theme-0.1.6.ebuild 609 BLAKE2B 9a08b5dd30b2d6231694099b5be5a27996a2c259956e008fdd4563aea4a0f3edb37e9f00e81831ece8b0096839c62e53974054f62a6429eae7ab0375d10d3473 SHA512 d14c8e274acb7b3fd3e587e35a912e07083a9993a5141795db572c1caacede7e7b7efed2873a6423fa1131c4e6a30c0e1733112b084377aaa9365cf3cfcdb5ab
+EBUILD sphinx-aiohttp-theme-0.1.6.ebuild 607 BLAKE2B 3f598f507ce3024268d2e38b516870f73d6f2da728bfccf2af23a4dab47a214d83edb816f129d07ec4dac347ef533e289415ba6698d3416bd81ad9321a298feb SHA512 3488c1544e79383f7c54e52b50a5354c4a47c637ad8c70d8120f9ebc44924b17f6600681197ed794404e28ff1125b7b6d3915952063b6ebf904463d314b23f95
 MISC metadata.xml 356 BLAKE2B c6f21942be22de996083446c4cf4d1d188e582ffc7550975b513475021f7097835512409e58eee10f86b205770734c968234d5fc542ec1a622d3883714685824 SHA512 9130b60a4ba5ad45d7bc2ae275485917c365933b215e9551ab000cd5a34a6932a07b02b7513d0890403fbf6a7cd713dd8cfcaaccd1c4819a0a9f15207f062d9a
diff --git a/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild b/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild
index 862fa7ba2013..e44e2a543db3 100644
--- a/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild
+++ b/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86"
 IUSE=""
 
 RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinx-testing/Manifest b/dev-python/sphinx-testing/Manifest
index f3ee884a1360..07297f2a6fc2 100644
--- a/dev-python/sphinx-testing/Manifest
+++ b/dev-python/sphinx-testing/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-testing-1.0.1.tar.gz 11513 BLAKE2B 46ede243507a0d90b2ad4b918deadb818491bb0ed15ce41886040c52650f9fd348ff57c03766fd1e7719bbb54726f8915e091cf94a5396da946102ca49fd07b2 SHA512 2d377c0c6fe8e34a463b35e96938507a3ca35fa06cd19a2682eb55825e1b88982a80a02ebb9a02a47f11ca5e8fe6a5b9e5c8114d955fa3b774e0148e82121818
-EBUILD sphinx-testing-1.0.1-r1.ebuild 834 BLAKE2B 6f12db632391972d66d41384d82b3280ca6cc329bf6efbfe2cca2c8ba048a69f375e211e2917efc81117f40c052cd94eea282787f9b376f21d05a63cb14c6893 SHA512 04fc97103581a7f7ca9b56013f2104df4c045bf89700fa6424470bea83e3f433773dae32d00d099473945079b9701d4f18e6d169421ad17d117cc03ed1ce8a45
+EBUILD sphinx-testing-1.0.1-r1.ebuild 833 BLAKE2B a97d3924164eb581b5b9314eaac7c67b0d558dac172628958108e04573aaf6c5879c34c6d38b47ff5e2b36dc78a5a2cfc52dde86c73be448ef01a4e24f551e2e SHA512 9d13e4899a0197fa8fd89835980944dd05f4ad707de5818e85f7ec6445886d9bd32120fa373ac3a80737e3e3045b86b93c03c2d3508d38d11525a61f8ba073af
 MISC metadata.xml 340 BLAKE2B 9a1df283aab1420d7818f4661b57f6d60cd734016c3711c633b9a6a11c401c8603503530fa5e1f50940bd28c1fed83196c1c543d16b5217b996f6afef23175a8 SHA512 f5299851dc6aa3c3ad1109123ac6c4eb5b5c7e1177fa1f068da5cef0920bbece63a8f1c424c5b95addf661e5a7d15a05a427676f6c272a54741495c77e316b78
diff --git a/dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild b/dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild
index 966d9b666d56..20290d8c0955 100644
--- a/dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild
+++ b/dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 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"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/sphinxcontrib-blockdiag/Manifest b/dev-python/sphinxcontrib-blockdiag/Manifest
index 40fbe9baf735..97d6c64ca7eb 100644
--- a/dev-python/sphinxcontrib-blockdiag/Manifest
+++ b/dev-python/sphinxcontrib-blockdiag/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-blockdiag-2.0.0.tar.gz 11903 BLAKE2B 9301fe05ff936836e8e648a507b7e2e5fd8cada58252fd46b274a4bb3e6b51b00b7696ceee712d12bd590c40c5ae1235e0b532ef55ffc2e78b2986cdae64a0f2 SHA512 305ad9b27bbb44480c69139cc0ae9cd8e47c6ad95da5b14a964c703a17e62ab9b342ff567e8312e403549a794f6381fe4c4d444ccb7a8e41410d1a3754ffb3f1
-EBUILD sphinxcontrib-blockdiag-2.0.0.ebuild 1207 BLAKE2B cdac468c9fd90646ab05ea5bd181888a7f54d34232860516eced6bc830900bd3c0ca82355fd614bcc301ce820d41572ebdf28e45a36006fd0be767523d1eedf8 SHA512 9d5c6f8a3bbf9e45824bae49ebe5fe7de54603ff7c2877a5017531de9a18779a9399ad41788e4697f6f29884edf5354e2e1dfc93336fc4e459177f148fa4f3b8
+EBUILD sphinxcontrib-blockdiag-2.0.0.ebuild 1205 BLAKE2B 257dd61b12cdb592df5644287738ecda043accffb4719014a692a2044c881ee3687d0da8b1bbf88e00fec933bf9df319ed5d8e6c39ae4308a3cc6b5faeabc28a SHA512 bb95a3c23189f14b607b8383241e1ef1f9da7978bbdce3d71608e9c1e0a2e13d5bc571c426b76404675c5c5a6edec1110ee94d07b1842cf1fb756241319052bf
 MISC metadata.xml 416 BLAKE2B 4383283e64d8db0b5576f1defc62412b5c4f4003e5ac75a2755e79d3e2a53f6d7aff82741d6225d2c96f0e2d87df650d47110a31cc91362dee641a86c54b18da SHA512 10fc4ff78fce4beadf8f8b64cfcaf4b71f84c3f74d80bd7299055ef7c2a759bf8d8eaef841e464d72d3272d999fe20ebfbcd382f2025932eef474387e92be6e0
diff --git a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild
index 8225357c130e..011fa2fdffdf 100644
--- a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild
+++ b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/blockdiag/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 sparc x86"
 
 RDEPEND="
 	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-newsfeed/Manifest b/dev-python/sphinxcontrib-newsfeed/Manifest
index bc9b094fe66e..fecc45d2c975 100644
--- a/dev-python/sphinxcontrib-newsfeed/Manifest
+++ b/dev-python/sphinxcontrib-newsfeed/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-newsfeed-0.1.4.tar.gz 10862 BLAKE2B 708c7a725ac36f54ea735953ba9d230b05da95147eabc91de9d610d3e02ec7d0d1ab8f5882d4e97327da425fc49e1b1a1753e011445ede859edd4f3cd5fb2a16 SHA512 96d9d0c15fca8b62f945bafc8f0eafa62df9c471f7510e2f153e47b66534e5f3041e5c01df772e6c35a9f09baa70064642f7f0fa43ccfd33dd64c2604494f2fc
-EBUILD sphinxcontrib-newsfeed-0.1.4.ebuild 865 BLAKE2B 2859c9b548cb6b7bdbbf39707ed8aec5149670d11165a10d7a22f6460f2b606aed93b59b2673b44bace4ca771a3920b6887caf835e060b2326179608373908d3 SHA512 5b5ffde0e9e969fc94e257abf5a05cdba97c23b1bf1b3dbd86b6a307e47e532f293d13e6383ece54be6dd81eae3ecd55db0d0d6e38ac44ab21325ec38d3d96ea
+EBUILD sphinxcontrib-newsfeed-0.1.4.ebuild 863 BLAKE2B 8e18072d197c80a00583359b774b72b24832d12c9bd61befd58353073e91584f6ce42cd00710e0e48c3b2b35d2232419f07606295440f3b828b7b55705649098 SHA512 30d91e1c23175b2eeb7becd43b90ba89d54b45e49e2e981d3c1fa7cdc5104f161eabd78fbc6984cfa12293299aacbb730bbeaaf6cb65d612d597c77e3c29e0ac
 MISC metadata.xml 331 BLAKE2B 9d40d757fbfbfc80c527481f0c1a3c558eee5829369ac3eda6ae4ed3ed63ef9b26a750057038aea1b670b48b9430aa6c4cf788d55a11ac7f072111c8a3437e5d SHA512 ec0eeb87c3e18a9ade919171833be4727e87d32664c83863bed8c33898112a2f237261b28e5b7a2521df495df61b9825cd8140352d9270e52412b53a1c5df3d7
diff --git a/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild b/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild
index 5ea09f7f8a3e..7b66056ce80f 100644
--- a/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild
+++ b/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/vobject/Manifest b/dev-python/vobject/Manifest
index abd9cd72623c..db1ec745dfdc 100644
--- a/dev-python/vobject/Manifest
+++ b/dev-python/vobject/Manifest
@@ -1,4 +1,3 @@
 DIST vobject-0.9.6.1.tar.gz 58556 BLAKE2B 74f9a7dc8058bb792492b1ac44a0310f58c603e677aedda35be0d8e94743e6e1e001a4ae888625f314f706891b7a31db77efa4c268482bbaf44ca37fff236cd6 SHA512 0b299fd4ca105a063f4ac7b03b157c54a3867d6fb798f9072897939b0ba275ba0887bb001c5ed38002a8eb1c10aee710af880413c072140b855af4b62d5aff72
-EBUILD vobject-0.9.6.1-r1.ebuild 753 BLAKE2B 5e93a983ffa494a90c4312796e508c38e988ccbf0713b756f772795f30bbc9a7991f3a11c371effa3a6b605099bf855f5e2bbed5a84f8bbf630487961528fade SHA512 92bbd48ae92e7032264dda17ab7a9d2148dac409251302d2ed3a90f559d2cc29cdbb6ddd28c6683dc813073cef0a5c997e0575921f42f68857aaeedc7ed27e2c
-EBUILD vobject-0.9.6.1-r2.ebuild 791 BLAKE2B 741daaae7d6cb2583d308b59917b90be29904247731a44feca84dc1e29d8e38aefba1fffc4c281703fbaf9738b6dd8b7c247f1a5ed5616943e58267cb4194c3b SHA512 2904ab0d3f98f03213fb843ab630181c054549069e32817ecb839565ced3d36472752a1caad6fce22f5d0cbd19d1bc68435e397e5448501aa6da7082a2fd2d01
+EBUILD vobject-0.9.6.1-r2.ebuild 788 BLAKE2B 1294d58e5ad668e1ac0a4336e146a643e6fdb0074e0dee560306ca1431aea08a93eb7646b1f9191a182bdc8c9355060d23ab43e87318143125da41a7f81dbc76 SHA512 6b108136f1cbaf222418527a418b955bd3c17262ebc75cd7ba3ffdcfb4b7215fa2071e51bc823c26462cb5a82041988c11f6819993398bf0b4bc227f98057045
 MISC metadata.xml 346 BLAKE2B 3d1f3f0efd8481b912aba7675d50f338b831d06108734b4622bf2aab5e0df5feff99856544ad12b5d2ac80393d16dc687a06359392c96e4c652ae062469a5095 SHA512 51588af560593c3553f3fa1fd97c1a058d71e819df55261ff7dd24e07a23f5f0290902debd56d509af4b8696d92fd4853f2deafb11b4d9a357fae754e7b62d8b
diff --git a/dev-python/vobject/vobject-0.9.6.1-r1.ebuild b/dev-python/vobject/vobject-0.9.6.1-r1.ebuild
deleted file mode 100644
index 1f5d43e37d48..000000000000
--- a/dev-python/vobject/vobject-0.9.6.1-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python package for parsing and generating vCard and vCalendar files"
-HOMEPAGE="https://eventable.github.io/vobject/
-	https://pypi.org/project/vobject/
-	https://github.com/eventable/vobject"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE=""
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=">=dev-python/python-dateutil-2.4.0[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-DOCS=( ACKNOWLEDGEMENTS.txt README.md )
-
-python_test() {
-	"${EPYTHON}" tests.py || die "Testing failed under ${EPYTHON}"
-}
diff --git a/dev-python/vobject/vobject-0.9.6.1-r2.ebuild b/dev-python/vobject/vobject-0.9.6.1-r2.ebuild
index ce291e2f41a7..ba78ad697171 100644
--- a/dev-python/vobject/vobject-0.9.6.1-r2.ebuild
+++ b/dev-python/vobject/vobject-0.9.6.1-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/websockets/Manifest b/dev-python/websockets/Manifest
index c6bde286049d..b8902c06de0e 100644
--- a/dev-python/websockets/Manifest
+++ b/dev-python/websockets/Manifest
@@ -1,3 +1,3 @@
-DIST websockets-8.1.tar.gz 58874 BLAKE2B 4f0541fdf5ebaa6199d9911e67279cbbe3937f8ac8f31f2579a35a9a5a7c468f925d20686bc47c6544b6c296f3d51e13e63edfdd199040ad00eb813905fbf70d SHA512 408e35d7a908830d51b3b9b73a1c34b1b2dbabbbbd2431515bc0fba7f6ec7db402a55fd00dc737d344549fd5d5f2d90e27cef7cd5f7847e4a1545d3c74db007c
-EBUILD websockets-8.1.ebuild 388 BLAKE2B 3ac1452196b138767e9d6c9b9bca7dd8234453d81b9df3c780fc21a0171c8d7bde52b8b7ac37d3a6cce7dc919ecb4ac8cb65345a29fff19231b0aceb236d6a23 SHA512 79197c685cf98545cd00b88ef72a1252e4e17e777cedd1a054cd3e544f1fdcb0908140e5b08843ae2decaff6ed06cf0ffacaaefa95a93335537c9d31d440cf13
+DIST websockets-8.1-src.tar.gz 156472 BLAKE2B 6cb5eec8276f7ef7172048eba6157560f42cec28acacc1a0a2f426ea1cab9a04029ebb1f8285b1aa2862c30aac8f2af81ef85d4dba8e53e267b665b718e01d5a SHA512 d245702574cf513da54bfc0ca10768558cd4e5017ecf8cb647f4b9176561192a3ace64edfc5c6f735664bf1b6136aa0bb9828114478f92d2c051e3109a218c12
+EBUILD websockets-8.1.ebuild 453 BLAKE2B 6017d2aaca566701b7d2094fd6a19861114c82790a18e2e7b0451fb343466f137fc82911628458489733414179614657cffc79d1cef5778aebcbacefc7d6897a SHA512 190f8da4dbb88f977fb6d792f15d708ac44efddac27c19e98ae226144023a99ed2ba96683c86776e58a69a12199885e57e5f8aa91333a6861f634c39389859d8
 MISC metadata.xml 338 BLAKE2B 75610f7068a63900e69ea8e9e3d4329e287f8f13d3f34986b8fd7876e64625cfcb6d16e9cb7e067cf6e2ac4313e70bd4c68a98eb6f10a387db67160fff51e4a5 SHA512 839e1f4babed41a34ef6831500bd12171d5a1bbd0a3d3ff6ef7fe8e9c245958bf0106dc79159ecf1e83e4c68d7a8ab90192c7128ac3450630ee7e0b66c68ea2c
diff --git a/dev-python/websockets/websockets-8.1.ebuild b/dev-python/websockets/websockets-8.1.ebuild
index 4bc08cea5166..074ac905ba2c 100644
--- a/dev-python/websockets/websockets-8.1.ebuild
+++ b/dev-python/websockets/websockets-8.1.ebuild
@@ -6,10 +6,11 @@ EAPI=7
 PYTHON_COMPAT=( python3_{7,8} )
 
 inherit distutils-r1
+distutils_enable_tests unittest
 
 DESCRIPTION="Library for building WebSocket servers and clients in Python"
 HOMEPAGE="https://websockets.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/aaugustin/${PN}/archive/${PV}.tar.gz -> ${P}-src.tar.gz"
 LICENSE="BSD"
 
 SLOT="0"
diff --git a/dev-python/zope-interface/Manifest b/dev-python/zope-interface/Manifest
index 5f6e7de016ce..d766eb97cd57 100644
--- a/dev-python/zope-interface/Manifest
+++ b/dev-python/zope-interface/Manifest
@@ -1,4 +1,6 @@
 AUX 5.1.0-drop-coverage.patch 571 BLAKE2B d5f334b7f5ec5df710174f9a3768c2d7400cefec7c3bb7cb0e4a3fced701b812af738d601ced61df57b78212f1ec621c6a53b906be2bbdf0838c31dc8c6f9e29 SHA512 04b30a85357fd7d0e0a4c52913b0260cc437f7cde2344399d400c2fc0e10cc60261eb4a3201954a515dfd030cfa564c9a222424390af8a3e20349270c89272b6
 DIST zope.interface-5.1.0.tar.gz 225400 BLAKE2B 6ad412bbf3c0327d2b8f37899c1e71fe4bf63c3840c9f2c7e776e3208ec8999c4812aaae89cb9a78724b40ef3dd883323b00eeccab44714eabef6c33c171be48 SHA512 be8319913222ada47a22559e22322ec12dff3adf17f45335d007c5aa3509d84a7d0a7e6c113967b91810b3613344b5c60e002eb740af2bbb454b2807de8dad98
+DIST zope.interface-5.1.1.tar.gz 228612 BLAKE2B 4452a9e75feb496e933add5b15c17a782c78aaa0274eae09955ce618dd5946997d29aedbd4856952467e243ccdda923b66925af27afefeda03aff78f5f8f1fe4 SHA512 9cf195154592f5bac3335420eb01c55914b856e4b135b1756c9d812aa9418dcbd82a7e8438d3d1b5891867ca655c722641eb4d1606c47132aa8f9523b67c5725
 EBUILD zope-interface-5.1.0-r1.ebuild 1272 BLAKE2B 1437e599497f408b3db543bda6046a36e730208a0d5c3f0b5392125364ec6cfb3dc098a2c2205306f6ef9b60b34ea247dd65c931fc757a11bd4c0036a82a39bf SHA512 802dabf239d0f29cf66549e86c36040911ec169ebb5aefa81b5702ed2a50503888363db415f9992a481a1d1d53cbd8ba3311e15eff918a2a19d6f623bc3df99a
+EBUILD zope-interface-5.1.1.ebuild 1340 BLAKE2B f5eaddb94e5e7e511181310a89a46fe982ea40b807b050d22cad09865f590c9ba55b3eb0a43fde5a670d74646add7766e3d8cfbf498458f1d40b383598f36de2 SHA512 2493fbeb4d98b669b1c0cf8cd27fbaf886eaeb48837afc035046ee7314cae6e5502ff3edbcc3e4c138525f875fc9afb57b3ef4bf89574f42a095731e200999bf
 MISC metadata.xml 386 BLAKE2B f8454bc6cb7c55f203d75f44428b0fe404d050e4938f80e5ca1e0504811a3ea73980ab474d12b47f31a87ed508a2f23143d6393eaf2f66eaface7b35a2058a61 SHA512 fc31e083f990006f9a4bdf1cdef5b8efee3e69e8444f614dd5fdcc0d7ddb8291cc1e45c21ab1418668c2e247068a39467e837aa8b869cc050a856635b8789fdd
diff --git a/dev-python/zope-interface/zope-interface-5.1.1.ebuild b/dev-python/zope-interface/zope-interface-5.1.1.ebuild
new file mode 100644
index 000000000000..5de915fb7e90
--- /dev/null
+++ b/dev-python/zope-interface/zope-interface-5.1.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# pkg_resources namespace
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN=${PN/-/.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Interfaces for Python"
+HOMEPAGE="https://pypi.org/project/zope.interface/ https://github.com/zopefoundation/zope.interface"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/zope-event[${PYTHON_USEDEP}]
+		dev-python/zope-testing[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/5.1.0-drop-coverage.patch
+)
+
+distutils_enable_tests setup.py
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
+		append-flags -fno-strict-aliasing
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# remove .pth files since dev-python/namespace-zope handles the ns
+	find "${D}" -name '*.pth' -delete || die
+}
author	V3n3RiX <venerix@redcorelinux.org>	2020-10-01 23:05:41 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-10-01 23:05:41 +0100
commit	2e34d110f164bf74d55fced27fe0000201b3eec5 (patch)
tree	f00ae60197c58f84ad51f60b210738d9b70f555b /dev-python
parent	f70a1bfc721336d4fc7dfb711c2f518a6b18cf16 (diff)