gentoo resync : 14.12.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-12-14 13:26:14 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-12-14 13:26:14 +0000
commit: 6abbf81ef2f298e3221ff5e67a1f3c5f23958212 (patch)
tree: 25413d1cb3a0cbfe36029db32398c0f333609215 /dev-python
parent: 9c417bacd51da6d8b57fa9f37425161d30d4b95b (diff)
1724 files changed, 10627 insertions, 6214 deletions
diff --git a/dev-python/Babel/Babel-2.9.0.ebuild b/dev-python/Babel/Babel-2.9.0.ebuild
new file mode 100644
index 000000000000..625b41efab30
--- /dev/null
+++ b/dev-python/Babel/Babel-2.9.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
+PYTHON_REQ_USE="threads(+)"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of tools for internationalizing Python applications"
+HOMEPAGE="https://babel.pocoo.org/ https://pypi.org/project/Babel/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/backports-zoneinfo[${PYTHON_USEDEP}]
+	' python3_{6..8} pypy3)"
+DEPEND="${DEPEND}
+	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/Babel-2.9.0-pypy3.patch
+)
+
+src_test() {
+	local -x TZ=UTC
+	distutils-r1_src_test
+}
diff --git a/dev-python/Babel/Manifest b/dev-python/Babel/Manifest
index 8bd4eb189b4c..ad68b19c11c9 100644
--- a/dev-python/Babel/Manifest
+++ b/dev-python/Babel/Manifest
@@ -1,6 +1,9 @@
 AUX Babel-2.8.0-py39.patch 7421 BLAKE2B 94a9b55504214b4c422cab61651dcc4c9192f438635e0ec6aa77ea1b53fefb782dd4a1d13ba89500fc2c2e13bebfc616529aaf74c18a55304fd23c2c53fb77cc SHA512 8d738bb0140c80bb2db8a2180c563f61500df42de1b69f0b2a36dea23aad889fe59451fca993161f6ca6a2f6006d98ce94ab139eb5be4a1a25f43e922e3fc9de
+AUX Babel-2.9.0-pypy3.patch 1130 BLAKE2B 23abff434e982c8d8f8350c599b3b94ee07775e7244ce26f9bdd1d91b00ca0f25c03ee2b52b466b42de10036ad2004b6bfc53a1abf10bc328f5ad98a48604078 SHA512 8cae713129f7fb87d22b7cd5f5eb196a2f8990f83141bc9617f79b3e9c56e1873e1d74adaec79b4bacf0c6a7d721fb9ce5cd747fef355a55a1e518b94536d978
 DIST Babel-2.8.0.tar.gz 8444381 BLAKE2B ea3757182464770f47d3253e77bece7b64c84558e7a19fc55759198bfa55c6d8156d27e9de7b796b62eefd93e458c7e00b2014dd23e4ed7383f5bc9785d1a332 SHA512 f9687b36176c146a8ace073197111463d24fca343bb1dbee8b0e37a7f37b68b4cd77ffbe3bf14a20f8f64c701aa860e0b5e6076658a95dbee2556f0688d68d91
 DIST Babel-2.8.1.tar.gz 8471453 BLAKE2B bc2e66a3c1c77e5b190cdb3f53d149268b6f49adde3040cbe6a3dd8eb98f6caffb3988232e76083e606186a87b9ee6b2b5352de89b7bc43d4f72905f1f594127 SHA512 ed39ad01b873d40d0bc611739761d412ff442b2df3d4c2363ec24501547da678cb752f640a02470c8513073a76c468c27fc16248820c779ef7adbe14d0f07199
+DIST Babel-2.9.0.tar.gz 8682986 BLAKE2B 0e1e8fe647fdd27230ee9c97f0994772bd5877f262f9cd00eb450445c5780b278249f87d50f98c5ca3fa5eca287c6b4fc74c5e082c522c250d640912f0ebc581 SHA512 250d1a19741eb0d1bda9d6b862f2d4779b6c67f10b8e045f450a271a16587e30f26f35ccccfea8ca13bb519582d2ef83569fa4381d0590fb9b61bf3ebf67e5f6
 EBUILD Babel-2.8.0-r2.ebuild 931 BLAKE2B cc27c7f1f16a42da4e2f43682d94d45d6a48e64254e777b978ded1d1b73e2f047cf6918d8402fc255e681d3bb4afe208877e2f5fa49166af3ce42cb1c52fd4e6 SHA512 1d12e8f8523b20dfdaf5867277c2cf1ebbffb7c508a812391bf2551a8a846087139ed60393b3360d1090a479abb2f0b4948447c1ce423f2882519fe3822c22d5
 EBUILD Babel-2.8.1.ebuild 947 BLAKE2B a76a3a7c5354e9216f890460a28fe0db35976ac6d76fd1ece62dd79464fe04f317cf436dffbe6dfe45508cc8a8abcc8086d6124af9640e95ced202e2e290a2d1 SHA512 2cea5488b8a87d7967949de765817b70a013775b9053ba252ce6ee66e0d3643b45598bee19dd8bd0d6a26f31c18277a654971475cf11fd0ec97d3547a00f600b
+EBUILD Babel-2.9.0.ebuild 923 BLAKE2B e0513deaa1b26f367b104800479b919a63534b23072ff918a3822725050294249c6c9fee95f257fe95abaa7f9ffa95132069fea47279c276e7e72af9073c8b5c SHA512 28e1d946896fde2ad737a28cd36b0d576e57fe1fbfc0b3230928a939caa60382c196440a757bec269eeb7198ab6331aa571ce7c99c7e20ac6a81b261fdd7a934
 MISC metadata.xml 839 BLAKE2B d9916ce88ce8436bb28d15300e78013e1c9e0f88f385a369c0ad6840f0fe81ad136052a3c257cef50a2fd86500bcde2b652ad0ed664f95d6affa4ccc8770445b SHA512 3688c1488c552b84c685d0aeb6251aea4f9d41be3db3aeb226291655107e1332df13445545b3742587e133de7468a40f22ca53fa67fd8d2e0db570069498654f
diff --git a/dev-python/Babel/files/Babel-2.9.0-pypy3.patch b/dev-python/Babel/files/Babel-2.9.0-pypy3.patch
new file mode 100644
index 000000000000..45d50f5ff0b7
--- /dev/null
+++ b/dev-python/Babel/files/Babel-2.9.0-pypy3.patch
@@ -0,0 +1,33 @@
+From a291ee5da29fb9767ce8dc5f94e3fa19908f2596 Mon Sep 17 00:00:00 2001
+From: Keri Volans <keri.volans@gmail.com>
+Date: Sun, 10 May 2020 18:43:58 +0100
+Subject: [PATCH] tests/test_dates.py: Fix broken test
+
+datetime was being incorrectly patched, so the unittest was failing
+
+Closes https://github.com/python-babel/babel/issues/675
+---
+ tests/test_dates.py | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/tests/test_dates.py b/tests/test_dates.py
+index 5be0d16a..3cd70d3e 100644
+--- a/tests/test_dates.py
++++ b/tests/test_dates.py
+@@ -761,7 +761,6 @@ def test_zh_TW_format():
+ 
+ 
+ def test_format_current_moment(monkeypatch):
+-    import datetime as datetime_module
+     frozen_instant = datetime.utcnow()
+ 
+     class frozen_datetime(datetime):
+@@ -771,7 +770,7 @@ def utcnow(cls):
+             return frozen_instant
+ 
+     # Freeze time! Well, some of it anyway.
+-    monkeypatch.setattr(datetime_module, "datetime", frozen_datetime)
++    monkeypatch.setattr(dates, "datetime_", frozen_datetime)
+     assert dates.format_datetime(locale="en_US") == dates.format_datetime(frozen_instant, locale="en_US")
+ 
+ 
diff --git a/dev-python/BitVector/Manifest b/dev-python/BitVector/Manifest
index d8ba539e501a..dad691c160d9 100644
--- a/dev-python/BitVector/Manifest
+++ b/dev-python/BitVector/Manifest
@@ -1,3 +1,3 @@
 DIST BitVector-3.4.9.tar.gz 128306 BLAKE2B c9559596dee2d9315e9a906e24d4d67ff74c56e2a0f94ccf7dafd360a5554b46f61a7e7e5bc30fa6a4175c97f6d42022468966ab123250319d36f65b23624079 SHA512 be2144a35990b46aa2cbd71d65db51baac5fec65d4c91a1e2222857b307c96f5551adf1c5a86f145f01fa895465b99bc02a485d5d7a43495dd1e05b9a0d9d513
 EBUILD BitVector-3.4.9.ebuild 635 BLAKE2B 0a3664179047416b40e55cb713c35c58807d13741d5d826acf4941b82d35bf1628dd8b6ed9114a2b132660e712bb46f935b0178f387ab4961182c7368653e199 SHA512 b072bc35888cd2864472a9ff7089355aa1c322a854a2cf115e7823aa7b6269209c919e866172c9afb7597707329089241dbb8d85263603b33996ae794d951f6e
-MISC metadata.xml 347 BLAKE2B eaf865a42d263386faddd64b393d1c3119e7c5a0054f4275afad6834dcf6170f10df5960dd4a457d317a542db0586b2d4cd6d20944f51974480485245dc3e543 SHA512 40e1b5745589984f4228a2360304a1ab4da57ea85b8a0bd14a2066f874ed62cb795562ee6802bd3c4803426eed421138ffedd15aed1c95cf20019ad611cc975e
+MISC metadata.xml 419 BLAKE2B 36f8dbcebc7fabbff0be1eebd52558eead8092cb15dbdcf5a816ce834c4486dc3743022f11b8d8944fa6e055b3450a7a45f2327617289b562c07d8057966c990 SHA512 dd2061a42827712b25efe3b0ac14db337945a89405506241a199cd17387c138361155e7e42bf8a3b9e75a03ba008957f376b2ec3294f05308cf07395b074ecdd
diff --git a/dev-python/BitVector/metadata.xml b/dev-python/BitVector/metadata.xml
index a2dbc076e2da..f9728c70b431 100644
--- a/dev-python/BitVector/metadata.xml
+++ b/dev-python/BitVector/metadata.xml
@@ -9,4 +9,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">BitVector</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 34adee8f3ac9..e82a2bb32aa0 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyGithub/Manifest b/dev-python/PyGithub/Manifest
index 8fba06ed9a60..5e595b594d5c 100644
--- a/dev-python/PyGithub/Manifest
+++ b/dev-python/PyGithub/Manifest
@@ -1,3 +1,5 @@
 DIST PyGithub-1.53.gh.tar.gz 3026570 BLAKE2B 7204c5934b94d5629b38e841a9c9011ea561ca8aa8d3d169915975fb02fe8db059fcb521d11bbb2350a806457d98abbfe36a19c4e5f633c82cdf06b8b7203c6d SHA512 f98d013d5fdf31ee59405c52edb35942ca5a3d2c1ff9653c71f03871bb28d0c247412bfc2593991026ddb989e1a33dfe91d19b4ebb1e89386b54493d51071768
+DIST PyGithub-1.54.gh.tar.gz 3117061 BLAKE2B d180b9c0192ad22b84cb17ff6c9a7c4ad4d490c149549515727a0f1ab4e572461d461cdcd4138a0d9f03f26b0a689579bd7ec875896330a3c43e5cfb45411dc7 SHA512 c716df1f6dc64ea6bc56db82b0f0263dc0ec29994ea9fa967c22a0eee07c4ccd206f14168e36df7d913cfa387ecca703cd2331cd549bd42ebbec0e33ecd15c44
 EBUILD PyGithub-1.53.ebuild 765 BLAKE2B 00f5df1c6be8b6f146d7c5f27eec89cd001c2c2cdf14ff1abd4aa84c089b76e42dd35e478b1aab3583b4ed6524a21cc68d391b598bee60c791df044fc3431094 SHA512 1ba906569f5ec5c07d5c7c387024cb0b6285a7f535ca04e3396d373815a2ea342e7e6be33355cb8e6f50e5aad8f4dbc556a1d6ce6a9476da79ed7a3249f0aec6
-MISC metadata.xml 471 BLAKE2B 1d1b80ed6b439d4e66af20c29e7ff4a2c229e29bcd9c3b8c4735c7e15f8176c0fcecd88d2cc26745edc52f99c75e9e70ffb70df1a1acc2b46c29d8801973effc SHA512 a6c6fb332c408fd4219ec277d30233693397b9badf6a8bf438ff65ae3cbb9431caaf4124c2291cf9cc9b1dc671f162bb6018de7ec6495f6a9740daf9a25bffb1
+EBUILD PyGithub-1.54.ebuild 767 BLAKE2B e06845d6d84823f891fcb5cfc2278193b625d536ba95e063bb0fe5fe99617155a2a38eca2d7e057f1d25e12752906e52096435d9de44d919d99a9a7c5bdab6a5 SHA512 a67b987c5663a5fe7b9f883e387523ccb04513ac176c2754ceae509998f1bf978b0892d87889e60baacb88033112cd1d5ba5a74e3c58cbc4f65249db6e27e6fa
+MISC metadata.xml 500 BLAKE2B 54b420b2aa57e2056d12b79a352a13cda1e26e28478fd724863949c30db61df7b64f79de17c8f75562e295468146b439d43c1beb37dc42e5bf1e3733b671e579 SHA512 184b8b3570d44a06976dfa1bdcd1af1ddcc2e59d9791e0df881325c90bca711923ed19c342886cb950263129b28ff8f04fb3c41ad31423e8b9cba20bf586661a
diff --git a/dev-python/PyGithub/PyGithub-1.54.ebuild b/dev-python/PyGithub/PyGithub-1.54.ebuild
new file mode 100644
index 000000000000..0a466756e898
--- /dev/null
+++ b/dev-python/PyGithub/PyGithub-1.54.ebuild
@@ -0,0 +1,28 @@
+# 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="Python library to access the Github API v3"
+HOMEPAGE="https://github.com/PyGithub/PyGithub/"
+# Use github since pypi is missing test data
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/deprecated[${PYTHON_USEDEP}]
+	dev-python/pyjwt[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		>=dev-python/httpretty-0.9.6[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/PyGithub/metadata.xml b/dev-python/PyGithub/metadata.xml
index 5a8ef9e1446a..584579126618 100644
--- a/dev-python/PyGithub/metadata.xml
+++ b/dev-python/PyGithub/metadata.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>mgorny@gentoo.org</email>
-    <name>Michał Górny</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="github">PyGithub/PyGithub</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">PyGithub/PyGithub</remote-id>
+		<remote-id type="pypi">PyGithub</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/PyICU/Manifest b/dev-python/PyICU/Manifest
index 0fcbab5da194..06debadc999a 100644
--- a/dev-python/PyICU/Manifest
+++ b/dev-python/PyICU/Manifest
@@ -1,3 +1,5 @@
 DIST PyICU-2.5.tar.gz 225591 BLAKE2B 0b0f61439cac355ca3ec930eea0624892ac5f158ecfc82a57f526044be486a676ac201231cf34cb2470e33bfbd2f198439462d0814959ddc25526d6408704151 SHA512 b2641c6f9956cd8026150923f0f10031712c426f45ed2b9fe468ce85917b028a6e1988ac73cd74e9eec2569601ece77018aa06863525e24df1944d4a5b762548
+DIST PyICU-2.6.tar.gz 233826 BLAKE2B 318b87b878f8d49f47f48780567751671f5f88902c4cae9a243a81300b002ca6ea2336aee38bfc76a3037326f15f197fd71819173b678c68094d16f8db51864e SHA512 ab4c167cbeb80a23904476e51a3c16aa4721e26840b1d4c2f44b5a610e5467a6880c45f27636efb9e44e8e4302a095d437f4868409103270d79ecd56a3d90c9c
 EBUILD PyICU-2.5.ebuild 470 BLAKE2B c9782693ea1983db6b9e897e1d7e86675d6adc2e9c015e4785666f684d62902324069267454ec54597cd9648e470a0ec0fb8ab66e4cb9c3436c076422cf448f0 SHA512 27ab45263d354436f54cf4d1a7a33afc54e4a8b1d0ab329e1ac15b17153239b6769601cf1137c0a2287e47b674148839054a4a7258995ffedb5c3bba7639b421
+EBUILD PyICU-2.6.ebuild 472 BLAKE2B 7f8a3a5168caa24dbf180c2cb09541da18ce24c8f3fdfc59e49c0d8e30667407955f2a4b6b7152db36df37ab88d475a6402ee2ba6bbd327fa01b932667fd9c7a SHA512 fb788da225111e20e0407646fea60dd474faf99d070ee1ca7f138eb4a4ccc519336646299bb50f78efd35636a046c852b00e1843cfe91a7899d5c846e7bcd4ce
 MISC metadata.xml 358 BLAKE2B d35d487a8be34ecff1465171ee9fd9381c35da622401faebce3d55f160a36b6dc94f8ec109e74e01571fc91694bc932fce7cacfa60dfa33a0615daf00fb1f762 SHA512 b2e487bd32ab89cf1d5f0aa5ff10b394560b2415fe5b5c433c78a551324a17bb25603115020216706e775a9eedcabab431255032486d7b8c1a5f1296a2ff8835
diff --git a/dev-python/PyICU/PyICU-2.6.ebuild b/dev-python/PyICU/PyICU-2.6.ebuild
new file mode 100644
index 000000000000..aebc83f22dad
--- /dev/null
+++ b/dev-python/PyICU/PyICU-2.6.ebuild
@@ -0,0 +1,23 @@
+# 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="Python bindings for dev-libs/icu"
+HOMEPAGE="https://github.com/ovalhub/pyicu"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-libs/icu:="
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGES CREDITS README.md )
+
+distutils_enable_tests pytest
diff --git a/dev-python/PyQt5-sip/Manifest b/dev-python/PyQt5-sip/Manifest
index dadaf08d576d..5e140a889b85 100644
--- a/dev-python/PyQt5-sip/Manifest
+++ b/dev-python/PyQt5-sip/Manifest
@@ -1,7 +1,3 @@
-DIST sip-4.19.22.tar.gz 1050805 BLAKE2B 7382fdf74c5bb8b55bcedae74acdcb7b81ef06a64d129a9e6f11a5eb293900e37df513f1c4290f2299f49a5bd97e2a6b3c6bc32ddbf2eaf848bd5e5c5dc25edc SHA512 4d366e589945e589f69a3caf979076ef37e319ac0efdd8ec3cee4869da89e112832462215ca2e235036bacfade7efc4d530aa93e7492c283dc1b2503e08feea5
-DIST sip-4.19.23.tar.gz 1053640 BLAKE2B 316c972a5cf7dd6464a418702e7d91192202330cf89a78d6ef480034ac8fc2f3f4cfedb85e6bc7d3d018bfe3d29ea767133db008dbfa521312e3aea2b96cff74 SHA512 a50c6202ebb6a5d1c98b6fc79925fa5d82236a944003854b057be9e2f7340d5cd689ba0e08f46f521736f3574c4089768c869bb8921e66b23944a31a832770f1
 DIST sip-4.19.24.tar.gz 1055461 BLAKE2B 6990b127a83fa57bc084eb9a1097f73c384b4fcf3d181479557fe2ffc66cde254bfbb5aef26f5ddd84dca346f54184952e7a111adf3b665f68571853e63b6575 SHA512 c9acf8c66da6ff24ffaeed254c11deabbc587cea0eb50164f2016199af30b85980f96a2d754ae5e7fe080f9076673b1abc82e2a6a41ff2ac442fb2b326fca1c0
-EBUILD PyQt5-sip-4.19.22-r1.ebuild 2053 BLAKE2B 0925192dce6fab7d8106f83ec522c8f1a9828f5a4a8a654370adf75e82c427453a3345ec9c6f005b5dc861c5b60a92c909077624a87a455839e5db5b13fbf6bd SHA512 d12679262992b88569f41a66b1df7c38c4330f0fde21fdf874081066459581131ac6ddd883473268cf797502f36a7f4f14bfe870abc042d61cc1450cb9099db4
-EBUILD PyQt5-sip-4.19.23-r1.ebuild 2057 BLAKE2B 11461c7345631242eabc7a8f234cfcf6effefb678d7104278e8b13ef194bcb85522121e19ffae23c980a6ecf0bf7de1593fcccda00c8ff67e548e6d7c4fea32c SHA512 e846c688c4732add0fed0bb4b971c880becbcea2728e4a510f9d7dc6de906a0ca743405a060866c56b6f0ac2d04e9a089b7ec17419a16600f366a14b38775c3d
 EBUILD PyQt5-sip-4.19.24.ebuild 2050 BLAKE2B 67dea5878ed4c64b5dc50558cee40fa5e48175cee88293b95c45016d892d1ed645573012da431ccee251903d1b574823490b21f2931e8f5b59cb91e078c1231f SHA512 efdd46c1767c410b44153883aa64b9bfdb10b29642898aaddb9142be3ffe3ec034d6383827c11dab7c016bdea09f4a8628d11a83385f8f7bda3f2d6909feeefb
 MISC metadata.xml 648 BLAKE2B 3e1ad5efbd33a225238ca0b7b3847349dd942b116d3a5ab4dc94826b6745b761cbc791ee314ad0c7867fa8f9cd63b659d4d8fcdcd4a488e58371f2f7f122a2e4 SHA512 e9347175c4203ba811b021ef07919cb911c6969c98886c855af1f74cf3140c57d0ae5d0a4e8b2bca5aac8dceccb774be96264f376ecffc777f53de4ddaf4f8f8
diff --git a/dev-python/PyQt5-sip/PyQt5-sip-4.19.22-r1.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-4.19.22-r1.ebuild
deleted file mode 100644
index 9313ec901ef5..000000000000
--- a/dev-python/PyQt5-sip/PyQt5-sip-4.19.22-r1.ebuild
+++ /dev/null
@@ -1,90 +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} )
-inherit python-r1 toolchain-funcs
-
-DESCRIPTION="Private sip module for PyQt5"
-HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro"
-
-MY_PN=sip
-MY_P=${MY_PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-else
-	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
-fi
-
-# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
-SLOT="0/12"
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	!<dev-python/PyQt5-5.12.2
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	# Sub-slot sanity check
-	local sub_slot=${SLOT#*/}
-	local sip_api_major_nr=$(sed -nre 's:^#define SIP_API_MAJOR_NR\s+([0-9]+):\1:p' siplib/sip.h || die)
-	if [[ ${sub_slot} != ${sip_api_major_nr} ]]; then
-		eerror
-		eerror "Ebuild sub-slot (${sub_slot}) does not match SIP_API_MAJOR_NR (${sip_api_major_nr})"
-		eerror "Please update SLOT variable as follows:"
-		eerror "    SLOT=\"${SLOT%%/*}/${sip_api_major_nr}\""
-		eerror
-		die "sub-slot sanity check failed"
-	fi
-
-	default
-}
-
-src_configure() {
-	configuration() {
-		local myconf=(
-			"${PYTHON}"
-			"${S}"/configure.py
-			--sip-module PyQt5.sip
-			--sysroot="${ESYSROOT}/usr"
-			--no-tools
-			AR="$(tc-getAR) cqs"
-			CC="$(tc-getCC)"
-			CFLAGS="${CFLAGS}"
-			CFLAGS_RELEASE=
-			CXX="$(tc-getCXX)"
-			CXXFLAGS="${CXXFLAGS}"
-			CXXFLAGS_RELEASE=
-			LINK="$(tc-getCXX)"
-			LINK_SHLIB="$(tc-getCXX)"
-			LFLAGS="${LDFLAGS}"
-			LFLAGS_RELEASE=
-			RANLIB=
-			STRIP=
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-	}
-	python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		emake DESTDIR="${D}" install
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	einstalldocs
-}
diff --git a/dev-python/PyQt5-sip/PyQt5-sip-4.19.23-r1.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-4.19.23-r1.ebuild
deleted file mode 100644
index c61529a6f32a..000000000000
--- a/dev-python/PyQt5-sip/PyQt5-sip-4.19.23-r1.ebuild
+++ /dev/null
@@ -1,90 +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} )
-inherit python-r1 toolchain-funcs
-
-DESCRIPTION="Private sip module for PyQt5"
-HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro"
-
-MY_PN=sip
-MY_P=${MY_PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-else
-	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
-fi
-
-# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
-SLOT="0/12"
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	!<dev-python/PyQt5-5.12.2
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	# Sub-slot sanity check
-	local sub_slot=${SLOT#*/}
-	local sip_api_major_nr=$(sed -nre 's:^#define SIP_API_MAJOR_NR\s+([0-9]+):\1:p' siplib/sip.h || die)
-	if [[ ${sub_slot} != ${sip_api_major_nr} ]]; then
-		eerror
-		eerror "Ebuild sub-slot (${sub_slot}) does not match SIP_API_MAJOR_NR (${sip_api_major_nr})"
-		eerror "Please update SLOT variable as follows:"
-		eerror "    SLOT=\"${SLOT%%/*}/${sip_api_major_nr}\""
-		eerror
-		die "sub-slot sanity check failed"
-	fi
-
-	default
-}
-
-src_configure() {
-	configuration() {
-		local myconf=(
-			"${PYTHON}"
-			"${S}"/configure.py
-			--sip-module PyQt5.sip
-			--sysroot="${ESYSROOT}/usr"
-			--no-tools
-			AR="$(tc-getAR) cqs"
-			CC="$(tc-getCC)"
-			CFLAGS="${CFLAGS}"
-			CFLAGS_RELEASE=
-			CXX="$(tc-getCXX)"
-			CXXFLAGS="${CXXFLAGS}"
-			CXXFLAGS_RELEASE=
-			LINK="$(tc-getCXX)"
-			LINK_SHLIB="$(tc-getCXX)"
-			LFLAGS="${LDFLAGS}"
-			LFLAGS_RELEASE=
-			RANLIB=
-			STRIP=
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-	}
-	python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		emake DESTDIR="${D}" install
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	einstalldocs
-}
diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index 3824b62c4d10..634b94810d1c 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -1,7 +1,3 @@
-DIST PyQt5-5.14.2.tar.gz 3246557 BLAKE2B 0dd57da76dede97349c1af1d97cebad430dd5ae03c99b71de2e1ef1c41c1503820b0c0b1af8ddb507ffa5d6f466f7d3012db2cf625dad949dc4c962fb9e8a6a3 SHA512 56d9b2970ff50f2af0bfd889ad1226bf64087a6210cc545c5a0188352d1651343fcda9d53f04b041273f61bf31baf43af4a1854c1b580d50c28cff82f59c24ec
-DIST PyQt5-5.15.0.tar.gz 3262004 BLAKE2B 6f9751bb00a8099555da89cc0df26d36906fabaf12eba60d11479152ad78805ba84d6de9c32b6212a19edb38b10c2253976a964bdcfaf18b8b8aa3656126b73f SHA512 35bcfef4d7ccfee04c1c4409d2af3d862f1e8e46d6ce743bfcfbaf43d2046bc58317824b0840f3db460ad280d1b7e896812268b36225198e916a1d9ea86823a9
 DIST PyQt5-5.15.1.tar.gz 3264559 BLAKE2B 20060297c52aa5d07ba28b50440bd3623b8648eef8502693f8175af9ba4edf9238b9be71c696ea2589556ad70e70e868dc9c286466af22867ab51d5c66e613db SHA512 a7378dd53337c58f5ba7e9f7510b57fe4affe578b68975ce1dd7ba5c2a1c77d08d51d11078ce782aab09509df934eb3e4d0588de87391f74ad99f9624644cc4e
-EBUILD PyQt5-5.14.2-r1.ebuild 5728 BLAKE2B be7eb17461a7de96db7093a308760f5bc8e7291cf33c85a3ec23cd587c06448d27b83d91c2359ef6bd5f2fd0fa07ac8839e79bb378e9314ad14e20c08ae79ce4 SHA512 6a29fbc177ee262d0f5551b3246d2512f6f2ec0b47db991a0885372c5c0afa5ce8a4d3e712791746894b90a334ce5bc33649b6a290ebb2d9c7a96adfc77c6c85
-EBUILD PyQt5-5.15.0-r1.ebuild 5740 BLAKE2B ef0da446f5bcc809cd0bb1c1d194a6183cc0dba0ddeee12658995d127542377d19bb75c46a4fbfa9353f8462b4f74cca16b81e5bed03bd1aac2dbaa5f8ddf461 SHA512 2d077f9eb58f623f835cdf0d13a8b5686037a553e4bad4ad7a14771fa58e0234f9ed9fecc580b43d98430f09afe101431e3b1098467960e6cf73df19740bb107
 EBUILD PyQt5-5.15.1.ebuild 5645 BLAKE2B e4d0ea23235af95deb7532aaf613bbf2b23fbc032eb5fc26be89cda774774b552d7ed4a83329fb9b162eb9d1d6f9d4be7d7b00d67e0094a780c1a851e116180a SHA512 69dfc5e0d4a9c975a062a5deb20a7f48e18e56b42f137ff56544d3e6d610495a011d15a6eb231d9938892f4ebb15375b3a20452caed63d35ec5ed1a388fd62b3
 MISC metadata.xml 2354 BLAKE2B 765b65d4070c72689637e5f9cc2f5499ee4b8fa622ce75fc87a873e9b69079dc83474ce03a79b4c77ed6cf9c46881e0d1d629d518b6d14849b9ce5f72eafff04 SHA512 21444cee42058a0b134c27c67ab8219dcc96c5898de4112e8cd125a46e61ec7f421a2f58677991bc3bb2c330e55fe2382b561ead1a6623d549210e7ddf06b6ec
diff --git a/dev-python/PyQt5/PyQt5-5.14.2-r1.ebuild b/dev-python/PyQt5/PyQt5-5.14.2-r1.ebuild
deleted file mode 100644
index 6f47872f089c..000000000000
--- a/dev-python/PyQt5/PyQt5-5.14.2-r1.ebuild
+++ /dev/null
@@ -1,193 +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} )
-inherit multibuild python-r1 qmake-utils
-
-DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/intro"
-
-MY_P=${PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
-
-# TODO: QtNfc, QtRemoteObjects
-IUSE="bluetooth dbus debug declarative designer examples gles2-only gui help location
-	multimedia network networkauth opengl positioning printsupport sensors serialport
-	sql +ssl svg testlib webchannel webkit websockets widgets x11extras xmlpatterns"
-
-# The requirements below were extracted from configure.py
-# and from the output of 'grep -r "%Import " "${S}"/sip'
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	bluetooth? ( gui )
-	declarative? ( gui network )
-	designer? ( widgets )
-	help? ( gui widgets )
-	location? ( positioning )
-	multimedia? ( gui network )
-	networkauth? ( network )
-	opengl? ( gui widgets )
-	positioning? ( gui )
-	printsupport? ( gui widgets )
-	sensors? ( gui )
-	serialport? ( gui )
-	sql? ( widgets )
-	svg? ( gui widgets )
-	testlib? ( widgets )
-	webchannel? ( network )
-	webkit? ( gui network printsupport widgets )
-	websockets? ( network )
-	widgets? ( gui )
-	xmlpatterns? ( network )
-"
-
-# Minimal supported version of Qt.
-QT_PV="5.12:5"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/PyQt5-sip-4.19.20:=[${PYTHON_USEDEP}]
-	>=dev-qt/qtcore-${QT_PV}
-	>=dev-qt/qtxml-${QT_PV}
-	bluetooth? ( >=dev-qt/qtbluetooth-${QT_PV} )
-	dbus? (
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		>=dev-qt/qtdbus-${QT_PV}
-	)
-	declarative? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
-	designer? ( >=dev-qt/designer-${QT_PV} )
-	gui? ( >=dev-qt/qtgui-${QT_PV}[gles2-only=] )
-	help? ( >=dev-qt/qthelp-${QT_PV} )
-	location? ( >=dev-qt/qtlocation-${QT_PV} )
-	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[widgets?] )
-	network? ( >=dev-qt/qtnetwork-${QT_PV}[ssl=] )
-	networkauth? ( >=dev-qt/qtnetworkauth-${QT_PV} )
-	opengl? ( >=dev-qt/qtopengl-${QT_PV} )
-	positioning? ( >=dev-qt/qtpositioning-${QT_PV} )
-	printsupport? ( >=dev-qt/qtprintsupport-${QT_PV} )
-	sensors? ( >=dev-qt/qtsensors-${QT_PV} )
-	serialport? ( >=dev-qt/qtserialport-${QT_PV} )
-	sql? ( >=dev-qt/qtsql-${QT_PV} )
-	svg? ( >=dev-qt/qtsvg-${QT_PV} )
-	testlib? ( >=dev-qt/qttest-${QT_PV} )
-	webchannel? ( >=dev-qt/qtwebchannel-${QT_PV} )
-	webkit? ( dev-qt/qtwebkit:5[printsupport] )
-	websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )
-	widgets? ( >=dev-qt/qtwidgets-${QT_PV} )
-	x11extras? ( >=dev-qt/qtx11extras-${QT_PV} )
-	xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
-"
-DEPEND="${RDEPEND}
-	>=dev-python/sip-4.19.20[${PYTHON_USEDEP}]
-	dbus? ( virtual/pkgconfig )
-"
-
-S=${WORKDIR}/${MY_P}
-
-pyqt_use_enable() {
-	use "$1" || return
-
-	if [[ $# -eq 1 ]]; then
-		echo --enable=Qt$(tr 'a-z' 'A-Z' <<< ${1:0:1})${1:1}
-	else
-		shift
-		echo ${@/#/--enable=}
-	fi
-}
-
-src_configure() {
-	configuration() {
-		local myconf=(
-			"${PYTHON}"
-			"${S}"/configure.py
-			$(usex debug '--debug --qml-debug --trace' '')
-			--verbose
-			--confirm-license
-			--qmake="$(qt5_get_bindir)"/qmake
-			--bindir="${EPREFIX}/usr/bin"
-			--qsci-api
-			--enable=QtCore
-			--enable=QtXml
-			$(pyqt_use_enable bluetooth)
-			$(pyqt_use_enable dbus QtDBus)
-			$(usex dbus '' --no-python-dbus)
-			$(pyqt_use_enable declarative QtQml QtQuick $(usex widgets QtQuickWidgets ''))
-			$(usex declarative '' --no-qml-plugin)
-			$(pyqt_use_enable designer)
-			$(usex designer '' --no-designer-plugin)
-			$(usex gles2-only '--disable-feature=PyQt_Desktop_OpenGL' '')
-			$(pyqt_use_enable gui)
-			$(pyqt_use_enable gui $(use gles2-only && echo _QOpenGLFunctions_ES2 || echo _QOpenGLFunctions_{2_0,2_1,4_1_Core}))
-			$(pyqt_use_enable help)
-			$(pyqt_use_enable location)
-			$(pyqt_use_enable multimedia QtMultimedia $(usex widgets QtMultimediaWidgets ''))
-			$(pyqt_use_enable network)
-			$(pyqt_use_enable networkauth QtNetworkAuth)
-			$(pyqt_use_enable opengl QtOpenGL)
-			$(pyqt_use_enable positioning)
-			$(pyqt_use_enable printsupport QtPrintSupport)
-			$(pyqt_use_enable sensors)
-			$(pyqt_use_enable serialport QtSerialPort)
-			$(pyqt_use_enable sql)
-			$(usex ssl '' '--disable-feature=PyQt_SSL')
-			$(pyqt_use_enable svg)
-			$(pyqt_use_enable testlib QtTest)
-			$(pyqt_use_enable webchannel QtWebChannel)
-			$(pyqt_use_enable webkit QtWebKit QtWebKitWidgets)
-			$(pyqt_use_enable websockets QtWebSockets)
-			$(pyqt_use_enable widgets)
-			$(pyqt_use_enable x11extras QtX11Extras)
-			$(pyqt_use_enable xmlpatterns QtXmlPatterns)
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-
-		# Fix parallel install failure
-		sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_pep484_stubs install_qscintilla_api' \
-			${PN}.pro || die
-
-		# Run eqmake to respect toolchain and build flags
-		eqmake5 -recursive ${PN}.pro
-	}
-	python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		local tmp_root=${D}/${PN}_tmp_root
-		emake INSTALL_ROOT="${tmp_root}" install
-
-		local bin_dir=${tmp_root}${EPREFIX}/usr/bin
-		local exe
-		for exe in pylupdate5 pyrcc5 pyuic5; do
-			python_doexe "${bin_dir}/${exe}"
-			rm "${bin_dir}/${exe}" || die
-		done
-
-		local uic_dir=${tmp_root}$(python_get_sitedir)/${PN}/uic
-		rm -r "${uic_dir}"/port_v2 || die
-
-		multibuild_merge_root "${tmp_root}" "${D}"
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	einstalldocs
-
-	if use examples; then
-		dodoc -r examples
-	fi
-}
diff --git a/dev-python/PyQt5/PyQt5-5.15.0-r1.ebuild b/dev-python/PyQt5/PyQt5-5.15.0-r1.ebuild
deleted file mode 100644
index 075b00012939..000000000000
--- a/dev-python/PyQt5/PyQt5-5.15.0-r1.ebuild
+++ /dev/null
@@ -1,193 +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 multibuild python-r1 qmake-utils
-
-DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/intro"
-
-MY_P=${PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-
-# TODO: QtNfc, QtQuick3D, QtRemoteObjects
-IUSE="bluetooth dbus debug declarative designer examples gles2-only gui help location
-	multimedia network networkauth opengl positioning printsupport sensors serialport
-	sql +ssl svg testlib webchannel webkit websockets widgets x11extras xmlpatterns"
-
-# The requirements below were extracted from configure.py
-# and from the output of 'grep -r "%Import " "${S}"/sip'
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	bluetooth? ( gui )
-	declarative? ( gui network )
-	designer? ( widgets )
-	help? ( gui widgets )
-	location? ( positioning )
-	multimedia? ( gui network )
-	networkauth? ( network )
-	opengl? ( gui widgets )
-	positioning? ( gui )
-	printsupport? ( gui widgets )
-	sensors? ( gui )
-	serialport? ( gui )
-	sql? ( widgets )
-	svg? ( gui widgets )
-	testlib? ( widgets )
-	webchannel? ( network )
-	webkit? ( gui network printsupport widgets )
-	websockets? ( network )
-	widgets? ( gui )
-	xmlpatterns? ( network )
-"
-
-# Minimal supported version of Qt.
-QT_PV="5.12:5"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/PyQt5-sip-4.19.23:=[${PYTHON_USEDEP}]
-	>=dev-qt/qtcore-${QT_PV}
-	>=dev-qt/qtxml-${QT_PV}
-	bluetooth? ( >=dev-qt/qtbluetooth-${QT_PV} )
-	dbus? (
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		>=dev-qt/qtdbus-${QT_PV}
-	)
-	declarative? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
-	designer? ( >=dev-qt/designer-${QT_PV} )
-	gui? ( >=dev-qt/qtgui-${QT_PV}[gles2-only=] )
-	help? ( >=dev-qt/qthelp-${QT_PV} )
-	location? ( >=dev-qt/qtlocation-${QT_PV} )
-	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[widgets?] )
-	network? ( >=dev-qt/qtnetwork-${QT_PV}[ssl=] )
-	networkauth? ( >=dev-qt/qtnetworkauth-${QT_PV} )
-	opengl? ( >=dev-qt/qtopengl-${QT_PV} )
-	positioning? ( >=dev-qt/qtpositioning-${QT_PV} )
-	printsupport? ( >=dev-qt/qtprintsupport-${QT_PV} )
-	sensors? ( >=dev-qt/qtsensors-${QT_PV} )
-	serialport? ( >=dev-qt/qtserialport-${QT_PV} )
-	sql? ( >=dev-qt/qtsql-${QT_PV} )
-	svg? ( >=dev-qt/qtsvg-${QT_PV} )
-	testlib? ( >=dev-qt/qttest-${QT_PV} )
-	webchannel? ( >=dev-qt/qtwebchannel-${QT_PV} )
-	webkit? ( dev-qt/qtwebkit:5[printsupport] )
-	websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )
-	widgets? ( >=dev-qt/qtwidgets-${QT_PV} )
-	x11extras? ( >=dev-qt/qtx11extras-${QT_PV} )
-	xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
-"
-DEPEND="${RDEPEND}
-	>=dev-python/sip-4.19.23[${PYTHON_USEDEP}]
-	dbus? ( virtual/pkgconfig )
-"
-
-S=${WORKDIR}/${MY_P}
-
-pyqt_use_enable() {
-	use "$1" || return
-
-	if [[ $# -eq 1 ]]; then
-		echo --enable=Qt$(tr 'a-z' 'A-Z' <<< ${1:0:1})${1:1}
-	else
-		shift
-		echo ${@/#/--enable=}
-	fi
-}
-
-src_configure() {
-	configuration() {
-		local myconf=(
-			"${PYTHON}"
-			"${S}"/configure.py
-			$(usex debug '--debug --qml-debug --trace' '')
-			--verbose
-			--confirm-license
-			--qmake="$(qt5_get_bindir)"/qmake
-			--bindir="${EPREFIX}/usr/bin"
-			--qsci-api
-			--enable=QtCore
-			--enable=QtXml
-			$(pyqt_use_enable bluetooth)
-			$(pyqt_use_enable dbus QtDBus)
-			$(usex dbus '' --no-python-dbus)
-			$(pyqt_use_enable declarative QtQml QtQuick $(usex widgets QtQuickWidgets ''))
-			$(usex declarative '' --no-qml-plugin)
-			$(pyqt_use_enable designer)
-			$(usex designer '' --no-designer-plugin)
-			$(usex gles2-only '--disable-feature=PyQt_Desktop_OpenGL' '')
-			$(pyqt_use_enable gui)
-			$(pyqt_use_enable gui $(use gles2-only && echo _QOpenGLFunctions_ES2 || echo _QOpenGLFunctions_{2_0,2_1,4_1_Core}))
-			$(pyqt_use_enable help)
-			$(pyqt_use_enable location)
-			$(pyqt_use_enable multimedia QtMultimedia $(usex widgets QtMultimediaWidgets ''))
-			$(pyqt_use_enable network)
-			$(pyqt_use_enable networkauth QtNetworkAuth)
-			$(pyqt_use_enable opengl QtOpenGL)
-			$(pyqt_use_enable positioning)
-			$(pyqt_use_enable printsupport QtPrintSupport)
-			$(pyqt_use_enable sensors)
-			$(pyqt_use_enable serialport QtSerialPort)
-			$(pyqt_use_enable sql)
-			$(usex ssl '' '--disable-feature=PyQt_SSL')
-			$(pyqt_use_enable svg)
-			$(pyqt_use_enable testlib QtTest)
-			$(pyqt_use_enable webchannel QtWebChannel)
-			$(pyqt_use_enable webkit QtWebKit QtWebKitWidgets)
-			$(pyqt_use_enable websockets QtWebSockets)
-			$(pyqt_use_enable widgets)
-			$(pyqt_use_enable x11extras QtX11Extras)
-			$(pyqt_use_enable xmlpatterns QtXmlPatterns)
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-
-		# Fix parallel install failure
-		sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_pep484_stubs install_qscintilla_api' \
-			${PN}.pro || die
-
-		# Run eqmake to respect toolchain and build flags
-		eqmake5 -recursive ${PN}.pro
-	}
-	python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		local tmp_root=${D}/${PN}_tmp_root
-		emake INSTALL_ROOT="${tmp_root}" install
-
-		local bin_dir=${tmp_root}${EPREFIX}/usr/bin
-		local exe
-		for exe in pylupdate5 pyrcc5 pyuic5; do
-			python_doexe "${bin_dir}/${exe}"
-			rm "${bin_dir}/${exe}" || die
-		done
-
-		local uic_dir=${tmp_root}$(python_get_sitedir)/${PN}/uic
-		rm -r "${uic_dir}"/port_v2 || die
-
-		multibuild_merge_root "${tmp_root}" "${D}"
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	einstalldocs
-
-	if use examples; then
-		dodoc -r examples
-	fi
-}
diff --git a/dev-python/PyQtWebEngine/Manifest b/dev-python/PyQtWebEngine/Manifest
index a011250d9af4..31008acf1db3 100644
--- a/dev-python/PyQtWebEngine/Manifest
+++ b/dev-python/PyQtWebEngine/Manifest
@@ -1,7 +1,3 @@
-DIST PyQtWebEngine-5.14.0.tar.gz 47794 BLAKE2B 28f4a577ab5d8c1bea439b11e836008d27b4a49f31f230885013b515147a95c97e398328d1fc3a99619c3fd6eca3da7e94bf5873de9ac6511e0f59e467d4490c SHA512 c5274ce5ba1c80c6851971c3e18acf33121cd5863f613bd1789fdb40323b52429b55b54f3dcbb3127c85343e11f14c004ad54711b2b59cab95fd440f90fe5f2e
-DIST PyQtWebEngine-5.15.1.dev2006110847.tar.gz 48514 BLAKE2B a4c4490720dcc1bf95c62e3bb9e72f2e25000a2641b64f2a0466649899f56eac0594461471ba787c332a32cda8b48cff0bddd2d4beceadfca02b1c06668e4117 SHA512 1f39052f22598f4fdb30ce9b9180fc145414e2e6708f2bda5a6f9166824926f91ca61070e64c4d9f880f0711a0c4c3a6a345d9904092bb13d51bd28e71fd52ab
 DIST PyQtWebEngine-5.15.1.tar.gz 48520 BLAKE2B d4e4fcfb1066fcc274f4b3c8ccd7380435b9391586e3396fb5aa95ad7443c168ea9be3b85ec93e2dc28285aca18718afeb1487cb2c4ad5ed1a4f4d03010107ec SHA512 1efbea43bfd4a6de1c7aa2ab2ca124c4278b6b7ea0d6073c64a7ad83df676759d0747421cae5214017e3c61d8edddf9766f93660e13eee5d407a24fd11d8c21f
-EBUILD PyQtWebEngine-5.14.0.ebuild 1666 BLAKE2B 50ceeff152ddfc9bd8809eadf514ed5be1363829d7533d4431f7ee5d23a6d3d172dd96303912dd05770391b633774c2931e11ecf9a1eb9cb5b10294f25a557a7 SHA512 ac328a51e306f15d4fea2101968dab5df731935642938915bc62399ce9eacc1a79bb5666af51594db0d37efc1ec9efdcc6d4168e44eb7c6d9a6e54515ec4c0a8
 EBUILD PyQtWebEngine-5.15.1.ebuild 1665 BLAKE2B 09615c6e5e816dab50b4726d03efdcf4d62ad9dc2b550521e4120188edf9fa0939fcdf7eb9d04ba7015f114e23c49a4ccc8f64bf259bb9a3553930e667aa8775 SHA512 a643e883aeeff05cf7a42a2d5e506fdc62e755d7458bb7a82080bd9412f82ea7862cad03d556150167abfd2a9a72c3014a434763090a6caec80122da8f8ad5ed
-EBUILD PyQtWebEngine-5.15.1_pre2006110847.ebuild 1668 BLAKE2B 18ba0ce56d43189b91d8d38109d8c55e43ebfad7bd037d48dbce6bbfa255b51b209fb9c519b9002e55ce25d6b0a88dc7a04f6ee9dea6a013d177ca777b2bd7ea SHA512 f1679dc7da76d09e86151674c35744388dd3bd0cfd38c279a0f04c932b03288a6be9fc8d937b22a051a8569ac7f351e1914e9683ef0481bd2d82f86d76ee784d
 MISC metadata.xml 958 BLAKE2B 3d360762116d92a71aee391ba8bb5eaeb4f8347f22c0bad7c05211d82cf9bf9ce04e74baa1691c3a48c7be7c3906c180234a7b3c33b76e56c6b94982ad0045f5 SHA512 06ed8222b239484fdb7d1e7ab35b922b9eea81ec144bace571355302d1b01dbd6bd80d2d5c03d1ec7f7edad851050305d2e87232f5580e92276018c7c4e9753f
diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.14.0.ebuild b/dev-python/PyQtWebEngine/PyQtWebEngine-5.14.0.ebuild
deleted file mode 100644
index 0f869cca5363..000000000000
--- a/dev-python/PyQtWebEngine/PyQtWebEngine-5.14.0.ebuild
+++ /dev/null
@@ -1,75 +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 python-r1 qmake-utils
-
-DESCRIPTION="Python bindings for QtWebEngine"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqtwebengine/intro"
-
-MY_P=${PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="debug"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/PyQt5-5.13.1[gui,network,printsupport,ssl,webchannel,widgets,${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-sip-4.19.22:=[${PYTHON_USEDEP}]
-	dev-qt/qtcore:5
-	dev-qt/qtwebengine:5[widgets]
-"
-DEPEND="${RDEPEND}
-	~dev-python/sip-4.19.22[${PYTHON_USEDEP}]
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	configuration() {
-		local myconf=(
-			"${PYTHON}"
-			"${S}"/configure.py
-			--qmake="$(qt5_get_bindir)"/qmake
-			$(usex debug '--debug --trace' '')
-			--verbose
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-
-		# Fix parallel install failure
-		sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_pep484_stubs install_api' \
-			${PN}.pro || die
-
-		# Run eqmake to respect toolchain and build flags
-		eqmake5 -recursive ${PN}.pro
-	}
-	python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		emake INSTALL_ROOT="${D}" install
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	einstalldocs
-}
diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.1_pre2006110847.ebuild b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.1_pre2006110847.ebuild
deleted file mode 100644
index 94183f43f9bb..000000000000
--- a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.1_pre2006110847.ebuild
+++ /dev/null
@@ -1,75 +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 python-r1 qmake-utils
-
-DESCRIPTION="Python bindings for QtWebEngine"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqtwebengine/intro"
-
-MY_P=${PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="debug"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/PyQt5-5.14[gui,network,printsupport,ssl,webchannel,widgets,${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-sip-4.19.22:=[${PYTHON_USEDEP}]
-	dev-qt/qtcore:5
-	dev-qt/qtwebengine:5[widgets]
-"
-DEPEND="${RDEPEND}
-	>=dev-python/sip-4.19.22[${PYTHON_USEDEP}]
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	configuration() {
-		local myconf=(
-			"${PYTHON}"
-			"${S}"/configure.py
-			--qmake="$(qt5_get_bindir)"/qmake
-			$(usex debug '--debug --trace' '')
-			--verbose
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-
-		# Fix parallel install failure
-		sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_pep484_stubs install_api' \
-			${PN}.pro || die
-
-		# Run eqmake to respect toolchain and build flags
-		eqmake5 -recursive ${PN}.pro
-	}
-	python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		emake INSTALL_ROOT="${D}" install
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	einstalldocs
-}
diff --git a/dev-python/PyRSS2Gen/Manifest b/dev-python/PyRSS2Gen/Manifest
index db08fb263eb8..dbac24140317 100644
--- a/dev-python/PyRSS2Gen/Manifest
+++ b/dev-python/PyRSS2Gen/Manifest
@@ -1,3 +1,3 @@
 DIST PyRSS2Gen-1.1.tar.gz 9149 BLAKE2B 1f388e8616c79d8b5436f69191d479c529e1348308d69782a833bec714da6289fc459ea2b554a1e660027a25d0581c441a0e75a623add3c42c8c33c5cc8518e1 SHA512 2240686914c87984626eb739676927fcd53488158bdebf589e07e8a778e6d24305964e032581c61836f0fabc1264e42d05c88eac8f4c5f6536c31c775434ce02
 EBUILD PyRSS2Gen-1.1-r1.ebuild 454 BLAKE2B 880945c0a67f38e98bca34242d5c4fceff4f0143850a51fa3e7c2047c21b74d687ed0bd7ad84c6cc6a184a339e0a46bbb9bd5822317d592aa28f073027f129f6 SHA512 4652943de98b1243cef0dd97db577f14e55947048f03603fb2becd6b3775d899f09c6ff9c26a33dd9e8484c3ec22b207981762d29752d6a5545f887dc0dded3d
-MISC metadata.xml 251 BLAKE2B fb85d245662fa1577cfe1d77526bd34fb2a674dd447192f2defe78b751423e3d14ae73efd3ac0e1e5e6fdb6259622a782e724ec77021faf526509f199dd20d61 SHA512 46942a98ef7e36470d1169a5bc8839d25603e33c143cd36327a8a85fc14cb6bfb32247eb7608d92cc58a06cc8eef5bd64d6ec2d21e69a88632e4b936598aa772
+MISC metadata.xml 323 BLAKE2B e5ff81e2850b8a51924efc6704f4524cf1ba823d7f022e07f6e1c2a4300479549b61c16ff402e1e396810c3ecda5218e76115f48afc545b076d9a22b08dcca56 SHA512 bc5754e1bb54ab3adc6b0b474eda4d45dd36d35ec7d30278d665c178cfe3436918cf21f39056e5770a9ca56f0aa62930c3ed5211c583ebae8fabe20de64bea33
diff --git a/dev-python/PyRSS2Gen/metadata.xml b/dev-python/PyRSS2Gen/metadata.xml
index a32d600f949d..a05bcf23516e 100644
--- a/dev-python/PyRSS2Gen/metadata.xml
+++ b/dev-python/PyRSS2Gen/metadata.xml
@@ -5,4 +5,7 @@
 		<email>whissi@gentoo.org</email>
 		<name>Thomas Deutschmann</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">PyRSS2Gen</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/PySensors/Manifest b/dev-python/PySensors/Manifest
index 8dfc942e8ccb..2a7bec5867e6 100644
--- a/dev-python/PySensors/Manifest
+++ b/dev-python/PySensors/Manifest
@@ -1,3 +1,3 @@
 DIST PySensors-0.0.4.tar.gz 10599 BLAKE2B be3a3692a846e5339758eff4f4396dd15bf96b3d20bc40df45436ce58381ac87503bca190fa215121506ecf9ce5175b254d93142ee881c4d5b8ef8e045854659 SHA512 8e6b2beee9bf282f073618c0b45e53330ce82c9fc9c6565a3c6b5f812231421c8c6e15ccc4fc92cda67ed08df5c482577d4a34720c920dbba7604f2b7c3ba21c
-EBUILD PySensors-0.0.4.ebuild 462 BLAKE2B e1c013c2a5e93b637495409f82a79228e07d06084d9214be9c746e9880196c0f5a7aab5147513461ed5fe68c00576332b1d56d6155b40f9cc686cd50e6683999 SHA512 92a4e6ab3ebd1600d5ebdc13b55036253026b9eff81876acf35ca53530e30577fe7894a0a81809001e7aaede9ea85a5f82c9b08a53c8777d624a057cbca6b783
+EBUILD PySensors-0.0.4.ebuild 463 BLAKE2B 1209d444045e56c9db03704ee8a5fd30f28ba734bfc872844e66a8f2c9e10ad91f5846edb3aca9e91b7ca4fd885151bc8d9b88cccc1e0bc2287549ba513847c8 SHA512 925a157475798ddb047ba76873a311802237c5b3589fb20b8585171f7c3ba356db150ec3a5d017001f1decc4ff4856dd21a6456a801d1a04a234248a025ff121
 MISC metadata.xml 437 BLAKE2B 42315c93aedaf44d9ecfda30cabe8751e9fb8ca2621dbfcb434fda1581a5d6ba415a025c37fbfe1b03de8121bd4248aaeb6159e6850d08c692d6b729953dfb81 SHA512 63f7823890f90ae6049539ba3b15ddd3beade8e75ade4b06835ca7f04d64f1744e752eb2e7bd2b66e9cde29a4a1e79467a0046bc01ea34e50c1753b4a2ee811f
diff --git a/dev-python/PySensors/PySensors-0.0.4.ebuild b/dev-python/PySensors/PySensors-0.0.4.ebuild
index 1ba53eaf6a5b..0a25d34c3153 100644
--- a/dev-python/PySensors/PySensors-0.0.4.ebuild
+++ b/dev-python/PySensors/PySensors-0.0.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/PyUtilib/Manifest b/dev-python/PyUtilib/Manifest
index ae45c87db14c..b61d63e3238b 100644
--- a/dev-python/PyUtilib/Manifest
+++ b/dev-python/PyUtilib/Manifest
@@ -1,4 +1,4 @@
 AUX pyutilib-5.6.5-tests.patch 1413 BLAKE2B 8cfb6abadbd0c83adccd69cd18dd85aa2c58ad6d8610de0912397e626704ff6921ed54869c0ea2e7dd1567070e5061fa424d7749236cd2e8321d17a6b60ad4a8 SHA512 00d838e4eab285e7eaa1fe802abd1fa22f3a662fd10220cc3811fab6d9025dcb327811e13ee13f2102ff1ff2b8b132a10c32cabfb94080940dec691b6a890298
 DIST PyUtilib-5.7.2.tar.gz 1566034 BLAKE2B 913c6576b39f14c19e2e633c36ade33fe812c77a37374c7c14d2fb4384ca38f68efd55209d70e96d9a78fea2fcf1cf83423680d0787da2d03cab88e59a208b96 SHA512 d9d7d890cdb524bb055885354784f2af01967164ce88cf3b144ccffb0a855ef34243fd518c58193517ecfc50f3c2e3ca333f026951c1ab0b38ce181ecf9e7750
-EBUILD PyUtilib-5.7.2.ebuild 1211 BLAKE2B 8b25f0fa1950408f0eac3d29d3cc524761317610bd425d201401f9f6671267eee5ec2f9ff3f8e2fff2ad8bbb51cbe50d426be0163b73b5c009f776cdad058b1c SHA512 2b01f24cf47356d370ffe838c31f2711cd8b4968bce5fb15b841015ed252037e0667eb8444be3889ef237c6ddad882a59e20887b63277289a50c527f0cf139fd
-MISC metadata.xml 338 BLAKE2B e8be381e5e42a081be3637b77a9b5356dd7d74d0352976badfca62bdf7b65c04554552703b3e12e169ec1c4b57d07cedcf75387a0fd65a8177213f0de8bffa9c SHA512 b3e03151085bcaa51e2108d7e69042523148aaba924415421323d53005c1d047103827ed99bf064cda4f02cc313b3ff4e5fc681bccb5f1f23a82b40a744ed9bc
+EBUILD PyUtilib-5.7.2.ebuild 1222 BLAKE2B 4d756f15158cbd6051e3f8d2bb26e97483486600471c845f4435da1922cd9b7220fbed6ed36025c093007395ba741d4100879541d989216e85a1134584d5bad7 SHA512 4834bb4c9e12d69781e615861abeeb061d40076802faf9e66452ab788299d549b2a8488b04ae2118f3aa052db23a4eb346b5bea72548d1691bb815316b5ed024
+MISC metadata.xml 399 BLAKE2B 035eaf4d0580b3df7e40a804be2ea3627872a6547d4bd47e6be414df760fa910c9689dae45a161cef4908969c61f4caf63175c3b45fb94bf78000e89085697ed SHA512 673f97cb37989a8526680d11f38dca84de990d3cf18c2cbe68ab1567146a2b03784c40e228f336096b1c45e86434b5b42b92a18ac09df88e423de999d316ce86
diff --git a/dev-python/PyUtilib/PyUtilib-5.7.2.ebuild b/dev-python/PyUtilib/PyUtilib-5.7.2.ebuild
index f8845c0ef4e9..cba7050bd716 100644
--- a/dev-python/PyUtilib/PyUtilib-5.7.2.ebuild
+++ b/dev-python/PyUtilib/PyUtilib-5.7.2.ebuild
@@ -36,7 +36,7 @@ python_prepare_all() {
 }
 
 python_test() {
-	distutils_install_for_testing
+	distutils_install_for_testing --via-root
 
 	local -x PYTHONPATH="${PWD}:${TEST_DIR}/lib" \
 		COLUMNS=80
diff --git a/dev-python/PyUtilib/metadata.xml b/dev-python/PyUtilib/metadata.xml
index 2541628cf9a8..bebb51bfe316 100644
--- a/dev-python/PyUtilib/metadata.xml
+++ b/dev-python/PyUtilib/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-  </maintainer>
-  <maintainer type="person">
-    <email>chutzpah@gentoo.org</email>
-    <name>Patrick McLean</name>
-  </maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">PyUtilib</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/PythonQt/Manifest b/dev-python/PythonQt/Manifest
deleted file mode 100644
index 677332dffd37..000000000000
--- a/dev-python/PythonQt/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST PythonQt3.2.zip 4539058 BLAKE2B c50b8333b71b6cbce6f372a0292a0ccfe791dc7eae5c660d4e6d1f5f2b3355644e3fd8cce9a514f0500e935f96c46976d0046ddd716465adb35d225e3c4cfeca SHA512 1ee0f50f5035568b38e945108f5496ba64355c6357c1ea8dfc17ad90fa360540769f94e0b3e0e398176e8a21c8afe139607f0b5a2e82c63f1cbd40201a25e0f0
-EBUILD PythonQt-3.2-r1.ebuild 2224 BLAKE2B 0b590d63fcb92ca4e548f28fbd37f275152b9c6c331c05de7953f74a5d71771992b808313eade75aa79c05b85c0dc60b92610aae046a82bc46d292c14756c9ab SHA512 9bb755b617465bab02aa08e93345c5f33bff4767a56d4ab377ef7302518e1b8adaeaf1ec5e2072db93e30781f386a694248f81c4dd7e9ce38c5122908e4ac113
-EBUILD PythonQt-9999.ebuild 2194 BLAKE2B 7f941f9c401c4a5df689ea5e3145d64ecae92a46df48f5a9332e5e2eea5613360924fd96ad9ab7cbda4aa490f0a51cdb8804de23a6be16531802c485d1b121b4 SHA512 79fb1ca958f29ad8ec9a43d8fa14e50291cc7a153a585e9b95e88f4baa689bfb88ee4d17313d3b23e70402f54b2d77e330e97621caa8bafe2bd7483784aac2e3
-MISC metadata.xml 921 BLAKE2B a9b1a1daef268107c78f143e9ffeaace6c6305575eaf5fe4894cdaaa2fd0f6551d16a3ae8a0e70fc5b19ca1817e71ab56ec2134259703e28df9d1b6e0f004f30 SHA512 237e70d7b8535adbbcf1a2e5f44e1b6053ef930ec2122ee56ae2e9f702d741e5630862d2143562e8a8562e0f9af38f4fac47981d9be79b689f3b515c63a634ac
diff --git a/dev-python/PythonQt/PythonQt-3.2-r1.ebuild b/dev-python/PythonQt/PythonQt-3.2-r1.ebuild
deleted file mode 100644
index 39deaa6db272..000000000000
--- a/dev-python/PythonQt/PythonQt-3.2-r1.ebuild
+++ /dev/null
@@ -1,96 +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} )
-MY_P=${PN}${PV}
-
-inherit qmake-utils python-single-r1 virtualx
-
-DESCRIPTION="A dynamic Python binding for the Qt framework"
-HOMEPAGE="https://mevislab.github.io/pythonqt"
-SRC_URI="mirror://sourceforge/pythonqt/pythonqt/${P}/${MY_P}.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc examples +extensions test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	extensions? (
-		dev-qt/designer:5
-		dev-qt/qtdeclarative:5[widgets]
-		dev-qt/qtmultimedia:5[widgets]
-		dev-qt/qtnetwork:5
-		dev-qt/qtopengl:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtsql:5
-		dev-qt/qtsvg:5
-		dev-qt/qtxml:5
-		dev-qt/qtxmlpatterns:5
-	)"
-DEPEND="${RDEPEND}
-	dev-qt/qtxml:5
-	test? ( dev-qt/qttest:5 )"
-BDEPEND="app-arch/unzip
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	if ! use examples ; then
-		sed -i '/SUBDIRS/s/examples//' PythonQt.pro || die "sed for examples"
-	fi
-	if ! use extensions ; then
-		sed -i '/SUBDIRS/s/extensions//' PythonQt.pro || die "sed for extensions"
-	fi
-	if ! use test ; then
-		sed -i '/SUBDIRS/s/tests//' PythonQt.pro || die "sed for test"
-	fi
-
-	# Remove webkit support
-	sed -i '/qtHaveModule(webkit):CONFIG += PythonQtWebKit/d' \
-		extensions/PythonQt_QtAll/PythonQt_QtAll.pro \
-		|| die "sed for webkit"
-
-	# Unset python version to use python-config
-	sed -i "/unix:PYTHON_VERSION=/s/2.7//" build/python.prf \
-		|| die "sed for python version"
-}
-
-src_configure() {
-	eqmake5 CONFIG+="$(usex debug debug release '' '')" PREFIX="${ED}"/usr
-}
-
-src_test() {
-	LD_PRELOAD="${S}"/lib/libPythonQt-Qt5-Python"$(usex debug _d '' '' '')".so.3 \
-		virtx ./lib/PythonQtTest"$(usex debug _d '' '' '')"
-}
-
-src_install() {
-	einstalldocs
-
-	# Includes
-	insinto /usr/include/PythonQt
-	doins -r src/*.h
-	insinto /usr/include/PythonQt/gui
-	doins -r src/gui/*.h
-
-	if use extensions ; then
-		insinto /usr/include/PythonQt/extensions/PythonQt_QtAll
-		doins -r extensions/PythonQt_QtAll/*.h
-	fi
-
-	# Libraries
-	dolib.so lib/libPythonQt*
-}
diff --git a/dev-python/PythonQt/PythonQt-9999.ebuild b/dev-python/PythonQt/PythonQt-9999.ebuild
deleted file mode 100644
index 01939249e831..000000000000
--- a/dev-python/PythonQt/PythonQt-9999.ebuild
+++ /dev/null
@@ -1,94 +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} )
-EGIT_REPO_URI="https://github.com/MeVisLab/pythonqt.git"
-
-inherit git-r3 qmake-utils python-single-r1 virtualx
-
-DESCRIPTION="A dynamic Python binding for the Qt framework"
-HOMEPAGE="https://mevislab.github.io/pythonqt"
-SRC_URI=""
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS=""
-IUSE="debug doc examples +extensions test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	extensions? (
-		dev-qt/designer:5
-		dev-qt/qtdeclarative:5[widgets]
-		dev-qt/qtmultimedia:5[widgets]
-		dev-qt/qtnetwork:5
-		dev-qt/qtopengl:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtsql:5
-		dev-qt/qtsvg:5
-		dev-qt/qtxml:5
-		dev-qt/qtxmlpatterns:5
-	)"
-DEPEND="${RDEPEND}
-	dev-qt/qtxml:5
-	test? ( dev-qt/qttest:5 )"
-BDEPEND="app-arch/unzip
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-src_prepare() {
-	default
-
-	if ! use examples ; then
-		sed -i '/SUBDIRS/s/examples//' PythonQt.pro || die "sed for examples"
-	fi
-	if ! use extensions ; then
-		sed -i '/SUBDIRS/s/extensions//' PythonQt.pro || die "sed for extensions"
-	fi
-	if ! use test ; then
-		sed -i '/SUBDIRS/s/tests//' PythonQt.pro || die "sed for test"
-	fi
-
-	# Remove webkit support if not used
-	sed -i '/qtHaveModule(webkit):CONFIG += PythonQtWebKit/d' \
-		extensions/PythonQt_QtAll/PythonQt_QtAll.pro \
-		|| die "sed for webkit"
-
-	# Unset python version to use python-config
-	sed -i "/unix:PYTHON_VERSION=/s/2.7//" build/python.prf \
-		|| die "sed for python version"
-}
-
-src_configure() {
-	eqmake5 CONFIG+="$(usex debug debug release '' '')" PREFIX="${ED}"/usr
-}
-
-src_test() {
-	LD_PRELOAD="${S}"/lib/libPythonQt-Qt5-Python"$(usex debug _d '' '' '')".so.3 \
-		virtx ./lib/PythonQtTest"$(usex debug _d '' '' '')"
-}
-
-src_install() {
-	einstalldocs
-
-	# Includes
-	insinto /usr/include/PythonQt
-	doins -r src/*.h
-	insinto /usr/include/PythonQt/gui
-	doins -r src/gui/*.h
-
-	if use extensions ; then
-		insinto /usr/include/PythonQt/extensions/PythonQt_QtAll
-		doins -r extensions/PythonQt_QtAll/*.h
-	fi
-
-	# Libraries
-	dolib.so lib/libPythonQt*
-}
diff --git a/dev-python/PythonQt/metadata.xml b/dev-python/PythonQt/metadata.xml
deleted file mode 100644
index 32c82921dccc..000000000000
--- a/dev-python/PythonQt/metadata.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>spiderx@spiderx.dp.ua</email>
-		<name>Vladimir Pavljuchenkov</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<longdescription lang="en">
-	PythonQt is a dynamic Python binding for the Qt framework.
-	It offers an easy way to embed the Python scripting language into
-	your C++ Qt applications. The focus of PythonQt is on embedding Python
-	into an existing C++ application, not on writing the whole application
-	completely in Python.
-	</longdescription>
-	<use>
-		<flag name="extensions">Install extensions</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">MeVisLab/pythonqt</remote-id>
-		<remote-id type="sourceforge">pythonqt</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/absl-py/Manifest b/dev-python/absl-py/Manifest
index 735b727d8599..91fcaea66696 100644
--- a/dev-python/absl-py/Manifest
+++ b/dev-python/absl-py/Manifest
@@ -1,3 +1,3 @@
 DIST absl-py-0.10.0.tar.gz 234053 BLAKE2B c7d85d7b351ec5d67ac5e98d5103b91ee7b91d3e01b15fff86ead2e177ba596719af8668f2ec1dd81b278557d902a90705803f5bd6aa7576b302641129eed050 SHA512 92862cc7997f469d7121746d1a8f8fcf99a4983eb033dc936e2ef22bcab896950a5e2bd8ce7fe6660b761cc16a39145104a7e2ba3588f38cde1964505d0265c3
-EBUILD absl-py-0.10.0.ebuild 552 BLAKE2B 5f69acd3cca416ec0dd770517f255bd7d050c02f15ef4ee6d6741c59110173b1154db17e65ea8e90db15f6421afb1757538438976561a0ccbe9d4e690c004307 SHA512 16584225a23a8ee6492b25f00efc0bbceb20da96f3a8e2d97be7770ba3d254e3eae54525e46a9f13bd21685cab08d4770daba272368a0f9e03817f9ac987f1b3
-MISC metadata.xml 531 BLAKE2B 3db4e14f8e949a75079014a516b9644b1a5fb17d7c3ca877cc8db4681a8a80c37641363a91ba84000bfc4b11d33fdad2f68f637a29233267be16caf287a20a3f SHA512 a66b08837eca504da558917c1a6c9a7aeae5d4f52622b74ecd365f89268b19f1b569478d7d1468b390a74a72ddd4f67f206d4b9932c7a32fe6e92e7bc4fcfaa1
+EBUILD absl-py-0.10.0.ebuild 564 BLAKE2B be93dd297057b7a042833e42e7ccc9b2fef546af38f6f754e70bc4524aff0723d617f95914385272e0089fdb68affd98f0704ba607915a6edc42e7997292bd06 SHA512 048523ce59c5ed60120504666d00b6abd988b60324332248b4898bd7a02892e092ab8b26f5568311b9f715cb54051f69ec93217de74692a5c298304ffc350e24
+MISC metadata.xml 576 BLAKE2B faf52655a8b6fd30293fa05a9b333806db3b2069a30ca7720bdaf971cb0242ee04350460d63f411c9e501cd4c6f0ba91e82ba32e3e067a9954acd954677475aa SHA512 cfb5ab7671b8cc6ecb55e3074cd31c42a52a293cff27210c7b5b955e1804b8b3a22da599142469097daa85331008e50a48da67b594bb55ecf5f8f8935191e527
diff --git a/dev-python/absl-py/absl-py-0.10.0.ebuild b/dev-python/absl-py/absl-py-0.10.0.ebuild
index 12fccf9e0dab..520ea6be65ed 100644
--- a/dev-python/absl-py/absl-py-0.10.0.ebuild
+++ b/dev-python/absl-py/absl-py-0.10.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/abseil/abseil-py/archive/pypi-v${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/absl-py/metadata.xml b/dev-python/absl-py/metadata.xml
index 56c13a3fb082..c3e51968a4b5 100644
--- a/dev-python/absl-py/metadata.xml
+++ b/dev-python/absl-py/metadata.xml
@@ -12,5 +12,6 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">abseil/abseil-py</remote-id>
+		<remote-id type="pypi">absl-py</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/aiofiles/Manifest b/dev-python/aiofiles/Manifest
index 4726b856bfd1..6e96bb20f245 100644
--- a/dev-python/aiofiles/Manifest
+++ b/dev-python/aiofiles/Manifest
@@ -1,3 +1,3 @@
 DIST aiofiles-0.5.0.tar.gz 13332 BLAKE2B ccd044ce9fcd74b2a6419b4f0e9e3977086c9685741dbb734a7f9222ab96dca58b5330ad0d0cd9f10fce03ee123add7101825f047451344fc451c40a4352674e SHA512 89eb1af506bdf5f3f2e9c3afe90f17d521ada1cdeb449dcdc800d4faa4edc1c9ca93811915aa059d8c5a1b0a3aaa40231a46b3d041ca745e071628293bddf1b7
 EBUILD aiofiles-0.5.0.ebuild 560 BLAKE2B fa744dd1773fba196d4f68875fac8212666b4da703d1ddb2007adcfd18c77fecb658bd273b0f4dec6e965593d90bef02af8b5c3c5d139ec7e40049b5ce05f875 SHA512 fac5b7b7cef4ae2a5299b64bd038e39c4a279b6a297762f276de4ebe5cc69d0e8e068999eaf7e8b3b49bf58bbf5a04b1714cf5bd59928ec920b3130ccd9035d0
-MISC metadata.xml 510 BLAKE2B f182d8530bf906c59a0557a258f2da78d1faf5c90eaae6da2e607e3db749871a7d1f8ed08136aeb867f9706ae3d51c7f934ad6bd9065f92b1da33fd3b0016c8f SHA512 3f4adfb90e2e02cd8c64dc384df7f615aa8acdee03aaf4f67464290b2860b5686e3384e6f4df35a3f001b3f7ce010bbcf44d87882dafd66c3400c5447e5680e5
+MISC metadata.xml 556 BLAKE2B e68a3d48d149f43e0ecde9b93b845477f855f755290c7dd9ce85ef237c7cf3cebccbd2b68e95ae7ca4dc0a840032240fb477abae8dd10a8c87a7aa873eec2243 SHA512 314a2583634cf75e3253efb3ec4e264fcdeb312ae920763226eb8976e1c772bbbbebafd85a00be986a36ac0b05723e878d0140ea751322e73cf5c538b4933f94
diff --git a/dev-python/aiofiles/metadata.xml b/dev-python/aiofiles/metadata.xml
index 83d73c6d0c04..f316a59679fe 100644
--- a/dev-python/aiofiles/metadata.xml
+++ b/dev-python/aiofiles/metadata.xml
@@ -12,5 +12,6 @@
 	<upstream>
 		<remote-id type="github">Tinche/aiofiles</remote-id>
 		<bugs-to>https://github.com/Tinche/aiofiles/issues</bugs-to>
+		<remote-id type="pypi">aiofiles</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/aiohttp-cors/Manifest b/dev-python/aiohttp-cors/Manifest
index f5a46576f0fa..045e04301305 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 963 BLAKE2B 9a4a80a8a00f30bf5d8ebd19e188f10b3a9fa080af27b6dcdb04611138f0388c3f0c005dfa99bb450b72ff79a773c5ef1b85454e6820ecd55b2b9f90d0f8065d SHA512 2479488ccabdd1c08560dad364c0db22783b695f86153cb6df42f7e11c56b6ae28917f3a55a6726d9c2dc594d788a7c6237795df3c447db76b686cabde04ee11
-MISC metadata.xml 453 BLAKE2B 425da23ceef20765f00fd1f15b34bf99166f66dc7d6cdc0ee74a7d6439ed912ebf79c365daf9cb50a918802706aa8782d88cee3520b1e37bf3e6505579521263 SHA512 690dfd58364f19eb58ae3348b9b2a8d64fdf4324dd26fb63cf563762f4f8368437fbae1afeeffeb0ccaeac100d793008e28b66309139e27418ef5cd70daf0d8c
+EBUILD aiohttp-cors-0.7.0-r1.ebuild 962 BLAKE2B 5f178f4f87bcca91094ed2b718b564944a4f9aa4cbda9e4c36b5e4e68c68363e4d79fe1b56d7352c9c621b50bbd66bfb4d385880badcad486d7cf7b3c63affde SHA512 4bacd9673661a85c761e1b5771b84746b977ed5d67c70c4aab13aa128bd3f69ae9d3fa1380763a104c354d895b777e401da1fe52d6a586ee1babcee960b84bcf
+MISC metadata.xml 503 BLAKE2B 850a82bc644b9678ffdc44bda43f74d9aa364abcd1490dcc7db045a35fad3fe7b3b45eb8c33d6c27afe4a7a7ce44295b2d0ce432058ce2bffe3511eca03d5ba8 SHA512 de084ce8a763b74a9a069a22e75ad4d331aa99aebc7c10cf8fc2f571695df148590d4945775784c589d6baf182025ce3f6e536989a50ba7f9bd278605965a813
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 2d7d613638cc..53239d103a16 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 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND=">=dev-python/aiohttp-1.1.1[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/aiohttp-cors/metadata.xml b/dev-python/aiohttp-cors/metadata.xml
index a00e54b3e81f..7e698af58c38 100644
--- a/dev-python/aiohttp-cors/metadata.xml
+++ b/dev-python/aiohttp-cors/metadata.xml
@@ -11,5 +11,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">aio-libs/aiohttp-cors</remote-id>
+		<remote-id type="pypi">aiohttp_cors</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index ad8330a180c5..45c7dd036572 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -3,7 +3,7 @@ DIST aiohttp-3.7.1.tar.gz 1111777 BLAKE2B 03d16e8c9d64ec407cf7b6dbbf5547a88f528a
 DIST aiohttp-3.7.2.tar.gz 1111049 BLAKE2B faffc582f2c72ff892862b5b782da75b381e59b21b284b1120e4edb16f22b760f8cabe56261061e0049a5dfd041456076e294e942a02309e9b3d6b414facb0cb SHA512 2dd4f0264f1fb0801be366c269b73dd80b542e8e5bfe18a01fbdfadd0210022ccd6e3975be1be416551ccce82f42881e18735d5c6fc68a42b7452ab18e157dc5
 DIST aiohttp-3.7.3.tar.gz 1113127 BLAKE2B 47d95565db1184c6b55a1e7d7a6df8cda872e4fe621f653e3143608f51dde2c7d30d00835da357dd7ae33f4858ad5778074dfde5261331a3539a5d6776ea1a25 SHA512 d1dbbe3cbdeb1a460f5030a08a251a7bb7ae7ec038ca93ba5187b2da1fe21b80ed6513db647ef382d2d92a3d527a34dffbd37f51aa1e8b65bb36d517304b1812
 EBUILD aiohttp-3.6.2-r1.ebuild 6857 BLAKE2B 733c733bbdf573fd4bfc1c9fcc44b4224f5913ee886abbf1908f3ffb258fe611babb6c46cc5ace49996875140cab24286e79e961f17b1af00093862d6a37f4bf SHA512 ecef2bd9d04e3d6dcb626effce1a895da5d5cb6354d522305484f4c33f4298bcabc7b0a08cda9e3dc89545c2405a021351e62c71f755c937123d345b8b7b4f5c
-EBUILD aiohttp-3.7.1-r1.ebuild 2479 BLAKE2B 32fae46276551e80eb35ec918506586419b3f8d15bcc06b0d2a4859bf403e3e38e8b3999301116054558d5e8a5665d149c9a205c2327a8cd227eac0c3e302887 SHA512 ed3e64ee8b04ead78a7c1f8cee5f4f165c6d61290a5d795fdeb44d30755cb5d1c5422b56594b3f38dd12ec39255bb63eab080dfa8da13b35a414b9942aaf7622
+EBUILD aiohttp-3.7.1-r1.ebuild 2477 BLAKE2B 527e91b161455cbc91255adabf53e100608892eabcbb94483ead211c026165f37c50e7f0e8bdec68631df4d29bcd7c2a84c94e48b1e36a6e780a508a76b87628 SHA512 877eb53ac16bb279be2df54db3236b73374f792ccf4e09f248e87f5a771ab6c39701543d4ecb0dd160c9362797b08612fbc89852e25ccdda1efa2a531bd8db6e
 EBUILD aiohttp-3.7.2-r1.ebuild 2506 BLAKE2B eed6db56a3d93185ca0018ae4337841dd20e9d90cada19bdab7c0a7575eb1f124ec4457546c13a83886f918c37f0b056d9a3363e2b4768aa8ec0ccab8822132e SHA512 3aaf70bb8ae5d84f3e387879b590ff830df5c3db952664d32cacdb92908afd96efce76103bb74af57baf4f9c68b0217202a02fc84785e152eefbefdbef6d4889
-EBUILD aiohttp-3.7.3.ebuild 2506 BLAKE2B eed6db56a3d93185ca0018ae4337841dd20e9d90cada19bdab7c0a7575eb1f124ec4457546c13a83886f918c37f0b056d9a3363e2b4768aa8ec0ccab8822132e SHA512 3aaf70bb8ae5d84f3e387879b590ff830df5c3db952664d32cacdb92908afd96efce76103bb74af57baf4f9c68b0217202a02fc84785e152eefbefdbef6d4889
+EBUILD aiohttp-3.7.3.ebuild 2513 BLAKE2B 3b6fca095b72abb6117c1fe26ad5d6dea02cefff3ea31bc02f71ea3c651a219655c42bc155c5c3994c2e04743e6428d5a521e6b9ca7509a1a46ea71c1cc362b5 SHA512 e2d6b665993e9a7f4938bd54ce3714c94198614e8d65460659152b8863893cb16ea68466a3d8fa333540780cc621bd5ee4a302a19181d276cc6372b728a6dea0
 MISC metadata.xml 489 BLAKE2B beb80da34848dfe7b81ed65d75923480644ecf42e2c5ce04a7f66f3e729651fdc6035054482aff966ec9f03cfbb812d3be0afd783af69e37f1002182e4885473 SHA512 d8c9e2edb8a57a3b6b02bb5314aef77dc266af6e80fd0300eb0652c59790232017d0062f5b7361b059c382d1c904f0f46cd0e672d1963e9595f3d4dc7514f182
diff --git a/dev-python/aiohttp/aiohttp-3.7.1-r1.ebuild b/dev-python/aiohttp/aiohttp-3.7.1-r1.ebuild
index 6494a6eada30..f34cfded7a1e 100644
--- a/dev-python/aiohttp/aiohttp-3.7.1-r1.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.7.1-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 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	>=dev-python/async_timeout-3.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/aiohttp/aiohttp-3.7.3.ebuild b/dev-python/aiohttp/aiohttp-3.7.3.ebuild
index 9e8be6e734f4..6ad99a03e912 100644
--- a/dev-python/aiohttp/aiohttp-3.7.3.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.7.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/async_timeout-3.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/alagitpull/Manifest b/dev-python/alagitpull/Manifest
index b2c3bdfc4bc8..61a5b84dc890 100644
--- a/dev-python/alagitpull/Manifest
+++ b/dev-python/alagitpull/Manifest
@@ -1,3 +1,3 @@
 DIST alagitpull-0.0.23.tar.gz 6692 BLAKE2B 63af3da6e98521487fad233dd648d9217d8e89c0d17e49dd771e934c0808a52c0659661ca8104c53c2d0fddf458650458e676e14b2e9c3820f353ab42044a490 SHA512 1620c0e25299f694f29f6e54105a2f336dee90535370a691a6e23a879a68626ef4aa19ae40ecc835553fe3b0272d48e4f5213c1ada054ad20d47034fc20dea3c
 EBUILD alagitpull-0.0.23-r1.ebuild 552 BLAKE2B 3015776a4abf63ee47cdcc4b6ea7fe68f9e2bce1c38887058f991c5bc6e8a775beee22bf4e308c0d806355659b6c5223796b42ecc3d05dd74139a7608b0ffa12 SHA512 11a5cf48bb374e0828de2929203ba57f123c244438c26ec6763755d9267684a322e636c2910c412115d15da4bdb8a0f4cecb79ff29bc4f8d53b32acb8f0434b0
-MISC metadata.xml 280 BLAKE2B a1973c7508f6f1a2cca51eb3bb625257870e00e31e6227f20a34611c81141e812e6a38ff6e66bd43abd0b238b1f5b36b262cd08a69e606f677ab6b1a6a68fd05 SHA512 7bfe4f6ad469f5ecb38967b5a2413baee476acfabce20cacbd0e784aa2e2d3636ede1a2b97088bec5b6c249c7ada0be3b44218686d1d8663e54f57f2eb6ad765
+MISC metadata.xml 346 BLAKE2B 7996041ebcc3a63ca67330fc22d5bf9c01446cfc2d502ceb7dcac619fe819a8811faf27c5373b83dfc6373c842d4997bfa07dcc81b45c1620067acccd27e091c SHA512 ae1433d61938879b6994d055464f91b317b6343f97af5cc6eed56200c9d582f67ce8e0cc1a60fcfb9063955f48f5c5a91739dc05105c0cfe730c22e964d00c0e
diff --git a/dev-python/alagitpull/metadata.xml b/dev-python/alagitpull/metadata.xml
index a50ee0d43329..0fee98a872c8 100644
--- a/dev-python/alagitpull/metadata.xml
+++ b/dev-python/alagitpull/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>chutzpah@gentoo.org</email>
-    <name>Patrick McLean</name>
-  </maintainer>
-  <stabilize-allarches/>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">alagitpull</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/ansi2html/Manifest b/dev-python/ansi2html/Manifest
index 09e258eda0c7..4a58cef9c167 100644
--- a/dev-python/ansi2html/Manifest
+++ b/dev-python/ansi2html/Manifest
@@ -2,4 +2,4 @@ DIST ansi2html-1.5.2.tar.gz 27124 BLAKE2B 0d02e8cea46622c4d2cbd06f06fd31b3c7e93d
 DIST ansi2html-1.6.0.tar.gz 36053 BLAKE2B deb63c6c9f431ff225cfcbbd2995f0fce9535736dba7d8c92f1f2e51d525640e69bc4269ab073438239edb35815288fa17b2d69c89cca7627ba2b5096009611f SHA512 35e5fb6cee96fe41a658c005734a58b08bc05e8ad5903ad18684c316bdad351a70c534b4162416225bc2ca774d01b4ac1bb8a8dad3170d0738aa7b3daf46b3c0
 EBUILD ansi2html-1.5.2-r2.ebuild 712 BLAKE2B 84148cd9cd8bb6563a1221a7df58c8549d7d60ed48ebeecfc3cba50558b9b7cc16e610b74806c04019874f8a8d18627f354deb5f11020713370c0d3c2368367a SHA512 4bf830f1298ce1cb2811a030ca5010a44ed5748bfb0e6c7080b410c8cbabcc5d633b9a44bd4f7b2dcca174ef37378f1dae596914e1a3c7a053924c84e7ea85f6
 EBUILD ansi2html-1.6.0.ebuild 1159 BLAKE2B 5e65b4dd14bdb0ad521fa5331b64b7030a6fcacb16b5abbd5e6e6e7657b26aa8def643c1e64cb655fd04e854807330540e99a32975025c4778af07e695e2b33c SHA512 011fdbbb4bc6e8f9ca15d534fb345af15f28010196804af3c48affce19cbe1d37e2f91bb9099f4a08a830b815031ed64036dfb05859510c5073f98c34f59e3d8
-MISC metadata.xml 417 BLAKE2B 899c93436bc8c598562daa050717316bf82fe7fa39bcc1e508e5a34db76d37664ec98480877834d40736102b1aa7cbd8bd314817439a41eae9f6956072defb86 SHA512 ec20e040aaa60e8069ea9462424b5e67688feeb245fc11f5d08b4c99e9a38daf0aa995009b0b67221151c2928ab979bf6bcb75d3123ce9176e81a481e65acad9
+MISC metadata.xml 405 BLAKE2B af420cb627ec9f6a472370674e49c22b519729a726701c364524e5c454a00ff731d5eed16a4208754a4f7e428df33bf244f93e697dd56952efb82ba059a5db3f SHA512 8e6bb50be6d8ecaa43a39c47cfa9d8243b2529e28b246623a6f32b5263848b73632c245483d6f6f7c146b8f8e49769370a76110f4490f61bf6d996ebf7a213ef
diff --git a/dev-python/ansi2html/metadata.xml b/dev-python/ansi2html/metadata.xml
index 5ea83a06dfa1..a805a61f7f9d 100644
--- a/dev-python/ansi2html/metadata.xml
+++ b/dev-python/ansi2html/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>sping@gentoo.org</email>
-    <name>Sebastian Pipping</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="pypi">ansi2html</remote-id>
-    <remote-id type="github">ralphbean/ansi2html</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>sping@gentoo.org</email>
+		<name>Sebastian Pipping</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">ansi2html</remote-id>
+		<remote-id type="github">pycontribs/ansi2html</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/anyqt/Manifest b/dev-python/anyqt/Manifest
index 9da3ff391eec..b0ee59c2a694 100644
--- a/dev-python/anyqt/Manifest
+++ b/dev-python/anyqt/Manifest
@@ -1,3 +1,3 @@
 DIST anyqt-0.0.8.tar.gz 43519 BLAKE2B cd70564e858fc344d89b85a5e5556cdd35dd584f51bba2bc39b9e015dcacdb8f0964b0d6dd435ba6e219543aafbca2fda0f49309e8df07e790bd75660d8585b0 SHA512 8bff488972703385bb0506fce7b33e2c62a0c6469e0284062b0882dda0842d5488621c722e00c2005aa1f8ff18307e823e146aca92c16f5116d2bc974b194641
 EBUILD anyqt-0.0.8-r1.ebuild 438 BLAKE2B 276ddb5ff1115f7d7d9ab66912acc19b037fdb7c77c905a35e120a5741fe464641dd8f92e6348d13a515eb2acffd362b09b85acf1f544bb084f953bfb6df71b5 SHA512 87c599497ec90a604d5bd5dc07a35cf0c32d7ef82b3e4964748c026aac8aaab0c9fe33a22b1cb6b806aaa4525cc336e3ebf5027ac4ca0a0d0fafeaf37c094d4b
-MISC metadata.xml 217 BLAKE2B b4bd64b91108b5009484a426472b93c0ee864691d060218864452d2e504b491022d3d7bcc4b57ad0b5e5f2e01b1fba019e8f63eb79b4db8dcaeb505593ffa2ba SHA512 9611c83ea0155f3d39afee524c6425ae6d7e07cebc4ee489a45e39ab80e97fc2bff56fd9a8d97536a5bc415da147eb587b20ccffa5baa61440df65bd26576e8a
+MISC metadata.xml 285 BLAKE2B 38152295d925a47f99af437b80fe1b74d4d157137f9757acea3b9225bcc5efe4acf0202094a45ef977df646f83592d04d283138bbbfaa0909259d9b7b4bc2abc SHA512 dbc52cf2f97731ff5ff78f113dad36e3a473c4471a04abb76d3f0e772098bb6744a481888850ad53cdd860a91b8784a839cde1402526da2e76f0c520436dbccb
diff --git a/dev-python/anyqt/metadata.xml b/dev-python/anyqt/metadata.xml
index f728eac91cc9..faf1290a5463 100644
--- a/dev-python/anyqt/metadata.xml
+++ b/dev-python/anyqt/metadata.xml
@@ -1,7 +1,10 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>amynka@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">AnyQt</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/apsw/Manifest b/dev-python/apsw/Manifest
index ae1a200798e9..65996dedd98b 100644
--- a/dev-python/apsw/Manifest
+++ b/dev-python/apsw/Manifest
@@ -1,4 +1,4 @@
 AUX apsw-3.6.20.1-fix_tests.patch 340 BLAKE2B c70f404afaed26c92f60690820812fb0ccbe355f43384b4e0a931851c27348b04335aa4c25baf5b2662c85403ad2eb075ce049a724c297a46ea2f796845aebd8 SHA512 386cae12d949a6f4dd55dc7e3e1bc176c43c5001f10acc75261c92fbe14bb09c0e054dfa4087d285496dec4cbd4a9add5733742dbfa82c6e10ee1c8d0f43fb0a
 DIST apsw-3.32.2_p1.zip 679785 BLAKE2B fb58a60f95a677a805b0347a0d8876e49c657092deeadb60a057f4afc62031313faf5a86b600d1d306e42f305c9af599d2439a7051e400cbba2d9185c213d5d1 SHA512 718de699c43eec139747f63c3c26da206aa20f104ec1c478009d29cedff7a432138726131b2458ecd3a67675254af77e94e50e8e96a208600fe2a94aa9d924c7
 EBUILD apsw-3.32.2_p1.ebuild 986 BLAKE2B 66ebe2aca74404da6a5b05ba5c1a267b686805184d39df49d2c7b8280c1d4b5ba6804fc7ec72c30727a559e603cb930d230692a900d1e54b6d6b40cb69afc207 SHA512 4b94acd23e349db090e65c61845e3d4b4028883964092cf160e9fef6e8ee35912ac4a1dd57d1d534408659034d859c222fc53244437dd7fb9a41be8c594f1032
-MISC metadata.xml 677 BLAKE2B 8125a6d9906cfa5626bff6182635ac0b6c65d52abfb9011fb486430055b3484855a7529c0b4fe7d3c2bba8646318a8cb01a37e2ac0b63def11abae26bef6882c SHA512 970eb7e730f147bbe24fbe377f6b9a1557f56d536ce462aef5ccba23059295c4c8d88bb384a7b7ec3f401a512e04134ebe19efa03473a90841d7c6246e2eb244
+MISC metadata.xml 699 BLAKE2B bf19c9247293e0352ad99f01a8cab2e64a8ca9af974849eed8b270dab4d5dec4bd803f3b5e29f433df8a0db9a596faed84a6fa4422db2eef5061f6acda63dcf6 SHA512 b8ed61d9356fd05fe274e6634cbd7ffb47ba5a599de8154a9a6016aef184bd63dea018bf453275f3a8a7a9e562fe1eb267276127320a2d3ce7d3c786e3024f49
diff --git a/dev-python/apsw/metadata.xml b/dev-python/apsw/metadata.xml
index bd25419f6171..061ddc25aaa7 100644
--- a/dev-python/apsw/metadata.xml
+++ b/dev-python/apsw/metadata.xml
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <longdescription>
-    APSW provides an SQLite 3 wrapper that provides the thinnest layer over SQLite 3 possible.
-    Everything you can do from the C API to SQLite 3, you can do from Python.
-    Although APSW looks vaguely similar to the DBAPI, it is not compliant with that API and instead
-    works the way SQLite 3 does.
-  </longdescription>
-  <upstream>
-    <remote-id type="github">rogerbinns/apsw</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription>
+		APSW provides an SQLite 3 wrapper that provides the thinnest layer over SQLite 3 possible.
+		Everything you can do from the C API to SQLite 3, you can do from Python.
+		Although APSW looks vaguely similar to the DBAPI, it is not compliant with that API and instead
+		works the way SQLite 3 does.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">rogerbinns/apsw</remote-id>
+		<remote-id type="pypi">apsw</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/argon2-cffi/Manifest b/dev-python/argon2-cffi/Manifest
index 90802233ef7b..43947dd305e9 100644
--- a/dev-python/argon2-cffi/Manifest
+++ b/dev-python/argon2-cffi/Manifest
@@ -1,3 +1,3 @@
 DIST argon2-cffi-20.1.0.tar.gz 1814415 BLAKE2B c216349beffa263fd96df23f40a8102b56a88b8320e64ac062ecfea4582efa34b298ba223437bfbfc422b68a3d9b9ea769c384db078c633103f2aae3cd38bd5b SHA512 d1d798e3e51ed67c4f523a66081fea99479ee986b5cfc36b250954e757b9846625681445447f9347519d9988f8a2ace2e3c8ce5817c5c6b4767819cf56ee0af2
-EBUILD argon2-cffi-20.1.0.ebuild 763 BLAKE2B f1231072a07245b189470997d0189b5d81d85f8bf6f254e1466b93eb2bfc8763c0c36e741b48710815cbf1e41e3a61071b6da26fc214e48fd353328339cb9d9e SHA512 efafa1066b82104f399b61073cdacf8ff23a7cb165422220a4eeef5fe5a1d496b371cc388437c642811fe1b40a018798f500fdfa9586ee424ace7ffbd782cf18
+EBUILD argon2-cffi-20.1.0.ebuild 761 BLAKE2B 6f0da8a96700efef59a5357f2a356ca2eee03b84195548a132b15488395380a9e1f7c74fed36004362969f7d7a21d39545e83aaa645c30209830c8e4dfe58c7d SHA512 9efdef8297463df37324cc28f8ac06366a7394cbfadef2e253acb8e5eafa974c9a68f32200e5e46173d634074960ca1bc07f217dd7aad23fed5fd7a398edfdeb
 MISC metadata.xml 635 BLAKE2B f81f4a8996795ecf69d31587e460532fca7861c8bc5546c7511ee19389406601e0cfe84d67e9387163247833f4032c8c00f3c4de7fcdf8b9f4a0ff405a5299b5 SHA512 d50d5dbcf728218f7fa3accb7b105b6c879a0fef1382868a1d30159e91dcbb3aa818e986303c0c694ac3d8b00b53e17a66d6b9c9d69bfa8a8d20157cacd5f706
diff --git a/dev-python/argon2-cffi/argon2-cffi-20.1.0.ebuild b/dev-python/argon2-cffi/argon2-cffi-20.1.0.ebuild
index 5107871dfb9f..edd79945cb0d 100644
--- a/dev-python/argon2-cffi/argon2-cffi-20.1.0.ebuild
+++ b/dev-python/argon2-cffi/argon2-cffi-20.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 arm arm64 x86"
 
 DEPEND="
 	app-crypt/argon2:=
diff --git a/dev-python/argparse-manpage/Manifest b/dev-python/argparse-manpage/Manifest
index 0f8744fcb7ee..b44b4e746a24 100644
--- a/dev-python/argparse-manpage/Manifest
+++ b/dev-python/argparse-manpage/Manifest
@@ -1,3 +1,3 @@
 DIST argparse-manpage-1.4.tar.gz 33661 BLAKE2B b2f6a0bb7ef3a95470e73c4c94b9fef42f130433d5f91263201d98c0afebd4c3fc38153a172aa86c50a773e3270e1f618083f968bd38a86046362367f2e8c022 SHA512 4756781dbe988541cb0e1fd8a79c4d262c7bf54397fb302ff3ad706e9a896d68f781931e73013cdd7136efc6e46914118b862e0377f49b73fb25b20d0a23744d
 EBUILD argparse-manpage-1.4.ebuild 532 BLAKE2B 5124686a176d874ccf1b792f613d469b0d685dabbf845a1938821c79f07a9d19e43b34316309d96b02c40ed94568ca2d67611fea743f6ab0c960d49bb7127dbf SHA512 a4953bbd2bf61f4089b8c51fa83f67bb40e0553ccdecda32235c7af36785164c32848c6d1b60ab21ecfff02e90247ddd3a8acdcaa6e02dfc5abeb13d64206119
-MISC metadata.xml 249 BLAKE2B 9e4529cdac0a55f14c36fde3fa54e30645a61a73d58e83ce460edf84d729bb3cd4cdc3e52d588690945508bc7d253b1edfb7734ebee94a88b75fee249a043c84 SHA512 ecad16da7f98e9b1cb1882147e6d8b7d541e4839d92fc26f3db1bea69ed633637da9259947b2b78d204a11d0edd3daa84f173613b6dc19110b5406c6fddfa7f0
+MISC metadata.xml 393 BLAKE2B 782aeee413c875a64465132ed14d6cea83d95b5e6bd54d62550c5edb6b4cbceb55526245ecdbb21673206d3c02c19acaeaeb3b2b5bf88e2348adbdd14fcd3f9e SHA512 b22f22c55a2fc6f0ff0f9380a035657923cc8ca03d6d6047a62f939ccfeda6389498042e7dba5016bd12f89cd207580250203027530e491ee863a982525404aa
diff --git a/dev-python/argparse-manpage/metadata.xml b/dev-python/argparse-manpage/metadata.xml
index cee379b15409..ad3003519fc0 100644
--- a/dev-python/argparse-manpage/metadata.xml
+++ b/dev-python/argparse-manpage/metadata.xml
@@ -5,4 +5,8 @@
 		<email>chutzpah@gentoo.org</email>
 		<name>Patrick McLean</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">argparse-manpage</remote-id>
+		<remote-id type="github">praiskup/argparse-manpage</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/arpeggio/Manifest b/dev-python/arpeggio/Manifest
index f3b6c739de83..bb119f47cd73 100644
--- a/dev-python/arpeggio/Manifest
+++ b/dev-python/arpeggio/Manifest
@@ -2,4 +2,4 @@ DIST Arpeggio-1.10.0.tar.gz 766416 BLAKE2B 75898c5be536998a12ec0efb8ca0729913e9a
 DIST arpeggio-1.9.2.tar.gz 761920 BLAKE2B ba8c8a5cb8965325c1c3be68a481e024b0ab703d5f60fd9ccb2589fe5efe2618fd24f2b9bc36823005897c83e233bc97372a0e3d2010cf2e2399b96aec58feb5 SHA512 fa1057caaa0b5d26937c6e5aed719f64b293d3332e3ce0277a586bd48ca136792a4811c292fd87f2e58148874e008a6f2f621630052c5dfaf0e0efe2e8039353
 EBUILD arpeggio-1.10.0.ebuild 728 BLAKE2B fef9aae528f38541ad0fd342932e1568f16d49278f09be86d5cacb8606aae5c4e36c5bbbaec4ca1f34fd51fff44a287fdff917e9aa3443ac819e5ff4e9402793 SHA512 85d78c149a939e05bbdde43845c5dc9aa29f6958b080ca7c0d9c83e52f675af42392d3dad59d7783794c5642217f4e9bad9d5af0c0a2d7e6ff177c3632f8b197
 EBUILD arpeggio-1.9.2.ebuild 974 BLAKE2B 8340254357d475a6914e5b245012598a08e0943f5ca6587b6882c7f4f0d1073bbb1d3cf91bd7ee1a5f577cde3157771fafb97ec8e99bb8fbfaff75bfe33fa902 SHA512 43128d92c47a4541cba32405a31d8bcae4fd4b283424af508f9a63a3f31fe5044f93b0a33c521b5e25c221107c0cde4acdd9a62fd11aab6b48b2f0121093f6d3
-MISC metadata.xml 351 BLAKE2B dac9aebd47c197ac00e60de049d4bfc62b3fc4082e1566475ca0a9fba0435385dc475cb6c2e7eaa6e4b91ea0ccb097ebe55da23f5f3e00325c7c1fc74e66d278 SHA512 cad3a1cb94dacf951a07d5a98a35bd723b00ba6745f52f1ff2f5d20c5c63fa9c1e875617a0833f822a1177cba0805b07964eb6ca0abbfa74f93dcd42f601a935
+MISC metadata.xml 367 BLAKE2B da0bdb5ba0b94ed3181e6318742907c67a6d04b095011528cb5acf614a55d15ab107ba212dbc3868710976129e5d9790690cbfd0858b97456daad4dc1ce8df55 SHA512 67e3ca7fa1fb672313f0e86d852acb2fe19418605c661e54b9be464cce7d3ca4a57ca426e606095639f51a8d0d74c50344ba7b51d392035a633e1af752b64770
diff --git a/dev-python/arpeggio/metadata.xml b/dev-python/arpeggio/metadata.xml
index 91634f41522f..832012f48b8b 100644
--- a/dev-python/arpeggio/metadata.xml
+++ b/dev-python/arpeggio/metadata.xml
@@ -4,8 +4,9 @@
 	<maintainer type="person">
 		<email>zmedico@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">Arpeggio</remote-id>
-		<remote-id type="github">igordejanovic/Arpeggio</remote-id>
+		<remote-id type="github">textX/Arpeggio</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/asgiref/Manifest b/dev-python/asgiref/Manifest
index 54cf970f8727..31fdbb64ce8a 100644
--- a/dev-python/asgiref/Manifest
+++ b/dev-python/asgiref/Manifest
@@ -2,4 +2,4 @@ DIST asgiref-3.3.0.tar.gz 26945 BLAKE2B bdb1154175f95fc068fd1841a69ec9c5e782c212
 DIST asgiref-3.3.1.tar.gz 27197 BLAKE2B 1a883ed8b87dd1214ffb7672796159684f04a9a38d75562df38455ea039667f877020263b4577a3f6f7cfdfa0aae2a2074781db669f10c5b639a5009ee4c94b3 SHA512 2d709e8b0ea8b9f11f485ee438cfbbfe8a832de1aa37094a6339cfff23c2605ec79f691320c42bebf46f3bddb005ebb6857d17a8ad641c87a149536cc65984e6
 EBUILD asgiref-3.3.0.ebuild 553 BLAKE2B 2cdfb25bd9f40cb79054b7d3702dc693045c66476d32921d086fdce5fbed39ef69ab2140adff05f3e071d139422c03376bf4f8582585a98bb4387de68a9daad9 SHA512 634b888ddfde6ad601e0c7d7d751b302ba74732c3ad440eb0434da0f1b03edf33765acfb6b855584a39e07ba16450dc4a4564051ab1c17b30f931b7362385921
 EBUILD asgiref-3.3.1.ebuild 555 BLAKE2B 0b6a29fb597615a1340f525b3f11345019e91de6927899519f2ff63551bb6feb539273f214066c97613b586f136909d4178367a162440df1e549770afc875bf9 SHA512 35762a636c0e74d3681f67964c88edf3cff219aa6433a16a6e20af53695590c9ecf4f75703a005ed69d4beb60011558b90a3cb83aebf4bdebca8746f06652ae7
-MISC metadata.xml 264 BLAKE2B f956660bd90e0c6757ce9a7284329bd8f9d14053624a6ac4a017e5a1ffba57ee084542dbc9ac887756dd64930cdb00e33dd56361404bbbd2d2d27213f84da4c5 SHA512 4d8147ee0077ed9f48ca883928f98dd317506bc25a1ba5c96fcd32870dcefae56ff47560cb99eb23a5339f893d19fa4529cc432afb7999dfa04c727cc6989eaf
+MISC metadata.xml 388 BLAKE2B eb8c329aa8d5220d66dd380ad7c4bb4fe539b3fb5b854e9a6b4912d2212b6ffa74d7f9331c5ec575bfd53407d016b464efb06c3f94c4088dd729f646b5d528ab SHA512 45d74c331619ea754ed36e7a2e9eee1687be49cf698ed7d9e89c8cb006b40001be93a8fc753830dbbba12a5ca61d3407aaa364aff3354708ae79cbb72cba6a20
diff --git a/dev-python/asgiref/metadata.xml b/dev-python/asgiref/metadata.xml
index 4c43a15ce6f4..c8bf84bc495f 100644
--- a/dev-python/asgiref/metadata.xml
+++ b/dev-python/asgiref/metadata.xml
@@ -6,4 +6,8 @@
 		<name>Python</name>
 	</maintainer>
 	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">asgiref</remote-id>
+		<remote-id type="github">django/asgiref</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/asn1crypto/Manifest b/dev-python/asn1crypto/Manifest
index fc7530fe42f2..3f11f4c00f51 100644
--- a/dev-python/asn1crypto/Manifest
+++ b/dev-python/asn1crypto/Manifest
@@ -1,3 +1,5 @@
 DIST asn1crypto-0.24.0.gh.tar.gz 641322 BLAKE2B eb30afd0d2579f44ee4f556139357dc7622691bdc2067df913a4412cd3dca8372b85d84e3a3cbef6ba83648bf4ef55d7e8614992e2abb019301c92d24b15a926 SHA512 426cc380903b4dd7aadd7b831e3a11ee3442c961a33b856d4aa8d9060e829f2e0ad905a60c4d6504569718fe2cee01d9be31628c89ef030bc34281e381c898e8
+DIST asn1crypto-1.4.0.gh.tar.gz 672812 BLAKE2B 7545d424c244c04c2639df45e0bb56c50de95d0a7ee1e56933720dd7215c2be2608ac7889e2e901785592592e9ac6cb116fff3cd00536903c392a9e3912fc08a SHA512 989e4e0650252c29477d71263549b99f2c51c87f0768c20264b3de65f32edd8e7922e8af23bb1a7e29567a4ad8c4c5d596cdf7db3c766352c7f19d4f93361cd0
 EBUILD asn1crypto-0.24.0.ebuild 842 BLAKE2B 235a01eaf99cd9287798da84adc85568f6063c21e8630ca271af6cc7173a56347bccd1ed33751af9e68a069b89bfe5b3d56f23bb87f7cc725ff6249c672509ab SHA512 8d1223fdfead57bccff66c0b6a6f2518999254774ea189e65caed7f4db80ddc2a77fe7322408ae5ad703171c745aedd6e658a5581863f99e335f91c259b05ae8
-MISC metadata.xml 384 BLAKE2B 6dbfdd39bb24b2df61454716e308605ae1d35c3babd01f16556bbbab240e425434315cb2b80a2c3e8e9b18b237899b5fb96566a7ffefde2af3af1dcc2e08362b SHA512 c2806f846608bdd0720b589494e13f57ab2d64026747f2b13f412c9a0e9d2bef6b16fc357e4d16b74ad7a2a2af8daa5e28d0b6bfe4d2141ce68881c724fd24c7
+EBUILD asn1crypto-1.4.0.ebuild 748 BLAKE2B 4c4b27af4da53ae0d83ada5df21829db4b448808fb2218adb8d080df71b3710a3a4748e5ff38c94f06777841914566e66a7346533d398d9bdf03dd8ab5f98cd2 SHA512 cd7e39e83aa036d4f86a2c9fda79d5588be6e84443610656433adb30d8458da3c6719b4b7d6d15fec98f3f9c01560839ad3adb8e54fcfeae5cd3f0f3ddf9142e
+MISC metadata.xml 369 BLAKE2B 10f3c63d43c7c239c32d1d531ae9f72e584e65038c6d8206fc53f91563e1d7bd7e26dce21d7c7c71e1e1b2359f5c46e989497bbcf34bbe373354253a322d74dd SHA512 40fa02100d2e7411d5556931fd91a55b30ad4d42d460bc072ddf0bebeee5cb9559a30d23968be82e49f14f347cdfdfd9b55614e5d48182e2147cf60b23eb1fa3
diff --git a/dev-python/asn1crypto/asn1crypto-1.4.0.ebuild b/dev-python/asn1crypto/asn1crypto-1.4.0.ebuild
new file mode 100644
index 000000000000..9803ec895c27
--- /dev/null
+++ b/dev-python/asn1crypto/asn1crypto-1.4.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python ASN.1 library with a focus on performance and a pythonic API"
+HOMEPAGE="https://github.com/wbond/asn1crypto/ https://pypi.org/project/asn1crypto/"
+# pypi tarball does not have tests
+SRC_URI="https://github.com/wbond/asn1crypto/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+distutils_enable_tests unittest
diff --git a/dev-python/asn1crypto/metadata.xml b/dev-python/asn1crypto/metadata.xml
index 2dfa57bc0fb6..94d6d17f750b 100644
--- a/dev-python/asn1crypto/metadata.xml
+++ b/dev-python/asn1crypto/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">cryptography</remote-id>
-    <remote-id type="github">pyca/cryptography</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">asn1crypto</remote-id>
+		<remote-id type="github">wbond/asn1crypto</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/asteval/Manifest b/dev-python/asteval/Manifest
index dede92d6ee52..7feccf2074af 100644
--- a/dev-python/asteval/Manifest
+++ b/dev-python/asteval/Manifest
@@ -1,3 +1,3 @@
 DIST asteval-0.9.18.tar.gz 52727 BLAKE2B 41b4093ee58dbb5fca0ab0ef3617e8211d2a21a968f448efd562ca53daea06c4ddae7fc93ba17bfeac501cb46c5d061148b10f33340e93d292559312f974644c SHA512 810fa9bc82df18bb92bdd487cd4cfc0a7c63adf5d4c7edac7ad7be0ba8e40605314a3453b4af06faf59821902a783bab3452adfe5c7ae54b69bd62b3126d3c3e
 EBUILD asteval-0.9.18.ebuild 445 BLAKE2B 8141ccc6791e9458ad4fde82d88b2610f4e9683fcc4c25a2cba8ff3fc0b62176f9d055c7815e1f3d18465cb3a90f3cbbf46b7a41796ebfc0a142d853c5e445d9 SHA512 c4a62670db94a9b8ded540c997230b004173d49ade8612160316245c4a8cf6729432830162b4dbd7d838cf0d00f35de046a447eee1d96643e43ec5cfddad8726
-MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
+MISC metadata.xml 286 BLAKE2B bddc2409a021a905f0d572194acf10f7d576dc529121bd4ba513ed0c53525a55895aef8fbc4f631e130cdf631a34bb91e78a1a3690578e2786ad375e33c644ca SHA512 71f5e2078139aee70ceb572d354e17ead91f6611bad649c2c51ef154710592bf692b803d5debe54198db55b713e48279dd671066306e7b36434484f3f664b9e7
diff --git a/dev-python/asteval/metadata.xml b/dev-python/asteval/metadata.xml
index 020b40648ee8..15763d8b08c7 100644
--- a/dev-python/asteval/metadata.xml
+++ b/dev-python/asteval/metadata.xml
@@ -4,4 +4,7 @@
 	<maintainer type="person">
 		<email>pacho@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">asteval</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/asttokens/Manifest b/dev-python/asttokens/Manifest
index 4d060838fc17..afade2a2e146 100644
--- a/dev-python/asttokens/Manifest
+++ b/dev-python/asttokens/Manifest
@@ -1,3 +1,3 @@
 DIST asttokens-2.0.4.gh.tar.gz 46823 BLAKE2B 111ed58c1b657900f830b7b9f521c1f87fd37945ab6ed6e165108fc2371923030b37cae33885e166a524eb8dd5cfad5fe9391a19b7729b7cd504474d1477748d SHA512 49287259d64c43c7460357d19ed95495ab499b0ad7ae0d5a59378ea0332142b574643349d1d3ca56442712ebec14c53167da475915017feb1b524ac190f9dac3
 EBUILD asttokens-2.0.4.ebuild 1463 BLAKE2B beed10427f48ad7a6644900f742aef1e723265b1ac7a24fc2fd713a6dd907443f271b1011b052e19ab2fef0e57c5014e7dfebd347bcc469f9e12a9b6d0702ba1 SHA512 4ca621407c94a98fde8d17d0a8acd61f50bdd4855c5b252b065d4700117d13f79bcfbdeda418ddf8be64ead584757713b6bf03693c3a3bebac82ae0ba4d8cf1e
-MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
+MISC metadata.xml 349 BLAKE2B 98a5cf5c1dd38d72e3a9291bce91e66b23feaae3df2356e68e60bd2fb37a578b3f62d9f1eef8f8966c1cb10dc1c6d0820cfc9977e30c8574f9881177fc58fd00 SHA512 1bb6c8ba010ccdc6a47646021446943063034afeccf89437e6a769f40136e0a8a3875dca5eb40beb119a87e24b37db342542d89acde1fd3a836853f4524f62e1
diff --git a/dev-python/asttokens/metadata.xml b/dev-python/asttokens/metadata.xml
index 266e3f19ca59..be6b2431adb7 100644
--- a/dev-python/asttokens/metadata.xml
+++ b/dev-python/asttokens/metadata.xml
@@ -4,4 +4,8 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">asttokens</remote-id>
+		<remote-id type="github">gristlabs/asttokens</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/astunparse/Manifest b/dev-python/astunparse/Manifest
index 8acf0880bb77..75d5e7396fec 100644
--- a/dev-python/astunparse/Manifest
+++ b/dev-python/astunparse/Manifest
@@ -1,4 +1,4 @@
 AUX astunparse-1.6.2-tests.patch 707 BLAKE2B 00d45b4b6bfdc70828d173985533345798a5982fa4f345e83c07e39c58dafffbf2a50ae1657df02769351a402e66faec443f7e63604ef457517e570803c50b3b SHA512 d1a86860548e0b904cc70017e0b5fa3a4e8da6bd1c03571e196e01a660d31a3ae03dec77c36945d7b5e53920b2531f0a7a0a5e3edc15b5a61c53ddafe83156d4
 DIST astunparse-1.6.3.tar.gz 18290 BLAKE2B d7e6fa3ba58c6e112eb84720832890f4515b1c4ed420587565cdff37da893c07eefd0b9eb00795a3eb08bf56834d65150298a6be65e524b0c267c38e6f9c20d1 SHA512 12e99b32524e551494d3053a57aeb646bca8a96a9aa17b0737e6dace6c11874e2e7633d82197cacc0b55622bea637030344ab45c8db57ef244bd63663799d2e9
 EBUILD astunparse-1.6.3.ebuild 618 BLAKE2B e8e190bf898ec04aea08b8edc6310b11c81a5e421a4c24b9fcf993e1756506041c28b5069a1efc9104c366424c7043b3b5524f8e48e2ed20db3beaa897de37d4 SHA512 7bcad61d4ea1bfdf04daec87b1d4f21da117880d96e645e7d2c6300f7745358b65cfb74c5ad697b677d14b983d2b01a5514f05d4df2ed52fe72d350ad6c9da33
-MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
+MISC metadata.xml 321 BLAKE2B 722f1449c016ff8fa07f474fda10f9caa14137eadde3872e5fe0624a4a3c5f516826b1b98a345c286032d947e4b41e0d06aed4eeb80ae0734e4ecb657b51da09 SHA512 e29a82b0c307eea4f9b60464a2fe8b9cb6c5bab4b797ada3ddc3f8cbda00f892910c97908487c5f53986f762c7824d9af61e28baa62d5b9985893798e6b64cad
diff --git a/dev-python/astunparse/metadata.xml b/dev-python/astunparse/metadata.xml
index c36c37139fad..3450c7499fed 100644
--- a/dev-python/astunparse/metadata.xml
+++ b/dev-python/astunparse/metadata.xml
@@ -5,4 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">astunparse</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/async_generator/Manifest b/dev-python/async_generator/Manifest
index 17ef48fd7459..0777c3bbba6d 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 706 BLAKE2B 426fec76b5d43fba969483b484fd776d9d07bc277857cc88081173039f446ff4e6d3df6c92d0f9cf25755ae2e30324fc010bd4625ea04ffc03ab9845114ebb73 SHA512 4ecc6e084c678a2848f8878de442893f79b363d86d7c49bbd7af65d72549f56859f9fe7b5257814e4bcbc6d729985053dc8c523fb50aec1187af9738f4a112ba
+EBUILD async_generator-1.10.ebuild 705 BLAKE2B 9a3e0a538cd4126e66cb348987368c2e13c261c15a961a0666ab6b9f9d11f8f71e34a1a86ae0d60ae79a6ceaf1bd8fd074a306ff27e4cc57e7631aaf0f8aab88 SHA512 578df87e5a45f0f8047be608d3d5d0f96238a4182315b52dc51294567bda3c9658c49bdd8c0e35f850be7061e6aca6584552f9586f27da16cc11434b3778728f
 MISC metadata.xml 466 BLAKE2B 475eccc2804c48f77acafcc3359a2d5c377cbcb79dd2ce1b083c2e2e55931738cf1eca46bb9d2b7172df435f9bcba6418b80c48836bfb7d8298f868639df5eaf SHA512 3d89946502cb479a68d77b5e08cc31171cf05891391833ddd986c70691f2d33cf3b480d290f90a58ffab53a9bc882af2adaaeb8f9cff53038a21f421ba7c2507
diff --git a/dev-python/async_generator/async_generator-1.10.ebuild b/dev-python/async_generator/async_generator-1.10.ebuild
index ef5ca4c835f5..c40758636268 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 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 DOCS=( README.rst )
 
diff --git a/dev-python/async_timeout/Manifest b/dev-python/async_timeout/Manifest
index 3a2d330c347d..f70c49351d6c 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 1023 BLAKE2B 61d94a0ef6b0a4f5d68fc66471f5655d36b33c642145eb1d83f63326f6a76feca1c33dde36fe8ed25dbc43fda7559c4874879e55a025cba8b9eb66de7d973a62 SHA512 d27ac6bf97a3061cdcf5b33e276b684cc933b9712130ce8c3ec348335557d5ad34e3bf7466444a660bef329daed771136ca76a5017e93d81ddfbdb3aca1666ab
-MISC metadata.xml 459 BLAKE2B 60ae5fe574af7abad31711e3950b593a06080489f447c53e4c40166f9fa89b19f81ac3519b9b1e4daaec9f783f9ea85aaa387903faba4d007280666dfab4dd03 SHA512 df5c0e3ce5f4e10486a6aef2923d96caf13b28c8dd4b9c5a5c0f8abd23ff8347d15b3fe9b89d7793a6bda297fc9b99ed63b12daa19442270f8a7dd95903c55ac
+EBUILD async_timeout-3.0.1.ebuild 1022 BLAKE2B b1b1fa74acece0d85587592b9634505f55f5b02651c51aba07411b1e7184a3610e61aecce6a4f60019ebcf9a0c73462d95ac8b2ba6c6010bb4b592b6e0d15c5a SHA512 bf4b352e0f6366308a2113b303b36542d355670799c27220824854a3ecca939bae18bc7af455599cc413861e175766cea2291210849043297892293dbbbb860e
+MISC metadata.xml 459 BLAKE2B aa3214d8a14324f68b5743f51371cf1902962a5b14bb7065a04944684d33f9639edbc9a899f5cd02ca19068506c5e403db149742d0b1cedf8e35a5927a837901 SHA512 fb0488558b0e1d7b9e0721a7d299bf2d105d66c67f51ea1bdb1b8dc529bb3a964c89d4410ee8640d0b094d1e364e5d59d8a9b7bafb0cdd9f3dde6443c0d46a15
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 f0b58a1475f4..ee351a5af79e 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 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 S=${WORKDIR}/${MY_P}
diff --git a/dev-python/async_timeout/metadata.xml b/dev-python/async_timeout/metadata.xml
index 50d0852ebd22..83850f5c20f5 100644
--- a/dev-python/async_timeout/metadata.xml
+++ b/dev-python/async_timeout/metadata.xml
@@ -9,7 +9,7 @@
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="pypi">async_timeout</remote-id>
-		<remote-id type="github">aio-libs/async_timeout</remote-id>
+		<remote-id type="pypi">async-timeout</remote-id>
+		<remote-id type="github">aio-libs/async-timeout</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/attrs/Manifest b/dev-python/attrs/Manifest
index 28d296b2dd6d..49e76275ad70 100644
--- a/dev-python/attrs/Manifest
+++ b/dev-python/attrs/Manifest
@@ -1,7 +1,5 @@
-DIST attrs-20.1.0.tar.gz 160766 BLAKE2B 65170484648318b9e6466789a9d212475dd8233c2d89fdd7bdf3b24dab4fd5018f981f30a0fa0df83271a8bcc915f13b03a55e7e42da2e1d8a3a0684430107be SHA512 0be286c9263ea26fbb29a89a1c9a37577577b1147cbf440de257a3652147bcb559c8fc4118a900cef558b9f49b59074a276c8a4843f3e8829278eaae5b70e913
 DIST attrs-20.2.0.tar.gz 160604 BLAKE2B 1536366a943aa2d0517e3c0aa71230c378b20e731cbac78d1c5cc96f2500fb30203ee0939e25c80f8216bcc6dc7ed1fdfc2b23ab7f5d7c712fb05f5ba65739b1 SHA512 829030d8c1fe7bffbbb8d70fc56228f4c378d85a24c89d802e51f63a78abbfa24f46f5aa8b56cb7ba26ef0bf1fb272163873c45c994145de0be45b14c6fb29cd
 DIST attrs-20.3.0.tar.gz 164523 BLAKE2B 66d2e038e485833f5033fbabe2ef9a6565e3f5f5e8530f2c70019e4f5bdfca51083ac6d0bbc9eb765f838070bc90e01db1c83ed6da113ced67300238e12b5f42 SHA512 640532c6b763fd96572e5d85e93c111bebc4c5e0ff9419fe92fb51280f03acb5f9f43339f57d30659e777d5578460675c60ec0a362f9ad433893e3624ce6a931
-EBUILD attrs-20.1.0-r1.ebuild 824 BLAKE2B 024e581795697e8095b830d8eb4eb7b8a68c2e9ff28e6f7397313886b26765c54a3c01c9b9d831e7252fb4f30fe7f97cc131ef4d45c7642666cc2b3fc1241cf9 SHA512 635e96242fe24eacea79ee7e04a0a3e7ac76a57f24e45846683ce8769a79bef8cea6db041507e86c3a5077c7abc4946d347fe0e16f02c83b958b2a68ba8e1907
-EBUILD attrs-20.2.0-r1.ebuild 833 BLAKE2B a138cb7f30f0dfcddb7d09abc4b4ba914f6d06e9bc7bd920b51639cf401079aee2b173c3e4e2c717c5046facaf59db2bc65c8a197857d1e7b02236165dfdd2cb SHA512 3b0ddceaadde450f4e9debf0162790d7447d74876eb816a718e933fe9274fa3e631da903aed5955bc11ea51fb6b2917d12745bfc87af7eab1e75a67c9772bf83
-EBUILD attrs-20.3.0.ebuild 844 BLAKE2B 8d89df599343176fcfb2b65c86ed6f56a6995431eae3e2472ce150c825e85749c9f26439f8317d592b5d6e9f00b65febb9a9dceae34325199bd835f68b71ad7c SHA512 99af5c4d0229d8cc358217b72356c84dce309312e96f45dbe0522649f44f8d1fd14e64ed7ab825a9438c8def1b7b76567f3234a41e69e90f0694d107ac3b43ee
+EBUILD attrs-20.2.0-r1.ebuild 824 BLAKE2B 024e581795697e8095b830d8eb4eb7b8a68c2e9ff28e6f7397313886b26765c54a3c01c9b9d831e7252fb4f30fe7f97cc131ef4d45c7642666cc2b3fc1241cf9 SHA512 635e96242fe24eacea79ee7e04a0a3e7ac76a57f24e45846683ce8769a79bef8cea6db041507e86c3a5077c7abc4946d347fe0e16f02c83b958b2a68ba8e1907
+EBUILD attrs-20.3.0.ebuild 843 BLAKE2B 051a7049545266aee9dd05e5dbdfe80e91a95a65c3a3c979043109eebe29796e508dc48f6f8e1b5dbd8f4a8b3ab15580dd65f49b61cfb70a2731c719dc9b0d54 SHA512 f4d9e146977f34056262b90a5c92f1bacdae7f6ca11db434ddb7c7d44f6135b71c2b34e57a24321bc7427e2981910a7cc9395894d61588a536e5d89b32748f63
 MISC metadata.xml 520 BLAKE2B faeb38666d6eedb08951c10cc1affa171731fd5ccdc4ca482946aa9e94b887d493a43282c6fc48835af03badaf59af17f912a8d3d1481297dd5596c4784b4951 SHA512 a12b5bb882626a823475b64cd56ede72349b38ad19b70696a83558553a26499a85371e0c2996274b98b0e076e00fc2041dbb0a9af485780c54a3d9a36d7cdfe5
diff --git a/dev-python/attrs/attrs-20.1.0-r1.ebuild b/dev-python/attrs/attrs-20.1.0-r1.ebuild
deleted file mode 100644
index 51d40502f544..000000000000
--- a/dev-python/attrs/attrs-20.1.0-r1.ebuild
+++ /dev/null
@@ -1,30 +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="Attributes without boilerplate"
-HOMEPAGE="
-	https://github.com/python-attrs/attrs
-	https://attrs.readthedocs.org/
-	https://pypi.org/project/attrs/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		>=dev-python/hypothesis-3.6.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-4.3.0[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/attrs/attrs-20.2.0-r1.ebuild b/dev-python/attrs/attrs-20.2.0-r1.ebuild
index 6e31251f8bf2..51d40502f544 100644
--- a/dev-python/attrs/attrs-20.2.0-r1.ebuild
+++ b/dev-python/attrs/attrs-20.2.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	dev-python/zope-interface[${PYTHON_USEDEP}]"
diff --git a/dev-python/attrs/attrs-20.3.0.ebuild b/dev-python/attrs/attrs-20.3.0.ebuild
index ff76ab4915e6..239b02ab9065 100644
--- a/dev-python/attrs/attrs-20.3.0.ebuild
+++ b/dev-python/attrs/attrs-20.3.0.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="Attributes without boilerplate"
 HOMEPAGE="
 	https://github.com/python-attrs/attrs
-	https://attrs.readthedocs.org/
+	https://attrs.readthedocs.io/
 	https://pypi.org/project/attrs/"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/authheaders/Manifest b/dev-python/authheaders/Manifest
index 005e1d0477bb..df03fa1034f1 100644
--- a/dev-python/authheaders/Manifest
+++ b/dev-python/authheaders/Manifest
@@ -1,3 +1,3 @@
 DIST authheaders-0.13.0.tar.gz 93319 BLAKE2B b4370a9cf3d6a5e9772be97d07ac24d1d4a97e24df07d65f74b22bbe4c85c8cc8d4a0e933b2c84b4b159aa7bd7572530e3784118e17f3b5caf8a4365e2bbdbaa SHA512 dfaccd9dedea8bebc22b831c481c733590e11a3483e42b45f0b6329bdaa98eec0644faf8da8b92c56c2d48a43eec9c52f8ea9a3c67ae841c46a7085cf0572177
 EBUILD authheaders-0.13.0.ebuild 697 BLAKE2B 56701520a526514d960868098baf2b2f48bcb478c7869630f55998bf05ecb9c480c18cf950e6b13f0954f0f18addb5d1a483564db5403a12f949a4da6ee18e8a SHA512 76663b888571a1733b101fbcb54bc585327e703553eaf3bf7ea07470d4cdd5f59b5f70e632e7c87b5698de014cb3274de809f954b7c92aae199d5d320bf9ce4f
-MISC metadata.xml 333 BLAKE2B 1a681ac99aee289a919b530bb87037df6fe53b044ce14ce3a9da3cec54a73d7fde58cf01f12678f18397d16b56c9e5bf88d289ddec4469e343d7193502124124 SHA512 a73512d246562e6591eb9c8d13759352cede7f0ae978d02c87bd72b1fe2c9b155cc3908e8489b136387bada61f1257d8e0771e01e26d998b51f9ce13c087ec41
+MISC metadata.xml 407 BLAKE2B aac794530afa2277f1499a7386f48ed3761720ca40cdb4e7a5336c21ed187c84c2b8c9ef0d803cad4d51a631ec03b92ef2f07183ac2ecb93d3f2d0a4fc0829cf SHA512 5789776556152b80e997c19e18ca0370576b5bf634d762106ac5058c6c4530a00113ddc5582732f2060b2e0f56319e9f9099cf0020acfdf64380dadf1d509412
diff --git a/dev-python/authheaders/metadata.xml b/dev-python/authheaders/metadata.xml
index 3ee70120def4..d7a8404dd952 100644
--- a/dev-python/authheaders/metadata.xml
+++ b/dev-python/authheaders/metadata.xml
@@ -8,4 +8,7 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">authheaders</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/autobahn/Manifest b/dev-python/autobahn/Manifest
index f58c975822f5..6fa8c8b85283 100644
--- a/dev-python/autobahn/Manifest
+++ b/dev-python/autobahn/Manifest
@@ -1,5 +1,7 @@
+DIST autobahn-20.12.1.tar.gz 1269156 BLAKE2B ff763accde6a2929fd777364c926132b8317d80f137d67768bf192fb72f45597ac115824783f01debacc773dcc9a60325692ac420e55b6f67f4ebc2cdc6187ae SHA512 df7c7065e050efb5f315055c05aa9b4fcf8636e7208f17b583ed0823a071c6484adcf610308e83df3b5bbb91a4df19266e739abc8405e34483b1bf3d9f2c74c7
 DIST autobahn-20.4.3.tar.gz 938992 BLAKE2B 259d18f4aa46f7eaeac75811c1c193f3046aca5c5e37627d9ac62eeaa3dc944d05a8d87a558e241bdef56c799be4d89f65d4c8ee7c1a2be20f892896227eb5f9 SHA512 c34f29951b8f9ff5161851cf3a7e964de136f6091b0231a8e78e7fe74cb085077be5078cee352b2c27412d9aa4303de1eb85aa1890b4fb583575638a9c47c6fb
 DIST autobahn-20.7.1.tar.gz 1260579 BLAKE2B 925d148836348c068d179d4871267bf79c8c42d27cacc6be09cca11396dbd213a5b86344142df886d4ff69d1214a86b49900ca3552bcdb640377cb0d6af7d0f0 SHA512 e2c241194da90ada86a2804683cb063320f75a69b76ddc016349c11614e7f298619c2eeba4fcccb8f8d65d84375681fb339d9f92f94f45f1015f4f12fa0c39b0
+EBUILD autobahn-20.12.1.ebuild 3040 BLAKE2B 18f19f325b14341bdb6d272012de8e6582759a24811a74aea84b2ed36c865947b20fe1640c75438d7a3ddde965c35b72d5af3ac66972405e6e228a88ff03c96c SHA512 de18ea1f72d6505a7394ba167c818811eff99c756fee3898cc5400a6a605a56c040c2149edd16dddf3e69d5d549a19a9799afb8c399ed4250e65ecac59dd350a
 EBUILD autobahn-20.4.3.ebuild 2451 BLAKE2B 3d5427b1164f94073c6da8724f11b9af14135f07bca9d2659c1d865fa646288cd50e980d51543cba6a53f039ebe12b17d30a692e96e90f324b135b7ae6502a33 SHA512 ea12ce096373c081376e66c26552e9f5a67822ed926a91e0726b9dba980cecdc9b8052aa2724fbe2a43d50e04cc0346d96d34b2c88f67ad157bd49f312bd54da
-EBUILD autobahn-20.7.1.ebuild 3001 BLAKE2B 425c79f8a968758816845df5888ca59910e3b2f5e0752304c5ae4a8d4bdd90e9317b2710125153d1ef33e0643dd90b4bcfad1936721a9070756de5a9ea0090ce SHA512 48425fe2c81bddc4fc16a55aa275e084a21e3f711fb5e5414c15c121ec60ff501b2310d1d3854d4a490a1c2bc98e24f18deb917412ea121e568e487a2dcea915
-MISC metadata.xml 555 BLAKE2B 35f1b962dcae81339cc00ddec0d51e0addfc78fe7263471bef713b512b75b90d0e88ee49d5757e8670c689bcc549ae6c4efb43f80423a1c3c87ddbe25fa7ce5b SHA512 d81264ea358930680a128403fc2f54173033a30c70969cd0e22790e0f78f30f7e6e575c3f671500e0da3fd0c13dd08a83ef6bc9b500b7121c8dc4e02a79c8702
+EBUILD autobahn-20.7.1.ebuild 2998 BLAKE2B 4a9e8d1708a4065466fca23dbbe1d833dfcc3760e4db3153d68124b8923a234e22d84ddc980133aa44dab30f579e9bc89626fed6b4856afaeb2593e128ecabcd SHA512 568b312ebc0186914f203681256e221a9fe4b7d6752bb2cdb91c609a11e5453d4c812afecde160e917701984f545ad91b4378ac61252b0eb89c46f9f8c6edcb2
+MISC metadata.xml 665 BLAKE2B 11ce0fe43744ff03c46a4e4b6b06733807a4674956dc885a3185bd353f0617841a6f6d1afbbc02c02b7e6718b5c0ccce69907920322e2966c8f7e9d1f63d6485 SHA512 9e154ce907c9868b86a70c4c2f6173e4fa8cc6e1f63380978d4a9c706f00316a9eda488fc39c32c5ea70f31a1a12187629665b590e79f64906ab982bf1401fbb
diff --git a/dev-python/autobahn/autobahn-20.12.1.ebuild b/dev-python/autobahn/autobahn-20.12.1.ebuild
new file mode 100644
index 000000000000..3633e2beeaa0
--- /dev/null
+++ b/dev-python/autobahn/autobahn-20.12.1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+MY_P=${PN}-$(ver_rs 3 -)
+
+DESCRIPTION="WebSocket and WAMP for Twisted and Asyncio"
+HOMEPAGE="https://pypi.org/project/autobahn/
+	https://crossbar.io/autobahn/
+	https://github.com/crossbario/autobahn-python"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="crypt scram test xbr"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/cbor-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/cbor2-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.9.2[${PYTHON_USEDEP}]
+	>=dev-python/flatbuffers-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/lz4-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.6.1[${PYTHON_USEDEP}]
+	>=dev-python/py-ubjson-0.8.4[${PYTHON_USEDEP}]
+	>=dev-python/snappy-0.5[${PYTHON_USEDEP}]
+	>=dev-python/twisted-20.3.0[${PYTHON_USEDEP}]
+	>=dev-python/txaio-20.4.1[${PYTHON_USEDEP}]
+	>=dev-python/ujson-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/wsaccel-0.6.2[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-3.6[${PYTHON_USEDEP}]
+	crypt? (
+		>=dev-python/pyopenssl-16.2.0[${PYTHON_USEDEP}]
+		>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/pytrie-0.2[${PYTHON_USEDEP}]
+		>=dev-python/pyqrcode-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/service_identity-18.1.0[${PYTHON_USEDEP}]
+	)
+	scram? (
+		dev-python/cffi[${PYTHON_USEDEP}]
+		dev-python/argon2-cffi[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+	)
+	"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/pytrie-0.2[${PYTHON_USEDEP}]
+		>=dev-python/pyqrcode-1.1.0[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	if use xbr ; then
+		eerror "***************"
+		eerror "Required xbr dependencies are incomplete in Gentoo."
+		eerror "So this functionality will not yet work"
+		eerror "Please file a bug if this feature is needed"
+		eerror "***************"
+	else
+		# remove xbr components
+		export AUTOBAHN_STRIP_XBR="True"
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	echo "Testing all, cryptosign using twisted"
+	export USE_TWISTED=true
+	cd "${BUILD_DIR}"/lib || die
+	"${EPYTHON}" -m twisted.trial autobahn || die
+	unset USE_TWISTED
+	echo "RE-testing cryptosign and component_aio using asyncio"
+	export USE_ASYNCIO=true
+	py.test -v autobahn/wamp/test/test_cryptosign.py || die
+	py.test -v autobahn/wamp/test/test_component_aio.py || die
+	unset USE_ASYNCIO
+	rm -r .pytest_cache || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# delete the dropin.cache so we don't have collisions if it exists
+	rm "${D}"/usr/lib*/python*/site-packages/twisted/plugins//dropin.cache > /dev/null
+}
+
+pkg_postinst() {
+	python_foreach_impl twisted-regen-cache || die
+}
+
+pkg_postrm() {
+	python_foreach_impl twisted-regen-cache || die
+}
diff --git a/dev-python/autobahn/autobahn-20.7.1.ebuild b/dev-python/autobahn/autobahn-20.7.1.ebuild
index 4b6e54bf13c2..cf474b175441 100644
--- a/dev-python/autobahn/autobahn-20.7.1.ebuild
+++ b/dev-python/autobahn/autobahn-20.7.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 arm arm64 x86"
 IUSE="crypt scram test xbr"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/autobahn/metadata.xml b/dev-python/autobahn/metadata.xml
index 72fb58a68e09..f367c1f98264 100644
--- a/dev-python/autobahn/metadata.xml
+++ b/dev-python/autobahn/metadata.xml
@@ -5,12 +5,16 @@
 		<email>dolsen@gentoo.org</email>
 		<name>Brian Dolbec</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<use>
 		<flag name="scram">Add support for WAMP-SCRAM authentication</flag>
 		<flag name="xbr">Add support for XBR decentralized data markets and etherium blockchain</flag>
 	</use>
 	<upstream>
 		<remote-id type="pypi">autobahn</remote-id>
-		<remote-id type="github">crossbar/autobahn</remote-id>
+		<remote-id type="github">crossbario/autobahn-python</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest
index eb2834c3b882..b384793e297f 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -4,10 +4,12 @@ DIST aws-sam-translator-1.29.0.tar.gz 805869 BLAKE2B 89054fa7e2488b53daf73a78ae1
 DIST aws-sam-translator-1.30.0.tar.gz 810821 BLAKE2B cb7d13162512f793c33f617290d36ad78d2410ad225835ae175192b7e57ae29745a247e08f9b34a158837aca57a4f30bcb9f90f0c4b902ef238ba4e99a0f80ff SHA512 a521994bbbf461a7a28dc8861a751e9495c0684c7462bb5da6459dffbc69917291f2ca6d0480a6dc0264d954c37fccff8c9b3691992d2fe082ce981d31af21da
 DIST aws-sam-translator-1.30.1.tar.gz 810865 BLAKE2B 2039e0724d05f7f9d8372b149f04427e0bd1a8a9b503e6dc49ee76cb4e7678d8f759317c43922d190a2bb55a446feffcbf448cdbc9343538b5c77d81b5545e5f SHA512 8fcdf0843f52c8424a78540cf2a9c3922070bcd34a2e0001a17b89b19b471dfbfc4fcd48211b80292d2f7b76eb2881152c68c4d4b56499ab38942c025226d49e
 DIST aws-sam-translator-1.31.0.tar.gz 813078 BLAKE2B ae87944bcfe7481db62c0556e1f20defbe5890bebd9b6bc8fe4f597b1ff463ec6382384832451becf5a49361149102a31316ca83e5933d12e0e7e18c9861b9c9 SHA512 fd2b775d2127cce9d78cd3c7ac4dd19f88a94be474f94e4db2486dc96bc88d9a3f621a80bd6dd0b9d70a42df32f3a9164c234a44ce69f84913aa6f4c59ae3682
+DIST aws-sam-translator-1.32.0.tar.gz 817649 BLAKE2B 34d606bb294700dac1d3385d173d737d3259f460d0ead302521eb4e2660d3781c49ce5db71e1721245068efdac03eefcfe8963d4915d1e1c60fd783880a95bc9 SHA512 e4adce238434983c56b69960fd673db88edf5b3e4f9356ca4dae508f5a7a8e6bbd3c84050ee606e1fbd578d8f58c5d8196890187e058b7ae2bc8249dbb8ac0d4
 EBUILD aws-sam-translator-1.27.0.ebuild 1300 BLAKE2B 653b444030665f83e9f4bab75995548e0438674ec88268fcb7cf7264b814aaf84f87268b955026a4adc87860d84c55a972bc00ffda181fddf6fec17b1296245c SHA512 1e458ca29205944eb9f970a715ba570fbfc1bd7993756fcc23b00a8ccdfbbab6b1d204781eb3e5891119978500e0c09cd01f74ba76ef7910ab27b0df27861d77
 EBUILD aws-sam-translator-1.28.1.ebuild 1302 BLAKE2B fc7ed0f3c8e070e6c0d43707f8cf760b06e353bc7bbbe2d04683f2bf0cd36ddabc3735192acdb929e934e22b0d883cedd802883c7c9495fbd153c7223ad883f3 SHA512 71cae066cdce8976c9efd7d0c5c764c8ebc3afc4e28ce545e1cc67172e9c53e81addca9cb0242f7b68c2e701f90c2c54a7d1e4696b07f2c090b8bda4ceedd672
 EBUILD aws-sam-translator-1.29.0.ebuild 1302 BLAKE2B fc7ed0f3c8e070e6c0d43707f8cf760b06e353bc7bbbe2d04683f2bf0cd36ddabc3735192acdb929e934e22b0d883cedd802883c7c9495fbd153c7223ad883f3 SHA512 71cae066cdce8976c9efd7d0c5c764c8ebc3afc4e28ce545e1cc67172e9c53e81addca9cb0242f7b68c2e701f90c2c54a7d1e4696b07f2c090b8bda4ceedd672
 EBUILD aws-sam-translator-1.30.0.ebuild 1302 BLAKE2B fc7ed0f3c8e070e6c0d43707f8cf760b06e353bc7bbbe2d04683f2bf0cd36ddabc3735192acdb929e934e22b0d883cedd802883c7c9495fbd153c7223ad883f3 SHA512 71cae066cdce8976c9efd7d0c5c764c8ebc3afc4e28ce545e1cc67172e9c53e81addca9cb0242f7b68c2e701f90c2c54a7d1e4696b07f2c090b8bda4ceedd672
 EBUILD aws-sam-translator-1.30.1.ebuild 1302 BLAKE2B fc7ed0f3c8e070e6c0d43707f8cf760b06e353bc7bbbe2d04683f2bf0cd36ddabc3735192acdb929e934e22b0d883cedd802883c7c9495fbd153c7223ad883f3 SHA512 71cae066cdce8976c9efd7d0c5c764c8ebc3afc4e28ce545e1cc67172e9c53e81addca9cb0242f7b68c2e701f90c2c54a7d1e4696b07f2c090b8bda4ceedd672
 EBUILD aws-sam-translator-1.31.0.ebuild 1302 BLAKE2B fc7ed0f3c8e070e6c0d43707f8cf760b06e353bc7bbbe2d04683f2bf0cd36ddabc3735192acdb929e934e22b0d883cedd802883c7c9495fbd153c7223ad883f3 SHA512 71cae066cdce8976c9efd7d0c5c764c8ebc3afc4e28ce545e1cc67172e9c53e81addca9cb0242f7b68c2e701f90c2c54a7d1e4696b07f2c090b8bda4ceedd672
+EBUILD aws-sam-translator-1.32.0-r1.ebuild 1339 BLAKE2B 95524019b5fd9ff5ab6459f321e8a13f454dbede355276127ea42502e7e383144e6b505285a93cc938432fb2dc503ae30ceaf828bd88f13956afe907ed154e14 SHA512 3fa1966be9165babb235e535e8a0b2999207b2ca671fdebf9e90b8de1d51676e1b98bea7a01d2a6b72c3d0d8c3bc815835650c12b179d3f441c72e61c4a8c885
 MISC metadata.xml 610 BLAKE2B 687fc6be648204f31de275e8cc2da9cc11e74a1f91a5474e0df5f163202f998d92e6f15847eccff364da46b4b7185017dbabc2c3016d4c1dd2a5f873f04cb1d1 SHA512 770b2f5748d6b6edc1be7c546035854cb4a0bf851f214b811867f376d5e260011f6542f6e43a80d2465e93f23cb912d61af385ceeea17d1e117f5f4f13a298b0
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.32.0-r1.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.32.0-r1.ebuild
new file mode 100644
index 000000000000..ac4085528bc1
--- /dev/null
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.32.0-r1.ebuild
@@ -0,0 +1,45 @@
+# 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="A library that transform SAM templates into AWS CloudFormation templates"
+HOMEPAGE="https://github.com/awslabs/serverless-application-model https://pypi.org/project/aws-sam-translator/"
+SRC_URI="https://github.com/awslabs/serverless-application-model/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/serverless-application-model-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/boto3-1.5[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# remove pytest-cov dependency
+	sed -r -e 's:--cov(-[[:graph:]]+|)[[:space:]]+[[:graph:]]+::g' \
+		-i pytest.ini || die
+
+	# don't install tests
+	sed -e 's:"tests",:"tests", "tests.*",:' -i setup.py || die
+
+	# deps are installed by ebuild, don't try to reinstall them via pip
+	truncate --size=0 requirements/*.txt || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/backports-os/Manifest b/dev-python/backports-os/Manifest
index d0b45fd8720a..3ef7847a6bcf 100644
--- a/dev-python/backports-os/Manifest
+++ b/dev-python/backports-os/Manifest
@@ -1,3 +1,3 @@
 DIST backports-os-0.1.1.tar.gz 11359 BLAKE2B 8c1f9ba4d62d9b6b625d31c902feb7532919a0a42064133ef07756a3806a6423a479f5b3c4c9824ebb421a9e1901d8932aa024ced7dd7700119236c186d11137 SHA512 d17c5f6146401fa96c02f2d848d515a5d1dd587ee2199b5e45c177e1853e21e7e7c205a4d89322c5aada71e3a7b34bc7f9afe8183625f76e4ba26aedf2150268
-EBUILD backports-os-0.1.1.ebuild 1007 BLAKE2B 8b3b739ae3db9f2387bc681bf8e48574bae2cb434d337f69fe36c81c6e507337ab17cb1496f00edfb3f81483a518540f62ddafede294cd035769f243d0fb1a3d SHA512 5cf3d591cbed44976237f00f89feaa5aed8c8be1ceb6c96a746c53d738e7446fd4fad6aab46055315c565849bb79038e7d556c6c16380163a9ac60760473f382
-MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
+EBUILD backports-os-0.1.1.ebuild 1007 BLAKE2B 89b47e74cb3ef147a3aae4aa1bde24a3d3fcffbf185f942d82e85f85c22aa7a61904434289da6d97c4ff2696e378f4735c0e72eb74bc56786998d535b20060d7 SHA512 2890951152f6592f9e700c94d95f5cd75875701ee98efdd2d9db648062eca237e857f2c8c9edf2029c87daca275e685bc802dffa30b9612a07ab43bef0fa4f03
+MISC metadata.xml 318 BLAKE2B 37d5ccfc6c2e4b3ed73ea0ac1fc227f8b5d1a6ebe28f4dd6a43b3bfa0399ac1b698e867617c2fe1ac3db4972e1a43dd8aa44c10e8a1b4ee367fcddfa8d523bdf SHA512 316c8f478d06ae9f7c9e7509ec4f9a5d8aa57e409cebd83e8e21dd6ff90ca2f8b2e2f22250ee6c4be0a89374459e9788edf6f0f6ec44e90ec5ecf34d6f3fb12d
diff --git a/dev-python/backports-os/backports-os-0.1.1.ebuild b/dev-python/backports-os/backports-os-0.1.1.ebuild
index ddb578ca2545..b7480cb7421c 100644
--- a/dev-python/backports-os/backports-os-0.1.1.ebuild
+++ b/dev-python/backports-os/backports-os-0.1.1.ebuild
@@ -7,8 +7,8 @@ PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Backport of new features in Python's os module"
-HOMEPAGE="https://github.com/pjdelport/backports.os"
-SRC_URI="https://github.com/pjdelport/backports.os/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/PiDelport/backports.os"
+SRC_URI="https://github.com/PiDelport/backports.os/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="PYTHON"
 SLOT="0"
diff --git a/dev-python/backports-os/metadata.xml b/dev-python/backports-os/metadata.xml
index 3da97a9953cc..5f0a9236cf18 100644
--- a/dev-python/backports-os/metadata.xml
+++ b/dev-python/backports-os/metadata.xml
@@ -5,4 +5,7 @@
 		<email>pacho@gentoo.org</email>
 		<name>Pacho Ramos</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">backports.os</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/backports-tempfile/Manifest b/dev-python/backports-tempfile/Manifest
index 2dbd8f8f5e4e..d0d9a1ca9d12 100644
--- a/dev-python/backports-tempfile/Manifest
+++ b/dev-python/backports-tempfile/Manifest
@@ -1,3 +1,3 @@
 DIST backports.tempfile-1.0.tar.gz 10262 BLAKE2B 9436c8a3eb7fa6da17dad4466ab030f62b93a19103e519efcbe79e35cf0687ca2960666a9337cdc2929aeeed3790a7ee0441377755b1f1e2a8192b07ed7f049a SHA512 1f3cf634e289704e96bd8483289415aae896d95a16f5ac9b226ba879497675d76148399770966bd2ef14a02d3c8848516a9b39cc400819023b06254b5b0500dc
-EBUILD backports-tempfile-1.0.ebuild 1174 BLAKE2B e301633140bac851414894b790d12451853284914f63e33a1c2cd3eb704a4f277ffd536a240c8a3b8f9777bd42cbe8f7d9ba00e980f68e4f41584d580cfed118 SHA512 372048ef19d3953ecd0dd28c53e4089b46711545e016da3a2c6e842f38153282867c43d1c93ca6258c3000bfa3e9fe3a763026f4a9a9541244f29d36b7f57c63
+EBUILD backports-tempfile-1.0-r1.ebuild 1127 BLAKE2B 2e970af4865e4f3ffc0375df93d2fd39c8326933df049843acc3d0c1526ea52904c2868d2f324362ab20c96574e19aea698f74130dc026b9c1f86ce9cfe8c7ac SHA512 fa2c3b072ed50b4bf681faf61e4921ebf0abd9044628b102c3ffc5bb8b5e6deb8cedc09a97efad21290da565f9c83e9114f8dc39759fba4ac235b262fdcbf89b
 MISC metadata.xml 469 BLAKE2B a2d579bc290c1cd1f0cc4b8372b3f4b14bdbc351f4ab368df14cf784fd46af41074c61a0816c619d0805485b1b41ce69110578af25f9d00956ba8ec3a68f9e2c SHA512 4b6866dc60034a21acaa1dc1c2a389d878d495747e51dc99ee60b8379e03bd99559f3c805920a77cdc35fb551f97195c6fdf9d596af881ff6f6829c5b7e4b235
diff --git a/dev-python/backports-tempfile/backports-tempfile-1.0.ebuild b/dev-python/backports-tempfile/backports-tempfile-1.0-r1.ebuild
index 7a1f774c2f86..f96bb176e088 100644
--- a/dev-python/backports-tempfile/backports-tempfile-1.0.ebuild
+++ b/dev-python/backports-tempfile/backports-tempfile-1.0-r1.ebuild
@@ -17,7 +17,7 @@ LICENSE="PSF-2.3"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
-RDEPEND="dev-python/backports[${PYTHON_USEDEP}]
+RDEPEND="
 	dev-python/backports-weakref[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
@@ -37,7 +37,7 @@ python_test() {
 }
 
 python_install() {
-	# avoid a collision with dev-python/backports
+	# avoid collisions due to namespaces
 	rm "${BUILD_DIR}"/lib/backports/__init__.py || die
 	distutils-r1_python_install --skip-build
 }
diff --git a/dev-python/backports-weakref/Manifest b/dev-python/backports-weakref/Manifest
index fff0961d75df..6a7d08729831 100644
--- a/dev-python/backports-weakref/Manifest
+++ b/dev-python/backports-weakref/Manifest
@@ -1,3 +1,3 @@
 DIST backports.weakref-1.0.post1.tar.gz 10574 BLAKE2B a53a64dc22d8d1ac93a157bef4a858156f620593ae3d9e69b99762298e9aed73a04fd0557d98f53eed8816e746869718bc028aeda619330ce7c031f8b6f346b1 SHA512 27fb7ffd3313e62ca5ac220efe5ce0a9ae2ba8a589c80d3c5cf98741e913da7f713e1ecf2af848510383f574fa3bc3b7b3c21e6696f0a252fb517fe836c07cc7
-EBUILD backports-weakref-1.0_p1.ebuild 1131 BLAKE2B 32d78344a3ae3758b8c16323b8860679d6cbe58545fd106ff4bf9e674fee44443dd452365e9a8dbf5f341cc9dacb946f5f3b105adeaa8c4e3b87c36d3709cd6a SHA512 2df1dd103514b96ef3d30bd88f959aef76b7be79080487ae9535fb3b0489693ec2bfe7a4294e0d958b4dc0299f294b9e4703d92fa2e083b19dbc50df9cc593f6
+EBUILD backports-weakref-1.0_p1-r1.ebuild 1011 BLAKE2B 834d579ac05ee871111504f9309f4f5ad264cf83661b7926cc75236279d382271710b897a620d72dfa435d0c5c727bedfcd371f921cb74bf0f589170c01584a8 SHA512 3f7d1b360fbd7b04518dbe15bb2894cd24945efd7fed5314b84a8f7233eb36ed74b5e7b2a8590c20047501d3889e0797e9a45b2bb8e95bd101019aeea72e53dc
 MISC metadata.xml 466 BLAKE2B a722c32d4462c21ac4fc1ce66a92571a26c283d10cabb187a8cc107604632c4ab79ad74290e07c318b3ee634a624459b667b9963c2a0a8485c470fba6ea982aa SHA512 77a6a25be5149dd2b146364f46e70585320f03cfd88f037f012df3601a8d74c789f33ab111d99d77667cc41be80050b398536e0b687014ac094436a7605b62d6
diff --git a/dev-python/backports-weakref/backports-weakref-1.0_p1.ebuild b/dev-python/backports-weakref/backports-weakref-1.0_p1-r1.ebuild
index 41ffcc609078..01b87fb525e8 100644
--- a/dev-python/backports-weakref/backports-weakref-1.0_p1.ebuild
+++ b/dev-python/backports-weakref/backports-weakref-1.0_p1-r1.ebuild
@@ -12,17 +12,14 @@ MY_P=${MY_PN}-${PV/_p/.post}
 DESCRIPTION="Backport of new features in Python's weakref module"
 HOMEPAGE="https://github.com/PiDelport/backports.weakref https://pypi.org/project/backports.weakref/"
 SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2.3"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
-RDEPEND="dev-python/backports[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
 # Tests require backports.test.support
 RESTRICT="test"
-S="${WORKDIR}/${MY_P}"
 
 python_prepare_all() {
 	sed -e "s|'setuptools_scm'||" \
@@ -36,7 +33,7 @@ python_test() {
 }
 
 python_install() {
-	# avoid a collision with dev-python/backports
+	# avoid collisions due to namespace
 	rm "${BUILD_DIR}"/lib/backports/__init__.py || die
 	distutils-r1_python_install --skip-build
 }
diff --git a/dev-python/backports-zoneinfo/Manifest b/dev-python/backports-zoneinfo/Manifest
new file mode 100644
index 000000000000..a93d9541436c
--- /dev/null
+++ b/dev-python/backports-zoneinfo/Manifest
@@ -0,0 +1,3 @@
+DIST zoneinfo-0.2.1.tar.gz 85385 BLAKE2B a6382560dbe8c4207c5a53971431497126a3bad7374580f4a67ffd1ffe5940701f13a09bc3a5ba4b729ab8d2484516ea2dc71131b7276f5339b1f60fc39c4ab1 SHA512 1f17ce34eef489dcd263665d58780ab54cf8aa83a601d31148bb4316e600f94d0af1d0baa1d6554d069c0801af906e21b9d5535db2bf76de32333820c61e2364
+EBUILD backports-zoneinfo-0.2.1.ebuild 1568 BLAKE2B d4d391cae1db9c2e72dc0d531b2be6f6bf0e04c640e51ac5dfc341ff0cd8cfb1e8fd7e794c7631928e93b1dfe5ecf2aa902e6b8844b3a125f3eed5adc2de288c SHA512 ea078c89e0cda9c7540aca10e17326f61ec813c1a53253edc7192edadca724c5aa267823a3cc76b401fa85e4b250229394955eee63aab882a9fab3304b951f47
+MISC metadata.xml 299 BLAKE2B 1ee3feadaf1ca5ce9f21e6992db3308c45acde5db35f0484cfc9ce8c0c63fe4f6504dd72fcf795562a86a72f6dd566cb31dbccd95d0c162a47050c54c4df8433 SHA512 4429cae96d7f99e5ca93fbf6ae8b5c18a02c515c20f46a7ac7e9d19a9ec63567cfac4ac3122ff23cd04073f76aae3b41c6f1540ea6aab20f488f093bf130db45
diff --git a/dev-python/backports-zoneinfo/backports-zoneinfo-0.2.1.ebuild b/dev-python/backports-zoneinfo/backports-zoneinfo-0.2.1.ebuild
new file mode 100644
index 000000000000..a5c5d51ed4a4
--- /dev/null
+++ b/dev-python/backports-zoneinfo/backports-zoneinfo-0.2.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..8} pypy3 )
+inherit distutils-r1
+
+MY_P=${P#backports-}
+DESCRIPTION="Backport of the standard library zoneinfo module"
+HOMEPAGE="https://github.com/pganssle/zoneinfo/"
+SRC_URI="
+	https://github.com/pganssle/zoneinfo/archive/${PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/importlib_resources[${PYTHON_USEDEP}]
+	' python3_6 pypy3)"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/dataclasses[${PYTHON_USEDEP}]
+		' python3_6)
+		$(python_gen_cond_dep '
+			dev-python/importlib_metadata[${PYTHON_USEDEP}]
+		' python3_{6,7})
+		>=dev-python/hypothesis-5.7.0[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+# pytest is used only for one skip, and requires unpackaged
+# pytest-subtests
+distutils_enable_tests unittest
+
+python_test() {
+	if [[ ${EPYTHON} == pypy3 ]]; then
+		# pypy3.6 does not support dataclasses, and the backport
+		# does not work with pypy
+		local pypy3_version=$(best_version -b 'dev-python/pypy3')
+		if [[ ${pypy3_version} != *_p37* ]]; then
+			einfo "Skipping tests on pypy3.6 due to missing deps"
+			return
+		fi
+	fi
+
+	"${EPYTHON}" -m unittest discover -v ||
+		die "Tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	# avoid file collisions
+	rm "${BUILD_DIR}"/lib/backports/__init__.py || die
+	distutils-r1_python_install
+}
diff --git a/dev-python/typing/metadata.xml b/dev-python/backports-zoneinfo/metadata.xml
index 3dd5571701ad..e70c1de18f01 100644
--- a/dev-python/typing/metadata.xml
+++ b/dev-python/backports-zoneinfo/metadata.xml
@@ -1,12 +1,10 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
-		<name>Python</name>
 	</maintainer>
-	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="pypi">typing</remote-id>
+		<remote-id type="pypi">backports.zoneinfo</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/backports/Manifest b/dev-python/backports/Manifest
index d7110ac51057..b9b8691aba81 100644
--- a/dev-python/backports/Manifest
+++ b/dev-python/backports/Manifest
@@ -1,3 +1,3 @@
 DIST backports-1.0.tar.gz 2070 BLAKE2B 7fad9ef13abdc5bab550ddf62061a952991ff601642f5e03359c3ba2bf20d923701d86aed178dce530c60870efd33a4a2b4b2498802c78df73d406bc496239fb SHA512 069e155209d6036dec09000e4543abea9383f13b229a7259b1d3d02fff4b51be1a32c766dee434215c8a5209afc5e7d24163d188a77cec7d354d34170665bd37
 EBUILD backports-1.0-r1.ebuild 582 BLAKE2B e1d6adb96b3f8bf8e95cda3f982a4132bc534e14e23f62f6c7757c07e187e92d7dfd35bdd1f9864dd9f319ebc239d3597e5c6e51c836e848ae061733bc546712 SHA512 c6f3fcb27296b64fcc988513c8a9619d4fb4fdf6500c407e52a500455ef81b4eb0cea937c1a56fb85c089d9b790729d40585565237388b98f1ed71130616280c
-MISC metadata.xml 246 BLAKE2B 3a28b3bb42a0352827a446ea608867a7782fe682458527ef441a528a22c9f951dc203639934a69ffb520f63aadce3037df28bf8c5304b3a5921b336142f9f246 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc
+MISC metadata.xml 312 BLAKE2B 88bf756abcddf4ffedbb8df1f3be3d95d37c904d8e29523c272b5e274b2dc82b7a06b8ab089b9504bfeb313b1419680d3d582ac6cc5ed371a242af4a7c2c65eb SHA512 b70bf4b03d5f244f65c4aef2614bc96ab73084099bffcbd5c800bee56f9e8db6520303b6e52544f8b0b6d8d483d840413d816f24a19bbe29124ab242a1762bda
diff --git a/dev-python/backports/metadata.xml b/dev-python/backports/metadata.xml
index e24dd86faa2a..6c49200e959f 100644
--- a/dev-python/backports/metadata.xml
+++ b/dev-python/backports/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">backports</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/backrefs/Manifest b/dev-python/backrefs/Manifest
new file mode 100644
index 000000000000..677b6ebc5ae0
--- /dev/null
+++ b/dev-python/backrefs/Manifest
@@ -0,0 +1,3 @@
+DIST backrefs-4.5.0.tar.gz 5995247 BLAKE2B ce3d33b91ab307811e555689a2ece0ba47e53d8245fd4fa367156a76893c5ca342cb47d014a3c94c6f30ebb32487fb36975a2fa6c7acf0a626305d05e0d80048 SHA512 c1e30a78c2e7a86efce1670000612b6450b6cae78f8c799cec6832aa88e4145fee6ffc3e1b8c54b55091f7c21ea4b09c1ee36af852bb51973434b593273e04a8
+EBUILD backrefs-4.5.0.ebuild 1160 BLAKE2B 3019e87ef11cd026909dbf59f318ed0c719306bae5c377f87a38901ead4c9e920a7165432405831bc1c1e0cb0821b45a44779dd4cb06e2b7b0b2602544a5c55a SHA512 7add8d07ac9c1aa3e27163bd04165715f512282498f20bcf6576ad3e3a042bf1eafc746738882c22956f871ebd310b09808dd4e47a508b1c8a43bdeaec3685bf
+MISC metadata.xml 1074 BLAKE2B 2903d804d13b3967e1dda39870c9f945b0b9327758ae8baf402112331836a4dbfd8328f6308a84ebdc5eee9b5f5a25d0d312de274cd57d47665fdcf2f44abdaa SHA512 7b23341b90d9a243e73578d2a30225318418997adc58d04db568a5771323af6d25125b65282f5e8f33d736da590d5cd40c3ceacb464c2c93422233bde1212b44
diff --git a/dev-python/backrefs/backrefs-4.5.0.ebuild b/dev-python/backrefs/backrefs-4.5.0.ebuild
new file mode 100644
index 000000000000..76f334eeed6e
--- /dev/null
+++ b/dev-python/backrefs/backrefs-4.5.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-git-revision-date-localized-plugin
+	~dev-python/mkdocs_pymdownx_material_extras-1.0.7
+	dev-python/mkdocs-minify-plugin
+	dev-python/mkdocs-material
+	dev-python/pyspelling
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="Wrapper around re or regex that adds additional back references"
+HOMEPAGE="
+	https://github.com/facelessuser/backrefs
+	https://pypi.org/project/backrefs
+"
+SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/regex[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# mkdocs-git-revision-date-localized-plugin needs git repo
+	if use doc; then
+		git init || die
+		git config --global user.email "you@example.com" || die
+		git config --global user.name "Your Name" || die
+		git add . || die
+		git commit -m 'init' || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/backrefs/metadata.xml b/dev-python/backrefs/metadata.xml
new file mode 100644
index 000000000000..2a6c9f9ed89d
--- /dev/null
+++ b/dev-python/backrefs/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+	<maintainer type="person">
+		<email>lssndrbarbieri@gmail.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">facelessuser/backrefs</remote-id>
+		<remote-id type="pypi">backrefs</remote-id>
+	</upstream>
+	<longdescription lang="en">
+Backrefs is a wrapper around Python's built-in Re and the 3rd party Regex library. Backrefs adds various additional back references (and a couple other features) that are known to some regular expression engines, but not to Python's Re and/or Regex. The supported back references actually vary depending on the regular expression engine being used as the engine may already have support for some.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/bandit/Manifest b/dev-python/bandit/Manifest
index 67db36c1aa68..6fb2ddad71cc 100644
--- a/dev-python/bandit/Manifest
+++ b/dev-python/bandit/Manifest
@@ -2,4 +2,4 @@ DIST bandit-1.6.2.tar.gz 498567 BLAKE2B ab7885df634ff8258fc7620523b56995cb2f262f
 DIST bandit-1.6.2_py38-1.patch 3892 BLAKE2B 750160be3d234b0d638307e74fd130921f43f460edca8d0ef0f9a98f34db709e0649b1e481668abd094942fa05ee710b82b3161fd82bc56bb0f5e73d90a6e70f SHA512 dc1e55bdcbf180e70757dd92aa590fe1348d84a2143af73e48c35c62864cf0720f6b055482eb274a4261adff37c84f998c75916b8ab70d99264bd88d09611e06
 DIST bandit-1.6.2_py38-2.patch 3724 BLAKE2B 8ce857419d99b059ce1b28aba7c04218397cad82f0fdb6e7eb3e57f698d6360de7b0f4402c40540e41d510db1aa0b75e006e0e15a20a8c5534b7e5a3cf78a0e8 SHA512 25f73b087b296867556d9b9bb7f789a4df64bd2930509086bc24312c43a3a98209d63a5b00009e31fd2653e89c85e62849c7af6ba044abc10c5789a6e3d9a968
 EBUILD bandit-1.6.2-r1.ebuild 1779 BLAKE2B 352b67abdc2e46d9d0c85a2d5ff419ad5e49da28c1e6073296f73e876e7f3d0ed965bc5b77adcd64f5355342ba42e6eb23205020e5e50cb994db4d329cf0d572 SHA512 fabad48d0071d8f3d9e958592589c79e15239b2160c710bfe0d04e8a19698619fe8bc6b5135ffd4ae031b8fd58c764c913c32174b32f0a98ad5edfc586d04c06
-MISC metadata.xml 632 BLAKE2B d36f7c8fa4f8bb896f1eb1ddcdafa2705aeec74ae61c75f2bcebee5b8060442721448afa709099cf2f5d0c6f4dcd9d622c44f94258eb846be36f7d9b82c0ccd6 SHA512 cd90a77633abd61030fe7412b929c129b2e8bb8fe3b265277e8fdbe7b6a9ada8503c5bc97dc6754ba6f4137cfc96bd508b1750bc7b9baa58d823892febb5e955
+MISC metadata.xml 684 BLAKE2B 7018c2b15088d3fa89c56a9b8ab316342cdc5e6b4a1437a22dc07ad1a5026623da288630cfb583a2b149ca1cb35a83353345652cd06dc206e5dcfbab7cc28465 SHA512 4c877fa708ef556c2435606b4f8aff213fcbd6a43d867c9c408c2bcf634ece14f36dbe45aebc7e9307cd87a624c83f5d1f6a944c0ce52f87d39f996ce1a11028
diff --git a/dev-python/bandit/metadata.xml b/dev-python/bandit/metadata.xml
index 40f27867ff32..3a9cff4a6b50 100644
--- a/dev-python/bandit/metadata.xml
+++ b/dev-python/bandit/metadata.xml
@@ -10,5 +10,6 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="pypi">bandit</remote-id>
+		<remote-id type="github">PyCQA/bandit</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/bashate/Manifest b/dev-python/bashate/Manifest
index d2aa68b28214..f3f8c742b1d5 100644
--- a/dev-python/bashate/Manifest
+++ b/dev-python/bashate/Manifest
@@ -1,3 +1,3 @@
 DIST bashate-0.6.0.tar.gz 30980 BLAKE2B 5b210edaa44a0652a03f30a641a072dba1482e1ca3b42c6b7140a52349ddb271f0137373a4d2f364032c22c176d6caf14be2635038df8a4e86585773d17a1f97 SHA512 bb64d8de0143bf2662497b1571ce654f4ceeb7d1dea3f625705b609ab70ed3b4bca6266c4eba7c2e7d99a1520fb9566a4a4daefa34c9c16538537b446c1da255
-EBUILD bashate-0.6.0.ebuild 684 BLAKE2B b2f740eb54bef3b05302f7b25e617b323f187b0a8e74b0943b57a88a094a872a20a6e910570aac90c6c008ae456ab31fb6ba3300516494bd929a9f995cb7c0df SHA512 adf850b67a4777dc4b80dfa28e8734bce225bd016e98f46f5cfe9c4c00c0ac926faa9980e39d68514e39739ec32eb5fa8a2f7a62a4e82197463afe1f662e34d7
+EBUILD bashate-0.6.0.ebuild 687 BLAKE2B 37f482e4546908809ef70dc5b3ab9176693d93a0a0310498bd85fc85d0aa6c30db839cc3462be73f9638806fd8c1abc72a8f841eebab0d9b71fe2eff0c16ed89 SHA512 1810f78fb729a4cb62a2df2a79a6b8f8567f08c85434d8e8f37f38d6c610d467b053e77f7c68520e3b4d6ff0a83afe12a6ef67e0e18baa827de85a969989c61e
 MISC metadata.xml 431 BLAKE2B 5584ee417afcf244975299d7ee769137b41956f60aa7b273d593aad8b9e1a05d0624d820870648a56da0ee816366a03b59e31ab27113cda02ddc084237c850c1 SHA512 1b7b1ac3b3de9dc163ea84df81645beb10790b3b192baa16b49fd977d9cc1c37794cbdc846d995c54fa1eaa9d04ec02149acfad07011bd273dc6693652c77860
diff --git a/dev-python/bashate/bashate-0.6.0.ebuild b/dev-python/bashate/bashate-0.6.0.ebuild
index 7ca3926ad713..e5ef34a22899 100644
--- a/dev-python/bashate/bashate-0.6.0.ebuild
+++ b/dev-python/bashate/bashate-0.6.0.ebuild
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+
+PYTHON_COMPAT=( python3_{6..9} )
+
 DISTUTILS_IN_SOURCE_BUILD=TRUE
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
diff --git a/dev-python/bcrypt/Manifest b/dev-python/bcrypt/Manifest
index 39b442d0da14..2a5e64994040 100644
--- a/dev-python/bcrypt/Manifest
+++ b/dev-python/bcrypt/Manifest
@@ -1,5 +1,5 @@
 DIST bcrypt-3.1.7.tar.gz 42512 BLAKE2B 5e762f153a5a69c1426748737956fd370e74fcd02e82b5a634e74dbb50fc9e894bdadb4e87eb9cdc580d0853f73ef348d9523ceaf4236df565e39b714bbd1c60 SHA512 bb9a431c8de97d5615d1a7fb67f868d08d839313fd5f3e17d8db40db1870f8b624594352c24c163c6a03485217de873cd92578040350678888728885c7b749de
 DIST bcrypt-3.2.0.tar.gz 42416 BLAKE2B ff9cca995e38fe27c6f02e9770e9349dfe528a1c9c18f41c72f29dfc01e981373fc0964f3a74161f2a7dddea63c5f48708539221adcd5a8ae99b7c30d7b1afd8 SHA512 aa782aa6a725434e0b0737973e33e6c2bf4e82d39e8dfba0913da5d7dd051d55217adab8004c3eaf896fc3c3e145ba543da1b5162a667a3d82a4eb6b07430b80
 EBUILD bcrypt-3.1.7-r2.ebuild 749 BLAKE2B 616ac74130346028188c70b150c5c9095de9bfb47d5d1aab97435db1f0db8f4cd73ed6386dfafb9698fb081584d9f844e0f417633e6ee906e112c65b544bd941 SHA512 43a77dd7ef01017083875e72f41432e69ed850c260a1929444eba09aeb5ef8f0ed92c96ca30d99c6c165f45b980dd1910505a4e3897eedf37fcd8752719929aa
-EBUILD bcrypt-3.2.0.ebuild 757 BLAKE2B f60ddb5a2091d91ba6eab304b6fec65bb06e0bdc3533d5b7659263cdbf7f4542cefc832b6aad75783ea89998771a1272dd659f9c4db81d79c121a01b33720edb SHA512 7585b51d8b73dafd9cc1c15981818125b8aa88868d377dbc23726e82cbb9888401d86c02af0f6bcaedc0f07792e7729334014e21b24417d96bdacf74a1f51665
+EBUILD bcrypt-3.2.0.ebuild 756 BLAKE2B 44a7cc439d7eff6c01b2467cd23030405e5312817344db171df4bf1f0235ce0f31b1336f9a6233ea73016b2daf10ca5fd050a29cad547d44314466351cc076c0 SHA512 90601b4b25dcb9742303b577f2ee85dd05535975b8da2cca1d3a37fc87c3eeb56ac80d1ac42065656a3910d9c23cb79637a4797d5aa4333d1f31f27918e5e5dc
 MISC metadata.xml 485 BLAKE2B 789fde3cb8c29c27778293f22f9e3a4453b743d52f5fab1dd2db6d940e4e1bff843d6ccdb4f7374b456b2cd4f80877f453205bb9a5eeee9f6e32382297ab967b SHA512 3b4fb489f9d1ecdee3dedc58dda61aa86c6bc30f29aba50de6dc4faa499276d83fe15518088e4d0e76c98ca30188b2f1b921807821fc73b5dfc592490e6fdb46
diff --git a/dev-python/bcrypt/bcrypt-3.2.0.ebuild b/dev-python/bcrypt/bcrypt-3.2.0.ebuild
index 5968b6a42c4e..3fdb063942f9 100644
--- a/dev-python/bcrypt/bcrypt-3.2.0.ebuild
+++ b/dev-python/bcrypt/bcrypt-3.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.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 ~m68k-mint ~sparc-solaris"
+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 ~m68k-mint ~sparc-solaris"
 
 RDEPEND="
 	$(python_gen_cond_dep '>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 'python*')
diff --git a/dev-python/betamax-matchers/Manifest b/dev-python/betamax-matchers/Manifest
index 9846be1ac325..49880412828c 100644
--- a/dev-python/betamax-matchers/Manifest
+++ b/dev-python/betamax-matchers/Manifest
@@ -1,3 +1,3 @@
 DIST betamax-matchers-0.4.0.tar.gz 4205 BLAKE2B d9f626b61195135b260b0b4d43e0f62ed18721aef7c03602e117c9efedecb88fc891972b30aceed1fc29502a0982a18f8a57ce264f81fb89906e455b70b9afa0 SHA512 325a8165205c21193b4c136aa4d35a855f9529d6ed5809a1306ae7a3e7a49790928b68104da04a918ff3673ad2ede3e4bd901019bde460a8e42e2c5d96fb8abf
 EBUILD betamax-matchers-0.4.0.ebuild 599 BLAKE2B 2f9f92ada357fe3642c4e42331fc52612c2a83fb0d9eef42644fd5ff889a8971ea8a8b4ea0709016d1d1217093162ab4d78d6913598ed1351701fa22d1254819 SHA512 a854f3fb4d9e8fcd6b85c7fbcaace1b8d1ee6e4137cd56a1617a09c83e19a6f9e03055b96bf12f6dd0c0ff403fbedd325b3e2be6c5e9fd247215fc60adab7e4c
-MISC metadata.xml 297 BLAKE2B cb9f3adfa8d4468a73ea16fa8163c138ec9a4b9891bd96457dea9089a38c19256ce5324bcf4899b434e4da5af7fa1dc1347a13045274f41aa470295cf47b6497 SHA512 d747ab48ad37480accced4a44a441588c39033a87694c3898f1599e57e49b6de393a4006cb870c4f4d64d176ae56a36d79aadf009c22c227236464475accd7ea
+MISC metadata.xml 376 BLAKE2B 97fdc98ae5df93cf7ed25c68aa0a658aba885cd358d3d86838483540640b79a0315ed50b7907d6b58c943bd72c0801bc608f084466b620ba97a6c8b2b52b4528 SHA512 b4fef2b009d5715d6a92b441da81d7dd017d9052f6822978ddb3d1e5f7cf618be37b2710d2b420b7b889a667b1c516c72c0176d3317c940dd57dee854acc10a5
diff --git a/dev-python/betamax-matchers/metadata.xml b/dev-python/betamax-matchers/metadata.xml
index 352b038b3bc2..41aba4e40747 100644
--- a/dev-python/betamax-matchers/metadata.xml
+++ b/dev-python/betamax-matchers/metadata.xml
@@ -7,4 +7,7 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">betamax-matchers</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/betamax/Manifest b/dev-python/betamax/Manifest
index a6409b008c8e..f7ccf23c24af 100644
--- a/dev-python/betamax/Manifest
+++ b/dev-python/betamax/Manifest
@@ -1,4 +1,4 @@
 AUX betamax-0.8.1-tests.patch 867 BLAKE2B d161db0b79eff7591bf87cf256a50357e1d82f7eeb0fdf39c27be287c97bf6a536a4e62defd173305ba598f388f2b49d22545443c6fcb589f66988930ae29a55 SHA512 001b26d84e4a02b242ee90b36df0a30c9c4890623191655a8eae5a87e106679197fa8090354b52a72ad07da97666190ebb3a7dcb9b4ffba7b9bea9c18bfed115
 DIST betamax-0.8.1.tar.gz 77526 BLAKE2B 2ce88326c5ef80082908912c4b14f149793c4457c47446ebcabaaffaa6b0ee64528096acc6bdd868fce0fad3d10ad66697cad5dc422c15b324e1cc9ae20eafa6 SHA512 89bfb56cf4004a70ec8c1f2342cfa0e02f850b8ed80b67f8b2b02c1a2093e8ac1cf1b9980354551e9d3a21fadde0d77d717f1559487024941973cd80bd451734
 EBUILD betamax-0.8.1.ebuild 1110 BLAKE2B 43eed0b3c65c9e15d3da038f06a03c73ba6c4b6032660897a916d37740a4f4801eeaaa191af0454d7f37cafb29a825099841579b8af331cd1bd1d53e2ee9f6a4 SHA512 b2d69230f289bb76077a6ca4bf2f504c19df7b517866fa50ac087155cf30e18ddcd5331fae06d996b6df9ffb1f58779662301c5bd447a25cb8f76023a9ae9992
-MISC metadata.xml 242 BLAKE2B 17fd7db1343fb7dba1842d5b62d83e56e2816962b0122ec6eee7f9e163f333d69ede2cbdf2a2ba8c77613367fca3d2cee779697fb25b5d8cf0439e1e845dbf1f SHA512 2ce768d5aae91f32da90c62900f556c647eb9806c810a817b6c45c5356e71f504b5a646bf75f553c3a9bfd3f94c4317df4948bae863ef7525b4a013b63618cd8
+MISC metadata.xml 312 BLAKE2B b6adeaea6a20f135ab0396ea0be72118164a917c935162c1904f07e9190cb0e692d604e7ca15f39504025990d1cbcd88ad088502202b82dde90a56862fd845ab SHA512 5c87d7dcbbd90c53df52d98b97cd54c5940cd6f3fd552fb692dbc856761cb125542a88e415ae01fdc1fff2643fdbcf7f521c2ea9f6c67d3fd9b14a01ef530e3c
diff --git a/dev-python/betamax/metadata.xml b/dev-python/betamax/metadata.xml
index e59516686a44..4e5aae36e564 100644
--- a/dev-python/betamax/metadata.xml
+++ b/dev-python/betamax/metadata.xml
@@ -5,4 +5,7 @@
 		<email>python@gentoo.org</email>
 	</maintainer>
 	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">betamax</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/bibtexparser/Manifest b/dev-python/bibtexparser/Manifest
index 5dfbfd2c50bf..916e482d3c19 100644
--- a/dev-python/bibtexparser/Manifest
+++ b/dev-python/bibtexparser/Manifest
@@ -1,3 +1,3 @@
 DIST bibtexparser-1.1.0.tar.gz 88656 BLAKE2B e5285953fbf79558643e19ea39f6421394f93afbfc6820be9bee0583c1efa010b9fe3478c9f3e36bea0c64e35c9d5bcb8341f1ee784c4150883e160723b94119 SHA512 f984cb307bfb8ee8143499469c0a83a28b3e9f061b17e5b43b7f9aa730c91427f2b2c441e501d37ab62f99ce2b7dd1cd7dee40b21c9f1a8e8b2dddf8eac2e74b
 EBUILD bibtexparser-1.1.0.ebuild 554 BLAKE2B 75058dd5c853b8fb9ab4e9291d2dec303e9772ef0c9d3261b7f355b1843902269f42f8f01f33f25b1640d108a7c20d245f486afd31064cdd4960c1fda07080d2 SHA512 c7422ea37e21b1982f8c071644b24d073a58e00e6c6e8382d16408293a5fe509c53a068102917ddf7d9531fb02629863a11a9a8e1036bb2235663594684e54f5
-MISC metadata.xml 345 BLAKE2B b62679a7f708f8ff2757c923e3ba7d8cfc73a7b3f1a293020660a20bec6cfd07e33b073f18f9543085834b7cfb07fb83f749ae30c2a0b18face008ace3b50da0 SHA512 d2ed1034bf79aeb9c8bb102618e5c5478a526a8567dd8e232126f35919b1e6ab6b27bc02f01d61a475c8ec3488450968fabe4548539d61a70b61459e0b1e1615
+MISC metadata.xml 395 BLAKE2B a90ac8a252adbf69d27b96abc5294fef318a174dea0cc54f57987304bab488a9f38a1eedf2595cc98c492df11da377112636e901e93c8dee9bd07f5ba806a513 SHA512 8134c9842f5db5fb3f23d737ae26ae95a5d0a916e9eb0aae15f836c2e6cb4f3e8123725d4ba542ae4e4c4b8737e8cc00890a32d315f58cbc3999011214b47b71
diff --git a/dev-python/bibtexparser/metadata.xml b/dev-python/bibtexparser/metadata.xml
index 30d601c0f423..049a994b028c 100644
--- a/dev-python/bibtexparser/metadata.xml
+++ b/dev-python/bibtexparser/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">sciunto-org/python-bibtexparser</remote-id>
+		<remote-id type="pypi">bibtexparser</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/binaryornot/Manifest b/dev-python/binaryornot/Manifest
index a9bf0ca1c340..64deb55827c9 100644
--- a/dev-python/binaryornot/Manifest
+++ b/dev-python/binaryornot/Manifest
@@ -1,5 +1,5 @@
 AUX binaryornot-0.4.4-fix-version-number.patch 391 BLAKE2B cde44c468996c18513115daee310eabbd267c2192a947ac3a3b572f009e4c0ed9e53ee967e2129dbf88cb2052cb8862cdb541f676ff2fb6a719c825928ff4760 SHA512 b40c2248c900c70f1b6603fd5d607005e07ce1278d4dacf72dd6664f7558a3b382ec815cd9215dd17f5b69a09002d48fa9e960771b274fb1fb08dfa4daf9df2a
 AUX binaryornot-0.4.4-tests.patch 674 BLAKE2B f07730709f11bf0732b60b81603c40bea1fa6da2d8df545b088072e0f710a7e123e438b03d2390122b6000c14343e932b38d4b6f8956ea87b72e29deae1a4715 SHA512 8a0f1066a580f08778434ed7d30c2ebf2764dbfd746b561ffce2fb8dd8d77cafaf4a58b03504cf5b1e4d37e0a6ffe3038dcaa5611cdfd7d42ada86edd1e47f3f
 DIST binaryornot-0.4.4.tar.gz 372361 BLAKE2B cb2099313f602915bacd5b463642f16430fcb0ab62dcaae546cb854780996526fb777c0b730b4b89e664ec7f995ddd2d2f632cfbac2dadca45958cfd1dd7a410 SHA512 31dfb79bb5847e12487d94519a357dece4572f7ed064686d53a49c2de5a51d6441be64523c98cca6221ed89be5bf26e54866dd3b79ac8d89fd5019a5b4d75a45
-EBUILD binaryornot-0.4.4-r1.ebuild 868 BLAKE2B 96d5adf53d567353e688ee7b9ef8a307a35bce0b27ae6da384245d4beddcee518d948e2286a52cac587dfc2fb2dbc09d34285aec6e852c932777fa95a4ed17c9 SHA512 c8d9a81dad5d7b9d084b2609a2eec3bf25c1c1baf92fffb4f2280c3edcabf36f3123af69130b506d1111c52ea0044c9fb9d37326422572097c8c767f2615f35d
-MISC metadata.xml 324 BLAKE2B 85a0925b2255a6577beed4974beba21884b88df30bc1519f6ce16e856659589c6e6e38166540f59fb0043885ce786382d90b6830c6ed1bc0051a5d728a1f780b SHA512 f20343e29c9a1d2bb354ecb3c308d5b21985deed5368d27dc144c3a6f2e236f30f7516e27a56e55be48fda32bd59ae9af96ff3b90ecf641bf57dc5b61a4267c6
+EBUILD binaryornot-0.4.4-r1.ebuild 874 BLAKE2B 3bebe5c8995782a33439b26f098080fd9328a09ed648596c2a3f8c028280553caf8542aac4c273e9368c14e89ec527a520115bb7e636327ee55ceef3780ea0cf SHA512 aa8a5f780590ee56fd06f7ef7433ddd11b0a1ed28ec216b75ab6edb1dfdce0e5d4ef9337957b6ec06bcac5f29e9942449ab89cec688d650b5da8fa995628655b
+MISC metadata.xml 379 BLAKE2B e0612d88b6c1e586117f4447e88ec38f84d23cfbdd6248a3be5a47ef9016d9748ad9142fcf4793d2f190fffeb78100b65e9d1c58974f6cf3c3c0d9545757f3ed SHA512 46557b676d1d32eb4b69fc16a5ae3e8091b2c602860b7426928681350dbda064ed1565e8cd68fb7ccffb96657699795cc0c9d2d66e66d8155eb582c265da334f
diff --git a/dev-python/binaryornot/binaryornot-0.4.4-r1.ebuild b/dev-python/binaryornot/binaryornot-0.4.4-r1.ebuild
index fc09c2b9e1bf..e9e9025051c2 100644
--- a/dev-python/binaryornot/binaryornot-0.4.4-r1.ebuild
+++ b/dev-python/binaryornot/binaryornot-0.4.4-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="Ultra-lightweight pure Python package to guess whether a file is binary or text"
-HOMEPAGE="https://github.com/audreyr/binaryornot"
+HOMEPAGE="https://github.com/audreyfeldroy/binaryornot"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/binaryornot/metadata.xml b/dev-python/binaryornot/metadata.xml
index 64d17e0e40e9..c1195b45b79b 100644
--- a/dev-python/binaryornot/metadata.xml
+++ b/dev-python/binaryornot/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
@@ -6,6 +6,7 @@
 		<name>Python</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">audreyr/binaryornot</remote-id>
+		<remote-id type="github">audreyfeldroy/binaryornot</remote-id>
+		<remote-id type="pypi">binaryornot</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/bitarray/Manifest b/dev-python/bitarray/Manifest
index 1d2bb476ea5d..12bd84d6541a 100644
--- a/dev-python/bitarray/Manifest
+++ b/dev-python/bitarray/Manifest
@@ -1,5 +1,3 @@
-DIST bitarray-0.8.3.tar.gz 36292 BLAKE2B a9e55e5f8e8257759ae8b6fb5e817c76ab9da6cd73699d492e111a9237e08718b4de22f20d97d1f633075228c503697e6faf032cceee01aaaeb4ef041fe39a4c SHA512 67e634fba3672faf986117534e9260566b7596c7fddc67d7195fce4c9cc13bf491f94b6d25005143aee1cbbfbce168be0c7a833bc1f293cdbb30149b29855372
 DIST bitarray-1.6.1.tar.gz 55299 BLAKE2B 14bee64a133fdf3d23bd557244fb25c54a223a786108d9f1bdab25d5d0942c1eba01f6997d7d6392b9885ef6be702dc73bb3b00c9c668480b74d7415c77767a2 SHA512 ad0ce244dfeaa571821b704968ddc08bea16dac94428a4571a599153704a4bdda5d7135c42c81ede655d48455378bfff7292a91fe49724bd5a6f48bb436a9fba
-EBUILD bitarray-0.8.3.ebuild 555 BLAKE2B ce5f61620d418aa3b3e6cab6a9afff028f5fc90eed08dd39637d3cca982eb257b5493646a4eb440ae069c0445ba9f3d7db3e7b44aaa5be26e7d0df89aef25359 SHA512 eabe42fd8b77684d054ec93cd67db1a50b283442c451e56177cdcccfe8b57351f1477c5de9ce3c3ac3365c992d172af8ac0be0dc3a368c8a01b8a839803fa982
-EBUILD bitarray-1.6.1.ebuild 556 BLAKE2B 16caff5453f58b4b449fe9b561af5507cc322585b3bf40e4ad74d41bde1e6610cda56a4a83f14e79e951a8bad76cf36f4428445abf1cf6e99260a55874474a26 SHA512 3ad5b3e4c12bf1c842f58ecf267d76e99ab47be86292090f71f0eef4838d960a45f6ec876d0494b2a89d9037e5c1cd92f2a8864717a72fbb1f9a01b062b02ed0
+EBUILD bitarray-1.6.1.ebuild 554 BLAKE2B fcf67d89d331e4fc0910fddf46231e46d77a0b4bcfd90b8e08bdcc964387f7691474f227e16f4b624995d79c269f908a78d6466f2325a5ccc55e9451aa3d17f5 SHA512 b8ec4534fb75de2555b727bb71ae23090db50e74274d98e8c07dde53d0c75f9d02866f97730601d4e4a5d13f52bf81d0e3fcccbf07fba481b9ebade14f9de0e5
 MISC metadata.xml 1194 BLAKE2B 2d94554cb381fb5e6f7879f55d282e3fb8f6868218390082cae0da4e10cca819ceea30ab180b143ec04d3cdc7d34a506095cd0bd8c521e32228bc6f3b177a12c SHA512 4a7db25dff2f2a47f76e52cbedb983b1b4514a8779a61c0ce9bd63955d67ca20ce4ea4c20cc4a71c5b0fbbbc0d98a65f8394479dc0a26bc843f3d0d830958d7d
diff --git a/dev-python/bitarray/bitarray-0.8.3.ebuild b/dev-python/bitarray/bitarray-0.8.3.ebuild
deleted file mode 100644
index d48bb41085ce..000000000000
--- a/dev-python/bitarray/bitarray-0.8.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-DESCRIPTION="efficient arrays of booleans -- C extension"
-HOMEPAGE="https://github.com/ilanschnell/bitarray https://pypi.org/project/bitarray/"
-SRC_URI="mirror://pypi/b/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-python_test() {
-	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/bitarray/bitarray-1.6.1.ebuild b/dev-python/bitarray/bitarray-1.6.1.ebuild
index 978daa9ae578..bcfc5c710420 100644
--- a/dev-python/bitarray/bitarray-1.6.1.ebuild
+++ b/dev-python/bitarray/bitarray-1.6.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/b/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="PSF-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 python_test() {
 	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/bitstring/Manifest b/dev-python/bitstring/Manifest
index cca87db890ae..accd4f306b9d 100644
--- a/dev-python/bitstring/Manifest
+++ b/dev-python/bitstring/Manifest
@@ -1,3 +1,3 @@
 DIST bitstring-3.1.7.tar.gz 407574 BLAKE2B aef290b174ca4cfb756778683e956ba083a8a51cc77d6232477318f91d6d1aee495967722e97a090353032ab99db97f72f3e4d5835e6a841c5076f788ffff456 SHA512 57a48cf279f1e0e2ea8e1ce436cd8c256325f6f9e9ad340b8c28c2954712faf8473e5779aeff4d66b4c596dbeb4cb39ea3328d5c22dcb4d8b0ee0a7098023561
-EBUILD bitstring-3.1.7.ebuild 603 BLAKE2B 11dda04817b22ce479842538c35de3f633ec8013aba872e9402a3ac1a934ca05024ccc5de28a65606b93d2210b5f7ac7ba18cc22043ad1037ac3dfd5b1f239a8 SHA512 8617fe8ca3076f5f866a3b8aa28bb47b7333a86f8bd41a95e8f2acb32b1fe8acfe7c13fd6047b99b1150dfb7e5f27721e154c32744eddce52a66331327726827
-MISC metadata.xml 685 BLAKE2B 45a55a5375b05612b1303a5d214343d4cd298ab0c71de1a716d816d001c999f439dbd341d60286bf1744ff57fd94a2dcd4bb3c88fc1899ee5246f332bdd6d96c SHA512 95f7164420cc0364bb45e1968e49833544ab7caf85cbf5e5b551c137e68d1a90f321e68abfbd52aca1ca425d8afc673292fa5d6bd4434e9b71723be87a42b975
+EBUILD bitstring-3.1.7.ebuild 608 BLAKE2B 6e3c86651144b25b93ab93586f523232d0b5d67933fe1a56066134d5750a22faec0f0d27b5da3c9e13aba6d9430f5a276d70adfea385d783f4019d3b385bce20 SHA512 11423cbef431e441669a40ef14a26f42d4225dd23ebd53b92f4043e6a572e5abd26dc5c3c5d05b9716847af64c38b36b74c05ba2217a3bec2cd2ba7b0c52224c
+MISC metadata.xml 732 BLAKE2B a9b70595fe02e148ffca9507d10b32167a12f8c96d10e5c37a33be5c469d450ace9f58e0c2002334c2519c2927b2f074f0b38ba46fe8404353737ea65e09993c SHA512 c192d76abacb6e82cc65877ed9cf211e79e944aed79242c0a01808dbef8c2ec2dd5d254c0022cb17d5acae33fc8065362f0c4d512f3f440b64e9247daa52d557
diff --git a/dev-python/bitstring/bitstring-3.1.7.ebuild b/dev-python/bitstring/bitstring-3.1.7.ebuild
index c7ce7fb6625f..56ae0bd5517a 100644
--- a/dev-python/bitstring/bitstring-3.1.7.ebuild
+++ b/dev-python/bitstring/bitstring-3.1.7.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/${PN}-${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/bitstring/metadata.xml b/dev-python/bitstring/metadata.xml
index 1248de8cc91f..816bbf70b81f 100644
--- a/dev-python/bitstring/metadata.xml
+++ b/dev-python/bitstring/metadata.xml
@@ -18,5 +18,6 @@
 	<upstream>
 		<remote-id type="google-code">python-bitstring</remote-id>
 		<remote-id type="github">scott-griffiths/bitstring</remote-id>
+		<remote-id type="pypi">bitstring</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/black/Manifest b/dev-python/black/Manifest
index 296141f66be7..bf7e53481397 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 2243 BLAKE2B 95683182ef2fa7a8bf0515fd37cbb1b09eb3ba37889cfaeff83486fa44cc5c4de74747189db7e706ab85d27716c90912bc3771e99e88f2347ac9ff68ea6deb48 SHA512 28bed17007da003987b551f911ea38977cdd63f0a47433f4c5893ee5e06b0b1e1032667a7e5a42ec1d864d7dbf9c8a9fa87b25505b9d398f90a95435f4f70176
-MISC metadata.xml 255 BLAKE2B 2bb3830b8cec850703f7912f4c22f5b0abeabeed0715222bc56141779d02160773cfd0f85417c553c1cd8f2738bfeb78c56dffb8e648e572019319657646d1ba SHA512 522158915afe67937f81ba572a918a2de8ca1f8591e097da56799c97870d7c44756c1acd8224d63bd3375c2b9ebc0e1ce50816899117948a48065a27804883bf
+EBUILD black-20.8_beta1.ebuild 2242 BLAKE2B 89d286f46840483c0e1b699889cdc5237f141f13f74113319af311147e4b2afb867ac738c23493622fce8f033055284b22f19175cbde599db073b2ec5e203b36 SHA512 35e32c617f0ceb1b61d55b8ea3844c754126edc57a1a11356751d2fb6db16b2d1adf86f7ccda5ed905ca8e0b6505d136ac7f92f951f3b7d1ca1135db8a30e36e
+MISC metadata.xml 317 BLAKE2B 9beb99f290b4850cdcb779d2ee9b0ba6f44cbf5a39663087b371fd06d504e8f71ce6aefef7cd3fe3f083a52aaff2759db3b2e2948ce57d32a8ab0d9dab0b8680 SHA512 eba0f35a21ddbe1bf496e760be745fe01eef8503fcfae7ffe15d8d154d2a7025d1c3082f07d0a1b763f62d11816542b2583a00cc956f7440bb827d6d114f5dc4
diff --git a/dev-python/black/black-20.8_beta1.ebuild b/dev-python/black/black-20.8_beta1.ebuild
index b508eafc855c..89826ef42d58 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 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 IUSE="test"
 # bug #754201
 RESTRICT="test"
diff --git a/dev-python/black/metadata.xml b/dev-python/black/metadata.xml
index 56cae167d372..e9851f2e412e 100644
--- a/dev-python/black/metadata.xml
+++ b/dev-python/black/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>chutzpah@gentoo.org</email>
-    <name>Patrick McLean</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">black</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/bluelet/Manifest b/dev-python/bluelet/Manifest
index 720aa2359073..944300bae5bc 100644
--- a/dev-python/bluelet/Manifest
+++ b/dev-python/bluelet/Manifest
@@ -1,3 +1,3 @@
 DIST bluelet-0.2.0.tar.gz 14182 BLAKE2B c05560f4cd1b4aaf3f25d22bbf5eabfef695cb1686742ae274df9024786ca08a4604ec9a24ad185718ad8d8876f8b5fb12df0f45cdda5b61fb6fbdc8fb09bcaf SHA512 58bd8df4b61f23a53f9310b68e5754155c00d598c9bcb7724e90ef6722ee5d6017751c2e056eaaa64cca71b89c391d248c14477457f30ebf2b28841a3fdc98fa
 EBUILD bluelet-0.2.0.ebuild 599 BLAKE2B 2e61658652671b95140974221dcbedac1c3767555c10a2cbcb9a58034d493d1d769af1202bfd51c8594157a8aa2d8cfdbec77fa183effc9086004b8e860c4656 SHA512 6d9dbccd8e3dd9f74a66bd128c7372eff975338f578bdfc47c76b41038f96595f7f605600a5b5c20370f9e7691c63ad81736cfc3fb92d6d72009aa17e020c7db
-MISC metadata.xml 1170 BLAKE2B 2bca135c0426bf0e6747a2c236adf72885e0bf94f6545ffee71e5262fbb1916e916b7acc80ea7a9a8442b7c603274ccd775a802227229ecfdb9d3ec3c41e995a SHA512 faf4e292411e4dfc2a3eda8c789f0a128d3477a95112579aba3cae1a6a2c1039dcfb9ba4231f1b1fe0a3a7f34c398e6e4aed937c101c0ac9a7a1b45c8804e071
+MISC metadata.xml 1215 BLAKE2B 90a361ac8838a24b6dff58320a794d585b0769fd7e6859bffd846731eb30cb5e0e7eb79f65ecde23f3e122cd0e1bab9752ea623efbd73a0b69e9533548a5c58c SHA512 b61fa93e8f9a0067ff1ff26d77bd9fcb0b1e2cb388ca928eed643155b03107cfb85a65981f9c1bb4dfbf3366817ee259465ee8db9f0af7d952c2491ff67a7867
diff --git a/dev-python/bluelet/metadata.xml b/dev-python/bluelet/metadata.xml
index f40580bfc18e..f536dab566d1 100644
--- a/dev-python/bluelet/metadata.xml
+++ b/dev-python/bluelet/metadata.xml
@@ -16,5 +16,6 @@ In this way, it is similar to the Greenlet green-threads library and its associa
 	</longdescription>
 	<upstream>
 		<remote-id type="github">sampsyo/bluelet</remote-id>
+		<remote-id type="pypi">bluelet</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/blurb/Manifest b/dev-python/blurb/Manifest
index 3932ca6d2ac4..e1b517d9473e 100644
--- a/dev-python/blurb/Manifest
+++ b/dev-python/blurb/Manifest
@@ -1,4 +1,4 @@
 AUX blurb-setuptools.patch 522 BLAKE2B a035fc3282d11845219a442494de83e385210421bcb45edf6780bf93d7cf43c2f3995394f862425f2c0e897357e8f187c07a2ff3b0dbc2aa9c932bfdfd83e69a SHA512 51348af10150ac288df6e4cc2d8c573b43432e18014234b4a68672518f02ef968dd26c4abe8d59dc8d6c64417cc86e770a5295635fa88356c526a580c201c581
 DIST blurb-1.0.7.tar.gz 21248 BLAKE2B 931a0db30447f5a41c956f15dac2bd967efd8a85d4837782e02af24edc31dec03d3fab27f22db1dafe334dcfc79b133cf99092fc28b59c190b1182d1f897e0bb SHA512 d84fdc0a7ecec1207a58a748f6d33343504d0b090166c91b05e9b3c2eb125fff890194539204386bdc7a1e0a595d2cb80d54d873045941491d26ca85cb55ac98
-EBUILD blurb-1.0.7.ebuild 576 BLAKE2B edc974b31f11e92ed68d5fdf545584b2b6e05c73ff4a1bf29fdd6e1d355d4826ddb3cedf0f9b8b3b0aa7d152b811eeb54e3944327a4d58ad3d2ff7dc2f24b512 SHA512 9adc2e0cc9a415e5a9d25bdbe46ad5bef052d4241c339b61f011903decacb527c806578e1e02f7e223e9fb2d8434339639d7cc962dc0bf46d152d5aa25ada735
-MISC metadata.xml 976 BLAKE2B 0d391aee3be51752f3cdb2406bacbc4a0bb45bfbebc3b2bc67b788af647faf92bf1308fbc9f51426d4c540f8e89edc8bb6f5c967000a56e40b134270ac8336bd SHA512 611315d86b3ccbecfadc3c38be45e0322221a0f1065d5d59d717a33fbf66f510274b6cb772ca3468ec76e21613ddb88cb547dc3a4e7b50d638c3fe811ed61abb
+EBUILD blurb-1.0.7.ebuild 579 BLAKE2B ddc76c2da55edcf8b4dd289663000a378e44f157eece20ce504a58715a26da323437657cdd7f41d88850fe915190b9a7bbfdd418d36fa9da0ddcdeaa339a3813 SHA512 9d15a10254a3ba048c6ac97176ec48f672477948e9f129285d0618c012307dffa7459a623350887a7189d86133fb1383a3c35a7041341ddc6597f509a78f6f29
+MISC metadata.xml 1014 BLAKE2B cd5bc5ce4fbd543bccb7f0662290434cf88574950b0987aabb7144b0a2a354c2a4b2b878ea72cbc94aad715a8bc39b1af76005a5963a94178f1aaa240647cf6c SHA512 24ce140152484f1e00c11539b7d92f4af24b03c72e21a1130faeaeab7c2414fe8e5450b66e4fa4f602e7ffa7b83360e3390745f68fc8db19ab3f084ea0922b55
diff --git a/dev-python/blurb/blurb-1.0.7.ebuild b/dev-python/blurb/blurb-1.0.7.ebuild
index a74c72cf82e7..1fcf11353aea 100644
--- a/dev-python/blurb/blurb-1.0.7.ebuild
+++ b/dev-python/blurb/blurb-1.0.7.ebuild
@@ -4,7 +4,9 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7} )
+
+PYTHON_COMPAT=( python3_{6..9} )
+
 inherit distutils-r1
 
 DESCRIPTION="Tool to create and manage NEWS blurbs for CPython"
diff --git a/dev-python/blurb/metadata.xml b/dev-python/blurb/metadata.xml
index a68165db0ed5..7c2d3fa75752 100644
--- a/dev-python/blurb/metadata.xml
+++ b/dev-python/blurb/metadata.xml
@@ -1,23 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-  </maintainer>
-  <maintainer type="person">
-    <email>chutzpah@gentoo.org</email>
-    <name>Patrick McLean</name>
-  </maintainer>
-  <longdescription lang="en">
-    blurb is a tool designed to rid CPython core development of the scourge of
-    Misc/NEWS conflicts.
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<longdescription lang="en">
+		blurb is a tool designed to rid CPython core development of the scourge of
+		Misc/NEWS conflicts.
 
-    The core concept: split Misc/NEWS into many separate files that, when
-    concatenated back together in sorted order, reconstitute the original
-    Misc/NEWS file. After that, Misc/NEWS could be deleted from the CPython
-    repo and thereafter rendered on demand (e.g. when building a release).
-    When checking in a change to CPython, the checkin process will write
-    out a new file that sorts into the correct place, using a filename
-    unlikely to have a merge conflict.
-  </longdescription>
+		The core concept: split Misc/NEWS into many separate files that, when
+		concatenated back together in sorted order, reconstitute the original
+		Misc/NEWS file. After that, Misc/NEWS could be deleted from the CPython
+		repo and thereafter rendered on demand (e.g. when building a release).
+		When checking in a change to CPython, the checkin process will write
+		out a new file that sorts into the correct place, using a filename
+		unlikely to have a merge conflict.
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">blurb</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/booleanOperations/Manifest b/dev-python/booleanOperations/Manifest
index 65226fe90793..76513f9f1658 100644
--- a/dev-python/booleanOperations/Manifest
+++ b/dev-python/booleanOperations/Manifest
@@ -1,3 +1,3 @@
 DIST booleanOperations-0.9.0.tar.gz 165127 BLAKE2B 9f72246afa46c414e3ff9ad23b86da9665a90180fc058ca278b82c1281e798d9d913e496995ca8d45ff948aff5da8a6de26706afdb5e538dee64d7ffe96c7324 SHA512 a63dec9c3a8008825538498b162130624b4d2b9ca64980a23d631601928c5fc6eebdc8f03f19094b7923b008bde6a87b5f21518cb33c8df3fcd41fd84a8ddde9
 EBUILD booleanOperations-0.9.0-r1.ebuild 799 BLAKE2B 09048d6caafc210c5909a77a78246e9cacd5fb69016e46164dfab4c81db2bffc2eff1466fd382f8198bb7e485e5965030ad8c235cd5467e00a79bf6b56bd12c7 SHA512 b8562e0a4bd912208ab6feef5322d09e1815d6fc68d66fb771325360440bc7fbd7b3fd8bb5626790caca8d430c8fa34c230e767dedfdf25f7fedb125ca4038a0
-MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
+MISC metadata.xml 323 BLAKE2B 083f2b60d847dfae2985c1221edb2b76ad6f8e46b840b96787fea472090068aff6707ea98ebd98bed13d5bdc4525a6b8fe885e563d7dfc9b7d4331b0c2c7c8bb SHA512 b37d8cd8bc3a6aeb57292fc07f1dffa47bacde9f4e25bf1fb324057a5257d8c4db113e21ca2214fe21a7552891645031a4ee59af80ef23c8d1087aec449890a5
diff --git a/dev-python/booleanOperations/metadata.xml b/dev-python/booleanOperations/metadata.xml
index 3da97a9953cc..53c77afd462a 100644
--- a/dev-python/booleanOperations/metadata.xml
+++ b/dev-python/booleanOperations/metadata.xml
@@ -5,4 +5,7 @@
 		<email>pacho@gentoo.org</email>
 		<name>Pacho Ramos</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">booleanOperations</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 4826c26f430a..e729e780f6cf 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -6,6 +6,10 @@ DIST boto3-1.16.22.tar.gz 339781 BLAKE2B d6703055d57f9d3486218efc3014439a1ca1335
 DIST boto3-1.16.23.tar.gz 339889 BLAKE2B 0a41c084beba187a89ddf8a743c6dc4f3663aebae035468a76967e4b732abdad496bb2f0a516b5af76affa18f99d4c1a3405d0e152fb41fb1fae22a6728542e6 SHA512 942b0a540cdd6ed744bc1b4285ca8d9e3121193a59717fa247431d232f25cf042625abf82709cecef20611feb68735415be2e3187ebd4e6a1efd7488c0db14ff
 DIST boto3-1.16.24.tar.gz 340133 BLAKE2B c1d195d5c6859686b2cbc9cfd772e43b6a052b138d792b896f0fea1b25eb1667d26f09369f6fcb2bfddaaaf8f994f14d2a6e6456aa098af5dbb6ddd8df503118 SHA512 55582c76ffd1d6f3d021c7ab89b6a93ea3bf3597312957497de4c8a226657414271385224e2808aecaa90b0e48f21b7fb8a62462df1cf26f142a7ecd5064f55c
 DIST boto3-1.16.25.tar.gz 340338 BLAKE2B 1ad36d77c3b1e6e67dbd8148b995d4299fceb1fa6993d0bb7d58f432252be13383fba00ee7199bb4a855d98264598c5a9cfc0aab3c8a5416a98e93b3e729843a SHA512 1e7a4d72735137b19a4b1e6f2621c33bf1fe9af860cc37021206f2eb422061092a00cae0e25f9ed44b74ef6fc01b48ba6f3e047c664085fac5dfb880dee3e620
+DIST boto3-1.16.26.tar.gz 340309 BLAKE2B df2c193b5e40f52381a4214fd5c6db9dcb0f32e3bdedf78b1ea16d166b9831c06b871809d1f0673bb3cd2838cb1f722a18a4c25a8c21fa20e5f7c14df9a7efb3 SHA512 1063702783e07a4e5a5ddce3611e57e993c284a09c026dab8af56be7a7a8ac157da2b636b808f58f0aa7940f90a7e36e439b8497713d4f95964dda13684b3795
+DIST boto3-1.16.28.tar.gz 340709 BLAKE2B 3c5520531efbb5e20f679f28f4c60964a7be38a0601f73dc0fa5ab3e2cb96939d985c1ebc20869b3fd2f556e9da836fdce4d92377fb9168eccd13cbcffd7c8c6 SHA512 72c10598560ad8d227250274fb296f11e6a1c417f8430221fd8a85e920c8a783be77193dd83ac53dc5000c2ea27c8ff626a5ef3cdee0a467237e732dd6442cdd
+DIST boto3-1.16.29.tar.gz 340743 BLAKE2B 1ef74d98aecf8dfd46bc340984d65e5dc2a70f320149b6bab18588a8371d0da6c93102da96f12950d0730c871fb6f13c7441f7ca148f974cb8678bd01b3af24a SHA512 59f8dba245c7525e4ddeec121d85919310e2bd6cf90419c19612434beff66bab4cca22968347512b0f9f2563ff3ee4d85e2d01bf10ce175c3a12a9a09c2e09a6
+DIST boto3-1.16.30.tar.gz 340801 BLAKE2B fcf87b43d2c18ecf1e9d7f0c8c423143e44777a6249a9893d0ebb4016703a9d87a157ed71fca98c8bd73419e6dd2bd2621d42406220e67e6dd462e1088837334 SHA512 66d3e4ae6296b1fbd31187228246c99e472ccfba756d6ca304eca134271d43dd80d1bc35af1fb63336a7c63f2341212329dde307cbbb2dce25e2aa0705c6a436
 DIST boto3-1.16.9.tar.gz 337905 BLAKE2B ed01e28fd7e62e5e5028307c93f92004bfbecffa77bc2ba1d6574b92ec2c515d910eb5107ac5ee03e0aca909f97f379aa65b5f839c8067634fa69266c58de33f SHA512 7343b8432788ef981819f91fe2ba27c4ec3947d01ff55914f7c89607250ecf60db2da8d25c8a2c7001ef546a9abed4cb744c5937ca09497aa1a983049648bd5e
 EBUILD boto3-1.15.18.ebuild 1353 BLAKE2B acf7d5909ffe2c1b58d3c2438b8ce995f98e092b2a76977674ad1c0491b4e2093ea53d8a1cd45b225e3577ed28847b60319a1a682d1af74c71acde7a822c4da2 SHA512 fc2ac14ce0c1ce9e7ccac46bdc9fde2e84687a7c634a784cc0ac7e99556b84f4ef3d2d27e546c445b687b93dcc293b63a5e3716ae645b01a60d8550fda591c4c
 EBUILD boto3-1.16.16.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
@@ -15,6 +19,10 @@ EBUILD boto3-1.16.22.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44
 EBUILD boto3-1.16.23.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
 EBUILD boto3-1.16.24.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
 EBUILD boto3-1.16.25.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
+EBUILD boto3-1.16.26.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
+EBUILD boto3-1.16.28.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
+EBUILD boto3-1.16.29.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
+EBUILD boto3-1.16.30.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
 EBUILD boto3-1.16.9.ebuild 1353 BLAKE2B acf7d5909ffe2c1b58d3c2438b8ce995f98e092b2a76977674ad1c0491b4e2093ea53d8a1cd45b225e3577ed28847b60319a1a682d1af74c71acde7a822c4da2 SHA512 fc2ac14ce0c1ce9e7ccac46bdc9fde2e84687a7c634a784cc0ac7e99556b84f4ef3d2d27e546c445b687b93dcc293b63a5e3716ae645b01a60d8550fda591c4c
 EBUILD boto3-9999.ebuild 1350 BLAKE2B 32d6cf48455240fb127d359f94ab09e45ec78655fbd63a5a1f29cd5a2b3de2941599c7d7068abc186b6e25baf13456b5e52958879871a5a8fc338b87e087fceb SHA512 58d3f3b2a1c04252e9c7527ccb094ec7ca41c9191de1aab85b4f6b2c6babe0c95d43f189031d2c8d1da2b35689d3ece1c27cdced6ecdec596a286893e05a5f55
-MISC metadata.xml 668 BLAKE2B 0fd93bc75c34b2348e49e39aa58d6404fc0bdeac1129a1c5644262973b08fc3f9afe371fdf9ee87ff00fd0aaa18b86bfbdbf86394434661b5253ae9b5b9dacd4 SHA512 ab5ea5b31b95ce548c12ec80f2261b98fb0e51b34218c23bafbe7cc0ac792b0680b5886062c2a016bd58ceaf1cdebc7fabade37edae756851895257b1ef1fc59
+MISC metadata.xml 711 BLAKE2B da283ea39f4540ad2445b1b88a12509a384e2f2a2ce0ffbc3845a475015c108de69b9e9868a0e43c0fb8c8b71a6ce498ece9676b0f623ed41b89efd92790be80 SHA512 80202cdc324464906b9ae7eae889d7d00c7c773aa5c49d22d8faab7deb621bbfe31cd4e66b289eadc7065e091b8615b284760736d915aa16ee15cf1c7f9e6b5d
diff --git a/dev-python/boto3/boto3-1.16.26.ebuild b/dev-python/boto3/boto3-1.16.26.ebuild
new file mode 100644
index 000000000000..ccc99e1c2415
--- /dev/null
+++ b/dev-python/boto3/boto3-1.16.26.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/boto3/boto3-1.16.28.ebuild b/dev-python/boto3/boto3-1.16.28.ebuild
new file mode 100644
index 000000000000..ccc99e1c2415
--- /dev/null
+++ b/dev-python/boto3/boto3-1.16.28.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/boto3/boto3-1.16.29.ebuild b/dev-python/boto3/boto3-1.16.29.ebuild
new file mode 100644
index 000000000000..ccc99e1c2415
--- /dev/null
+++ b/dev-python/boto3/boto3-1.16.29.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/boto3/boto3-1.16.30.ebuild b/dev-python/boto3/boto3-1.16.30.ebuild
new file mode 100644
index 000000000000..ccc99e1c2415
--- /dev/null
+++ b/dev-python/boto3/boto3-1.16.30.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/boto3/metadata.xml b/dev-python/boto3/metadata.xml
index 54ceb365c5f1..fc2e23c4ec36 100644
--- a/dev-python/boto3/metadata.xml
+++ b/dev-python/boto3/metadata.xml
@@ -20,5 +20,6 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">boto/boto3</remote-id>
+		<remote-id type="pypi">boto3</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index c9f54b3e85b9..fd522162ac46 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -8,6 +8,10 @@ DIST botocore-1.19.22.tar.gz 7073938 BLAKE2B 41ec38e7abdff5e6fd4530dd39522a13d10
 DIST botocore-1.19.23.tar.gz 7090433 BLAKE2B c5b6801e169b7c0325b33b005be0e4096442d5f9e09e7223d6668cdbd7a68b977284b4e660be5dfbf30ae661202691866dff2b3b1639d7467b3ff21ed6c90702 SHA512 9e984c48109f17126e380b0194e998c65ef02cba83ce3be6b3398a5913a41e23607779c82b90814d8193abdeb3a6cecedb443a6fc5d8d6b7ccb68ed0a0e0bc37
 DIST botocore-1.19.24.tar.gz 7111127 BLAKE2B 61f368b4e8dad8d3a03d2a73cef68f7971bbe3a2173c55689eeacc166a983c8986039f62222884176f05df13002e31868ca498664f46452362f289bd44d8df2c SHA512 42ca145f9e47b61715c816add725758dcf617c663dcd0beee29e66a28047d3bd7908ce10b7614afe9111a539e74f436286b876c107bc3591f5689619939a4551
 DIST botocore-1.19.25.tar.gz 7125010 BLAKE2B 18c03d1e61beb5b92fa958cbd6ad10d6048b51fd6b244187cfd27be0b3a0132bc2cdd0598d933cfde62a5f9cf92d2ddd2a0b7e269ace6e3319a3e37af2037bc9 SHA512 0cc4b015957330fbc5654b33953943c845c955a8fabb7b33672d496d68fe0e8783b1ba3254695bcdb7fa4b3775464f5c09af04e09931e38ba95710a6f0aa8320
+DIST botocore-1.19.26.tar.gz 7124956 BLAKE2B 6091c9536de9a3171a2327ca1d1531799fa28af48870e37de8251b42a947a7f26881ee787964cd95a070acdcb4f3b634a816ab74a519b72287e61ad11aadeaa0 SHA512 bfdf3ff4fce1463fd1cb6fc2f8a97782d68388668b6dc3ffd0a0a3fac3d0f6b7da645c0a0d2d9183096c44b8b99dc2a0a9e1a29a7bc4b7ff0cbbbc3fb066f191
+DIST botocore-1.19.28.tar.gz 7208608 BLAKE2B eab5731c530747421186c3e24cc0cb0f5b120b37e4a4d587a5ec0b118d138ff13fb9608bd028a3182aa353f188f56f0c2a05c918aafc8d79eaa87ba89d5b4265 SHA512 71de40c171b1aabdcad159b2e6817740e793a29eda99c6cdad28643bc444a26fbcd7594d927bfbe031c4e4c8b74826ba51efb37376f5a70d8a2591c524a2301a
+DIST botocore-1.19.29.tar.gz 7219708 BLAKE2B c5468be09300edf1acfb82780ad026ad78537b641b9f8f9384c41397e293a51559259c64925dac2852b888a28b49c23b7802b2c3adaca097424029fe9717044c SHA512 674f76a443541ff3665dbb1834ac69f8776e497526001db9bd229f22ea2137452c3bf954d8a6b74a732bd9e7212545cae19c9058357a38c357ed09d89c9c1cc5
+DIST botocore-1.19.30.tar.gz 7224700 BLAKE2B 50712be7e6e4a8a22607d567a8d227bbc6d9a7156c245a9faa5adf0e94364d5e5738dd558534e072d071e88315fd79555454fd5f36dfb5d309effca6a39f2247 SHA512 8d9a0becad072ac01e04c1709e8851344bbcd35ecb6c269cace7c229e3b2e48b8fd91ca31be96c67831030a75a63027e8700772601a65eb529bcfd8a58434b6c
 DIST botocore-1.19.9.tar.gz 6972834 BLAKE2B 3407c056c7995cc1ccb1b5b4c5b3a6254e38672b52e7889a7a022520283416e4dfcabd05c8ca0ed78e4624c7a20c9f43bfde87a76d7a72660b4c95256e4f9ca4 SHA512 8433f22ae7652e524a82da8d2ccda48da9eef44788333898b7526335d57a7757b80754f0d5c6a2c84ec3bde2ec9fc7da5cf872cbda7286f620b4f4878fe9a583
 EBUILD botocore-1.18.18.ebuild 1485 BLAKE2B ce1c4bcd1ffbe79d297935a669cdd3d888509e755b30ac19ae4f9eec6bbaaa7621cdf105eda31efacfb3ff053f74c172b31542022635e74312f32477a71611f3 SHA512 d21d2cdde75987519bcee104c049784d63a9491c2f458e78c05a4389b5add29960b5f3acaf1e2e27cc6efb590a8463fb329ace052a09e5c33200f45f1f18a6c7
 EBUILD botocore-1.19.16.ebuild 1496 BLAKE2B 0eb45127ff4fac7d4993ef398b6ad1569cf2eaf8f3fcfee53a1a6072f59d6274ff54ca171015e1e04580c74ad2d4ddc60884d48218af8e2a017a6d8519e9a14d SHA512 d0482c33572812a938fd0631f8eec0f8ae42188f80d6238089d89ea49542f927146fe10f2fe15f672b79129b04328472000dc2a4ead9cb01aac7f5ffae6c80e1
@@ -17,6 +21,10 @@ EBUILD botocore-1.19.22.ebuild 1496 BLAKE2B 0eb45127ff4fac7d4993ef398b6ad1569cf2
 EBUILD botocore-1.19.23.ebuild 1496 BLAKE2B 0eb45127ff4fac7d4993ef398b6ad1569cf2eaf8f3fcfee53a1a6072f59d6274ff54ca171015e1e04580c74ad2d4ddc60884d48218af8e2a017a6d8519e9a14d SHA512 d0482c33572812a938fd0631f8eec0f8ae42188f80d6238089d89ea49542f927146fe10f2fe15f672b79129b04328472000dc2a4ead9cb01aac7f5ffae6c80e1
 EBUILD botocore-1.19.24.ebuild 1496 BLAKE2B 0eb45127ff4fac7d4993ef398b6ad1569cf2eaf8f3fcfee53a1a6072f59d6274ff54ca171015e1e04580c74ad2d4ddc60884d48218af8e2a017a6d8519e9a14d SHA512 d0482c33572812a938fd0631f8eec0f8ae42188f80d6238089d89ea49542f927146fe10f2fe15f672b79129b04328472000dc2a4ead9cb01aac7f5ffae6c80e1
 EBUILD botocore-1.19.25.ebuild 1496 BLAKE2B 0eb45127ff4fac7d4993ef398b6ad1569cf2eaf8f3fcfee53a1a6072f59d6274ff54ca171015e1e04580c74ad2d4ddc60884d48218af8e2a017a6d8519e9a14d SHA512 d0482c33572812a938fd0631f8eec0f8ae42188f80d6238089d89ea49542f927146fe10f2fe15f672b79129b04328472000dc2a4ead9cb01aac7f5ffae6c80e1
+EBUILD botocore-1.19.26.ebuild 1496 BLAKE2B 0eb45127ff4fac7d4993ef398b6ad1569cf2eaf8f3fcfee53a1a6072f59d6274ff54ca171015e1e04580c74ad2d4ddc60884d48218af8e2a017a6d8519e9a14d SHA512 d0482c33572812a938fd0631f8eec0f8ae42188f80d6238089d89ea49542f927146fe10f2fe15f672b79129b04328472000dc2a4ead9cb01aac7f5ffae6c80e1
+EBUILD botocore-1.19.28.ebuild 1496 BLAKE2B 0eb45127ff4fac7d4993ef398b6ad1569cf2eaf8f3fcfee53a1a6072f59d6274ff54ca171015e1e04580c74ad2d4ddc60884d48218af8e2a017a6d8519e9a14d SHA512 d0482c33572812a938fd0631f8eec0f8ae42188f80d6238089d89ea49542f927146fe10f2fe15f672b79129b04328472000dc2a4ead9cb01aac7f5ffae6c80e1
+EBUILD botocore-1.19.29.ebuild 1496 BLAKE2B 0eb45127ff4fac7d4993ef398b6ad1569cf2eaf8f3fcfee53a1a6072f59d6274ff54ca171015e1e04580c74ad2d4ddc60884d48218af8e2a017a6d8519e9a14d SHA512 d0482c33572812a938fd0631f8eec0f8ae42188f80d6238089d89ea49542f927146fe10f2fe15f672b79129b04328472000dc2a4ead9cb01aac7f5ffae6c80e1
+EBUILD botocore-1.19.30.ebuild 1496 BLAKE2B 0eb45127ff4fac7d4993ef398b6ad1569cf2eaf8f3fcfee53a1a6072f59d6274ff54ca171015e1e04580c74ad2d4ddc60884d48218af8e2a017a6d8519e9a14d SHA512 d0482c33572812a938fd0631f8eec0f8ae42188f80d6238089d89ea49542f927146fe10f2fe15f672b79129b04328472000dc2a4ead9cb01aac7f5ffae6c80e1
 EBUILD botocore-1.19.9.ebuild 1494 BLAKE2B 46144609fec0e6664898d9408afe9e31590c90653c092f160c4d2ec369f3b1189d49b94255dfd6fe3ed1a0390418d7109c87c6aecc341781eda27cf8da1a451d SHA512 fb88fed5c0e0f117547952237e4e097d52fb3009ccb2fad160d35061aef86ac88a6d0cd2a59ffc20c746da35685bf475f336f5a47ac55cbb625041003a486d6b
 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.19.26.ebuild b/dev-python/botocore/botocore-1.19.26.ebuild
new file mode 100644
index 000000000000..ca40b64d111f
--- /dev/null
+++ b/dev-python/botocore/botocore-1.19.26.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-1.25.4[${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/botocore/botocore-1.19.28.ebuild b/dev-python/botocore/botocore-1.19.28.ebuild
new file mode 100644
index 000000000000..ca40b64d111f
--- /dev/null
+++ b/dev-python/botocore/botocore-1.19.28.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-1.25.4[${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/botocore/botocore-1.19.29.ebuild b/dev-python/botocore/botocore-1.19.29.ebuild
new file mode 100644
index 000000000000..ca40b64d111f
--- /dev/null
+++ b/dev-python/botocore/botocore-1.19.29.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-1.25.4[${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/botocore/botocore-1.19.30.ebuild b/dev-python/botocore/botocore-1.19.30.ebuild
new file mode 100644
index 000000000000..ca40b64d111f
--- /dev/null
+++ b/dev-python/botocore/botocore-1.19.30.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-1.25.4[${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/bpython/Manifest b/dev-python/bpython/Manifest
index a75d02211a55..b304cbc8bf8b 100644
--- a/dev-python/bpython/Manifest
+++ b/dev-python/bpython/Manifest
@@ -1,3 +1,5 @@
+DIST bpython-0.20.1.tar.gz 223953 BLAKE2B b26ee6e4d41609e9a04a013d90f4ae7f598ba28028d9982a77aa7f11887a60c39855e875ae004b416e375b0c906e066a22a18f0251d2e7192d690fe03afe51c7 SHA512 ff69b175afbb1f050f1aa481966bbc32580b3d113a886f49a97fa8f01e3c8c0edf2c0075785fc61ac616168c97d61ee7daeed85d0b08f1317fb774f7ad6bf439
 DIST bpython-0.20.tar.gz 224127 BLAKE2B 6b7334f6657e27eff3f48468ee4eed64b69f9ba9ce92881a28ff57a5d5e60948b30fca689adc7a3aac088d2aa1316bfd43509f4f8d80b4822e8990f2753a2059 SHA512 13c04bd9b9ce0bd1b3775295e249e0505abe3be6c601dc9d90455863fd8bc178abb3fe98b05586c6298ea9308a6b062907abf2979b37b08e4341439b0311a565
+EBUILD bpython-0.20.1.ebuild 1294 BLAKE2B 36afcc9534b3b5d5e5ac2ff568b9d5857aefdbe43032609a5834d0259d1be6f9fb3ce9f528e6881820248dc2cb348791598c0d997a8317b1962d596271e0bcf4 SHA512 99046d683bfe88df4b2cdcb4157ef1818de37a325623e9fed919ee037f4bb772bf2367e5182f78a3eb12736d6fa6a714eb078e1ae354a47342ed2a6846a682ec
 EBUILD bpython-0.20.ebuild 1293 BLAKE2B 78f1b53f228bd067c3c9c8c2af79a6df96d9623f3e531a7334295f2ac54038e4ee2072d3db971bd943b325130e524c949fd116812903a47bdd781a4b4e4bfd66 SHA512 82c75f49d3b0d3edc3f46c0454a1941f13f5690faec16fc9cc76b76fd7afe8f381f7e0aed9ba746ec12dce417b0d4d24658c512aba0e40eec7c9c008f22b80ef
 MISC metadata.xml 551 BLAKE2B 624afcce3174b99f96cb51a1e103cd96576746627e6b3cfab98cfe65624de7d3edb8c6412b6fa1e2d0fc5b03d998e0d07cbe036de9601a804fdfd2bae2e4012e SHA512 aa2eb7728bbd2760c3eff386e27c99e2dbb74ba105647f8408b01537e2748cab8207cee751fd6bbccfd5a7eb99212a406f5ce93ab55a0ed5d9bce7ade1836547
diff --git a/dev-python/bpython/bpython-0.20.1.ebuild b/dev-python/bpython/bpython-0.20.1.ebuild
new file mode 100644
index 000000000000..ecf0abab267b
--- /dev/null
+++ b/dev-python/bpython/bpython-0.20.1.ebuild
@@ -0,0 +1,45 @@
+# 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=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Syntax highlighting and autocompletion for the Python interpreter"
+HOMEPAGE="https://www.bpython-interpreter.org/ https://github.com/bpython/bpython https://pypi.org/project/bpython/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/curtsies-0.2.11[${PYTHON_USEDEP}]
+	dev-python/greenlet[${PYTHON_USEDEP}]
+	dev-python/jedi[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	>=dev-python/six-1.5[${PYTHON_USEDEP}]
+	dev-python/urwid[${PYTHON_USEDEP}]
+	dev-python/watchdog[${PYTHON_USEDEP}]
+	"
+# sphinx is used implicitly to build manpages
+BDEPEND="
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+
+DOCS=( AUTHORS CHANGELOG sample.theme light.theme )
+
+distutils_enable_sphinx doc/sphinx/source --no-autodoc
+distutils_enable_tests unittest
+
+src_prepare() {
+	sed -e 's:test_exec_dunder_file:_&:' \
+		-e 's:test_exec_nonascii_file_linenums:_&:' \
+		-i bpython/test/test_args.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/bracex/Manifest b/dev-python/bracex/Manifest
new file mode 100644
index 000000000000..b08578e75586
--- /dev/null
+++ b/dev-python/bracex/Manifest
@@ -0,0 +1,3 @@
+DIST bracex-2.0.1.tar.gz 24356 BLAKE2B dc4df37c569e26a4319d4240694a397926075ba8cc3d6f44cb35ae42dd20c36f690f904d6a6895aa4e02d7108b3bc173d4a6f672ac9bf5ee426f280dab5fc0e1 SHA512 28758ce4796ad64cceeab0e93edf4c9bb71c6a968db3b917db3e22619278a4639e587da7070c15c5a3c8c1121871541e7764904769859c3c590ac8611f224a13
+EBUILD bracex-2.0.1.ebuild 1047 BLAKE2B 6e95538bd6fb2c2ef5975dd6de844e52fd792b829d8e3971444a13b8a31a22cacba982220625c6c04a21de88fb81b3fce819689d7e6f4d40ddea893a5bcfe7ba SHA512 16e52304611f7eca1b4ed555b6239fac7ccce63f510a600e3c64cce15bb86735ce2cc37517022d5443b2d0f3fb05340580d43d708862ec0b87d36dc390f6fd5f
+MISC metadata.xml 1198 BLAKE2B 0fd219ffba7d698f8dfc8bfb131e2baad454e2cdea289d8cf0875bdad2cb818d47596af1f47f98c0e1861ef1097e877425fbc15014b5711447747c63511d2e9e SHA512 3ee15cdfed6e6a8cc0304fcac06b1448e413a4d6e7205a1164297f2343cf38672fd3bad03436554e631be757b6026a678bf071af07c86b74dde9ae23df3ae23f
diff --git a/dev-python/bracex/bracex-2.0.1.ebuild b/dev-python/bracex/bracex-2.0.1.ebuild
new file mode 100644
index 000000000000..3219582fd350
--- /dev/null
+++ b/dev-python/bracex/bracex-2.0.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-git-revision-date-localized-plugin
+	dev-python/mkdocs-material
+	dev-python/mkdocs-minify-plugin
+	dev-python/mkdocs_pymdownx_material_extras
+	dev-python/pyspelling
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="Bash style brace expansion for Python"
+HOMEPAGE="
+	https://github.com/facelessuser/bracex
+	https://pypi.org/project/bracex
+"
+SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="test? ( dev-vcs/git )"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# mkdocs-git-revision-date-localized-plugin needs git repo
+	if use doc; then
+		git init || die
+		git config --global user.email "you@example.com" || die
+		git config --global user.name "Your Name" || die
+		git add . || die
+		git commit -m 'init' || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/bracex/metadata.xml b/dev-python/bracex/metadata.xml
new file mode 100644
index 000000000000..f0d91e4ea335
--- /dev/null
+++ b/dev-python/bracex/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+	<maintainer type="person">
+		<email>lssndrbarbieri@gmail.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">facelessuser/bracex</remote-id>
+		<remote-id type="pypi">bracex</remote-id>
+	</upstream>
+	<longdescription lang="en">
+		Why Bracex over other solutions?
+
+		Bracex actually follows pretty closely to how Bash processes braces. It is not a 1:1 implementation of how Bash handles braces, but generally, it follows very closely. Almost all of the test cases are run through Bash first, then our implementation is compared against the results Bash gives. There are a few cases where we have purposely deviated. For instance, we are not handling Bash's command line inputs, so we are not giving special meaning to back ticks and quotes at this time.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/breathe/Manifest b/dev-python/breathe/Manifest
index 5cc801d5387a..9d616abd646e 100644
--- a/dev-python/breathe/Manifest
+++ b/dev-python/breathe/Manifest
@@ -1,5 +1,3 @@
-DIST breathe-4.14.1.tar.gz 69369 BLAKE2B 93c394d7174aff8e8e8b1c95435d88c5f344ea1a26f46e9ef6ea8e7457bb9650d0cce96d03bc5c23e58704e3dcda3228ef1a61b16cd9ab45b07c2f1989eea88f SHA512 7247aae71c8e3e2491b76e6a5889fd9b97100e921e8c724c26e6c75b904c4e5dca825ae824b015f156960d5afbbf622b29535a46261c7fa0c24dd52deb46d096
 DIST breathe-4.22.1.tar.gz 76241 BLAKE2B 1b410eefe47610abf2e55bba86d13169449a03be2503839fa7a0f4f351e79d2e5f24d208c95d06a58e2d8cacef55ef52ea5921d5d71ce50b94fb0eed207918a2 SHA512 3b49819821356929a18d8ad9e25edd93d91661f3baea452121afb74308e11afa9a3cc96e31a063d380cfc1b0973ac646d5917279d9b56131be25dbb13dd632bf
-EBUILD breathe-4.14.1.ebuild 764 BLAKE2B 7c4fe46495538c0a713d5dafb3a8cd71a9f1d8b5f84fdc54e6e76bb14de2b6cb6ff54b66403e8b4a971698990b2aa866041f7ce90582e90c54e729c6800ee5e8 SHA512 1235f63ff79f275a403478bdcad3ee8723d4ebbd274bcf1545b489fbfc4174ef4f7b2cc76020038933397a0a53d9e65f3d82350b4a5b6cba0ba29d49747b3ba3
-EBUILD breathe-4.22.1.ebuild 767 BLAKE2B 42347b4f359f92a9d229b9bc1e337021e59683f4bffacc8ea4aee9748c62bf7c5498fe4e15eec1fa54e09579223a03b7322062cb019a25e3915270183a849915 SHA512 a81c5ca8916c51614a82e123c414c62e99b9ef45538ae2ef55d3c513310693a0731015a5235d1385847252031f11442ea15e2d3c57b3449a825351b734c26d87
-MISC metadata.xml 796 BLAKE2B 5f7541beb0113e83fb387eadfbbefea4bfe9d6a172c61fd60a2de473ec9e61f1a941d768350526de1464ff0ebbc58dabf13e7be3e38cac1d3a3cbcd791260d40 SHA512 734fa318039a2831c3cd35fa9f710739406b627f1e0f1d34c772d1d9dae53ea6921c21a236cabf00e3a1d3d2e95f053ea39436b1f539d9fa0c2bf1abbaf9018f
+EBUILD breathe-4.22.1.ebuild 764 BLAKE2B 47c348271dfa7781288e5fcf37f4eab8ae31eac0c874f2ecdbdb205646a4d3a8730bca65d145d6f5030374b535051b9e2bfa6d8b0d9c96e13d6a6cfc640c5576 SHA512 5f1b3869b15ec36750fc9ed36fa0064ddd76f146e93c48cd194aae481a63880a69658cd5313943cd861cfc332ee1e267ed7388c4a5df95fffbf08e00e5dfca1c
+MISC metadata.xml 821 BLAKE2B 5105f5b60fd5fb3852dcc4d9c6acbeeb2f15e561256799162b5db18c1dcd665f2ac94f9e766fbab3c17856da7936694700850f84e7ca3bab196a5d96454b5083 SHA512 15b0904261afeb1e16da06f81bc78ed099268c7119086e04899eb6735656d508f3eb1dcc8bc1d8a0f6ae59943f1b2aea4204382eb78474aadb72b9d2030bf3de
diff --git a/dev-python/breathe/breathe-4.14.1.ebuild b/dev-python/breathe/breathe-4.14.1.ebuild
deleted file mode 100644
index 9f9c21dc8aa4..000000000000
--- a/dev-python/breathe/breathe-4.14.1.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..8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx Doxygen renderer"
-HOMEPAGE="https://breathe.readthedocs.io/en/latest/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	app-doc/doxygen
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-texlive/texlive-bibtexextra
-	dev-texlive/texlive-fontsextra
-	dev-texlive/texlive-fontutils
-	dev-texlive/texlive-latex
-	dev-texlive/texlive-latexextra
-"
diff --git a/dev-python/breathe/breathe-4.22.1.ebuild b/dev-python/breathe/breathe-4.22.1.ebuild
index 47e8e11f3e19..b38dab15c46b 100644
--- a/dev-python/breathe/breathe-4.22.1.ebuild
+++ b/dev-python/breathe/breathe-4.22.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	app-doc/doxygen
diff --git a/dev-python/breathe/metadata.xml b/dev-python/breathe/metadata.xml
index c4975d2a8a68..1082a3d1f99c 100644
--- a/dev-python/breathe/metadata.xml
+++ b/dev-python/breathe/metadata.xml
@@ -13,6 +13,7 @@
     like support for people who enjoy using Sphinx but work with languages
     other than Python. The system relies on the Doxygen’s xml output.
   </longdescription>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">breathe</remote-id>
     <remote-id type="github">michaeljones/breathe</remote-id>
diff --git a/dev-python/brotlicffi/Manifest b/dev-python/brotlicffi/Manifest
new file mode 100644
index 000000000000..f032f752f8d0
--- /dev/null
+++ b/dev-python/brotlicffi/Manifest
@@ -0,0 +1,5 @@
+AUX brotlicffi-0.8.0-remove-dict.patch 5333 BLAKE2B e68065d06c072f61b0115925706e1476ef58d4217635c2d29e32a503cc0a98a2b55a9155f8bc189659b986a8bc7ca213b4b1f1405b0379e3f2813db50b5b949b SHA512 8e1acde07e98c609e295d0c2408823de026ffdfa88b3a45880ab5321b5293ce19791000bc5fd0d37ba96ccecb243151ac52ac2beaa2447ca912ae21d5a4a711c
+DIST brotli-46c1a881b41bb638c76247558aa04b1591af3aa7.tar.gz 19840371 BLAKE2B b9a1c3c2e5b62bd63b392debe54bd1732ac1cb31f88500f0142108b453649d96901d9a03b6db98642cb9abaf9188c06d440f2b8bd3cf57fbbb52196a931f5079 SHA512 dc573c90491032a205f32f0ce9c93e95b06c70a3107caa9501e038a212226c37117d63709a29843367344bf7d18cf32d0c0578b11166387198e12b38b1522406
+DIST brotlicffi-0.8.0.gh.tar.gz 21997 BLAKE2B 5e817e228ce01cd7a831c59cca5bab3e851d676f1daa5efab8f61a203c0854bcc92605c88896dff5f4ce27fc880718da5ddfcf02a3bddbbd7b2e18c33f1e77a4 SHA512 fd0c64b400d3b48e0e2d113b4d75e32a2b33fd99505c7661d6d51ba9aedf5cc1f58be09bc90a5f1f7e3424addef2b54cc085a41e6291c87d53dd7d4e8fc7eb4e
+EBUILD brotlicffi-0.8.0.ebuild 1254 BLAKE2B e1509b8e7eef67790776cd636e949e5882bbb9acd36d652f9f638a09bfb68c959daa635cb186451911482bcc2d252378934c96dca1e9707daa262d2be5e3b40a SHA512 158164e87df8795f7b9955438a36022e26e6b58be897bbcb9839c44aa133f369f93b866d72329680db342724d43301b9df3978fa5b77cca3958495910b5051ed
+MISC metadata.xml 376 BLAKE2B 7044a00a2d66d5f983cc9485bc9a3124d24162cb72fb65c716653f1b4bddf7c6a1d3e7a407726098650167f74d5c10bab2582cabbb533cbf966ac0b8292cbe70 SHA512 51fee847f41d497493f69a12962df09d1229357502538b00c1941025230745bda4595619dca1277e6c01840c788e677ec0d1033d897350373e84ca6e9222ddd4
diff --git a/dev-python/brotlicffi/brotlicffi-0.8.0.ebuild b/dev-python/brotlicffi/brotlicffi-0.8.0.ebuild
new file mode 100644
index 000000000000..5dbd99180383
--- /dev/null
+++ b/dev-python/brotlicffi/brotlicffi-0.8.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+# Commit of the Brotli library bundled within brotlipy.
+BROTLI_BUNDLED_COMMIT="46c1a881b41bb638c76247558aa04b1591af3aa7"
+
+DESCRIPTION="Python binding to the Brotli library"
+HOMEPAGE="
+	https://github.com/python-hyper/brotlicffi/
+	https://pypi.org/project/brotlicffi/"
+SRC_URI="
+	https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	test? (
+		https://github.com/google/brotli/archive/${BROTLI_BUNDLED_COMMIT}.tar.gz
+			-> brotli-${BROTLI_BUNDLED_COMMIT}.tar.gz
+	)"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	app-arch/brotli:=
+	virtual/python-cffi[${PYTHON_USEDEP}]"
+DEPEND="
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	# remove custom dictionary code that isn't supported by new brotli
+	"${FILESDIR}"/brotlicffi-0.8.0-remove-dict.patch
+)
+
+src_unpack() {
+	default
+	if use test; then
+		mv "brotli-${BROTLI_BUNDLED_COMMIT}"/tests "${S}"/libbrotli/ || die
+	fi
+}
+
+src_configure() {
+	export USE_SHARED_BROTLI=1
+}
diff --git a/dev-python/brotlicffi/files/brotlicffi-0.8.0-remove-dict.patch b/dev-python/brotlicffi/files/brotlicffi-0.8.0-remove-dict.patch
new file mode 100644
index 000000000000..bfb1b61b951b
--- /dev/null
+++ b/dev-python/brotlicffi/files/brotlicffi-0.8.0-remove-dict.patch
@@ -0,0 +1,132 @@
+From 0fe3dc70240ea62b56861ab830f9ab44644b18e5 Mon Sep 17 00:00:00 2001
+From: Seth Michael Larson <sethmichaellarson@gmail.com>
+Date: Sat, 28 Nov 2020 14:36:59 -0600
+Subject: [PATCH] Update libbrotli to 1.0.9
+
+(stripped down to removing custom dictionary support)
+
+---
+ src/brotlicffi/_api.py          | 21 ++----------
+ src/brotlicffi/_build.py        | 25 +-------------
+ test/test_simple_compression.py |  8 -----
+
+diff --git a/src/brotlicffi/_api.py b/src/brotlicffi/_api.py
+index 49da0a3..8358d3f 100644
+--- a/src/brotlicffi/_api.py
++++ b/src/brotlicffi/_api.py
+@@ -95,8 +95,7 @@ def compress(data,
+              mode=DEFAULT_MODE,
+              quality=lib.BROTLI_DEFAULT_QUALITY,
+              lgwin=lib.BROTLI_DEFAULT_WINDOW,
+-             lgblock=0,
+-             dictionary=b''):
++             lgblock=0):
+     """
+     Compress a string using Brotli.
+ 
+@@ -124,11 +123,6 @@ def compress(data,
+         based on ``quality``.
+     :type lgblock: ``int``
+ 
+-    :param dictionary: A pre-set dictionary for LZ77. Please use this with
+-        caution: if a dictionary is used for compression, the same dictionary
+-        **must** be used for decompression!
+-    :type dictionary: ``bytes``
+-
+     :returns: The compressed bytestring.
+     :rtype: ``bytes``
+     """
+@@ -141,8 +135,7 @@ def compress(data,
+         mode=mode,
+         quality=quality,
+         lgwin=lgwin,
+-        lgblock=lgblock,
+-        dictionary=dictionary
++        lgblock=lgblock
+     )
+     compressed_data = compressor._compress(data, lib.BROTLI_OPERATION_FINISH)
+     assert lib.BrotliEncoderIsFinished(compressor._encoder) == lib.BROTLI_TRUE
+@@ -255,8 +248,7 @@ def __init__(self,
+                  mode=DEFAULT_MODE,
+                  quality=lib.BROTLI_DEFAULT_QUALITY,
+                  lgwin=lib.BROTLI_DEFAULT_WINDOW,
+-                 lgblock=0,
+-                 dictionary=b''):
++                 lgblock=0):
+         enc = lib.BrotliEncoderCreateInstance(
+             ffi.NULL, ffi.NULL, ffi.NULL
+         )
+@@ -271,13 +263,6 @@ def __init__(self,
+         _set_parameter(enc, lib.BROTLI_PARAM_LGWIN, "lgwin", lgwin)
+         _set_parameter(enc, lib.BROTLI_PARAM_LGBLOCK, "lgblock", lgblock)
+ 
+-        if dictionary:
+-            self._dictionary = ffi.new("uint8_t []", dictionary)
+-            self._dictionary_size = len(dictionary)
+-            lib.BrotliEncoderSetCustomDictionary(
+-                enc, self._dictionary_size, self._dictionary
+-            )
+-
+         self._encoder = enc
+ 
+     def _compress(self, data, operation):
+diff --git a/src/brotlicffi/_build.py b/src/brotlicffi/_build.py
+index d2a2d85..45dccb6 100644
+--- a/src/brotlicffi/_build.py
++++ b/src/brotlicffi/_build.py
+@@ -93,20 +93,6 @@
+                                                       uint8_t** next_out,
+                                                       size_t* total_out);
+ 
+-    /* Fills the new state with a dictionary for LZ77, warming up the
+-       ringbuffer, e.g. for custom static dictionaries for data formats.
+-       Not to be confused with the built-in transformable dictionary of Brotli.
+-       |size| should be less or equal to 2^24 (16MiB), otherwise the dictionary
+-       will be ignored. The dictionary must exist in memory until decoding is
+-       done and is owned by the caller. To use:
+-        1) Allocate and initialize state with BrotliCreateInstance
+-        2) Use BrotliSetCustomDictionary
+-        3) Use BrotliDecompressStream
+-        4) Clean up and free state with BrotliDestroyState
+-    */
+-    void BrotliDecoderSetCustomDictionary(
+-        BrotliDecoderState* s, size_t size, const uint8_t* dict);
+-
+     /* Returns true, if decoder has some unconsumed output.
+        Otherwise returns false. */
+     BROTLI_BOOL BrotliDecoderHasMoreOutput(const BrotliDecoderState* s);
+@@ -205,15 +191,6 @@
+                                           BrotliEncoderParameter p,
+                                           uint32_t value);
+ 
+-    /* Fills the new state with a dictionary for LZ77, warming up the
+-       ringbuffer, e.g. for custom static dictionaries for data formats.
+-       Not to be confused with the built-in transformable dictionary of Brotli.
+-       To decode, use BrotliSetCustomDictionary() of the decoder with the same
+-       dictionary. */
+-    void BrotliEncoderSetCustomDictionary(BrotliEncoderState* state,
+-                                          size_t size,
+-                                          const uint8_t* dict);
+-
+     /* Check if encoder is in "finished" state, i.e. no more input is
+        acceptable and no more output will be produced.
+        Works only with BrotliEncoderCompressStream workflow.
+diff --git a/test/test_simple_compression.py b/test/test_simple_compression.py
+index 45c322d..a480587 100644
+--- a/test/test_simple_compression.py
++++ b/test/test_simple_compression.py
+@@ -110,14 +110,6 @@ def test_compressed_data_roundtrips(s):
+     assert brotlicffi.decompress(brotlicffi.compress(s)) == s
+ 
+ 
+-@given(binary(), binary())
+-def test_compressed_data_with_dictionaries(s, dictionary):
+-    d = brotlicffi.Decompressor(dictionary)
+-    compressed = brotlicffi.compress(s, dictionary=dictionary)
+-    uncompressed = d.decompress(compressed)
+-    assert uncompressed == s
+-
+-
+ @given(binary())
+ def test_process_alias(s):
+     c1 = brotlicffi.Compressor()
diff --git a/dev-python/brotlicffi/metadata.xml b/dev-python/brotlicffi/metadata.xml
new file mode 100644
index 000000000000..0ca2bbfddadc
--- /dev/null
+++ b/dev-python/brotlicffi/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">brotlicffi</remote-id>
+		<remote-id type="github">python-hyper/brotlicffi</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/brotlipy/Manifest b/dev-python/brotlipy/Manifest
index 61244dd70c5e..e1341e5b6d6e 100644
--- a/dev-python/brotlipy/Manifest
+++ b/dev-python/brotlipy/Manifest
@@ -2,4 +2,4 @@ AUX brotlipy-0.7.0-test-deadline.patch 913 BLAKE2B f7a57989defc3cbc6aa0f29d9db73
 DIST brotli-46c1a881b41bb638c76247558aa04b1591af3aa7.tar.gz 19840371 BLAKE2B b9a1c3c2e5b62bd63b392debe54bd1732ac1cb31f88500f0142108b453649d96901d9a03b6db98642cb9abaf9188c06d440f2b8bd3cf57fbbb52196a931f5079 SHA512 dc573c90491032a205f32f0ce9c93e95b06c70a3107caa9501e038a212226c37117d63709a29843367344bf7d18cf32d0c0578b11166387198e12b38b1522406
 DIST brotlipy-0.7.0.tar.gz 19375 BLAKE2B 035dc8757e491bc4fc0d8e2b6b82703eecc8f6f4150da42fda0f6c6f42a617519f5191371eb1dd976b8bbfeab88845bb018b874a395cdbf0ff409a6911f969f5 SHA512 bec8183cf3cc8ba9e594d1a86a8a33d88a6ac8e9c6a6287c837bda3726183ff1b486f2c49da4e489b5b3cb51b57dd5816413b59419920c2ced48435221f1beaf
 EBUILD brotlipy-0.7.0-r3.ebuild 1476 BLAKE2B d20460de46ba191242127e20ed96f6b89e1d404ad6a704eb793bffd8d252efb4b441cf3983d571bf08c6a9ddb6f172b6f8f958f9988feb1d53f38e47fa06eb8c SHA512 fddd9ef185395032d3cb22557715c74565ef6e6565e4c8c5c690424d3475f277c3e672f7290d07272a0e25bc55f729752391a6b9adc9bebecfffb0351043687d
-MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
+MISC metadata.xml 372 BLAKE2B 3911434692e9e18810246101a8a365425be643f6895718f6faaf9463a99624ab898a5197127d904942cf8ad452e28052da420f05abd1d8c8368f8b7da2fa08d4 SHA512 daa1c91e60f79c74e425cbbda5a60297659ccbc91e7356efc32053d435e666f56347c02f7ebebbc2059ce3b91919d73c7d70295c1a2a255d8abcc2e197a90e79
diff --git a/dev-python/brotlipy/metadata.xml b/dev-python/brotlipy/metadata.xml
index 7f4f33c6dbc9..56e99b52ee7f 100644
--- a/dev-python/brotlipy/metadata.xml
+++ b/dev-python/brotlipy/metadata.xml
@@ -5,4 +5,8 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">brotlipy</remote-id>
+		<remote-id type="github">python-hyper/brotlipy</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/brython/Manifest b/dev-python/brython/Manifest
index 8ca09c6a4fbd..88fce6cc4604 100644
--- a/dev-python/brython/Manifest
+++ b/dev-python/brython/Manifest
@@ -2,4 +2,4 @@ DIST brython-3.7.3.tar.gz 10403156 BLAKE2B a30c957925149f1b7eb736c1fcacd171dffb5
 DIST brython-3.7.4.tar.gz 10473351 BLAKE2B c457498d7f9b61ef416d6ec0ccbf86e3fdc7cc55f90fd8a853005285cab814d054319a5437cc24d22d6088af6f5b58da5311c6f68721d7b243fe31ef450c38a1 SHA512 70959debdd0a3e7f7e533f17aa2149802454bee23598d844156756ee6aab697b75337a26a341e6408966036f419696d0f8b073cb5383f32a9f6de65cde2fa40a
 EBUILD brython-3.7.3.ebuild 761 BLAKE2B 35236dc8fac0d6f47e8cd45855538098cd50bc2de66467c552c55885237264913dab68a18671b0a83973c9716e5155fee029f7201863178a56ce889713fcec8a SHA512 ff84dbf08200f19b806d9e109772d7318dfb32fba4e1643023621af992f798e3eafcb1f6a676e5a2b982efe82630bfac73b3406ec051d5c365c96182100a3049
 EBUILD brython-3.7.4.ebuild 761 BLAKE2B 35236dc8fac0d6f47e8cd45855538098cd50bc2de66467c552c55885237264913dab68a18671b0a83973c9716e5155fee029f7201863178a56ce889713fcec8a SHA512 ff84dbf08200f19b806d9e109772d7318dfb32fba4e1643023621af992f798e3eafcb1f6a676e5a2b982efe82630bfac73b3406ec051d5c365c96182100a3049
-MISC metadata.xml 345 BLAKE2B ab7c78390c35a156fed3a3507ab979347fef95259f4083a28ba2c925356907158a0e7249cc4e6e46cc9117e418a07a3f91a67ba34163aa5be657ca37bf11b318 SHA512 ff1357bc421a8f96fe10ddc253035271616da444fb6cca11d3b263629c12abfbfc17324d06e744c95c319fe525763ff752db69aa3439edaa3fdc3e7e56c5bb05
+MISC metadata.xml 380 BLAKE2B f28f70695ea35121b72cddd060fad924b95f33449c0c41b01ad55ae7dc2f15c28c6e49c2c3fe49a59e89f533a05db40de9a88d976b213751b2af7a53dd031642 SHA512 ab2ca2fdef7aaf2893c3b2bec50cabb69f907edf3a543c4d0156d2ca9488c2d6642c8c6dd6e0a7c6d88cf9b2bdd4c745b2d7b1a96aaa471c7269f53502c70203
diff --git a/dev-python/brython/metadata.xml b/dev-python/brython/metadata.xml
index 36e30a512a19..f2bfcdca5681 100644
--- a/dev-python/brython/metadata.xml
+++ b/dev-python/brython/metadata.xml
@@ -1,11 +1,12 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>monsieurp@gentoo.org</email>
-    <name>Patrice Clement</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">brython-dev/brython</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>monsieurp@gentoo.org</email>
+		<name>Patrice Clement</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">brython-dev/brython</remote-id>
+		<remote-id type="pypi">brython</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/cachelib/Manifest b/dev-python/cachelib/Manifest
index d883031b0279..3ca9378c71f0 100644
--- a/dev-python/cachelib/Manifest
+++ b/dev-python/cachelib/Manifest
@@ -1,3 +1,3 @@
 DIST cachelib-0.1.tar.gz 9844 BLAKE2B 7281a3851281c2babd3d144db0e22270e5c196eaaf62f975844f9972538e571a36a855f8a0209e2f38d1a962dd52d0d7fcefa1f6d3b97c3f5dcd119585c7ade8 SHA512 8ed41a14f3bc36393ecdce7dcc0023ce954900f4541463cf08b823b6c11a28532812c9873d32991f023986ed2ded39a560ee556447bc6d4c3e45c3d4d749c2b9
-EBUILD cachelib-0.1.ebuild 512 BLAKE2B 0336430628a0e65bcb177476712a79b22a3040cb230c67212da3be02cb05abce70ed1617908a7d234503765e72bee84498ad09a35bcfc57853057edaf5df3245 SHA512 dee39ae092535c2ce7477bc48a38b922495331e7a63d08be867209c91dc52d6f80b542275a88e642b9182eb558f901a8a1aa333e9335e184a0bee696bfa74800
+EBUILD cachelib-0.1.ebuild 514 BLAKE2B 961ffbb12e6519db3dbd82a95de1ab625f9debda020cccf764d43eb4b5faeadf6d79dac36454cd5df09905c5348ca90e6cfc2b3f13ff667a1f9f1288812128a7 SHA512 ed4a688be97cc84b8bef52aa8c92fafe28b60e64c2a4e86815b0f93c6f2d7eb61e84b5bb0d1be8b433c138a07c15d963498d7bd3183aafe766f4600c4fa603da
 MISC metadata.xml 348 BLAKE2B 548d0e9474e9d2c42f0c4d0fb60d0cf53053fb7d4b2b62dcef25c0d1dac802b32af0af53189c8dea4b57309126840efd38a4fab3fc79000f782b82c9927b7a4f SHA512 b602b68d9c5d5fc239ddd37449d0edfb2909c8a8a5fd45c51c669a390149c107af0d5b198d65ef34e5f83aea1f225b8f136d693460abfa6ae27bc57232ca17cb
diff --git a/dev-python/cachelib/cachelib-0.1.ebuild b/dev-python/cachelib/cachelib-0.1.ebuild
index 582e8a51439f..2600a37d15cb 100644
--- a/dev-python/cachelib/cachelib-0.1.ebuild
+++ b/dev-python/cachelib/cachelib-0.1.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6..9} )
+
 inherit distutils-r1
 
 DESCRIPTION="Collection of cache libraries in the same API interface. Extracted from werkzeug"
diff --git a/dev-python/cairocffi/Manifest b/dev-python/cairocffi/Manifest
index 888f726bf9b3..9ac5d91dfcb1 100644
--- a/dev-python/cairocffi/Manifest
+++ b/dev-python/cairocffi/Manifest
@@ -3,5 +3,5 @@ AUX cairocffi-1.0.2-test-deps.patch 671 BLAKE2B 489b14e3e9847f28c53211aedc9b3ef4
 DIST cairocffi-1.1.0.tar.gz 68744 BLAKE2B 604812572bb1a39ab52e41e03714acc93ddc7532e07ac36b693f53ad71cf0bcfd5d2f3bceb56b8e352fe7f179b174a244238b9cfcee690cbc0cb96e5b2934c75 SHA512 a9bc9ec5be767388aad9d06cc3b386b474dbacf097d3558b4033834cfb2f5418eede2f4b4080bec7e4725c6821f6e54d6c3366e8c4ee73bd3fa1cf444b395197
 DIST cairocffi-1.2.0.tar.gz 70393 BLAKE2B b5cc69ec2805524e8f66a6234c4e19502181fad18c754379d91b05c2d2a88c82742f2b2057afcaac93f4d23ee64b41b2e84f029b6cb4ce2e7b3fa81ae0e8a485 SHA512 0f5b58ae85b2cc880bfb8ede6cbfe4905737211dab5b080815eb59f7cdd9c580367b9e00e7216d68ea9cbb84bda3f21ddcbccb2e744b86d6da8b991cffb96caf
 EBUILD cairocffi-1.1.0.ebuild 781 BLAKE2B fd97362eea8415a40d9cc60e7bfca532b3f095c2ce3cac892269c6bfd6865ba8b79fddbcb1640ecf8ecb798d5295dc311a7fa47d3d50d87f601dab22257e2d8a SHA512 2a0e41a651bc2918ffe90624ede77ae31d6a7e6cba871ac0c416efcc22cff4f6032817438a67a8e9eb9af2d0230c9bac580cc5f79c29e64cff9d18f9003ee8a9
-EBUILD cairocffi-1.2.0.ebuild 901 BLAKE2B 517131aab097ddd31a6f734ed04b90187f536137fee0591c172f54d392bf10749adf605994b4af44df4d83ce8d949936354363c5b01cba9868f897e23ce1f28f SHA512 959bbd1b8b416597ea74077227b0299c892af301706dac75ef5d7c5570d244651641984f870946a2d27c829d3cdc9ca45cc29c7776fba53b79e79bbcb0bc37c4
+EBUILD cairocffi-1.2.0.ebuild 898 BLAKE2B 483ef93a9b4682c99dc68a4adebda0290e95dc796888d5815d18917c0c871a7e224df87697acebded2f7f96b3d96650a0bc237bae1a5e4c500018a23f65980a3 SHA512 b7f14467d263f8d72aed1c170b07eb3b6ad574b3f113680e9809670cc1be89b099b2fa5dfb0d4c07d68f09b92ee7a56eec2c3cb8790d17d01402584c162a2721
 MISC metadata.xml 379 BLAKE2B 75baee69a9fff6d3c571bded0b1e6cfd8abbdfae7262faa2215fb3251ace498c33119ebe3bf74e4e4e0b2d1ba620b9bc60d4daf244917098e17c62af24d4b401 SHA512 b0bdbb3b144675f9e90a0421c694e0f0a782dbf315dd8203574bea69b9389d49d377797a28d9d86588d062e15071c1fe226dd4166a4fbf8e95a852d46cc20215
diff --git a/dev-python/cairocffi/cairocffi-1.2.0.ebuild b/dev-python/cairocffi/cairocffi-1.2.0.ebuild
index 61a574f5b0d5..904fb171ce2d 100644
--- a/dev-python/cairocffi/cairocffi-1.2.0.ebuild
+++ b/dev-python/cairocffi/cairocffi-1.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ppc ppc64 x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/cangjie/Manifest b/dev-python/cangjie/Manifest
index f17004982230..5a74542d4b2d 100644
--- a/dev-python/cangjie/Manifest
+++ b/dev-python/cangjie/Manifest
@@ -1,3 +1,3 @@
 DIST cangjie-1.3.tar.xz 237156 BLAKE2B a94f51df82136edddeeeecb729737a7be1cf4677c86df153ba86b436a404615156e6fe43d6efbb6ae602982763a4cd8ea09850882942a70a3a3737075bde0c01 SHA512 633b0040740105573fe72811c2f763756b67784330520ecadd5e0b24fc51e414f54a71f03444940f20c8a4943a14b65e2f1d18339696e2ea5cf659de8592df2a
 EBUILD cangjie-1.3-r1.ebuild 1051 BLAKE2B 15cc1821f26edf61b15981b57e660db827e56f1fce629d7281524d89a698b4c6b16a734cebd526931801a657e36dd4333b851e7e678080e77f745c0b85fedd59 SHA512 e539a11e9bfa9d90bc2008ae68b9d259110d6c93de62749cd19bcd8df2206b1642b7681a9c87ee8c4e50fccb92d62d0411f2b21044cf2cee1f893c7699b92d54
-MISC metadata.xml 318 BLAKE2B 7ec0867350c50e5dd8bb12e583f3b9fd3d396922facfd592bed942cb6c082ecd6e61a8b80c124bc6f092ecf9a8f1888f2e36165d862b246737c5387ed53bc59e SHA512 052a2ca9b301c41b76960284f760443dff543294b9a8d13de4c2454747e61a2d85e317a1ce08b224442c50822d0a39916aa897ba63c31b4707ebf667fd5ae70f
+MISC metadata.xml 363 BLAKE2B 415d064ff5d99a8e6d9e582de2e2b2f6ee5cb8dcc712b985ea413ed9bcf3150d4fda4f694027103d181a4b5e69208e0cd567086a0b75be8e5364432f4b3fe638 SHA512 e7c5f73f49214e73532031315b85df38cd7f2b4c13c15a70c43406fb000a6b09726c7c294dcc53c537cd75216d5b1ce3355024eaaf06e2bc53a26a6d753b12db
diff --git a/dev-python/cangjie/metadata.xml b/dev-python/cangjie/metadata.xml
index 5249303a03c1..765da01d5bfd 100644
--- a/dev-python/cangjie/metadata.xml
+++ b/dev-python/cangjie/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">Cangjians/pycangjie</remote-id>
+		<remote-id type="pypi">CangJie</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/capturer/Manifest b/dev-python/capturer/Manifest
index 1f455bcfb81f..9b4f8c57f3e6 100644
--- a/dev-python/capturer/Manifest
+++ b/dev-python/capturer/Manifest
@@ -1,3 +1,3 @@
 DIST capturer-3.0.tar.gz 18146 BLAKE2B 345313fa9e58c4e0121c795bd99606f99e46459215ed239da56586da8f8ffab35d97f0bf655258abe9cc45d4abaf7cb0ad2e76054d8c1781be2531ca01b04381 SHA512 3c83c0eade27380304347bdc93df392b2cb84c084e50693993dcca5fd572b8f92d31de43b4a2ddd0a0e8c7eb097629127e86a4860918c507d13b0e2979a04098
 EBUILD capturer-3.0.ebuild 717 BLAKE2B d5ba8786a9d0cfb7fc5c0d4407a283ee550ff252844338865aa34ffa266875e84940cde3f26a65eee836a77e485ae6100e779488f49bfc11de12d1275259c356 SHA512 1fe27fbc52b7513c1c384f1de4114feb9517cbd028de0e77ee0a1e1d54434ef68de9071ff728c34633255dcd4044fbe59494772b6028b261e962d707df63c8b4
-MISC metadata.xml 390 BLAKE2B 6f1ce9de711c22d533fd07fb56b62c6f30c78aea141f78b4946fd9400b6daaff70eec5334aad41b92ffc28829d9edb3f6ef1e2515ab5a18c7e139265043f8a98 SHA512 4df2d5312905b2be06239d81f2274ae4e6517f48d62ec54d5d755bb08cccaaece3531b391f45097590f039db10b8bcf6ff265a28506a0f8096f121fda85e498c
+MISC metadata.xml 372 BLAKE2B d6fbcd2d4d1828f9045207360f275c22e2ab0ba3c6aaadf1c062d24705fa3bbc6950d2ee1045163e6910570a2f420057888b45acb77397dff1e7a860e22c2b76 SHA512 87c5f004eb5626cb4b451036a934180f4e037269f00de69fd02d26fd661e87439b36c08bb80388737ec5b9fcc0a1d2c9fe8f5800e28979cf0c7f6f8aa6898c2e
diff --git a/dev-python/capturer/metadata.xml b/dev-python/capturer/metadata.xml
index 42593b5baca9..b622882856d8 100644
--- a/dev-python/capturer/metadata.xml
+++ b/dev-python/capturer/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">coloredlogs</remote-id>
-    <remote-id type="github">xolox/python-coloredlogs</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">capturer</remote-id>
+		<remote-id type="github">xolox/python-capturer</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/castellan/Manifest b/dev-python/castellan/Manifest
index 8e5d5595c385..20e431c52c72 100644
--- a/dev-python/castellan/Manifest
+++ b/dev-python/castellan/Manifest
@@ -1,5 +1,5 @@
 DIST castellan-1.2.2.tar.gz 67085 BLAKE2B 5a6af5fd91e1371ed9024bf09f31bc5b9e7d55455a61c6c23f62fe84d80f717e83c96f2c72375c37537fe4fb7484b7a16e668f6e37ffa14bfa04f6e1fb69eaeb SHA512 3777180ecc2a2a26c917d89dff28d2ff9e20e1de86249b0e5cda63027394dd8b5a763314135bebba3d2b6194825068c9a7c1c32a4a1e3185caaed74a105aa032
 DIST castellan-3.6.0.tar.gz 70924 BLAKE2B bbd9bf5b411332d5454b4c0d69b63c16b751f8e23c01e723a95acbc722f57fb5f1286c20855b9a9a0e36607737e417f9c5b02a1f7ea4e394c210fa812feb6323 SHA512 d2eb7d7e9ecf29f43d16f0d95dbc18165bde7c9087670fde817fc476a58d57cd3765e9706e4108da99159065748b78dc1f25b9a6ae024359ed98ea5a10dfe3c4
 EBUILD castellan-1.2.2.ebuild 1098 BLAKE2B 054592ce40101386e2795b1aaef7e9e400f72a322183a0f4305ca784975b7962864b0aef6d2d198657b2e8a9ab8e2591a9926281cc2ce11b9c245fe4aa4f5542 SHA512 2f0e198b9920586feb08629468f48c5ed959c2fd69c7c1f2d27bf08f558a05d9dc4bba80099c6ff5fb8c64977f3865882f8d63e6983e3c0fda61fc00ef684d8a
-EBUILD castellan-3.6.0.ebuild 1132 BLAKE2B 9385d102c2af361792cbecea264a5feca68fb440b6e41ad96f6690473a44f23744ed6e99659599d6dc8e1e857b93f4771fc2ef7841a047ef2a8475aa36eaac16 SHA512 46b3569b726b33c273624ae98d6a3da9cffdf21ed2d24413fcd9883cd66c3fef830f8e385ac09a044e28af84b98a9aaca7b149c9d4b17f5a07cbbae6d4846a99
+EBUILD castellan-3.6.0.ebuild 1130 BLAKE2B 0acd7b316afff20a02e8135bc6f09e9f5b95873e98a17cf4c639cdb1e5e2a250fb8ac75e94f31eae1a7bc54361cd4bf2b5430f1a93e1a7c4a609fe3f0745b08c SHA512 ea53e988a2a0e9045e8217be21bc18eaaaac802dc0616fd3c9544936cd1350cbb30e28ab59f30e20f27e75524506c83703670246d146f832e146a89504d360db
 MISC metadata.xml 350 BLAKE2B e268e6f00ea7e2efd2a8b7809772dabcd667292326d31b6dfbf02950b8a2308546aa9c2355143355228067b29deed90d7efb4a366c59315c72f2b0848846ca37 SHA512 1253053f789a6f674d002641a8da8599324736b8d0e58eb80245c64f00d32040c865cb3979c709d9bf27f25aad31a30cf818c3c6806ca8172d6ddceda2c9a02c
diff --git a/dev-python/castellan/castellan-3.6.0.ebuild b/dev-python/castellan/castellan-3.6.0.ebuild
index 382236424dae..036e5deff557 100644
--- a/dev-python/castellan/castellan-3.6.0.ebuild
+++ b/dev-python/castellan/castellan-3.6.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 CDEPEND="
 	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/casttube/Manifest b/dev-python/casttube/Manifest
index 552a6ccdb91c..9f7631cd4c23 100644
--- a/dev-python/casttube/Manifest
+++ b/dev-python/casttube/Manifest
@@ -1,3 +1,3 @@
 DIST casttube-0.2.0.tar.gz 3760 BLAKE2B d4e37fb0e98f2e9197e7e1a78b45109d0319f9b4337ef86d0dcd5797e703960162432990b9c4d26796ce5cc957179023044b86a9b07c8e581d13373889c6c824 SHA512 0ab69a92d49a9095c0adb70fec95011447d1f2a57e7642504d2ab4f19fc5f93b09db0e5d277bf7876311e5f26067a687bde58e3aa12469dcc6778486fc19c836
-EBUILD casttube-0.2.0.ebuild 524 BLAKE2B 489b7f9b235d1a09621092ab2f3b546edc968944bfa531b26022aa3afdfdc791eeb5721ced4ba3cd8f501c6c1722bd17b218bbe6da604f6ba42e0943043f3ce0 SHA512 28adadfa6a157353446927d56a1572cfdadcc8e86f3bf78f1ccc0b5f048cfab5eefa2717cb98c4bc7e51b4292952a04f8bca2814032a5b1879cf5cab3bced325
-MISC metadata.xml 333 BLAKE2B 1a681ac99aee289a919b530bb87037df6fe53b044ce14ce3a9da3cec54a73d7fde58cf01f12678f18397d16b56c9e5bf88d289ddec4469e343d7193502124124 SHA512 a73512d246562e6591eb9c8d13759352cede7f0ae978d02c87bd72b1fe2c9b155cc3908e8489b136387bada61f1257d8e0771e01e26d998b51f9ce13c087ec41
+EBUILD casttube-0.2.0.ebuild 520 BLAKE2B b0f9d8916b2ea17da921bf7c4aad414700e170aefac6dbe74dfdabf143f7c8bcb74cf973611189774f32081200fa0bf4b788f7f3f679f6bcf72d88ba510e8470 SHA512 d916acb4b9995af0214d96ea1135ca98d3a4ef577ae04f1b021a6fddff42b813e0be4dec53903cf9586c1f1a9683893ebe6100c6dd2678114737cd02ea0d72f0
+MISC metadata.xml 404 BLAKE2B 4f128937998e2d21b5d29cfcf16079e3a6137d6fbed6919874b183be9aa7f44dbd78d2bba023ac47a16287f4f321e96fd707864a0f35600bc061da0622daff06 SHA512 597300af2de67ce930821eabac150e377b8d22e4f6606c7771a6af55f7142c69b2d404c24fe5d6471870bab3ae674e1cde360f22e8e620588f10f4acebcbc01f
diff --git a/dev-python/casttube/casttube-0.2.0.ebuild b/dev-python/casttube/casttube-0.2.0.ebuild
index 6d11275e5628..92cc28c48a42 100644
--- a/dev-python/casttube/casttube-0.2.0.ebuild
+++ b/dev-python/casttube/casttube-0.2.0.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 python3_7 )
+PYTHON_COMPAT=( python3_{6..9} )
+
 inherit distutils-r1
 
 DESCRIPTION="casttube provides a way to interact with the Youtube Chromecast api."
diff --git a/dev-python/casttube/metadata.xml b/dev-python/casttube/metadata.xml
index 3ee70120def4..3672312509f4 100644
--- a/dev-python/casttube/metadata.xml
+++ b/dev-python/casttube/metadata.xml
@@ -8,4 +8,7 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">casttube</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/catkin_pkg/Manifest b/dev-python/catkin_pkg/Manifest
index 690e51d0bfc6..d9ca414d410a 100644
--- a/dev-python/catkin_pkg/Manifest
+++ b/dev-python/catkin_pkg/Manifest
@@ -4,4 +4,4 @@ AUX ros_packages.patch 622 BLAKE2B d155ddb5cf084b660914028b89f061be243ff15ca934a
 DIST catkin_pkg-0.4.23-gh.tar.gz 64677 BLAKE2B 7bdd6e748561fd7e1193bdc85373e621bba0f1f80452c85c9d90d3b7cf758a83596376dae841b0ccac56a4ba7732111d464a47bc50cf4d9f29fb607f00ec66d7 SHA512 f388eb9ae588dc3a7b69d20fdba127081c9bfa24f7d5d01fee4cac7b57cfb05beb342a23e96052d4952dcb16be87495a9514edae57ea9d7c9742dce9a8a99dee
 EBUILD catkin_pkg-0.4.23.ebuild 1296 BLAKE2B 568af171ed276b7f7297b80fd002ca8329128fc4d614409ff55bf73c7d7f5ee050922f101daabcf916771b050f159ef0ecf717876230f825c269219b141c1b5a SHA512 a1b0fb2f162ee7d2a04e3e88a73290ba994cacceb474868f93950228228bc7c0db7c9d497e0c66206ebd21ebd77bfc22fccedbedf1ea5e4802ba3c4e3f07ace0
 EBUILD catkin_pkg-9999.ebuild 1296 BLAKE2B 568af171ed276b7f7297b80fd002ca8329128fc4d614409ff55bf73c7d7f5ee050922f101daabcf916771b050f159ef0ecf717876230f825c269219b141c1b5a SHA512 a1b0fb2f162ee7d2a04e3e88a73290ba994cacceb474868f93950228228bc7c0db7c9d497e0c66206ebd21ebd77bfc22fccedbedf1ea5e4802ba3c4e3f07ace0
-MISC metadata.xml 343 BLAKE2B 54c183cdd942eaeec77723ae80d09a3cdd6e40270a3974e80a811fb050289e6f86b8d722fcefb1f37f7c2b8ad1ead3e00f04d49c2a029884daa7c2c33869ef87 SHA512 3ca5d78edb7c7dd2283944af93b7a8b6b3bb176ffa9e0df31881c8b5d66a4abc7e080e11f25f285e0b8735b16ed1598cf032a37d62b7fbb0b5adb3296e9b5862
+MISC metadata.xml 391 BLAKE2B 47b8c26f89a501bb1701d68c80d0027b09cbb52fe46f639f119814fc589c21d7ecce01c5e0cfabfc579c3385fa16b974913b31481f9761573e61c2d14ad94786 SHA512 b9a7270d2ab39db2b7f08c2cc7386424f642ce43e031ee256cb6081f9ac0f9446ab6af0b3cca641a97d3cd88b6eadbae3b127f219a1eda9dd59e1ac0bc2ff75e
diff --git a/dev-python/catkin_pkg/metadata.xml b/dev-python/catkin_pkg/metadata.xml
index 23a932120133..3be7e345ed20 100644
--- a/dev-python/catkin_pkg/metadata.xml
+++ b/dev-python/catkin_pkg/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-infrastructure/catkin_pkg</remote-id>
+		<remote-id type="pypi">catkin-pkg</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/cbor/Manifest b/dev-python/cbor/Manifest
index 02cc8acd9315..a6edd8ab5dcd 100644
--- a/dev-python/cbor/Manifest
+++ b/dev-python/cbor/Manifest
@@ -2,5 +2,5 @@ AUX cbor-1.0.0.Fix-broken-test_sortkeys.patch 1621 BLAKE2B 37336807f72b9bef9be36
 AUX cbor-1.0.0.Replace-deprecated-logger.warn.patch 4012 BLAKE2B 443f5a7bf3b30b8b3b313321c01cf48ffb09326f38f524c45dc2cf33de497097d8276f7f4add58b981fac6a6322c8ae5e0919ba854912af3babe4906bb4a4be9 SHA512 02b8bae3c269808884d9c6f23e3ff429f6e11b6ed3d41da0f2e2c3f69569af434aacd9e6c9115c65869b499c32d7cddc20de5a721d89ea7e7ed9c669348ed276
 AUX cbor-1.0.0.zero-length-bytes.patch 361 BLAKE2B 5422309b2a1f40e6553107380548396cceaf142f09eaa776d415690e71bbd5c7d6899a2c38e43ee479a539995e4c1a3816467d19a9ecfdf084915a6047f20e4e SHA512 cc1d11a5e8169271d3a35a41f850e62de8ebab0d3e2e23e480c3aef08c2a77a4670173523564c8c3abb3f021565acc088ecc3a0e4957c0ccf4a7e0a41c7aeddf
 DIST cbor-1.0.0.gh.tar.gz 25541 BLAKE2B dc5491235fee79ad15a8b92aafef2a690a407dfb98792e88b2e87fa7c354277b997ac314dc38279168f50c52f922de4bfe330b860126d4c5b836c019b05a1aee SHA512 88471b1c9c9a4128a4098194e17a4322ea2a01624ae1ffa9c33e433da31a089c45f4b64472d36620797488a451c16771c213b2b9a9ab711232c6658da4cd310f
-EBUILD cbor-1.0.0-r1.ebuild 1444 BLAKE2B dc3e777968a65352072ac789d1e5b067fb7b6be532c58ae461dbc587959b002403498ca40fcad5ef0a6310cc9b44eb3b55775ad508aac05653e31088a42f5ec5 SHA512 58312bf09df9f6c5984970a9971f882b610dab8e40abb51bca36d8b09ab84522b3e105586688e22b415eee2901ca5c0e1d06c1d0240e22cf3cb6a010126e837d
+EBUILD cbor-1.0.0-r1.ebuild 1249 BLAKE2B ab226d978298590e6bd4ec1dae1156655c4ea7da4bd110178de30122a2f558970916a31b0c1e377a5bc999876783a81a6eda753b75403910e0a1058800bc9d75 SHA512 499c9d8c55e64871fbdf9c1851339ad6457a5bdeb695aa8e0f69e6fa8d61e10ec407be6359efabf0b3f2b5028820736aeafc66009d72d59bee30ffde40c6460a
 MISC metadata.xml 999 BLAKE2B 46bdaf98ffe5045cb76897112d80887e3b96f6f87b864cc4af8217b918351e37e87a06d36f2a8028a69f75198904228b275243bf6947947218ddcac67e4d5626 SHA512 c79ba66b6fdbfc112de321697eaacaa6c2f5ca40cdbeca4c5d606e3b0c76371bb64d0e62270a3c1315ff058f5f66b5515a214f8e1e4214b1213790262f24efb1
diff --git a/dev-python/cbor/cbor-1.0.0-r1.ebuild b/dev-python/cbor/cbor-1.0.0-r1.ebuild
index 28ec5ba34fcd..cb0dcf6748e0 100644
--- a/dev-python/cbor/cbor-1.0.0-r1.ebuild
+++ b/dev-python/cbor/cbor-1.0.0-r1.ebuild
@@ -28,13 +28,8 @@ PATCHES=(
 )
 
 python_test() {
-	distutils_install_for_testing
-	PYTHONPATH="${BUILD_DIR}/lib" \
-		"${PYTHON:-python}" cbor/tests/test_cbor.py    || die "Testsuite failed under ${EPYTHON}"
-	PYTHONPATH="${BUILD_DIR}/lib" \
-		"${PYTHON:-python}" cbor/tests/test_objects.py || die "Testsuite failed under ${EPYTHON}"
-	PYTHONPATH="${BUILD_DIR}/lib" \
-		"${PYTHON:-python}" cbor/tests/test_usage.py   || die "Testsuite failed under ${EPYTHON}"
-	PYTHONPATH="${BUILD_DIR}/lib" \
-		"${PYTHON:-python}" cbor/tests/test_vectors.py || die "Testsuite failed under ${EPYTHON}"
+	"${EPYTHON}" cbor/tests/test_cbor.py    || die "Testsuite failed under ${EPYTHON}"
+	"${EPYTHON}" cbor/tests/test_objects.py || die "Testsuite failed under ${EPYTHON}"
+	"${EPYTHON}" cbor/tests/test_usage.py   || die "Testsuite failed under ${EPYTHON}"
+	"${EPYTHON}" cbor/tests/test_vectors.py || die "Testsuite failed under ${EPYTHON}"
 }
diff --git a/dev-python/cbor2/Manifest b/dev-python/cbor2/Manifest
index 64aa04e49ce5..0f08ff132c80 100644
--- a/dev-python/cbor2/Manifest
+++ b/dev-python/cbor2/Manifest
@@ -2,4 +2,4 @@ DIST cbor2-5.1.2.tar.gz 73247 BLAKE2B de033651c0483aee4bb3bb31f9a997bdd6329c2941
 DIST cbor2-5.2.0.tar.gz 81467 BLAKE2B ac35cf682f15eba2c2bff81f562fe2f22906ab8da39c04cbf65f403eeacb5e640e200b15a8cca0d7eede1d0106cd8674640b3093d166a4414a2d42452a374322 SHA512 101aed37c3921ace2f4a5fbb9964ddd2ec2ffcd23fb1a9f838b2f8925f17ffaf5eb39a40b5426e176f0c97a2ba1d3a045e96ceb53312b283101900eddacc6af4
 EBUILD cbor2-5.1.2.ebuild 793 BLAKE2B ba87377c387ec8f77e743d8238b00d507a2cbae2b7e268f35c0c663b51abb27eac8bf237dcca360176be001d1708ed3b323baa5d4893bd89d19f24cefba1ce23 SHA512 197843e9efb07fdd5ca872772ef0ce60303780a33bc6cb8b7f767158c32d2e1998ce695f9679205442710d07efc229ed0336adbb1e0a80e2e7aa4d68950aeeef
 EBUILD cbor2-5.2.0.ebuild 774 BLAKE2B 66da689a1ffe49d3a7bcd227c5a5d3557325dea7d4729b5e4fe00e3bf3fdd342f598867b60e860dc707309cbdfb0b75e7cefd7c8b6760e584574062aa7ec1afc SHA512 d6dc2d4c2cade15efba3902578fc7f28e8fa72665efe780f71738b41ca7974535635255670c545faaaf9873e09d4cb5d7b4c78ba44c3820ffe67bb9f82d82402
-MISC metadata.xml 894 BLAKE2B b6180631eee31ff627a9ec598c98db018c8445bed530477b2c40da412bc61cace8a22073b1b386965a8817c7b25a976b1ab535f31d99279813e4a4ea0a7b5fb5 SHA512 1ab12e51dc2a38646f3a8ff334e5833a0e1673664e9ba26bc8d9f7b0feb9b69d0b32ff232ea363d804483c18a1b23c9cd1a8dd02a18b7f796db80f383ff55c09
+MISC metadata.xml 893 BLAKE2B a56c40664c6526d741a1f4e6be15cb582e0a0402182545262e3f1f489441e94a2c17072c01797e95cbea02d40b2d6addc14027596e4cd2fa49ccb4cb0feadd09 SHA512 1695d3be04f9cb86ea83f3676f5e8628b196b7044bee019ba8ce234500ee1501d013144155fe86ca8f21a10abb35074cd98fbec7da9db7f33c1046229fca9f5e
diff --git a/dev-python/cbor2/metadata.xml b/dev-python/cbor2/metadata.xml
index 77d7b556b447..b7664ff5cbae 100644
--- a/dev-python/cbor2/metadata.xml
+++ b/dev-python/cbor2/metadata.xml
@@ -10,13 +10,13 @@
 			<email>bolson@bolson.org</email>
 			<name>Brian Olson</name>
 		</maintainer>
-		<remote-id type="pypi">cbor</remote-id>
-		<remote-id type="bitbucket">bodhisnarkva/cbor</remote-id>
+		<remote-id type="pypi">cbor2</remote-id>
+		<remote-id type="github">agronholm/cbor2</remote-id>
 	</upstream>
 	<longdescription>This library provides encoding and decoding for the
 Concise Binary Object Representation (CBOR) (RFC 7049) serialization format.
 It is implemented in pure python with an optional C backend and is compatible
-with versions 2.7 through to 3.8.  On cPython>=3.3 cbor2 can use a built in C
+with versions 2.7 through to 3.8.  On cPython&gt;=3.3 cbor2 can use a built in C
 module for performance similar to how pickle wraps the _pickle C module in the
 Python Standard Library.
 	</longdescription>
diff --git a/dev-python/cffi/Manifest b/dev-python/cffi/Manifest
index 44a485cb741c..9fb26cdb5b64 100644
--- a/dev-python/cffi/Manifest
+++ b/dev-python/cffi/Manifest
@@ -1,5 +1,7 @@
 AUX cffi-0.14.0-g-line.patch 9258 BLAKE2B a57cb8836dfcfb1124b1b72c38fb4c02d231fc7116c2de4b970e6423d037d1aa382173a4bebb9dafab0d690df485a64d824aafcdb16e31d01b391c25f4c239eb SHA512 335758de740050256af711e688072bbe4ac835551437bc2fbfd4dfaf5492efd5c722bca3bd8e5747bb0a88d3e7e6f82b78f85f5f42a4f11efb7b2f6c3ae4a492
 AUX cffi-1.14.0-darwin-no-brew.patch 568 BLAKE2B 43afdb086a0385e913f287bc5c1534df1b881058cf7efdfdecd9df063c27ebd26683edad43e3010e1c01d9d93c5d98785ffbe65a5e3317d96ebb6a3132aecdab SHA512 75335871b8f98223e0247defc3d08f1c10ebed58c79790826c4e39057e6757b8bdc07e2773ad25482ed17c13480b3e72b3667e48697a456ed0cc4a39e7d91b79
 DIST cffi-1.14.0.tar.gz 463065 BLAKE2B 4d1e8a92241db801848ef8bd05ea15a31c7f61ea426ce4da184aff00df786348d2c76de9dc48898c814478aed9750b665868df24ad39435062cd7e1c84163e52 SHA512 4c5451eeede1d48a8f4b40e25b845ad1863b8bf3bd39624e6c693c2800d89a13efedc4c43b37e317a035613bffc2e3fd5f7e583c46cb283cb5cb930356f86253
+DIST cffi-1.14.4.tar.gz 471302 BLAKE2B 9722e517c99b6df239f59235baea76957900dc8566ff04c8d1fd367d20ad5f5437212bdb5e4e98aca303121e79411634fcb5e4e72179ecb3007d4f0eee68c9f2 SHA512 b2c54a805ead93c5dd8531d7f0f7e4b44be8f07bfcb1af2f19eb6d325b4e846cae23f16a5bcc777ba019d1213f013611614ade798e195f5b4f6b7904c9cb6e3a
 EBUILD cffi-1.14.0-r3.ebuild 1387 BLAKE2B 3b57da73b7b31c1435e3168987cd4a4ec45beaeb0a0d852eee2e2e8a09ec59a04cb2816d964e9dd957746b9dcb879ee16f661db0bcd08538aea50df83fb4c313 SHA512 353f6db5ae87c5e626ef49e8cd1ece7e8d1437ea2085006b61caae8f03a46e21b22245339fc972d879c384cbb6f895d4d41b1ad29c882243d49d1c68fca459de
+EBUILD cffi-1.14.4.ebuild 1562 BLAKE2B c64f7781abab802b62f2c44515caa29118d256aa66e17b8c1d58de1f7316dc211dd6ad3091cd979e43a683bcfbf4af8b3ef0a72ded9a009a1d065d760bdb5a6f SHA512 15e218bb8b53eadc878fa93e92f1c5747f67d6beb54c85b1c072aeb76061b008fe100ca8de8facefaa572048db7eb03ab4b3ed26a98ba75ec0358d0e5dd3c89e
 MISC metadata.xml 317 BLAKE2B b6416209bd2358c42c2be3bd228238b401bf126919b6e7371d83d7cec8cb55a40f89db562701cc8f3dfa904e225426881b22ff1d3b72085365b5caf9b8c6a403 SHA512 0744ca7b98b2ebe2985bf2a81a337d09be62cfaa51f8380bac52f8d30941e997f09be20e28caf6967226a71369003cf35977790aba56ed0d469cc490cfa089b6
diff --git a/dev-python/cffi/cffi-1.14.4.ebuild b/dev-python/cffi/cffi-1.14.4.ebuild
new file mode 100644
index 000000000000..424351b6817f
--- /dev/null
+++ b/dev-python/cffi/cffi-1.14.4.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# DO NOT ADD pypy to PYTHON_COMPAT
+# pypy bundles a modified version of cffi. Use python_gen_cond_dep instead.
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="Foreign Function Interface for Python calling C code"
+HOMEPAGE="https://cffi.readthedocs.io/ https://pypi.org/project/cffi/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-libs/libffi:="
+RDEPEND="${DEPEND}
+	dev-python/pycparser[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+distutils_enable_sphinx doc/source
+
+PATCHES=(
+	"${FILESDIR}"/cffi-1.14.0-darwin-no-brew.patch
+)
+
+src_prepare() {
+	if [[ ${CHOST} == *darwin* ]] ; then
+		# Don't obsessively try to find libffi
+		sed -i -e "s/.*\-iwithsysroot\/usr\/include\/ffi.*/\tpass/" setup.py || die
+	fi
+	distutils-r1_src_prepare
+}
+
+src_configure() {
+	tc-export PKG_CONFIG
+}
+
+python_test() {
+	"${EPYTHON}" -c "import _cffi_backend as backend" || die
+	pytest -x -vv \
+		--ignore testing/test_zintegration.py \
+		--ignore testing/embedding \
+		c/ testing/ \
+		|| die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/cfn-python-lint/Manifest b/dev-python/cfn-python-lint/Manifest
index 81f52719e23b..bc85d4b626e0 100644
--- a/dev-python/cfn-python-lint/Manifest
+++ b/dev-python/cfn-python-lint/Manifest
@@ -2,7 +2,9 @@ AUX cfn-python-lint-0.30.1-tests.patch 621 BLAKE2B 7b4d457c56f32799c0da0e1e1f655
 DIST cfn-python-lint-0.39.0.tar.gz 5096885 BLAKE2B 50fe41b1dd533c10a011d4729e78241d0153389cd9eda2c887181b62341d5ff38eba223606c2f9e725dfb1a6c934b5f044a236fb2044368a413d434eefd097c4 SHA512 d48116aeefd996943aa1408c76574ec137e96447c7b8950bb1726ff00819611ad6179a8af820ee4d16f493455cf55110e90b78b6d4325036e955529dedf7807f
 DIST cfn-python-lint-0.41.0.tar.gz 5192401 BLAKE2B 1f4c491446b552272cb9fea46d9d07ca559a4ac7526730663b0824d3ba631a333128ca45b2dbbe637286b0495d0198c45ce19b662bb1448125c919ab4fed57b1 SHA512 3ece6a39666dee395c78fed8e23d9228ec7e0cca67d9216b709300bccf48605903252202cb7d05e7c9b9122be11ed4ca39540aba891359633f1772af72a73fa6
 DIST cfn-python-lint-0.42.0.tar.gz 5307120 BLAKE2B f54c4ae7fcefa6b56714a0cfdf89d9fbce20078daac0784c6169dfbe1a110da699e37b526f306ed9734504fb3387c660ccb997748579b65afe01438124361383 SHA512 ce2e6a0031e3d67953da6f5dc96f0b155f1a1144bee75a8a476490eca69fdb700c8a3d6fd89b0afa4c8d724956e5f86bc48417035d7c94f3eed00abda47f9931
-EBUILD cfn-python-lint-0.39.0.ebuild 1455 BLAKE2B 8fad045ceffd2d4f2bb6861d71cd4e8320023217bf27b406736d347b4d5160b263b1796b4d50425cdbecff14846638c339be68fe1ac3451ebd452db938742742 SHA512 a19f7a67f1c8811e10cdcce49142ddd9360464f28fb0a9fbfbd7eafa94012cae6cb0eb757e3a010adfb29f3471395fc72fcc23b91422f8315a505cf629e169d4
-EBUILD cfn-python-lint-0.41.0.ebuild 1457 BLAKE2B 7806e53e56ea8376013c4f137134ddba64a4795b17bb7ffbc1f96eb4c77320fc623bb1e8bf95ee0e80e02acb5b53860362d646973fe54f1990dc03b9c8b878e9 SHA512 e7a88d7294729d399888b8c5aedd06a2b324c35fdfcbd6406f165a005587729c20820589205086c99d11f21e7700b7ba693a0a1b1c9d4840ed482887e2a8fb92
-EBUILD cfn-python-lint-0.42.0.ebuild 1457 BLAKE2B 7806e53e56ea8376013c4f137134ddba64a4795b17bb7ffbc1f96eb4c77320fc623bb1e8bf95ee0e80e02acb5b53860362d646973fe54f1990dc03b9c8b878e9 SHA512 e7a88d7294729d399888b8c5aedd06a2b324c35fdfcbd6406f165a005587729c20820589205086c99d11f21e7700b7ba693a0a1b1c9d4840ed482887e2a8fb92
+DIST cfn-python-lint-0.43.0.tar.gz 5329573 BLAKE2B 94ea659e3df02fb3b269984cdf6d879d0e2719aadf3c95f15c2982606cde220493da0a7e34e16538170f96a2611e8693dbad73033bd842e91de613c8cdcb2009 SHA512 fdde4cdffd01d1e8011f44b4eaec0bfe28f2189f53bdc3054d563cf4657c5f828751d8a12e2050d8e04687fe05bf768b5db8cbd27d2ed1c5e0d8967ede70d0ae
+EBUILD cfn-python-lint-0.39.0.ebuild 1339 BLAKE2B 0493cbc1361e663531bb80becb0e09edb3e5d8da4fa6258748e68061ba6765c1e324894000d8c5daa110680714d9ea045ff79bba27b3218e65a115ec1d0750e4 SHA512 75ff46b3bf5265045fbddb5fc0621b900767c999a03abcdc4bd3925b391927876c98431fd5bcb4199e261fde46cdce73dd555f795e7e37419a0ee800be461098
+EBUILD cfn-python-lint-0.41.0.ebuild 1341 BLAKE2B ac10bcae4e7c4cca570f4fa1e66f35038fd340fbe6d69388bf6300ae7cfa275610f1a2f239cad3b6ab1bf1ca8308a0805c91db8896f5eff612e695ad179b8f6a SHA512 eb21732bf1dbd44eb434f6b056c61c04b82f67f685b62709b9ccb16d37990f9cbaccf828021fd27fdc518707c14cf7977133ba3a722376bf53220252b4695a06
+EBUILD cfn-python-lint-0.42.0.ebuild 1341 BLAKE2B ac10bcae4e7c4cca570f4fa1e66f35038fd340fbe6d69388bf6300ae7cfa275610f1a2f239cad3b6ab1bf1ca8308a0805c91db8896f5eff612e695ad179b8f6a SHA512 eb21732bf1dbd44eb434f6b056c61c04b82f67f685b62709b9ccb16d37990f9cbaccf828021fd27fdc518707c14cf7977133ba3a722376bf53220252b4695a06
+EBUILD cfn-python-lint-0.43.0.ebuild 1341 BLAKE2B ac10bcae4e7c4cca570f4fa1e66f35038fd340fbe6d69388bf6300ae7cfa275610f1a2f239cad3b6ab1bf1ca8308a0805c91db8896f5eff612e695ad179b8f6a SHA512 eb21732bf1dbd44eb434f6b056c61c04b82f67f685b62709b9ccb16d37990f9cbaccf828021fd27fdc518707c14cf7977133ba3a722376bf53220252b4695a06
 MISC metadata.xml 596 BLAKE2B c9937cb001e177c18c65bff8b70940d241e54f58aae3818071510f1c73540fcac6c532c8700b4904d4e2c9382f8a5288a2cb8745e174b8ac0a4edfe114d78ff5 SHA512 40c20431d8132ee97311a23bba87d6b408297410573c191f8fc43282bd156884adc25b6ceb6f2168d3456d535c4d82fb3473dd9025bda276f6aad829f68a8e37
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.39.0.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.39.0.ebuild
index 64b6dd0c57c8..2ee32af274d3 100644
--- a/dev-python/cfn-python-lint/cfn-python-lint-0.39.0.ebuild
+++ b/dev-python/cfn-python-lint/cfn-python-lint-0.39.0.ebuild
@@ -33,7 +33,7 @@ BDEPEND="
 	)
 "
 
-distutils_enable_tests unittest
+distutils_enable_tests --install unittest
 
 PATCHES=(
 	"${FILESDIR}/cfn-python-lint-0.30.1-tests.patch"
@@ -47,9 +47,3 @@ src_prepare() {
 		-i test/unit/module/maintenance/test_update_documentation.py || die
 	distutils-r1_src_prepare
 }
-
-python_test() {
-	distutils_install_for_testing
-	"${EPYTHON}" -m unittest discover -v ||
-		die "tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.41.0.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.41.0.ebuild
index 8fdc39d88ec2..a83123122bcb 100644
--- a/dev-python/cfn-python-lint/cfn-python-lint-0.41.0.ebuild
+++ b/dev-python/cfn-python-lint/cfn-python-lint-0.41.0.ebuild
@@ -33,7 +33,7 @@ BDEPEND="
 	)
 "
 
-distutils_enable_tests unittest
+distutils_enable_tests --install unittest
 
 PATCHES=(
 	"${FILESDIR}/cfn-python-lint-0.30.1-tests.patch"
@@ -47,9 +47,3 @@ src_prepare() {
 		-i test/unit/module/maintenance/test_update_documentation.py || die
 	distutils-r1_src_prepare
 }
-
-python_test() {
-	distutils_install_for_testing
-	"${EPYTHON}" -m unittest discover -v ||
-		die "tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.42.0.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.42.0.ebuild
index 8fdc39d88ec2..a83123122bcb 100644
--- a/dev-python/cfn-python-lint/cfn-python-lint-0.42.0.ebuild
+++ b/dev-python/cfn-python-lint/cfn-python-lint-0.42.0.ebuild
@@ -33,7 +33,7 @@ BDEPEND="
 	)
 "
 
-distutils_enable_tests unittest
+distutils_enable_tests --install unittest
 
 PATCHES=(
 	"${FILESDIR}/cfn-python-lint-0.30.1-tests.patch"
@@ -47,9 +47,3 @@ src_prepare() {
 		-i test/unit/module/maintenance/test_update_documentation.py || die
 	distutils-r1_src_prepare
 }
-
-python_test() {
-	distutils_install_for_testing
-	"${EPYTHON}" -m unittest discover -v ||
-		die "tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.43.0.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.43.0.ebuild
new file mode 100644
index 000000000000..a83123122bcb
--- /dev/null
+++ b/dev-python/cfn-python-lint/cfn-python-lint-0.43.0.ebuild
@@ -0,0 +1,49 @@
+# 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=rdepend
+inherit distutils-r1
+
+DESCRIPTION="CloudFormation Linter"
+HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-python-lint"
+SRC_URI="https://github.com/aws-cloudformation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.25.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_resources[${PYTHON_USEDEP}]
+	' python3_6)
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+	dev-python/junit-xml[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install unittest
+
+PATCHES=(
+	"${FILESDIR}/cfn-python-lint-0.30.1-tests.patch"
+)
+
+src_prepare() {
+	# unpin the deps
+	sed -e 's:~=[0-9.]*::' -i setup.py || die
+	# requires git checkout
+	sed -e 's:test_update_docs:_&:' \
+		-i test/unit/module/maintenance/test_update_documentation.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/cgroup-utils/Manifest b/dev-python/cgroup-utils/Manifest
index 8e871a61113e..37a5f899a2cc 100644
--- a/dev-python/cgroup-utils/Manifest
+++ b/dev-python/cgroup-utils/Manifest
@@ -2,4 +2,4 @@ AUX cgroup-utils-0.8-tests-builddir.patch 644 BLAKE2B f2ff44542b2883f33aebb43bea
 AUX cgroup-utils-0.8-tests-mountpoint.patch 713 BLAKE2B 1f92579b823ad8f0fd26df19226017d5c81a781e4eb368bcb7efcf1cc7aa0930e150f26d237fb3134e583079f8db42642ae366f3e4d9630d90c137f395bc20e9 SHA512 477c8a48bb82a1470ed5afe8b6d48963247ef6b7617e1b316547372fe785661fbd59dfb713d9e1dc88bd55a3e9b8b2593b92eb2ccc3dfbebda83649cb611b9c3
 DIST cgroup-utils-0.8.tar.gz 35260 BLAKE2B 11187a917d5159699eb46fb67f5057eb16317f86c32e6471d8543955e1d40107663517395226ae75e3b0739fb59c7521590a3d04a5d818b151970cbea559dee7 SHA512 fcc31fb6d2bdfa761c248553d056ea1bdcf697ae9ab8ccdc895feefdec7bc4e560bf2352968866b3064548545d98527d2a4092d4c8d2f335ef76e3c4b721bcf0
 EBUILD cgroup-utils-0.8.ebuild 644 BLAKE2B 5f623dfe7253bcdbcb96325172ae5cf97bcfe8f25b3e1bfae2f3edb7686a806e2bf120864233aec7f461d209180a0ccf44f28d287c5bf5e72d05798d33ceaadd SHA512 b68b403f2db8bd5f01b91e2eb98c57374e27a35e26c08c308e97c15e73d329d1c4b2ede634070a969a9073196808e80c049c49326f7c39d12ac0b2b579f22719
-MISC metadata.xml 451 BLAKE2B 062e0315750415c2f65864206c4a9fb474131476a22f13248bf052f89fe275cb8d2deb3701b13944876490610fb15d6772749e04fa853475ea86eb0a775a48c9 SHA512 79e6b6e146a3cb3ad322dffe5a299ed92c800988b943d9fb2080ba2c0572d5adf376948f7f88c529b7d98db3952e295fb2528f235025c841f0df7ed7d01e4484
+MISC metadata.xml 485 BLAKE2B dff6b45015747c03cec01553724601db09e8eeda8f3d11736d3828df809d510ae5a75a9e82c4dda195a8288cfe7cec081dce5ade8b74c17d3c177461276f2a35 SHA512 2b24b2adddf3152c71e8564ca5ef2a3f1dea2afb639c846c33dfc4991c59d83c1d0e9b73b08d45890042d8e23ce2f5fd1f8f3b4a0189737fab9ded6b74261c73
diff --git a/dev-python/cgroup-utils/metadata.xml b/dev-python/cgroup-utils/metadata.xml
index e4905993c028..6e335f41f8cf 100644
--- a/dev-python/cgroup-utils/metadata.xml
+++ b/dev-python/cgroup-utils/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>blueness@gentoo.org</email>
-    <name>Anthony G. Basile</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">peo3/cgroup-utils</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">peo3/cgroup-utils</remote-id>
+		<remote-id type="pypi">cgroup-utils</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/chameleon/Manifest b/dev-python/chameleon/Manifest
index 12c2582a64e5..f5cb5f0bd5ba 100644
--- a/dev-python/chameleon/Manifest
+++ b/dev-python/chameleon/Manifest
@@ -1,3 +1,3 @@
 DIST chameleon-3.8.1.gh.tar.gz 137012 BLAKE2B 20b0a830ae932ad0e8b28015b233049ee78a74f06f26d2652ee297f366eda6f54fa7650fa20a3c4da3802a2466c0f6a4c4cdfd9608761a20986c86673c61a242 SHA512 d4a4b3ac0b59865a7ea1d9ede7f08d991296c1d08a48c7290b9e2864afa6527237d8dee604114918f3b5035f2cc915bf6218d0758ebcd393f2103bb0751f6ea2
 EBUILD chameleon-3.8.1.ebuild 486 BLAKE2B e33b7e2215e3d23e7002c1a29097413e6cb5f1191b68f96670aadf87cb297b70111f88fca3bbdbce84dd5506683c33ca68aa9b5f2b4401e0315f1a1dbdf6a74c SHA512 e636a3e52fe294c971e7a95559b7a7002611131727b250b7983828924bae1af8050272e89dcf35979b19ab5edc7e0e3dd70d7228a6f404ab158ceb0e187fc6af
-MISC metadata.xml 336 BLAKE2B 977479a6095d95c4e347fcd892dee85a6b7212257ae16bc4f5b399ab9f640e128251a5f4c7dfb5a986d59ca055d0b8a672043fdacf977cca9657f704039eab1c SHA512 be8a4e640ca8c5dc78a76defb915e5bf2eb8f9be17cd6d7e70df390f17916c05787ece4abe97a8d0e6a4a95648c59a986b2f11f27633f39be9483df365df7074
+MISC metadata.xml 392 BLAKE2B bc9c178a8aa25e5dda53e20ec371ee84bbe8f75e17d426b5c9739a8d438aedbe7329d085c311ce2e5e5ff6d54b4ac676654608baf7ffed39be033382c1c075c2 SHA512 d9bac397232f6ad4c24b72c75dd97f57fad3072f0ba4c898ad75137d6c88e5ad1b71b5b89b251f1cc5d2e18e189f7a41e9cd7a6e369e5992b88594ad8f6a2e33
diff --git a/dev-python/chameleon/metadata.xml b/dev-python/chameleon/metadata.xml
index e56e490aa9a4..8c59eb99923a 100644
--- a/dev-python/chameleon/metadata.xml
+++ b/dev-python/chameleon/metadata.xml
@@ -8,5 +8,6 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">Chameleon</remote-id>
+		<remote-id type="github">malthe/chameleon</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/chardet/Manifest b/dev-python/chardet/Manifest
index 0b20f817f7ea..00903b006db1 100644
--- a/dev-python/chardet/Manifest
+++ b/dev-python/chardet/Manifest
@@ -1,4 +1,6 @@
 AUX chardet-3.0.4-pytest-4.patch 802 BLAKE2B 64992866c2f101b41f525a0f8cf642774850211f434b471dcfa5aaadcabd5ceb573d5b902f6cdecc2f651a71dc8955204f13beb8a5261d4d0ff3aa6703a4266d SHA512 ca99abb30e8e221b43b7467cfa385c0abb16addd4befd149e35208278a25faf07dd99edd20595be4d0d0d0afdf81602b47e0110f4e9335ef90f5b4c41b54b0ab
 DIST chardet-3.0.4.tar.gz 1872214 BLAKE2B b93e2d3e0b5a5c35affa5e3ee661323029f79837a1222d8f69db72911301d9490c9788d2effc577eeeb2a50334cc855afc4bdf4b8dbafb143fcc411d93b824a9 SHA512 b433ea0e15e200df968e6d61c671c42fbd77e519eb033035c4a5c241e1f98e1dfaea6747af632788507583b3ef85b00d510b3f6ef5cf58589ceca1b3a088b357
+DIST chardet-4.0.0.tar.gz 1923933 BLAKE2B 10dce34cbe6f01536a526931510ed625bc5062335e9419e24c9e48d5697ebbe70dcc54ffaa976ec153340cc74c3086627a3b1dd9e34be32c89a9a81e83fd70d0 SHA512 cb0e052fdd9fec251ebc6eb3f31ca95ece017f2bfa99122997f989286988058ed9688e49d00631c63d8e4e52da1050e23f02b28d0e739aee7302b24c8808370e
 EBUILD chardet-3.0.4-r1.ebuild 878 BLAKE2B 0cd873d6b789416d7932f30214a2270b07b1fda9b8056fd505b372ba0634255f182277bbd902d8defc8f2e4ce2beecead4369fe92e82ba1d7f6785d53064daec SHA512 b31e19f7de72f2ef3ec7bf8206354ad0af2f727ecae97383b0e6418291e5662f70576b1c19af5b7457d090085a8e9a3fd4eac130a79857c536d6c53569572df2
+EBUILD chardet-4.0.0.ebuild 707 BLAKE2B aefb905643199a69a74f38b3a069ea39616515eaf53130971540e286d92386935e24ba9baa1f7d68187c7988a68ffe17011dea69bd6949237077fa733d6b29ae SHA512 69c1aa75453599965f5c9ec14f918172e85c7ec584b4b63216651fffc8d370e8ea56dcc5f4ee9b6a8cf0173eb13a792efef0bd1735410a93b5840bfb372f1b58
 MISC metadata.xml 377 BLAKE2B 8aa19a889e96303024d469c969a9e47613cabd1456b0e21888a02a091049e09a53c6faa3d0e128b5ea21b68f521cede9cf09b570f2fba7a4299187a44e40b018 SHA512 c48c3874a248049fc2845d0a64ee5b94c705ef58158f882f30bbdc561f311a7203cd8979e067a5b0f3f034c95cc4b6da373cea6efc9616f3dabc574772874650
diff --git a/dev-python/chardet/chardet-4.0.0.ebuild b/dev-python/chardet/chardet-4.0.0.ebuild
new file mode 100644
index 000000000000..029b82e3b4bf
--- /dev/null
+++ b/dev-python/chardet/chardet-4.0.0.ebuild
@@ -0,0 +1,23 @@
+# 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,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Universal encoding detector"
+HOMEPAGE="https://github.com/chardet/chardet https://pypi.org/project/chardet/"
+SRC_URI="https://github.com/chardet/chardet/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+
+BDEPEND="
+	test? ( dev-python/hypothesis[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/cheetah/Manifest b/dev-python/cheetah/Manifest
deleted file mode 100644
index d4fa59685ad9..000000000000
--- a/dev-python/cheetah/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Cheetah-2.4.4.tar.gz 190989 BLAKE2B 567aee718199021c3de725376da37b2f28081cf8741d1af201f7e6e88e026f460c10f3502463d58285a1340e308c718f709d437185f99f22c11f76c586ba4a60 SHA512 11b8cbf7d71789d6ae83596b133ddbe0bf1ccf2bca4c59562e7cd1d9bb75fa9d3208c0021d7d77edafdb03fd399cf1a26c003267fbffb94f27bf4457b0f9234c
-EBUILD cheetah-2.4.4-r1.ebuild 1214 BLAKE2B 6a34089dc87e98d3342e1536e7f856e78aa01525e09eed52b9477fe750227b10a0c0ba8186d29d71c3ad7f145c3893c172c71ba56cf39d82512dce3e5c4e62ea SHA512 bf202f762bf10013cce717e4deec88f9b788fd25813f20fed0a2d2e6c3dce29951cb3f0e5477402ff397a4a2bb81d06b384eca300dcb4f09d831bacfcae45954
-MISC metadata.xml 661 BLAKE2B 2808adeb2392976f9343fddfeab9f9494ba8eb4690c77b71c4f66434459d01eb8755f7ff1c97669f84a9e8e4b158fae2d0b69d3b2fccd6f4dacfb0e67bcbd629 SHA512 7c0f9ab56f056a5b878572b16991039ef79e009a50afc44e7e9745051d58d99f4c3f7c3c427f8a165a9a54e76983cb9cc5cd16f0e3629d85e5288b71eb0f38b6
diff --git a/dev-python/cheetah/cheetah-2.4.4-r1.ebuild b/dev-python/cheetah/cheetah-2.4.4-r1.ebuild
deleted file mode 100644
index 7af0e545a7da..000000000000
--- a/dev-python/cheetah/cheetah-2.4.4-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_PN="Cheetah"
-MY_P="${MY_PN}-${PV/_}"
-
-DESCRIPTION="Python-powered template engine and code generator"
-HOMEPAGE="http://www.cheetahtemplate.org/ https://rtyler.github.com/cheetah/ https://pypi.org/project/Cheetah/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-SLOT="0"
-
-RDEPEND="dev-python/markdown[${PYTHON_USEDEP}]
-	!dev-python/cheetah3"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( CHANGES README.markdown TODO )
-# Race in the test suite
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# Disable broken tests.
-	sed \
-		-e "/Unicode/d" \
-		-e "s/if not sys.platform.startswith('java'):/if False:/" \
-		-e "/results =/a\\    sys.exit(not results.wasSuccessful())" \
-		-i cheetah/Tests/Test.py || die "sed failed"
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${PYTHON}" cheetah/Tests/Test.py || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/cheetah/metadata.xml b/dev-python/cheetah/metadata.xml
deleted file mode 100644
index af1e88f2ab32..000000000000
--- a/dev-python/cheetah/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<longdescription>Cheetah is a Python-powered template engine and code generator. It can be used
-as a standalone utility or it can be combined with other tools. Web developers
-are its principle user group, but it has many potential uses and is also being
-used to generate C++ game code, Java, SQL, form emails, and even Python code.</longdescription>
-	<upstream>
-		<remote-id type="pypi">Cheetah</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/cheetah3/Manifest b/dev-python/cheetah3/Manifest
index 2f7c1d2e757a..213bfdc0642f 100644
--- a/dev-python/cheetah3/Manifest
+++ b/dev-python/cheetah3/Manifest
@@ -1,5 +1,5 @@
 DIST cheetah3-3.2.4.tar.gz 315044 BLAKE2B 5cb36364f424acf87593b3f18b5709d1a161dd3fb9bc1f4cfb6fe7c22d2515c852d5d7d0215692274ffe5437267e3232fcfae3d76c592cf66d8927fabdf37953 SHA512 64fbe95fe8d5f3185168ba780e106a46caa0656272235168df603eff50dd6e476eed041658a1e11ae12ee10d148a001c32a23677a1ee6da5b6d43e20e4d1e36e
 DIST cheetah3-3.2.6.tar.gz 2481158 BLAKE2B cb8ad192ae9caf0d1284294b323cf4a918cd2fc951bae25867d69a3dd7933728056b76fbf52a22d34f290056a96cce7d9ccbeb2404f2f0bb782f8db8b7453e47 SHA512 abf74def695018a79cb1364f60e402e7e0095a4d2f069decfbddf42501d865b70451ebc7b52abc67aa23e57276d7a3b8c2894a9571876e15db43cd1358f74d31
 EBUILD cheetah3-3.2.4.ebuild 1108 BLAKE2B feb3b153182c585a189c91c88bf01583ddab2ccd0b0891b1b6d65a0e315646885ab9a5b55345c75e508fcc6e9136db99f30a9f7a9611d8f3ae2e7b7e3be0789a SHA512 94211308717d78375513adaadc6cd393e38f9e709f6e2571e4f0cbbe3b6c053162ac17c479adbb4aabd1cf1545eda57146cafa6b7c9c7c730f7f207c41ec0dee
-EBUILD cheetah3-3.2.6.ebuild 1109 BLAKE2B a800d38f39b7372ed7c37d3bee22b7ded7ad868eddea18d7c253be3031b29eace1c391a6842decfb1218a131a19f01a8ab41ade5ad6dd9ba24861b447c7172f6 SHA512 567457fe6bc3ccf5ab02b43bb519b31b525cf3921f1a8a6f6281377864f705c14d2fcc8551775e3224853a3e80dfe1e74a85092e5eb96ff6f00235ad11cfe472
+EBUILD cheetah3-3.2.6.ebuild 1108 BLAKE2B 82bca670f003baacfb1db56dc88857878b120d29d48573e983896b3ba4b47e3da588618627bd19c4b077bb4a23750f7c5387e47b4d9e9fa3900bbc7d35b58367 SHA512 113be9381752bbdc2e40c9405b9db9e4efe33aca59edc3b5e3c07610d8f5a7f5ea0546cfae4f3a13929ec1ba5f954c939bc002b2e674c59ce0b4b9ebf6ad062c
 MISC metadata.xml 662 BLAKE2B 3dfe6898c1c2b60050da8427fd4e51a07ba7870120ce491166b9fd222bbaa49e7df7ba3afafe8b159a7b60f781da67dc0dfdf03f085e813cb3f6d59169ecc526 SHA512 b15fac64b057cc9216aaa21002332ec348e89a618ba4c32dd8b9622afd17d7d8db6ef6c3e7c645ad0a03b306c50b79322f5ad1866db93f1033e69b1c7d6130a1
diff --git a/dev-python/cheetah3/cheetah3-3.2.6.ebuild b/dev-python/cheetah3/cheetah3-3.2.6.ebuild
index fecc1a523ddf..ab5b0c42ce4c 100644
--- a/dev-python/cheetah3/cheetah3-3.2.6.ebuild
+++ b/dev-python/cheetah3/cheetah3-3.2.6.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.cheetahtemplate.org/ https://pypi.org/project/Cheetah3/"
 SRC_URI="https://github.com/CheetahTemplate3/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 x86"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/cheroot/Manifest b/dev-python/cheroot/Manifest
index 63ea6ce0b40a..71428e07a0b2 100644
--- a/dev-python/cheroot/Manifest
+++ b/dev-python/cheroot/Manifest
@@ -1,7 +1,9 @@
 DIST cheroot-8.4.4.tar.gz 107753 BLAKE2B 4e5d9c3a101876d76696a2e6e3c191f199810e734e25cdc07aac69c102eb28b90033c6fa749569e140c01dbd08a4b06f067b4f47d34ef483d48731c6372ee5eb SHA512 18e2c198a537abd740a868fc4055c1e1e0501392c5518ec345669d02511dac2d59aa2abe2670ffb1800c5aae7032b11445488ecf7fd63d02d5923ed08b82f216
 DIST cheroot-8.4.5.tar.gz 109443 BLAKE2B f8dd7a053304c6be559862028ef306c742c015e98c236f3e154f863c3abbf7d261f85b9a7e880ba9f51e6a8bf25cdf96ed6f45f7758657ecbdc4d6b7dde7f6a9 SHA512 2e8c84a67e24772dfeea7fbb397807e6553912d32392c393ec85181ccb381b1f4d3e38cc2366710a5c789869cbc6d15a79bd1b20b6d3845e5c08496b4f4b0e9e
 DIST cheroot-8.4.8.tar.gz 111377 BLAKE2B be020dd45fef980e7e7b10e19f1ff2bf076ddd30578a31371afd7b9c85a644d0fb4c4836401f17be8df3307071f3337359f611f9cb6d28b17fb5b7723d6b6f7d SHA512 fa0362d29adbcf0b06038d209e33d722ff2f0766d8f2dd46c8ca217195ef5b30bb51400a9615f11cc136683b146ab2c21c3f1974cb4e7ad55488762e31da40f5
+DIST cheroot-8.5.0.tar.gz 112163 BLAKE2B f7105f7c2d5433b90832dff6404120f153783b644b5acab72a915899fd138df1ee9ecde6d4148a66472cfb31802e58d684256524a212c65c1c42a22ab7783ce2 SHA512 3e781bfaea0b1d0b339ddb1ef871505c7eb0f4a67873f3207ec3cbb703392f579de90785c196d77f7a484b675de1438def4ad91109e70ad5894d26e55c645a01
 EBUILD cheroot-8.4.4.ebuild 1524 BLAKE2B f960b663a86ac5d31ba5966f4618c4ea378ba8261861ef5da20e237877a7a225e0dbfc9b9ec2581dfa67a3968bcee21b79d5e0316f0d43c33ac641808ed8a5de SHA512 42d487dfa1ddaaa1b054e82df553d421af770160ab7ff3f0e60d7036bb6945dc69cf590d88baac39c1c04f36867a91ce435c7e8ef6bf9a7312fb1ff2cf0f5820
 EBUILD cheroot-8.4.5.ebuild 1529 BLAKE2B 9d0e3bda85a726d08e7e5f145e4a5e814239c6d7574bc93d9f15b4c04609b542693b728f35becb45657601f17e656e26e3167807418ad13f31539be01cf211ac SHA512 17db137994110789ff496c40a0b2d10efb7913de0c9902cd4bb5498483c704eaad09d808948767c805f9c9efd1a956fbf3fb3d0641cddef4f95b62edb9874cc7
 EBUILD cheroot-8.4.8.ebuild 1529 BLAKE2B 9d0e3bda85a726d08e7e5f145e4a5e814239c6d7574bc93d9f15b4c04609b542693b728f35becb45657601f17e656e26e3167807418ad13f31539be01cf211ac SHA512 17db137994110789ff496c40a0b2d10efb7913de0c9902cd4bb5498483c704eaad09d808948767c805f9c9efd1a956fbf3fb3d0641cddef4f95b62edb9874cc7
-MISC metadata.xml 495 BLAKE2B 10d63d06fd73012b64f27454cb1eb862d49b42457c90081e2d830a37939df8fe92b25c482f7f389fdab02eac56988a5212b3006c2ad41d3056a0c787ad44b7c1 SHA512 244f8755ee65b71e3350df78503f97c7d814b766302371905219dd937a887461df709d1e142326ebe1902c70a6a5940d748067ce975330377c7358ef9e57675f
+EBUILD cheroot-8.5.0.ebuild 1532 BLAKE2B b1bb9a41ac047424b491eddfcba78474101c2bbce9375d6596cec6e5a60e4841ad0cc34557d2be3d5ce027f72b3acf0018efb387dfa7e060730982c7d7f890fb SHA512 09ff41f3021704044f689947787bf313aa954b582d42101ad6c581acacc21f9c6aba77a564ec56dd3644ee4fa2cff5fa2d7cf567377517dc5ab7f43501bd0f8b
+MISC metadata.xml 495 BLAKE2B 4194775afacc99b4983275505dd45471a7ca4305a6cfb37d8fe80fdc00d196da1c2722940d2ae13408de0c13c92c7a2a01ef153b35f49f8ccb9d7df2f605dceb SHA512 710108fdb8ddda277cceea3d57a3ef716e7a67067e658f9719a793f9ba7fd04e8a1e4482c68c23ba458e29e85b9b233d72ec485ab8c585703f411fc32051f256
diff --git a/dev-python/cheroot/cheroot-8.5.0.ebuild b/dev-python/cheroot/cheroot-8.5.0.ebuild
new file mode 100644
index 000000000000..8da9ebf823bb
--- /dev/null
+++ b/dev-python/cheroot/cheroot-8.5.0.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=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Cheroot is the high-performance, pure-Python HTTP server used by CherryPy."
+HOMEPAGE="https://cherrypy.org/
+	https://pypi.org/project/cheroot/
+	https://github.com/cherrypy/cheroot/"
+SRC_URI="mirror://pypi/C/${PN/c/C}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-2.6[${PYTHON_USEDEP}]
+	dev-python/jaraco-functools[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/jaraco-context[${PYTHON_USEDEP}]
+		dev-python/jaraco-text[${PYTHON_USEDEP}]
+		dev-python/portend[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-1.11.0[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/requests-toolbelt[${PYTHON_USEDEP}]
+		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+		dev-python/urllib3[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -e "s/use_scm_version=True/version='${PV}'/" -i setup.py || die
+	sed -e '/setuptools_scm/d' -i setup.cfg || die
+	sed -e '/--cov/d' \
+		-e '/--testmon/d' \
+		-e '/--numproc/d' \
+		-i pytest.ini || die
+
+	# broken
+	sed -e '/False.*localhost/d' \
+		-i cheroot/test/test_ssl.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/cheroot/metadata.xml b/dev-python/cheroot/metadata.xml
index 9a033da645df..f992a83fa3cc 100644
--- a/dev-python/cheroot/metadata.xml
+++ b/dev-python/cheroot/metadata.xml
@@ -11,7 +11,7 @@
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="pypi">Cheroot</remote-id>
+		<remote-id type="pypi">cheroot</remote-id>
 		<remote-id type="github">cherrypy/cheroot</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/citeproc-py/Manifest b/dev-python/citeproc-py/Manifest
index 369cca5702fe..298e897f1776 100644
--- a/dev-python/citeproc-py/Manifest
+++ b/dev-python/citeproc-py/Manifest
@@ -1,4 +1,4 @@
 AUX b1a5f925527093b0b5c11507f379a908e3354820.patch 1339 BLAKE2B 0dc159ac56179f13c528a13ad617d1ac52e65b4cc9be59bf6374adcb1ce787ffdc960bc70cc5dcd6287bd9bde4157f0ed1bb1511d2021a476ac61ce9428c2dd1 SHA512 477fc02354cacc75bfc341257caaac23501381c1e233a84a1e0973c98eba350c7cfa1a15503130f3059c0a239c20d5bb5fbde40b754785581c287fadc0183701
 DIST citeproc-py-0.4.0.tar.gz 109786 BLAKE2B 8d8520ad10a9db7b7da1a2febcc594750572a562ada3944e41dd42321a3b9384828ad17e671307b5c4affeca2ec4a3f8e97eec650dad7005323ccb2913ef43d5 SHA512 bdc09a6f632a13cdfa757710c0d137ec73fe590bd01e049847fe013569231426bc72b318133fa34c96c5608b7a30058c27f4cd3d5fa2ba4b0760527b877992d5
-EBUILD citeproc-py-0.4.0-r1.ebuild 555 BLAKE2B ad28b068d55eb21688e9c260f43dd36fdc6724cd69fc8d2db8a84b1e008d3da5c3603f06413ea5f91609b0646eddd3e593088c1dfd5abd20aa232ff8d69ec8a2 SHA512 e7433fddf346c7d2915530911fda4668d1f00e9f879f0a403e5aec5713840fa5055f1e1d37c31a1e810a1c6490746f5d02e2cae7b59a9889ce883c34447a2f9c
-MISC metadata.xml 433 BLAKE2B f512298eb65cda00ae88968b103a176640dd993d5e1815a1b414167f90014a74957b2043f7177d3f9ffb7b58cabbfae42cf06894e3247ab65d6ce11ec362477b SHA512 375292332cd82155673005e0a0d189120fadacf98e81f181b9540f40915147e895b7ce5fa3bcf1e924c08619944b65b28745f9b76ee520877abf3c6d94a690fd
+EBUILD citeproc-py-0.4.0-r1.ebuild 554 BLAKE2B c8c1d12dd3179a6e87ab2a613b7939ff933eee7cafc32dde9d07e5ea55406f2b7152b6c6307265078fc99c73f17bfb5ead97723760648c99d3a31920108e3f0c SHA512 dcf38eabc48ef5fb48ff3a2423a6558cb1201150551d106f9a0f274bc470447f01f71fc4064dca4cd2f88a62350e653f4150213c7a6d19d415cdaf0261a0dffc
+MISC metadata.xml 482 BLAKE2B 6c0c96b460086723724faf9fb01c1c13a85058032a650d2f336130fb55081c19891b87ac9c65cfa03371e2f86496da097a9f71a5caf7a543b10e4413ae598797 SHA512 72be613e0b90c85636c184a1f6e43cc67173a2167458180be118c7ace3c622611d1f1860703ac347460c2e755dda9a66d743a538ceec5efe349ea05c4ffa73cc
diff --git a/dev-python/citeproc-py/citeproc-py-0.4.0-r1.ebuild b/dev-python/citeproc-py/citeproc-py-0.4.0-r1.ebuild
index 567344095393..88e0adc0c2e9 100644
--- a/dev-python/citeproc-py/citeproc-py-0.4.0-r1.ebuild
+++ b/dev-python/citeproc-py/citeproc-py-0.4.0-r1.ebuild
@@ -3,11 +3,12 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6..9} )
+
 inherit distutils-r1
 
 DESCRIPTION="Yet another Python CSL Processor"
-HOMEPAGE="https://pypi.python.org/pypi/citeproc-py"
+HOMEPAGE="https://pypi.org/project/citeproc-py/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
diff --git a/dev-python/citeproc-py/metadata.xml b/dev-python/citeproc-py/metadata.xml
index 4ad4957cfd25..f2c00bc183fe 100644
--- a/dev-python/citeproc-py/metadata.xml
+++ b/dev-python/citeproc-py/metadata.xml
@@ -11,5 +11,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">brechtm/citeproc-py</remote-id>
+		<remote-id type="pypi">citeproc-py</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/cjkwrap/Manifest b/dev-python/cjkwrap/Manifest
index a6ae7b1b2716..91658f08e6ef 100644
--- a/dev-python/cjkwrap/Manifest
+++ b/dev-python/cjkwrap/Manifest
@@ -1,3 +1,3 @@
 DIST cjkwrap-2.2.tar.gz 20995 BLAKE2B 35604e2d1aa24a75e1de0f0b17ba592e7588aade42d43e98864f5d83fe598eaa0ca566682cb7c7af566e66f79c9696ba2ae86b1579681688d6cd31469c07a3ff SHA512 c72ce67b10af46018f7aa5d65af030373e8889a28f533a59d55668e5c90a759ad7cb31708dd6ff35561f9e62115edef5bc0facc74b6a6e122d7399d9dc950624
 EBUILD cjkwrap-2.2-r1.ebuild 446 BLAKE2B f08f05fac24e11a0cc22524ed86b9a41f3d97a4f16ecfe312b8be6d4638c53706c0d95ece918912215b27e2f7e8194b9e02b5c413d71f07394cb2ab1fe752126 SHA512 67a17726c0a78d032914092a5d638bcf0c89d20a82fc6dee09729dc75ff11847279bf13ecbc712eeb37734a3ef9557b61f24ecf6df720c689c9af1dc993572c3
-MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
+MISC metadata.xml 318 BLAKE2B 6915746c10e2f9ad3c3a2254c537a8fa5a759adaff27057d2ea0e368530e9bd42eabd846226fe19136dfeeea90f9d7cf046870f1f18c572d5bafcd3ccf0c4e26 SHA512 425a58c2d40e02eaabd011b347308de7a23d5858e896b415fb45b1b36f971349241a13e6b94c1a61477ba2d78973889bc73cc4990d7c40decd167824f8eed74f
diff --git a/dev-python/cjkwrap/metadata.xml b/dev-python/cjkwrap/metadata.xml
index 6b0a0fb3a729..07822b67318e 100644
--- a/dev-python/cjkwrap/metadata.xml
+++ b/dev-python/cjkwrap/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>juippis@gentoo.org</email>
-    <name>Joonas Niilola</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>juippis@gentoo.org</email>
+		<name>Joonas Niilola</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">CJKwrap</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index ef0d626b42c5..b57de226f6fe 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -1,11 +1,11 @@
-DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
+DIST llvmorg-11.0.1-rc1.tar.gz 122777435 BLAKE2B 23b520d33cf4b641027ee52bb10c6171d60356c9167d5b94012929e6e547c526cda1a6177c295ed19592dfb83b020f63b2cef4cabc70ce9a2a8e098fe654a3cd SHA512 605c7bbff1610f335be8ea4f1204df797fed21185a54c77565f6ff2d00794d1967e9c5fab7c87633e242f2f999bdffb76da83f756d261c1ca476114599409ae1
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD clang-python-10.0.0.ebuild 924 BLAKE2B d160ab3d5b4b57df192aebc214061fcadd11233a7fd97480124797bc52da0f3026be74021c127b68eba8e5e3db0e9d523e20e36537fbee3fc19ae606b48a5858 SHA512 862f0822b486311c4ffec46db51030d707c43a21d69ea22b5eafbedf004679805371b2d453d0bfe9939818d2f7d9658170bb7799e601f6974f3621df03b5bc12
 EBUILD clang-python-10.0.1.ebuild 923 BLAKE2B b96dbdf62c22c703a871c8d00971976f1f856dd81bcaf34859bbb0f4de72f74a459331d732fcd6cf9afe0913815573459a1db933e10091f5c99cb8b8d23be1a1 SHA512 f033ff3e59044f45926ce86a594226eaee03b76ad5ea7b9ca390cafb619d01416370005fc947f2b643072b2fd6d6d700f5ba0cd686fa10fadb6816fe56c6dffd
-EBUILD clang-python-11.0.0.9999.ebuild 902 BLAKE2B 7b7d93c597e0aedb92928c2a549f7a0ab6d9745db42e60f7d7b0dd904aecc70f4a3e752ac105250a6348502a570109eab099942100cbb2f1376a477e59394c20 SHA512 6c6fbee3cfcb1d32e6a9ee4ed72e66a5aa7e88c4333b719d504a24da5bb8ebead00d39ab071691a49d0954a3b3e35755b8fbe04b8591ad995d7a811c74201a77
 EBUILD clang-python-11.0.0.ebuild 923 BLAKE2B b96dbdf62c22c703a871c8d00971976f1f856dd81bcaf34859bbb0f4de72f74a459331d732fcd6cf9afe0913815573459a1db933e10091f5c99cb8b8d23be1a1 SHA512 f033ff3e59044f45926ce86a594226eaee03b76ad5ea7b9ca390cafb619d01416370005fc947f2b643072b2fd6d6d700f5ba0cd686fa10fadb6816fe56c6dffd
-EBUILD clang-python-12.0.0.9999.ebuild 902 BLAKE2B 7b7d93c597e0aedb92928c2a549f7a0ab6d9745db42e60f7d7b0dd904aecc70f4a3e752ac105250a6348502a570109eab099942100cbb2f1376a477e59394c20 SHA512 6c6fbee3cfcb1d32e6a9ee4ed72e66a5aa7e88c4333b719d504a24da5bb8ebead00d39ab071691a49d0954a3b3e35755b8fbe04b8591ad995d7a811c74201a77
+EBUILD clang-python-11.0.1.9999.ebuild 903 BLAKE2B 5aff11bd5e99e2f0073f945c1a1980a68c12c50d5becd20cac9631af5d1e130fd8062e2edf60e8d93f0950a1a831fd84c2b829ea1112d970b86128173c95ec38 SHA512 d2354a7cd8442519d77decd7b531ec173811596715af25163c37f8214c57a0f9b3a8afa475485360b34cf1dcf449efe8f4e8af83d9b74f3225991fdfd45031b4
+EBUILD clang-python-11.0.1_rc1.ebuild 903 BLAKE2B 5aff11bd5e99e2f0073f945c1a1980a68c12c50d5becd20cac9631af5d1e130fd8062e2edf60e8d93f0950a1a831fd84c2b829ea1112d970b86128173c95ec38 SHA512 d2354a7cd8442519d77decd7b531ec173811596715af25163c37f8214c57a0f9b3a8afa475485360b34cf1dcf449efe8f4e8af83d9b74f3225991fdfd45031b4
+EBUILD clang-python-12.0.0.9999.ebuild 903 BLAKE2B 5aff11bd5e99e2f0073f945c1a1980a68c12c50d5becd20cac9631af5d1e130fd8062e2edf60e8d93f0950a1a831fd84c2b829ea1112d970b86128173c95ec38 SHA512 d2354a7cd8442519d77decd7b531ec173811596715af25163c37f8214c57a0f9b3a8afa475485360b34cf1dcf449efe8f4e8af83d9b74f3225991fdfd45031b4
 EBUILD clang-python-9.0.1.ebuild 924 BLAKE2B 8a666866e1c2fa2806c29ae6c6787cee7dd7bbb33ac8d2d99e9072d13f8fd0b1a98388de9f655b9f26bc43085269af402592d62c29dd1ff3f2e1564c2e8a4c39 SHA512 c0c164894497d871a3016ec8dc19e09142f5f77d194dfe27d9ad12043daf22df7abaacefaa2294e7355aab2d45fe7f578e80ff7df87af6dcc0c75e8128f885ca
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/clang-python/clang-python-11.0.0.9999.ebuild b/dev-python/clang-python/clang-python-11.0.1.9999.ebuild
index 6d7cb294e651..36c6ba65c994 100644
--- a/dev-python/clang-python/clang-python-11.0.0.9999.ebuild
+++ b/dev-python/clang-python/clang-python-11.0.1.9999.ebuild
@@ -8,8 +8,6 @@ inherit llvm.org python-r1
 
 DESCRIPTION="Python bindings for sys-devel/clang"
 HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( clang/bindings/python )
-llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
@@ -27,6 +25,9 @@ RDEPEND="
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
 
+LLVM_COMPONENTS=( clang/bindings/python )
+llvm.org_set_globals
+
 python_test() {
 	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/clang-python/clang-python-10.0.0.ebuild b/dev-python/clang-python/clang-python-11.0.1_rc1.ebuild
index f0886b6c9c3f..36c6ba65c994 100644
--- a/dev-python/clang-python/clang-python-10.0.0.ebuild
+++ b/dev-python/clang-python/clang-python-11.0.1_rc1.ebuild
@@ -3,17 +3,15 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit llvm.org python-r1
 
 DESCRIPTION="Python bindings for sys-devel/clang"
 HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( clang/bindings/python )
-llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~x86"
+KEYWORDS=""
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
@@ -27,6 +25,9 @@ RDEPEND="
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
 
+LLVM_COMPONENTS=( clang/bindings/python )
+llvm.org_set_globals
+
 python_test() {
 	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/clang-python/clang-python-12.0.0.9999.ebuild b/dev-python/clang-python/clang-python-12.0.0.9999.ebuild
index 6d7cb294e651..36c6ba65c994 100644
--- a/dev-python/clang-python/clang-python-12.0.0.9999.ebuild
+++ b/dev-python/clang-python/clang-python-12.0.0.9999.ebuild
@@ -8,8 +8,6 @@ inherit llvm.org python-r1
 
 DESCRIPTION="Python bindings for sys-devel/clang"
 HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( clang/bindings/python )
-llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
@@ -27,6 +25,9 @@ RDEPEND="
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
 
+LLVM_COMPONENTS=( clang/bindings/python )
+llvm.org_set_globals
+
 python_test() {
 	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/cli_helpers/Manifest b/dev-python/cli_helpers/Manifest
index d690a27bd205..88b1304dd0b5 100644
--- a/dev-python/cli_helpers/Manifest
+++ b/dev-python/cli_helpers/Manifest
@@ -1,4 +1,4 @@
 DIST cli_helpers-2.1.0.tar.gz 32967 BLAKE2B c2ee2a92dce4185f656415d6079196953c5e9dccf9de4e29d9de61bf72b041a6225ffe4afa866b0f78abcd5d0809ec739db489aee21e440575b7e2a6e09b916a SHA512 75c6b24ae1ed05cbdfddfc30c5e43aeb7129f5fa319d485e19be098691762ad681c4874449b2f339f833424a970965b5a28a3b66814cb556ea8ad6293740fdbe
-EBUILD cli_helpers-2.1.0.ebuild 660 BLAKE2B 3edf508e2c873a63a74a8d4077c3c5e2dfc708da864b3b5c9f3309b20829c970ae10739bbac343d4c2f08486edcb24e02342efb943e3610e1f7cd11a583ab664 SHA512 d8abfc803a2d09e498f855797d415850f28fbfa83260de9f0ec9288db0d5396961a704bc4ac51f8d403de3e0bd3f68a63f9ae7acd7dd4d3c9f5bd0ea74f2a1a7
+EBUILD cli_helpers-2.1.0.ebuild 659 BLAKE2B cf59956df021e929353c6aecf0185953b6934f1b08c91ad0ea32b960b8a06c1ea61f64a780d56f603ad676d43c5a09ffbcce9644df94d20575116ea4a0de8439 SHA512 98234f6f77b3a3e29b9ccd109559bb479b42f5b6f9ae05b51ebc8c690669a3fbfb5c6a784012f03bc0e2859f528474ffac11eea1f0e17c97e7d207fdae361683
 EBUILD cli_helpers-9999.ebuild 640 BLAKE2B 1735334767048c032a78753bef7baec1e90be2f9791aaec3b1e288b2c1117c6f1bc7dc399f54df6c9a056a15b25fc3e0b67c61ab6c29a7132b0ac3db90935bcc SHA512 327f03e46233829c699f1c71cbff78cc354320d36a332d16622c96adb86a1803cc13c23136a7c6f521420221d2dea0af1dc11fd2b68f3a7cee3b51df12a83abe
-MISC metadata.xml 407 BLAKE2B a1128f59da6b44295f47017d6c08b582d58b51b551e4ec866ca0b40778c4353f9c633fbbd3423df0d89b7c85f81caece2fa3a9ce40be2fbf4231961dde1aaf92 SHA512 19d20ea5cc6006d8b35576e7d68167b797eb677cbd62a150f82ac6738ae43d658d9461ae3ed0499b259812ab7b1e4aeb30348436c25fd96e95cc75667fad803c
+MISC metadata.xml 456 BLAKE2B 3c7bef25195fc639bb4bcbf6edf7236e18c8b338e9327673da6b4aca9778363115ff3f271015d01b98fc4728028b751ae9d55f85f3375adff20862f6b6a9706d SHA512 c3d592c696302e6e11accf1b50853e6f114c5de063ceb02d22eb23d3e8af338a0222d9615ab689825f483aee1156acb939ccfb01c1fe768571ddf137a28e3e95
diff --git a/dev-python/cli_helpers/cli_helpers-2.1.0.ebuild b/dev-python/cli_helpers/cli_helpers-2.1.0.ebuild
index 8e70cb86e447..bb84eca13ff0 100644
--- a/dev-python/cli_helpers/cli_helpers-2.1.0.ebuild
+++ b/dev-python/cli_helpers/cli_helpers-2.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/dbcli/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 RDEPEND="
 	>=dev-python/configobj-5.0.5[${PYTHON_USEDEP}]
diff --git a/dev-python/cli_helpers/metadata.xml b/dev-python/cli_helpers/metadata.xml
index ad9e3e04b43d..b7e9e25a0511 100644
--- a/dev-python/cli_helpers/metadata.xml
+++ b/dev-python/cli_helpers/metadata.xml
@@ -10,5 +10,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">dbcli/cli_helpers</remote-id>
+		<remote-id type="pypi">cli-helpers</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/click-default-group/Manifest b/dev-python/click-default-group/Manifest
index 1bba01f83e14..accfbba02146 100644
--- a/dev-python/click-default-group/Manifest
+++ b/dev-python/click-default-group/Manifest
@@ -1,3 +1,3 @@
 DIST click-default-group-1.2.2.tar.gz 4753 BLAKE2B 919e3921ef3c6723b92cab8433032237af4e5583084badb6cc53d82971d81aa910ae6553deefea2ac46067d2618bb8f6d2003f0b2c4ced04acc5b46588012614 SHA512 6f296d154813e0c3dbf8e435c4c1b4394f51a000320c5585aeb78b81f30fe15bd27a8aad0fdbb71fccb88dc3083682519f1dd06572c8d5c35639fb9c3acf73fa
-EBUILD click-default-group-1.2.2.ebuild 636 BLAKE2B bd6746ecf03373153f8a1514202520eb5e92b1d7a093e14c5ea3bea581313380534f8d3f853710ba33e1b6522de8185cb8e478e7d18d54acf7ce09c5b56452f9 SHA512 e393412c8cfa0e79978839371a24426d9859fc8b072e830294b97343623794fc6a9bbb467da0a4c08cd2f0170b004ecd6c6c96728ff419af6cea86922b6cc81e
-MISC metadata.xml 322 BLAKE2B 8a78490ccdc4b51ba871eac8ca74b0e342ed41d8d91f8a4b7c0c824b6447be791604c71f1f59d5151686931a34160b5f5d1979b2760e4aa533b45033ce3d09c9 SHA512 c90048e0f2c412a4d44e289cada3350df7a74a8d87f09b1568085183a37fa6895163fa913f4a3917c34e314a81fedac06d8c24304b1cf619c3489275a2ef1417
+EBUILD click-default-group-1.2.2.ebuild 655 BLAKE2B bc6044901e40ecc9ae4881cb7c44d95bd844e05839eeb5963bcc58b9c9145d4f360875d468e21bdd36b297eeeb0b4e0e80040206ccb08eae888eb6a3711534c3 SHA512 4b8278e3a8c694f9c78fe4cb69c3de1ca734b56f9f4964902555162f015ae957cbcf67ae4aaf96a7326436ecb43e192b668dc6da12301a7e1e534ccf3baf0015
+MISC metadata.xml 395 BLAKE2B c056e2469b8b6a215ba4340cb91979beec19cbeee393bb3502bff45834075218dbff6552d6cefa24a0fb6d6ec3cf94b0390c36cd84aa2fbae2ca5c1966b70c4c SHA512 cb527c5d7603eed5b507bdfdafb3ccea613bd77f183c1830c9e759650fbaf71a4f851d74028fe4cbb40da4214a0e662f1ff3913295e33503ae859e3f865533f5
diff --git a/dev-python/click-default-group/click-default-group-1.2.2.ebuild b/dev-python/click-default-group/click-default-group-1.2.2.ebuild
index a973e932d905..c8fffa8e0e2d 100644
--- a/dev-python/click-default-group/click-default-group-1.2.2.ebuild
+++ b/dev-python/click-default-group/click-default-group-1.2.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Extends click. Group to invoke a command without explicit subcommand name"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/click-contrib/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
 
 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 ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="dev-python/click[${PYTHON_USEDEP}]"
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/click-default-group/metadata.xml b/dev-python/click-default-group/metadata.xml
index 3fbe64efde32..fd2518ed0546 100644
--- a/dev-python/click-default-group/metadata.xml
+++ b/dev-python/click-default-group/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">click-default-group</remote-id>
+		<remote-id type="github">click-contrib/click-default-group</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/click-plugins/Manifest b/dev-python/click-plugins/Manifest
index c4eac577e47b..7a49410a3794 100644
--- a/dev-python/click-plugins/Manifest
+++ b/dev-python/click-plugins/Manifest
@@ -2,4 +2,4 @@ DIST click-plugins-1.0.3.tar.gz 7950 BLAKE2B 4ed7d15c37b2eb127faac6179c064675074
 DIST click-plugins-1.1.1.tar.gz 8164 BLAKE2B 48d75b9445b72dca41516fe81d02c6fad8089630c0d49963f559a847b90c7897c8db64773c4ec5f4c162d0f2f4fdd14fe212d485765d38977145fd32acdd0dcb SHA512 bbd838f50603ac4e76daf3535fd5d27a17e17549addbc8b582df6d6193b4f07d743101ce52f0b71f326995fdfeac159805025770350ca2e7697f212dce0c4b1a
 EBUILD click-plugins-1.0.3.ebuild 512 BLAKE2B 712326c229d3d0aace82ca6f131be36830d3bf577eabdbfe6f9d519b0d31380766df54459d148ae8fb8d18a9bd160cc82e4dfe246170dc11cf050aaee6c10a95 SHA512 8e7c94c94ded1e7be78b49fe606b04c72137b4cbfc28f12a0a2f974f0df31d70dc7d0f1d58be45427b102ad61ade55bc29ca94f9156c9315807f07c1e81e893c
 EBUILD click-plugins-1.1.1.ebuild 541 BLAKE2B 5a519c2f32e411920fc627fb05f482dfbb5b3aad205849a6e7ab0b4f592726103ae1dde54e6f3fb8007b461d297c55550aff65880a4b283d5e7485a88129271c SHA512 27ee7929d8e46e66f4e12db74b33036c0c5d5838b28fd4fa56c966f298fd8d2ac5bec46c7d950dc3b5afc931f983353ec5eab6d9959f367a4ce590eafedb05f6
-MISC metadata.xml 248 BLAKE2B db670c3ae382b7098d9d12959aadf4e3adc1e8d9ca4960e6966b63b88a179376cc32540952c9ad5835e5c41f0c8937c383da2ba2d079d78a868b3274bca00330 SHA512 a16675a6c8b0afce6dfc3591b8c30b89454b6a8aece3431d396a0cf0b32d5e19f529e3e514130881657bbd079347cdc1fc9e8ac5fadc07c3dae3cfaec1ad0bbe
+MISC metadata.xml 310 BLAKE2B 6b5b9178909dc6dba63fb0395ac30ad3de9510ce33b933052450f3cdef5bcfd8b67c161ca7c050f7124028353608e21aa24d48ba98dc2048f6d476ce716c4a3f SHA512 32fc9c04ab42bdd5c246166e5e2c44e4b1b8f6dd21cc5ce6cb291bcfbd6babae60d998dce4196a83b5968c63e517132aab79472ae784019fe6fab1c1ad53e1c7
diff --git a/dev-python/click-plugins/metadata.xml b/dev-python/click-plugins/metadata.xml
index 9cd89183f850..6adfac23640b 100644
--- a/dev-python/click-plugins/metadata.xml
+++ b/dev-python/click-plugins/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="pypi">click-plugins</remote-id>
-  </upstream>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="pypi">click-plugins</remote-id>
+		<remote-id type="github">click-contrib/click-plugins</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/cliff/Manifest b/dev-python/cliff/Manifest
index b2c6f23c84bd..2b80f3bcbbfb 100644
--- a/dev-python/cliff/Manifest
+++ b/dev-python/cliff/Manifest
@@ -2,4 +2,4 @@ DIST cliff-3.4.0.tar.gz 78990 BLAKE2B d7d8209e2fe24614cde6d3e113eb0dbbba981addef
 DIST cliff-3.5.0.tar.gz 82997 BLAKE2B f169770a0a956e6091e56eccda8d10906bee09bdb03b474f3b17837b3eda858f3afd21beae1d6945bcdabfa89fc1555d13d70ddd0454a10fe05bfb63c8de75e7 SHA512 215f22e5dd2c4c17bd0f19866189b6b247377a7d5bddeb4a07b7536af7545bd0440b5fb0a98474fc018e3b12f6695f60028c012f3e7eeb6498b20f2923939d08
 EBUILD cliff-3.4.0.ebuild 1203 BLAKE2B 4bac1690e15c736c6ca79ed940a0459811e05e6264949aae242807d266c988fc09e2c0fcd69c8606ce5c54cc260b7b50a8c40cd15234d56f70ccc6f367a902e5 SHA512 26f04001fba369a2805f3e4c33ffc69953a8e1d921e88a1c63c861cebbcd1dc42204e629a3bb34b6afeeae04fc72e196192ff6b944b387299ece48562c29e9f7
 EBUILD cliff-3.5.0.ebuild 1209 BLAKE2B 06c8d877c1fe0181403667f586e99328dd67c1c2ba7fa34c06546e24e81a244182855e9b23e73183099fedef7dffe5a09c5b9e1b7e2af736a877387078a038bb SHA512 bb3d0f6698272acdfeee15d40a4daa5416ab631e327d1f14d94ae5bceef0e14033af5c4635aedde8bff2de13a56cc88ada596f4ce580a62f15fc87328f2a8efa
-MISC metadata.xml 734 BLAKE2B cdfc9f839d8dd599e27c78314ca5688d94dc52b3128d0aca7c6ff11d8b7f5f9de9d2d43f6690543d8e44b8483899d0cc21ef7273dbbdbeca0b498b2a593279a9 SHA512 6103b640d65a93bbd2cd9cf6ca6ae42a12a0fbfcdc26dd164494b777bc976d14d7e0bd94372b84ed30f7eab3e1acb54787671d90f165cbf6b0b160770cdbcfff
+MISC metadata.xml 766 BLAKE2B d1e77f1b381c58cc9d5c004cbc5062bc8b024bbd416ce4f3e44d6fc817252980193d7f3990b4f0248d23d763dc62a489fbc68093eacf8e3e7fd82cb596b6fcf5 SHA512 bdeca590929247212b707d2faf686d70102aae0fefd4904a9bd091e041d926740df1fe0556b485d0947c7ff879c190341fbc3cbca535aa0e2140104a8b618f1b
diff --git a/dev-python/cliff/metadata.xml b/dev-python/cliff/metadata.xml
index 75edbe394a4f..6b802a7a609f 100644
--- a/dev-python/cliff/metadata.xml
+++ b/dev-python/cliff/metadata.xml
@@ -1,22 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>prometheanfire@gentoo.org</email>
-    <name>Matthew Thode</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <longdescription lang="en">
-    Cliff is a framework for building command line programs.
-  It uses setuptools entry points to provide subcommands,
-  output formatters, and other extensions.
-  </longdescription>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="pypi">cliff</remote-id>
-    <remote-id type="github">dreamhost/cliff</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+		Cliff is a framework for building command line programs.
+		It uses setuptools entry points to provide subcommands,
+		output formatters, and other extensions.
+	</longdescription>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">cliff</remote-id>
+		<remote-id type="github">dreamhost/cliff</remote-id>
+		<remote-id type="github">openstack/cliff</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/clint/Manifest b/dev-python/clint/Manifest
index e0888bd8f201..3d40fc5d13b1 100644
--- a/dev-python/clint/Manifest
+++ b/dev-python/clint/Manifest
@@ -1,4 +1,4 @@
 AUX clint-0.5.1-disable-args-dependency.patch 417 BLAKE2B 182c61c55e2d0d573ab62bcefaa6c31a43e9c6ca11c1fd4a2a36ff7917198b90e09016d877d368bddb6234996bb85d3517825d4bbd8b0a48e594d3e987e71ce7 SHA512 294e21ce515bbaf2949cf0da5c1c89e2dc9a1c4556a52c2a2d3ed360cbcd22891cfa103ed97abc59f5498e08f38995c3986b42dcbc7e548b87076d7e3dc574cb
 DIST clint-0.5.1.tar.gz 81140 BLAKE2B 5b42e7d46321f0416d3ffb51edf66c53476d3e4a211e971f36cab54a412f6b0f0ec26486c2b95871956ab09e7e4adf68e8329dd7e9e3c7ed1adb3f8a0dd2a728 SHA512 3ad8bfc587acb1322c7d7c3e73756a07c98f3b4215a3d4dc409b5a2067bc70dce2dd98d19250b8122b319b7bcf5e2859251de2829780345de06f93b35447c4e8
-EBUILD clint-0.5.1-r3.ebuild 800 BLAKE2B 75e1ef74fbf37c6077be026193ffa3802c4b4a49420ce469a2b8c4210061abb7444a3404f693f570f105924166f02b144db4c7b7cb0607c438c240571e7e04f8 SHA512 3dc6b32540db778d330401f590dca15e5062a0c615696e928768db31ee73de06032ce616fbc74ee78c4a9943f58a30d61e0cf13a21e272ce8c1bf519e98104e9
-MISC metadata.xml 248 BLAKE2B 886e9928c5735483e1b88968c7c68b328965d8b77022184e2428115042bfa146439a44a5b3b6ae1c813fc9626617bc5158d0be4d0c173594dc93efa84f1c2268 SHA512 28daaa3233c61835448e78dfcf4381cbb1d6789f0fc16b309aa9317d36f81754d1757ba5d6be5b6b6209fad9921708619b4e92011d91c879eddc440a819fbbdb
+EBUILD clint-0.5.1-r3.ebuild 816 BLAKE2B 440d6291272a5db977c3ebcf7ce91fe3964df5b06731670a1dd47712fc366585d0c23deb9479984ec9486e369b1412e30226977611d9aacfc868a214872a5462 SHA512 d6140a4d75a60591af6f21b1c8774a24e90786f815d5cd5043db786511352d9f193f16aa03c48c1a9e1e5af00e537aa4d6bcd4c8a2f97c4544cda247bdc3fea4
+MISC metadata.xml 299 BLAKE2B 43e7d81392bd0ae882571f0ca4e0dee2bbe3447e1df1e84c36b77f2c8d8da4c27fb085bd10189b7009450a1378778981a7d332f6cbb7674c08f1cca622140d08 SHA512 7827c04d5742ea61c2bc614b09595e79a19634f47e63c4f2840209a1f8731f69346c3bf7abc146fec791b8de3b34201a0b9c63c0458ab1f2501bae55a4bfb924
diff --git a/dev-python/clint/clint-0.5.1-r3.ebuild b/dev-python/clint/clint-0.5.1-r3.ebuild
index f985c3f2fb2f..530a51074740 100644
--- a/dev-python/clint/clint-0.5.1-r3.ebuild
+++ b/dev-python/clint/clint-0.5.1-r3.ebuild
@@ -8,8 +8,8 @@ PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
 inherit distutils-r1
 
 DESCRIPTION="Python Command-line Application Tools"
-HOMEPAGE="https://github.com/kennethreitz/clint"
-SRC_URI="https://github.com/kennethreitz/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/kennethreitz-archive/clint"
+SRC_URI="https://github.com/kennethreitz-archive/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
diff --git a/dev-python/clint/metadata.xml b/dev-python/clint/metadata.xml
index 7ae38406c025..efb3f4fc03ee 100644
--- a/dev-python/clint/metadata.xml
+++ b/dev-python/clint/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<!--maintainer-needed-->
 	<upstream>
-		<remote-id type="github">kennethreitz/clint</remote-id>
+		<remote-id type="github">kennethreitz-archive/clint</remote-id>
+		<remote-id type="pypi">clint</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/cloudpickle/Manifest b/dev-python/cloudpickle/Manifest
index 33e8478bd5d8..977e9604298e 100644
--- a/dev-python/cloudpickle/Manifest
+++ b/dev-python/cloudpickle/Manifest
@@ -1,3 +1,3 @@
 DIST cloudpickle-1.6.0.tar.gz 52743 BLAKE2B 9007ebd4464adc0cb203e596cb756176d17ede5cfb90d172e11630df3e0a93dba471d8b20aaf750701cbbf1fdfb4a5faf24a75f8df82aecb4b77bd62c8979027 SHA512 3b663a013d1512b732b13f38bdf2d5d89704a73577c9fee2a6e808882d42ecc1bdb3589b1cc61279ec621b6dac27d8e223b2fd839442e2d5994892f04d015535
 EBUILD cloudpickle-1.6.0.ebuild 802 BLAKE2B b542010c2ff549e6938b99289baa5a334d84147bdd43cd675553b0ca0301286a99ac1709af4705092c258009c295404a317879af2ff6beab5ac3177d29b3da3f SHA512 8c9d3160b2106cfe3bc0040110d68e7374e1b327253219b6825df8415124a2fa4645cafd00771c0c404a0714ced80312456051717aa8234b57beb30e87b6b86b
-MISC metadata.xml 349 BLAKE2B f7eeb1b4942b76c75c613e051071f3901bcd71892208d6a27121a212854f1b840914fda091f7ff7fbb085c07a38b4bfb7bc10131f82abece68d136b13199f853 SHA512 8321d76e26a00e6d3f27179f0fd158e2675c5d577861807251cb81664408b91e43d6a4e0917c2c846570a07388d6a36c51c6c3739c91a8d148aef9d6549b3623
+MISC metadata.xml 399 BLAKE2B ac63a04dbf00bd09fe35d3824cd6e789b95fb139e4bbedd3a05cd56638a777b834250b46b04fbbbfb656f4507cc1691c5035cfbe01784e94f4bade0a51301e52 SHA512 cbf22fd608de45a444fecbc87cead7be6b2552f18921731c1ede37b8433c345c4bd8162605bfcd83a0e166243da19427669923bc58ae847539aacf80e0e27f1e
diff --git a/dev-python/cloudpickle/metadata.xml b/dev-python/cloudpickle/metadata.xml
index cc58bd679721..38fc6e1d8818 100644
--- a/dev-python/cloudpickle/metadata.xml
+++ b/dev-python/cloudpickle/metadata.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="pypi">cloudpickle</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">cloudpickle</remote-id>
+		<remote-id type="github">cloudpipe/cloudpickle</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/cmd2/Manifest b/dev-python/cmd2/Manifest
index 7b632631894f..99ffbcf95dd2 100644
--- a/dev-python/cmd2/Manifest
+++ b/dev-python/cmd2/Manifest
@@ -1,7 +1,7 @@
 DIST cmd2-1.3.11.tar.gz 657770 BLAKE2B 829023a4ebd2c2034dbbcd276720476ef9e19a0869bdd2dcc18f2b7cb58bf7c9874b9c56c60d6ba15f7458327d768bce5f07890054361b58574697cf8408cfd6 SHA512 bd640a38723cfb7886b74631ded288fee87026fe718db48ea71a1eb3cb61cea514dda2c4ccd1df95b5ade3c8f8a4a14be3dd9d6722c59260a5fe7c4dfba30f24
 DIST cmd2-1.3.8.tar.gz 643320 BLAKE2B ca9eb089c4d1a5922d3f762e9fe118168349c807b770265d2e565a183447b938f08da578e0dc7de4a59a52fc39df2b53a63c84c1d86efd75c0ba58950bbe9a9a SHA512 af2b56234e0b257c4de564d46f4be83b56c37fd903ee737e825779558e44a9b60164bac1c0bc35a79c8aa1ba80155331c496c310e5ecad94f984673a30ef6976
 DIST cmd2-1.4.0.tar.gz 660494 BLAKE2B 1a7d5efef704cf3011affa99303233ad9d16e09d16bbe9319324599e6d69b1a664556e9ed406f2a34bfc6021a6d1607a44fd4df9cedbd6688826e0bfe8d91b77 SHA512 1f35e9773578a1d2ea1255cd697754b126c1e90486e84319c0f86ee409ed22bfbc267ff1d3b9af1072985337c9cbc51eac4e288281146d9c20b54c8b364f1547
-EBUILD cmd2-1.3.11.ebuild 1236 BLAKE2B 2439ed6260f743b3b7d169500928bf141f0365d4e845878da097cab51730e494d602130f149e24bef039c1c1284830b7008d14b0db5939b8c86b2d50b551653f SHA512 36772ba5ceaedb87b7964fc6d33852b5b6e81666bb23add80294a92b67d3c99a6339febee3ddf718e731dca7fd27d1d9fc53c5a6c0be266ba58cadfcff5990ea
+EBUILD cmd2-1.3.11.ebuild 1235 BLAKE2B 52cfa28ff67f559ed4af995bc77dd001c6f8f0c6239f70c52eca0077f1547b13c871b93b45fd1e3775bc7c8c5747fb9bffa47497cd7a6093d96351d6af5fea9d SHA512 9fdd2a70ad330ab564cb36ae8ad9727a893a0a67d5159b0e5fe8d893cf0889049e5256522b138de8ec9e2a96493600075814f77b139dad80c358e888c3688b57
 EBUILD cmd2-1.3.8.ebuild 1231 BLAKE2B 94e7f09cb9e2fc73c5e831ab193be8a723cc66fba42dcbdbba7f51e2733f6b736ba6117366a81eb35fffcf80329201ad4a1280ea1dd189ee3b96c926c268c2b1 SHA512 4a746cb023b3ce7afcc383bfa1a4abae0e5be4b0bb3ea90649e474fecb2a16b7c7767b636a3c8ab7150ec75c3d2dba80a07e055720d7f900020a5ccfb6f10879
-EBUILD cmd2-1.4.0.ebuild 1237 BLAKE2B 6ba444387e36ebcc11511c30b0f8cf9577ed63744081deb292a411a2ca195b1c58200f496841390305945d6f0bb31cd993ee98f7ea992e2a51c3adf0cd157f57 SHA512 6ad20be1300967b792426b458dfbb8d7578edf96e8dcc4e592188a62a3e997e2b869bdf04009dc367ebdd53a40ff73d020e3d0683f378263efb5b3be51dd8254
+EBUILD cmd2-1.4.0.ebuild 1137 BLAKE2B c467d24e0ec9fae72f2b91f64a40752c82500e15b2bdcbeb8abaf4edae92ce5eeab2e3a23794b84d2f605af7b3d73f21258e0a7ed7918b1e014796a460ae8485 SHA512 6cbb1e031fea9e97e3414229edddbf3b6b309dd09595258a70effd7e5b2b81956368c3310b23a5a001b4e97251125d460755630c786b9c48ff2586c959f880a9
 MISC metadata.xml 521 BLAKE2B 0246c37d4e3d54c54b632fc75eb51b0b6e1ff3fcf6be8218a958c9483fb0248bfa3238ed31ab9631f41b12bdef71704649423bd2b44a322ec0b4cfb20a6026f2 SHA512 6a94c23d403d07e6d8e980e4c11ed1a1a0de4707417d60b539a4acc50312d1a9604d9d7ee55dd232c51c8fa6fc24f10bd28e9cc80e2a6f143086da448f78f924
diff --git a/dev-python/cmd2/cmd2-1.3.11.ebuild b/dev-python/cmd2/cmd2-1.3.11.ebuild
index dbc42145e8f6..878df1db58b3 100644
--- a/dev-python/cmd2/cmd2-1.3.11.ebuild
+++ b/dev-python/cmd2/cmd2-1.3.11.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
diff --git a/dev-python/cmd2/cmd2-1.4.0.ebuild b/dev-python/cmd2/cmd2-1.4.0.ebuild
index cdd3428887c2..aa46d05c5c4d 100644
--- a/dev-python/cmd2/cmd2-1.4.0.ebuild
+++ b/dev-python/cmd2/cmd2-1.4.0.ebuild
@@ -41,8 +41,3 @@ src_test() {
 	local -x COLUMNS=80
 	virtx distutils-r1_src_test
 }
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/colorclass/Manifest b/dev-python/colorclass/Manifest
index 41fe88713317..2d5635d25fec 100644
--- a/dev-python/colorclass/Manifest
+++ b/dev-python/colorclass/Manifest
@@ -1,4 +1,4 @@
 AUX colorclass-2.2.0-tests.patch 483 BLAKE2B ea0a953102fcb693e451f837cd35b77a0a8430ed7f44e898a8c6b8862643c8f51ef6d793153af795862561df4cb6046c98e9658409aded87ef74073e0858a26f SHA512 f415192d9de61ee8d0d6ac39f33effdc4b107069cc9a9abc3c0b1ecdb903ebe9785036385bac59217a33a75c0bd267dab2a9f2e9b9127b00e4abf4e7632123f2
 DIST colorclass-2.2.0.gh.tar.gz 486151 BLAKE2B d8f4c9e826cf284df47bf2aac4da71f448818858e2383b331b5bba791d9db3c5c11d5aff74b3eb740e657914137b2b74b217854ab589806a22a0ff6697cbde1c SHA512 c627cdf6abdb5a60e9ecc1fb3b669898edc027fdc3f8cde31be2e10402ee308c2067fcd50d1228759e93fc58c521b7fc12e6b259233a17cf99f55cda26279fed
 EBUILD colorclass-2.2.0-r1.ebuild 568 BLAKE2B fae7e6829a67d8b802a202d0aa5a71332892e72fed82c8abd4c037a2c3f9b931eef94aea7b100d90ed285a7ee18442737676d93f9c0d45ece7d37c8ce056bb0b SHA512 4a30401ee1f29d8cad655fc3c6721a0d195523775a7e6860c9dd90068ee632a20a45e272b6f2a149816baf7415730789adbdee2cf2f2645a62b9c4c894a99198
-MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
+MISC metadata.xml 374 BLAKE2B 1656d6f1d6a6d8bc75c1f2d9b790c85a5992ffb94f8bf56cac32dfd07833f8f8417b782f9418515c15bc0cac48659409a11a087ca8e839e1ec7743349727f511 SHA512 9ce3b60ea6e344f10daff59046d494090ef274cd905419dcfcc4f1e0a6f353d959d51ababd9744e9e1f0377452a5cebd52b5760a27fe55d3bf2b4e1500790551
diff --git a/dev-python/colorclass/metadata.xml b/dev-python/colorclass/metadata.xml
index 266e3f19ca59..a9434e20d624 100644
--- a/dev-python/colorclass/metadata.xml
+++ b/dev-python/colorclass/metadata.xml
@@ -4,4 +4,9 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">colorclass</remote-id>
+		<remote-id type="github">Robpol86/colorclass</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/configobj/Manifest b/dev-python/configobj/Manifest
index 88c2af7d398d..f9867f0b0852 100644
--- a/dev-python/configobj/Manifest
+++ b/dev-python/configobj/Manifest
@@ -1,6 +1,4 @@
 AUX configobj-5.0.6-fix-py2-tests.patch 1494 BLAKE2B 5c52aca50d606c0fa3fef6d2fb184b3d21bb45ca39c4cb5893aa67b06e46954110b4a2109fb1592931a1947b56b12a80a575baa54ca7dfbeb1981bb1c610137f SHA512 ff87d2b54a47cddb9dd77d43a3028805f98c76e7a0c9529d40fa2d936c8b23ede24931f2066665d0b6ba30db6f62ac4871605c6b89c4842eb93847eb2d6e1e8c
 DIST configobj-5.0.6.gh.tar.gz 143664 BLAKE2B b554d0aec903aecb55387a0164cd6f8d442e9fc1ab231ce7f7123e7a5041e07a86f5f7bf70492ca93fcdc1bd3caa5b855c427f060842e3b4a7524afbcc417a76 SHA512 326eb86e362f281ebf07abcb1cf7616abb270c482eafe842371cda8708245ca5e8262f1644b7164664ecc10e9004ed061c9de18cd233a657d4697dbc3ba3c59d
-DIST configobj-5.0.6.tar.gz 33248 BLAKE2B b58a22fdf247f1c3022108e24abb4de55620ce75f6aeb5f269f008a5668e07b8c1d0c49e4059d7f4c4c361d269ead39c3784377635c7718f92c2381e69c56cb5 SHA512 f253fdd0bc3fcd37f56c9ceb28f5c8c739b0861e099b07a3929645907c97b2261f0529850a95c1a42507846f72d88a0992fcd1e1d6fa8654dc713d120f769963
-EBUILD configobj-5.0.6-r1.ebuild 761 BLAKE2B 9b767d0b102973b7e2d5238932fd00eadef572878fb55bb88ca8facdbe6bac65d07aa4512726b278ab4289a106d75be47250d398243743e0ba7f6f8b9700e6e7 SHA512 469b470bfbd4a2230801a4bbf36c8f3943cba03aa14327be4deaf73d44cc3d104425a7edf9c8260e694d2605b58d316e99e85e20ceed3d5780a187b2c28d3e87
-EBUILD configobj-5.0.6.ebuild 981 BLAKE2B d6fd8c2cb300a411006b6ec0d5cb654b191d2ae0cc6076a177c748ba03f66533baf3e617524c3388d3235aa36c2fc3443dbcacbc1dfae9dfbd771b2d19abf941 SHA512 1911989a71c0235b0389acb6d2c354c2f75569c10cc99325d84f1d03ffa72292d9e099a7af11a9a59d4d9c51f92e38ffd36d7d778c7484a8f8d31c1c09cee305
-MISC metadata.xml 663 BLAKE2B e4c20390482c920c99164449489636bc0ce8305f38a96673898743a79bade7b6c09d6c9cb0fa5f7df84dd3791e7b78ac0e685e2c32dadfde1c44ad48f427a655 SHA512 c8c5d8bd7b5efd97310af1bc9dc172f3623f01b45b44c20ca33f92ad0d09845bcab10e6afd704df1188a747660ee4e7f519a55dc40ca5945c189611740e9c480
+EBUILD configobj-5.0.6-r1.ebuild 754 BLAKE2B 82a68c39645e5339d8bfdef3b86458cd7dd8b7efbec2179b6774d8f8834d2de77e10acc17d6a646b724af4cd217d5067acc4d958a3c316de06433046a8e42249 SHA512 ae2494e72766dc13b42d25783b6ce2fdceb7c305cb6c3dabbdcfa1660c7a2ef990fd9fd832d74722e0f834e5a382e8c67863c91059851cab9581e231c276c3f7
+MISC metadata.xml 688 BLAKE2B d4a4e54b638c6d5011dda8858341b089eaa20b6d92566586d95ed407b7d94d80a4272426fa2904176e084df92b0606c957f16bb6fa4692848f2044d5ba206386 SHA512 653fec16eb0773050fc60e0df5b8be0311801495f4fe109d6346319a24159f78af614b1c587f0521be47e0c608373289e6bb05dec8284ae01cbe55c52c34d780
diff --git a/dev-python/configobj/configobj-5.0.6-r1.ebuild b/dev-python/configobj/configobj-5.0.6-r1.ebuild
index 0326ad38559d..a7c732eb2cd4 100644
--- a/dev-python/configobj/configobj-5.0.6-r1.ebuild
+++ b/dev-python/configobj/configobj-5.0.6-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/DiffSK/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/configobj/configobj-5.0.6.ebuild b/dev-python/configobj/configobj-5.0.6.ebuild
deleted file mode 100644
index 41c7ea7f06d3..000000000000
--- a/dev-python/configobj/configobj-5.0.6.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple config file reader and writer"
-HOMEPAGE="http://www.voidspace.org.uk/python/configobj.html https://pypi.org/project/configobj/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# Not to install un-needed _version.py
-	sed -e "/^MODULES =/s/, '_version'//" -i setup.py || die
-	sed \
-		-e "s/^from _version import __version__$/__version__ = '${PV}'/" \
-		-i configobj.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${PYTHON}" validate.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/configobj/metadata.xml b/dev-python/configobj/metadata.xml
index 6d4c52e673c5..a315e8346053 100644
--- a/dev-python/configobj/metadata.xml
+++ b/dev-python/configobj/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <longdescription lang="en">
   ConfigObj is a simple but powerful config file reader and writer: an
   ini file round tripper. Its main feature is that it is very easy to
diff --git a/dev-python/confuse/Manifest b/dev-python/confuse/Manifest
index b96a68eacd04..11e910ea7b40 100644
--- a/dev-python/confuse/Manifest
+++ b/dev-python/confuse/Manifest
@@ -2,4 +2,4 @@ DIST confuse-1.0.0.tar.gz 34790 BLAKE2B efa23f59e6d450160af279042ed3d77b3b26bd1f
 DIST confuse-1.4.0.tar.gz 36020 BLAKE2B a11becf564c84177f919b4c6936dc9452a2821d9dec190167d8eefc141c424323a2cf1934e608028ac07c7290eb4e139a9051904b13fc4ea00594185db10ec2c SHA512 4a06568f3369d08f177e9f639f59511c565961b15b6a8bc3a7fd244396b47c19c163aa05abab96cce5078b962a98763fc0c5739ff8bbd98a5976696ad6240c2d
 EBUILD confuse-1.0.0.ebuild 951 BLAKE2B 850c9ff33439c653f186e8093bea5df58b8cdc9887394b0d079f734bffb57b380a0ea9927013755760c6c4718458a0b4a0c7e095cdc16e2693a81a822f522841 SHA512 1ec796da1398cccbf84d7d6bfa93dc82c560678f0e211f8d2834eac8d6a32b8b7bec8636c9bdaf88ff9809452126084f475644436b2dca88dd383ddb7fe616a6
 EBUILD confuse-1.4.0.ebuild 710 BLAKE2B ebab635705b36a72e14154e960ce881be1a3a080c9e694d4a4dcc52ac052c0dfe4588b205f4d4d17c9d21ecc0d48f5899ebba0cb918ba8513e38835b5cdb5647 SHA512 7d89f06d6b4a2890860dc2b8856ef49c137b320afad37694b4a058928a15385a2473ad2fa362547afc2130fd95fde77d3876bbab2591f484a6db9e193a5782c8
-MISC metadata.xml 701 BLAKE2B bce609dc69af849b9a0170310c00d7bb8e3d0558eb7766f7c8ed3795fc94b8dffd7b2e0b02d73ce0141672ef85f6efd8c88998e1fe13978d006a7489ad4cfc0e SHA512 ef254dde3f95264808212b15058e31b0eaf03d4f8b304242d1dee2b6c10d4255109c48ed534394f1fbf9ee19f020b1ef51e8e0148dff9549507183ad1c14d65e
+MISC metadata.xml 746 BLAKE2B 0bf69273ad54619bc158b823837952e24962f31420f00bb239bb647dd54dcecaa03c18b5d587a1c3c56f8f60a7e5e1f2125d91643a6f01e2cece5e2002989acc SHA512 ad6c5bf41154439c02d4b4fdbba4f49542f9149eee175bccedf504e3b9a371f62a578b2710154f32edc24144996eb343102d434f752269aea651fafa9c87554e
diff --git a/dev-python/confuse/metadata.xml b/dev-python/confuse/metadata.xml
index 30a66ee8e064..0f6926bfc340 100644
--- a/dev-python/confuse/metadata.xml
+++ b/dev-python/confuse/metadata.xml
@@ -16,5 +16,6 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="github">beetbox/confuse</remote-id>
+		<remote-id type="pypi">confuse</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/consonance/Manifest b/dev-python/consonance/Manifest
index 2128098b259d..8026bbc0195f 100644
--- a/dev-python/consonance/Manifest
+++ b/dev-python/consonance/Manifest
@@ -1,3 +1,3 @@
 DIST consonance-0.1.3.tar.gz 30762 BLAKE2B c30db2741a851ae1ef02361102c432d931925125d8648c0e5b1a88005f480219eaf81e8205559dd709b43e98b3925777d1fecf702577e38c3ec1c8f4e8a19cce SHA512 9f36f81b453dc4de2217a997580bb3f8747c86a8116275ba5a0e86cc66ec62d6490ae20c0e5f7401d1c16d601686936ba7b789999941c657a0b508ce0dea1cea
 EBUILD consonance-0.1.3-r1.ebuild 904 BLAKE2B b4d8238e001ebf42ba44938cde4a7bd16d2c0acab156f51cf0cf42c0427a7f57e0b80bbebbc9dceb546cf10f5d573184b887b23439876f406a11e269025e2a48 SHA512 69f675c212caf42bc782f136067e2efa693ac2c8465858c9483505e66f72128411a3802a744943731dcae588bf3be18ecfc8d34f7909d435213b8a5ad8035e75
-MISC metadata.xml 582 BLAKE2B b36276e39edda1de4250583df9a2deb2118b0433ffe44c20960108f79857efc8b3c86950e8fe1b8cf115d40dfc767eb14908886b7e86e108582d3262ec960561 SHA512 fff3526cfea536ac2704be7a8da499b4d4a64f07f5682ed48ab84bbd1ecfdc9e2272d46eb3623a8623097544da121ad8de826ba474579e201b614ff7d61c6572
+MISC metadata.xml 630 BLAKE2B d2441eb3403b196b5b97a7ca65b56991c11c409f85e514607f9b52e61aa7abe8541a1523c44b45b689011d788efbb0a5b613a8e0a4b555b60b980d633611393c SHA512 6f14827ea26a75f9513f3553a2c1316fa8ef7acc114f5bfb933aa273f7ae2bcdf41eef169d65454acabbde4dac16087cd801cbea801abeb86e3e94e405920c52
diff --git a/dev-python/consonance/metadata.xml b/dev-python/consonance/metadata.xml
index 185f266d7db9..c701381ea1c2 100644
--- a/dev-python/consonance/metadata.xml
+++ b/dev-python/consonance/metadata.xml
@@ -13,5 +13,6 @@
 	<upstream>
 		<bugs-to>https://github.com/tgalal/consonance/issues</bugs-to>
 		<remote-id type="github">tgalal/consonance</remote-id>
+		<remote-id type="pypi">consonance</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/cookies/Manifest b/dev-python/cookies/Manifest
index e9b75f2a5beb..23903fa0a28e 100644
--- a/dev-python/cookies/Manifest
+++ b/dev-python/cookies/Manifest
@@ -1,5 +1,5 @@
 AUX cookies-2.2.1-fix-warnings.patch 9038 BLAKE2B 78692c413a2a5495dc43c544cbc27410a341088c8ffc8cfb8543ef0a6f7e7393ae37379912dada2cf0e4ce8b238160244305869a12629ede435dfcb6df334910 SHA512 cc18c782d07bda0518a1d0824281ac068bc97684abc505ba24bc895e6f43f70bc16835c9781ffada42175ac2cb9dde7a200b0746910e7106c3b41e8a9a0cb382
 AUX cookies-2.2.1-tests.patch 1131 BLAKE2B c98b40cab2a20b5779e670bfb481f34abaa080d0780a76127f12783f0fd108b67c590d01304f2f173ab5808fd8f9ad7ef65d0227a1f31eac4296302b7610ea81 SHA512 ff571d810ca576a9dbcea1960056ed05ceaf738148324d434409b03cf399d43ecb5b13fe228da54465d020c6cabe109a447f1a04a37d1276feaf5be6cf38eea9
 DIST cookies-2.2.1.tar.gz 40704 BLAKE2B 422d70f15e93193ac9c4865f988b22a895a81c59ae98a86cb90289940c283f3998a7e1d3b7ecc0a4f4b004d6b4b64de6743cae7a10f45d9bd1e6136ff35518c0 SHA512 76f362a9a1d74b87c90c5b91ad806d872612d31f487e4067a627409316f6099602c9e5a429f85ce20adcb0a7b63dd131b9e1ecc5c0c6444d1569367432a719de
-EBUILD cookies-2.2.1-r1.ebuild 651 BLAKE2B 1762d12bbd783e9c382774286866ede3a5a363637a7c14b8e18d6b8a71ec84babed9f21f459db5d4118093bdaf04ccc920cc2c423f7009458eb211418300f6ac SHA512 5eeb2c07ef9acad56945b40abe8510103882a6a26b6ee3cf6a0f2ead122415507834c5d3183c63c393ab8432dc127d4b24dc908fbf84986f2fa8a39fb98ba9d4
+EBUILD cookies-2.2.1-r1.ebuild 656 BLAKE2B de20ddaad29f095f59d1657e41d1d731c204924592d28162b7d756c3b21ab41adb2e3a9d14e2ebe3742067c6efbb6664a3d68d9ce9ae8fbffc44baef3b5e35f1 SHA512 c976f424c7c8579f9c56039f0fb46e9ed5b87d5ae48e189a7e30881ddcb9bda0aec02d33012ad25f764fd67da9fc450e4d351e8dd13fc03f0678b062cec41be3
 MISC metadata.xml 310 BLAKE2B 3f44f9692738692ca4eff801de2fa67bf33220d8b5a94985dcf33c21d1b18b78f6dc8f13bdc42b4edb4afa96a869583c6caa0643190ec68a24c57852c4212d8b SHA512 b98da30bc8b8f3deb352a59ca73a88a9640cadbc20b3049523930f6e671cd057d19b4dbd559702efdac09ba1ed238b7df95502e9203f1d34147fdea5a308c82b
diff --git a/dev-python/cookies/cookies-2.2.1-r1.ebuild b/dev-python/cookies/cookies-2.2.1-r1.ebuild
index 0f5a2fce13ed..0abe9efe445e 100644
--- a/dev-python/cookies/cookies-2.2.1-r1.ebuild
+++ b/dev-python/cookies/cookies-2.2.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 
 PATCHES=(
 	# https://gitlab.com/sashahart/cookies/merge_requests/2
diff --git a/dev-python/coreapi/Manifest b/dev-python/coreapi/Manifest
index 234ebf1372ec..7b754bb73c75 100644
--- a/dev-python/coreapi/Manifest
+++ b/dev-python/coreapi/Manifest
@@ -1,3 +1,3 @@
 DIST coreapi-2.3.3.tar.gz 18788 BLAKE2B f7837d6a0430e6617a2589aa84a209b3c544a913773bc4388c3bdef7348c83577e1b216e83c14736b15174ede840ae297b050eba551b4fe22d784e4d51677956 SHA512 5a66cf9613a9e11046577684b837f48e17db2285d14a51a77aa47eb945eef72a9ee0525b7b1b1c57fddec102c144ce56430ed5a95717e77d906d0b617dce708d
-EBUILD coreapi-2.3.3-r1.ebuild 598 BLAKE2B 998cd11e473eed824b9d91784dc4d64a86281118be03358a3b6c2adb50fd313a8fc396c0edf9641863dd969517b74420d7a52baa041f26903520e213226cb347 SHA512 973e4d54b14f3442bee47e457cc6e3ec31eea7e1dfc1c27de4c9fef7854130da8c780e615b7e2dbdcab83254396d9b65af975a25842ef48589e7c165bc00d220
-MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
+EBUILD coreapi-2.3.3-r1.ebuild 594 BLAKE2B d8364d0e2b591386f4fa38d34aca08ec7e20d3c76ff5a38769cfaa805d27afcde89201d6e821891bef8f4635005504013f5f919c59c218ecf68c49db6cfbae6d SHA512 0937fa52366a22cf238d89bdd5c8585b403f2ae70ba698ab3fb5d0f16fd2eec1afdd16970884fa53a2b13af5ff65dcd0c742d6481b50a52a16ecd2e2a0fe0006
+MISC metadata.xml 318 BLAKE2B 20a9a2b6d5d8999992260fe1fede9c0c764981692b123d35292b0bfdad2fc5574684dacea613abf3608da24360fda08a95d9a6cd891409528970e4db8802b190 SHA512 280feaca87f7aab6b051c19b2a5bf882108272a31f8f5ee3143f8cb9c3ba52fd24a1d115dc0966b6f41a13d5c620b57455c2cc5897cf1e1892ad61c57fce1a34
diff --git a/dev-python/coreapi/coreapi-2.3.3-r1.ebuild b/dev-python/coreapi/coreapi-2.3.3-r1.ebuild
index 61a0d757cfe6..b8f32cf2ee23 100644
--- a/dev-python/coreapi/coreapi-2.3.3-r1.ebuild
+++ b/dev-python/coreapi/coreapi-2.3.3-r1.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 python3_7 )
+PYTHON_COMPAT=( python3_{6..9} )
+
 inherit distutils-r1
 
 DESCRIPTION="Python client library for Core API"
diff --git a/dev-python/coreapi/metadata.xml b/dev-python/coreapi/metadata.xml
index c36c37139fad..dcf00dccb5e5 100644
--- a/dev-python/coreapi/metadata.xml
+++ b/dev-python/coreapi/metadata.xml
@@ -5,4 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">coreapi</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/coreschema/Manifest b/dev-python/coreschema/Manifest
index 64c0f16d89bd..95b2d980de6a 100644
--- a/dev-python/coreschema/Manifest
+++ b/dev-python/coreschema/Manifest
@@ -1,3 +1,3 @@
 DIST coreschema-0.0.4.tar.gz 10974 BLAKE2B 8bddafea9eb82140cdf2b2cd40ffc31dd4a0457f8ca216986807657a5021f7a4319f1e3db27caf7d471f8617f6f0c3a6d79ebfe7e0285bc9a6627f93d6efa760 SHA512 21a35b29cd0bb96dacaeeb0bd0faaaa4ee8875bf9639b431b59f17c41ee4829173932a6b35760caa3b46a0ec39ca173fe896b26b740fe97df36943270bc2bd3d
-EBUILD coreschema-0.0.4.ebuild 457 BLAKE2B 648eed117503ceeaa99b9b867b882301d48f3649297a65984965632da9961e3bc578bf01f13bfc69ed38f66cf9845ead12e6955173bc33705489a0bd41a32a12 SHA512 4b5b8ec09494fb3b9f0e4449eb5b2f349377dd4c4eced2b63fdb2973445a19469e4745b535e455cecb07bae0e049c13208d6860b3e3560b1dbae7a3da3dfeb78
-MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
+EBUILD coreschema-0.0.4.ebuild 453 BLAKE2B 52f7ef51e08091555cffba36308199f7caa0a28a41757b0e7eb72f8f56e327d6440cb81ff4060d629e7c709bdf3ad8ed747b42552715605793152939786049ba SHA512 101f09818320b42b0cc385951e2ce18e00c0b3e15bde42248edc26e2a1de54e497d27afb8533939ccb3b581cb60c005aad30670820cdea8dd235fcee78d02b9f
+MISC metadata.xml 321 BLAKE2B 0d945d507cdca835659c7952bc4531cc4761bb72101e6dc1d1f770cf48848ff9b8bc3ed9ca08d9b819e5ca706b19d19c44c55adccaf88e2d5386c0d32bbceb10 SHA512 41665a189bf9b4b255809327884274b8f7f450520bbbb73aad03c3e812398ad601c4fe3d25d9748879cd9b5e82437dd5dd63381911e162493cbeb897390095a3
diff --git a/dev-python/coreschema/coreschema-0.0.4.ebuild b/dev-python/coreschema/coreschema-0.0.4.ebuild
index f402f85a12df..ba5eb3d7d97f 100644
--- a/dev-python/coreschema/coreschema-0.0.4.ebuild
+++ b/dev-python/coreschema/coreschema-0.0.4.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 python3_7 )
+PYTHON_COMPAT=( python3_{6..9} )
+
 inherit distutils-r1
 
 DESCRIPTION="Core Schema"
diff --git a/dev-python/coreschema/metadata.xml b/dev-python/coreschema/metadata.xml
index c36c37139fad..187eee7c7894 100644
--- a/dev-python/coreschema/metadata.xml
+++ b/dev-python/coreschema/metadata.xml
@@ -5,4 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">coreschema</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/couchdb-python/Manifest b/dev-python/couchdb-python/Manifest
deleted file mode 100644
index ca18a291bd47..000000000000
--- a/dev-python/couchdb-python/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST CouchDB-1.1.tar.gz 60839 BLAKE2B d3fe1195083f0e0e36dfc25ca25d08e5f447ad34b8908bacedb43d81979ce7bf926100297422439103f8ef3a8bd398e408c19ad676461ad5908d79b92b4d9661 SHA512 f68a0bb04f74cf91ae7d190eedec2a9c24c03dd0ef333c27cca7ef7abc95d3d355f78d653d68371a0d27dcc9a8d69f5886627f0eb0c6af49b632becf6bd0668f
-EBUILD couchdb-python-1.1.ebuild 933 BLAKE2B 7ebd20eee297ecc9355a949af05a082c470b568981f128411b71a12c519079f31d3e98c7527eb4d32fea34676619e2a83dff01bd38bc93e856e0472d87b4cebc SHA512 8070ca8356afec7a7c432a3b34ecc872f5765ab8cd8403954483061f6244f96302ddec20a9b62d7b4534deb544bc801c436d59d1dd58b41fb9bac867e13662e0
-MISC metadata.xml 492 BLAKE2B 238ee8a64a2463e5e261c9d43fe9853fa7b5cfb135d9961f798e60937c9618e11dcb3d28ba9cda9a6fb017c1f31783ffd0aa15d3a9e94cb1418a768b327e1a81 SHA512 69b7bd6ace846417beb252df5372a01726879e839a14c8586deb33a6ff53a2279b088f822cd30d86af58197d9202526eac40d9394f74dbc4093b1dc23277b10f
diff --git a/dev-python/couchdb-python/couchdb-python-1.1.ebuild b/dev-python/couchdb-python/couchdb-python-1.1.ebuild
deleted file mode 100644
index 22089250d21a..000000000000
--- a/dev-python/couchdb-python/couchdb-python-1.1.ebuild
+++ /dev/null
@@ -1,42 +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} )
-
-inherit distutils-r1
-
-MY_PN="CouchDB"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python library for working with CouchDB"
-HOMEPAGE="https://github.com/djc/couchdb-python https://pypi.org/project/CouchDB/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-S=${WORKDIR}/${MY_P}
-
-# Tests require connectivity to a couchdb server.
-# Re-enable when the ebuild is capable of starting a local couchdb
-# instance.
-RESTRICT=test
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/crcmod/Manifest b/dev-python/crcmod/Manifest
index 37672c8d9efe..c6a180d2d990 100644
--- a/dev-python/crcmod/Manifest
+++ b/dev-python/crcmod/Manifest
@@ -1,3 +1,3 @@
 DIST crcmod-1.7.tar.gz 89670 BLAKE2B 542bdde18f4565f574a2746de5e1fcb10d015d5c89f3eba7a0c316a3e53eb5a895664e2f51e54dcbab7d2ee6f30055137f22498f44b6c27d40d0692ff9652813 SHA512 3c2f65004761c84f19d6ba95a0af74512108bad5007d9e20f8e684822e4196ce17073e58b47d2fa997e058e3d82782f3393458b6f0e86935418f38877d319a31
 EBUILD crcmod-1.7-r4.ebuild 510 BLAKE2B 310a6f9e4faf51fce9bc62a949860d8d56b4cfd43eded19755b9931b51b1c63715aea84cb1e7e14fe92674cf469aee45c9b4697a632d78babc4b4445709c91e1 SHA512 ffe578001beaf2b11a95d0de5765a40a1bc86133bd31b51ebb0dd74aa64644bc0e2af3bced7ced5fc7f2d934426fbf5a146ef574a81b9f662dc6254e86b9042c
-MISC metadata.xml 592 BLAKE2B d936b9da244fdf7e037e990eb21fa657a29e77351583bcb07485e1a89b995bfa63cc135573eaca2dc9bd5c0a5a1df88f4940c7d47dc9aa2ac14731e3882883c1 SHA512 b2cd4011048abcfd7853c8411820b7f5d8ca69ec9c12f121f4c2f406989a8a829bb998c05019e68c0dd702f32ccdae94e83d4897d174c4e09a99177ae3a89433
+MISC metadata.xml 636 BLAKE2B 069e35c666b73c29f748950d85e104a0df9106b579ff56a03fcd83113309781d822504dae0199d132cef3c7310ad4c4ffad5c225143c576232bdd3b7a4909865 SHA512 0791b8f3367307f2a8548557601a990a740cc13da7c3ecc65d7a50a521f264bf18dbfe03746190909e691fe6f800628409751cfa34449732d0396c2d3f7d15a6
diff --git a/dev-python/crcmod/metadata.xml b/dev-python/crcmod/metadata.xml
index 1ca4db946408..4ce1ace987ca 100644
--- a/dev-python/crcmod/metadata.xml
+++ b/dev-python/crcmod/metadata.xml
@@ -13,5 +13,6 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">crcmod</remote-id>
+		<remote-id type="pypi">crcmod</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index 4d8bd41b8d99..b8f11c5ec6dc 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -1,7 +1,10 @@
 DIST cryptography-3.2.1.tar.gz 540994 BLAKE2B 667f09ac81423ecdc84c8646f0d02ee3a2955f55d35623e59c07696810a93c47332f7f8d877918eeeb6581d8e02bde3b70aae8e9d32be7ffbc8011e5e7e382a9 SHA512 e3f1806693c24aadc3ef0df374ce1845760e87ad7c243226b75e80820b50bdc0760e4bb5f6ce26d62a6d23736b3109f72cd30b52ae2a36b26ec5656ec96c6175
 DIST cryptography-3.2.tar.gz 540815 BLAKE2B be4edd5d4cd9564e8622284ff9b1d3a7cc7d6e46cfa790d8e1cfa1ce389c5d628e39b056dc5cba3b94ab3fa45603df73a7b4ebd9d1c70fc88c457780f6616311 SHA512 0096e6408b5868cc0b5e6f67945e4200bb943a00ac803546048fa4d332f81af4a224b2d67b911ee8da1ad086120935d7d557fc70a739ecffb22f408ee9b8d09e
+DIST cryptography-3.3.1.tar.gz 539756 BLAKE2B a3eb52d756565ae83d9f2e06045be1d3439a2464b633a9a168101796a448d7c7531e8247862f7996d04500347d32dcebf6b1352e9c9f2e4f0d8008d4bbd000dc SHA512 62192fe0fd3bb8844ccc0056ab72a42b038db2a4ecb0928543c520b85e1de93066dab0d604acf23d37395d68172b9618f81c6022a59ec49725bc1862096d15d1
 DIST cryptography_vectors-3.2.1.tar.gz 35168164 BLAKE2B 77af3be0dbd7393da7cd59600086041b78fe20339018a637fc1cf3600c7cd08cf2e565c79ccb47f4719a4b0f01cf2ab2db00c025805443b333dd7fdf3aa835a7 SHA512 44ff756a6ece9700f7657f8ba92417e95bf273cf500f1dab2141de5b2af6e61840d65c37b766abd752c76025ead1550bfc7b7340ce5774c75fd0bb8ac768cdd8
 DIST cryptography_vectors-3.2.tar.gz 35168065 BLAKE2B ebd915eee9b91bd61445bcb442d3052972b1463132b8e63343832baa27c25566e22ca9f50c9d4ea73cb12185f9228144eaac4bf5cc68a3bd79f347fe2d021adc SHA512 bb0d00c8a66fd328ef38b0008519856a14d35b6fd634a6f67ea5530775d36538fbd326326c3f0cd962b1a008c21f2aded4d733f97bc12577679ed8be67b858bc
-EBUILD cryptography-3.2.1.ebuild 1605 BLAKE2B 9d22469b0be63f6c0b3d613be76f595132ca1580f7d96ac66586b690cf1eba2e7e1c9b415aa0ccb279156b31657ab34992d05ae4d2dbeefde98e104b4c161084 SHA512 b339960a16d44f5a3c38107d88976490a2d124bcd6073ba4b1486c3e354fa77386b05f7b212df35aedeb5461354e34b500ee8fd9cc908adeffedbe316c9a02b6
+DIST cryptography_vectors-3.3.1.tar.gz 35168171 BLAKE2B 72cf5d79773a728c16847e3e62f8ce444526c051d7562467446d3e59c66064568fdfcbfb1fd35419fd79079ff9a02a2f3a97f870f7adef6cc9a0fd23b4edf514 SHA512 a102535bd3cf72118106ca7268d5a9921738d41f81247940c550961d61cb0d1869095b7891c39e8dc15816f7d38230622846747b4b7a3f226f09306cf86220bd
+EBUILD cryptography-3.2.1.ebuild 1942 BLAKE2B 2872701d3b66af19dc2825cee1e27f950f5cdfd4900e3ba25bde668b1a088a8968d3bb377ca67591f3275eaa2acefd0b673df3ac58e44cee039cab32bcbb9e83 SHA512 4c45006b80c4eeb826303e3f70e855796164d88e732af05052d9176d21327f14122f120cabca616b21543a725eba6a8449f431832850c5e42acdd5c8f716305f
 EBUILD cryptography-3.2.ebuild 1597 BLAKE2B ce9b411af9b2e2fcad65d7f017e8b36cbb6a032451fd8c75b036af869ef1342d5fd3bf7b36faf16a4070dc2f5a3177212322c6ef32111785db4bb8103f39b8b3 SHA512 37ede133d250d4c7eb0d0044a3943d2a963f9ed2b173bb2e4bafec10f88e8dd0ef20086628fdd526af90128d08888a035876e83464686b125d0282f2ebf549bf
+EBUILD cryptography-3.3.1.ebuild 1948 BLAKE2B 5bf3fa11739316e3c65da69c4ae33a0f9e873784c27607dd6a83ce6966e89cb0a545ccb551108d5b28348e83772036998793285824a3bc6f1e89c56abb9c50e8 SHA512 267b725bcd5b8dcc247369c88e862da5c20176fa32ab4bb3afbee1d0bb548d649a78406de29af2363e8c2e234e7868c90e7f84f288722e0d328359d6373b0cab
 MISC metadata.xml 499 BLAKE2B 2e4c37917ebb1604f399b0db4abe27b02b133a2cc8fb69fbbf52b6fdc0aee079dde61be188bfa5bca043a1804a670ffb53f6ab1e79147230166f696741fadad8 SHA512 26eda8b0a2ac91dce2946e18e941e2e75df15e4583e4ddb1f1329403eaae30db9976017f92981c462bfb8c8a559de2a2ea9531f4ac5ccb2d57cadb00e68e05ec
diff --git a/dev-python/cryptography/cryptography-3.2.1.ebuild b/dev-python/cryptography/cryptography-3.2.1.ebuild
index c0d4715e4df5..f6ebc6c81528 100644
--- a/dev-python/cryptography/cryptography-3.2.1.ebuild
+++ b/dev-python/cryptography/cryptography-3.2.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="libressl idna"
 
 RDEPEND="
@@ -46,6 +46,20 @@ RDEPEND+=${DEPEND}
 
 DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
 
+src_prepare() {
+	default
+
+	# work around availability macros not supported in GCC (yet)
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		local darwinok=0
+		if [[ ${CHOST##*-darwin} -ge 16 ]] ; then
+			darwinok=1
+		fi
+		sed -i -e 's/__builtin_available(macOS 10\.12, \*)/'"${darwinok}"'/' \
+			src/_cffi_src/openssl/src/osrandom_engine.c || die
+	fi
+}
+
 python_test() {
 	local -x PYTHONPATH=${PYTHONPATH}:${WORKDIR}/${VEC_P}
 	pytest -vv -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
diff --git a/dev-python/cryptography/cryptography-3.3.1.ebuild b/dev-python/cryptography/cryptography-3.3.1.ebuild
new file mode 100644
index 000000000000..bde114eb1121
--- /dev/null
+++ b/dev-python/cryptography/cryptography-3.3.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 multiprocessing
+
+VEC_P=cryptography_vectors-${PV}
+DESCRIPTION="Library providing cryptographic recipes and primitives"
+HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	test? ( mirror://pypi/c/cryptography_vectors/${VEC_P}.tar.gz )"
+
+LICENSE="|| ( Apache-2.0 BSD )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="libressl idna"
+
+RDEPEND="
+	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+	idna? ( >=dev-python/idna-2.1[${PYTHON_USEDEP}] )
+	$(python_gen_cond_dep '
+		>=dev-python/cffi-1.8:=[${PYTHON_USEDEP}]
+	' 'python*')
+	"
+BDEPEND="
+	test? (
+		>=dev-python/hypothesis-1.11.4[${PYTHON_USEDEP}]
+		dev-python/iso8601[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+DEPEND="
+	!libressl? ( >=dev-libs/openssl-1.0.2o-r6:0= )
+	libressl? ( >=dev-libs/libressl-2.9.1:0= )
+	"
+RDEPEND+=${DEPEND}
+
+DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
+
+src_prepare() {
+	default
+
+	# work around availability macros not supported in GCC (yet)
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		local darwinok=0
+		if [[ ${CHOST##*-darwin} -ge 16 ]] ; then
+			darwinok=1
+		fi
+		sed -i -e 's/__builtin_available(macOS 10\.12, \*)/'"${darwinok}"'/' \
+			src/_cffi_src/openssl/src/osrandom_engine.c || die
+	fi
+}
+
+python_test() {
+	local -x PYTHONPATH=${PYTHONPATH}:${WORKDIR}/${VEC_P}
+	pytest -vv -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
+		die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/css-parser/Manifest b/dev-python/css-parser/Manifest
index 6212f745734e..7c9f4bd3e44c 100644
--- a/dev-python/css-parser/Manifest
+++ b/dev-python/css-parser/Manifest
@@ -1,3 +1,3 @@
 DIST css-parser-1.0.4.tar.gz 143977 BLAKE2B 94a42d751a90d306b0dd2d503d8d9c326509b438d1f52b5567e6f6db7d80e7a6d2c37cbfa0db79225cc4d0fd5df612b3e430fa1c62604a2f8990d20678019af0 SHA512 3781128e55c1e72aa00369873e214f683e3f42944ae83d399697adb7d2966f68fb500c39982845ce9cd06078e4021838d82b06f99d90938069371da8a89a0857
 EBUILD css-parser-1.0.4-r1.ebuild 526 BLAKE2B f268ac00fc5e42cceeee3251bea9eba8503bc7ea715dfa12668942153af955d8fa711eadd7f198c33c5ecbc8649aa19b4da40ddc9ff50b8b8e72c1141e33440b SHA512 dcfef816f61f72f5b4aeb8b6ed57aba8e039c3cc67124bd207d7987e060cd4103f52393b50d051adaad7ef5f35319477c7e9789536694b051b06546489e0017d
-MISC metadata.xml 313 BLAKE2B bf6a2cf19a6d43b19692e4d932d695a811d10530fadb6b33a6f329be4ce815bb36ded2c7a1b3b0081237543954972d58ae115576d4ff0c3d4fc0309fb77f3a58 SHA512 1ca073d67b4f5afa950071e961b091993c0f14a66073e28f33604bc5cf5820d9f4701901d93f8db46a91b1fb6b7a05b8164a749823e2c59959640e8771b3126f
+MISC metadata.xml 353 BLAKE2B 80a5c57121e677736428a469c564718517f745cf24b00d8493a0035d125038cc9286ff3b2b826e941098ba3d5f1713d32f33e699c78f4387c0b995e566a545e8 SHA512 2916ec27cb3c474df265a5f937d1d6555fd6abb8e97f94301a383afd924edb61eeeee3c9dfc220c4ae3322555077f499f384f4b33ba5416b72c2054382cdcbca
diff --git a/dev-python/css-parser/metadata.xml b/dev-python/css-parser/metadata.xml
index 4409159ffa70..96600ef2547c 100644
--- a/dev-python/css-parser/metadata.xml
+++ b/dev-python/css-parser/metadata.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>zmedico@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">ebook-utils/css-parser</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ebook-utils/css-parser</remote-id>
+		<remote-id type="pypi">css-parser</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/cssselect/Manifest b/dev-python/cssselect/Manifest
index af59e66b4856..4b66f0539830 100644
--- a/dev-python/cssselect/Manifest
+++ b/dev-python/cssselect/Manifest
@@ -1,3 +1,3 @@
 DIST cssselect-1.1.0.tar.gz 35516 BLAKE2B b4480ad4335ba15ae8a2ae758ff942865a5b61de68b3b00fb59d517b1dacfce1cd817280e4aac562dbf829f90601a56220f01d99aecbc502420b9102e50c46ca SHA512 b33bca6a026f4de37b75606fd238dbd170b57d06288fbff3ea97ce79685a99af275fb8522b04ea9d6693aba5a18541d70b657191fdad881be79718bcf2e7655c
 EBUILD cssselect-1.1.0-r1.ebuild 768 BLAKE2B ca30ca2d63fd9005c0cdbb78bc79994e8f1fc67d217e9a5b264ef29143daa363e24d33baf41773285346e372fd24a05f1aa04aa308668c917328f977de7964c5 SHA512 30f6f728af71dc212e0d759bd3029aaf4c882312a7b98983c3113c21d31be6686fcbc29572b675956dc6e8546952c793200f831ddc7b53a5366674e2501520ed
-MISC metadata.xml 347 BLAKE2B 20bb640e393498fbdc33ca98b9c12f00a1edeed7045bf994c19f54a58a12d5fc49febde2b8942a8ed5c4062bd0b5d6e7ee8e54a54b3d9d7cfc3b4c461463fdcc SHA512 30350a626aa8234991a13f4f650ff05495ee177f9d6acb21973325a8616df5db76bf5db0a3046f7050601f4938684e71777bdc85171902f6c915596eccde215e
+MISC metadata.xml 392 BLAKE2B 303b60a36eb7f9c18b3f6a9a7fc164ce8e0896165200bd418718a47d77e8a9d970ce0eb274702b7bf24cc3bdd0b385036bcd5d01cf40fb724587369001223693 SHA512 03d9bc1936c4b6567027916468d2e12f29be783763d1a19719de78e59a142e247d51844b4ae9d12aa533b195473b2057ce6d5e08ef9d548358fadc7f4eaf558c
diff --git a/dev-python/cssselect/metadata.xml b/dev-python/cssselect/metadata.xml
index 56773600370c..534bff56c2a2 100644
--- a/dev-python/cssselect/metadata.xml
+++ b/dev-python/cssselect/metadata.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="pypi">cssselect</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">cssselect</remote-id>
+		<remote-id type="github">scrapy/cssselect</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/cssselect2/Manifest b/dev-python/cssselect2/Manifest
index 24aa3cfcd5a8..4f72993bbd66 100644
--- a/dev-python/cssselect2/Manifest
+++ b/dev-python/cssselect2/Manifest
@@ -2,4 +2,4 @@ DIST cssselect2-0.3.0.tar.gz 29534 BLAKE2B d7426d72c52ab2cbdbadfb935b3d4f1f23cbc
 DIST cssselect2-0.4.1.tar.gz 32756 BLAKE2B 86915c39aa5b72ebcdba25b3ac23f59a0fb6c6109019d68e8ce8846572d9412a3cc76cdf9e8b2163605cb942183019eb9170df9a4e61476d703eaf612381a903 SHA512 feafeec3dbe3157ee452d94cd391a09cfcb48ca8bd1563c117c77c9ceb01102c4989611ede39e433ec25d3ddda98a94c4589ccb290b79c729683e673763b42ac
 EBUILD cssselect2-0.3.0.ebuild 714 BLAKE2B 982bb2d99d8627720ebd8436f332e92265298eb8ea9ad99b63e0eb7c53e27d9a62a21e2a3a7aa14b64f97a96a993bcccc6c7c2cc5e9eacf9aa73be5adc791bff SHA512 0540e406fc5e79a16eb8b84823d86ebfbe62c3c8e2c3a4ae16198ba33cdf0f59b830d490a16f9895e7564d25c2caa620f3e604ae1a35e7de45621b12c28c7911
 EBUILD cssselect2-0.4.1.ebuild 724 BLAKE2B ae66b7f80b6c157642ca654865dab86468d8c306e5cf032be2f25fad910a3a95f809978892481a2776d8e1c113a7e83086867ec1b36f47cc0e2ab72120f5e618 SHA512 4d88fddf8e9c35ee3850b71753ccb54fe23eab2194f196b888212a85f9557ac57f3593fd95dbf6175ef10bdcba545506fff8a37a4f2056fa0157c7d879b38b11
-MISC metadata.xml 323 BLAKE2B d7d2c7c44a6d77f88dbdcd8a0543282203a71e28f2b64f637d92d37cad737fa6e27d339d6d2c66fb96f83aead59794ef4da5fcabcfc51f1945c781b6c4295a89 SHA512 977631018db4c06abc89d7eeb92640e7a045c64fdc96ef9d69a4191a6e3e07f6ecea37c779b9fef2e01a433dfcb311e991b31fe4656119fd445154628789c005
+MISC metadata.xml 393 BLAKE2B e95fef65fc2e47cd5174d88c9903082b1c842b3f9f1df386c2b3361834ff9d44017cd16354b0683840184282404638c34e206c5e47e51ca25d579a545c583243 SHA512 dea924c8ebffb69f3e79d0d2e7877d1bb0064f9019c33f77f5dabad3d6553e5fcc224e52beb92d055fd6a82ae2771e9413bb4d288588c88c7c7e25e973258ad4
diff --git a/dev-python/cssselect2/metadata.xml b/dev-python/cssselect2/metadata.xml
index 5e93d5bcc827..c6a21dbbcc3e 100644
--- a/dev-python/cssselect2/metadata.xml
+++ b/dev-python/cssselect2/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">cssselect2</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">cssselect2</remote-id>
+		<remote-id type="github">Kozea/cssselect2</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/csv23/Manifest b/dev-python/csv23/Manifest
index f1ad0a3c42fc..a50829a9eaad 100644
--- a/dev-python/csv23/Manifest
+++ b/dev-python/csv23/Manifest
@@ -1,3 +1,3 @@
 DIST csv23-0.3.2.tar.gz 24132 BLAKE2B 2c5eb231814e087dce9689c7075bdbc3875b3e200dc1273022d55661ec60f18a5bcb03e062b205fde13e845e5e50d530b07596b51ad7b2a89e41b45629bf3ce8 SHA512 289386cce5de4ae5bc42fc56d1639bbd1483034e5422f63142c1d188de735b1f5f18f9f69e3cb96f4ac3e1d7d0b371b1c45e720982c4f4b539fcf0d2da893f6a
 EBUILD csv23-0.3.2-r1.ebuild 753 BLAKE2B 4f908e5efcee009259aa3ce10e64446d973549b81ee926ae1b95917586994bb05202ce76923cbd3d9f95a954079c5b10c2e20c2bdb8d20531b955e29cfa329e1 SHA512 ceb03284cbe408d7fe77c32bf150e0041ebc9934bdb2b9cada0ed0c95b6e1f28d3fe3e202d843a55dbda687ec0e51a0b16ca4cf593293e2ea6f3522037fe7153
-MISC metadata.xml 242 BLAKE2B 17fd7db1343fb7dba1842d5b62d83e56e2816962b0122ec6eee7f9e163f333d69ede2cbdf2a2ba8c77613367fca3d2cee779697fb25b5d8cf0439e1e845dbf1f SHA512 2ce768d5aae91f32da90c62900f556c647eb9806c810a817b6c45c5356e71f504b5a646bf75f553c3a9bfd3f94c4317df4948bae863ef7525b4a013b63618cd8
+MISC metadata.xml 361 BLAKE2B 43f9dc14af4978ea8f825d16fc06ba82b5ad1c33ea279ed6be0bde9fe9d66f0c5705e5a35498de60c525ce5db2653406ede42fe164be618aa119158f65feab68 SHA512 921364097f1d8c20e7ed174304bd4736bd3137edfecc77258ee77a84298b2d005bf070b8900ae1671e291c3b064e45937865c581f9a192bf7fe9c0c3f77c361b
diff --git a/dev-python/csv23/metadata.xml b/dev-python/csv23/metadata.xml
index e59516686a44..b49d8f544761 100644
--- a/dev-python/csv23/metadata.xml
+++ b/dev-python/csv23/metadata.xml
@@ -5,4 +5,8 @@
 		<email>python@gentoo.org</email>
 	</maintainer>
 	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">csv23</remote-id>
+		<remote-id type="github">xflr6/csv23</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/ctypescrypto/Manifest b/dev-python/ctypescrypto/Manifest
index 81687b80f262..c83d3bfb4717 100644
--- a/dev-python/ctypescrypto/Manifest
+++ b/dev-python/ctypescrypto/Manifest
@@ -1,4 +1,4 @@
 DIST ctypescrypto-0.5.tar.gz 44667 BLAKE2B abf24a4a5dc5ea1d977427f781e44433aaeac716b4f1f8d6f23e7f8de7debae75cfff80e72c369b64b8b9299f4b058763d42c5f21cd499f9b5689481afa5a538 SHA512 96ca12145be503a5b343d936cde172039057e5a2308fb6f6f65e14fe859d4e98d93ffb996849e391cf0c474425ee6243fd4c7998b088938a21456965d135188f
-EBUILD ctypescrypto-0.5.ebuild 1060 BLAKE2B fdc8fd0dcc2a07f20c236be62eafcf5cecd5ffc5e60f4670882357f7b6d365e0265e366a1ee40c65fd85631ee6e2541e2908642e8528abde65054f1a280670e4 SHA512 bd37608cfa893aa1e7e4dcf27b22f3c2fe3fc3538f799a99a9ec413843ddad4f4df8c9fcc1b8843200526190e93970d6a957f626987ec58502a6b6fcc265e485
-EBUILD ctypescrypto-9999.ebuild 1060 BLAKE2B fdc8fd0dcc2a07f20c236be62eafcf5cecd5ffc5e60f4670882357f7b6d365e0265e366a1ee40c65fd85631ee6e2541e2908642e8528abde65054f1a280670e4 SHA512 bd37608cfa893aa1e7e4dcf27b22f3c2fe3fc3538f799a99a9ec413843ddad4f4df8c9fcc1b8843200526190e93970d6a957f626987ec58502a6b6fcc265e485
-MISC metadata.xml 425 BLAKE2B dc5497a725f4d7ce3118e6de7090649851ab489289173a21a687aff121ec731a4713c726aa462f54da58801dd9f53787ce480d93f657e0a4c48b69874b15202d SHA512 a0c956fffdd8fb67922d69df4b687537522c50aa685c5689ccaf216d789d00f2221ec1d3789f75dbedd5d204fbd2089cee03c7aef1db0fa3d43a7c88c7b77494
+EBUILD ctypescrypto-0.5.ebuild 1061 BLAKE2B 54689d9590433ac8b85563a6a18fe90b0e4ce8d8670065b2c323f8d223d380a18ee2ab1ad11d8f50ec2fc84476c4e60fe134891caa9f1da4d7e307cc4c269b3c SHA512 9d9d04f71f22b567ffffb3265763f20a14a7ac33997b0d4b343ba7ebdcb6b1ee54e8d59f93efcf9468c3bd04b96c5831f0385105f2c192550652deb6b9007979
+EBUILD ctypescrypto-9999.ebuild 1061 BLAKE2B 54689d9590433ac8b85563a6a18fe90b0e4ce8d8670065b2c323f8d223d380a18ee2ab1ad11d8f50ec2fc84476c4e60fe134891caa9f1da4d7e307cc4c269b3c SHA512 9d9d04f71f22b567ffffb3265763f20a14a7ac33997b0d4b343ba7ebdcb6b1ee54e8d59f93efcf9468c3bd04b96c5831f0385105f2c192550652deb6b9007979
+MISC metadata.xml 499 BLAKE2B 567939aa92d045742041c9fff63529bcb4475d410a6391750e18fa4123878219cffb9f13e4ed0f47648bb2c141987eecedba22c2151f1ab1fcdd2446fa1b30bb SHA512 3bdd3af210f997c7f35667ecd60ae9f95add447990e21419790d9fdd8e5839d9ece74c941ad3ea56026e402c43dbf6897d653d17f2b31b98fc1e8eb469fa7e5b
diff --git a/dev-python/ctypescrypto/ctypescrypto-0.5.ebuild b/dev-python/ctypescrypto/ctypescrypto-0.5.ebuild
index 26427d4300ee..96f10907bc1c 100644
--- a/dev-python/ctypescrypto/ctypescrypto-0.5.ebuild
+++ b/dev-python/ctypescrypto/ctypescrypto-0.5.ebuild
@@ -4,7 +4,8 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6..7} )
+
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ctypescrypto/ctypescrypto-9999.ebuild b/dev-python/ctypescrypto/ctypescrypto-9999.ebuild
index 26427d4300ee..96f10907bc1c 100644
--- a/dev-python/ctypescrypto/ctypescrypto-9999.ebuild
+++ b/dev-python/ctypescrypto/ctypescrypto-9999.ebuild
@@ -4,7 +4,8 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6..7} )
+
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ctypescrypto/metadata.xml b/dev-python/ctypescrypto/metadata.xml
index db19a33dccc6..aa7795ba5ec7 100644
--- a/dev-python/ctypescrypto/metadata.xml
+++ b/dev-python/ctypescrypto/metadata.xml
@@ -10,5 +10,8 @@
 	</maintainer>
 	<use>
 		<flag name="gost">Build with support for GOST Message Authentication Code</flag>
-	</use>	
+	</use>
+	<upstream>
+		<remote-id type="pypi">ctypescrypto</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/ctypesgen/Manifest b/dev-python/ctypesgen/Manifest
index 02a33656c17c..f0ba618990f4 100644
--- a/dev-python/ctypesgen/Manifest
+++ b/dev-python/ctypesgen/Manifest
@@ -1,3 +1,3 @@
 DIST ctypesgen-1.0.2.tar.gz 119413 BLAKE2B 27bc387ccbcd62cd164aef544129ead58248272251d2e2737f7fd65f22b92def3b62845a92dab4e1ba3faf030a002b4f2a67bfb0492ffb6298ddba9d7a2ba0f3 SHA512 d5168f72a04878d64b43c096f84f2a32663d481d7ac37f78d706f11aa09b68fe267af476885232a8c64be0f33dec20937e11bbfdef6231ecef1b19eae592d638
 EBUILD ctypesgen-1.0.2.ebuild 743 BLAKE2B 709cead01d50e8a2a9b1e0823fb3e109c1d88126a02f822bd6c3f17d95698b7fd5244b5790cca644c838c2b7aa3fd30f4cd34045b72e2ae2f8ec7dff27325bad SHA512 a00bf3c986da193b2cd27faf4050c66067c4d4c2710e30c2f6a855b65482e309ff5383af7e3cb3227ec55d85296ac449d81b9d026a808f80e92433cc15b78868
-MISC metadata.xml 327 BLAKE2B 0c2d0845df5c1de25a375b7cd59ba658b8f60fa45224dd02a9bfe864685f3414dd741aef1b3256e2780470e87ae71d46fd872ecc8ad5f801bf0f281a83c04f04 SHA512 3cc32b4405bb86fec917d9fb3ff5aef6ebc1d4f73474a1cddb34dd6861e7916315a09f5171ddff9e35d61d1aab29cf0be47fa20c347fc8b93e2db6ca8323cb6c
+MISC metadata.xml 374 BLAKE2B 56998bc1ce60556b107d068e80ca55bf884f2da7eaa6766f281cecf83c4516ccb2ca47a86a9438e4d14a45baef24f8028ae89526e3bcf721ca5d6664a802fb78 SHA512 f640795fd90dac62b0748e1bb63fa028ba9e01d31d6f0e28ad81329ac7826f1892225306d222d8d347031e39eba9a87d203b37df14103f3cc69f85a00cf74404
diff --git a/dev-python/ctypesgen/metadata.xml b/dev-python/ctypesgen/metadata.xml
index 64f7f4e7715f..9d0eeacbd604 100644
--- a/dev-python/ctypesgen/metadata.xml
+++ b/dev-python/ctypesgen/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">davidjamesca/ctypesgen</remote-id>
+		<remote-id type="pypi">ctypesgen</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/cursive/Manifest b/dev-python/cursive/Manifest
index 388abddbce64..94f12bed9ef2 100644
--- a/dev-python/cursive/Manifest
+++ b/dev-python/cursive/Manifest
@@ -1,4 +1,3 @@
 DIST cursive-0.2.2.tar.gz 43065 BLAKE2B 2c007b357c3cd1d560f74958b78d157c97301b8c2e15ed50ff340950eb4abb8baac078865bd82a3222a22505862a78a651905c843b6b0ba4662d653dfdd5f369 SHA512 6c97f8f71b016ee57349b8156543c8ca41c29c3f234ea60967b96c09fce2cea4b36b9f92996c622bd9504d4a71893903e8d5a8ab50e089fd37bddb8095f4b9d2
-EBUILD cursive-0.2.2-r1.ebuild 901 BLAKE2B 4477ba05023cf591e9c830b9af892b7d45763ed4bffa6476edde4cd11cd8eb88e05befcc557d9c63079db57f09cc5072afc4f7d34e69b61b9e577adc49361f2e SHA512 a5d2525ff820f7a6df85abcace17d03065233bfa55a0b76018852a776666fdf2502020550871fe6ed7638fd8a25d996328a38797fadafaeaa3a971ddeb3b24c4
-EBUILD cursive-0.2.2.ebuild 899 BLAKE2B 8019e27fa31e3ef0fec1731789af05dd3d170675d1499f34c663f11b3ad40e1314cd0fc07f5683216826cda3bc6a70cad5d2c5321074d3cccc99332732c347cb SHA512 6053ccf5d7862db54b9e1e0a9576bbf4924b166d6de5355bdca75206eeb4174c25ab25713f07ae5266c153b7d71731b14ecaf77a38a8b01dfd6f55189119ae10
+EBUILD cursive-0.2.2-r1.ebuild 899 BLAKE2B 91d3d57242fcb960425bcb302f894f9fd9ccfe56c72e60b761afde1c97d269fbdb8891b90759a5af155f8c456b90c8c41a7205c00f7b2bb2d27e2714d425a9bc SHA512 8f24e1cfc7a070368af503304e35b21bd62a0ad621ce330416b7ac50bc3ec054a585b3a41497a88f2db8218c1a6f096e9d3c544759943b8a81a0d60dc69c1013
 MISC metadata.xml 531 BLAKE2B 2d1b19c291e6497c949cf9ea099b5246733eaab4a91fcd7f5a4801d3fd48caf6ca0d1c90f6235778057f417d70e47586de3e0921b455ea9e40d76efce7230c5e SHA512 32918281cadbf14c3310426a34593638198b873cf03550fbc7b5f4233385f6cf58fcfd7c2b44606ce243d6618a15c9911938037cf42b8ef05538324b3a569638
diff --git a/dev-python/cursive/cursive-0.2.2-r1.ebuild b/dev-python/cursive/cursive-0.2.2-r1.ebuild
index 737826a40925..254e2bb45b7e 100644
--- a/dev-python/cursive/cursive-0.2.2-r1.ebuild
+++ b/dev-python/cursive/cursive-0.2.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/cursive/cursive-0.2.2.ebuild b/dev-python/cursive/cursive-0.2.2.ebuild
deleted file mode 100644
index 6b0f389fe263..000000000000
--- a/dev-python/cursive/cursive-0.2.2.ebuild
+++ /dev/null
@@ -1,28 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="Cursive implements OpenStack-specific validation of digital signatures."
-HOMEPAGE="https://github.com/openstack/cursive"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-RDEPEND="
-	>=dev-python/pbr-1.8[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/castellan-0.4.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/curtsies/Manifest b/dev-python/curtsies/Manifest
index 041cf04bcc59..417074b88441 100644
--- a/dev-python/curtsies/Manifest
+++ b/dev-python/curtsies/Manifest
@@ -1,4 +1,7 @@
+AUX curtsies-0.3.4-typing.patch 365 BLAKE2B ac2f34c7185273fedf546faebe88f3abf7d6d69482f7da875c5979141532d4c49e80c31d1aaed6e32b2e3a8a4d53f526caf0ce83335fa41d325421c04ef01295 SHA512 510474b8cc9b35cbd50e1c993cd9c919bd951b3321a6f2d62e1797968344c506159b1ea2735c21033e39414fcedfa2917f4572019b9c9b2fb263d0e1153d6c93
 AUX curtsies-typing.patch 330 BLAKE2B caee67d514f926271fcbe498a06cb811ce48035317b23e03e160405e0d4209a95579e70c7bbf1d4d5926af6d24e2016dd51aabfeacc796f9e32649b65c269cee SHA512 6f13aab4de020c39bbbe531e9fbbb24b419d7dfd8a982d04748ee067254a52087ffb04189e05428abfe6e8f163a25541bd5f0681c660bb550ccc84865d03f6c0
 DIST curtsies-0.3.0.tar.gz 47120 BLAKE2B 51d6bf5686c275690c6b906e7eba642aebd54dccb106463a9b1733e2174fa26a30b8365a17d6cfa18244fb74693364a3aa5184a17f2460425a57fb8912d6bcaf SHA512 b1fc09a4e9aefe09b878a5c710ef86c90f93895a8ed40b40a3c13b24a2dfc1fe771ace11c20e3fed4fcdd0bed8b9615ee3c2bcf200fa34fbfb895a4a7b57b14c
+DIST curtsies-0.3.4.tar.gz 52733 BLAKE2B 5345005e1a650fbc94db29464f26c9cc615509a64f6287f3d3c9ca69b063e6adaf6af95e292c1bee3a2290abd6b98cd0dcc3a01405b4ab63ee5db4f8570b6e51 SHA512 5f65af34f6dd13491acf65311516ed90e57d99f681032ab6b4753710953f5285b012a09de6c56d28ccd5bc942c9886076f04287cddf955ba424205a5c44785b2
 EBUILD curtsies-0.3.0-r2.ebuild 685 BLAKE2B f07f481b5bb42e2fd63ea3be553a39289f57f75d325d5f96ab58904a2106f2d51f865bfcbbdb9be7cf6a810d3fcc70abff80369cb33f053eb31f1852941d6942 SHA512 b9a44eca87130792ce8388552e62275cd1cd6d1b4096a4ac79ab71795d8e7b2f2ec43831c14a654680a892a0077632f7c02aa0bc55a661ffaf37451667d57a98
+EBUILD curtsies-0.3.4.ebuild 686 BLAKE2B 30c120db37aa07b33e08e54c3a17d2ec0e8514db764624008a47a58a9dadcb94367419236f4a0b14f43bf9cf0f9cf6b4b61eff0e16b478286ff3e02e9c27045f SHA512 3120030777161f5764ba9752435dcbf1b8696c30c5cedbab6461b190d2bc9d4caecc8369549cd1bd76008138f6336eac52f93b396cd12f207ca8e832eea36ea5
 MISC metadata.xml 387 BLAKE2B bdddb5521d99066f5585c1180d4cab02d11d48f1118f2548bd0d4889d83d9c59a4fde4d018950b34c4e930c33b034439d500fe21f861ee139a8e5d997cce73a8 SHA512 c5e6232c1d85452c22de8bb1b112abe47881e3d0c4fcdda8b7e22ac7544222b63b48becaa225d40ce2a3025966474a0f9bae126f0348b1ada65c1447921dc714
diff --git a/dev-python/curtsies/curtsies-0.3.4.ebuild b/dev-python/curtsies/curtsies-0.3.4.ebuild
new file mode 100644
index 000000000000..b1c99e6f7988
--- /dev/null
+++ b/dev-python/curtsies/curtsies-0.3.4.ebuild
@@ -0,0 +1,31 @@
+# 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="Curses-like terminal wrapper, with colored strings"
+HOMEPAGE="https://github.com/thomasballinger/curtsies"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/blessings-1.5[${PYTHON_USEDEP}]
+	>=dev-python/wcwidth-0.1.4[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pyte[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests nose
+
+PATCHES=( "${FILESDIR}"/${P}-typing.patch )
diff --git a/dev-python/curtsies/files/curtsies-0.3.4-typing.patch b/dev-python/curtsies/files/curtsies-0.3.4-typing.patch
new file mode 100644
index 000000000000..d7488a9b4b31
--- /dev/null
+++ b/dev-python/curtsies/files/curtsies-0.3.4-typing.patch
@@ -0,0 +1,9 @@
+diff -r -U2 curtsies-0.3.4.orig/setup.py curtsies-0.3.4/setup.py
+--- curtsies-0.3.4.orig/setup.py	2020-07-16 03:17:08.000000000 +0700
++++ curtsies-0.3.4/setup.py	2020-12-01 15:39:28.331241501 +0700
+@@ -27,5 +27,4 @@
+         "blessings>=1.5",
+         "wcwidth>=0.1.4",
+-        'typing; python_version<"3.5"',
+     ],
+     tests_require=["mock", "pyte", "nose",],
diff --git a/dev-python/cvxopt/Manifest b/dev-python/cvxopt/Manifest
index 88fc0b453144..ebddd2c04afc 100644
--- a/dev-python/cvxopt/Manifest
+++ b/dev-python/cvxopt/Manifest
@@ -1,3 +1,3 @@
 DIST cvxopt-1.2.5.tar.gz 6742389 BLAKE2B 32e872d13624250610e7eecf2a5755b7b2adbf98dd9b7d1b0d6e236d62677fcdef7c08a2365d7b511f755a38b34a29ff78b280fb7e92ec6256a71c63e022e003 SHA512 d21d9977941140e76d1619a1239fab5d93a3467c4cbeacca2003168c96e1bbec9698563dba07107f6e0a84a0af92124d5c868af599bd049b64f47a3cd3753afc
 EBUILD cvxopt-1.2.5-r1.ebuild 5535 BLAKE2B 328b146d857bfe5e294c7c3e0baf101e2a78f70700f272d2edbbf4142285e73fa55e2022032089bf398e2ba7457e3a1150fa7a6e9ab2d9a563c37510f025bf95 SHA512 6577efae0032bc3c3abb9c7304c9baf48366e2d26c787ba1a2ceb76b53b197bd2dc1161b2f520d320248fdc2e482ff159a1c35f8df0785ad0ea4721f2678b034
-MISC metadata.xml 805 BLAKE2B cfeb4a97635e28a1fe93b26897950dfe13268aef349647c5ca7455597e679ab7e79d21daf1b54f4c8855624abb8286676aff2da381782dd3b42b0a587f9396b2 SHA512 52bdd0bdc12807d7a3d2d820af3167b0768225167377bdf42e5f7218d5154deab2bee8bbcfdd173301e4b1d87f268bfb4bf6c1f884113c2d1f3fbf7fa1dc2ab6
+MISC metadata.xml 835 BLAKE2B caea2602d76a94cf09c152a0643684e69ba0c60e2770d80332479cbba0080be60dec71791f5473d9da2ed0e7139ccafe413c1a1bb2065fb814e4c5a15c38c082 SHA512 2fda5c0c8aaf8b4bc803375174aefb692d734d735fd883f78ac7a2e78a00f8bbc666641b17d56f7abb79d0a0a0a7643b3c67861f1015773999d5029207c83791
diff --git a/dev-python/cvxopt/metadata.xml b/dev-python/cvxopt/metadata.xml
index 73822eb2153b..d8071e3a6fbe 100644
--- a/dev-python/cvxopt/metadata.xml
+++ b/dev-python/cvxopt/metadata.xml
@@ -1,23 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>sci-mathematics@gentoo.org</email>
-    <name>Gentoo Mathematics Project</name>
-  </maintainer>
-  <longdescription lang="en">
-  CVXOPT is a software for convex optimization based on
-  the Python programming language. Its main purpose is to make the
-  development of software for convex optimization applications
-  straightforward.
-</longdescription>
-  <use>
-    <flag name="dsdp">Use interior point library
-  <pkg>sci-libs/dsdp</pkg></flag>
-    <flag name="glpk">Use GNU Linear Programming Kit
-  <pkg>sci-mathematics/glpk</pkg></flag>
-  </use>
-  <upstream>
-    <remote-id type="github">cvxopt/cvxopt</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>sci-mathematics@gentoo.org</email>
+		<name>Gentoo Mathematics Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		CVXOPT is a software for convex optimization based on
+		the Python programming language. Its main purpose is to make the
+		development of software for convex optimization applications
+		straightforward.
+	</longdescription>
+	<use>
+		<flag name="dsdp">Use interior point library
+			<pkg>sci-libs/dsdp</pkg></flag>
+		<flag name="glpk">Use GNU Linear Programming Kit
+			<pkg>sci-mathematics/glpk</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="github">cvxopt/cvxopt</remote-id>
+		<remote-id type="pypi">cvxopt</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/cx_Freeze/Manifest b/dev-python/cx_Freeze/Manifest
index 8134bbf2cb59..2042b626a50c 100644
--- a/dev-python/cx_Freeze/Manifest
+++ b/dev-python/cx_Freeze/Manifest
@@ -1,4 +1,7 @@
 AUX cx_Freeze-5.0.2-buildsystem.patch 531 BLAKE2B 930bde6c60990417c6b2365e7b8d1784d6d816093a0b005d7722c4936431533950b045ec8ebacd1b5aeefe29f24c4c98c8298d2a3ae641f2350fa1fbd7c54081 SHA512 ecec5ba92d669267c98a980722c5ac17e5ff6f92ba34b25bf7d2827cbc2e7022262baef42596fb84d4b101481d1377a2a2f3ff13069476f9c37c2da7fd6bf8ed
+AUX cx_Freeze-6.4.2-buildsystem.patch 509 BLAKE2B 767f17facca00f0adf50e5be9685dbcd83b689029a39811eee91e71fc06d77081e033e7d7a2f3fb0efa29ce4e0807d0e189aa420a49da769f021e5686a9310aa SHA512 295808b040cdc347eab0b7f3df0c155320953f1c09b69ebcce0ef3132a5a8b28f51149b197e07d3db07103c8ff894fa2b9a3934a7725fac669ecb24a8e4a217d
 DIST cx_Freeze-6.1.tar.gz 92474 BLAKE2B 5341b30b202ab96c34c82e5b12dc6a99ebaf429b6a4b6356a55c5d4fefae7504fd017cb5d29cd1601a6affca0e8e8aa1e01ececbf57011f9235b4c516b21a772 SHA512 029753e8b9eafdad383254af0f7296052c124b662473f4453b6bda0ea500430642d93941a59c23df1d0bbbee462f7d61390b5f66c946372c96bf41ea6ffbc685
+DIST cx_Freeze-6.4.2.tar.gz 108571 BLAKE2B 742d2491154706f51ebb3e072428afac1ce5c647f2b8cb6325ea166bbedc1852503ad40e56a532345f1e2a045532620cdad24622e19ecb12d9577cf57abd291d SHA512 4c9a92b6f8dc458f82abb144171b18db1349e75b237f707ca37b7b68527508e8fb3adcf5d7b142922709727501fdc46f16a01619b29e98a6af1a0c09f9306b82
 EBUILD cx_Freeze-6.1.ebuild 534 BLAKE2B b01752efcabdfa3709d4f0eaf9f2b2a6377f0d0faee3743cf88645e9b08d2726ccab9f4235ac6aa9415bff096b83e4cbbcbbf25311636aa72dacfe3d0d4ded2b SHA512 82523ff9c357cf6c944a2bbd69fd31f1ca39227f960a5fc308833db5443185ab99fde98350e8f673e90aa406fdae7b909e358a10a222e70abb4ea61a92df8caf
+EBUILD cx_Freeze-6.4.2.ebuild 531 BLAKE2B bf97144dd4182c558b40727a5d340b4717c3adfbbbc168bf202d259fd88ebf3787a66c9d951a560a7d864391a98e56ff3edb29a2bbdca1693e305ad738b77d3b SHA512 c93036beb81cf7a31ad14169b088b13fc8117e511c4dd09806e0deb3a16dc204bc190e35e45803a5b691bfbdb27043c040001e6e55e5ac1d43e7b2870d3e5be9
 MISC metadata.xml 484 BLAKE2B 91383306d9ece5b470d8d130b6d5fd4edb65858d0f41311e8594af5f0153af9547ca7a37f846c58b324e1e2d731baf0c1e19ee9cc8739bb0fb7841cdac695780 SHA512 91d2d8dbe191920043ac0e5e6a8ac3ef3071f8b9cfef1251ecf7f3c08f072c8b837f4bfad9299cd5d165706839012426773d825cd652002e6dae975eae0fc4a5
diff --git a/dev-python/cx_Freeze/cx_Freeze-6.4.2.ebuild b/dev-python/cx_Freeze/cx_Freeze-6.4.2.ebuild
new file mode 100644
index 000000000000..7e7edc84bed5
--- /dev/null
+++ b/dev-python/cx_Freeze/cx_Freeze-6.4.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+inherit distutils-r1
+
+DESCRIPTION="Create standalone executables from Python scripts"
+HOMEPAGE="https://cx-freeze.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PYTHON"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=(
+	# bug #491602
+	"${FILESDIR}/${PN}-6.4.2-buildsystem.patch"
+)
+
+# Test folder is missing needed content
diff --git a/dev-python/cx_Freeze/files/cx_Freeze-6.4.2-buildsystem.patch b/dev-python/cx_Freeze/files/cx_Freeze-6.4.2-buildsystem.patch
new file mode 100644
index 000000000000..5d23a8ded944
--- /dev/null
+++ b/dev-python/cx_Freeze/files/cx_Freeze-6.4.2-buildsystem.patch
@@ -0,0 +1,13 @@
+diff --git a/setup.py b/setup.py
+index fd24ec9..068119f 100755
+--- a/setup.py
++++ b/setup.py
+@@ -68,8 +68,6 @@ class build_ext(distutils.command.build_ext.build_ext):
+             # PY_LDFLAGS_NODIST = "-flto -Wl,-export_dynamic -g"
+             if get_config_var("PY_LDFLAGS_NODIST"):
+                 extraArgs.extend(get_config_var("PY_LDFLAGS_NODIST").split())
+-            else:
+-                extraArgs.append("-s")
+         self.compiler.link_executable(
+             objects,
+             fullName,
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index 77effcd32c84..438a60c27234 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -1,8 +1,9 @@
 AUX 50cython-gentoo.el 388 BLAKE2B 5bc38190b467efa9e7be1a5831022534dbfdc02206fca34f39bb2c897aa50cdebf960589181a9614a50829c380a892a9013e8ec5f538d51f52475cb8d92fdb5b SHA512 dd554d0d6cc220988552b06a20337af20b847e75bee76c90eb92ea979d9c2ae9d64ffa849266ff403d857b3737981de451bf40061bea0533600476bc57661c18
 AUX cython-0.29.14-sphinx-update.patch 377 BLAKE2B 32ba9ccc6c093fb9e575686c9a3b707a10a2488979d0a1dcc0863022d48255455216d11c1968bc5d49a8b583a340113c090ec103ae233dcac2164beb1765f9cc SHA512 3714019a1659b69243bf5f76d1557e3e4e507fa6b15bf4259001f961d1127e18e01e3d17fe04706c882e264651ea5699c6295f33c66af7577ab6e0906c0d3273
+AUX cython-0.29.21-spawn-multiprocessing.patch 1096 BLAKE2B f31e9e8bdc86ab1098bfa115e60470410f41fdf4be558c6a11d0c3ea61b8a8009f6242a96e2574f525e53b6125de78c5f8dbd8f7499d8debd368e80a6d383e47 SHA512 71f2349dfee2504bffe2ce378a00b2033ad229f99c597382eafa54107fbdc56fc177e4412e6314794b5ce22d9713e535467b0ed3e36ae657a5deb9c3325eb242
 DIST cython-0.29.15.gh.tar.gz 2075879 BLAKE2B e6322656c819c6b09e235c32d2b520e8fe917c864047d028dd67041e70251025f14accbd76499b7b9290d0424989adf89321f251526e66a892bdc243ba80ba7f SHA512 bd0872359d31a41750353bb0d7f03c2a40aa2bf6e492148e693321cef15b02ae4f8d5f5a00efde7216f09a6ac06f2bb3ded9d00e27ad0cfc53605f3a9ef55af8
 DIST cython-0.29.21.gh.tar.gz 2088511 BLAKE2B 7a4ddabb65a519d3c71454ac8417438a3a9c46b47489c18e7c7e82ffcb5d5f2f0c5246d0b364f8317d374c53f0c83844c73c7d2ef6b9f75f10707aaf2931ce41 SHA512 2c0c3e3fff07106eb98862f71cd5dec9ff29460cf9b9e4de74537ca5e033f7523989beb5fbdc14723beaf94a535976f75c803e791b87e017961d9694b8c37679
 EBUILD cython-0.29.15.ebuild 1952 BLAKE2B 6369461078d2d1c3b33b47a05911bd019751f60fd1a4bf9df14302e0b699bfa3265d5449b9f1e669303958141a38d0afcba0b94fd1809b8e94fd99ff8eb930e5 SHA512 78559785f85582572c633f75eabdc54bca756461ac94c7aa7a2771862abda2c5c114d776edc0e6efdd04bf76a8136a132c627bc77b67282bff86ad703ca87dcb
 EBUILD cython-0.29.21-r1.ebuild 1803 BLAKE2B 5b046420481ac99e04e85023b8606df8c16908e05570597bd67ce263273acd739f235ca78e0651b79da2018e5d762a0d883055bac24a98b7df62add78acae0ec SHA512 4c6adf7f19c645d8e98ba4b5b50ba21b2169932f25dc4a0b1d3445874fa7de7e6e6962f4e4dc77c681dc1950d44ce4fe29fe23c212d20314772572d1f29f57f6
-EBUILD cython-0.29.21.ebuild 1952 BLAKE2B 802d05a0f8cfd7bc1bef8d21ee95418b796c20db09fc310726e79c9f253a969f7bba5ece98feeab7683dfeaf08ab2ef19409d69e8ff47786904d7ab8e4eb72d8 SHA512 5e6c4ae66e81cf1068aa6d40aaa537d0544cf707cf46276b394b28707855bd146dca25dc131ca719a000ba8708fe6ac508a8f58b3ef0b54e0e489cdcbe99a35a
-MISC metadata.xml 570 BLAKE2B 078d948ba14cbbfb98103ee3746f773c12d35c91e64358950aa0ceb78695e19d8ca4c0c33b388c2c5cd54b83856430a8934d8a40aec74c3aa0d761e0a4a03add SHA512 73c65ef6b088cb50125dd662f263fb1aa1d60c3631aa8453b9ed2ede6bbd839235c6b37c3f8d1a17618c167874d64a3aa6f95c9141c8b6c921eaf4c1c4d68dad
+EBUILD cython-0.29.21.ebuild 2010 BLAKE2B 199e438a27dcc6d29422be23fc4310bf5f27423d3b5b5d115fa68d35bc30f03a308a5549853ab80946939aa8e37121ab0a0d173ce10fbe3097649ac8985f2962 SHA512 6f4e3edc7e117ed4fb7edbc5449acbc4da8ab75fef99cc83920fc6cb03500fa7bbdaa3cc45ba1ac519f2efa51a0329aaba07b37331dd0a7b68cf5229e5231b53
+MISC metadata.xml 605 BLAKE2B 900f2ffaa501d7ce5bef46115f7fdbda0966bf4ae048b4c27ac4be06e1b23de17c674e27f97627aed8d1d65b52bea01532d8a698bdbcd20b7c9fab4bad278b16 SHA512 66176bb6e00f70b610a41bfbc973bae2b4b8b9aeeeb6bdc9e14c2832d513d5452aec6509f8225daffb7e169d93311a4ccb026c935ead80ffeb35d91f1ae558fe
diff --git a/dev-python/cython/cython-0.29.21.ebuild b/dev-python/cython/cython-0.29.21.ebuild
index e3ada54d8df6..2a1a1e79155c 100644
--- a/dev-python/cython/cython-0.29.21.ebuild
+++ b/dev-python/cython/cython-0.29.21.ebuild
@@ -31,6 +31,7 @@ BDEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/cython-0.29.14-sphinx-update.patch"
+	"${FILESDIR}/cython-0.29.21-spawn-multiprocessing.patch"
 )
 
 SITEFILE=50cython-gentoo.el
diff --git a/dev-python/cython/files/cython-0.29.21-spawn-multiprocessing.patch b/dev-python/cython/files/cython-0.29.21-spawn-multiprocessing.patch
new file mode 100644
index 000000000000..0aa7212b9a34
--- /dev/null
+++ b/dev-python/cython/files/cython-0.29.21-spawn-multiprocessing.patch
@@ -0,0 +1,29 @@
+Needed to prevent a loop while calling cythonize on macOS - or any platform
+defaulting to the 'spawn' method, as Python 3.8 does on Darwin.
+
+https://github.com/cython/cython/pull/3263
+From 15ae78bb74a856836dd64828326f4f0812d36520 Mon Sep 17 00:00:00 2001
+From: Marcel Bargull <marcel.bargull@udo.edu>
+Date: Fri, 6 Dec 2019 18:21:19 +0100
+Subject: [PATCH] Disable parallel cythonization for "spawn" start method.
+
+---
+ Cython/Build/Dependencies.py | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/Cython/Build/Dependencies.py b/Cython/Build/Dependencies.py
+index 593e00a6ef..f9b9c15bc5 100644
+--- a/Cython/Build/Dependencies.py
++++ b/Cython/Build/Dependencies.py
+@@ -1073,6 +1073,11 @@ def copy_to_build_dir(filepath, root=os.getcwd()):
+ 
+     if N <= 1:
+         nthreads = 0
++    if nthreads:
++        import multiprocessing
++        if multiprocessing.get_start_method() == 'spawn':
++            print('Disabling parallel cythonization for "spawn" process start method.')
++            nthreads = 0
+     if nthreads:
+         import multiprocessing
+         pool = multiprocessing.Pool(
diff --git a/dev-python/cython/metadata.xml b/dev-python/cython/metadata.xml
index 6fed3f622bc9..e9decf14f92e 100644
--- a/dev-python/cython/metadata.xml
+++ b/dev-python/cython/metadata.xml
@@ -1,16 +1,17 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <longdescription lang="en">
-    Cython is a language that makes writing C extensions for the Python
-    language as easy as Python itself. It's based on Pyrex, but supports
-    more cutting edge functionality and optimizations.
-  </longdescription>
-  <upstream>
-    <remote-id type="pypi">Cython</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+		Cython is a language that makes writing C extensions for the Python
+		language as easy as Python itself. It's based on Pyrex, but supports
+		more cutting edge functionality and optimizations.
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">Cython</remote-id>
+		<remote-id type="github">cython/cython</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/dataclasses/Manifest b/dev-python/dataclasses/Manifest
index ba62e49574f8..61ce1b3f7dd1 100644
--- a/dev-python/dataclasses/Manifest
+++ b/dev-python/dataclasses/Manifest
@@ -1,3 +1,5 @@
 DIST dataclasses-0.7.tar.gz 35690 BLAKE2B 8d3c60d1e2ad4c9ceb3c502fa74f8fdae75717e52c698984b6def96e867cae633864de711856a69992df6a207617d17d7116f5e0daa7d757076dc8b97d7e0e9b SHA512 ff921237a99bac21e091ff253824eb07eb09be7e7ec02b869da9c68c35141fc1bee526b3d2942963bac7762827438ea8fdc89fa72404991b78d1d063a3c18661
-EBUILD dataclasses-0.7.ebuild 556 BLAKE2B 1449f4c16e18f3c6d21faac4a1287f4c567a9ea9130a57650480e098e3ac7d4ca5393fc12a5a9aae3029a3e647f026136cae4dd7f22c16c16d0f7eb6dc4a6f9b SHA512 a469bd8882d370e37569545b0323f0aee81119a1babdaf8df1b4adc1fae0e444ecb32f445a02100f828c82b2370aacafd584eee02721815f36ba8490ed38ba89
-MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
+DIST dataclasses-0.8.tar.gz 36581 BLAKE2B fb4cad844f00157a8affc85a0c5d949d7d44fd67ca8083262247af46d93be189628c4ab7b37d34dea983059615603342d50d8b9d0ab75f5365463a337d312b6a SHA512 81b27dd10077084ca82b0a3cbbcee428a5c5cb2e6ade5de46a39731507c2d6f93f9038b704e6555c850044683516a0d130b95a14c91881d04b0bd2c496ca8d6a
+EBUILD dataclasses-0.7.ebuild 600 BLAKE2B be311e320300a648b571bbc6f29c36bc39cd6f81a0861e9b0aec9925bdffcecdae80b923f930a1e31c5c15ef65440c196efc3203ece64617e84c1abd60fed15d SHA512 46aa89d7d826a0823a0b286b2eff609d0818fbe97df9731a1aa68411c92ebc797b959d2050beb018d2b048cc90b1858dbde948ea30527dc7a155dd78964b6e9b
+EBUILD dataclasses-0.8.ebuild 608 BLAKE2B 95a56b608ec6fc95cce4731f5aef53923208eaffb60043f5afe3593a9a697556571d2fc17b213e72dac6cdf8b4b4cd92de1348db6023290b6c903623e7b86d9a SHA512 44f402058441c1eed579bf618b8effd7ffa8a6794b69c63cfbb5de2dd2acf7f5e0cc570b3b807b85ffe4aca1ca4df1679f6cd74eaa0a6a7a5ff7f16f7980b950
+MISC metadata.xml 354 BLAKE2B b4b3845edd3144b2fc3e38bb7d2f4b2ca6d14ea67b989dd48d10d988b9a73a270f7bb02bd42149eb7db04e5d0381037fa04cbd724892bd5768abe87a01aa1152 SHA512 5159250fa6639857a89afca35a7b6f7eb190d07c612e9a079e2045fedd3d28feb1ddf9c3587b387a0463fa3951c9142843af7ca18b5f94d73bc6951d7e2ebb90
diff --git a/dev-python/dataclasses/dataclasses-0.7.ebuild b/dev-python/dataclasses/dataclasses-0.7.ebuild
index 195170403189..41fa5a59aeea 100644
--- a/dev-python/dataclasses/dataclasses-0.7.ebuild
+++ b/dev-python/dataclasses/dataclasses-0.7.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+# this is a backport. do not add extra impls
 PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
@@ -15,7 +16,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
 
 src_test() {
 	cd test || die
diff --git a/dev-python/dataclasses/dataclasses-0.8.ebuild b/dev-python/dataclasses/dataclasses-0.8.ebuild
new file mode 100644
index 000000000000..3637681c4e08
--- /dev/null
+++ b/dev-python/dataclasses/dataclasses-0.8.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# this is a backport. do not add extra impls
+PYTHON_COMPAT=( python3_6 )
+inherit distutils-r1
+
+DESCRIPTION="A backport of the dataclasses module for Python 3.6"
+HOMEPAGE="
+	https://pypi.org/project/dataclasses/
+	https://github.com/ericvsmith/dataclasses"
+SRC_URI="
+	mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+src_test() {
+	cd test || die
+	distutils-r1_src_test
+}
+
+distutils_enable_tests unittest
diff --git a/dev-python/dataclasses/metadata.xml b/dev-python/dataclasses/metadata.xml
index 266e3f19ca59..74a8b3e369b1 100644
--- a/dev-python/dataclasses/metadata.xml
+++ b/dev-python/dataclasses/metadata.xml
@@ -4,4 +4,8 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">dataclasses</remote-id>
+		<remote-id type="github">ericvsmith/dataclasses</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/dbus-python/Manifest b/dev-python/dbus-python/Manifest
index 4fcfe135adcb..5f196c67815e 100644
--- a/dev-python/dbus-python/Manifest
+++ b/dev-python/dbus-python/Manifest
@@ -1,4 +1,4 @@
 AUX dbus-python-1.2.16-py39.patch 948 BLAKE2B df88f38be549b81b404f3e5e7f0d4c09f7c43bc9ee91b0534059fbb3edbbe675e7ecd467d5d57f365aa59d510f06c41c9ae4970a5e5e8d2fad109bf55cfb507d SHA512 ce5f419736dea09de8a58e372c7587afbd270d806bdcc0eb3b7bd5fa830be00453152ea7ea44a32a06d860ca3174282f62ef44d5f8c9d43de7d8724c69f2ab37
 DIST dbus-python-1.2.16.tar.gz 576701 BLAKE2B 58d9f9ea092cd3a6b872c084a6159baf03f1aab615282e161a0e3da1d01ff5f4940862e693d21907b0c146d285b9067386759a1306ae2e6907f5e2ff4ef9944d SHA512 e76c00c5fd3fe6884e4c24f258987fd3b80d21bd4e0f96aa8fda152078a860b62321324f6efcbfe7226d5ab2521a14b5bda7cf2468d2cae5f376c124a71aa05c
 EBUILD dbus-python-1.2.16-r1.ebuild 1736 BLAKE2B 2473610936d74e7a3890089757e503a43dfebae0b2f5534011df6603f75c32fcbb444170d56f459eb8cc44f9abce1bb91ae32fe9ad922373d4275f93db52eb40 SHA512 0a112bbecae1e3c2164f768c65a8fe10a20c16506a8f3b76f1cc0e15f27cb4790be80ad8549dffe4cfe21e085a442f30c7c5e2c2a0384fcaa2d55d3636726fac
-MISC metadata.xml 337 BLAKE2B 96d3f5d7c37edb1a63791e013c39cf5b10c94d621ad851f9975d9d5e36519da135bf963f2a0e38c2c098fa48c2056bf210bdfcebc12bb10a88c9e9f85c55eb2a SHA512 633761250e946af99fcbcbf813b70fa0b1e03a0d89102faa3f324c418f0e749371aa931d253dc5a6f69369c25acc2d50a0f5e2155bd727766bc70f4bc3933d65
+MISC metadata.xml 403 BLAKE2B 016856f2fe17f2036e04502f85ffcd605d52556ddf50baf50fa431548b57914994f03f159ed01beaba1409daf0b4192e6101d4e62db73a75944ed0550943f2cb SHA512 a7a70f0a2430894661a3324d32a091b8f9473170c2dc073a4dca269b29e19507b753f09aee212ef47c13e1f89e9d1ae41d0f50b96da211bc3afcc4d51dd94e6a
diff --git a/dev-python/dbus-python/metadata.xml b/dev-python/dbus-python/metadata.xml
index 5bb287759c58..7f2598156160 100644
--- a/dev-python/dbus-python/metadata.xml
+++ b/dev-python/dbus-python/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>freedesktop-bugs@gentoo.org</email>
-  </maintainer>
-<maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
+	<maintainer type="project">
+		<email>freedesktop-bugs@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">dbus-python</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/dbusmock/Manifest b/dev-python/dbusmock/Manifest
index 41a0f628c812..d01230634f20 100644
--- a/dev-python/dbusmock/Manifest
+++ b/dev-python/dbusmock/Manifest
@@ -1,4 +1,4 @@
 AUX 0.18.2-disable-polkitd-tests.patch 372 BLAKE2B bb9b33df485c635a080c41d4bea5360cf6a128a2f569782a51525c1ac9e6972bd03188f9777b1685f04900d48f2e554507db7c8b755de02c0a07de8defa26f05 SHA512 a105bb67702ef10d578e4df723452f060248287e9fc394754257c036ba0c6b186f90f5849a37e32e57cd70f16bbb73d0b8f84d9d153e1649d3ec5ab147dd6183
 DIST dbusmock-0.19.tar.gz 72567 BLAKE2B 973cfa02d1aec29f2151ce077471c49f7def3cee079eb975bbc1abca39cc6d391f5dc4aed40fcd9c9db3fcc25429e689f130dc495b94428b73c64f3c650a9c3a SHA512 9f49cb1818c0de8b774d4ccd0eed35de3b0a95de669e70539699237b5cdfee993da7747dc28375c8f1c26fac83d948b7ce25107d866e28b833b556c6f654706c
 EBUILD dbusmock-0.19.ebuild 1071 BLAKE2B ceac7e1a85ab974743225c48b6d76168b69cc55b703b59dc29caa6433a7c7b5ce13edb312355045d14eaf8a58d9d47ae86c9738eb93e07f64ce6c3878d728c54 SHA512 74a0aa6c85d547eca93f99c9e27fe9cc13136a74b963ef315ee560a332f7a809e4d7f154d2809a3be720cb1f7ec76b7e97becc32fc130b0c45bf4422e8b6663e
-MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
+MISC metadata.xml 331 BLAKE2B b328a0033b2b0c38d69fe4d8d37c6f270e5f0e2fccbdd2ac0b346cc7b067dbc99af9275f5d9eca50972522cdea6c5a5f2cea8465e9afb6b7c616506ef0ca9196 SHA512 6469bee681a79c9496171ee61cb26fedec1dc4317dfc81163a3597379fd3b295fca78990a6d2cb56ae1d7243ecb08416e0bb6dc618f2ce534691a0e5ba6e5b50
diff --git a/dev-python/dbusmock/metadata.xml b/dev-python/dbusmock/metadata.xml
index 996e7cacd217..598247402a90 100644
--- a/dev-python/dbusmock/metadata.xml
+++ b/dev-python/dbusmock/metadata.xml
@@ -5,4 +5,7 @@
 		<email>gnome@gentoo.org</email>
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">python-dbusmock</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/dbutils/Manifest b/dev-python/dbutils/Manifest
index 7155c6c6d1fd..c2fad488b346 100644
--- a/dev-python/dbutils/Manifest
+++ b/dev-python/dbutils/Manifest
@@ -1,5 +1,5 @@
 DIST DBUtils-1.3.tar.gz 91733 BLAKE2B 8fb3fd16208c27fbbbbcbf1e7b9de2d4d2e8008916309256bd2ae5494d0ff60071fd3fa839dc7ccbe8832f333bad52d97dc4d176c822cc1ce3d5ce0bb05d637e SHA512 47aaa63144e6a0f4d020adb54fc5f36af01848a12f8adfcbd9889825980a1479b32041c087992de5f44478cc25729d1c97ed6cb094def2b93165f0120f10c5b6
 DIST DBUtils-2.0.tar.gz 92911 BLAKE2B 1822f85b9da1bd7936d01f8069deef10e8ab9b7a5c89de718071cf4783f2845357ccca0e85057d430c57f33a2a7c6d239f632032397bb1f0013a40e42383b5f1 SHA512 7818eab572db4798d0a7a2eaed6c4ba91c79c8517da56db21c07525f0097ca80c0beef1c9608b0b80c3a93f1372f37de7c8ec97f2e33dc4dc4a3d464c5981d13
-EBUILD dbutils-1.3.ebuild 987 BLAKE2B 44251aa0297e8cc72142d670782a2e4d55306f64533b71d09c44e46fb2ba91f5cdb6b221d883e296a84d673e5ccbed16bb67e3a37099c753570c0667f79c6a59 SHA512 d0d30ca4af89c90a71f75f466b833dc94c1569e3e4f8d09486c2f5b14be982fe10e4403c43c5b687d7e7566fe009262b137eadb2de40dadf7b6896708fb214fa
-EBUILD dbutils-2.0.ebuild 965 BLAKE2B 944e2b520d0f0b313d208e5a6d6d71360bc924308e02cdea022a2134823a0b3d013774d6f5e9c53d51a4113abb172dc53a90d9aa09d5251ba1484bd7057ed40c SHA512 c89895a2c584163c1bcdf9967f4443fca006c904209a487c2d7b624c013a8d55a8dbce9fe324a3793d3b93deafbf7c2f540f370f2b334e1a2d05bc2e5d8d9f20
-MISC metadata.xml 826 BLAKE2B a7baace30406ef448d6d77c580ac35312a77a27686ce1d483848ce031ffa969528e8b0ee28f849a94d7cfa431af46879edac8d40b4482c1a352f549469046654 SHA512 3423e04da4fc401efa422a35f94ae970fc09c6ee3d8b71c52f8e35f0e454558235d052eac3f738c6f9025adf643637c9f85cd8683c5c5c14be6ca57be0f25995
+EBUILD dbutils-1.3.ebuild 1012 BLAKE2B 8b91df98b3d5b35f5a38a4fe1d27142ff5373a828649685333f219d4925a2176285ff4fc01579662c03dd7a5c538c6459ac8fe9542090eeb611de3b87c633c98 SHA512 abced40ec1edff7d221fc2922ff22b7f3f85f5cdac86bac38cb671f06dc973e37caee6313a15c235549abac5d330e3b4e85b88745bd69aab4f4868403ce7223f
+EBUILD dbutils-2.0.ebuild 990 BLAKE2B bb123b577cf6a7b759578ac3b2592c90d3c8b3a770559e5cc3072eb87357da35391ac7973848d4ea6e645283cae353f1c605d178e5cbe19835edd07d05efac21 SHA512 b21a0c836ccb5b3baa714bcc45432e07b965745174413074872ebe49d92d24d2ff2b29ab84f394b0744856c600cd430aac5983af5c38a8cc16f3e1a84d817093
+MISC metadata.xml 873 BLAKE2B c580cea1451a08f7e143041608c2cb39fb01cb67d5bb2b5f734672e27d02cd9ab7c66d84645b3710269838c84c2fc28f2e79b66f313fb9c308bd474307754e82 SHA512 06ebcd8a96fd0c1e3152c45fe6df8e622945013d1822e47ad5cc87979d204fa0ba7eef61031983f91f74261b28792fe18ca6442311b85b4c074d2155e352e62c
diff --git a/dev-python/dbutils/dbutils-1.3.ebuild b/dev-python/dbutils/dbutils-1.3.ebuild
index 40b10864236c..197c5d0c0d57 100644
--- a/dev-python/dbutils/dbutils-1.3.ebuild
+++ b/dev-python/dbutils/dbutils-1.3.ebuild
@@ -13,8 +13,8 @@ MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Database connections for multi-threaded environments"
 HOMEPAGE="
-	https://cito.github.io/DBUtils/
-	https://github.com/Cito/DBUtils
+	https://webwareforpython.github.io/DBUtils/
+	https://github.com/WebwareForPython/DBUtils/
 	https://pypi.org/project/DBUtils/
 "
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_P}.tar.gz"
diff --git a/dev-python/dbutils/dbutils-2.0.ebuild b/dev-python/dbutils/dbutils-2.0.ebuild
index 13bce71b251b..d230f6c0ea6d 100644
--- a/dev-python/dbutils/dbutils-2.0.ebuild
+++ b/dev-python/dbutils/dbutils-2.0.ebuild
@@ -13,8 +13,8 @@ MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Database connections for multi-threaded environments"
 HOMEPAGE="
-	https://cito.github.io/DBUtils/
-	https://github.com/Cito/DBUtils
+	https://webwareforpython.github.io/DBUtils/
+	https://github.com/WebwareForPython/DBUtils/
 	https://pypi.org/project/DBUtils/
 "
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_P}.tar.gz"
diff --git a/dev-python/dbutils/metadata.xml b/dev-python/dbutils/metadata.xml
index a24feb91917f..5f3a181b8872 100644
--- a/dev-python/dbutils/metadata.xml
+++ b/dev-python/dbutils/metadata.xml
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>lssndrbarbieri@gmail.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <longdescription lang="en">
-DBUtils is a suite of tools providing solid, persistent and pooled connections
-to a database that can be used in all kinds of multi-threaded environments
-like Webware for Python or other web application servers. The suite supports
-DB-API 2 compliant database interfaces and the classic PyGreSQL interface.
-  </longdescription>
-  <upstream>
-    <remote-id type="github">Cito/DBUtils</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>lssndrbarbieri@gmail.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		DBUtils is a suite of tools providing solid, persistent and pooled connections
+		to a database that can be used in all kinds of multi-threaded environments
+		like Webware for Python or other web application servers. The suite supports
+		DB-API 2 compliant database interfaces and the classic PyGreSQL interface.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">WebwareForPython/DBUtils</remote-id>
+		<remote-id type="pypi">DBUtils</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/defcon/Manifest b/dev-python/defcon/Manifest
index 2c6b22cf30e9..8a73e15b0650 100644
--- a/dev-python/defcon/Manifest
+++ b/dev-python/defcon/Manifest
@@ -1,3 +1,3 @@
 DIST defcon-0.6.0.tar.gz 403682 BLAKE2B c85cf4f846cab3f7543dcec885221e9f828cdf56fb1a373c9d06b27a29c1ab22fc9702d2ce561af97e3d4aa3b03712538ce0b29a0042fa4a0fea6f11eacba69b SHA512 b981c87d2355dc83b5da0ea4879707336ade8ea4d6ca2bc13da064367938579f2a60dfa5b1c0fd3629f4a2de97676e4f02f30f99a6116049cc2a10abd13a3d7b
-EBUILD defcon-0.6.0-r1.ebuild 597 BLAKE2B b1df540994ee14562a1d6b7c2f8ad6bc448b913a78ad3d3db5d3e632746e41401feb77a03c722b493f05d1f4569b9ca1b2171456c46760cbbe50c2ef2d5b95e0 SHA512 ea38ca1a21fda4fd1f14963c5ac46b78ac7c42f52749a86c2a5651b5549079e02bbcff417303acb67c4888580453cdcf775244dbde02a016228d1639cb4907fc
-MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
+EBUILD defcon-0.6.0-r1.ebuild 595 BLAKE2B 8b55bccf251089c43672330a436f839cf5a8194b61414eca2f22c7aa1c677572284a088715f35d10a8c024d38023b3ceb2a35788aa1909f255d9565ccc34fe49 SHA512 e2c4a89f0aefd0f445b2211297592318283376386f5b726e86d50a82a04e11b36b3749e10b471a757f239f0868f22ff369255a976cb5f7c55487a70e23e46154
+MISC metadata.xml 368 BLAKE2B e99b9b950a6b060499bd76d17bed5b749b7bea284c7226bd54c613f6c64012c7d858e474b817f06137923dfa67f1700a2aaf41a487f54be9ef3c13e16bad9709 SHA512 73ba1e560ac21b734b3938609e61926ac45819a6cb546f2c8058fcbdf888f468e6b6158383cb538e3dcef70fcda2f63a2c17f185653abdb327402adc3db3751a
diff --git a/dev-python/defcon/defcon-0.6.0-r1.ebuild b/dev-python/defcon/defcon-0.6.0-r1.ebuild
index 3eca22298852..ebb2602ca1d1 100644
--- a/dev-python/defcon/defcon-0.6.0-r1.ebuild
+++ b/dev-python/defcon/defcon-0.6.0-r1.ebuild
@@ -7,8 +7,8 @@ PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="A set of UFO based objects for use in font editing applications"
-HOMEPAGE="https://github.com/typesupply/defcon"
-SRC_URI="https://github.com/typesupply/defcon/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/robotools/defcon"
+SRC_URI="https://github.com/robotools/defcon/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/defcon/metadata.xml b/dev-python/defcon/metadata.xml
index 3da97a9953cc..cce07bdefb95 100644
--- a/dev-python/defcon/metadata.xml
+++ b/dev-python/defcon/metadata.xml
@@ -5,4 +5,8 @@
 		<email>pacho@gentoo.org</email>
 		<name>Pacho Ramos</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">robotools/defcon</remote-id>
+		<remote-id type="pypi">defcon</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/denonavr/Manifest b/dev-python/denonavr/Manifest
index 0270f7c02c20..0852d96465c6 100644
--- a/dev-python/denonavr/Manifest
+++ b/dev-python/denonavr/Manifest
@@ -1,5 +1,5 @@
-DIST denonavr-0.9.5.tar.gz 94016 BLAKE2B b6a013e6831600316dd4e1e33caec7da18774e17a1e9423dd2ae989c4f787cac471e21e2de06db0e01427345234a87825e298dc27881f21fbf69a720bbb04df4 SHA512 798fe126ab3c57ef285f45978e3b06ff5fab99eb3fc47e277c2d2eeb1786ac30fc09de8d23f2b4f59a1240bc2df4fca8e6946baf5135e051f387d1195a070ac7
 DIST denonavr-0.9.7.tar.gz 101839 BLAKE2B d44600e6963c2e17ffc12f203926b522d2bf2d9a853e4f061583158fb087b8fb5dbc43be835aa639ffe11391aa494a8b061b2c177bccfc2568781b304547e311 SHA512 2b8a8224ec46b90d2256d7d516801c6ae18b4434a0ee901b0a9aa80cc0481216fa33566bf33d41928f0112361b165bbe40e5f44b65cd17f09beb7cb3f4d9d803
-EBUILD denonavr-0.9.5.ebuild 644 BLAKE2B 73d19e57387ee6fd872ec1d75dc6fc9b4f35fdc479ba405ade982c3eacc9ee349c74415754e482289d586fedcd1fb5aeb8a5badefeb765a8245c3ea49962023e SHA512 4e5f423beb12be295bca772d860adb8da02f5c4680f8806049c6fc68db6f1f18c9ffb8c89d12943641ca6dd0ecba4eaa5647dcf3a99312965ccad716b4d69865
+DIST denonavr-0.9.8.tar.gz 101850 BLAKE2B b02a18d1f61547e7e63fbd51a72de57803ec6e78232be0027fb6b77176fa872227afcb5a414b0cb92ca4373116a5c6ec4975fea73ae272742ec399e4c0e3ad81 SHA512 30ca12ffffcf66b45c17434c96e496fe61af5cd42aa85dcb25502f6a21593ec4d884937d52726a430b405d9807ad024456e48e144a759ea1351fccc906a95af3
 EBUILD denonavr-0.9.7.ebuild 641 BLAKE2B 53f5495703608ab5a8074b1e6a7c4e33e127974a7090834f3b3aba1e9a5ed74eed7f35b4fedfcb0b6fa057b48ebdbb53e50ca881d35c2c676bcd6ac6cc50d293 SHA512 2581fea7ab57070db673eaf7c8e3dd377521390b1704fb6bbb930d6a8d6046bf3481113f424d2ed49f023610e150f93bf4100fea3e6f750897b7f2a086429f63
-MISC metadata.xml 448 BLAKE2B abf1f391011c497830fd97efbefd1bf3ee9a92967b962859f9b557427b3dde2fb9da76a5c14c8f33b28ebb0e57a0d4511c4403c6a13270f500389d2dc0aff487 SHA512 017d0cc05c8dd263292a080f39a86b415955081f2c2d06a58ef59f21703748b8e15b54a88a4592f9e378e256d6f5ce60d5317aecd373777fb1e686a8cfcd8031
+EBUILD denonavr-0.9.8.ebuild 641 BLAKE2B 53f5495703608ab5a8074b1e6a7c4e33e127974a7090834f3b3aba1e9a5ed74eed7f35b4fedfcb0b6fa057b48ebdbb53e50ca881d35c2c676bcd6ac6cc50d293 SHA512 2581fea7ab57070db673eaf7c8e3dd377521390b1704fb6bbb930d6a8d6046bf3481113f424d2ed49f023610e150f93bf4100fea3e6f750897b7f2a086429f63
+MISC metadata.xml 549 BLAKE2B 7031b8af81fe98059cf29d386d6f09493af833f33dacfd2be8f4e4e534a6ec1196e85cfc3ddf13ffe4a4333c0be7c95d453916bf6a223065e1520259956ce51f SHA512 01ecd0c14cce4a3479e70c3aea2d3f2e3c582bf9ff7bc8f887f341e19b0e45fd78638a12b6a617db018da4fe98704345e7e27fb9d6d0ed464daa71b2d1ccacf0
diff --git a/dev-python/denonavr/denonavr-0.9.5.ebuild b/dev-python/denonavr/denonavr-0.9.8.ebuild
index 9273badd2211..a1811fa7960b 100644
--- a/dev-python/denonavr/denonavr-0.9.5.ebuild
+++ b/dev-python/denonavr/denonavr-0.9.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
diff --git a/dev-python/denonavr/metadata.xml b/dev-python/denonavr/metadata.xml
index 51a6a2214725..6a5e4dd7a60c 100644
--- a/dev-python/denonavr/metadata.xml
+++ b/dev-python/denonavr/metadata.xml
@@ -5,6 +5,10 @@
 		<email>sbraz@gentoo.org</email>
 		<name>Louis Sautier</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">denonavr</remote-id>
 		<remote-id type="github">scarface-4711/denonavr</remote-id>
diff --git a/dev-python/deprecated/Manifest b/dev-python/deprecated/Manifest
index 952047330b23..de888ac9d4a0 100644
--- a/dev-python/deprecated/Manifest
+++ b/dev-python/deprecated/Manifest
@@ -1,4 +1,4 @@
 AUX deprecated-1.2.10-py39.patch 2040 BLAKE2B cd8f7c7b29c3a81bcccf907fca26864801db0440fa675581222d20d39dbfc19eeead1a708cea3b500ae15af0f3f0c64e2838a7ec8a8b57b540ced07d1641e1d5 SHA512 5cece72f18f0faab35814cd2b59bd441a0f21ebb3b2c392d9e0936df4c321d15dcefe7333615462d2fda57cf640cb8e5a95d2e2486502caec33894ddb1faf49e
 DIST deprecated-1.2.10.gh.tar.gz 2967353 BLAKE2B 941fa81dd27940be4fde1219a9fe127777354aa2054b15178cade4a859b01f8dff426e0da8161bac580ff6446b44767f3207b474bb5f555826239db039085497 SHA512 4bd53b759d04ab15c74a4c147b2c69c73aed6e40555acf0e84cf0c5b7ffe248da234bd1311c5629f9357d50bc08e55e81363340dcfdabe88933525bcc7859a70
 EBUILD deprecated-1.2.10.ebuild 541 BLAKE2B 5524c1b9b3b15cde003796d375aad6de29c108c63477888eb3b121379d954ef7c1cd7f56ec083fa3af6171620953c4d05302bac062724a2c9bb53d156a3638af SHA512 46df883300a946665d23e11095eb04608e53223d8dea557cdf049353d9a25a76e6e0bf2f2f16d7578463b36564d2c92d6901de25c531eb43a29a9fd54ccb1a66
-MISC metadata.xml 242 BLAKE2B 17fd7db1343fb7dba1842d5b62d83e56e2816962b0122ec6eee7f9e163f333d69ede2cbdf2a2ba8c77613367fca3d2cee779697fb25b5d8cf0439e1e845dbf1f SHA512 2ce768d5aae91f32da90c62900f556c647eb9806c810a817b6c45c5356e71f504b5a646bf75f553c3a9bfd3f94c4317df4948bae863ef7525b4a013b63618cd8
+MISC metadata.xml 315 BLAKE2B 8016c6be7019b2ef9b31533e8a75480e8f57eb09f0d9f5de5ba53093fbd1e04fc4299f0b18ec4c56b89c2ee06718d3bab8442a28cf457a7fc87c99469738ca05 SHA512 c5c38075210982e49af49da7e3094c4aea053e3cbfce85fa7e8549d842cfefdf3f9d537b85380370093d3e9bc3d108822b1c620eadf369267cbec865c4d5d15e
diff --git a/dev-python/deprecated/metadata.xml b/dev-python/deprecated/metadata.xml
index e59516686a44..9e1c60a102ff 100644
--- a/dev-python/deprecated/metadata.xml
+++ b/dev-python/deprecated/metadata.xml
@@ -5,4 +5,7 @@
 		<email>python@gentoo.org</email>
 	</maintainer>
 	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">Deprecated</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/dill/Manifest b/dev-python/dill/Manifest
index af654434cc75..266d34b2148d 100644
--- a/dev-python/dill/Manifest
+++ b/dev-python/dill/Manifest
@@ -1,5 +1,3 @@
-DIST dill-0.3.2.gh.tar.gz 148972 BLAKE2B a807350a2d2bb84e705d20c9c60d47834b41863b862a5d347ebc32273c1b9479c568cd3018126adb1cd052bb00f50e8424f7118b37524329458150b9a3e59e3d SHA512 74a0c01dd7c0126c7de21a3b3660e51486fec17f64f23b8e7f23b70243209908573fef8851f6eda53868e89ef1a8a5e351a3ef81dd9cb3e122a2dba33a86bbe1
 DIST dill-0.3.3.gh.tar.gz 149103 BLAKE2B b08830ad1eb47ceb29c6be6ae88ab38338d9a8a325188bc3890b71c7f393792988da4962819f9b82bf7ad9ebd668c96989ef8c55072a2c82483660c4ec01d072 SHA512 bb514c37902412380d99f38293d5cb9d3d6a6643a34e59e6e889c89d845f9b83e9fa3fa9f0a75218575aa56670f287144f2b00abc8359b5fc6cb450351b43b68
-EBUILD dill-0.3.2.ebuild 630 BLAKE2B 433932c4cd4c415f331b17a024314e23a4284b95a296b9f26362e039cc1a5b6e512df4e613be195399f3c35dd09b28da49a0dcb624a0477ec7153992f1eebeb2 SHA512 62c23291eeafc72a38d0d6e90493dc0a910735a2042bc059c3a2478b3d69103139c0754f8291aeb67f8417c261eb9a9243675ffc18dddc1c22789fe9233336d7
-EBUILD dill-0.3.3.ebuild 633 BLAKE2B a459f682842124d3e1f78ce80b24353e71e4594779b8e86ed6f6cc8a23d00b6ae2071b15dabc078be5db8a8a528cb4006b0740193c51e7aa0cb59b4b6a45afa7 SHA512 1c325c302396875f42cb488267ce4ac3903d8d75b60d155fa99173a5d07f0a7a7a9cdde0724830a6fb4db49fc8d7d6177ab7dd1d36401d8d19a66adc2b6c54e6
+EBUILD dill-0.3.3.ebuild 630 BLAKE2B 433932c4cd4c415f331b17a024314e23a4284b95a296b9f26362e039cc1a5b6e512df4e613be195399f3c35dd09b28da49a0dcb624a0477ec7153992f1eebeb2 SHA512 62c23291eeafc72a38d0d6e90493dc0a910735a2042bc059c3a2478b3d69103139c0754f8291aeb67f8417c261eb9a9243675ffc18dddc1c22789fe9233336d7
 MISC metadata.xml 996 BLAKE2B b76f67cff65e28c22663f6291652a39fc232369ba747542d0840236971d9857989b179c80a09cd736e2cb504e1db12934a083cb7e38922430dd25844b7fa40a3 SHA512 0dada43b585791564a0351ad160f0d5c11e8821c6fc494d5ea833e48d59b84a10a2c9a99501536d00b5fc03fc55cc51839852363790e1ffe0eed9971021dba40
diff --git a/dev-python/dill/dill-0.3.2.ebuild b/dev-python/dill/dill-0.3.2.ebuild
deleted file mode 100644
index 21415440540d..000000000000
--- a/dev-python/dill/dill-0.3.2.ebuild
+++ /dev/null
@@ -1,30 +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="Serialize all of python (almost)"
-HOMEPAGE="https://pypi.org/project/dill/"
-SRC_URI="
-	https://github.com/uqfoundation/dill/archive/${P}.tar.gz
-		-> ${P}.gh.tar.gz"
-S=${WORKDIR}/${PN}-${P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux"
-
-python_test() {
-	local fail= t
-	for t in tests/test_*.py; do
-		ebegin "\t${t}"
-		"${EPYTHON}" "${t}"
-		eend || fail=1
-	done
-
-	[[ ${fail} ]] && die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/dill/dill-0.3.3.ebuild b/dev-python/dill/dill-0.3.3.ebuild
index 32554341e099..21415440540d 100644
--- a/dev-python/dill/dill-0.3.3.ebuild
+++ b/dev-python/dill/dill-0.3.3.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${PN}-${P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux"
 
 python_test() {
 	local fail= t
diff --git a/dev-python/dissononce/Manifest b/dev-python/dissononce/Manifest
index 001edc8a6188..a22930af8c82 100644
--- a/dev-python/dissononce/Manifest
+++ b/dev-python/dissononce/Manifest
@@ -1,4 +1,4 @@
 AUX dissononce-0.34.3-fix-test-requirements.patch 1099 BLAKE2B 9bd65c18b440181187dbce8f8d6c3c97902d127e904efd9514fd7d2c987b16c4f82ea10e7182ef3a72b73998d3cb76c3a3ee4838f4f3b3d83dfd40b1ad748273 SHA512 e875717877881372e3b446e5a1eee4f3aa0deaf5381e16c54992ecc0c0b8e36e44419dcda3a8603bbbed1cb3bcb8710f8cafc086a016a6c49267b10b443023b8
 DIST dissononce-0.34.3.tar.gz 594227 BLAKE2B e37ce7a41aa71f36a60b14b3da50df5c387aa64c472a48fe76d66f05ee495673b2719fb0ca0fab196992c4920eeba72701d47defceb70c2d85f5f894d13d40dd SHA512 f192c3f6abc3943fa8fffe959d3db74e810483c9f5868cc128a851ffc42069d084c0d935ca74fd45d5bcce3fe2cfeeb788094dc34f0567ed709ddfb57275fa18
 EBUILD dissononce-0.34.3-r1.ebuild 765 BLAKE2B f13016ae978c439457a516da1cdc5ca625285b6608672e31c4b0c99d7dbbe633e9cefb7660c98bac72e256a86743f5f8367d81c4dd1c45d00d7e94dd49850c6b SHA512 6670081013cdc516ea55ae1cdaec72ee642b517833c013eadf1212d27e1c079aa1ddd524262cf6154ef3a7179853527d6d1eff3c093d15c868f1f579f5466e9a
-MISC metadata.xml 659 BLAKE2B 9e628e24c999a14575817d45ba61f5ff0e444c222c67c3204c1c53a7c928e926ebf9e4319c3f450d30686eeb01c1b94adec2008d65e3275df09964a9b281aa16 SHA512 2bba877c4161cb766f935cbfb5b7b421cebca89116e9bee83655ded6bdcb332c719314e0c2c1cae010409e071e511bb1335f5118993b647b1c25a99076f072bd
+MISC metadata.xml 707 BLAKE2B 7e9d43dcbf4a8f5da5e099fcd4b6391903d48a91712ea98f426e175a0d0ffe62a7bbe01a8c570a3554c9cd597ee9a6be120b0a99e5eee22e028cada3fdc15251 SHA512 6980f618735d3a2132cbc86473f09476711d61553922182f85831e91bd92737b8240e6966847797d2ea2a2e4c035b95f6719b1af02655538c107ede578bab888
diff --git a/dev-python/dissononce/metadata.xml b/dev-python/dissononce/metadata.xml
index 394038dd3ab6..71c2d8b79b80 100644
--- a/dev-python/dissononce/metadata.xml
+++ b/dev-python/dissononce/metadata.xml
@@ -14,5 +14,6 @@
 	<upstream>
 		<bugs-to>https://github.com/tgalal/dissononce/issues</bugs-to>
 		<remote-id type="github">tgalal/dissononce</remote-id>
+		<remote-id type="pypi">dissononce</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/distlib/Manifest b/dev-python/distlib/Manifest
index 6ff69f5257d2..3a0f0d0cead2 100644
--- a/dev-python/distlib/Manifest
+++ b/dev-python/distlib/Manifest
@@ -1,4 +1,4 @@
 AUX distlib-0.3.1-system-pypiserver.py 1532 BLAKE2B 7bb2bbb2282bcaa943735804428b00f6c51fdb51c7acaec7efe653495acd9194a0544d5d49531a96ab269ab8a61ba87e3c35d4f30ce5275a0a284fadd88cc19f SHA512 b96579d450c5c33502edc57480d5bb00aa3b9b61333c43ab446a3cf7117934a6a14026b2061cbf28e69e88a515554f8a1aad732f685cb73f18686b1aba6379ab
 DIST distlib-0.3.1.tar.bz2 1068500 BLAKE2B 52135869242f71cc6d6887da6d9e20ffc6b46c84d8146393961062d92d8c0bd68e1309277f64fdec0319ff3c503b1caaba3d5378f5c081dca79573c8d9c2e6f2 SHA512 f259299176c45be7024b80759015a2fad120ffdde55b6abea0f7fb0335cee90809b5daedcb88abdfb68fd496284b2e478df622004b3750327bfc86807581116c
-EBUILD distlib-0.3.1-r1.ebuild 1458 BLAKE2B c2a18d5937368cc6a7c9adea7f54f1b33d06b7db7ceea591b7643f5336d9c6e7e5c7b52b67cd2444a614c361d65038db9a4e7dd46191bc031a4c31125f655b09 SHA512 64ee7a3e94d6d2df3cf725481fc92041f3b7d8789368cb64dda81f5f060d29a5b8c8d4e23f398fae4e1e4aaba5236bad6514d30d33e95de10d4f64d6c12744de
-MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
+EBUILD distlib-0.3.1-r1.ebuild 1464 BLAKE2B 36c87d82b5e98b7d4b7e6e4ce35d0a0d5b462877ffbf777d36e128cb1c0ee8c2f3e7c14a79063bc64009e884afa25166cd95c1781cb00ad606506b0a5a118738 SHA512 0bf5fc293503a40ee346ea68410738dbf9c7bb680c4162af2d6fa949d402a7944296c409b1204ed215e0e3536be635e2bbf6696ac744bfaf4bc07227102f8941
+MISC metadata.xml 288 BLAKE2B 865be58267f18634250b494dac795da10ca6daa5defa289003da9282f06eebdcc3a3369bb39b2a7ac216ec44134b29ec9052676637564974eafbbf4c270403d4 SHA512 2eb267e476064080a3e34b4f66af276666a30d37967298384f612c2fe9a73bd805b0ba72f6c4e2c1ca6d6bf737d8b3f5484b0c3f37f2ec1616f9017124c54cf1
diff --git a/dev-python/distlib/distlib-0.3.1-r1.ebuild b/dev-python/distlib/distlib-0.3.1-r1.ebuild
index 0a9a6ef399d0..7eaff0461b0c 100644
--- a/dev-python/distlib/distlib-0.3.1-r1.ebuild
+++ b/dev-python/distlib/distlib-0.3.1-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 # This package's tests are extremely fragile and tend to break or hang
 # when it doesn't like metadata of packages installed on the system.
diff --git a/dev-python/distlib/metadata.xml b/dev-python/distlib/metadata.xml
index 266e3f19ca59..f04c184a6cad 100644
--- a/dev-python/distlib/metadata.xml
+++ b/dev-python/distlib/metadata.xml
@@ -4,4 +4,7 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">distlib</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/dj-database-url/Manifest b/dev-python/dj-database-url/Manifest
index a0eb02476170..276835547916 100644
--- a/dev-python/dj-database-url/Manifest
+++ b/dev-python/dj-database-url/Manifest
@@ -1,3 +1,3 @@
 DIST dj-database-url-0.5.0.gh.tar.gz 6309 BLAKE2B 72647f8651d595b4020161b15364836b8483bf8a12ec72e434bc9d0583878ee9f4e4c76110581f285adddac3e7c2d7bc071f720a7fde91c84c3ea53b6c979300 SHA512 541d5177bff0fcc21372d2d9dc699ba11de1b1cabf10d61fb9f1e844a6dd4d46df5c7fdb6ccb4505cf984e41d7a2ae4e3af5e7d05072b0ed6982499eac5aac66
 EBUILD dj-database-url-0.5.0.ebuild 528 BLAKE2B 07212eac1ba2ef0c46ef25bf3f5f49072f5e26a3541ddf3aa4620565bf1ad91d71610e8db29eadad1e697251b45b3c0e14a2e1a8ec67cc2c59125057e5c68ce3 SHA512 161cde866b2a66d05fd2e7b71f5cc9ab0af54909d1cc0c64f9b71b5ce254bb0127b9bc5d9c8b21859836bf1fa426bbfb4186696a8e41f72dd34039f8c0ea8b0b
-MISC metadata.xml 423 BLAKE2B 8ffeb653121355367c526ae43a04bc378066ec1606fe4a034553d0a53edeb241443fe02d28917ea46ca5c5f49a8ec56a88e951e68a7e2d98013ebd76be66dc4f SHA512 e7ce0313806e3c4ae511bc1b60bbf3f7921610c9fe889166658299dfd0cd01bf01f5a4d47b1a166569e9365b0d75e980e8bf463f63fb82c8134a20e7b1c74ff9
+MISC metadata.xml 406 BLAKE2B 9e373049eda15ee3ac87de1a93c2c6ace80868cd42166bb9d8a895b0d558e84160de131c2e9db969dbfcaf0f8400176919800cb5b0b07202533022d707af1f0c SHA512 0003de2818ac2fb9acdbe55fb3c40d46f1a32fab1e9b4e03c7b9426a7f841d31abb323bb863282ff1b10503d751cb31c67d4ffb693bc56b8f262edbfc382777b
diff --git a/dev-python/dj-database-url/metadata.xml b/dev-python/dj-database-url/metadata.xml
index 85f9085eb45c..66c1e8881de1 100644
--- a/dev-python/dj-database-url/metadata.xml
+++ b/dev-python/dj-database-url/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="github">kennethreitz/dj-database-url</remote-id>
-    <remote-id type="pypi">dj-database-url</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">dj-database-url</remote-id>
+		<remote-id type="github">jacobian/dj-database-url</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/django-cacheops/Manifest b/dev-python/django-cacheops/Manifest
index 2cf745b76409..98c61c4b6ae5 100644
--- a/dev-python/django-cacheops/Manifest
+++ b/dev-python/django-cacheops/Manifest
@@ -1,3 +1,3 @@
 DIST django-cacheops-4.2.tar.gz 50240 BLAKE2B 87ef35097f3c521ac21e614adf3b05d871b562d2a463921ba70ce3f7f4a4f7c1b6966e27077dd95016f10649cc1127fe1f7f65bd6353f86cc4395c59d20ea60e SHA512 8caa9b9ffed45bbc6039cb14ce311f714160aca2111408ae1505bbd78d0b8b4057e9414994bd0d0c1334392e83b4c27ca59e0ac1db01e3a56c409f2806bdaa27
 EBUILD django-cacheops-4.2.ebuild 606 BLAKE2B 0ddf1f450d4e823ffce04b5975c20790572aaa92e3ae1c21250f60dbffe703b830d7d7377478fdd137460512a7f15565a3502c7c7e029050771922aa2a935efb SHA512 ab3adfce784e67899b00dd4d18b2da2ab8a99bb36325aad03fcb8aa2ef8274a657cf7d68c3d19e8ee2356fc72d0c241c6c550c74a5fd7f0929c7447b50747a39
-MISC metadata.xml 327 BLAKE2B d4518f6d7090440fec7e9518fbce9813be8c9e7bce9583bdf0c47b1ca456a078d23fea12f20febd4f4bad6d2e57109e5acf301bdf724c6cdb5346749a3e42989 SHA512 88bc51ba0079d132b0bf9b053e33262f5cae9c4a66f561d6c7303066f117e2196fbbfbce5b4cfe35c7f1cc5020b3818c365dab4dde696d5543dc70ca32d40ff1
+MISC metadata.xml 405 BLAKE2B 782983c3020ee5b0cffea3ada5dc600641837f20b756819ec7bd55a45ccfd18902cea91b6455bf162f0d1829a891d412fa65d60d0b9c593b5aa7b54a46d1af5e SHA512 ba5db367d7648a62e477ea8c967525c9976996406f70af2345854ab2da66fdfe63d6f1cc0c40518fd362586c784ea3bbaa215a1497074fe78c2b0298cbe8a06d
diff --git a/dev-python/django-cacheops/metadata.xml b/dev-python/django-cacheops/metadata.xml
index 5d3d9dc0e2ac..17ae2620bcce 100644
--- a/dev-python/django-cacheops/metadata.xml
+++ b/dev-python/django-cacheops/metadata.xml
@@ -8,4 +8,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">django-cacheops</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/django-cors-headers/Manifest b/dev-python/django-cors-headers/Manifest
index 7e1edd5b190d..2711d074548f 100644
--- a/dev-python/django-cors-headers/Manifest
+++ b/dev-python/django-cors-headers/Manifest
@@ -1,3 +1,3 @@
 DIST django-cors-headers-3.2.1.tar.gz 26261 BLAKE2B fcab223308223af20754275256e9c03f2dc99210b05d200fcfa0f0e4583c7f8a098ec66a3a40d771aa94221d9d21d2bb0c673f4722b72f598b95f31420fa7526 SHA512 9b48820fed88a468ea51db9ed7a8506afe96ebefcde3c1e2fc497a6580aa506669bec7bbdc87957e9d9e8b711445a7d1359a213a6a15dfcb7313d1437e252397
-EBUILD django-cors-headers-3.2.1.ebuild 532 BLAKE2B 1c0500f998d293a52dce023131510f792b18b2688c8b94280d73d90ac9842e28cf557efd5bde6a1e560bd8037816d08a5a35e86d0b8d9681216e2b644bf0940b SHA512 02ebbf2b2639ae5f353557572986d2e77dc23b46878bf9b48bfccabd993d69628ddc55b4c7612fe0e2e2f6cea8a0f6ecafd97c21f1e885492d07f7ef1ff650e2
-MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
+EBUILD django-cors-headers-3.2.1.ebuild 535 BLAKE2B 8e50dbd469ca08cd47bd30765a3c3848cf4248ab13cd2340652caea4653d9f4ec3cd1f301d62a83134bf07b8a7e60ca252efc06f21942c5522b81fe2e289693d SHA512 b3d60ace65f1e89af03225543c6947ead56c9dcd17c15a4e757d6f02d7ed2cf57a83c42728cedf8015bfd543f3aeff0e38138d62931962d320d288e5db50779a
+MISC metadata.xml 400 BLAKE2B 924af06d562382e0c692a09f58bc6b8616e3d73a9bcd2f7073ea17ce8cd27ecfdd800d3311cce622f86bab9a01e9151c1514ca8ab6f1ba43508f6edc5497029b SHA512 b1ddf20f92855b534146b185843e816553fe4574bd8c4fdce7c7084f7c2ea9edf1e1d81a55cc220f687045ec8e8dfd4a77ece7c727adc633358b93fe22e563d8
diff --git a/dev-python/django-cors-headers/django-cors-headers-3.2.1.ebuild b/dev-python/django-cors-headers/django-cors-headers-3.2.1.ebuild
index 77307b63a59f..f2f932695177 100644
--- a/dev-python/django-cors-headers/django-cors-headers-3.2.1.ebuild
+++ b/dev-python/django-cors-headers/django-cors-headers-3.2.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_6 python3_7 )
 inherit distutils-r1
 
 DESCRIPTION="Django App that adds CORS (Cross-Origin Resource Sharing) headers to responses"
-HOMEPAGE="https://github.com/ottoyiu/django-cors-headers"
+HOMEPAGE="https://github.com/adamchainz/django-cors-headers"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/django-cors-headers/metadata.xml b/dev-python/django-cors-headers/metadata.xml
index c36c37139fad..5080a409e510 100644
--- a/dev-python/django-cors-headers/metadata.xml
+++ b/dev-python/django-cors-headers/metadata.xml
@@ -5,4 +5,8 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">adamchainz/django-cors-headers</remote-id>
+		<remote-id type="pypi">django-cors-headers</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/django-debug-toolbar/Manifest b/dev-python/django-debug-toolbar/Manifest
index f294751579a5..db4bee1312d0 100644
--- a/dev-python/django-debug-toolbar/Manifest
+++ b/dev-python/django-debug-toolbar/Manifest
@@ -1,3 +1,3 @@
 DIST django-debug-toolbar-3.1.tar.gz 228867 BLAKE2B af3d8011136ba30e690e03548d757405e9cd89fb5473b277720a3151149e92be212e50a6ec3d95903382716c9594405a1e93a7a1bf231f220f4b5c8ae1e38480 SHA512 c4cfa3cd98adfba7362e259e18a0240b886f294ba10f5c64e12887b00d4dc952e9b80cac0f78e7193a15566585f43d988f6d287e4d0dcc84c4f8395c7006e2b0
-EBUILD django-debug-toolbar-3.1.ebuild 1170 BLAKE2B 458a46ad50bca484063b13d883373c1d49c960538124329622435ba3803672578962d55252b1fce00c1dd449f8380d256dff06cd4a43ee646f3ec524d9b5db73 SHA512 9ad2f9b2ad80dfea4653783234d13fff87774c7913a8c06e3e930f652ca1c393e304a28bbfbe7452702c139b1d5dd8717009e9f23ebc8a308f78f9bcea887db5
-MISC metadata.xml 356 BLAKE2B c0d02bcf9ab38d7939a3edaf8eca080283ccee6f95f1e04ac96ce5870845e6a84d6672d6ac923c74d18c340326bca379691946aac7a51bdee8d6f4adcb45a50e SHA512 12686662e852b0283d2212f0db83c832c1248723a7cd751990e43b1641ddbad2cc2c71c17ac4704c01beec9a9366fc726504c10e9a9e56456b544a800cfa7847
+EBUILD django-debug-toolbar-3.1.ebuild 1161 BLAKE2B aec355450ba85b72e69c5166d26c159d762ba6c78a6d72eb02bc66b777cc7a4b945ffa286aae15f889214e4af9539fa2dd5aeb3a648ca2c42d7c2ba33411737f SHA512 c728ddb1d6a2fe747f3602f0657ea4b544c09878caac74955f6970c758dddd5f1ec143538d6d0a8da7fd54020aeccbc3357f2eba120423ce87d4403ed74b6189
+MISC metadata.xml 392 BLAKE2B 69de466f8b461389463725f2ac42881a0e0b17b2242d6dccfc045593b9feb03a0650c7e9961845298c410ac81dfbc30b9387bec3e0574765c59acb8d3256e737 SHA512 f85001a94daa2890ea28e87ecf6b6233f905141ebbb9af29087bf42a91f72f0cc7458474e84ae1ea80fd854252cfb2bb305576ad2a25ce5e36cf823caddaafd6
diff --git a/dev-python/django-debug-toolbar/django-debug-toolbar-3.1.ebuild b/dev-python/django-debug-toolbar/django-debug-toolbar-3.1.ebuild
index 5f9abc451510..e0aa5296f38e 100644
--- a/dev-python/django-debug-toolbar/django-debug-toolbar-3.1.ebuild
+++ b/dev-python/django-debug-toolbar/django-debug-toolbar-3.1.ebuild
@@ -10,8 +10,8 @@ inherit distutils-r1
 DESCRIPTION="A configurable set of panels that display debug information"
 HOMEPAGE="
 	https://pypi.org/project/django-debug-toolbar/
-	https://github.com/django-debug-toolbar/django-debug-toolbar/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	https://github.com/jazzband/django-debug-toolbar/"
+SRC_URI="https://github.com/jazzband/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
diff --git a/dev-python/django-debug-toolbar/metadata.xml b/dev-python/django-debug-toolbar/metadata.xml
index c3f31e955609..77f1654b40b6 100644
--- a/dev-python/django-debug-toolbar/metadata.xml
+++ b/dev-python/django-debug-toolbar/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">django-debug-toolbar/django-debug-toolbar</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">jazzband/django-debug-toolbar</remote-id>
+		<remote-id type="pypi">django-debug-toolbar</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/django-extensions/Manifest b/dev-python/django-extensions/Manifest
index 4d3c50cabcc6..b800458a12bf 100644
--- a/dev-python/django-extensions/Manifest
+++ b/dev-python/django-extensions/Manifest
@@ -1,3 +1,3 @@
 DIST django-extensions-3.0.9.tar.gz 779297 BLAKE2B 9217d395662a8e7dbe09e691cfac7da05e3d8e8b67337c66be1bc7c8a03ddb76df267f38e2ec62c80ffb6be6cef005146ba34c215ab5e76009091ba4b7b05b9c SHA512 42f84fae63b6fbc99d1fc931a73cbfcdbe8cb8c6c7e9997c7571975b073de1132f2f2153ae9a851a4b144c317262b23669624c770d1785364253c295a384a862
 EBUILD django-extensions-3.0.9.ebuild 543 BLAKE2B b0eadcdf7b6e03d32c0f41b25ca59b8b1c46e2ef3598851e2a0965142a2359c887dc6bc9b368041d85b4ca0cef8a45d35ac73ac69aff98b779221fdf551d845b SHA512 dfcdcdf3e8a93c6b65dfd13002650fe9dfbdc8637969212587f6260d716e278bd00b16d157ab3c4660c48090ad935e25f912691d9dcc8bb2385a8ed035b3b7d8
-MISC metadata.xml 296 BLAKE2B a47173b91e681b5b6ac22b7bc6e943b882d9296fcc4bae0a52d90ed339cc9e15c98681fb351156141581dafec3c9d5880925775fc4d8cf291b43266ef30685eb SHA512 52f2a0e5139e146a5d6ad1e6c23070df78bbd3e2a78ddc9530707d0a4e8d62bd0f3ea2427fcf18bcb54b46fa4501068bdfd6c44f9ba0d2519e20d123ff11747c
+MISC metadata.xml 371 BLAKE2B 086a467a4a03c59a3e014c69bbe3e4475b038aa06f7fc9c578a6e058cb748a9a7416142f49f83aba14df5e97c6ed63a8592269ebe5295e2964d3e1761f39bb18 SHA512 6fdaa3189514e72b9f077da6adba1bd6cd217667013d0d999663dda58408c51210730111ba8c566252ad8dfaad64ad6c96c2234c8e125b580845b49879e12dfa
diff --git a/dev-python/django-extensions/metadata.xml b/dev-python/django-extensions/metadata.xml
index 8bd0580ba2e8..c7d9d99dfedf 100644
--- a/dev-python/django-extensions/metadata.xml
+++ b/dev-python/django-extensions/metadata.xml
@@ -6,5 +6,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">django-extensions</remote-id>
+		<remote-id type="github">django-extensions/django-extensions</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/django-filter/Manifest b/dev-python/django-filter/Manifest
index 30f4a533b956..d563e1987514 100644
--- a/dev-python/django-filter/Manifest
+++ b/dev-python/django-filter/Manifest
@@ -1,3 +1,3 @@
 DIST django-filter-2.2.0.tar.gz 142804 BLAKE2B f2385fe3afa78349395bd3334461ad2acc760a2007d4b69618993e176899c77e8585d90bb68578e561a16459cdf35a480adf0a0e6235d6500e5f2c2a7c602445 SHA512 16a4336d1558cabfe497dd9736a2f652c9f9d141a72c856cf13f3ca56db4da85b5926b05c772aef5fa43a75e085025244b8deaf7facbc5bfa68907bd99f4f95d
 EBUILD django-filter-2.2.0.ebuild 532 BLAKE2B 57092f1f286da60aee1064ded293ebb581f741bed6bef94a78eb687d0b8e4161d5422f4d060cc28b2698db9664abcfb47ec2981899cc2d7d22fd1ee73a233b35 SHA512 21ffbd3d1c390b2fbb8304253d51fa3b39f664b782d86789063973102555ddfb5e4291e0743cb955d1a93e54c839d41065854b97317d9b5ee728204e9d2171c4
-MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
+MISC metadata.xml 324 BLAKE2B 12344776128e63ef66885d1355375da977aeccd5119ff4d8a95ee4775a1eeb8365a69988409d1a6a37f0fa76abb04e9b03ba30e162a2d590bbe3ed138c4e60c5 SHA512 150744eb6e529228a82a340c30479c4a7018d1ffe29d406e6171c038e6b6c736cac9fc36ea011b606a2dd4d33f56326c8fb8ff1f8b5df9664c43982865f46bbf
diff --git a/dev-python/django-filter/metadata.xml b/dev-python/django-filter/metadata.xml
index c36c37139fad..94af350f2260 100644
--- a/dev-python/django-filter/metadata.xml
+++ b/dev-python/django-filter/metadata.xml
@@ -5,4 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">django-filter</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/django-gravatar2/Manifest b/dev-python/django-gravatar2/Manifest
index c46499eb3468..911bd082afa1 100644
--- a/dev-python/django-gravatar2/Manifest
+++ b/dev-python/django-gravatar2/Manifest
@@ -1,3 +1,3 @@
 DIST django-gravatar2-1.4.4.tar.gz 8396 BLAKE2B 181aee58f6be4f8833a26674f020412e050387855a84d4c3b8b8f1c028eeb56caee7c95d4a09f301d7e974051b1519b90e1cff1e9789c860f74497da1ab88fe1 SHA512 999fe2a036b23f73ee8111cccde459aa72a5f90995d322e772776f85ba206281e791cdf7d4888b45c7f2ecf8baf6509ed44652396f5db158c484a2fb53439c99
 EBUILD django-gravatar2-1.4.4.ebuild 499 BLAKE2B 4590bf9d8006227a256efa9c24b71962e27d424dbd542139d9790c60c76c7cd5d9c80ef4f3abe710b051e65b82bdf3da04d7a143b94096b3510a3cd6d57252f0 SHA512 877476fbd7fa3c2bf542c0409840f5027d4593f8c1486667b3982d9956da2021548cad150b87bb7108e6b6a4051541393b3c133fb2344e1d202dfe536393d3c7
-MISC metadata.xml 295 BLAKE2B 3c119ba286af37428c6b1224f01e9252f69561a961995802e85c62709916f5f9e431266baf14de59d75ba8d7eab99f53365961275255a20cc3c4babfe1f4c4b6 SHA512 51b052a8f6dff1692c3d914b3eb19f9d6af086dae59e500cf728eaa9fd28ec3ce0fdf62adeabaa28abc036a0d0c3d63dbd6a07b774fe0bbdb7546f2c71a280e2
+MISC metadata.xml 362 BLAKE2B 94a7f6d7c2423f26581cee06564f4d3b6ad7821116357d088c55d73c664c3c6fad655af00918cde3d0b5e529ae004bf8ebb9a86b409aa9dc2d8754b3854611c3 SHA512 7aea9be0e3fc7aaa45f0129c42ecd5aa9ab321b2bb3ee29c6aee1da0e19c44d9fc74d28d5ecec8b83a055b0889eae26f623edc358f3b87bb787db84c78cc16ce
diff --git a/dev-python/django-gravatar2/metadata.xml b/dev-python/django-gravatar2/metadata.xml
index ce6b295c28a4..04e8636b56bd 100644
--- a/dev-python/django-gravatar2/metadata.xml
+++ b/dev-python/django-gravatar2/metadata.xml
@@ -6,5 +6,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">django-gravatar2</remote-id>
+		<remote-id type="github">twaddington/django-gravatar</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/django-js-asset/Manifest b/dev-python/django-js-asset/Manifest
index 676713341fc8..1d1b03864a43 100644
--- a/dev-python/django-js-asset/Manifest
+++ b/dev-python/django-js-asset/Manifest
@@ -1,3 +1,3 @@
 DIST django-js-asset-1.2.2.tar.gz 4436 BLAKE2B e6b2ff1b2b90da5ae95af08b28eb1970e6e0edffee7eeec0a4697855040c4afd0febcc569d0a78c46bca80835b404367c426019016e5089b3aed984916e13cc2 SHA512 ea050c5093abd8312733b1402e275fcb44f0702c27e28aeb64d0470a8514cd85906707915556a9878b669c96918813c4bf2b69d281d33f18fcc7c143f8ae9f48
 EBUILD django-js-asset-1.2.2.ebuild 506 BLAKE2B 0a3ae84b838fec557bb5d788f217e3de939e50dec95a96e57c8dffd9c02b94b6135fdc05d7c52d21ff7cb3ede0b92a3bf370275a959af345fe80ec6566d456fc SHA512 97ce93a17f2c05212681869fea7ee00dea93bdbb35a4f372b5fedf39f55a5cf5166a72d252174491f78a01fa3dc18c10fc7f3d943d68e706ebba880df0a266c7
-MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
+MISC metadata.xml 326 BLAKE2B 0c3b07657f9f2a01e054709029aa38bceb8d7babab49a668122cac2a1736892d5892b4a3ec35b773ae82f6a146247238421fff04c11669c1f7ba5ba5939cdbb5 SHA512 23f16332ae8e2b165a4b43107a3c14ea46768e015433417993edceccecb6e0557441dde0bcde74b423ecb907a5645e751429a748cfd655b76119907c12e52121
diff --git a/dev-python/django-js-asset/metadata.xml b/dev-python/django-js-asset/metadata.xml
index c36c37139fad..1aca95d47fd8 100644
--- a/dev-python/django-js-asset/metadata.xml
+++ b/dev-python/django-js-asset/metadata.xml
@@ -5,4 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">django-js-asset</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/django-mptt/Manifest b/dev-python/django-mptt/Manifest
index 1241c27638cf..2c42fd23c8d7 100644
--- a/dev-python/django-mptt/Manifest
+++ b/dev-python/django-mptt/Manifest
@@ -1,3 +1,3 @@
 DIST django-mptt-0.11.0.tar.gz 98300 BLAKE2B cbae24143007dfe8913aacf4cbe22bbccdf929617adc31640c2d429d6ea8be727a937be0aa8353e82862b9fe8c571397db4dd3877015eb17c2c5a56172cc66a5 SHA512 21af30007661db1474628b6f8af86a3f6de52494efe1aaf9235f8b1660ba153f0de3ad91ff979588e4b681b00b44652a05146df7d3951d6ee62da38a1900fd89
 EBUILD django-mptt-0.11.0.ebuild 571 BLAKE2B 02497a56e117f408ae6f6d1d5165170db113f99d452dc8fb47cf5c8b29f11e5da7e4dd78854dd7c3ca55c67e19067ef3ee50a8c02b07a5c8cd740db6831c3621 SHA512 dfc624a9c18060ba55fd3f2f26fdbda82c2b1a8b92982a3fb2de758deabe4720f9262c4edc44bac9f4f7f935e9c53c9dc1c9cfc3718192f0b860b6f4409a60da
-MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
+MISC metadata.xml 322 BLAKE2B 5c85c273d60954e6bf317518cdea0487f3c4d4c3d2b0b9073941d8d03b9f69d0e463a227d8d0573afc4881d275dc36f3dea79a33c1715291148fe07749feb243 SHA512 589208cd8c1c207f03054d7dc25dfeff92c894780c8f7f34b6455912670a22b549ddbbbdbb2fdd2559707a7d046985923605dfb862a6035d92c2e79fd89b1dcd
diff --git a/dev-python/django-mptt/metadata.xml b/dev-python/django-mptt/metadata.xml
index c36c37139fad..515395136cd5 100644
--- a/dev-python/django-mptt/metadata.xml
+++ b/dev-python/django-mptt/metadata.xml
@@ -5,4 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">django-mptt</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/django-pglocks/Manifest b/dev-python/django-pglocks/Manifest
index 2c3e110058ae..9b39f4cc66da 100644
--- a/dev-python/django-pglocks/Manifest
+++ b/dev-python/django-pglocks/Manifest
@@ -1,3 +1,3 @@
 DIST django-pglocks-1.0.4.tar.gz 4085 BLAKE2B 8aaaaaf3b6ace4fb179117dd7b5064245ed9bcc44d0a613e3fd8a048196a15c9d9243bd683388b318c5ebab68b81b111c214ae3a7c3575ac86dcfe6e34a65403 SHA512 bb0a7dc18142fb668cb2f47acf48e62118c17b824d1d04407d253b1bcb3e572a38341e851f53f5e44e48fb6241d4c977e4971686e1f1feca191b27f6e9d7b133
 EBUILD django-pglocks-1.0.4.ebuild 466 BLAKE2B 56bdadb2b151a21ae4a11ee6728e1b3ae43beb8138fc8af1b16a597bcce7a932501b0a5a10af5b55f79028a57de81209ac1909092261e20d127481e62e51eeaf SHA512 df22e4be818c8b632cb2bf5b835f62dbd3c6984da779e51902d4fefbdbacd066d9c2b990e3730432496b174ad271cd397456b206c9580c4fdc0f381d7ea3b009
-MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
+MISC metadata.xml 325 BLAKE2B df8cdb3f0e103a18111f2d3ee454d56f87094bf29230d7703d836bcea1a795225371d4b02cf7b2fffdbb8e7a463424f334a448c18f26badf8f8f38a3566ffeaf SHA512 8adb49e54a1bf49b518a163a9204dbc8ec2a64b5668d73761256ce00939fefe201c2259750ac132ea72bb9d459fa4ac7a077c651e049c6a760e15ceebc3ff923
diff --git a/dev-python/django-pglocks/metadata.xml b/dev-python/django-pglocks/metadata.xml
index c36c37139fad..00fa937a6b35 100644
--- a/dev-python/django-pglocks/metadata.xml
+++ b/dev-python/django-pglocks/metadata.xml
@@ -5,4 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">django-pglocks</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/django-prometheus/Manifest b/dev-python/django-prometheus/Manifest
index caf974f22059..bb229bcc8786 100644
--- a/dev-python/django-prometheus/Manifest
+++ b/dev-python/django-prometheus/Manifest
@@ -1,3 +1,3 @@
 DIST django-prometheus-2.0.0.tar.gz 20028 BLAKE2B 272f192cc0ee4492fa6dbbb65ba6696fdf8fbddc0724290d9b55e5aedb740c2c92cb609969240004b4faca4569580ab451284c2f4bbde589ee61bb96ec448ff3 SHA512 8345c23c8032f0dbecd8e801bd6673e7e3804003ebee0a15b0c8ce3b2d4c6b6f47e7c41e33df2b18a0497eb453972d8b231b88fb51184fafc58d306a9430fdec
 EBUILD django-prometheus-2.0.0.ebuild 577 BLAKE2B 503631295aea3c36b2447a6a7fdc1c716cb91a7a490a4bdd73b441f22e459d427680e7dbea7f4f32b93238f79a0134561056ba346368a4c890174aa82e1f84ff SHA512 1fdc688e16160c7985b479b72127f236db4afa95566de27f68973fbec4c75d9a3af3c9ac0b32d9668af471cb146efbff2df68f9b6052ecc3dce9f10910086f79
-MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
+MISC metadata.xml 328 BLAKE2B f53fb884836d43f5e5d68795b2905ae77d981c422c3a9326cd749533a33f870dda6a13a1946cca6cc0dcc53361303af3b820bca99c10cdd84643a6733347b24b SHA512 5e4ea2e04845f17b63d889c1436562589b6d02e199e5eac61adccefcace9038ef58c6b5934b10e1bb057b575795580dd73a557cea20cdee8f8185f6a3ae2d3fe
diff --git a/dev-python/django-prometheus/metadata.xml b/dev-python/django-prometheus/metadata.xml
index c36c37139fad..b4bca3123fc1 100644
--- a/dev-python/django-prometheus/metadata.xml
+++ b/dev-python/django-prometheus/metadata.xml
@@ -5,4 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">django-prometheus</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/django-redis/Manifest b/dev-python/django-redis/Manifest
index ae1d23fd0cfd..09d041a952cd 100644
--- a/dev-python/django-redis/Manifest
+++ b/dev-python/django-redis/Manifest
@@ -1,3 +1,3 @@
 DIST django-redis-4.10.0.tar.gz 59208 BLAKE2B 76a6887fdcce7decaeb2c4b76ff0ff58b8b074e902f6ccfc57dbdd21aeac82fbe37367caaf0af1c6facd5b87db6bb053b2fc553ba87b3cca970f2c0b1f99e35c SHA512 39e2d72699ceb2b0887e7048db22a4067001fb5e2c10ae2c5d2d8a0ab71e862773e443ba3a109f7b874b994a842e89772b3e33152aafd2a98e1cd906d5d2e690
-EBUILD django-redis-4.10.0.ebuild 493 BLAKE2B 039ea4a4634f71978a87859654e857c411332a0f28823a115536f5d578cee5e620da9d7a6ff8003ebfae6b3cf1621300abba9c21357110f11c8e33a84d5d5980 SHA512 e7da9e7f0379583323b54b4e639debf153b98abc4eb02e5d16f0ef668513b8ae96da796915d51a53c75bb9d811b4048a9f943fb7566436cda3c61758f3d5cb0f
-MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
+EBUILD django-redis-4.10.0.ebuild 495 BLAKE2B 3820d88bc95a84614d5370db8a4d746db09f6dc7323c65878243a2c28e8238a7f644ca99da9dbc9e46c51c5525361f6f3c904ee9a1d69b7fbe48fcf48293576d SHA512 3aa9b03f28c4f177b5b17546185403d8a53c82bbff612eb4cfb5492747b24a841c63feac33cbf587dc01c8b87fd1af54c60717a28dae7b4508c1e1823951cb1a
+MISC metadata.xml 384 BLAKE2B 5d0785252e97fdb57ebed48e7f192236d384946b893ae2c36b180fac006119d094e899f756e95bcc04151b541a5329b4c55ecfdcb3542a85a3c8c449d6c6c189 SHA512 da987a6c44f22bd8d136993c38627b8059083f4b274d4b39a341089d990217efaf0a4c0ac1197476af7d5687adea3fc664d42ee33779882ac78fc02541233592
diff --git a/dev-python/django-redis/django-redis-4.10.0.ebuild b/dev-python/django-redis/django-redis-4.10.0.ebuild
index cdd13fa9c909..58ee6c87a0cd 100644
--- a/dev-python/django-redis/django-redis-4.10.0.ebuild
+++ b/dev-python/django-redis/django-redis-4.10.0.ebuild
@@ -7,8 +7,8 @@ PYTHON_COMPAT=( python3_{7,8} )
 
 inherit distutils-r1
 
-DESCRIPTION="Full featured redis cache backend for Django."
-HOMEPAGE="https://github.com/niwinz/django-redis"
+DESCRIPTION="Full featured redis cache backend for Django"
+HOMEPAGE="https://github.com/jazzband/django-redis/"
 SRC_URI="mirror://pypi/${PN:0:1}"/${PN}/${P}.tar.gz
 
 LICENSE="BSD"
diff --git a/dev-python/django-redis/metadata.xml b/dev-python/django-redis/metadata.xml
index c36c37139fad..e093c7994dc6 100644
--- a/dev-python/django-redis/metadata.xml
+++ b/dev-python/django-redis/metadata.xml
@@ -5,4 +5,8 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">jazzband/django-redis</remote-id>
+		<remote-id type="pypi">django-redis</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/django-rq/Manifest b/dev-python/django-rq/Manifest
index 9718d47ba3b8..f389b769dbe7 100644
--- a/dev-python/django-rq/Manifest
+++ b/dev-python/django-rq/Manifest
@@ -1,3 +1,3 @@
 DIST django-rq-2.3.2.tar.gz 41038 BLAKE2B 837a8f819e9a91763b2d4ec961257d429e6d686fbaaa181d7fbe41efd9e08d958c5c340e4e1a4c8f0ef4063e985d3df82d8ea2c6a7cdea872b330dd545660e31 SHA512 8cf59aae163034240bfecda5f332dcc590813445cb2fc14bee15459ec8d4c50a36ab56865b3ce9360968451695e7a6d5eca5da26ef63c29dbc9dd58af8f16b98
 EBUILD django-rq-2.3.2.ebuild 527 BLAKE2B 02270816b2d9018497bc5b1618aeea38aa1c821dacf7c6b64b443fb055725d088f3880ff6ed54e6cf753a1c2a3423a2824cd1031f24f993c88c700f23935ff28 SHA512 f517548e513cd2e62f819c391a4b27d5118ea16f3a09ff8fa541b83cc6ca5a1233e497c9ae3db0bb94799946828beef64748462014515a15da65e31d838a5d0c
-MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
+MISC metadata.xml 320 BLAKE2B 22b800a6cc365319036651802956e243a138fb7dc5b4e0e94600a1f0851b660c2fdff5530a6785f7b9bb76f16f6611dd1bf92babef9be941e7e370fcb27fd9dc SHA512 4a01a197df79fa3649dc3524c8790649e9e5397f34ea3e6841dc0bc188ecd31f7141c80b5ab254d409fd073626eb0bb470a17ced2abd5ef65c2d8b49bcd291ba
diff --git a/dev-python/django-rq/metadata.xml b/dev-python/django-rq/metadata.xml
index c36c37139fad..14eafe988a39 100644
--- a/dev-python/django-rq/metadata.xml
+++ b/dev-python/django-rq/metadata.xml
@@ -5,4 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">django-rq</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/django-sortedm2m/Manifest b/dev-python/django-sortedm2m/Manifest
index f0cbf9141ef7..479c2515c3d1 100644
--- a/dev-python/django-sortedm2m/Manifest
+++ b/dev-python/django-sortedm2m/Manifest
@@ -1,3 +1,3 @@
 DIST django-sortedm2m-3.0.2.gh.tar.gz 44296 BLAKE2B 41dd4a7bc654fef638f7a387b1307ee32ca2d8733f4ba6b9fffc92a9ab4c6af7d64159cd5a24f4305483502609a1730fe12a3072f493251840ba840b98155877 SHA512 4e58ff37cdd798d88c47a8efee2bc783ad7109b30e023127345b6d12b176e452d6125fbcaba5392fc11660df3e8b66be4b23d5ff7ab90020f946cfedc80276a7
 EBUILD django-sortedm2m-3.0.2.ebuild 831 BLAKE2B 178b605f32974cef64e5d7ccdf55a38bfca6634837076bb64af94217920314406b78835127d08655c587244705d35859570a2aaaab63efd9eec7f896e912e23c SHA512 53ec00e85a23fe8b6c9e35057825c7c6ac71d9eb9c5c2097b607c0f0a5d97b9141b27819bb6841a0c6b59b2878fd0ccf1e9355cd61451d1dcbbb717c6ef87f88
-MISC metadata.xml 329 BLAKE2B f56302e008935e131134356469a8f76d56fe7b69f33267769dd36cd115eba90ee52d485236971cd39f93e0a3ce027948b2a93c499b205b80b8d01909ebad93af SHA512 8a6f9414b12a198d536062a2e4632a8461f9635d8fcece03bdb05fbe511f7b6683f42ea09d4eb8304a25450f2e707717f4e066498ff74a76d14609af39911aed
+MISC metadata.xml 384 BLAKE2B bb944ca72c1e84fe1cbfa69adb0a0532c32383f92900c07f60080881ceccca0040a204f5aca0dc7adc3139ce557889dd234eaab37211907e646bc66b1ac0df89 SHA512 70d3dd00966434fa44bd6e91007e9ca3e09eb0d51a5df369fe12a8abe97496c383fc2aebe47803df0a429c9035bdd18f480a5bfb09d7a774e479315190e37c80
diff --git a/dev-python/django-sortedm2m/metadata.xml b/dev-python/django-sortedm2m/metadata.xml
index 4f0804843856..c0a692f6f379 100644
--- a/dev-python/django-sortedm2m/metadata.xml
+++ b/dev-python/django-sortedm2m/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">django-sortedm2m</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">django-sortedm2m</remote-id>
+		<remote-id type="github">jazzband/django-sortedm2m</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/django-taggit-serializer/Manifest b/dev-python/django-taggit-serializer/Manifest
index bcfdf50ba248..732ed7bf5d46 100644
--- a/dev-python/django-taggit-serializer/Manifest
+++ b/dev-python/django-taggit-serializer/Manifest
@@ -1,3 +1,3 @@
 DIST django-taggit-serializer-0.1.7.tar.gz 5589 BLAKE2B 2e9fceacd1eb1908848da99d7ec6b708f4c37f64c7ccde9e1082356e7695430c4c1f436a7d1a37200a249d2736adb848c1ce4fe26f63a6b1748080b62c1215dd SHA512 90a3e39cda13826bfcdd0a6f262108112d261bc5e03f8ed973c0af0e1a6d8efd80e1e0926682754df4efdb697cea5453df39de70b0067c02bc452a8462ab2574
 EBUILD django-taggit-serializer-0.1.7.ebuild 523 BLAKE2B f42880636805586789f246a21efd425475c58fedf960a29c3d472b14a6c729b76e6e2300b0b8fa99dfa3ad369d170dbc956462434c8c15c59fd2df78ec0a5521 SHA512 a1a718ea5bdb82149b8f5f741a316ca7b5615da18b4438fcb867ae9433c26fa5628eaeeaec34f0c89fd7f64435157f9870f08b9d3014593230278c8a3a4cc16a
-MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
+MISC metadata.xml 335 BLAKE2B 8d0cd28e833674e110f49c0ddfded1bfe4314a565b8e9fed542fe14b0d23710715d99ba430862f5438635ece13651972814c9f7ca437c615b7ae016bedce7db0 SHA512 bb3d5a6e63e6396747e8a4e5c2d266ef5cf3ec2414d1765548c28c356249ecb3ea6efbe7a1aa400ad210fb65334366c13ed5f63a6cfbe493e98095664baf5ce0
diff --git a/dev-python/django-taggit-serializer/metadata.xml b/dev-python/django-taggit-serializer/metadata.xml
index c36c37139fad..c9b586832afd 100644
--- a/dev-python/django-taggit-serializer/metadata.xml
+++ b/dev-python/django-taggit-serializer/metadata.xml
@@ -5,4 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">django-taggit-serializer</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/django-taggit/Manifest b/dev-python/django-taggit/Manifest
index b284c57e2be4..298f86ee3aac 100644
--- a/dev-python/django-taggit/Manifest
+++ b/dev-python/django-taggit/Manifest
@@ -1,3 +1,3 @@
 DIST django-taggit-1.2.0.tar.gz 42938 BLAKE2B 0de8e942c28ce1b268742150061c78221aa957c2574d3df617e72f71104287e73f14fa66ade1e8642459cb1f0400e8d0f995ccd1fe7182bd8f980bb5b3595448 SHA512 7e074ba5ce2399ae0a85da0726b8a945b1da5c22afa9f6fe47b1ad6d65257b54de3b9596091872a48a8a12f53393bdea97aee5f32e42cb0658ae39475a003c78
 EBUILD django-taggit-1.2.0.ebuild 483 BLAKE2B bc8308a17c4497dc81d6a56e2c4b5d62e1f734b9208fcba3c53943fa9d67418de26e50b68f8c02e1b02785010ccbc8d4e5267c5fa9f3d0649a7606a3b6d64a93 SHA512 b8768a539ce5a27f2605b36487cd560021a4c6c581e2121af5d776a75f6a741ad4d18ea52e1ef76693cce0df0e68515f6d6cc2d6860963b976d82f6fdeec5ee1
-MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
+MISC metadata.xml 324 BLAKE2B c935818d1db94f53997cabb493fd55829aae1b09e63487a7f9d76c0940c20271ef3e1a2b59e76f63fc75b76f5a6e58f60531be91c46e1486272704e2fb4127a3 SHA512 df661f7bbd8cd3a106bb943ab30913165d57e96aa8038b941671f5c1adc6e7223726a17d3f830942c48fcaf7eaab41603edff31c88f40aaba82cba498698be1e
diff --git a/dev-python/django-taggit/metadata.xml b/dev-python/django-taggit/metadata.xml
index c36c37139fad..5cbf891ae812 100644
--- a/dev-python/django-taggit/metadata.xml
+++ b/dev-python/django-taggit/metadata.xml
@@ -5,4 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">django-taggit</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/django-timezone-field/Manifest b/dev-python/django-timezone-field/Manifest
index e74342c38c82..6fc6d4dfc67e 100644
--- a/dev-python/django-timezone-field/Manifest
+++ b/dev-python/django-timezone-field/Manifest
@@ -1,3 +1,3 @@
 DIST django-timezone-field-4.0.tar.gz 6866 BLAKE2B 1904dbdc6454109ab00df5008d36a9db9e8dc68215d1824c980ef82711871747d7b51a263d591968494511a33bc4325930dd7d87ba4b62d9386c78c5508d7680 SHA512 d928cc22d45f027b9d5776272cd8bc03b3d7e403d4ade293973e25a7ef96ab1ff6ccaa5bfce2900f579b52f5e8cd6c581054e944440d05b774457faf4ca9c9b1
 EBUILD django-timezone-field-4.0.ebuild 562 BLAKE2B fac8df261207cec6e033a6149f170525c2f4f827dfa5d52383a4ecf34a3a4bd9f14219ef003a73980697809ffde64efe85e5e703ca1885dee7ab7d95ff262162 SHA512 c8f22230b47e0b9481a6e86949a12730a0920bf0fd3475eda164ba695676e317a476f830034a509d4952f30cac8fe1f3d312c4cbcb34212037d8b7b5a720c0aa
-MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
+MISC metadata.xml 332 BLAKE2B edcb6dc33eb62f4dd720dd43000b309ba4d907d25d89d8b3380467c4d7d5c35e2ef46489c9cf0582232c7d3505824d1ea402d49ece7bf94b7494e319ab54d1c8 SHA512 d3d9e662a63076ecc9f0e7bc3acb79c98443edd523632fa28a10ce316c12d4dfc3ebd8145ea6eac5073cd5cda42abe87c18ccfccdca6b42a93ec39b028b445c8
diff --git a/dev-python/django-timezone-field/metadata.xml b/dev-python/django-timezone-field/metadata.xml
index c36c37139fad..46a2959005e1 100644
--- a/dev-python/django-timezone-field/metadata.xml
+++ b/dev-python/django-timezone-field/metadata.xml
@@ -5,4 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">django-timezone-field</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 3ef7ff7072b2..3d2639eae5ac 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -12,11 +12,14 @@ DIST Django-3.1.1.tar.gz 9250616 BLAKE2B 220c53873a70bb30f0ea9b48a70ba71b2de517c
 DIST Django-3.1.2.tar.gz 9387482 BLAKE2B 77e330b4b42f85ef416e90a2690c6315f2a8d30b5705f64b86f62daabe3ff60b24d9fcf8a1276e7425e5cf0e03833a5ca601d15dc3e1aa32f7b5d7a9792302da SHA512 39115e942c26c9af27c4079f590e15caa86cc5c0e012873d7be23809e39de178b2dd935919dee21bbee153bccb17463abcece1db3b1f7dfa95b7b55879488876
 DIST Django-3.1.3.checksum.txt 2429 BLAKE2B 7184da75a1da2c615c78a892c8331ff4abfec86e1ae93f8a74c836988d97ecafbbadaecffd352904c01b40a840a80f4d24e8b48f2570054a2349ef6c58bb43e3 SHA512 ecb1de139b05e697253e0b09fd15b692050be647cceb30d8f1482613d0c3393a3017460aabd7ff71ad1de2a8c70cc9276525d7a2a9285540a052805c969f55d8
 DIST Django-3.1.3.tar.gz 9253273 BLAKE2B 9284b637ea39e028ebabe44de50dacfe6a89621fcc5eea73b7f470fc998faeb361da428be8f3f3e349f25b8629b5a350f3a5b7c35ea50183b285daf63d8944a7 SHA512 0f49316dc61a299a257313c27051852e948337491047bacb2221c9c753a5cf4bafb2ed686311ad5345dd3045260331afccb013c21503891538340225a469d1ad
+DIST Django-3.1.4.checksum.txt 2466 BLAKE2B 635ddd40b542890aef29f53df0fad172e48450081f57c72042a71bb5de654b1d1f5f7ce0c588b1070a203e1d4afe3a1ed19431dd23a2a67cd510d4072c79a00f SHA512 729b771008489bbf0563002e438ef88abb2a14b2c29f307cb2db9c75450f30ac8bd4920bf0493dbec06b3640fc0d4b6817e8a054af1028ad065bd321c761a6c3
+DIST Django-3.1.4.tar.gz 9392125 BLAKE2B b583442de50c358e70a49b9ef557d43211e6faee17933a44012dbb9f0dac3ccbf0a91e01a2b8b798fff7ae05100199e9e9c94a81748b41ea13e49d12bb510617 SHA512 02cfaabb25e5f932dcbf659faba2f0afe298e4bee4f510f7adebfff181bdd13c3a0b08e8ce379bcc59326d904be8699db4ce31065d93566b93cad758365207f5
 EBUILD django-2.2.16.ebuild 2398 BLAKE2B 50de7688181404a9dac497283f011fa96e4963b4e3081531ad0adf47fc32d3878902055447d073163bd948cc349594f9a51289ee98546c957576d2a2ff8ab47c SHA512 603d21991b904244584703729896554b91f71e49e5c3220cfcc5b577e8047afbf49d6c64e273b8b44ceea0dff9d1a21dc945730d746d2eb7c163ad08aa64e193
 EBUILD django-2.2.17.ebuild 2776 BLAKE2B e02000489e63101a17bed98c0a9efe21f78b1626f547dbc83583177ad91fd901ad1b57cefc75766065c95533be5ca8a0b6d8b79b1f9d88cfd405d63f4904403f SHA512 cd03b69e7b41762d75f7424c9e65ed06ab0e2a9ba356b5136ce1fbe1adbab25147b68ad922015960de48768554c71ca0feb3545cdbc15992949df91be5ea5e6f
 EBUILD django-3.0.10-r1.ebuild 2550 BLAKE2B 89648d1fc5de29c8a7e985763c1e167f5f97599225e42675678378e64cec83a4bc842c0c8381e511cc7f9fe6e795e45c0cee2e063e18072cfddb803d072002bf SHA512 437a6688b766a5e5fe7b9f5eb8875a174cbf0e8e9dc65b73f898abafd370763f4828b2f60841d6b5ba4de1a3f150518e4d168941890004cb8a2729046623568c
 EBUILD django-3.0.11.ebuild 2928 BLAKE2B 0c046c236971ffe1c3b7a11d44b498ea1881fb8345aa4afef63d9c70a8591c412ad7c93e31cc9494fdd76646c5eb95c2ffbe625c0ac4c3374e6ef941194f9771 SHA512 297660bcad7cbd7c4b89c395dfa84399f69563395f61be8f6d24a99ef05baef4a5c08579ff8740a959447bf649d4e22409bedc58913d2627fad2bd72635dd033
 EBUILD django-3.1.1-r1.ebuild 2557 BLAKE2B 9079e6e834e4708427a133803c2caa1496ba5151734f8ce918f35e3f68fc70e8a527e87fdda29e0772cd4abd8a8874fc284cd2aa0957ec42ee532b00927d5441 SHA512 2cd024c9b8cbba267bef2b81469a0fb4378f0cc3535043bbc3d688fe47d37ffe6d5277cbb43721de2b9d67002defce396797eb17954c36d52a3d2c979b96b05a
 EBUILD django-3.1.2-r1.ebuild 2559 BLAKE2B 4ac70317a83d02b60704f4ccab979ebbedf4c03d83aa0963eee5c9365017bccd85918b1ff9a025e6607c0d45bd81cefa3d8e53d57f40bbe3b5170b74d1d48998 SHA512 227cc4568c914ef8743433cf7a094da80fabb4de446f01ac779af8cc86725d5e5d358c69aaeab4e1a77a590a7ee69d30915a7ab15037003079ae62be064c6273
-EBUILD django-3.1.3.ebuild 2935 BLAKE2B c793c11f4ac5c57831a19ff8d096333d63cf110aa6664971abad2b4f7e2e0e07fb224894219f46d794c0e55a1b4c1c531999977b42974e2bb1cfe534b1359e8b SHA512 e6960435112e622ad0e2803abaa2acf2497fe706ba341dbc8ff47a54422c8ceeb1aec405305d23574c753ca7cabf7affaff700eb75f36004389fc404d1c520c4
+EBUILD django-3.1.3.ebuild 2946 BLAKE2B cd3728de4bbb6d9cbd2a8087a44c17c63db16ed53cf03b5dfd48396ddd471c863ab34338bd2ed9b5c85e9d070cd12ed690607cb8dbb005bc831059090888a15b SHA512 35009a53a06693be34cdf0f020fe793297a0a63dab1fedc8d3f54acf9ffb0866523f75f9218ea450437e44d7732d6fbf3926966430245edaab0651c4ae85a741
+EBUILD django-3.1.4.ebuild 2741 BLAKE2B a162732837c1810695e69d76774684348a8f7be3a005979ee40a85c72a54c51f57708cb45293aeac699de8b46fffd7e8d7009eab02cb55b2f01617eadac05288 SHA512 74b80f16e5a1845f7d3456e7d1e5f23c15899d367c58185124e92aba0ffbdbad0d8e392b7c6e761e1e11b77cf1f25429eb279f3d26d2409acfd8d6cf7962b0a9
 MISC metadata.xml 399 BLAKE2B f49845f5a6476a0b43cbe47ab11b298f53703d850d145a31967f512d9402048fc1b1891606ddba7342ea9613c27ace3986f6b508ed83f0c5eccb26a13fd49f85 SHA512 92470f2930b1c940ccf3478b11157adcc4b84924b0cab4e1fd8aae98c7bba14e995491ce44810223eeb3802967be68c867d0ee4ac0df9f49b4234efd1a7ecfa7
diff --git a/dev-python/django/django-3.1.3.ebuild b/dev-python/django/django-3.1.3.ebuild
index b064fd138ee4..a1cdaba2e63f 100644
--- a/dev-python/django/django-3.1.3.ebuild
+++ b/dev-python/django/django-3.1.3.ebuild
@@ -23,7 +23,7 @@ LICENSE+=" Apache-2.0"
 # admin icons, jquery, xregexp.js
 LICENSE+=" MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
 IUSE="doc sqlite test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/django/django-3.1.4.ebuild b/dev-python/django/django-3.1.4.ebuild
new file mode 100644
index 000000000000..6e2cded2dbc8
--- /dev/null
+++ b/dev-python/django/django-3.1.4.ebuild
@@ -0,0 +1,95 @@
+# 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 verify-sig
+
+MY_P=${P^}
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
+SRC_URI="
+	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
+	verify-sig? ( https://media.djangoproject.com/pgp/${MY_P}.checksum.txt )"
+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 ~x64-macos"
+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}]"
+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
+	)
+	verify-sig? ( >=app-crypt/openpgp-keys-django-20201201 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1-bashcomp.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"${MY_P}.checksum.txt" sha256 "${MY_P}.tar.gz"
+		cd "${WORKDIR}" || die
+	fi
+
+	default
+}
+
+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/django_polymorphic/Manifest b/dev-python/django_polymorphic/Manifest
index 5c4484ff5dca..5f37575cfe5c 100644
--- a/dev-python/django_polymorphic/Manifest
+++ b/dev-python/django_polymorphic/Manifest
@@ -1,3 +1,3 @@
 DIST django_polymorphic-3.0.0.tar.gz 103298 BLAKE2B f68e53de329a8b922fdf8b6daa212422cca8a0dcb31407e4423e8245fe4200c3d2986ca1c9b46013fcc3ae42cedd9fff006db64ca068f8ebff1e19dca2b45aa1 SHA512 7c7030a622d265db2a6d67c327df3044c6598d36ba9d6433f27171f9c07b34dad7a466372e0f7baefc9d2c344b96a2ff9aa28add1fa131c3869d61e4a4c46222
 EBUILD django_polymorphic-3.0.0.ebuild 755 BLAKE2B cdf481e553fd0076b7f6934151ad175e2f58fb6548620af792083259e1ed7ee6ea3f9e32b7a37baae4cb209b649dd5a7a5a75fd67639ff77bbc5affee417f048 SHA512 71376c46b79aab665e88ead4a536c1455583ec983133737473ddf0eb50b55db6d1cb9893e2d7c44bcb2757b2b0b0c130c86773ca524a4844dfb069493fa8ff53
-MISC metadata.xml 331 BLAKE2B d16890936e0e3afcf4a159edcf065a1da3a65ae1340cbd827490daed9024a8b1c50dc65e5d081162c890b2536b2e1a3bebae46fd8f5c06ed7f8d86e8e7ac875a SHA512 2a964482cf3c70f33cb01faad49664bb5345c00f21fd58dd9ee10c9df067565b3899a9be56c0d997990bc0ed492c3a9a480951af314f822e0f8dd6bc41581ea8
+MISC metadata.xml 321 BLAKE2B a4ada2cc74a6c69c9906afc5eab1b6937c7fd42745dc22427b418d6f62df17044341fd53db933bc133f85ec5cb051bade9d9688208abec3baff4fb205d0a4bad SHA512 fa9d3c68f35a3bf7f06c646f033a4945b7b8999fcb49c9a7426ca9fcfbcdf9e6dfb17b74369a47afc2c1bbd0f66ed15fe6931a76315b3402026e0aad2dc47282
diff --git a/dev-python/django_polymorphic/metadata.xml b/dev-python/django_polymorphic/metadata.xml
index 0e637b8f044f..6e9f777e1ed6 100644
--- a/dev-python/django_polymorphic/metadata.xml
+++ b/dev-python/django_polymorphic/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">django_polymorphic</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">django-polymorphic</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/djangorestframework/Manifest b/dev-python/djangorestframework/Manifest
index ca60f7e22d2a..68cab82be4b5 100644
--- a/dev-python/djangorestframework/Manifest
+++ b/dev-python/djangorestframework/Manifest
@@ -1,3 +1,3 @@
 DIST djangorestframework-3.11.1.tar.gz 804357 BLAKE2B e069b7ccf60d124281f37e5533dcd28b9f4402ab7b875ff62d3c0aed72060d0ee40c5905f09225367da91a812b3be1d4bec47343b9643380c4f583ee70d8ea98 SHA512 3063441f965a98c2bdd8279d3fc300d45af032094590b097cfe31a28fdaaf1772391ae023d5229537c1f6e7ff01405e604123bf9c665cd902a26e1cf94a8785f
 EBUILD djangorestframework-3.11.1.ebuild 471 BLAKE2B bfc61068d374ce32592c115826b2196baf570388691096f7da502e371d57100e0255fa02910cf5f2c2fc7e6489a8bdeea56d02182f2a50d4fdcc14686171e194 SHA512 ff6f4f5deb67ec915f62c619232ff577168911cdb578aa92905d5edcce569d80814b8cb28284b311cfef0889154a18614c852c325894fa2d34b2bfc860af41e4
-MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
+MISC metadata.xml 330 BLAKE2B afda95e14e1db06af5da809e3466dcc99e4fabd85ef3b4b1c0ea9afad2e5d742eef67a46e89a915900d5d98569f5772c8977c391cc476924be51d021d0c0023c SHA512 1833829abd241267c19a2c94f54c56baac0bcb7fe478f56faea6690d8990acd35750439229f056ffe4a3059e159a732750623b317524a141d00c3cc40a52a8a0
diff --git a/dev-python/djangorestframework/metadata.xml b/dev-python/djangorestframework/metadata.xml
index c36c37139fad..6650f6a06ae6 100644
--- a/dev-python/djangorestframework/metadata.xml
+++ b/dev-python/djangorestframework/metadata.xml
@@ -5,4 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">djangorestframework</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/dns-lexicon/Manifest b/dev-python/dns-lexicon/Manifest
index 89b526c6565b..b94a80a525df 100644
--- a/dev-python/dns-lexicon/Manifest
+++ b/dev-python/dns-lexicon/Manifest
@@ -1,3 +1,3 @@
 DIST dns-lexicon-3.3.4.tar.gz 147008 BLAKE2B 14e0bbba48b8340ecb274c122363aef6490de539ea2c1ce7a4ba4ef19eaa69271ea22e28afd700dba0a1060b01211f8ac9a1081e21973f07abb9ca057638241c SHA512 274a1a4ffd1d767623723b6e9aee1e9f07022f3985cbc15f75cc410f477e1dcb7a674fa847119bdccab7332d058f77ef85771bd7bcdadbe2dd9483415a365a6d
-EBUILD dns-lexicon-3.3.4.ebuild 643 BLAKE2B 482cdfa80094a42397c3232f497d84cd9884274d880583fae02d9bf3053cee3ec3988a2c9ad6545fbe1d3ac6a9f7144c6ac48675766fd1e8b526d186b9f55a0a SHA512 589e5a6eb6b05963526e15f818e33f8948fce2ed7b13dae7aa45676ccb184db33a746082d9313e5ab08385635c5dda75bca39800c9ec878ae9fd71a1247a9bec
-MISC metadata.xml 253 BLAKE2B 7dac7f77dcc8de31f439cc6d7770a503f95be9c2f8ae57df9e725df941e2b31a90a43664a485a5fad9510b9ae060ba7aaaddba29324338dd9eb07d88a63c7dce SHA512 303268e1f46e337e32c64b544c0962ecbe8de1799c42736b3c3515b6f31954a655830c402317bd0534cac12059e17eeb5f360d010432dff795a136662a5c10f1
+EBUILD dns-lexicon-3.3.4.ebuild 625 BLAKE2B 527e1aeb36729244cc7a84ec9eaf1dd3687f1d3f09bd56850383748ef84baf9aec0dd2c91e88d688c6a3b7ce730369fe6b524e9fc76e06eb500185991b6423ec SHA512 8c867ffe6b5a9426315dec2699e9e52cba19788398db8939ea6c8ca0fb4aa7f49f65da6316ee982dd0694dde345e0ac1f40c8f0024ba39cac17431f279452f00
+MISC metadata.xml 321 BLAKE2B 9a4d10338c252149b986ddec309089607f2a1d3ea0ebaeb20860a14d3207260f34c14d8deb2eae973c01a4645802e2669d547378c3fdf58254bb26cc127974b3 SHA512 16c6b64132fd43d6c3e2767e94f9c24e91d73aa82be948483a63cef3be3835ba2135dace06cc816449677385856c1376218ef60c0d96af9c2766279dd3c6c51c
diff --git a/dev-python/dns-lexicon/dns-lexicon-3.3.4.ebuild b/dev-python/dns-lexicon/dns-lexicon-3.3.4.ebuild
index 572094e0ff2e..46b078b018a0 100644
--- a/dev-python/dns-lexicon/dns-lexicon-3.3.4.ebuild
+++ b/dev-python/dns-lexicon/dns-lexicon-3.3.4.ebuild
@@ -1,9 +1,12 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+PYTHON_COMPAT=( python3_{6..9} )
 
-PYTHON_COMPAT=( python{3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="Manipulate DNS records on various DNS providers in a standardized/agnostic way"
@@ -15,9 +18,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
 RDEPEND="
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/tldextract[${PYTHON_USEDEP}]
diff --git a/dev-python/dns-lexicon/metadata.xml b/dev-python/dns-lexicon/metadata.xml
index f3de5f693ed8..1f03a671c07d 100644
--- a/dev-python/dns-lexicon/metadata.xml
+++ b/dev-python/dns-lexicon/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>patrick@gentoo.org</email>
-    <name>Patrick Lauer</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>patrick@gentoo.org</email>
+		<name>Patrick Lauer</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">dns-lexicon</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/docker-py/Manifest b/dev-python/docker-py/Manifest
index f5a633ca74fa..f12767f01eb4 100644
--- a/dev-python/docker-py/Manifest
+++ b/dev-python/docker-py/Manifest
@@ -2,4 +2,4 @@ DIST docker-py-4.3.1.tar.gz 236548 BLAKE2B 2934410e9360ac0a0ea4a038fe75728252804
 DIST docker-py-4.4.0.tar.gz 246544 BLAKE2B d19b923499bb32f85728f88e479db330f442ddc32da06cad6f56cfff3386a020e45a0ede1afff635ce3d0e2d5e9112b0a4022969f75647eb6e57c13ef1bd6cb0 SHA512 8882a6547570d64c4cf9db7e1bd5ad13dca9a5b439631f3436587aecc1ed3386b230f9b6f82c07d9614f7d29d918ec6a3733fa6af6d8784a698e1b8459d4dcbc
 EBUILD docker-py-4.3.1.ebuild 1113 BLAKE2B 981029a4ee9d66a5ac8f386e5213fc55979bb5866a6be10aa80284eca76be1ce358a81da2aa8e5d9ad27d593ac7c615b6f7c5175641a510d1b4ef8466b4d6324 SHA512 ec2a77ca17561a6f52b3ad6973761254d690e117429f9cf695a9caa7d3f1b07285878668aa3e27baed1d472f9caa9efb25516fbb756e1bd0f873b198d432a188
 EBUILD docker-py-4.4.0.ebuild 1116 BLAKE2B 1c4acd03d9f127b01a144f99c98f3b309308ecc582543556a7c9273a072a9053cad2477a07265cdcecfebec43f86c511ff4c5557b48e4f73ad3d36bb5a20bbea SHA512 267f8cad01e4bcea796f2c0d2ef9d2aac4180f2a2a78025662946f8da706c0a37f1a03893a58744b346abfb510fd5c72b4e7ed4f617dd79c4d57ff160687496c
-MISC metadata.xml 398 BLAKE2B 40d5a5305a062cdb348ca447eb5f50ae9a0ca7a80c9460ac33af87bd78dcc552ba089f465294214cb4c0d9fcabed0f696875d47ba67e19ee14d3dbbc7c2e7dc5 SHA512 f991f94b167947549e0a2a152cd52e3fba6a95d54297559602b01a90e39ab6f675bba5d002994bd824cb6b284506aa3dad655461ef5f130f225ca13143e3eaa0
+MISC metadata.xml 434 BLAKE2B a6fd9237a338297a004bc72f08239cc92642aba95c590bf7f2f287c5b3d196b632998dfe5c32cf8155498df1472fc84f4d41290880b14161c8d43d0a70ed7f5c SHA512 fb6af1a1021d752928bfad27313ccbba2f09ad88249ddb9cc7db4c1f1fd591035f636eb35d79f675b5fcfb984f1d201fdd7a8d4b38cb2193abbd31f2d62f039e
diff --git a/dev-python/docker-py/metadata.xml b/dev-python/docker-py/metadata.xml
index 9862fd2de429..da5cbb29397f 100644
--- a/dev-python/docker-py/metadata.xml
+++ b/dev-python/docker-py/metadata.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="github">docker/docker-py</remote-id>
-    <bugs-to>https://github.com/docker/docker-py/issues</bugs-to>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">docker/docker-py</remote-id>
+		<bugs-to>https://github.com/docker/docker-py/issues</bugs-to>
+		<remote-id type="pypi">docker-py</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/dockerpty/Manifest b/dev-python/dockerpty/Manifest
index d28e5f5e3182..59f81b1435f7 100644
--- a/dev-python/dockerpty/Manifest
+++ b/dev-python/dockerpty/Manifest
@@ -1,3 +1,3 @@
 DIST dockerpty-0.4.1.tar.gz 19608 BLAKE2B 1c7229bdd18100bb75a8ec80f0b8a636137efce40affb2bbadf27eef5ee13322ab92f9a3f77db0ef79c35366daf700550eb9a358534f7a1f1c2b92ec2cd4d5d0 SHA512 1f27a1d1cf9bfa21a77f2c0695334ec09a81ed5b70190b16fb23ec0e2ab4cb84af334b5e9275265eff2d8014aac5f96890276bed5775bb805c3f30260c99da70
 EBUILD dockerpty-0.4.1-r1.ebuild 714 BLAKE2B fd3e7fc94780ac9e930ee7f7b72e00cbe094a0d3dbcc5b886b8ab116af22578b3669fbf68917724c4f4d707d9803989d189ca63b28325335688244d00b4201c4 SHA512 00d95191620cd7ebaf4adbce37e2c49af8e2b59bf239bfa47319772ca9f9e929e66e88b819e651e339ef2a4ffcbe145ef379e7524af3012a8d16b5b42d5a752a
-MISC metadata.xml 246 BLAKE2B a3790516e837d7d62a7efa31295004ba64b36026f45d696d87b5fb83e0b08815b887209bd5ba4f0be5a8b1371797d4abdbd125f4f018b32dd95613b36c53ffbb SHA512 c9e4e7717be1b4f5571d287b57d59c6de4bee0f4bb0a21a55cbbc886f711d57e52e74761bcf7f1102e1efa4b0e56f508e5f15eeb69cb38866692bc232032f936
+MISC metadata.xml 293 BLAKE2B bd348b2ab06a8fbe1b9deec3a24f0dfdc0da1b55884d60f955a3cad321d8705c56fd6dbd79494034954a1f899eddef53bab953adafbc7721bbbb1e29587b21f8 SHA512 425398565aa73f4a85fa3252af7afa7e277a3d81a23e7512ea954efba5336f9b7cc971c770a236e0c2b3a93b1bcf1082dca9a012e9f81824a632391925be09a3
diff --git a/dev-python/dockerpty/metadata.xml b/dev-python/dockerpty/metadata.xml
index a46f63a01b20..3546f36224a9 100644
--- a/dev-python/dockerpty/metadata.xml
+++ b/dev-python/dockerpty/metadata.xml
@@ -4,5 +4,6 @@
 	<!--maintainer-needed-->
 	<upstream>
 		<remote-id type="github">d11wtq/dockerpty</remote-id>
+		<remote-id type="pypi">dockerpty</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/docutils-glep/Manifest b/dev-python/docutils-glep/Manifest
index 94fcb8f74f77..df9a36c0d331 100644
--- a/dev-python/docutils-glep/Manifest
+++ b/dev-python/docutils-glep/Manifest
@@ -1,3 +1,3 @@
 DIST docutils_glep-1.2.tar.gz 6771 BLAKE2B ecb17f69dd2edb12d81ea1bf90789564e86b921125c20913134500dd53ae04b0962141183cbcb9bd17af904196ead2228e4c80a6e256576b715ae6323afadc30 SHA512 696412447120893c198dcd9f13e042d20b35465e83ef8b488ee2f1c184b5fd3928ddbf10ed4e78886c4c72dfe1f9fa46c1f75c7997990afcc04353b5d59ebf9f
 EBUILD docutils-glep-1.2.ebuild 721 BLAKE2B 2e55cd2f5c3b72f4f725220dc3a2e27867589561ed9b84ee835a7e8e1ca9d3142feb9cc952790166d33993c2b2f69482fec39257e110357e7f72eaa7e4a46baf SHA512 5158c8c2ee3b50cc8fa02bba2a66169169c5cc8ef42d83811cd43806fde28a3799a8b282b07645951125213deb91002266f00a595e33ba9f65d5150ed2b64e96
-MISC metadata.xml 372 BLAKE2B e34273d2456e517c83d2ed1933ccdcce21d22ce96cff97c691d920c144e921b4f49b0018b4d9d5dd72a7fb0f2578dc0ed9d4958915fb386d0db3bb134d592df5 SHA512 da8ea65057ab402c29eab6fe2bb7fcc6f82052cb4fbacaac99c955da80da7286cd837bf0489420f04bf41aac1789a349ea50f624bb105f44021dabb92340d1e3
+MISC metadata.xml 448 BLAKE2B c9fa61a0dc008ae6c69241a3cdcb5240f0b2814528ad309995fb5095e1233b1c9a3f11e85a30a576055316fcf91d9fef6323baab6cd9c76606e74163c132c2b8 SHA512 57d39f1dc1333568a2efade5da3cca87a94bb56cbfb23728bcfb70e56ee4e310c92cb64dcc2e39e5be5a7d9deec57f309f593d11039b9d1bb9ce4a10c47f49e1
diff --git a/dev-python/docutils-glep/metadata.xml b/dev-python/docutils-glep/metadata.xml
index 3136117dc036..15e6fc74668c 100644
--- a/dev-python/docutils-glep/metadata.xml
+++ b/dev-python/docutils-glep/metadata.xml
@@ -10,4 +10,7 @@
 		<name>Python</name>
 	</maintainer>
 	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">docutils-glep</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/docutils/Manifest b/dev-python/docutils/Manifest
index 0c11630c7d8d..03d664a43d1b 100644
--- a/dev-python/docutils/Manifest
+++ b/dev-python/docutils/Manifest
@@ -1,4 +1,4 @@
 AUX docutils-0.16-tests.patch 2986 BLAKE2B 70c80ad50998dafe3d26ddd0afd1d8d176949ed875ddfc4ec79687f81d6ebacbd5f06355c77ee457450515e4902f56746fe72c4773cd51cba37c9109d898185e SHA512 ea0c01a37494c5e13996c2652c99cf341cfe064365ca17dbe76a0b4b21b914a59c4ca83ab8e261f80878c22f971234478951f360df5f0fa2321d8f9bc974d28d
 DIST docutils-0.16.tar.gz 1962041 BLAKE2B 64d045d43433e944686b5d9077de0b544d49d041adf398f9b66612db432860853df4a84f4c4b44461789b3039f83e3847547062b2f5bc5d2bde3a0f1ffc9ffba SHA512 4e0c6662924cac6b8f28bb77a4f50eafd637c1083990a23dbd905d8a05362a18dae96e63408ed43b595b693ca755c7961d1282129d3215ed3774af0dddcc0466
-EBUILD docutils-0.16-r1.ebuild 1866 BLAKE2B 3d6777a23cfb44934d371fd522b82076e26b24380f6b2f6a7ee7f4e4bab9a6e0064b65621945aab1871305b2a4831d0232e90d6a8db07b24777a6784b99cd211 SHA512 48226ff47a65f500171a0d674c4ef9e1d516b0ce933f09ecdf8499170d83e12d71e13c93b65ea63c300bcb8e4e883d0e6f76d721074c4cc5642ac38d060953ba
-MISC metadata.xml 342 BLAKE2B 18746f74840cdf8a245c4ac3233e4ffefdc8fd4768b5b995f4c9232c6ce4c47b6cb965c8077ca8d73fa6af5c4a9216e8661d2c8afe6d9f1c3153b04495549ab1 SHA512 df1b48b67e1588314ce5109bfffe84c23f5ea8036e7726b9c120f4fda220795015a02ef7ba6b4cc7da9aef579eea8f17a96aa1afa089fb01967be9ec4ef6be63
+EBUILD docutils-0.16-r1.ebuild 1865 BLAKE2B 69a191addfcdae8b57066a5c8b3e955d4b68d35f78e55f037fdd3f680bdbb17a4c779082d9881644950f093ea99c3b66d7e5bc1d3a804a9aba9ae44084cc5728 SHA512 2f160a99e2ef97a4a854b9fced36a7ec859b513faba4a791399c3e7b232d74851638ae391f0fbd905f51c379cf0918304486561fe16c490398a643cbed11132a
+MISC metadata.xml 388 BLAKE2B 0781c1ff7eed3e16515aa155bad0f9bb80714c7297eab6840de07aea41d496f94d7c59db363518f914ce13b54cf2c038ecd05b86f6823df58ed01070b46d4775 SHA512 e977e1b753d903ded926f251b30443e07d3080bb33be1e7e66bf2a80e4d81da1fdc2bdff12e6cdb1a1746019adca4c3901f59daa816588301be42a85709995c1
diff --git a/dev-python/docutils/docutils-0.16-r1.ebuild b/dev-python/docutils/docutils-0.16-r1.ebuild
index 1e418f79f501..d650f51f93f8 100644
--- a/dev-python/docutils/docutils-0.16-r1.ebuild
+++ b/dev-python/docutils/docutils-0.16-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Python Documentation Utilities"
-HOMEPAGE="https://docutils.sourceforge.net/ https://pypi.org/project/docutils/"
+HOMEPAGE="https://docutils.sourceforge.io/ https://pypi.org/project/docutils/"
 #SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/docutils/metadata.xml b/dev-python/docutils/metadata.xml
index bf89c00057a7..dba061c24c9b 100644
--- a/dev-python/docutils/metadata.xml
+++ b/dev-python/docutils/metadata.xml
@@ -8,5 +8,6 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="sourceforge">docutils</remote-id>
+		<remote-id type="pypi">docutils</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/doublex-expects/Manifest b/dev-python/doublex-expects/Manifest
index fefebc68ff21..f312a9a40765 100644
--- a/dev-python/doublex-expects/Manifest
+++ b/dev-python/doublex-expects/Manifest
@@ -1,3 +1,3 @@
 DIST doublex-expects-0.7.1.tar.gz 6315 BLAKE2B 4af2832244578237821ba29baec54ffe1f226dfb1c92a5a03122c1a30c0e78d472ab8f75e6412a9014b97265120b5c60a8b5674cb42be58b46397a537bd534bf SHA512 2aaff2e58556ed9eb91ebb418e65058367411e011e843afb5adb08ab69705b6bdfb478d3052aae093ad1c1a1b49ba1e084e4c5510acde4874182a658330e3448
 EBUILD doublex-expects-0.7.1.ebuild 745 BLAKE2B f13026b57fcc150471a6e5d447013b16f96c82662c78e3fca57e798839b2ad397983bea85c7acf814b2189ebec2dd8f431fa0e618882eb0739e58ba3cd297ba8 SHA512 1be63e073b07a8aa42c0db1286fccb4e4760d0a312d3ce8c94a8045e21f477e1ba4f58cb1b22147c5c321062a289e528ad1717346a9dc18970b664c4ed4fa015
-MISC metadata.xml 263 BLAKE2B b2f81a90ecd9e66c5495a4c8cf4bb7d0e2dbce41a5e5fbc172f1d2ab65569bf15223789dbc356ae93774af872c3267b756eddaec82014c64f242c92455e8f3aa SHA512 0281999c203e87325a1f2688efd19a57088305289308fdf2401b775a3ffe375ceefb200dd4896417a7e1a5f436e5681143326c74635acc504af8e25d3b876c1c
+MISC metadata.xml 316 BLAKE2B 1a6781ae10e61fbb36662be888c26e7bb9456eb29573fa00dddcf3b2bb8d1356a9e4d3202ffb6f60154f25ed175a5ed189ed079acbf500d89260e69c6bd6de19 SHA512 b9f088c0a92a80658a33b1bca8f8a3f8d1120dec1137ed6cc2bb696515aeff38fbc92a0cd98c8b498ebb46d6a15cdf634507227265a66b759f730e7a2b7abf8c
diff --git a/dev-python/doublex-expects/metadata.xml b/dev-python/doublex-expects/metadata.xml
index 2a41f4498fe9..30114c42b2c0 100644
--- a/dev-python/doublex-expects/metadata.xml
+++ b/dev-python/doublex-expects/metadata.xml
@@ -4,5 +4,6 @@
 	<!--maintainer-needed-->
 	<upstream>
 		<remote-id type="github">jaimegildesagredo/doublex-expects</remote-id>
+		<remote-id type="pypi">doublex-expects</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/drf-yasg/Manifest b/dev-python/drf-yasg/Manifest
index 8e051e6cb998..b431316a444f 100644
--- a/dev-python/drf-yasg/Manifest
+++ b/dev-python/drf-yasg/Manifest
@@ -1,3 +1,3 @@
 DIST drf-yasg-1.17.1.tar.gz 1300642 BLAKE2B 6cb21bf901ee2612666bf076faecb2748f7af8ee30a8cd71f00d58bd26f837a8850725d1944d5f933c49ea65657870ff1ca351464db77303380cec85d8de3183 SHA512 b8e2e11fa3b18b3fd827e80674dfc6a99bda059455dfed9945a311dc43783a7871f5dcc92a2327174e6c28f3235c143ad73c8694cd2e24cd713f712662b3976d
 EBUILD drf-yasg-1.17.1.ebuild 987 BLAKE2B 3764a1176433f498f1b34ccbae2aa8a040234808aa26b967f19650419172cedb47c0897ef040fd8af2cb1e5696992ea894d9aefd75b6e3c5c336a04bad9224af SHA512 13de04dfdc374762765ef64c6f4afe92c279dd6cca5eccc29548a121c2a077b7c38126af5e43d2e94bb7ed58bd4d3ad0b34d4d4785c37613c962aba75e3cbbca
-MISC metadata.xml 363 BLAKE2B 7adee65506aa3e63d7eedb2ced7a91f3ebb34fd2654da96656b31242cb4017da34e9986246be218841eb0046beb590fe3381dbd49bbdd79eb4e965b27223f109 SHA512 1cb8c63d5549c77ec884f5d668e8270ab7f73097ab25d1fc19fea3150b3ed56d7fbfb899d5418c3343cbeed6bed219edb892d3a4b630e900ef00db19103b3f3c
+MISC metadata.xml 434 BLAKE2B ca982c1af439d65a6cb9a36be92866b239fe15c89af7c31d5954f619fb88177e5d46dae7da85a62449e07f51321e0e85bc1a9524fd70dc455a9a21c5576c3cc9 SHA512 da0183596ec73fb68dd859997b1f16f85d3740d8018c0954a31bf74f60978e1c980e56a418152f7a81718c58491cceceede1bfb09229e436c856459cbc6942df
diff --git a/dev-python/drf-yasg/metadata.xml b/dev-python/drf-yasg/metadata.xml
index d162bd623caf..4a091e4f1cf4 100644
--- a/dev-python/drf-yasg/metadata.xml
+++ b/dev-python/drf-yasg/metadata.xml
@@ -10,4 +10,7 @@
 			Enable swagger spec validation using swagger-spec-validator
 		</flag>
 	</use>
+	<upstream>
+		<remote-id type="pypi">drf-yasg</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/duecredit/Manifest b/dev-python/duecredit/Manifest
index 90a2bed49161..ed765f034cdc 100644
--- a/dev-python/duecredit/Manifest
+++ b/dev-python/duecredit/Manifest
@@ -1,3 +1,3 @@
 DIST duecredit-0.7.0.tar.gz 66131 BLAKE2B 3f32c1a4e62d4650d6914f4e124907170a50d63900fbb009b870b3f9c9eace27b76500e655cb74caea0ce22cfadd62f81a84a438c1cb82092502661f1d4e0c03 SHA512 a32ead3e0710323d5ab3283a3b2d1cb03e03bf925f78fdb3b5182079851127b8b674492bd402667e57ec113d1ec05f9c3490642f8d0fba6a8f3ddfd706a052c1
-EBUILD duecredit-0.7.0.ebuild 537 BLAKE2B 01bb53735f1c8685d7783930ed654e1eb6422c3f5160fee99a37b0361178e64f263a2fbe1cbec59bb9f46010068a8e7dad0fdbe86f908c65ca1dbf61b5c49665 SHA512 a53dc1a960579476201a6ba3463b5b5eb42378e8341f4de84b37a0e8d349f2fd76e95ca9e2d62517ddf1e2ec444c44676018f12d1df12b5138d013dbab4e210d
-MISC metadata.xml 433 BLAKE2B a1c9500ec6e84b027e6d0f2ec09d5a3b1a51818858401099e047a68b37fae0be7ba2d0b91b0ebe6509d992aa4617cd1a61b5b07a72e0935286e669853a7ed578 SHA512 7138c51966df35d8cf946b13e66b45eeea22e9d89aa899b14523bdd1b6871b3d78e1d2c8d76c989fa27adf0d1b8b5245c7b5ff3c735ad5b0d8466deb12ee26ec
+EBUILD duecredit-0.7.0.ebuild 573 BLAKE2B b0da60446db9923e5bab708e7ae1d391cb37fe9d3d4aa6987959bfdbce01bf45ad0aa170f24f9ddf8252c05453e77fb3c6870c471e6819d6354bbf3ceb3a2ea3 SHA512 3ef87ab8b89e585903e70f61305349545b3aca179be4fa81f12ba2b0894c14ce90fec6e1907d43b1fa9a19f7b343c074285148e523751b7baa1c12183f7a961b
+MISC metadata.xml 480 BLAKE2B 5e4927cb74c9651b672ae1de0a11964baddb4aa37ecec03fa14a340fb944e1481cc0f81a0c18c802e6d32a7acf0f1b45cc7b5b7ec625e1a31aeb5dff823b1f42 SHA512 85f8e8eb8c3e4c496b78d81d9e7f5ddbd39d29ac13f9c94becd556ca4e136f7eff028186945fc43c4de8de9bf70d08df3d3e3830f1ef512c45f02095aff81b02
diff --git a/dev-python/duecredit/duecredit-0.7.0.ebuild b/dev-python/duecredit/duecredit-0.7.0.ebuild
index 7e4a4de6e9d5..dc34504d06e3 100644
--- a/dev-python/duecredit/duecredit-0.7.0.ebuild
+++ b/dev-python/duecredit/duecredit-0.7.0.ebuild
@@ -3,7 +3,10 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6..9} )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
 inherit distutils-r1
 
 DESCRIPTION="Publications (and donations) tracer"
diff --git a/dev-python/duecredit/metadata.xml b/dev-python/duecredit/metadata.xml
index 4da5669f0f1e..91a1ddc68208 100644
--- a/dev-python/duecredit/metadata.xml
+++ b/dev-python/duecredit/metadata.xml
@@ -11,5 +11,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">duecredit/duecredit</remote-id>
+		<remote-id type="pypi">duecredit</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/easyprocess/Manifest b/dev-python/easyprocess/Manifest
index a3b5e349c85f..1587649ace8b 100644
--- a/dev-python/easyprocess/Manifest
+++ b/dev-python/easyprocess/Manifest
@@ -1,3 +1,3 @@
 DIST easyprocess-0.3.tar.gz 11310 BLAKE2B d26405863f213a94687d646f57aed98d0285bd57c0dfe9c40d2f49e5cfe46710e0435ff20eb1d697648e6fd1b63a38adf46a03f0fe970e35d44bfe3ad058d63f SHA512 3a10a02b28139c2d3d53134ac7842dcc7027c855e55b17747be1545cbf77cf86303531b595a54d92d7dc8133aee210388d25f3362b705ee554323c01d742d336
 EBUILD easyprocess-0.3.ebuild 640 BLAKE2B 38937850e2431502e56759991db3dbe672d5f3258068536524bae4127c53228f8a804066136a8e0b1bc581afd57cc7a8c3cfa3decc3f4d0201edb70df190bc5b SHA512 7b79a5453fd0ea8ca2490b82ba1721a8c85a22dc7ed42ba5033c9c879be3f2bdec782ee3eef03103acd605fcc56c4331ee76fbab87b0703bf27bcaf9fd915498
-MISC metadata.xml 375 BLAKE2B 393138e315b4eae4dacb9339fbb5766e9dbaa84b7482babaddc08d524fb8b9939f6622ee9c6d09b66c61ac270fcc483fac39996a12ba87ccccf7cafd4c6d36db SHA512 9a44b6b9de4d1a61d6af9256519473541d5513cef349c15178c025dee3aaaa3f6772b1be56576411a985fcd9c70029c00743d8f577be8eaec4c5a44646c9cbf6
+MISC metadata.xml 449 BLAKE2B 78b6cbe4127b69d14901485e2e72b3d65e17facfd76458feb0c89684b7ba8e94d3aca5f31703dab839739b603e84e4fcdba56708a1177d7420b1a33c6155566a SHA512 5c5aa93a5d443b975c6420c57db269e5528b0be826478ed0f14c4d8b906da29c4c0dbdaa856645480d631c8d850aa71a7290999fd608392cee9613bedb3e9d7c
diff --git a/dev-python/easyprocess/metadata.xml b/dev-python/easyprocess/metadata.xml
index d22e99d73577..987795a65110 100644
--- a/dev-python/easyprocess/metadata.xml
+++ b/dev-python/easyprocess/metadata.xml
@@ -9,4 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">EasyProcess</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/ebuildtester/Manifest b/dev-python/ebuildtester/Manifest
index 393b20bb7ac7..024183b1eafd 100644
--- a/dev-python/ebuildtester/Manifest
+++ b/dev-python/ebuildtester/Manifest
@@ -1,4 +1,4 @@
 AUX ebuildtester.bash-completion 538 BLAKE2B b56fd67648a73b184c6965c1377066bfded9e3adc795a06e8a753dd27784b9171589119cc8c4e26dd0b03def5c0fb6668f9ef960f7f93da34e33c996373b923f SHA512 21c413a8aa7ddaae5e11c4f279f9c6ffd700e8fc3f64c1df6cd07087d5cd0e6097e193a01bc266ec669dbb3d516e1e6361c3e1461e8ee07ecd7cd4fae05482f5
 DIST ebuildtester-0.1.16.tar.gz 15564 BLAKE2B ae9c304fcdb9450c0b99eb75128d7e17790b87c541c87ef484a04eb1e74b18df44996e6a2d2ecfea11568f1e028d9279ac708bfa61978b4d8f176dd0183b8a69 SHA512 3e30894f6260b82a97e0000e65ab6a556c2055ab50ebbc7140b6716166b783574b87f333738d87e3ff11672f1b055df2acf483384e616e7bd9ffa42467c79743
 EBUILD ebuildtester-0.1.16.ebuild 734 BLAKE2B d62712f0542ac3965562ae984955d31d6836931a8ba836c86853f6460746d6fc933c1c2653c9a91077f3e9ddb7c337bfa4785baf07a15fe6d0e9c873dec42cd4 SHA512 8eb83494cb57be6e300c552d5dbf5a1d8ba1be613ea360bbb5f69f394891c7f11174436768385d1ade1a02f34ce15d3439fc9cd8beb2802fb49ab5529f6f2c0b
-MISC metadata.xml 222 BLAKE2B aa232ff5c60f78800795caafa7e9ad7cf285afeca45a8d7d5d95808dbadbdd6dd1e7ca04ef38eebde2b199302691fe8cb0f1428150be4b29a8660a4f30f75709 SHA512 7dd37880388ed41ddfd8eddc790e4e800039bc34fcf03baf6d77865f081b3a8cf425060ec9a77182479fec918b7d04ceead69eae2b357f0fe7481be42adfe1c0
+MISC metadata.xml 297 BLAKE2B 05f415213e45849ac677a97c4cff26321825063b9a1026150831a64fc0b164001c13c8d8ac34048acca005e188796ce05b7150d97951cc861962a21da07d1436 SHA512 fbc9cabab9c3d9f281384b2c937d13602811023027cc1a30f31ccc13b1cb45fb1f60754ac5b7626b865c20be0dfe928b1b8890388a7642e452a227f99e0617c7
diff --git a/dev-python/ebuildtester/metadata.xml b/dev-python/ebuildtester/metadata.xml
index 3622a638273e..17fead7d2c14 100644
--- a/dev-python/ebuildtester/metadata.xml
+++ b/dev-python/ebuildtester/metadata.xml
@@ -4,4 +4,7 @@
 	<maintainer type="person">
 		<email>nicolasbock@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">ebuildtester</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/ecdsa/Manifest b/dev-python/ecdsa/Manifest
index 1f840fecea5f..c4858a7af2c4 100644
--- a/dev-python/ecdsa/Manifest
+++ b/dev-python/ecdsa/Manifest
@@ -1,9 +1,5 @@
-DIST ecdsa-0.14.1.tar.gz 100303 BLAKE2B f7f02bcd99752a7e0c7ac7d22625f5a42638fefb9a92fefda3da279cdbb76d1a5337df5abfd43eb1edccf794c5b2fe34e10df876696d74e921c5ddb35f61f3a5 SHA512 6a66e07ec75e93af73d2363dfd817b35a103f8ff8d62c5ce3af9e98e917d38213aa4f80d570f81c830938123f9599e24d96605a36650eaefd806ed07ab0c14a5
-DIST ecdsa-0.15.tar.gz 122119 BLAKE2B ceeb0204b15d75ada1b201321caff2eb28080bbbf5f6436e6cb50203828eb318d9fe8b8343157b59370183d122e47399a3d2cd6ae569b80d81809d7c778639df SHA512 7b7491d1abdb5ca43456d943c96525fa5d722635c496bbddd04ef8e1baad9dc0aef3d1752afea7820f7796421b18295ee260657ec1e8faf7564613b316c0d603
 DIST ecdsa-0.16.0.tar.gz 125851 BLAKE2B d7fce3fdb0b6e37edb62482bdfc1df6b02f9fba677a6370dd3cb19f04be9cac62900d8347b318bf1d1e39b2af5672d0dde620dedf7b2ed6aefad3392df5279fa SHA512 94ccefe19899a5e56393bb0e6624e9af66bdc60ad370d65900a24a0465c430a3a001ed9c25970e48834cb25ca730bc9279af98d17ecd3ad66189c64c8f864b42
 DIST ecdsa-0.16.1.tar.gz 126935 BLAKE2B 84e04c0afe076c009a88f7ef1a0193329e3d4945e34c752b869cbf449667c424341fae7da2e7c908b773c6f4ab495d29dd40aa3a9be35b0c03d315ac330dc3e0 SHA512 935416ff25a71b1e6fe442b11e8d2c1463b1652d539274e094112a4847c2c749ff58eb9f5ed108ed5613b7363d3f2b1c07ba3d01af8cfed4e1b4bec407d3f5a6
-EBUILD ecdsa-0.14.1-r2.ebuild 849 BLAKE2B b1c633f6c8c6161a6f447da16cbba4ce6daa1d617f96b20dcdb08b691010b7b6f6b4221fb54a2df1b4d0f427361fde1eee5a44a5742c5711329b5e23878ea2a8 SHA512 e777f09d3e783cf2c23ee00d49747f719d276eb5bdbfe22236324f18e67ae9edc64b4fe12a8c29bb960ef9fc50d1c64b1e03edf01ab975bbd5e56d72eb6ec5a8
-EBUILD ecdsa-0.15-r1.ebuild 924 BLAKE2B 6bf62a762c9bac959ee16cde737d521673d335fb1c46569e24b41f3206223ef5bd0e911efbfb1b89179ce066edbc5bc8b7f46e435c907cb01181577f848ad96a SHA512 f913665a5ab370d32ab6ee82e71b48643a535f2162955b28818fd46d53e4ec95164f4d101b99215e0ef261147ff52b7f81ef854353dc20eb237c832eeba67221
-EBUILD ecdsa-0.16.0-r1.ebuild 798 BLAKE2B 01d84745af87e33f479ac728b06c4e0a2df0809143264c37a96a6699fc543f4db097418c43d5bd562a8da90d7a689e8397b13641c3194d1c88f0048b0964f7e9 SHA512 118ede2303a870d2b0d1f00159b8b6d7e5a1d0acdaeeaa39def140456e111fe36cc5576a5d2af7f0067d44bcf429aa17c5bcaf6d47f5721e5fa08622e198c676
+EBUILD ecdsa-0.16.0-r1.ebuild 790 BLAKE2B 5501b38a6e966b6b75080c5bc6f6d0e226bedb3ac808473c90c75c3758343170820c52a8566456f1d8f0e6a9c882b6da79f285f37f61783492b67906ff0b964c SHA512 1ac84af5efd056876ae16db32eb6649a849d5e80597e44a3b75621f6bbecd15f09625657096c92a1e1b76d256be96986e2d72329a06b8da39539900963135b52
 EBUILD ecdsa-0.16.1.ebuild 798 BLAKE2B 01d84745af87e33f479ac728b06c4e0a2df0809143264c37a96a6699fc543f4db097418c43d5bd562a8da90d7a689e8397b13641c3194d1c88f0048b0964f7e9 SHA512 118ede2303a870d2b0d1f00159b8b6d7e5a1d0acdaeeaa39def140456e111fe36cc5576a5d2af7f0067d44bcf429aa17c5bcaf6d47f5721e5fa08622e198c676
 MISC metadata.xml 404 BLAKE2B ef1491349f83c10a28862359dcac0fabf0cd453c75c1ddcf8598e66782e30917be40798f9816a96f0862f89ea2ecf2f77744cb939da4212a6a9dfb9ffa223a1e SHA512 a609ab61800cb403d82a0e63d5b44e26b8ffcb984ef216ce894aaf3a532fd124ac012a764d1b76b7ea03f3202f736ec3eafea20277b00f99d43e2b6c2e2ce299
diff --git a/dev-python/ecdsa/ecdsa-0.14.1-r2.ebuild b/dev-python/ecdsa/ecdsa-0.14.1-r2.ebuild
deleted file mode 100644
index bdfa5f183100..000000000000
--- a/dev-python/ecdsa/ecdsa-0.14.1-r2.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,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="ECDSA cryptographic signature library in pure Python"
-HOMEPAGE="https://github.com/warner/python-ecdsa"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint"
-IUSE="test"
-
-BDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pluggy[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/idna[${PYTHON_USEDEP}]' -2)
-		$(python_gen_cond_dep 'dev-python/unittest2[${PYTHON_USEDEP}]' -2)
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/ecdsa/ecdsa-0.15-r1.ebuild b/dev-python/ecdsa/ecdsa-0.15-r1.ebuild
deleted file mode 100644
index 632d6300ad36..000000000000
--- a/dev-python/ecdsa/ecdsa-0.15-r1.ebuild
+++ /dev/null
@@ -1,32 +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="ECDSA cryptographic signature library in pure Python"
-HOMEPAGE="https://github.com/warner/python-ecdsa"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/gmpy[${PYTHON_USEDEP}]
-	' 'python*')
-	dev-python/six[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pluggy[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/idna[${PYTHON_USEDEP}]' -2)
-		$(python_gen_cond_dep 'dev-python/unittest2[${PYTHON_USEDEP}]' -2)
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/ecdsa/ecdsa-0.16.0-r1.ebuild b/dev-python/ecdsa/ecdsa-0.16.0-r1.ebuild
index 75ba4679814e..4be8a067653c 100644
--- a/dev-python/ecdsa/ecdsa-0.16.0-r1.ebuild
+++ b/dev-python/ecdsa/ecdsa-0.16.0-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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/editorconfig-core-py/Manifest b/dev-python/editorconfig-core-py/Manifest
index 375dfa99d4a3..48fde20367a4 100644
--- a/dev-python/editorconfig-core-py/Manifest
+++ b/dev-python/editorconfig-core-py/Manifest
@@ -2,4 +2,4 @@ AUX editorconfig-core-py-0.12.0-no-cli.patch 503 BLAKE2B 98c71ac5fba08ee58d83dba
 DIST editorconfig-core-py-0.12.0.tar.gz 24801 BLAKE2B 10901b1595965139dbc3aa3227f335c2128b2ea83204ed88b0e799021f7c215fd13c3e2246cb9197ecb7c918aca2d6e9269d94298aa0665432ab091630a29dd6 SHA512 29c5f58bd7293052e4b1fbfbadcf4a148eb939558494d599bafd46151a4fb5af9cd07dcef477db9a709a0ea63dec0dd7e9d4071779f8ca6e3bd137268cc22f72
 DIST editorconfig-core-test-abb579e00f2deeede91cb485e53512efab9c6474.tar.gz 7900 BLAKE2B 9ebdb5e522948bc9e86ea84435ccaa11585a8a12f4cd6fe54c64d78917281c913568351767d8077623b1196d84206d1c2d0126a0510f70df484c1b55d829028b SHA512 ae5424b4926d6cb127cb3da473400ced4f7ccf224f7baa8bc5bde0317cc045bb7b99738a56efe5fd0e5a0fbe39b997b9fb1739d24713e7f83b58e987c5e56a32
 EBUILD editorconfig-core-py-0.12.0.ebuild 1255 BLAKE2B 8394b78150c8aaad8989494b920ab2f85f46487554674d6b69e33ee9340f6f05886aced8477dd779f5bfc071c0b01eebace89995163166b22d5af6f08ce9d516 SHA512 34ba2e0a9ea5c0328394563575b5f3c7af8fcd90bde02187a79ca4b2db48f62466128efb5b14d1c8a9c1d7752d8d061ef100bee6c64e70bdd7691d086fdd7acc
-MISC metadata.xml 679 BLAKE2B e9d5e33c647f61258a1d8a691f98716030cf425e1b4279a6b05a0151dfc7ec4298ae2070f60316a983618eb9628b5e3c8e1149783cd7768547f8624cec504a87 SHA512 ebac6fb7f09e22832a5436aba0b445775800d377a794c0a5b32302f2d3baf0c6c09d70685bcd12f21e084b290915a43d729cd94b8e92246259446aa17548710b
+MISC metadata.xml 729 BLAKE2B 1a59887b22998e80126440e5de0ad69278d223de35dc0913e1a40eb9730d36818621f7d4ded84b68f4f38e0c6e69bd07ddf87c94109f1b852be2cf2c53253972 SHA512 caaf4dab9fb589e0680d23e8ae84bb1760c2e3aed8c0362d75e724dd9925ef3f2dc1a67af55b3de3934ac803de3dc6f100af4305a18c2809c78295a654b58685
diff --git a/dev-python/editorconfig-core-py/metadata.xml b/dev-python/editorconfig-core-py/metadata.xml
index 53919fa69295..3a66b57dd848 100644
--- a/dev-python/editorconfig-core-py/metadata.xml
+++ b/dev-python/editorconfig-core-py/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
@@ -15,5 +15,6 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="github">editorconfig/editorconfig-core-test</remote-id>
+		<remote-id type="pypi">EditorConfig</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/elasticsearch-curator/Manifest b/dev-python/elasticsearch-curator/Manifest
index e61062c51915..1ca3b5b5d9d9 100644
--- a/dev-python/elasticsearch-curator/Manifest
+++ b/dev-python/elasticsearch-curator/Manifest
@@ -1,4 +1,4 @@
 DIST elasticsearch-7.3.2-linux-x86_64.tar.gz 285050383 BLAKE2B 730d8550f5887facae3075ce3b0bdb96b49350782fe7e687b8f4477bb363ce7c1595f2b1ece2b7d59d18539886b6e4806f56b0f5674bc417528232a92f1c00a8 SHA512 08e89347797ec6f008fb76cda17ec3e0dbc553fc992d07f4944fd99d17d5bc934849d9e534724d1541432c9844d3da57d875bc08a0c4cd95ba4251e2b03f833b
 DIST elasticsearch-curator-5.8.1.tar.gz 231233 BLAKE2B d2369c18be69cc5c8e17a6d7a72660bd7165c349cdb06c740c8db9dd2b583f181a09ba7d53ee0f4692cb6e31d373274f0610f2a654ba4a6da2d0ca0ff22c7c97 SHA512 500767967f423629f34d42ee088a9c007e193216c42f5590364ffcacc9e1efeba65dd4d333f806250e3b7fe0bea8b5501d1e6f3bf6fb0b8c46a46954e92c4a65
-EBUILD elasticsearch-curator-5.8.1-r1.ebuild 5016 BLAKE2B 5ec14b65a62887d4323c6999262a8c7fd5d378a548eb33acc5309d825183f033378fb4561f3cd2a12d4086931f8138be590ef819fb1b6c33500f9503e5d9f02f SHA512 ce1372e0b8045c464149aeaf1fa8e71db1bbf86a651d02b361819602cfe2a145bf94a55d651ca1727ce0a08d810c1fb2facfd250775b3affbdf149dabc983ae6
-MISC metadata.xml 469 BLAKE2B 7c08e8c5ee97bee865afa27423349bf1998d868fea946d5d61b3eab77094a782d151677bac74f1b8c7ebbc4d88d323c3806251b463627994fcbda2a812524224 SHA512 38e98a77a6da51e077ac9a0dc77059276c58f56f8e26ca45a26df3ec16641dcb46ca9bccf85fd0dc9a358de1ac1424bfffd4cfc3d8213272ec6193663c89860e
+EBUILD elasticsearch-curator-5.8.1-r1.ebuild 5004 BLAKE2B 82ea535e41373df3115433af58fea859ad873c92d33d9c88d98c15c100d6d043eacedfd443edc65012879474fa31233a9bcdf2ea0ebc9390d78c425d0de19783 SHA512 173ff7bb9b39ac4e07f3451a8050f76543baff087ab3de1dd26f22c405fa3e947f304ec321e2487d5d123a83f1aa885773ab98607cd0841238e993cecdb23b49
+MISC metadata.xml 304 BLAKE2B 08a58fb0853f9fa5113313673eb6884f09248e8ba6cc8e94ecc7068b3d07054b0d6762235529b2629835fa735ad8d695871a6d39491f50079f20d526f64dfebf SHA512 d9584d016eb61732b1cafe35b0e02df2c26f2759c00aa89a206e7d46e9c7309f66ad6fbf9dd3a992df46feb608d3b5fa354d878aa38c206c26565f4c987926c8
diff --git a/dev-python/elasticsearch-curator/elasticsearch-curator-5.8.1-r1.ebuild b/dev-python/elasticsearch-curator/elasticsearch-curator-5.8.1-r1.ebuild
index 06dbb51b1e7b..faa31514609d 100644
--- a/dev-python/elasticsearch-curator/elasticsearch-curator-5.8.1-r1.ebuild
+++ b/dev-python/elasticsearch-curator/elasticsearch-curator-5.8.1-r1.ebuild
@@ -11,8 +11,8 @@ ES_VERSION="7.3.2"
 inherit distutils-r1
 
 DESCRIPTION="Tending time-series indices in Elasticsearch"
-HOMEPAGE="https://github.com/elasticsearch/curator"
-SRC_URI="https://github.com/elasticsearch/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+HOMEPAGE="https://github.com/elastic/curator"
+SRC_URI="https://github.com/elastic/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}-linux-x86_64.tar.gz )"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/elasticsearch-curator/metadata.xml b/dev-python/elasticsearch-curator/metadata.xml
index 942da1fb5135..31ed8d596996 100644
--- a/dev-python/elasticsearch-curator/metadata.xml
+++ b/dev-python/elasticsearch-curator/metadata.xml
@@ -1,15 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>hydrapolic@gmail.com</email>
-    <name>Tomáš Mózes</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">elasticsearch/curator</remote-id>
-  </upstream>
+	<!--maintainer-needed-->
+	<upstream>
+		<remote-id type="github">elastic/curator</remote-id>
+		<remote-id type="pypi">elasticsearch-curator</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/elasticsearch-py/Manifest b/dev-python/elasticsearch-py/Manifest
index c759ee7e5dfd..48f5337afcf6 100644
--- a/dev-python/elasticsearch-py/Manifest
+++ b/dev-python/elasticsearch-py/Manifest
@@ -1,4 +1,4 @@
 DIST elasticsearch-oss-7.7.0-no-jdk-linux-x86_64.tar.gz 73216528 BLAKE2B f0f1a3d3347ea37703e90bd896b24f6e3c58406d9fb20f3607a4d08eee325b5ae293db48d1afdc208468ee775b9085a28f39f2e175b67e4881bfb61d5cb85a9a SHA512 f9b323cff078a0dc856f99efd164775a9cd0718bb0ddb6c4d4817fa53cae71748f1aec5158afa45d4b29076043cbada9743a996e685439436e93d94a9eff2768
 DIST elasticsearch-py-7.7.0.tar.gz 128862 BLAKE2B 461b7ac3bc6d96bacdc1e8595c05b4dfd3e6bad2d2d11eecaedcb3b7e96c7390fe26c47b7095b3b1e8500872cfef689a749bd7103bef352680a2cf3ef7dad350 SHA512 6da382c5056f61dde2bf509c902a4ca33548ee937d037dc977e8c8864ebc09385f630b5c99ab8b24b69390773a241786495d1c01a5684ea3892d834e7a1550b1
-EBUILD elasticsearch-py-7.7.0.ebuild 2940 BLAKE2B dc6e4d1499b436bb9ddd738fd1cb0ad84aca5d6286d775e27751c4c264d5b3cddf418f37ca1be66c93e7095e2fe9f05136affe7934701535b04bf3c605e057a1 SHA512 adb2a6cb8b75231f945a16ba0199303af42bb91137a7036f1f8643d0d9749f91d7325a9b4c1e487d085db0f0b18dd1aa04685ebbc7655c1c99b51413e0e85144
-MISC metadata.xml 592 BLAKE2B 3535c37456da9c7904e88e5921c6fd27bf6790178a0f847d0a302aae76e4c68889d31337383ac1d0a1dbb55d7f37bc056bced2f2de29c4d85864b881feeb3405 SHA512 752265ff356d02b2825ac2ef5e5177649cdcdd31b5a3738e3638af89a7bfef8b16fef8332e67c3ac03285318b22e455795c75d408a1abfc99068a1d4015eade0
+EBUILD elasticsearch-py-7.7.0.ebuild 2934 BLAKE2B d0d191b7ead63849eb18cc3aa335425c4a2b9649f00a858f3ae827be61439ebc718004837b16c2477a35e572221d05f75d9fb3f75425b8a64dc826cf5fa34c42 SHA512 57a186d2a8b4c9f1ed958d2e6ed7f4fc21332f23506013abfd21a8a6d86d2e0ebf8de44023bdd70ef8664f92af8136ec0f6bcdaadf9eb63a8bbbc55ef3055fdb
+MISC metadata.xml 505 BLAKE2B f91672ea101edbc85c7c726c3f2cc996f028f2cbb1688138a1cc8f3f4afed6531820bab6234830b75698efaa328ba38faa660b6c598ec3fb9dd6091eb5b7d37c SHA512 4e93c374721a8fc667640fc5cb8c78d0540cc4b45e4a06c3350a402e419465275d54d83d47ae44cc8f16c86e26b140456c98d7d3097d04b23f1ca66776b8c7cc
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-7.7.0.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-7.7.0.ebuild
index 338d6fcaddea..2cae049bcf61 100644
--- a/dev-python/elasticsearch-py/elasticsearch-py-7.7.0.ebuild
+++ b/dev-python/elasticsearch-py/elasticsearch-py-7.7.0.ebuild
@@ -12,7 +12,7 @@ inherit distutils-r1
 MY_PN=${PN/-py/}
 DESCRIPTION="Official Python low-level client for Elasticsearch"
 HOMEPAGE="https://github.com/elastic/elasticsearch-py"
-SRC_URI="https://github.com/elasticsearch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+SRC_URI="https://github.com/elastic/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 	test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-${ES_VERSION}-no-jdk-linux-x86_64.tar.gz )"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/elasticsearch-py/metadata.xml b/dev-python/elasticsearch-py/metadata.xml
index e75480b915d9..ae9502a12af9 100644
--- a/dev-python/elasticsearch-py/metadata.xml
+++ b/dev-python/elasticsearch-py/metadata.xml
@@ -1,19 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>hydrapolic@gmail.com</email>
-    <name>Tomáš Mózes</name>
-  </maintainer>
-  <maintainer type="person">
-    <email>erkiferenc@gmail.com</email>
-    <name>Ferenc Erki</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">elasticsearch/elasticsearch-py</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>erkiferenc@gmail.com</email>
+		<name>Ferenc Erki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">elastic/elasticsearch-py</remote-id>
+		<remote-id type="pypi">elasticsearch7</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/elementpath/Manifest b/dev-python/elementpath/Manifest
index 643cf2b883e3..748d935553eb 100644
--- a/dev-python/elementpath/Manifest
+++ b/dev-python/elementpath/Manifest
@@ -1,5 +1,5 @@
-DIST elementpath-2.0.3.tar.gz 191499 BLAKE2B dd8ee226b5e04168de90e0375db971bb51aad233cbc56a63e1a79aa847fffbeddc5438ca769317ccd0ad6f30aad61ec65fe9dc7c32dfff687e8cd208ccf9ee46 SHA512 fccb291405aafa5751f0dbb636171145a41941e929dd93b097d61f11366e71757f47a65c32b83fd8ad0fafcfb530315417ea879b3e05421bc479b2e309960006
 DIST elementpath-2.0.4.tar.gz 191601 BLAKE2B fc2f29a737c180fb04cc289b8cd9149b7a4f3c317a5efd746c42658aa6fbfe5cb78b957f517ba9a9e8650cc1ba0ee885a723695a8a107ec4cc05328828f5cf21 SHA512 b114ebe054eb6f46e261ae2a39c8126b86abafba26803eee676731d8d46d613daf5493215873ae96c9b098f6ebf9961a1ac777ddc0a1e2b1e4a3ca924d74c213
-EBUILD elementpath-2.0.3.ebuild 671 BLAKE2B cd22a5ce0e6d7a8e738b2e25854197669bc611640d6846e1ca3f9475965eacd2a06f8fb47c9abd87e509bfa4ad20bef0270dcb7a1092bab2063f368b3fd8608e SHA512 14f0d3e104cec625349da984bde32dbe4da1a48c7e28c5d7f2784a0d743f2627cf8d2bb62f06851c1f47d7e715f1f02933c87abace95f10b3bedeb2fc93655b1
-EBUILD elementpath-2.0.4.ebuild 690 BLAKE2B 193db9630af873698b4d5ca8640204dd9d24b9f1051240ca91cb9795cc2f4979ec73a83d9b5dcd4cf0ee93fe60664f12a5eda5c0bb861741faa04a6a14a7b3e9 SHA512 6642fdfe431f8af623ab606e92860cc4cfb78469be3679110b2099fcc055524b37014ecc987f71ae15c9c425be323c6d15c748bf2d0d7986c16e3bd06a81082b
-MISC metadata.xml 242 BLAKE2B 17fd7db1343fb7dba1842d5b62d83e56e2816962b0122ec6eee7f9e163f333d69ede2cbdf2a2ba8c77613367fca3d2cee779697fb25b5d8cf0439e1e845dbf1f SHA512 2ce768d5aae91f32da90c62900f556c647eb9806c810a817b6c45c5356e71f504b5a646bf75f553c3a9bfd3f94c4317df4948bae863ef7525b4a013b63618cd8
+DIST elementpath-2.0.5.tar.gz 194557 BLAKE2B 0c2571eff6fd850f42d2e3cd30598a5764d2f3a81f9cad756eda82e1212337e344314d60203d06b19200537aa8027e4c902de4df746b4e838fe42a1db39f25bb SHA512 c4fd4b360c88870ccb4102e7bca29cd979262b706b795b2a9314853543cd0a40c0ea4bebbac9cff9aaa0fcfefe107f574b41822be7e3c7328bb163c2bdc53283
+EBUILD elementpath-2.0.4.ebuild 682 BLAKE2B 64cf9b4a2c9277ec72e945dd0813e011c48db7f3f2ba4a06117750ac05ee1abea509941d86aa01d7cb405d0b97a9dfdad7c2c017aa4b5a68429d64d7cc029471 SHA512 6072e1021012e36f27632c3c8575d6ad8d15f2d445135bcdd05a3b858919aca2b6be9b3557d9c7d582ad7a8a3f993540db687426d2a671927a1513070794efcc
+EBUILD elementpath-2.0.5.ebuild 690 BLAKE2B 193db9630af873698b4d5ca8640204dd9d24b9f1051240ca91cb9795cc2f4979ec73a83d9b5dcd4cf0ee93fe60664f12a5eda5c0bb861741faa04a6a14a7b3e9 SHA512 6642fdfe431f8af623ab606e92860cc4cfb78469be3679110b2099fcc055524b37014ecc987f71ae15c9c425be323c6d15c748bf2d0d7986c16e3bd06a81082b
+MISC metadata.xml 379 BLAKE2B 83728e52dcbc4f5794b1d73c968e2f28858cc1e1384dc9c48b5d462f8c50124681691aee7d290b926654cb8453b7b372f81eefc5de785dc43a3165ab8933a22b SHA512 36bf1752608d8d5cb3de0be695774b09c0ac66934928476e8c972e7ec0d163d3e61bafbfdc9f587215a2d8996ca2ddd14ffd26c16791c85c70f5eca7e1e511ea
diff --git a/dev-python/elementpath/elementpath-2.0.4.ebuild b/dev-python/elementpath/elementpath-2.0.4.ebuild
index 658c4c61f188..70b716a50d45 100644
--- a/dev-python/elementpath/elementpath-2.0.4.ebuild
+++ b/dev-python/elementpath/elementpath-2.0.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/elementpath/elementpath-2.0.3.ebuild b/dev-python/elementpath/elementpath-2.0.5.ebuild
index 3a0762a67902..658c4c61f188 100644
--- a/dev-python/elementpath/elementpath-2.0.3.ebuild
+++ b/dev-python/elementpath/elementpath-2.0.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/elementpath/metadata.xml b/dev-python/elementpath/metadata.xml
index e59516686a44..75682625977c 100644
--- a/dev-python/elementpath/metadata.xml
+++ b/dev-python/elementpath/metadata.xml
@@ -5,4 +5,8 @@
 		<email>python@gentoo.org</email>
 	</maintainer>
 	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">elementpath</remote-id>
+		<remote-id type="github">sissaschool/elementpath</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/empy/Manifest b/dev-python/empy/Manifest
index 18aef6e19d8b..5cd5da0c2ea0 100644
--- a/dev-python/empy/Manifest
+++ b/dev-python/empy/Manifest
@@ -1,3 +1,3 @@
 DIST empy-3.3.4.tar.gz 138495 BLAKE2B 0040b26966d3d6c7911cc7957159084ddb610085affaa5cf214121fdb292c43b071df8990749e02c0c3ef46cba131188e0907b8ab7c28a0834498b505bec0a2e SHA512 5de8de26484468d180a2575bfc8302cb3d32004ed4d70768310b7564a9ed1bb880b8c1d862f419588b2b5baa8c3da8bc707eac41f3921e6136cc5bc3f47f1a3d
 EBUILD empy-3.3.4.ebuild 1008 BLAKE2B 1578964a5bbedc3620b50a3490d40c9f3fdb835194cf1267fe1b9824000dd4a72ebc3062bfd5b3ab561d86dab15ed29675f064e1b7a046113e9ec962b0cb646b SHA512 35477343e3dc8859953d31e5a476fc822687f9d2c42572aa3582f8a26bb7f5ee7af14a7c4105762f3c54b10bed1679195b9c880cfa19c2ce02f2334ed9f6dfc2
-MISC metadata.xml 264 BLAKE2B f956660bd90e0c6757ce9a7284329bd8f9d14053624a6ac4a017e5a1ffba57ee084542dbc9ac887756dd64930cdb00e33dd56361404bbbd2d2d27213f84da4c5 SHA512 4d8147ee0077ed9f48ca883928f98dd317506bc25a1ba5c96fcd32870dcefae56ff47560cb99eb23a5339f893d19fa4529cc432afb7999dfa04c727cc6989eaf
+MISC metadata.xml 331 BLAKE2B 8d17a39d3a33950846a59d7ea3582a7d5de4382d8fef2bb225ddb103370c658b556399d7708931c57ba7bbb71bcd55c7886a7d3eb5e8f6ea2c42446dea531e19 SHA512 502f00b8c181b7eb726f5132fc5556539cb17a7b75eab684fa13e606cc32f6fd73fbe4d4ed78903028b0edb4e6c2ff8c8574bc7c24d695fff124f1452a7d6480
diff --git a/dev-python/empy/metadata.xml b/dev-python/empy/metadata.xml
index 4c43a15ce6f4..a0ad39881470 100644
--- a/dev-python/empy/metadata.xml
+++ b/dev-python/empy/metadata.xml
@@ -6,4 +6,7 @@
 		<name>Python</name>
 	</maintainer>
 	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">empy</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/entrypoint2/Manifest b/dev-python/entrypoint2/Manifest
index 2a773a379bca..4b3596e4cbd7 100644
--- a/dev-python/entrypoint2/Manifest
+++ b/dev-python/entrypoint2/Manifest
@@ -1,5 +1,3 @@
-DIST entrypoint2-0.2.1.tar.gz 11396 BLAKE2B ee462006f1fe4c80f707d00c2ef89fcf359b59853730786920ad931a099afafc808620ca16f0232e07a75c824b4b25ff50971c643f70087b89ab2ba6b7e13c1f SHA512 2273eda6cd8bf5a5e9fc5e8a657f837a88c8b617e384cdb6f6b62b3380e0b37d82af54dadd59a0ff82cd85cfdd61bb79d6c747621370f50e97c3796111baaaf6
 DIST entrypoint2-0.2.3.tar.gz 11542 BLAKE2B ef1ef511e02a3c5601d3147af241965fa78361a8cd070b5f0240f3842cdd49b3f93a32af4299568d201382c8c5a694ec7f85191c5880d489056744f59cbcd346 SHA512 c02ca02be9f25533c6a37a3aa372cdb75de8419349e279f7bd82369667a75943fc2fd0ba5afad49281d623f8ac4d6f97ffb2dbdb7b72b4cdc9afec80e763bed5
-EBUILD entrypoint2-0.2.1.ebuild 546 BLAKE2B 45248bbe41b1834dc97c3f0d23e6f5e74747750a4e50d845acb2d399ca60ac3d735c19c6cdfdd62fda90b277102d24a53dfee2eba66427a6c397696503987eff SHA512 7ecc7903ef8205db6998919932bf6aab6b4b0fd74c15dd777bc77ec47f07277cd824cef875bb3ee37cf163c611743166acdda64e55b15735d3ab82671ac51e49
-EBUILD entrypoint2-0.2.3.ebuild 548 BLAKE2B 48b6eaabc07e0a4dd7a3450af0ccc0de1d297ebaf2c7941be29e34a5769707e73e42d7936638482865567fda136cda415164eae70fc9cce496f1b588df6c0a6c SHA512 c550a431fcd1bd79f563cdb94a0a23273538e1509e2eedc036bfa12e738495814e4c15ab37f5a57b084d8fcbc6252c9947059770ff926fac09a5bf8077378484
-MISC metadata.xml 375 BLAKE2B 393138e315b4eae4dacb9339fbb5766e9dbaa84b7482babaddc08d524fb8b9939f6622ee9c6d09b66c61ac270fcc483fac39996a12ba87ccccf7cafd4c6d36db SHA512 9a44b6b9de4d1a61d6af9256519473541d5513cef349c15178c025dee3aaaa3f6772b1be56576411a985fcd9c70029c00743d8f577be8eaec4c5a44646c9cbf6
+EBUILD entrypoint2-0.2.3.ebuild 546 BLAKE2B 45248bbe41b1834dc97c3f0d23e6f5e74747750a4e50d845acb2d399ca60ac3d735c19c6cdfdd62fda90b277102d24a53dfee2eba66427a6c397696503987eff SHA512 7ecc7903ef8205db6998919932bf6aab6b4b0fd74c15dd777bc77ec47f07277cd824cef875bb3ee37cf163c611743166acdda64e55b15735d3ab82671ac51e49
+MISC metadata.xml 473 BLAKE2B 4cebc84f93a2dac87dd4a865de27f607cb1f945f33afb2fbad493a1ddda4c947b5503eb21c55c72be0d6145330f097a02d0eb93baf4d22e8924056e14c50bf2d SHA512 3e684c9a6e8a344aae9b662329c1e8af851118469bb8701bf3ef449fc0072260869daf819546c296e29ffbeedf2095e5788d01162b3c96286af49aeae6e5f8d9
diff --git a/dev-python/entrypoint2/entrypoint2-0.2.1.ebuild b/dev-python/entrypoint2/entrypoint2-0.2.1.ebuild
deleted file mode 100644
index 51a72e233eff..000000000000
--- a/dev-python/entrypoint2/entrypoint2-0.2.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Easy to use command-line interface for python modules"
-HOMEPAGE="https://github.com/ponty/entrypoint2"
-SRC_URI="https://github.com/ponty/entrypoint2/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="test? (
-	dev-python/easyprocess[${PYTHON_USEDEP}]
-	dev-python/path-py[${PYTHON_USEDEP}]
-)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/entrypoint2/entrypoint2-0.2.3.ebuild b/dev-python/entrypoint2/entrypoint2-0.2.3.ebuild
index fc2e650b9d50..51a72e233eff 100644
--- a/dev-python/entrypoint2/entrypoint2-0.2.3.ebuild
+++ b/dev-python/entrypoint2/entrypoint2-0.2.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/ponty/entrypoint2/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="test? (
 	dev-python/easyprocess[${PYTHON_USEDEP}]
diff --git a/dev-python/entrypoint2/metadata.xml b/dev-python/entrypoint2/metadata.xml
index d22e99d73577..ba153c9918fe 100644
--- a/dev-python/entrypoint2/metadata.xml
+++ b/dev-python/entrypoint2/metadata.xml
@@ -9,4 +9,8 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">entrypoint2</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/entrypoints/Manifest b/dev-python/entrypoints/Manifest
index 432cb992c252..c81c7c433fcf 100644
--- a/dev-python/entrypoints/Manifest
+++ b/dev-python/entrypoints/Manifest
@@ -1,4 +1,4 @@
 AUX entrypoints-0.2.1-init.py.patch 243 BLAKE2B 79706eacd51f9eb2b9bb319befc01c44894e2fa0c394585d2ad578b07e64fa4a6fce5e7c8f1c50752b1fa63e05776186759bc1ce426559405fd0a0e6c8b14aa3 SHA512 f25cb047aa8743dd9145c8e5913c53b5faa6a2b0ed3a50a957d69739bef43b3a6612ec38754bb088c2f9a8e116df61e00962fd1a78c45e5c107cbdd40a9569d0
 DIST entrypoints-0.3.tar.gz 12315 BLAKE2B f548d98eeb9dcf5760b26f66e5dec0849c9a9027cd68447c07a585e7b80f79a7c66712d0dd270b6960db167d26f9cf0c9c221edd21f2692c2221d36e952ede65 SHA512 aa1274362d3a4b00266103319ca51aa266605b4999c89a9d0673eb61bfae9e646cb0ec6b86c95544493f6fe048385a2c7641d64adca8f45815546fb1e663c858
 EBUILD entrypoints-0.3-r2.ebuild 833 BLAKE2B c77505e717fd0f996216f4c1acc69375aca66f7dd6e3114873a50643c3ec86fc47c2b47e8d139b3c64c73c381831938b9f5bd9fb01e370db26e0c5b304aa99e3 SHA512 f499ec34c3edf5e21cbdb0f221f21d6950e3b051e8e5ed428e6c77f36803f480c672a2948a102dfb09eed25e575bc959f150b3e2c987c42d5eba1cdc786e2828
-MISC metadata.xml 755 BLAKE2B 2bdb17501f0f4130ca9fa124d2994b95a383b3f2ca9b7f5cfee3bad344ad3d4e9ff00b190fa385a3485f300f85c9ca3540cd53523c4d03b08eaf6398d7e6bef6 SHA512 c416305f3033e682efc0fa3fc1414b2e9c82db59e876b18c393542a8d06e98edc458a2bdbbacd2dc15a6cb3ad3fe37dbb50063f1bb50e033888ee725f25b740d
+MISC metadata.xml 780 BLAKE2B 13f639cdea65735e24577eb5b327a9ebe00909457ccbe181817a02c973a83a6e037c48d09b885bd5da38b4d0c29ce96cbe4aa334f9ed8c0253c392e133639a87 SHA512 5c09061fbdfe9e7fd844175ed774fdf176dc681c5f4e6432ca10d8730d36e0aab3df07cbb58da02050c64ba875fe8e069221b94283e81d5b50d830a63c9f2e92
diff --git a/dev-python/entrypoints/metadata.xml b/dev-python/entrypoints/metadata.xml
index 843ca0b4843a..8d61c9733361 100644
--- a/dev-python/entrypoints/metadata.xml
+++ b/dev-python/entrypoints/metadata.xml
@@ -1,22 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <longdescription>
-    Entry points are a way for Python packages to advertise objects with
-    some common interface. The most common examples are console_scripts
-    entry points, which define shell commands by identifying a Python
-    function to run.
-  </longdescription>
-  <upstream>
-    <remote-id type="github">takluyver/testpath</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<longdescription>
+		Entry points are a way for Python packages to advertise objects with
+		some common interface. The most common examples are console_scripts
+		entry points, which define shell commands by identifying a Python
+		function to run.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">takluyver/entrypoints</remote-id>
+		<remote-id type="pypi">entrypoints</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/errorhandler/Manifest b/dev-python/errorhandler/Manifest
index 16d6b3c9ce21..b21fb58bd677 100644
--- a/dev-python/errorhandler/Manifest
+++ b/dev-python/errorhandler/Manifest
@@ -1,4 +1,3 @@
-AUX errorhandler-2.0.1-no-intersphinx.patch 342 BLAKE2B b2165e4dcc5acb49c7f456c9eb2fc918e9c764cc3c83a920cbde99ece65827cb3f44d3943783d484de75bed6214f3878d22848a6ed52b51a4577e2e9352c1ec0 SHA512 dacd25028b2afdafe7507e466914b37cade57f8678849946052b60fda817bd6065232dc83673f9377b0abf0015716547ddc3a03177eba081f1f01a63741559a6
 DIST errorhandler-2.0.1.tar.gz 8534 BLAKE2B 2a1db016acef81b5e625800614b2b5084cb6e8175d623e42726a728018871d200709ec66db16847ae0cf604551925a18fd2207c861388844f324a6eaae4bbe90 SHA512 b2fe44f400551e2af8aa589aefce042ee761893678b211a0e3ec7eb4527803001ac930d0941425f6e1487d36493d0c8f439e0bf672536ec27f041309fd69420e
 EBUILD errorhandler-2.0.1.ebuild 476 BLAKE2B ecd2af083080925376c701e49e5ad3cb792f941dcdb6e935b6aa3bd4a9fa7f608ec366180955f711b907f7ba10bf3b3eceabca86f4233bcd782db023747e8da5 SHA512 8d4333a57bcefd38069fde85b5a86964bc0616af1c91ede8afb9a487b10be047ae45f901fb600a1a9459525cc786aed3010525c90cd2bf470204b0c4670ac01d
 MISC metadata.xml 325 BLAKE2B b9d3bdc299f206991f900f0fefbf436445eedfd32b0c005919d37417003fb115d435924e424943554333fb65d6811d82e27436f6cd40b0818e204804da74ce6f SHA512 d7a0591bd66d48cab6821c9ac4131839a8b60f026ffbb677263f1af1a0f6f9b9dea2cfe3be003c40e2da7f16914ff2078ed591de0c6833406595010ed88479ff
diff --git a/dev-python/errorhandler/files/errorhandler-2.0.1-no-intersphinx.patch b/dev-python/errorhandler/files/errorhandler-2.0.1-no-intersphinx.patch
deleted file mode 100644
index d37e190fb6ed..000000000000
--- a/dev-python/errorhandler/files/errorhandler-2.0.1-no-intersphinx.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/docs/conf.py b/docs/conf.py
-index 2c71c44..0e6f0ae 100644
---- a/docs/conf.py
-+++ b/docs/conf.py
-@@ -5,7 +5,6 @@ pkg_info = pkginfo.Develop(os.path.join(os.path.dirname(__file__),'..'))
- 
- extensions = [
-     'sphinx.ext.autodoc',
--    'sphinx.ext.intersphinx'
-     ]
- 
- intersphinx_mapping = {'http://docs.python.org/dev': None}
diff --git a/dev-python/eventlet/Manifest b/dev-python/eventlet/Manifest
index 1cd2549efc63..4be20c6c08d8 100644
--- a/dev-python/eventlet/Manifest
+++ b/dev-python/eventlet/Manifest
@@ -1,4 +1,7 @@
 AUX eventlet-0.25.1-tests.patch 1428 BLAKE2B be4b0e0104473e8434075175a85cb658e7257eea6bb554f92160d308649aa7faee6f4db7d2aa8a3df54e22bf6689d649dec6b74d523425a27bc1a77233b5976e SHA512 a7a413cce99def526ed63b79d1f73d270db9332ac88ff83a830fdc4106ffa20f2e14dfbf8d0dbdd071d39c4d2f161250bd8e7c0681f187fa0736d8184cccd872
+AUX eventlet-0.30.0-tests-socket.patch 607 BLAKE2B 3da02ca5cbc16ef2a8ecbd6fc9f817404cd2ad6cd6378e0faaaac7c9721e0ac03d3becee1962f44df3edfe0c30c55d7eb92c66b4a01bc94468d4f1791e40eecc SHA512 3a4f6985c3880a85578591ccbdcc0e76f5dce7c4c8897489d2f2976faf3e73e7ab1d755c91ddfa4cf28b1019e730580ba45184179c0ceef6eee859a2bf6ae28e
 DIST eventlet-0.26.1.tar.gz 398200 BLAKE2B f14024d0825fb5530929766c63dceea7446057d9ad5dfb98ab013e96cab9b0eef5440f2d4d7ceeef17691c8a2a9055cac2b93fb23653a6facba4967c4e7cb0b3 SHA512 55b9b214130d0482ea005ea570a5aa3eafdf66e6d315a95c5ba60186a2d9a9df5c2638c86d886968954ce39e5ac2153e1f9e11631e6aef237078c3776af7d6c5
+DIST eventlet-0.30.0.tar.gz 401035 BLAKE2B 94a272ce810b28c00fc8a468f160e38f3c58c98750455e5eb096c266c46257a7e30e0278a6a8f509e47e6ab40297129ccf52b347a723037f9cc9b85a3e06a203 SHA512 c2ba283063333e9e74536dcda33276f98f74051ea0e9c8669506d2e3b11715f37cd5963af6130f14761a42cc6c8346e59c756efe2cef0ea3547dc30ccb8bf0fb
 EBUILD eventlet-0.26.1.ebuild 1767 BLAKE2B ae71076b4ab1c6903a557fd3fb1b1f8facc88235c4f2957f41da098d1e7a1c75ccea80ca8d95cc73cc557fcc731e309a57adf8310bf24aa970dc1430107fbee5 SHA512 68b12849631f3516d4692ef4151e1bb9c00a2aac883cf4ae87aab8a7ad781ff8b102ed6748917b7502f5f6329da05eda924559aacba29d63f118f8334ccec1a3
+EBUILD eventlet-0.30.0.ebuild 1840 BLAKE2B 9954992c66a4adb3d2b9e60dd30f809a362e151e560bd888a97fc57c2fe572b2b08b14f26a453516ab6fe596d7f7816c70a7202dd13eb2c5d787e95d8dfa0e9e SHA512 e9a7330597a1a9452b39eb86f8af9093f9a3662e7ec24e69f3da81c886dacb8b6332c47d617c251b5b9b574d273f65234ea257b2e0bc3b88d36be59b31473c63
 MISC metadata.xml 380 BLAKE2B abdf12718464c834d63994ad012a6d47279fa6f0e5cb0d075bfbbf24167438220ec9681eac874c93dc3abd9c1498a1a7f658a622f8ebe764cb6803b1b2bb4561 SHA512 8100edfde1885122848aa543b99bbc8529b9dc2aeea3b7efb74a3d1e8e01bdd2110e4cdce2c4ddeab9fd0182f193118e876843a61a25e17355d0916d50331daa
diff --git a/dev-python/eventlet/eventlet-0.30.0.ebuild b/dev-python/eventlet/eventlet-0.30.0.ebuild
new file mode 100644
index 000000000000..bce0a6cda427
--- /dev/null
+++ b/dev-python/eventlet/eventlet-0.30.0.ebuild
@@ -0,0 +1,65 @@
+# 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} )
+inherit distutils-r1
+
+DESCRIPTION="Highly concurrent networking library"
+HOMEPAGE="https://pypi.org/project/eventlet/ https://github.com/eventlet/eventlet/"
+SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="doc examples test"
+
+RDEPEND="
+	>=dev-python/dnspython-1.15.0[${PYTHON_USEDEP}]
+	<dev-python/dnspython-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-1.4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
+DEPEND="doc? ( >=dev-python/python-docs-2.7.6-r1:2.7 )
+	test? ( ${RDEPEND}
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.25.1-tests.patch"
+	"${FILESDIR}/${PN}-0.30.0-tests-socket.patch"
+)
+
+distutils_enable_sphinx doc
+distutils_enable_tests nose
+
+python_prepare_all() {
+	if use doc; then
+		local PYTHON_DOC_ATOM=$(best_version -b dev-python/python-docs:2.7)
+		local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}"
+		local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html"
+		local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv"
+		sed -i "s|'https://docs.python.org/': None|'${PYTHON_DOC}': '${PYTHON_DOC_INVENTORY}'|" doc/conf.py || die
+	fi
+
+	# Prevent file collisions from teestsuite
+	sed -e "s:'tests', :'tests', 'tests.*', :" -i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	unset PYTHONPATH
+	export TMPDIR="${T}"
+	nosetests -v || die
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		docinto examples
+		dodoc -r examples/.
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/eventlet/files/eventlet-0.30.0-tests-socket.patch b/dev-python/eventlet/files/eventlet-0.30.0-tests-socket.patch
new file mode 100644
index 000000000000..4dd309c68a38
--- /dev/null
+++ b/dev-python/eventlet/files/eventlet-0.30.0-tests-socket.patch
@@ -0,0 +1,13 @@
+Let's use TMPDIR as the base for this test's unix socket to help it pass.
+We set TMPDIR in the ebuild to ${T}.
+--- a/tests/backdoor_test.py
++++ b/tests/backdoor_test.py
+@@ -47,7 +47,7 @@ class BackdoorTest(tests.LimitedTestCase):
+         self._run_test_on_client_and_server(client, serv)
+ 
+     def test_server_on_unix_socket(self):
+-        SOCKET_PATH = '/tmp/eventlet_backdoor_test.socket'
++        SOCKET_PATH = os.getenv('TMPDIR', '/tmp') + '/eventlet_backdoor_test.socket'
+         if os.path.exists(SOCKET_PATH):
+             os.unlink(SOCKET_PATH)
+         listener = socket.socket(socket.AF_UNIX)
diff --git a/dev-python/exam/Manifest b/dev-python/exam/Manifest
index e3df504d6889..6c4718adff9c 100644
--- a/dev-python/exam/Manifest
+++ b/dev-python/exam/Manifest
@@ -1,3 +1,3 @@
 DIST exam-0.10.6.tar.gz 15028 BLAKE2B 6d2a888b9adf14665e8f009bae7b2c724dcb60fe19efa98a189988a73a0cb5933179407c754ed1c19b24694080b6df31838768f694460fabd9196e58e8b4c94d SHA512 1cc082b4fb9a7270ea81750ee3f34400f3f6eac65dd1488af333a43d0623bf8f9176b73e2948c324bb9c0062296284bae66fe215263456baf9db378676c8a4f0
 EBUILD exam-0.10.6.ebuild 424 BLAKE2B ccb3c8637031aab37f599b82c2186f2c8b54f00d6c0368f9d80b0c10e36c3ece8652fc4f466ccd98733d5df0fe57c71d3b5e346887f739ca2a66f3d9e3affbf6 SHA512 59c8b5845fc2b46610e046be4a95053b6284c7fb44276d77c8a569706555a207673c3e5328040659284db9b161085dce731a9b166fa603aec65deb90b2b7cf3b
-MISC metadata.xml 1685 BLAKE2B 51e5e8f94272ea0318f683f1868e3d2519f492d4b3a4870990ff574fa08dd094ea976e56b8cede7e554ebc8471685c6efaf13355735c021e881c96200d3412d0 SHA512 48974f1aa263535521d2691b715f4500f512ca903fd325339a7614cfe25ca836af17aca742e2d4939752c8acb741380a4e5ce6ae3fad2b3babbad85f8e06e48e
+MISC metadata.xml 1700 BLAKE2B 9448f77935050f99836bbf1aae4fd140dcadb1c620271eb5316ff92ea9de74f5958467c53ed0cfc36f1cf931bcd85b8492eb73029fe6e66fc6688edbdee6a113 SHA512 592bfcec70460045e61e4e8abf6043e18861018d27b2ca7684f364242c790bd6e2d984bdcfbb9aeed696f6d6f2f51790c53b11a09653fe8e8b39fbac3ffc051a
diff --git a/dev-python/exam/metadata.xml b/dev-python/exam/metadata.xml
index e782094b1d21..d79043f73e5b 100644
--- a/dev-python/exam/metadata.xml
+++ b/dev-python/exam/metadata.xml
@@ -1,28 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>lssndrbarbieri@gmail.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">fluxx/exam</remote-id>
-  </upstream>
-  <longdescription lang="en">
+	<maintainer type="person">
+		<email>lssndrbarbieri@gmail.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">fluxx/exam</remote-id>
+		<remote-id type="pypi">exam</remote-id>
+	</upstream>
+	<longdescription lang="en">
 Exam is a Python toolkit for writing better tests. It aims to remove a lot of the boiler plate testing code one often writes, while still following Python conventions and adhering to the unit testing interface.
 
 Aside from the obvious "does the code work?", writings tests has many additional goals and benefits:
 
-    If written semantically, reading tests can help demonstrate how the code is supposed to work to other developers.
-    If quick running, tests provide feedback during development that your changes are working or not having an adverse side effects.
-    If they're easy to write correctly, developers will write more tests and they will be of a higher quality.
+	If written semantically, reading tests can help demonstrate how the code is supposed to work to other developers.
+	If quick running, tests provide feedback during development that your changes are working or not having an adverse side effects.
+	If they're easy to write correctly, developers will write more tests and they will be of a higher quality.
 
 Unfortunately, the common pattern for writing Python unit tests tends to not offer any of these advantages. Often times results in inefficient and unnecessarily obtuse testing code. Additionally, common uses of the mock library can often result in repetitive boiler-plate code or inefficiency during test runs.
 
 exam aims to improve the state of Python test writing by providing a toolkit of useful functionality to make writing quick, correct and useful tests and as painless as possible.
-  </longdescription>
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-python/executing/Manifest b/dev-python/executing/Manifest
index 69eb6434499e..fa67d2b6ce7a 100644
--- a/dev-python/executing/Manifest
+++ b/dev-python/executing/Manifest
@@ -1,3 +1,3 @@
 DIST executing-0.5.3.gh.tar.gz 303234 BLAKE2B cb9de0492c4aa31b53310abf65d97df888278671fbf24e5dc2f3f4b00fd22d233fae2265bffe240c092c5b67bfca1e69ec1c4eaa937a0d4c90bedced1f156e2a SHA512 faf591de8e6354300fb572065bda304c3cbc529725b4044ad4f4ca1f86d892da21598ba7245059824e27894937d46e4ef9ef5962a9d7dff78e4144a3e0e6b388
 EBUILD executing-0.5.3.ebuild 1073 BLAKE2B a4a3da165439df3b2c851d7683fa8a5179b39b291c3b23c3b6997c5797b72ec3964a1699f0be41016931dfe86e8f22ff901a7209920781d8cb9ae9d08b99ac4b SHA512 78b93e2537ba57f8d95c126cd907db9e556ec7b902dd648d562af503682161647ef07da2e0000813f885726ae4c8a4b335e79fc3b6140f09f53ad3a1359f6941
-MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
+MISC metadata.xml 350 BLAKE2B d128d36a837974853f5e51c64b03ca8eb749eaba54e5049033153e1c3671eef5a91490855820a47ce718f28e2aa45dd9d26df75e81fd923d7f119d546b6d9b61 SHA512 ff4ae4abcc417476ba024f7e9ff8f8de8c57d70f34c36bd2a4adae498c01489c16bf315ff174616ac9d65de3431983c35da66edae60668c9e526ada2a026555a
diff --git a/dev-python/executing/metadata.xml b/dev-python/executing/metadata.xml
index 266e3f19ca59..9117f7343c32 100644
--- a/dev-python/executing/metadata.xml
+++ b/dev-python/executing/metadata.xml
@@ -4,4 +4,8 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">executing</remote-id>
+		<remote-id type="github">alexmojaki/executing</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/extras/Manifest b/dev-python/extras/Manifest
index 06bc435ea8a2..2623759126be 100644
--- a/dev-python/extras/Manifest
+++ b/dev-python/extras/Manifest
@@ -1,3 +1,3 @@
 DIST extras-1.0.0.tar.gz 6759 BLAKE2B 341bce7f172afeb9e2a5179ab392d396920dc8ec2b9a6e734daf8668c7f329d9a64de6f3f90b70f8e42d5e111ef196315341c0bb0f347f13ba4974d970695fac SHA512 510c796628f28db90bb96c7c9ba5fc9b2b950d2968e219efe67f3899bbe7ef68fe5de1494f8fd640f13a1ccd329e7dac9cd38aa965ab1e07c4cd287c04da50fb
-EBUILD extras-1.0.0-r1.ebuild 668 BLAKE2B f7e63d21c37faa0151fe1b196d003fe5e789327ef916bbd8e29a1cf6a2546f9c6861f4208501252a45b636af8e9441de866bc382e6aea15fb4bccd343d344694 SHA512 f0582cd54c11afb623d41bf74f5109eeca9d1750ef1c9937a725e686f8cc79c066d781b5f72027c927aa778afa32b3f5f3cef56abb8afa44e1fb567fd2acc6d5
+EBUILD extras-1.0.0-r1.ebuild 679 BLAKE2B ba6c36fd06ad73c53106f8b9a7c6233f33c59caf59de24a1a86fc5f9a481183b48396333ecf97ef6ccb2666874e59c0c958a9d6a4ef683e27d5221340e670532 SHA512 fb72b90146a6a165e637b43cbae0efea934ac9e633c907567eaa387a6d612d07df02811b79d14e776bc6965796dad746776c0ba7858ffdc9b835a1f4834d77c7
 MISC metadata.xml 381 BLAKE2B c7f141d44f01d1f5163cf4f55c03f5a939f575297bfda8a6b5c59442372314cc637cd83f1f0b2fa4c21f70266bebb5645468afad0d747f8e15df689751b89545 SHA512 bd91400e2886a9f79e973f16fa5a84c6b3d38a3fab45db89bdc5f930e7bd8adff02fddbb9f8fcc72199dad32881a355b046c5cdc2c16e679a46c1bc9e08c3e02
diff --git a/dev-python/extras/extras-1.0.0-r1.ebuild b/dev-python/extras/extras-1.0.0-r1.ebuild
index e871b1cde293..110cfb6465b8 100644
--- a/dev-python/extras/extras-1.0.0-r1.ebuild
+++ b/dev-python/extras/extras-1.0.0-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 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/eyeD3/Manifest b/dev-python/eyeD3/Manifest
index b5afd09f9850..bc5de07afe67 100644
--- a/dev-python/eyeD3/Manifest
+++ b/dev-python/eyeD3/Manifest
@@ -1,6 +1,6 @@
 DIST eyeD3-0.8.11.tar.gz 215807 BLAKE2B e289a274198a4adceb0ec3b77a5c79f50faaa320edecdf07d1d2af3b5519f0c884c8cef146b124fd172d74626f70af2b689dd536ade1a68ed27fedff840513ee SHA512 ed147fbe6ce88319cdbfc752e1ddbcb141180bdd87854c209c621956bc52395c5ba442d929016419620c0b230f5b8a3e1fa638b73c7cf329405425148f953c9c
 DIST eyeD3-0.9.5.tar.gz 222657 BLAKE2B 3932c1b07e0961773a1cccaebec116c3b51a8c4560850661e8725efb3f4c5716b43ba610e35a2682f94b0e3b72513fbf108ffbc8c436a52977c308ad82e59400 SHA512 be89a2070b8cd5d70b25ff24e508c35e4e0ad20bfbe7bc91e4119614c1359cbc7a4ba812066b608f310abfd027d34b7bfa13f9dae8f3ab54f3ecfc9ce47c07e4
 DIST eyeD3-test-data.tgz 97281754 BLAKE2B 9b667a5f8be157ace06d773d575c08f4a8e8b7a7b81ba9cb39b1e2c924b2e3f98597607ed3076b13150e02ef7768e89d1ff8a9913021e5f4b9ac6b59344ed397 SHA512 937971dcefc53812c59adb97df27d200e92de04e12391c735ab85cd547e2a168aa1212d88c206ec71ac2fa85a504a9faa91dcc444b45149aca7c8f3a794e9a95
-EBUILD eyeD3-0.8.11-r1.ebuild 558 BLAKE2B 38f36e5f8c769a1e228f834495b4d56d9b9ab3dffc0211551d4f65a8a7288c969119d0b690f3426c2a2221945233235a87d6d6447f966105ff518dca683b82fa SHA512 70c13459cd085dc0cfcc844733baf13c54174b514d9ac500c76f0f0ff4430943e6a433429bf27acefca420064b0df680ee8f432248d3f9992808d102e341ac61
+EBUILD eyeD3-0.8.11-r1.ebuild 551 BLAKE2B 2e420d00d88b35f98a3dddc45d4e0a0301b0ff27aeff09cb7a49631a60202a6259569e3a2338626228c8dfc80302cc74870fc6f5f8553d530d3f72ab8552f581 SHA512 21a8cdb3a35b2861e309c61d5c9be61f247d72875cd011fec745d1ae78e618274caf2f4465a3aced962b39a9697ad0722934500fcc00b5dd2fd3e24077eaf9ba
 EBUILD eyeD3-0.9.5.ebuild 1228 BLAKE2B 7c43fb2c6481785f7970b6db60063e6988ad1cb7d918d096e3240419725053829a5498e27a404527cb115de176174a23e480e925bcd12f4a3b0b60c7f731383a SHA512 39dac2d29e7d1148d492674876d5481501da373fbb2820af4d4f753dcf2c9b05e73ef1e13405deb2666498a9992a6be1f0b7cea933f6d22cb4cee2e2e14dbdeb
-MISC metadata.xml 353 BLAKE2B 936234dca3e9cd646ab403b630c1dd05eb56bc3648bfdbda6fa31b6609334dbf04622760ea00d78f3c9b2bb37ab3c3d8e992db3210bcaffdaecbd5bc3e538fa0 SHA512 5d9b0061aaffcdcaa374f9ebe83ac47d7d6acdd28a51452f68d3f43a5e7b866639b9edebd82c20a440fe4e7f54a93567219a91cbf524218276c6c17df8b605c1
+MISC metadata.xml 422 BLAKE2B b8e4ddea71156c634ca87bd24654a084283becb2724cd427dc24e8bd3b4753e413523684f88fa6ceca7923fb27f7df1620332e2ed50c9fd071e2783212426158 SHA512 45f20846e2b377dc1433c97c09f82f9b94d00de58252307cff4459a8ed820cc5c5ea5bd6bc674bd0dd39b9f6b91a4e49e65e682b32100502ef61ff78b18fc313
diff --git a/dev-python/eyeD3/eyeD3-0.8.11-r1.ebuild b/dev-python/eyeD3/eyeD3-0.8.11-r1.ebuild
index 6720dd35d923..49dfff1428e3 100644
--- a/dev-python/eyeD3/eyeD3-0.8.11-r1.ebuild
+++ b/dev-python/eyeD3/eyeD3-0.8.11-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/nicfit/eyeD3/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0.7"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]"
diff --git a/dev-python/eyeD3/metadata.xml b/dev-python/eyeD3/metadata.xml
index d0913ee5d1cb..0f50ed7380ba 100644
--- a/dev-python/eyeD3/metadata.xml
+++ b/dev-python/eyeD3/metadata.xml
@@ -5,8 +5,11 @@
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>
 	</maintainer>
-<maintainer type="project">
+	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">eyeD3</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/fakeredis/Manifest b/dev-python/fakeredis/Manifest
index f2d747551681..4fc2c374afae 100644
--- a/dev-python/fakeredis/Manifest
+++ b/dev-python/fakeredis/Manifest
@@ -2,4 +2,4 @@ DIST fakeredis-1.4.4.gh.tar.gz 65483 BLAKE2B 500346bb96d2c1308d0565a006ca037784f
 DIST fakeredis-1.4.5.gh.tar.gz 66197 BLAKE2B f0f36d1e209673f7722849e835c2a33fac9f7e8bfb1294ecf2e69478295f14af514d0fc4a5732a20ce099333b136d682591fef031ce90d6262fa8c9025cbfa2e SHA512 e16ae5c5947a924b0c9c40ae68efebad5cccea9f88d1b5c3f1677e1ccb8c1fa75dbafc9b413c2359b774f3043c387ff91ecd4e2e21204036883175944338d59b
 EBUILD fakeredis-1.4.4.ebuild 1051 BLAKE2B 0dba6874655b81e658b556c408c9cbabbc53255d44dc341f39f6196ccafcfc61c37394823a5b7ae5a181b4217afa0d912a622282d6cb73ccb7f8455a4b8cf3e3 SHA512 dd939840fa1388eff049603481a9a07bcefefe846d3f1e758949fb57c32077b28a13723ea6ed6134fade3277e9a6d0b044707b11c1190bbe286b8f7646fbac37
 EBUILD fakeredis-1.4.5.ebuild 1055 BLAKE2B 47ed0c021d8ce4225f52256ddc2f865817def2cedfb613fa2745fb21d8a6511550827b1e501ff044772aa60c48b81f7907443d9c61d2904258a85eb609954bab SHA512 c40e7789ac227099088f19fa3e31e3bc8ebd41bf63c3a69e0be6e1e07ca41d546811f3a411a7fd493e27ff7e6aaf8614b5a9c006617fd598daf21ee68a4d084f
-MISC metadata.xml 242 BLAKE2B 17fd7db1343fb7dba1842d5b62d83e56e2816962b0122ec6eee7f9e163f333d69ede2cbdf2a2ba8c77613367fca3d2cee779697fb25b5d8cf0439e1e845dbf1f SHA512 2ce768d5aae91f32da90c62900f556c647eb9806c810a817b6c45c5356e71f504b5a646bf75f553c3a9bfd3f94c4317df4948bae863ef7525b4a013b63618cd8
+MISC metadata.xml 371 BLAKE2B 5d6b5f058881d62662d45b5f0207912d915fc731a4816b16ee098d19f7e8aa98f63e45bc68c6a41db7c09a84b4a82177a74e4edf566e506f287dc806bc461d54 SHA512 f43716bb013e8bcf042b0c75393686f1ae7eeac8b1f4b9c2d1acd27738d1f82427ded18f51d857032361ba2f4a3ea9679d3bcbb9ad2d99c3def5beac2873af3b
diff --git a/dev-python/fakeredis/metadata.xml b/dev-python/fakeredis/metadata.xml
index e59516686a44..dfb478e2ea05 100644
--- a/dev-python/fakeredis/metadata.xml
+++ b/dev-python/fakeredis/metadata.xml
@@ -5,4 +5,8 @@
 		<email>python@gentoo.org</email>
 	</maintainer>
 	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">fakeredis</remote-id>
+		<remote-id type="github">jamesls/fakeredis</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/falcon/Manifest b/dev-python/falcon/Manifest
index 5292c1392d47..0d1e15c3064b 100644
--- a/dev-python/falcon/Manifest
+++ b/dev-python/falcon/Manifest
@@ -1,3 +1,3 @@
 DIST falcon-2.0.0.tar.gz 1075333 BLAKE2B 338e0b2474d743171fb0bc9dc3a05da428e6d46fc25e7cf1e978f799ed70e76bf265f32ba2cdf16d6eec8ea03b7b6111f70aa5b8f59141b7029d8ba9b03cd0d1 SHA512 d5365f91eb312cd058773d0a3809b5d8631acc188b9ee884e7c7db35664138608998f397d3fd831c568cafaf261cca2734b9dc7fb60590062e316ad1dbc74614
-EBUILD falcon-2.0.0.ebuild 812 BLAKE2B 1b29c7b5261f847df57c210882c121034b49d5a840d68cdf3062ab3ddf09db930b69b594449118162f6cfa6284f2505f22ecbd9b8a34a9708a71516b493ba70f SHA512 87db99c80f9ddbb9e232f50266f8262b77219b2f54a4d24eb1c67aeecb797285cc8501b800418dc94c1e6622a2784a963cfdcd4beb5122e4db79c7951c0f2979
-MISC metadata.xml 427 BLAKE2B 419677eaecb3e5eb3fb26781cc3df41cff373a70a4899ce89cef22efbce131c457ce2bdd489b92287ff80f6d12962bd210035a5db77e518e456898498a5eea1d SHA512 7221c24f2bfa8068d4f5516e094af7dfc01786c63ae8d3f040b8d1da0ec4a83a6c507332e524fbd78e0644c978c11c89bec8c9771e0247ef48de1f50c50d8fbe
+EBUILD falcon-2.0.0.ebuild 815 BLAKE2B c05c1b1a03cecedca9315865a682a33badaa29baa7209244d8a2f664903f62c80e40d03d973a80335f25e6eb4f595b4f89c3dbe9102eb6e78650da7b9e4c8e53 SHA512 464d75b18fb25adff1a1373b011cda5eb48439f65e9b5cdec1bd2b1a6465d25f0451f065f0669d56778e5fa95f84039ff031e67b77ce204b4dff75c81bab4ee3
+MISC metadata.xml 459 BLAKE2B d285469f0a0bebbefe0a7b4aa05fb9b1cea19d2c7df8f63dcda73e38a6ad3c076f79187d4ec83d98389c9b153d4633f3a1daa502f25fea66be90d5407118701f SHA512 bfd46dc7f13b05eaefb14154c7138cf81ce330f5fc736dc0ff56c1ce95d980e9a838f99696df7aa329610aca18e84edd390363c569132a556c5239236b257d01
diff --git a/dev-python/falcon/falcon-2.0.0.ebuild b/dev-python/falcon/falcon-2.0.0.ebuild
index 398eac5b72bd..1c9ee79bb282 100644
--- a/dev-python/falcon/falcon-2.0.0.ebuild
+++ b/dev-python/falcon/falcon-2.0.0.ebuild
@@ -8,8 +8,8 @@ PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="A supersonic micro-framework for building cloud APIs"
-HOMEPAGE="http://falconframework.org/ https://pypi.org/project/falcon/"
-SRC_URI="https://github.com/racker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://falconframework.org/ https://pypi.org/project/falcon/"
+SRC_URI="https://github.com/falconry/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/falcon/metadata.xml b/dev-python/falcon/metadata.xml
index 690e2fa0f23b..d7035d2605e0 100644
--- a/dev-python/falcon/metadata.xml
+++ b/dev-python/falcon/metadata.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>rafaelmartins@gentoo.org</email>
-    <name>Rafael G. Martins</name>
-  </maintainer>
-  <use>
-    <flag name="cython">Build cython-based python modules</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">racker/falcon</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>rafaelmartins@gentoo.org</email>
+		<name>Rafael G. Martins</name>
+	</maintainer>
+	<use>
+		<flag name="cython">Build cython-based python modules</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">falconry/falcon</remote-id>
+		<remote-id type="pypi">falcon</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/fasteners/Manifest b/dev-python/fasteners/Manifest
index 1f337a156128..81bcd91fa08c 100644
--- a/dev-python/fasteners/Manifest
+++ b/dev-python/fasteners/Manifest
@@ -1,3 +1,3 @@
 DIST fasteners-0.15.tar.gz 17898 BLAKE2B 58da6de627024f6b50d2f35caddfa126ee5d45ea89e16c5f14f7c42fa72e47ca9f98e1f46806b6f5e06401b25132e89113043806db1b13c2d0a095a09aa9aa69 SHA512 756f2ee8aa82ec6fd548d6e4320123b7c0bede834d4e58ff9031e004a8d9d0c23f7df4026ec4195799baa459720ca02d69a981a4aae54713e190a71152f2df9b
-EBUILD fasteners-0.15.ebuild 603 BLAKE2B a6ab8687f84f7309d283e85407189563e843c2539e5da1bcf675357c0a6b693f39775dc0294b80344a6f0dbe4ebfe13f153425c43777fd1f7bb84605f2ea2ae4 SHA512 7bc8f19e619e16baadc1ffadf3fb0d92d50307b8a677e452fa980d6245ffdeeeedd23098bf5da49dabec65b89534e41b0b87f71766469c16cd919ae377f9cacf
+EBUILD fasteners-0.15.ebuild 614 BLAKE2B 8aca1a40bd8724948f5418c72998fc7c1479ad3e7422cb0fab7cb23b8e1128faa33e72b9a8be5a0a7968bf3e6e82ad3dd6d79cb3ab229e62116011d107155fb9 SHA512 f1ce8e3fc7c14fe1c3aad7805ba1677a7e5e44a3663611a83caf31f4a2812758a2d197d77f12f7fa6b10f8b13ae3aa4c3031dce04b2ce36725e66411aa9d51ee
 MISC metadata.xml 509 BLAKE2B a2ecd43c854cb670cc29c9bb6e663a46d33334f3e2ff45963730712eac8eb7b9059445dc798a73f89eb2c9e66c5de1caf9b6f4193df5c0552e8176355a325e0e SHA512 f72b52a24f4693ba6d534aecf039a616be7bd5efc83dcc76c8eebaef95edd247192c784caa7b001224786071e5dd3dec59758be0717330a71c4afb7718bc68b1
diff --git a/dev-python/fasteners/fasteners-0.15.ebuild b/dev-python/fasteners/fasteners-0.15.ebuild
index 3237207f37fa..9be92e0a5829 100644
--- a/dev-python/fasteners/fasteners-0.15.ebuild
+++ b/dev-python/fasteners/fasteners-0.15.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	>=dev-python/monotonic-0.1[${PYTHON_USEDEP}]
diff --git a/dev-python/fastjsonschema/Manifest b/dev-python/fastjsonschema/Manifest
index 2f231d8b26f6..33087d782b08 100644
--- a/dev-python/fastjsonschema/Manifest
+++ b/dev-python/fastjsonschema/Manifest
@@ -1,3 +1,3 @@
 DIST python-fastjsonschema-2.14.5.tar.gz 33488 BLAKE2B 4604ebd46851c8fe856909fa3943e053ac7359a9f360c189add2a46780fe045ca1952033174d008db7696bfc861a504c3aaa7389c33a2edbccd10cb14de8a097 SHA512 255db86d1d62845e512ca5669f3200360847d974710050ac53fe88536d6d9f943ccf41a8414702dad70fa1a38defe9859f2b608e13a54af11199c90d63cdf1d0
 EBUILD fastjsonschema-2.14.5.ebuild 577 BLAKE2B 98da8940b1f3210f64bd925a602e6a3f5fd59545d237b6495654fde3ddf2705d7c58e72991d66cb51b99152b08aa5e5f94eefb14e710f8158e97c0ed80448f88 SHA512 9a04f102b23b996fe9e62be6058210a87eefbb9aa894b428306798e9cd2cbcda8ca6e2b8dc3e20f14d96faf8178787710659b9d91c97e4e5c2391f78a5bee566
-MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
+MISC metadata.xml 295 BLAKE2B 3074fbdbb11405da3fe5f91635d597613413c525ecca4c64e06fe674f64dfc3bf8283ceadfff25f18b963887440600d96d0d6c885d3646871e408104eaa82e1d SHA512 21d8a9a257002002453b0975bb890d047eefbc9a3367b2eec5f51d321b95de5538347bf96041ab62117d66f76b1e4c5c587861434e273818df7b11c38920d3a8
diff --git a/dev-python/fastjsonschema/metadata.xml b/dev-python/fastjsonschema/metadata.xml
index 266e3f19ca59..b22752a68952 100644
--- a/dev-python/fastjsonschema/metadata.xml
+++ b/dev-python/fastjsonschema/metadata.xml
@@ -4,4 +4,7 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">fastjsonschema</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/fcl/Manifest b/dev-python/fcl/Manifest
index 2143e860f895..15225b7a2b7f 100644
--- a/dev-python/fcl/Manifest
+++ b/dev-python/fcl/Manifest
@@ -1,3 +1,4 @@
+AUX fcl-0.0.12-fix-compiling-on-lld.patch 400 BLAKE2B d50568d13ad303c9c56a604d5ff8bcfaa537298cbda7b48628c07637ae7364aedf88fb57a04c601765ef1ff5280d609fc50dd06270d9cce32085f19d3c3b1e08 SHA512 4e668d7ac21a0fd326db170d64a3ac0cd931dfd5657546682033c30ad86d7d29ad845a5be4110b8cae2cdfd5ad1a784f3792eb7a8b0fd665f17614dab30a0c9b
 DIST python-fcl-0.0.12.tar.gz 17204 BLAKE2B 594d466270160e71e67d99f1745b382c3b1f7754adeb9ba58443e4370e14496e45f4a7619eb7d41db22766f75fe841e088609014bf5a9ff5a6b7ee526b34eca2 SHA512 3b5462206e63e17c646edeeedb268474cc6df1ff12d64d4de0c46bcc281787a42b6306778d2fe5d4d3b2e23bc0ed86e092c9a39b74d019638c771ac5c9d9f8ce
-EBUILD fcl-0.0.12.ebuild 880 BLAKE2B e6b401bf06c027386ef067dc4ec03d4071e78db035a7c408055a27d2a6fd3b7142b42059f74c0c4aca615db08b0a7cbb2ce9f9a989810a2e64486210070d3567 SHA512 d39c3ce60715e3432f0fc397ae6cf56df8971e0a98bf95940f3ad735aa6e079f77c3969ea212ca06b693abc728e7e0360f0f4d9cd230d16ad76b5e942756e498
+EBUILD fcl-0.0.12-r1.ebuild 777 BLAKE2B db7d60ca6ff0a3ac0c1d41620e727039eabab3be4f6f54f0a526917028203057a64283170c7fa8650262afd6fe33f2dd0e34dead41085d62b640a296e49ea8b2 SHA512 5d8f2c604b448208747360ea5b56dd19061922587da2265d3202a03f41dab798b5053c8cbcc5cab4a9a52dce72c86bed2d538b87cc79a95647fd07e8fa5ad91d
 MISC metadata.xml 690 BLAKE2B 9ffe7a20279a393ab054e5f14e03b567b6c9a22da79a0f4abf44a534bb217931a0a2774e8ab03fbfe28028b664ed45654d5687bd44eb5ab7461f16a1bae82f8a SHA512 8d59da8cedbed47d103b8fe47fc05b16533008c8ab8e5d684ffad836d4a06c9c139a1c3800d2922e4ee68f432924dd363e99b233c167be8b585a4eb8a4de72dc
diff --git a/dev-python/fcl/fcl-0.0.12.ebuild b/dev-python/fcl/fcl-0.0.12-r1.ebuild
index 49e3bde5d1ce..27910fbb1371 100644
--- a/dev-python/fcl/fcl-0.0.12.ebuild
+++ b/dev-python/fcl/fcl-0.0.12-r1.ebuild
@@ -17,7 +17,7 @@ LICENSE="BSD"
 
 KEYWORDS="~amd64"
 SLOT="0"
-IUSE="examples"
+IUSE=""
 
 RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
@@ -27,16 +27,9 @@ RDEPEND="
 
 S=${WORKDIR}/${MY_P}
 
-distutils_enable_tests unittest
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r example
-	fi
+PATCHES=( "${FILESDIR}"/${P}-fix-compiling-on-lld.patch )
 
-	distutils-r1_python_install_all
-}
+distutils_enable_tests unittest
 
 python_test() {
 	"${EPYTHON}" test/test_fcl.py -v || die "tests failed with ${EPYTHON}"
diff --git a/dev-python/fcl/files/fcl-0.0.12-fix-compiling-on-lld.patch b/dev-python/fcl/files/fcl-0.0.12-fix-compiling-on-lld.patch
new file mode 100644
index 000000000000..0e3cf7a54196
--- /dev/null
+++ b/dev-python/fcl/files/fcl-0.0.12-fix-compiling-on-lld.patch
@@ -0,0 +1,12 @@
+--- a/setup.py
++++ b/setup.py
+@@ -21,8 +21,7 @@
+         include_dirs = ['/usr/include',
+                         '/usr/local/include',
+                         '/usr/include/eigen3']
+-        lib_dirs = ['/usr/lib',
+-                    '/usr/local/lib']
++        lib_dirs = ['/usr/local/lib']
+         
+         if 'CPATH' in os.environ:
+             include_dirs += os.environ['CPATH'].split(':')
diff --git a/dev-python/feedparser/Manifest b/dev-python/feedparser/Manifest
index 990a26e52277..dfbdc7d6785f 100644
--- a/dev-python/feedparser/Manifest
+++ b/dev-python/feedparser/Manifest
@@ -1,6 +1,7 @@
 AUX feedparser-5.2.1-sgmllib.patch 2748 BLAKE2B c7b4ce987f0067020e996134379ff0d30b151fc64a85ddf8a66748d118d748cc3552c2a889e3621c90221c37d1adcf8668e2e417566a6059a4a272ce1c3323cd SHA512 3ef63206b043179f5a09cf1f3d5256aed1ae0c559b99fc0ec4c1de756dd678af8a7672673f864f72c8162705056fb0011ff19b39debfcbd0faf402804869f681
 DIST feedparser-5.2.1.tar.gz 252956 BLAKE2B 182ebefa8a44276e758f277c203c28b274c580b667b039e4fc6ed9bd059b15e35e775e9efb784a97d712dc57e7b176ff91d6e094ddd225735f4315ffa770ae83 SHA512 1fd0c4324e2eff8ef4b15e3793c767290bca562af4a5056fdbdfa12411095530c87a113bb1b9757e532ff63aecb399b18f1e6b753884798eb6b8d3fdf575af81
 DIST feedparser-6.0.2.tar.gz 251508 BLAKE2B e571bbd1a26ff06536ce3a134a5f91ff2cfc65ef7074ba7d1e17f4ed57ba19f8db395991b0a8137f9a7db931d4bda2a8a9157588ea5764ffde3bfd0616c71a35 SHA512 8ffcfb2934070ed6f0fc1a3b3d7c6a055c8c8e29dee8d56fa489832b71b94bc70dd8c8360061a103894ea9a80c6a91a6708da16999e36619092674ccfda36a75
+EBUILD feedparser-5.2.1-r1.ebuild 1139 BLAKE2B 0dead1db6bea5c34764ac2a4d8ec536781054356151960c0fc24867b10a7c8cf1ab15212c076657314965384b3084eafb50c79080a649e4e6d7dc968c5cc4c3a SHA512 b339b0153c17dd8cdaba383a15d4b7f8a1866f7aaaa89dff0e6b4729e13fa929bffb8f5f55a00ac1671d068f0366505dd8ae51e2eb97367978a18823a58bac19
 EBUILD feedparser-5.2.1.ebuild 1194 BLAKE2B 8fa165bdf23171244f6d0fb6fdf2cb296c06515296150cee3a871ad09c9825a476802d176935f7eb459d130f7c0c43a4a4774ac8d913004bc63c960db25dbb6b SHA512 90b24aa7ffd61794fa22a9d530f7ade3aec69cc8f330a9f1979f6ff302aa2a6c94b5897e0e05ae7671b86dbceea9b63f540e221bc3d739d366192ae45dee77a4
 EBUILD feedparser-6.0.2.ebuild 893 BLAKE2B 21b4df6b21a24d54ae9c6392cdec404fb664dee11f365871670c78f066e82ca82a8f11462d4de3e9a92df31427887ebe19753696ee3ca561781c0ef78f3be721 SHA512 1dfec37a2a8be9a53f9abb94f8e80457f265371f4267449e724a6637e82b896e3319a1f905f8e94a1b7a35338b00abb29091c38f37532ee64b1551bfd3b0dd7e
 MISC metadata.xml 467 BLAKE2B 99c83112b5515f5fd591bedf71882a7445b064cd44dc1e8f6fb2654d31582ad310cf796e36cdb8e093ea80a8546dc34fe263ae1a77e34f56db968f174c1e3e6d SHA512 80c5b4647324ece6c83e748e8eb41002403308f75397f643a95c8c9f7682074a66256d0bae04c6a4040ce6d0c3bec564d2496aec15647bf5447b49c8917f2db0
diff --git a/dev-python/feedparser/feedparser-5.2.1-r1.ebuild b/dev-python/feedparser/feedparser-5.2.1-r1.ebuild
new file mode 100644
index 000000000000..40f815e4b539
--- /dev/null
+++ b/dev-python/feedparser/feedparser-5.2.1-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Parse RSS and Atom feeds in Python"
+HOMEPAGE="https://github.com/kurtmckee/feedparser https://pypi.org/project/feedparser/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+# sgmllib is licensed under PSF-2.
+LICENSE="BSD-2 PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+# Tests have issues with chardet installed, and are just kind of buggy.
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${P}-sgmllib.patch"
+)
+
+python_prepare_all() {
+	mv feedparser/sgmllib3.py feedparser/_feedparser_sgmllib.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	cp feedparser/feedparsertest.py "${BUILD_DIR}" || die
+	ln -s "${S}/feedparser/tests" "${BUILD_DIR}/tests" || die
+	cd "${BUILD_DIR}" || die
+	if [[ ${EPYTHON} == python3* ]]; then
+		2to3 --no-diffs -w -n feedparsertest.py || die
+	fi
+	"${PYTHON}" feedparsertest.py || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/fido2/Manifest b/dev-python/fido2/Manifest
index 98a8623a5c38..e7789070fe37 100644
--- a/dev-python/fido2/Manifest
+++ b/dev-python/fido2/Manifest
@@ -1,5 +1,5 @@
 DIST fido2-0.7.3.tar.gz 188262 BLAKE2B c1d832229ce741be3b81e4cded65b77e57c008aaba8ccbdf640bae1c27f4d86f2c0ce7ffc83405e3693646a8f2868030619c958ecbaa58a6a6328ece2cf6d3de SHA512 715779ecc9dba19de0e45df13d018e7dd223f20f5662860874aa8aa6f811c1df71c07656d21b49a4b6f14a149134d8af6bac076a7f71cb7392ca2fef70b173e1
 DIST fido2-0.8.1.tar.gz 201198 BLAKE2B 33411dd05d7f513445afa8a6fc4bb90f3989a655fa05d2ba9da411aa7eea3b30ffa253fae6586f76c416115e5bec90f6f120472a49a0acfbd91020d2cba8f74d SHA512 fc0753ea694f2170d529129764cd9f9c5439cd2f467e4f384d7a698266ee8391a5c9c7c6e51d2dc2a99b93fca1c7d5288d5236e302672a87b8ca7704f328c0b5
 EBUILD fido2-0.7.3.ebuild 1065 BLAKE2B b71ccee7a4731d15ad77d9bf1980376cdd37c093fcd52d632fdc08a19fedd4252f2d497661222ce2463a49322d6b9cbfdc71d7b536bcccf7c1a9af91bf33fd22 SHA512 debe2b7dd2eb0d6c4675fb1532dd5aaf79562d8a285e330dbc2440eb38b86940a54da440767a0a1c989dc490a6ddcb4412927a8cd9be23008733727dfc61831b
-EBUILD fido2-0.8.1.ebuild 1065 BLAKE2B b71ccee7a4731d15ad77d9bf1980376cdd37c093fcd52d632fdc08a19fedd4252f2d497661222ce2463a49322d6b9cbfdc71d7b536bcccf7c1a9af91bf33fd22 SHA512 debe2b7dd2eb0d6c4675fb1532dd5aaf79562d8a285e330dbc2440eb38b86940a54da440767a0a1c989dc490a6ddcb4412927a8cd9be23008733727dfc61831b
-MISC metadata.xml 539 BLAKE2B 3e4288bcfbeb472b34ae14848e5dfdf24eeb8ff819efdd14a888a50d0eaa1e5efb6854a9c5cdc1c4e998b7483cfae673f83d11c98f8f97db561af50a0a908ac1 SHA512 6868804b1d3118b99dc77a1f204c05487462eee4fd1458ef9f722fc1b9038b3d4cb7a8436246b115343d53616e466e1b33fd97ca7adbca9e8cbffcfa95480354
+EBUILD fido2-0.8.1.ebuild 1065 BLAKE2B b85d06b7cd809d79869d5d1e5d44f4da0aefe2555a506807d07fd4b4d876133d8d447e7fd524094297822be539c7c159eb03c43d4d90385834407907cbf22e54 SHA512 65c741ce661a32265448b97e28ac7c799a5e0584474a9cd9ead1e4459473c7f85ed7ab9525a4459384904257c323504d0d45e9d23053930658006aef9a6eed10
+MISC metadata.xml 589 BLAKE2B c9c7be67189c6857e4c4dce022289bd43ec0d9d2ef5376a2369d942f61f59309f6c211648ca3507bb740471cd3c0876846fd992e6d56d5b9828aaf86a57693bb SHA512 2197002048163ef201936db666780dc77e635f318f10e8bf9a4843042f05ca001044695dc47460ad758cd5520cb454b9678f51a30cbd640c86a1a4923a66f426
diff --git a/dev-python/fido2/fido2-0.8.1.ebuild b/dev-python/fido2/fido2-0.8.1.ebuild
index d59bb437ce44..48ef415e8c47 100644
--- a/dev-python/fido2/fido2-0.8.1.ebuild
+++ b/dev-python/fido2/fido2-0.8.1.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
+
 inherit distutils-r1
 
 DESCRIPTION="Python based FIDO 2.0 library"
diff --git a/dev-python/fido2/metadata.xml b/dev-python/fido2/metadata.xml
index c9ccdc3b158b..3ebed6d78bfc 100644
--- a/dev-python/fido2/metadata.xml
+++ b/dev-python/fido2/metadata.xml
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>gokturk@gentoo.org</email>
-  <name>Göktürk Yüksek</name>
-</maintainer>
-<longdescription>
-  fido2 provides library functionality for communicating with a FIDO
-  device over USB as well as verifying attestation and assertion
-  signatures.
-</longdescription>
-<stabilize-allarches/>
-<upstream>
-  <remote-id type="github">Yubico/python-fido2</remote-id>
-</upstream>
+	<maintainer type="person">
+		<email>gokturk@gentoo.org</email>
+		<name>Göktürk Yüksek</name>
+	</maintainer>
+	<longdescription>
+		fido2 provides library functionality for communicating with a FIDO
+		device over USB as well as verifying attestation and assertion
+		signatures.
+	</longdescription>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">Yubico/python-fido2</remote-id>
+		<remote-id type="pypi">fido2</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/fields/Manifest b/dev-python/fields/Manifest
index 4899502ab08a..9aace44a9b49 100644
--- a/dev-python/fields/Manifest
+++ b/dev-python/fields/Manifest
@@ -1,3 +1,3 @@
 DIST fields-5.0.0.tar.gz 36232 BLAKE2B 7e5ebc5b7c76b456acbe02e0b325685776c573dd0715e27402e5245e04f3c54e6e0ac04b8780a50d9b560cb5fbb664bca6a3addc76666f012aa2427140dbf870 SHA512 3d80b9c6a1d0a43568045fc25422b0db783c84e2e3f2be8b1d41b0150f48fef58736d863d06b4562b29190cd6dc2616829faab8e901b7268ac2e9e63e996180e
 EBUILD fields-5.0.0-r2.ebuild 875 BLAKE2B d500a0b8b30ce82cc2e9b16f70abbbc1c4a41e5b6fcb3aff9b18e770415f25d8240f36b87b6c8bf715adb2f20b332405bf03e824b4ad408ebef05913030c0226 SHA512 1de1a21a520caa5b508009970a9fa98e69e1b1b5a75e1eb32431b10db4c1a24c8a54aa5c634eb5f680bdd415b09fd642edae9d0144aeb83d450f8e4eccf308e5
-MISC metadata.xml 361 BLAKE2B 611ac98563da8aa9d43f8a5a3e1317c96f4098803d80235bceade270c526b89c62ca3bbca8bed095a504024ddfa00be570ba8b54daea8ff1bb7d109540baf6a0 SHA512 47819e00388927636ac00892661f0f5b71101ae081cdf29bfbbffbde24a5efb3ad339130a8bf97116591552be630902c4a003a98f3202f81e2bf7a81f1fefa47
+MISC metadata.xml 394 BLAKE2B c44d383b7a260304d050e1f46642c0adb5ebcd1a3ffa8317d29758c4fdfdd2afd1e9e0d78ece54aa45235cde09af87d8aafa86b20193dbfa495e51c796f3c914 SHA512 9158a335ac27faa4ee14da7063e859c71f4f80a09ac512c3804ce0e830ed8fe1241cc8a6f05561728499a9ccb08631252a0eead97232d25af240b9b6b54d4a92
diff --git a/dev-python/fields/metadata.xml b/dev-python/fields/metadata.xml
index 4391ab4e39cb..bad4b18882fe 100644
--- a/dev-python/fields/metadata.xml
+++ b/dev-python/fields/metadata.xml
@@ -1,12 +1,13 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="github">ionelmc/python-fields</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">ionelmc/python-fields</remote-id>
+		<remote-id type="pypi">fields</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/findimports/Manifest b/dev-python/findimports/Manifest
index ee9fe2ea7240..15e7abffc08f 100644
--- a/dev-python/findimports/Manifest
+++ b/dev-python/findimports/Manifest
@@ -1,3 +1,3 @@
 DIST findimports-1.5.2.gh.tar.gz 32211 BLAKE2B ea3110925085d466df7f95eaa06dce9e331ecba52c1772b76b05e51c633a8adc1ff91295db441049dab39129606e3927f69834376cc5fb864f5f3b62ac68bac2 SHA512 86432d29d180d4299ba789b69601722a6a15eed9badbf2f930e8867be06c64a2f1f8123ae182d7c6b73339287d04c2cdb4a18a31662ea72e86283ee165dc4d45
 EBUILD findimports-1.5.2.ebuild 470 BLAKE2B bf11966352785963786db2fe4d0ee1e47ae7132086e2d60bf6a49a405325cd865d8f5770ce82937786266332757e7c1aba002ded7b7961b798faf824dc69ad60 SHA512 51a09981afc79bf63c6a721f912990affa2a8d3882c54ec4768f3262969d064ff59dc64187373e476cbf9aa0fc2eb86845eaf279a65f50407a5d12003efe4bd5
-MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
+MISC metadata.xml 321 BLAKE2B 0ba0d2265364e7a059e43fc70702dfce93dbb85296594ebffd84d481ee2a6f10f49d983f1cdd86a85c20425cb8c0a5d74ca31b0b0ebb0f8cd2c663d29033ad00 SHA512 47a18d5032cd7b43e403d3c33fd30afcbca6b9fb45c2580381531bbdb8d227035278d86e689c42e927181f205c7123cd2c2e4935de1cf23d6fe03985d76b82c8
diff --git a/dev-python/findimports/metadata.xml b/dev-python/findimports/metadata.xml
index 0319eec4c8be..7f668de4daab 100644
--- a/dev-python/findimports/metadata.xml
+++ b/dev-python/findimports/metadata.xml
@@ -5,4 +5,7 @@
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">findimports</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/fitsio/Manifest b/dev-python/fitsio/Manifest
index dcaa96737b63..97ee145bb5d3 100644
--- a/dev-python/fitsio/Manifest
+++ b/dev-python/fitsio/Manifest
@@ -1,4 +1,4 @@
 AUX fitsio-0.9.11-test-failures.patch 1560 BLAKE2B 3299a43eda8df89467474c51dec85af9edb8af52c93958e49834317439d440a0993ef6311002a4cddc4cde6aed42ed355dbafcf4f6ecbe98b81d60b9763c1c03 SHA512 224ae91e65d4b5f24cd64f3ab389940bfa58801822ad090966c4c570d5c9fb568588b3efa1dab73c2ebbbd0b5f802c2364fda31097811da78c09903814613c6b
 DIST fitsio-0.9.11.tar.gz 6020222 BLAKE2B a71a0a6a026999b06dce54beb48fab2f510951099788b51456a6e07057daa7c911d5a2841d5f15a397705459daf081ff91bff1014782c93cb1dd76faf0ef2e1d SHA512 751b9612fe051f128d8f5dea61e2d119409293051a130ee3e18836181637e8c8daea757a715012fd024678d00e234e8b6c0cc0c9229c2bd9a406db312e4607d7
 EBUILD fitsio-0.9.11.ebuild 933 BLAKE2B 2f89b876e1eafe948f6968a2026c384de48bcc678d4647239b6918817e04f445459e4e0c28d0f6d79bd2b4fdd72fd6cad9c916b540c15e3f752a281f075d6e35 SHA512 b3dc85d888ab8d6fa0b2932132b5455d522833a6fe17290491b6b7f4fa8d9a8ce4bfd4c645fa36c6a4820b1dd8da13634cb266845704c5b7b067c022c1a6cb86
-MISC metadata.xml 930 BLAKE2B 495700f368bc6c69ed91745ec7d2847c5cca1690c454bc3b69acbf34eefbacb5b398bf7b56292dc25f2c642a91acc0e2ca054a2a578827aef3c4f95a07a75bf9 SHA512 ef4d3c9838e4e151b16febdacb9fb3b3538763dfb0c08b43ad73a9d9ecbdb275d91152b64b400aec8e3d337f08f3aa46cc166251e34142a68514135d6ae314d4
+MISC metadata.xml 946 BLAKE2B 5db7e27af3ff956fe32bb98c7bb54e7f4479fca568bcf0bb4c6c6bbdd97ac7a2db645bfbaed09ea3338f6512c75037b30ddb70aef4abcdeab6855cd1ee476b4b SHA512 75e62ae6ab0ae2348fbe678419e9d28d79373965b3d87af425195074544687b4fd54133b86e04a129a224a6eb84d07a3ab20b53cd38c09484d0f6532dd5db211
diff --git a/dev-python/fitsio/metadata.xml b/dev-python/fitsio/metadata.xml
index b7f5bc4ce9ac..c8e0769187f5 100644
--- a/dev-python/fitsio/metadata.xml
+++ b/dev-python/fitsio/metadata.xml
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>sci-astronomy@gentoo.org</email>
-    <name>Gentoo Astronomy Project</name>
-  </maintainer>
-  <longdescription lang="en">
-    Fitsio provides an easy to use object-oriented API including
-    providing a Numpy interface to FITS files read from CFITSIO. It
-    allows direct access to the columns of a FITS binary table which can
-    be useful for reading large fits files. Compared to astropy.io.fits,
-    this package is closer to the underlying cfitsio library.
-    Fitsio also exposes a microlanguage (implemented in CFITSIO) for
-    making efficient SQL-like queries of tables (single tables only
-    though–no joins or anything like that).
-  </longdescription>
-  <upstream>
-    <remote-id type="github">esheldon/fitsio</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>sci-astronomy@gentoo.org</email>
+		<name>Gentoo Astronomy Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Fitsio provides an easy to use object-oriented API including
+		providing a Numpy interface to FITS files read from CFITSIO. It
+		allows direct access to the columns of a FITS binary table which can
+		be useful for reading large fits files. Compared to astropy.io.fits,
+		this package is closer to the underlying cfitsio library.
+		Fitsio also exposes a microlanguage (implemented in CFITSIO) for
+		making efficient SQL-like queries of tables (single tables only
+		though–no joins or anything like that).
+	</longdescription>
+	<upstream>
+		<remote-id type="github">esheldon/fitsio</remote-id>
+		<remote-id type="pypi">fitsio</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/flake8/Manifest b/dev-python/flake8/Manifest
index 162186618e6c..660d6dccac21 100644
--- a/dev-python/flake8/Manifest
+++ b/dev-python/flake8/Manifest
@@ -1,6 +1,8 @@
 AUX flake8-3.8.3-pytest6.patch 1883 BLAKE2B bd4eb8f184636bfbc33b262df8c5612402a1741670531068f2ca9d15f03633e27030819c6b9549ba88bc8c37307a65a0b714e48e4c846e73b80d31578c49d8c2 SHA512 7179106e01f1562d7dbeb3b4e2b4285bbbe29373f776e0d03aecc5e5c44b2e650016ed34409935a66184bb1ab9e6828e0c46f7c65526a6ac44c2a0885354e18f
 DIST flake8-3.8.1.tar.gz 157166 BLAKE2B cc8b2dc11f78a6b9c62662086cc190a29a0a4e5a228d4823de8e2f3f327cea3e5df4db220faf9cc14fa34e3825b7d1e4fc4ccf9d1205b437903f327f3ebfa7bb SHA512 f73a306be7d8e5bc48dd9d6d8f8cdee07a90c6c38ee7bd37a21f4be23f1812e4a1e214cc75ca1a324f40e750312b5d7ed573ff49d673f9a1f33aad188b108add
 DIST flake8-3.8.3.tar.gz 162305 BLAKE2B 7211c9ff99ce2e8e3094e6a7a1917ee1b3d61902a45408b9c84f077097af8d1b0571e27209ed78409c9931ff53fdb660f81d1886773b8ef74ceb0bd3de60420c SHA512 007158ea5caf60ff84e935f1b74a5f746fba00991c8808395ff72126dc1a8c8e135badc6f1f383027349076b8f3e146e9d0af27b6e24cdf97390463fd69ad940
+DIST flake8-3.8.4.tar.gz 163583 BLAKE2B 221234931365912adffec99c7c6761d2f35918222bee902ade4d8009d24f6918c66d23fc4b973fe653152cc6857b62ba859780b0d9de53fb91b7ea0379bee9d0 SHA512 51ed09beed50175573e6184b404431b3f89aa6594c40c70ed8288982fe12c2a68992e36d69c99013188f03555bf9fef1ba4f111f8e389cef1e1daa69b41ff5b0
 EBUILD flake8-3.8.1.ebuild 1370 BLAKE2B dea3b7d66efcbb3097ac81e75cd0d76910ea424fee8017e7ae9cde2804858da1f0476a422403b00b17d476eba997afe96b393fd119d25d209ff2e43b72a337f4 SHA512 ea4e8d513f18033b12ee674a16328d41dad86590706623987c379871249b54ffb2527bca1ef0a8a5c5ff661655cef6a7cc9113573d2d4d498472de9568c1a9bf
-EBUILD flake8-3.8.3-r1.ebuild 1374 BLAKE2B a438c019c4bb40f6ab77ea264fe5ac3f25326b907e5570f1639e42c73f29dd5271df3e50113c05f5b40d7eaebf189bb1dbf8f41915e35b50d01f8f89980ea6fc SHA512 22b97188d716bc35c01f5fc67e1eea63fae685a6aee48a5873ac4e79d55018bf6cb9daabe151a27ed051f334130708597b64861eee0877386dd006c35c741907
+EBUILD flake8-3.8.3-r1.ebuild 1226 BLAKE2B 549255d94ed090a20f31068c4709ff19ccc66fd70470ad7403ba281900ea8f505edbee0ec7b2320c4b144ac8c967f48e0345e1a3dc5f6bccfb3247db4fa8bc70 SHA512 aac42be022e9423175fa2ff193349d1c05f2c85e53074017b3185d213cdc84cbcaba79e8e0fbcf2cd88edfbd56dd22cf7a9ef461c1e65e4395a3148bebc7756b
+EBUILD flake8-3.8.4.ebuild 1195 BLAKE2B a79ccb98a42db8e5e0d5ecd2bb10a9c930f1d4d4a97e53c6b216294a9d1f684a6f827a25d5f995a4497a61efa9d6895f33fa1f1a655c1335b4a548732cf21baa SHA512 077887525adcc75737bdcf2ac8897fc4632f260d6ca9ad1b7217b1fb7f6306e86a8c5bf3ccaf3193b89243fcbd5829eeba09d182a79191d18c45afe03fc9f2df
 MISC metadata.xml 398 BLAKE2B 5a71d80adb94073494d12eb93722d21593a388b4f4cb47ad8ce1e8d053f24d1597c36743e720dabbc023f9318039b45b0b1ddc22d86455394b72789ab0c5e988 SHA512 823dbd0877b3ac042e5c51f260cb0f3d3490383a4975d7bf2267898cad7e3366a693be270d2eb9c8dcea8b7f66d1e6a3343b7a4be5c1b8f0fff8ffe514952e5a
diff --git a/dev-python/flake8/flake8-3.8.3-r1.ebuild b/dev-python/flake8/flake8-3.8.3-r1.ebuild
index 55e6d64f8d8d..1bfc0de53548 100644
--- a/dev-python/flake8/flake8-3.8.3-r1.ebuild
+++ b/dev-python/flake8/flake8-3.8.3-r1.ebuild
@@ -38,10 +38,4 @@ BDEPEND="${RDEPEND}
 PATCHES=( "${FILESDIR}/${P}-pytest6.patch" )
 
 distutils_enable_sphinx docs/source dev-python/sphinx-prompt dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-python_test() {
-	# Otherwise some tests fail if the package isn't installed
-	distutils_install_for_testing
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
+distutils_enable_tests --install pytest
diff --git a/dev-python/flake8/flake8-3.8.4.ebuild b/dev-python/flake8/flake8-3.8.4.ebuild
new file mode 100644
index 000000000000..c3d63314f8bc
--- /dev/null
+++ b/dev-python/flake8/flake8-3.8.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
+HOMEPAGE="https://gitlab.com/pycqa/flake8 https://pypi.org/project/flake8/"
+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 ~x64-macos"
+
+# requires.txt inc. mccabe however that creates a circular dep
+RDEPEND="
+	>=dev-python/pyflakes-2.2.0[${PYTHON_USEDEP}]
+	<dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/pycodestyle-2.6.0[${PYTHON_USEDEP}]
+	<dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3 python3_{6,7})
+"
+PDEPEND="
+	>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
+	<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}
+	test? (
+		${PDEPEND}
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source dev-python/sphinx-prompt dev-python/sphinx_rtd_theme
+distutils_enable_tests --install pytest
diff --git a/dev-python/flask-assets/Manifest b/dev-python/flask-assets/Manifest
index 0e2eb1da6657..41d71424e623 100644
--- a/dev-python/flask-assets/Manifest
+++ b/dev-python/flask-assets/Manifest
@@ -1,3 +1,3 @@
 DIST flask-assets-0.12.tar.gz 23017 BLAKE2B df7eb45a9abdd0be3f23655f49d30b53c90ea204fa0c91c286657d6b12750c7cdb11e78c2c8e140dc8677c90f52fa44c7d776c446c8fd4f92a060a570bdacb2c SHA512 28a5b275ba002c32e53200038673e507556d0acc12ccc9d2678ea3c179aa93eff275dd8fca9686186d20b65faa1600902e892a6aa4043df449c399008a37179d
 EBUILD flask-assets-0.12.ebuild 482 BLAKE2B 1ad07ea82edc746ce027e9728411cb9cc5cc966edf097ad4022767136d8efdb8efea6a0c21d8b5a5b1e4e7c2c584566260192220039825adf5833bd979e701a4 SHA512 ead3577a97c122f242bd805e7c2ec63b919caa0f28b3cff167bb710e722dde4fac81fb65ac77d7c4102efc49a7b0e0e562537808ce8306058730adb261181e40
-MISC metadata.xml 436 BLAKE2B 9cd9813c005aaf1d435a5f56ee7ba3b13b3307c26768213ed779bab7e9830d2de090e5aae2a060fc28cdad15c297c099fafca822f63ff0c40d5cd145a89bf933 SHA512 04cd06543b3f93cf097144af2fe7d4fc90186adc3e32edac2206188eb00f5b98a6ca2a84cb2aadf081b47f5aae8a53fe1273eaac35f18c83dcddc43bed5a55fc
+MISC metadata.xml 486 BLAKE2B 0a5b00c63f5127f6098c6188be5bf7ac3c0302739caec2eb0d1fd0106dd10d3069713b5605298294e93d9738bc5d2caad828f3458105e9a595875d1138d380a6 SHA512 8b9d3bdb7027fb74e2bdfa54d028959d4735dbdda37c474be76e0de413fb15a1b45d7d5e43c99597d1e1d989908de72319b6c1d1900dc9043449253f305f7a9c
diff --git a/dev-python/flask-assets/metadata.xml b/dev-python/flask-assets/metadata.xml
index 4e3e70575758..804f01c4ec05 100644
--- a/dev-python/flask-assets/metadata.xml
+++ b/dev-python/flask-assets/metadata.xml
@@ -11,5 +11,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">miracle2k/flask-assets</remote-id>
+		<remote-id type="pypi">Flask-Assets</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/flask-compress/Manifest b/dev-python/flask-compress/Manifest
index a4d37fd43c57..2e4c1778543a 100644
--- a/dev-python/flask-compress/Manifest
+++ b/dev-python/flask-compress/Manifest
@@ -1,3 +1,3 @@
 DIST Flask-Compress-1.8.0.tar.gz 10182 BLAKE2B ff292503dd0a141ffb3d49e57f62755c59244129e53268f97d0ab5bdf4644108d9eea5567982fbb000afe54d7a418751f5b8ecb685b3e42c25413e7740d03004 SHA512 9bdc45b6d189e8b896a781dc48b761ac99a551a32bdaa9695556e7dabfd76f7ef98249397a31492e629ea35d82c5104d99b5803b9ecf9b2637cc802a87939f1c
-EBUILD flask-compress-1.8.0.ebuild 581 BLAKE2B abdd5bc0c568e14c1e385d981905005b29889a7c521f571f421acf054d06efe3e81b8b0d1f1bf07fbc6ec465715eb3a7179a32e9735776c360b400d9dbead8c3 SHA512 e0aec7f161a96cd8ad5c8ded98f064e18ed8f44e5bef84ef6e7eb7d8cc07ecf8b2909b2554cc134936b3354f6c89c8cc7f2fccd23ffa090fa883206b821d9fdc
-MISC metadata.xml 455 BLAKE2B 7f4418124863adeda47aabd82ed9c123ba47065382d4ef6b87044a8307d2fe34028aab1c7d1fc04ce8a4a6c47ab259be039ab0a4971b705bfc74be9e74543bb4 SHA512 96e0549a0ab7f0a8e2ccdd8bc0a139c50f273ae60896666f7b21b1bcd937b147eaa93a327d897d2607d2c01e4afaa305abb83ad378cb6e2b9a93678f04ee25fa
+EBUILD flask-compress-1.8.0.ebuild 581 BLAKE2B d685f6d5f5f2f327be0ee05eb07cbf0552c3ed43ec290fbc35fdc7be6e48babed11670faeff806cc30ed6395f6404f14b9770b8d6354af6da682b2588533ee41 SHA512 ae3576c08bc2e6c8de04931e078a2d2ad686ac6fdca1a1e68b33ff02f0aae379c2b96958590833bff807e180ba2f361cdedf19bb47f5c1b08a5079835129981a
+MISC metadata.xml 455 BLAKE2B 32bea36b88ad19fed08198fe3ac37b3853dd3a50b1d24c67f56e06a222537e48ca275a701a11bd5d2027ef3533d1603f44daa9aa7d2c5b41081bf78e1c1ad842 SHA512 c3f44e2c49cda143874476662b0fb3458d2bd1f2651d2664e10e45cf373886765e0d6ffd1125bc9e8de9c0c0ce9ee1d9b23279ff4afc1ce40e60e5bb748850f9
diff --git a/dev-python/flask-compress/flask-compress-1.8.0.ebuild b/dev-python/flask-compress/flask-compress-1.8.0.ebuild
index 9197bdc599fc..ca8fa5f18516 100644
--- a/dev-python/flask-compress/flask-compress-1.8.0.ebuild
+++ b/dev-python/flask-compress/flask-compress-1.8.0.ebuild
@@ -11,13 +11,13 @@ MY_PN="Flask-Compress"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Compress responses in your Flask app with gzip"
-HOMEPAGE="https://pypi.org/project/Flask-Compress"
+HOMEPAGE="https://pypi.org/project/Flask-Compress/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 RDEPEND="
 	app-arch/brotli[python,${PYTHON_USEDEP}]
diff --git a/dev-python/flask-compress/metadata.xml b/dev-python/flask-compress/metadata.xml
index 7a15dcf1edb8..99b352b321bc 100644
--- a/dev-python/flask-compress/metadata.xml
+++ b/dev-python/flask-compress/metadata.xml
@@ -11,6 +11,6 @@
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="pypi">Flask-Gravatar</remote-id>
+		<remote-id type="pypi">Flask-Compress</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/flask-cors/Manifest b/dev-python/flask-cors/Manifest
index 729c63023067..89e753876443 100644
--- a/dev-python/flask-cors/Manifest
+++ b/dev-python/flask-cors/Manifest
@@ -1,3 +1,3 @@
-DIST flask-cors-2.1.0.tar.gz 28038 BLAKE2B ecba951b0bac645088658ea5dc4947c0eaf9d0adb8f0f70e3a3f68337e008cb04a5efab3cb8139aaddf380f9b59c2524d33a5c5ac851b98446dadff9aa82fc92 SHA512 235162749485588e9112a52a833a43e68ad1737997628dc51cc30358d01837f427ba33872ecb1fff8e821b84c3de0a15a1c89c57f2407ef0cacafae9ca354640
-EBUILD flask-cors-2.1.0.ebuild 1697 BLAKE2B c1d7d414617e548225909389fabef7f00dde243aa9918117f1f96a2241c17b734b7471f83db098f28e693bb2ad6c7b18c958c8d5dc8214ad3b80d7ef1b0b663c SHA512 1934e08be5cba963a226b4d37e237bb1e3da8d184b69a36c51e0b5430f7be39168715557e1c960650feb02e6127d72099597e10523ae4e8fe064487e141e6f7c
+DIST flask-cors-3.0.9.tar.gz 29222 BLAKE2B 5c13218728c1741c455efedcf46af0b7e2c765e41ad256eb52413f06544d6d0d1d755ab336bc4a2a44627665b1252246073acfd201622604db825dbd7e2501ed SHA512 1b80b4dbc928e076c8c415f4514877c2e44e5b658b200178dc9a63b3342e46a7da62eba80d6703cdfd6ac74302aae2ff072531a587e7f04e5c1715d8b7592654
+EBUILD flask-cors-3.0.9.ebuild 805 BLAKE2B c1471251ec869a17ca175db36addf0f80c2d577a460bc48ae236908ce4924c6e49098c3915d55b4085300bc5f22e5ca716fb35b0b7007b9c95ecb26011118954 SHA512 af234fd526e2467e0ab5c46c0de177c8ae7c634c895c5b1f4ce4bb85a3dfb5010f58d218f76b06823b0da804b795a68d20dc112f51f113846fac0a31b88cd8b2
 MISC metadata.xml 514 BLAKE2B 255de178f7bce4d4b4678199a8edf799c2a07bd79c8c518bf28a056a2166169864c3e70315d80a09db14ac15a858cc759f5e401ac9808dc5d7d3f2b1c8495dde SHA512 d91e721a0f45e423cb947f5943d9d0615a17f84401c365584ef3eb2b157259f5bf978a10c90e690a52d49f4160c1991f9edfb26e74768686200149f50a15a443
diff --git a/dev-python/flask-cors/flask-cors-2.1.0.ebuild b/dev-python/flask-cors/flask-cors-2.1.0.ebuild
deleted file mode 100644
index 153d823f42cb..000000000000
--- a/dev-python/flask-cors/flask-cors-2.1.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-MY_PN="Flask-Cors"
-MY_P="${MY_PN}-${PV}"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-2
-	EGIT_REPO_URI="https://github.com/wcdolphin/${PN}.git"
-	SRC_URI=""
-else
-	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="A Flask extension for Cross Origin Resource Sharing (CORS)"
-HOMEPAGE="https://github.com/wcdolphin/flask-cors https://pypi.org/project/Flask-Cors/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		${RDEPEND}
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		>=dev-python/python-docs-2.7.6-r1:2.7
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	if use doc; then
-		local PYTHON_DOC_ATOM=$(best_version --host-root dev-python/python-docs:2.7)
-		local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}"
-		local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html"
-		local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv"
-		sed -i "s|'http://docs.python.org/': None|'${PYTHON_DOC}': '${PYTHON_DOC_INVENTORY}'|" docs/conf.py || die
-	fi
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/flask-cors/flask-cors-3.0.9.ebuild b/dev-python/flask-cors/flask-cors-3.0.9.ebuild
new file mode 100644
index 000000000000..08e262b9ddc4
--- /dev/null
+++ b/dev-python/flask-cors/flask-cors-3.0.9.ebuild
@@ -0,0 +1,32 @@
+# 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
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/wcdolphin/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/corydolphin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 x86"
+fi
+
+DESCRIPTION="A Flask extension for Cross Origin Resource Sharing (CORS)"
+HOMEPAGE="https://github.com/wcdolphin/flask-cors https://pypi.org/project/Flask-Cors/"
+
+LICENSE="MIT"
+SLOT="0"
+
+BDEPEND="test? ( dev-python/packaging[${PYTHON_USEDEP}] )"
+RDEPEND="
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests nose
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
diff --git a/dev-python/flask-gravatar/Manifest b/dev-python/flask-gravatar/Manifest
index efca00663547..947106e7758a 100644
--- a/dev-python/flask-gravatar/Manifest
+++ b/dev-python/flask-gravatar/Manifest
@@ -1,3 +1,3 @@
 DIST Flask-Gravatar-0.5.0.tar.gz 17299 BLAKE2B 7dc16c609cdfbf690a39fbb3bd2810398030bd5c7a54394468902dd131116509da8de448a55907e4738fc984ef422f3c7970b8453b27971eadb106cbb8648562 SHA512 bb4ff064489a030fd763a46fc045109104535474d115aaabdf5c4d1a82a1e3303ee34f590a3f1203a9d009307fc8c45c37af7c30e76a4fb10bc46dd684d37751
 EBUILD flask-gravatar-0.5.0.ebuild 822 BLAKE2B d24b2a1a305d569303885ff734681ff8d1d46556e188a6b5cda95197637d9e977c6c9723a8564df5b05a469fd9df9a1240347b7016a35acdd5bd4210ffa9f03f SHA512 34e4faa67034f67964743bec43283fb03f3b939edc3590883f895b04c215bab43ccd24a48614c2902941bfedd063a020efaf9955337b934c73177df25b3921a5
-MISC metadata.xml 431 BLAKE2B f3d71b4c8b86528458a7dbbefd527c9b32252338950f799ec315351454219dafed0b84e74e1e2443b48114a50c8bade0953648cd5ec441b2722fee4e63e5beb6 SHA512 d6cc23df1b882978c77421c21b2a00ea7bdc6781ebd283b00cefdff1efd79e6822025e63f2fc64d2268237f114a6e0f6b451487060d66bfa30295312518f6bbb
+MISC metadata.xml 494 BLAKE2B babf9c483c787ddd967da49777cb29bbd6290f6a5848c0c8208182d4fe66be8d6fe0dfc9a40ddaf2064a4af595babd8141ee4ed77bdb077abf4a66e102c51cdc SHA512 ba05679c44177bfd67425f16aae70af66a1fa89080978cc7ef3129f18d78e76feaf1af361dee642744a24430d10180399661b5b2e0ed1ca0567819ac44b2f625
diff --git a/dev-python/flask-gravatar/metadata.xml b/dev-python/flask-gravatar/metadata.xml
index 09014f03117e..8ecbf7deefaf 100644
--- a/dev-python/flask-gravatar/metadata.xml
+++ b/dev-python/flask-gravatar/metadata.xml
@@ -11,5 +11,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">Flask-Gravatar</remote-id>
+		<remote-id type="github">zzzsochi/Flask-Gravatar</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/flask-htmlmin/Manifest b/dev-python/flask-htmlmin/Manifest
index 43dde48c6d34..437e5558bc98 100644
--- a/dev-python/flask-htmlmin/Manifest
+++ b/dev-python/flask-htmlmin/Manifest
@@ -1,3 +1,3 @@
 DIST Flask-HTMLmin-2.0.2.gh.tar.gz 12178 BLAKE2B 38d21e06058728be9f6a23c8b18dd0f209833723d63bdf07262f37ff0fd6ac0de810bc164bfb6e91ed446e6402f93f204468f9c2307cf45c3a1609361be33992 SHA512 ea863644baecdf54d6b0a920ad0cbd84880e6c029a7d5313f0964f03233a74b7d11b3e15431ecf02fc6c33b38241e472968ed1bcad5b8163d14001678a4833e2
 EBUILD flask-htmlmin-2.0.2.ebuild 686 BLAKE2B df9c38bc4bf336ed71a7584d0d7f38548e18f5edeb3928c242ea9da22fcb996e7e6e4e204c3b81c7ca219a9df72b6fd9f650dfc2586bc77ebf0493fec36d4ebd SHA512 f454008f267fe67e78921a20405b3a5a9f370ea09acab3dca737446b36e707711544d583878056c7261ed8ad9f34a97cf1ca0f9cd90d192b784d76ce929e227a
-MISC metadata.xml 454 BLAKE2B 9edcbbc782ba0dfa1aaadc7ce793e1d3af60ee3ddd045a6fbbc0920f74599e4c251ea19b226de137a322d1c959af207b62c8f8886e7c533df1a0fb02bdd84e8c SHA512 775939a3cbdb3ac75c0996b25cef5cd8e8d2060eca521af4bad3d261455f0fa5566d83a6f9cf756ced03fe163df966d4ca9ba6a92e5872c8b4b6f1e29a6d59b3
+MISC metadata.xml 516 BLAKE2B cf0f7b9d8a2c71b61b3aaef427acf7f078ea346f03a6765232167739cb91de6f157d858837d3161522034b8d0d5e0c51f074f877c812a0a16b54eff1eb17de77 SHA512 5669f2c8f5acf049f91c8daae2595c1f35e46e337e8f285dcf3263905e3d5495d61db274b82b2ca554badda14b38874f6bea3d3bd267d873137743154f42a1fd
diff --git a/dev-python/flask-htmlmin/metadata.xml b/dev-python/flask-htmlmin/metadata.xml
index ab9923f6c014..8d354fc00558 100644
--- a/dev-python/flask-htmlmin/metadata.xml
+++ b/dev-python/flask-htmlmin/metadata.xml
@@ -12,5 +12,6 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">Flask-HTMLmin</remote-id>
+		<remote-id type="github">hamidfzm/Flask-HTMLmin</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/flask-paginate/Manifest b/dev-python/flask-paginate/Manifest
index 61be89b07590..9aa6878f6c71 100644
--- a/dev-python/flask-paginate/Manifest
+++ b/dev-python/flask-paginate/Manifest
@@ -1,3 +1,3 @@
 DIST flask-paginate-0.7.0.tar.gz 119358 BLAKE2B 24c1f3bc77853c9c96bb72d3364e73845f8fd0870606dd96b4261861430bef864a6830dd793f4f6e8a9371c89342dda88c5f976d79ff4a1bec7d687614b2014a SHA512 11c335c08c6a9c32999e5b8ba7a76c1fb04769e5ab679b550efc87497446edbaa1e3ccb62a4c238a0b5585f7ba4067e43f158ae123c3b118db84b90cb5d4f219
 EBUILD flask-paginate-0.7.0.ebuild 593 BLAKE2B 7e551a8ff2f03e99fbbff323cbca30bdce156bd6d666830c4bf38f409764509247669c57a288f983c3bf99e6dcf52a8dc76c88539711601590ea1cd1d126aa9f SHA512 609ecb95be51e187515d3a0122c0f3c37a120b5e83b2bd70f215d12e9c3c3e7c16a88bccab02d1f1cac546e2df883da6b05dc669b2502a651b6e052afd903e0e
-MISC metadata.xml 618 BLAKE2B f9feebe27aa247c8458d416154475e0c0234e2ab391d6b9dcf06016c01cebd3d7078efde6079646ff3a8b718911cec1d0699bb5cb4eb2a319b14752718f8fdb5 SHA512 9f6ff105f8b01580628888ecba7a9175e42618ef17e96a90dce15f08335b5dbc76a6b09cbabfd9a7fb659557e04531e4fb46ec3856418d96e18cff5da7a61cba
+MISC metadata.xml 604 BLAKE2B 253ae99a88375087c344a86b3bd816cc19b93c2fc0773698d79a6741e74d0086db26b2bc7898952ba8e67ec50a309f891d6bf23249660d9089454374bf2f77cf SHA512 c8162631e94b4c169580d0436b7ec18018d217ef3bbdfcf869407467c254fbdee5862de20c7048e6074082f2f1bc95a0d420c9333b15c0e4f4b226ad6a2af88c
diff --git a/dev-python/flask-paginate/metadata.xml b/dev-python/flask-paginate/metadata.xml
index 35a30be0a275..e0b79d552b46 100644
--- a/dev-python/flask-paginate/metadata.xml
+++ b/dev-python/flask-paginate/metadata.xml
@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="project">
-        <email>proxy-maint@gentoo.org</email>
-        <name>Proxy Maintainers</name>
-    </maintainer>
-    <maintainer type="person">
-        <email>davidroman96@gmail.com</email>
-        <name>David Roman</name>
-    </maintainer>
-    <maintainer type="project">
-        <email>python@gentoo.org</email>
-        <name>Python</name>
-    </maintainer>
-    <upstream>
-        <remote-id type="github">lixxu/flask-paginate</remote-id>
-    </upstream>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>davidroman96@gmail.com</email>
+		<name>David Roman</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">lixxu/flask-paginate</remote-id>
+		<remote-id type="pypi">flask-paginate</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/flask-paranoid/Manifest b/dev-python/flask-paranoid/Manifest
index 4eea000d85e6..d39afeb04d45 100644
--- a/dev-python/flask-paranoid/Manifest
+++ b/dev-python/flask-paranoid/Manifest
@@ -1,3 +1,3 @@
 DIST flask-paranoid-0.2.0.tar.gz 101084 BLAKE2B 5f1f92679da5f374699c8acc97300085840d47e57f48d935cba60e78782109f70651bb7f804410dbb241b48c96ec08498b8b2cc8c18573f14d0bc7972b746d19 SHA512 0d642999fa4d5b795c3dcecc586fc1600cdfceec4adb38bb87ca8be9825d9ddafabb07d98df573a89e61a44a0abd27cbbd21524237b0e23b337a7d5e32ddfdae
 EBUILD flask-paranoid-0.2.0-r1.ebuild 663 BLAKE2B c951d817d987ed52dce3ecff23f5cd3e79028a253d7b4577c3d559e7c074a0aaab9a44f84457b64e724a55ad21cb4883febf75e172b89b9332cc05497ba688c4 SHA512 0bb178f66d7a3a99e407018d92bb7e11590a1639e14336c73ab0c6fa6830094bb653f8c686be7ee45c35257e200cea9e98cb5083d6cd1db59c83c536aef41ac2
-MISC metadata.xml 431 BLAKE2B a011627716653140fc147c2bc05f1c949b71225fd5d83b389371bdbf51e1fea614dbec9269b95dffca914c6e952e712d400f3d63ad38a8c4debd994194080cd4 SHA512 52469023be87cd14845fffb7290a1c0fbf087bd60759fe87ae2ead185664f7006d899494f1c0d6c29dce49900cffa27526241fa9ac715efe27d23e0bd5dbf415
+MISC metadata.xml 500 BLAKE2B 9aeb4cb6b72002532ebe80baf4389bd147cba9cc10d9a864fff06cf5d079442d78611e5e3f0adfdd19721d7af5d49d7eec8a5a5c056467583eacc6ae5696dab6 SHA512 d35f9d66da00579cfe4ab0adaecc46d0644a1f691722922db5dd7a387e879fb0bcfc54e9bbf7b88c1ad39239214902eab55992b3dbc63aa350bfe5d4a22215bf
diff --git a/dev-python/flask-paranoid/metadata.xml b/dev-python/flask-paranoid/metadata.xml
index 9b4a931e5d0c..c80422b6af14 100644
--- a/dev-python/flask-paranoid/metadata.xml
+++ b/dev-python/flask-paranoid/metadata.xml
@@ -11,5 +11,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">Flask-Paranoid</remote-id>
+		<remote-id type="github">miguelgrinberg/flask-paranoid</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/flask-restful/Manifest b/dev-python/flask-restful/Manifest
index 9fa45a3dbdb2..6dd1d4777012 100644
--- a/dev-python/flask-restful/Manifest
+++ b/dev-python/flask-restful/Manifest
@@ -1,4 +1,4 @@
 AUX flask-restful-0.3.8-werkzeug.patch 1517 BLAKE2B fa895690ca771f1b4431c62baec0577554fca082418c2421eb8012be2e234699eab54f2690d237dbd490f536eae5fe0fdfd8fedad16fc60bd92351f66c93a7a4 SHA512 96db20a0850f37ebb90fad0964448783c3af8b9b8128709fc52d509f9b1edad72455330a09f81b4b766eea7b88f3b79fb01e112f1684be7776a8b3a78ab90a19
 DIST flask-restful-0.3.8.tar.gz 114588 BLAKE2B a18eac613300102bb5a5ca78cea1e6f81f3de21d8bd2e6c72f2f1a559e8b4228175cc7d372b68f131267cd8bc759e354e5782e527d1e992579210348cd2b78dd SHA512 15172114fcedc2f4286cf5f583d95e42c8c8ce6553f9a44e57124f2b1417bf9f094dcb5154a6933ebebc8022f39d4d7969d29d38576111f9d5b45f630b36a66c
-EBUILD flask-restful-0.3.8.ebuild 987 BLAKE2B 620c70d1318b4e55da6bfaf171b51055c2d2df5d2099ee6a1fead872cfacbb9a00698a04377bea80db7bc4b92a488ace537b5536f6054394cc638543b0ffa91a SHA512 14d732daf0ce2119811b30e1dfacc0e4bb65f78759bd325eea30a692793c29932674aaccdabbf13cf4774f8474a4d7d658d539a67e3ae4675fe2c9142f6075e1
-MISC metadata.xml 349 BLAKE2B ca6c5de3fcfddca1b3e6766ffa3dc82294b24cc533842dfc31d05a64f6b3949ac928e72d9e9d53493f2fa8e0b79875196a7c37e13e82df3a965a44572854bd9f SHA512 f2fd44852255396e94d2e1c61b1f47a7e87d51cbe7d5a3f0451020daacb69cf4f5de6620d092470537f3693d9dd816d597c4ecd8fb80bfb9e7a71d9bb49c4a9f
+EBUILD flask-restful-0.3.8.ebuild 1004 BLAKE2B 9ce816964f8da7eba5d3b7c47c6b9a55df7a53ea817b548f47345e12601c13d9b243cf1c266e5115d7732cca1515be95a04753f7e972ccd6592b2d905d901cb6 SHA512 bff4bb81dda4eaab26d4298605ee426eff053d2bcb246d018154c4192a02706e8f1827969d51b20e50a37a1597350253a0c20729947218c5a6eed2d090953e50
+MISC metadata.xml 407 BLAKE2B 32075e72b358faf256d1f2b0a650eb7b1d966dcb4376a4394933545b0b96d77d633bdcd8cdc6db044c825fdc237b9b4674d38d3d90027f9cb758325121dcba6d SHA512 2b7f74ec3648a92e7740b22a8ee5f367d61553d37fbc854a90cf2774a383e1fdc3382217c7811d21f8a0a98dd363ebefd873a8a8286cbb8e0f781382584ddda5
diff --git a/dev-python/flask-restful/flask-restful-0.3.8.ebuild b/dev-python/flask-restful/flask-restful-0.3.8.ebuild
index f991e3e9ba38..e5302ef6d2c2 100644
--- a/dev-python/flask-restful/flask-restful-0.3.8.ebuild
+++ b/dev-python/flask-restful/flask-restful-0.3.8.ebuild
@@ -7,8 +7,10 @@ PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="Simple framework for creating REST APIs"
-HOMEPAGE="https://flask-restful.readthedocs.io/en/latest/ https://github.com/twilio/flask-restful/"
-SRC_URI="https://github.com/twilio/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="
+	https://flask-restful.readthedocs.io/en/latest/
+	https://github.com/flask-restful/flask-restful/"
+SRC_URI="https://github.com/flask-restful/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/flask-restful/metadata.xml b/dev-python/flask-restful/metadata.xml
index ee91a7f4854b..a1a006d5411b 100644
--- a/dev-python/flask-restful/metadata.xml
+++ b/dev-python/flask-restful/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="github">twilio/flask-restful</remote-id>
+		<remote-id type="github">flask-restful/flask-restful</remote-id>
+		<remote-id type="pypi">Flask-RESTful</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/flask-security/Manifest b/dev-python/flask-security/Manifest
index bd0b436131dd..b0a942270695 100644
--- a/dev-python/flask-security/Manifest
+++ b/dev-python/flask-security/Manifest
@@ -1,4 +1,4 @@
 AUX flask-security-3.4.3-optional-deps.patch 2287 BLAKE2B 5cd174499a3fc22e0888850332ccd0798927a3127d6b84b19dae2ae1cbb8c998b6e8e5246a76eb84712d932f80c77316201834ee048c05c2de6e190bf9aafed6 SHA512 08b0ebfadbf126d1c4dfbc51d222f5da797c40bafc11c923eb2a98c3f65778f2f5400e0ced37c5fc6318a7941dd036ae780dbc958980620bd075f0212c0ea49d
 DIST flask-security-3.4.4.gh.tar.gz 348525 BLAKE2B 77a851c2549be9ce8612e3b186ad2d83d272b277f286885da491f3f0fe99e8836d145749ae137f1e75625c34b2214270ba4d24f1bfaa514012064dd38f083230 SHA512 1c1a4f079199704d7a2a4e11351cd199e3a790f5d0c7f68b240c299e83b129227fac4ca00caf45401efbf14520c1d65d3b710b85e8f53b495283b94a164f97a2
 EBUILD flask-security-3.4.4.ebuild 2142 BLAKE2B ec9d9aba810b228ac39c65b151b6d89ad15f0749b2908fbde50cc4af7f5ab9fd41d000c9e93cfeb8e4f840757d26f70bc30ae19015a955602ae1df9e9ffa0ece SHA512 074acb81070b082e9bc7f31f316da2c0461688a6cbfef7bf3b16577f6582ccd6ac0322fee00ca3cffea4ee812bdb25feacf4113bdb708b09fc86503632aa952e
-MISC metadata.xml 341 BLAKE2B e33881ccf51b30de5fa6831f144035f0e895f2e1720ef7ca9360a1196b7d6c587f736d4d868afbdbd6678ea020f41164a41c0ab99069bdddd253b7e5b9d80d04 SHA512 ec87dffdadc946be52ca0a12d9265250f5a0e08e833c0cbd6deda1e8eb70354c2fea0bdfcdbe86fc16072138972881112cc5a5b08f4179b85f89695b5b22f30d
+MISC metadata.xml 416 BLAKE2B 1da613b370aed838bdfe6ffaa616c80aca54cab6030680212db38c0bf1ff783d24db11d8dd2056843621668b25ccba850b2c3d6d62b378ade78f88b263c5573d SHA512 3ab74e9f590c343323fd3d9438bf2a487b77019eeb986e4a0f461c991a00075a70246812cde79f27a337c6ba385e162148a4382063888ff7f2fcf8405bf9573a
diff --git a/dev-python/flask-security/metadata.xml b/dev-python/flask-security/metadata.xml
index bd009040dd29..1ce44ccf1cd0 100644
--- a/dev-python/flask-security/metadata.xml
+++ b/dev-python/flask-security/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="pypi">Flask-Security</remote-id>
+		<remote-id type="pypi">Flask-Security-Too</remote-id>
+		<remote-id type="github">Flask-Middleware/flask-security</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/flask/Manifest b/dev-python/flask/Manifest
index 6250460c6922..da03a401ee06 100644
--- a/dev-python/flask/Manifest
+++ b/dev-python/flask/Manifest
@@ -1,4 +1,4 @@
 DIST Flask-1.1.2.tar.gz 637516 BLAKE2B 90dffbb8faa48489d1c71ff2a064d41e97d2103c07532fd5b252dbe0b32e4babb815e31f0ceae201a66cead645b68149d13d4bb39a0df1b27b4002e613920493 SHA512 9feb6a9a8f34fadbea508d465f73c24b1d81b3f66243804dc3904d198c2fd78e2e1bef94df6a4940a7eec6b9b54abea06557a87de8b27b0a9497d18b3e071384
 EBUILD flask-1.1.2-r1.ebuild 1338 BLAKE2B e89b99344478ead8b68c72944fa1fc9f540124478cddfaf0249c5abca486cf7294d859a05b11b9ec907be5b9c377a06ca64aae23c1c9300660bc35e0bf8e7e77 SHA512 676f300d5b22098c7904f8aa36d06e3d7fcfe4ad127f5cee4cd983a2000bb6f3b866f7fd5279b03e16c62817bc2f7d4866723c417fe9a14d23e9e8c737a76a89
 EBUILD flask-9999.ebuild 1296 BLAKE2B 91a4a57d017a9b898be3999456cb017564aed62c1dd0ec0eb44f9b1d6782fe94417b4130bd175c3e16927b6cd5699c71860dde9afd58446dddce28305dbd3da3 SHA512 ef2e1d1126f0be3df197913a356a698448cb38e0ab9c179c867f2a1c81fcbfede1af8f938156c5778c1273aa619c0c9d77abfb5e264b5fd90816be25799fa2d6
-MISC metadata.xml 387 BLAKE2B 32096cb4f4a2e7b3e484224a6253f7f0ee52d73b9419c8ea3f76aca7d782408fdf2917ef1797057b32d1dffb17522d23cc26011fdde938d9a47046d0e9794769 SHA512 f70179503fe0651fe6ff288731f10821cce3b19d020c3817db2f6d846f66d5f013f52c168d75e3fec8070b19bdbd9c3b08670d56d8aa6158ba3547a70ae39b84
+MISC metadata.xml 385 BLAKE2B 0aa1fc56ae29e91457344d7ca4f8a26506d46d22b71ac7363fb443ba7fbcad7974f86b898dd7b2e4cc2bbbc5d58fe1a1904a077e5c7b959ba2e1761f1561769f SHA512 223a1a9459b462c6dfbfc2fa0d6932e1f9457e86eb9a70e96c5182a3b4f898a121aa13dc9425811b8fcabc6dca8ba1d715e5aa221453e235a5b5ee2c25cc02fc
diff --git a/dev-python/flask/metadata.xml b/dev-python/flask/metadata.xml
index 5226bafc3906..47e65a882e09 100644
--- a/dev-python/flask/metadata.xml
+++ b/dev-python/flask/metadata.xml
@@ -8,6 +8,6 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">Flask</remote-id>
-		<remote-id type="github">mitsuhiko/flask</remote-id>
+		<remote-id type="github">pallets/flask</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/flatbuffers/Manifest b/dev-python/flatbuffers/Manifest
index 1b75c5aae9ef..9533898e60d1 100644
--- a/dev-python/flatbuffers/Manifest
+++ b/dev-python/flatbuffers/Manifest
@@ -1,3 +1,3 @@
 DIST flatbuffers-1.12.tar.gz 11286 BLAKE2B 9286d9d53bfca515ff01d329decc61201b8bc6231db8700d920530b21b8a213769f4c092ea4af901168ff31f57641f46853cd9d52a6a90398ec8b6ec67b7fb0b SHA512 d7059508908c6bc7f421d04c0f8dbc9884015009b3601822489119853d851f2bf3aab941a96d19b354edf3c9c377625d0faf7b92f7a63a6d597e6ceac4abcf2d
 EBUILD flatbuffers-1.12.ebuild 431 BLAKE2B be469b95f862114bbad4f587fbe938ff746b13f08d36775df4db6881748c3585e9ceba1829cdfcd9c679df934a34afe25bcb27572056987f261d043c1b4cc6f3 SHA512 6a5424d66e728f4589bd05670b400abe2eb93bbc34e5366d811e99b4c6f18dc806e32cbc9bdd28e6bb9e966840f59a811ac9c263603b1498eed70d2d0b15ed42
-MISC metadata.xml 341 BLAKE2B 977ad4559ebb4cc73818553b4a725b63516d5522e170726818c01800a692729394c399bff12ce4e1e9859ac577b3b47673901f76e1a8c431b59e9a2f51461a59 SHA512 bfb03828d98e2316bc1614f2491ccfcfd5f1f3a858397b40755b64c6f550391061fba3933fcf28f11f881145f90754a7d5d28396a574c8a16c2040deaf364de0
+MISC metadata.xml 377 BLAKE2B a3d580401afb572f52cca7ea6e3fc35f55c58cf59e07918c0faaa54f63e6948e873b3e852bcb682c0c0034b2d878cd1afcecdeb1dcc556d715c32b19536a0432 SHA512 c6aba7e15ba6ddecca26a56b4a7507a097cf2e45b26eb71069abb8d86a560fd1719292fe32ea9314a57aaa49f9c92f446c9abd27cb1b947b3a8104d193ef9d0b
diff --git a/dev-python/flatbuffers/metadata.xml b/dev-python/flatbuffers/metadata.xml
index 9b133105c87f..fc134ec05d45 100644
--- a/dev-python/flatbuffers/metadata.xml
+++ b/dev-python/flatbuffers/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
-        <email>dolsen@gentoo.org</email>
-        <name>Brian Dolbec</name>
-    </maintainer>
-  <upstream>
-    <remote-id type="pypi">flatbuffers</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>dolsen@gentoo.org</email>
+		<name>Brian Dolbec</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">flatbuffers</remote-id>
+		<remote-id type="github">google/flatbuffers</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/fleep/Manifest b/dev-python/fleep/Manifest
index ae65eb80b47d..fab4ac1edec1 100644
--- a/dev-python/fleep/Manifest
+++ b/dev-python/fleep/Manifest
@@ -1,4 +1,4 @@
 DIST fleep-1.0.1.tar.gz 6547 BLAKE2B 75ede77464e32404b3e1229adc9484d1d44b33323ed18f4be5275ffd1c8f63863459f46ff9cbf4f90d0e1387c0e5c967cce13ac8f6ce65710709dd227c04df89 SHA512 ba56f3a6c99f4c793e9f5c4ec04f7a96effabeadd92b18aeb7689a75d8504ccfca086db635d33e358ea9f67887e904c141e259ce2e9b9f3ea77f9e24c1b0eb27
-EBUILD fleep-1.0.1.ebuild 502 BLAKE2B 327699b975965519ac0deeaa68f49bb3bf0ac26382be8f54e340b28275395574258f44ca392b517140b739a76d842d82618dec3cdc24788f8bc11071beb8457b SHA512 396492cfc0df32ba3d55dffdf056064f03052785c3c7f597c05c13ef09a13f71dc94fa00c42d6a733297785fd95adc342c1f1b44a118c43e63a6df9028b1d9f4
-EBUILD fleep-9999.ebuild 502 BLAKE2B 327699b975965519ac0deeaa68f49bb3bf0ac26382be8f54e340b28275395574258f44ca392b517140b739a76d842d82618dec3cdc24788f8bc11071beb8457b SHA512 396492cfc0df32ba3d55dffdf056064f03052785c3c7f597c05c13ef09a13f71dc94fa00c42d6a733297785fd95adc342c1f1b44a118c43e63a6df9028b1d9f4
-MISC metadata.xml 326 BLAKE2B 165baf53562230ca992f549f9eb81ba297244f399f1c76356ac7b1e7afc0ff979a3bf923c43ce3f85f8ef01599ff6a7a1134758e4aa3052451024bdcf748982a SHA512 47fa850b90008ba48db395a4cee9b150da6d201b829f3507d39577e4f2d3296beeabf3515557b7816bad6c23c75c8e395fc00e62dfb3e6b27dc172d94eddfbbb
+EBUILD fleep-1.0.1.ebuild 502 BLAKE2B 7f0da9c6a7cbad2640fa1f1cc36ec0131b3890f6fab205c1650d84d009f2f792390b5f01dae9e841a6638304c86792372c9f794bc600efec39fcc96855b175a7 SHA512 c4c6fdc97e7bbebcebbef9d0c54f769f581f0525dbf033d937f5b9c65e0f1564a585ab3155945b2a89e287dc83149449be6485008990a70e177ec5fbd1ee8dcf
+EBUILD fleep-9999.ebuild 502 BLAKE2B 7f0da9c6a7cbad2640fa1f1cc36ec0131b3890f6fab205c1650d84d009f2f792390b5f01dae9e841a6638304c86792372c9f794bc600efec39fcc96855b175a7 SHA512 c4c6fdc97e7bbebcebbef9d0c54f769f581f0525dbf033d937f5b9c65e0f1564a585ab3155945b2a89e287dc83149449be6485008990a70e177ec5fbd1ee8dcf
+MISC metadata.xml 394 BLAKE2B b7e3b83459800ddcbd5853411afa08493933b4acf4f9795935fb34e42285d60b75caef1eb6860c15306f9a24421f516da6578518de94d0e4e7c7f3fc0529fc87 SHA512 98e150c1ce256678540131c057c1ce822cbed783a81ac09b7c0230a25f3cb214d2a7f44dd1497d2cef312f000e5114d5171105792807cb789a49d72386c40841
diff --git a/dev-python/fleep/fleep-1.0.1.ebuild b/dev-python/fleep/fleep-1.0.1.ebuild
index 41bf60a740cd..97acb64e66ec 100644
--- a/dev-python/fleep/fleep-1.0.1.ebuild
+++ b/dev-python/fleep/fleep-1.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6..7} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/fleep/fleep-9999.ebuild b/dev-python/fleep/fleep-9999.ebuild
index 41bf60a740cd..97acb64e66ec 100644
--- a/dev-python/fleep/fleep-9999.ebuild
+++ b/dev-python/fleep/fleep-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6..7} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/fleep/metadata.xml b/dev-python/fleep/metadata.xml
index c8ab1000c5be..9e666fde3716 100644
--- a/dev-python/fleep/metadata.xml
+++ b/dev-python/fleep/metadata.xml
@@ -8,4 +8,7 @@
 		<email>zerochaos@gentoo.org</email>
 		<name>Rick Farina</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">fleep</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/flufl-bounce/Manifest b/dev-python/flufl-bounce/Manifest
index a8dc28ec6a8f..4c2338d96a51 100644
--- a/dev-python/flufl-bounce/Manifest
+++ b/dev-python/flufl-bounce/Manifest
@@ -1,3 +1,3 @@
 DIST flufl-bounce-3.0.1.tar.gz 100217 BLAKE2B d5620d73513a7e5bbfffb212f13bba34ce199a129a217873a8237d8456a7a1854d78cb9b06e4ee763d4dcfdcfdc185e0d67eb3be82ad829c054baced8acfc25c SHA512 9a8d0dec98f8699fd3dff62f5dd831ab5754f11d246b750cfed8ae7ebb771c3c7c1abd4fcceb0f8aa052653802c6e6e5a7bd4711e63b9095ede238817a3cd146
 EBUILD flufl-bounce-3.0.1.ebuild 597 BLAKE2B 5d474cf18a69fe51be6c1d9f13102deacdb20221f09bc89ebafeb455d24003dd6eddb7af2b0a11235112c234d981273b2f8c16beea2a0b84cf180409797bd214 SHA512 681dde2fb9ee19bd60285bb1baa17f4958f572cc5f9f0d065379dbf29db8bb51263ebb77b7587122adb3ea6b33aa5afb5be132c2a6f3e6ccbd88e094e04d1f96
-MISC metadata.xml 333 BLAKE2B 1a681ac99aee289a919b530bb87037df6fe53b044ce14ce3a9da3cec54a73d7fde58cf01f12678f18397d16b56c9e5bf88d289ddec4469e343d7193502124124 SHA512 a73512d246562e6591eb9c8d13759352cede7f0ae978d02c87bd72b1fe2c9b155cc3908e8489b136387bada61f1257d8e0771e01e26d998b51f9ce13c087ec41
+MISC metadata.xml 408 BLAKE2B 86b95efa86d25f2fdfa4a15280f59b4954a4acc27797c515e3405ff2a919f1f8dcf14eecd599cc9905cf8c006d750da25a857ba62ea38073a58ff1f0804bb4fd SHA512 a21333b02911e94fd2728b0d6235f9af81e4ec258a20ee5d5f09c88364fc08bfc1f5e99a5ae40cb01bb3f19047bba958dffa46543fe93ce9b8c0c588b880be67
diff --git a/dev-python/flufl-bounce/metadata.xml b/dev-python/flufl-bounce/metadata.xml
index 3ee70120def4..dc01cb742b0d 100644
--- a/dev-python/flufl-bounce/metadata.xml
+++ b/dev-python/flufl-bounce/metadata.xml
@@ -8,4 +8,7 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">flufl.bounce</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/flufl-i18n/Manifest b/dev-python/flufl-i18n/Manifest
index 794544323fc8..45d5364ed118 100644
--- a/dev-python/flufl-i18n/Manifest
+++ b/dev-python/flufl-i18n/Manifest
@@ -1,3 +1,3 @@
 DIST flufl-i18n-2.0.2.tar.gz 19106 BLAKE2B 407f69708234e4c24403733c752ed79dfc0ff7d269a325c2d599ac00a0de077dfe63078fd050556f683008296885f397a59ea42b6d0692549856535166e63805 SHA512 05d9283bed456ee8d48704dc595f514e13b0c74096df177ed49bf178987baeee014ddc4331cc7d36edffbee1dcb58fcae152c2cb317b7ce73d9630864b98f1cd
 EBUILD flufl-i18n-2.0.2.ebuild 571 BLAKE2B 9b3fe508227500864b71e65dbf3bdeef698de3aee9d074830f4210c0b9c2b6799225a9f9cf101144d81ae61cf82f77af0882ff7e7d7a3218668fbf60fa7f9abf SHA512 a725fe23bcb845f49f4dae6ec5a96a3e30ad2c6285261e672e30af92676a38b308eec4221c0d16b106e8af519c1fc25de4ddff1ad63a464376bfc8ad7777b08e
-MISC metadata.xml 333 BLAKE2B 1a681ac99aee289a919b530bb87037df6fe53b044ce14ce3a9da3cec54a73d7fde58cf01f12678f18397d16b56c9e5bf88d289ddec4469e343d7193502124124 SHA512 a73512d246562e6591eb9c8d13759352cede7f0ae978d02c87bd72b1fe2c9b155cc3908e8489b136387bada61f1257d8e0771e01e26d998b51f9ce13c087ec41
+MISC metadata.xml 406 BLAKE2B f6f83f2aab363940a49aeaf94e1c6071c03ffc43f0d055d495a46c58340f2bd7d7adaefb20a78c27ed5692f28c08503755a80c77a76259f05697ca154ea401ea SHA512 7b1c0ea21d0af33b9adf005343a9c00a98a14df62afc734456dbbe2346dfb9e4cee5c78037e9de08f5d0297f9fb78f2855e4994d631da546688bdc41eedcd4bf
diff --git a/dev-python/flufl-i18n/metadata.xml b/dev-python/flufl-i18n/metadata.xml
index 3ee70120def4..043b994e6a22 100644
--- a/dev-python/flufl-i18n/metadata.xml
+++ b/dev-python/flufl-i18n/metadata.xml
@@ -8,4 +8,7 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">flufl.i18n</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/flufl-lock/Manifest b/dev-python/flufl-lock/Manifest
index 620a4728928a..96260be2245e 100644
--- a/dev-python/flufl-lock/Manifest
+++ b/dev-python/flufl-lock/Manifest
@@ -1,4 +1,4 @@
 AUX flufl-lock-dontinstalltests.diff 554 BLAKE2B 4440739b038f1a73e035555028152c14ceca39ad42ddbd5457c839c154d12160fbd6d3da1c4f0e24977b9f2d0f117fd031e2f65599198172a61ea0f19a39b84e SHA512 e0a918f69563e5573fb245736ebf7557ad98e917cf9cac51d331fa7265a6a46f3b9b1fee0f14f66d0d8ffb8d4e5b57cbc4271f3b95362ce0029e36046138b578
 DIST flufl-lock-5.0.1.tar.gz 27788 BLAKE2B 2651898e881719f24bc61e14f697877ca39f2747fadf52de1a5fc917b26e23001df5f0a4ea2e48271da69198e1a1336e69cc0167a4f46fddd21f464b355fa4ca SHA512 f937fb6c7f7bef2b85674225f83f3162f34db3fe2df3d9a896f772c4489c3e0611361e3d1d9efda7727112d780f31022d3045d3a3b8e78e9412aca2f2418ca24
 EBUILD flufl-lock-5.0.1.ebuild 820 BLAKE2B c8e28bcccbb13b75000f16c00ddb0b4c77da2c2c75fdc731bbbc5bb3562d7fe1dfdd38d539b03fa6bee3139ed91c597827b183b7ed1a2482d7d42aaa89b293c4 SHA512 bdd9e3c75e563e67063692d629cdc9d0c05eec760ca9e74f51f20a96df5b14bedacedead8fa4f4a0534d90f09feca1a8367ec15ad46e9db45a079dac9de5bf6a
-MISC metadata.xml 333 BLAKE2B 1a681ac99aee289a919b530bb87037df6fe53b044ce14ce3a9da3cec54a73d7fde58cf01f12678f18397d16b56c9e5bf88d289ddec4469e343d7193502124124 SHA512 a73512d246562e6591eb9c8d13759352cede7f0ae978d02c87bd72b1fe2c9b155cc3908e8489b136387bada61f1257d8e0771e01e26d998b51f9ce13c087ec41
+MISC metadata.xml 406 BLAKE2B 292a253230d4c718cf487d4ef1d760ba4e4910af7742462e99263a28f74b8a83bd12832502c918f2630a3e8afe2a9eed348f0532535253610cebea49979c83f7 SHA512 5e3d8954a932195a7cde168d5d86eec59babe5214af33da08805f1c2cb463d4369d14d7ca59bc8e3247281a556863236eccc4e317833fb560c5ae7dee84596dd
diff --git a/dev-python/flufl-lock/metadata.xml b/dev-python/flufl-lock/metadata.xml
index 3ee70120def4..24259133e15d 100644
--- a/dev-python/flufl-lock/metadata.xml
+++ b/dev-python/flufl-lock/metadata.xml
@@ -8,4 +8,7 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">flufl.lock</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index 751fbc86f26b..8c8468e0688f 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -1,3 +1,5 @@
 DIST fonttools-4.1.0.tar.gz 2253792 BLAKE2B 470207d74404851aa111142ad8541d45820ded0212029867c289f2e7741d4b41b4ac824f65555a23d4f3dcc974428537cd319a8787bc4d80f2fb67561a21d1ee SHA512 3d9485cd34b5ea3dfdcc26474e0b21a96811b84eda16341c39165aea72bb09c3cf3360a069b316ae6575a399e26f6518c199180caec7bb959f245ced7ca45e3b
-EBUILD fonttools-4.1.0.ebuild 1338 BLAKE2B 8edd03ef799bed4f83fd76d2df8a926efd2671a44ac339fb714917bfdfb44bdc92989d5b8bdb90d7be0e5720de4d2ce7e2597bcda89bff71cdbd99d363872654 SHA512 e31487f501e901aeceb1bab1db9b672cf112e79e0158065ec81a3661cdab5450345179a0563e68aa423b9ec1930a4523dd9c3383ee8b0c6730fe6e3ba59e372f
-MISC metadata.xml 447 BLAKE2B 7dcb994a336f5f5f918ab6fb2f1c3132fa888bc95c99b34995066f5d798992928234aa3d232bcca533e9741e9cd801d3ec4074859eebe5b3576938c45335b780 SHA512 efa90bcc7d9966f5b0509c3e125a6bca894e261a86a094d6538c2fbe20be54bfef4d0a55e9e7aa954bb619af9c62714f15b8f4a4a686291ccdf06351c8cab7a7
+DIST fonttools-4.18.1.tar.gz 2498166 BLAKE2B 9ea9fd372c71883e37756c9b0b5bcd193782d49a99df37e7245f788362b284af8e5b9456c31b1c6b84fb6cccd8bce0339e95c87cecc008f0130e47a40c74bfe5 SHA512 d87c466e87ffa70bb15ee40f889b25e1187d51a1074b6e47a259d5984d51d7ce988ef50db91796fcbd06b5692b2c627d0a4cd76e3be6d0da348c0872ff01317c
+EBUILD fonttools-4.1.0.ebuild 1356 BLAKE2B b062425fc7bc10c18c3c44e0d29c946f0ddda6e24d4345429039c60323e9b9501f192894eebdc8aae1d39c195bd34e8717e9e8fd9716c8cbc0817c697bd2f5a7 SHA512 317ba31531366edbfe474592594dd8c9dbaf19dda856f90dd3e37f4a5fcec214e6a2197a85193ffd962967aeca32dc675785632d927f170ac03c83851fd63e27
+EBUILD fonttools-4.18.1.ebuild 1392 BLAKE2B 740f06cc15d4902bb0ddf431911eb2940a98b6c395cac21f9863670d43f4f9ac82fcd9ec473542ee773b1abc7a71f5e51497a8f9e68b17adec8b62d130312ded SHA512 2b6c51fd2aab0c4099359a6c621f18fe0fafdcaf35de9e933c0985d63a8295f5d768f854bb39cde3f25ee4379160816ca7d7cd3551cc43ba6a8ffdc8e239a6cf
+MISC metadata.xml 494 BLAKE2B 2bc2e69cfab3a180d7098efccd9059c14e8eaf75fe29d26272952a7e65a383ae060444f64892cc3b2c185405d59c2cfea5f7fc2e3dbdb68bebf6568cbc4770b7 SHA512 cf381a45630a10358adc449689ce496da052a18e5257c3426c8e52f333a90f254278c2cf9a18770fe08fc7d60b5b50c48fc77bb3b36bf73fba282a3eb8ad5e71
diff --git a/dev-python/fonttools/fonttools-4.1.0.ebuild b/dev-python/fonttools/fonttools-4.1.0.ebuild
index f15fbef58011..ab2adaed22e2 100644
--- a/dev-python/fonttools/fonttools-4.1.0.ebuild
+++ b/dev-python/fonttools/fonttools-4.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 RESTRICT="!test? ( test )"
 IUSE="test"
 
diff --git a/dev-python/fonttools/fonttools-4.18.1.ebuild b/dev-python/fonttools/fonttools-4.18.1.ebuild
new file mode 100644
index 000000000000..c1277db3ff69
--- /dev/null
+++ b/dev-python/fonttools/fonttools-4.18.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_REQ_USE="xml(+)"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
+HOMEPAGE="https://github.com/fonttools/fonttools/"
+SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+RESTRICT="!test? ( test )"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+
+		>=dev-python/fs-2.4.9[${PYTHON_USEDEP}]
+		app-arch/brotli[python,${PYTHON_USEDEP}]
+		app-arch/zopfli
+	)"
+
+python_prepare_all() {
+	# When dev-python/pytest-shutil is installed, we get weird import errors.
+	# This is due to incomplete nesting in the Tests/ tree:
+	#
+	#   Tests/feaLib/__init__.py
+	#   Tests/ufoLib/__init__.py
+	#   Tests/svgLib/path/__init__.py
+	#   Tests/otlLib/__init__.py
+	#   Tests/varLib/__init__.py
+	#
+	# This tree requires an __init__.py in Tests/svgLib/ too, bug #701148.
+	touch Tests/svgLib/__init__.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# virtualx used when matplotlib is installed causing plot module tests to run
+	virtx pytest -vv Tests fontTools
+}
diff --git a/dev-python/fonttools/metadata.xml b/dev-python/fonttools/metadata.xml
index c5af3a50bbc8..2abce01d1b35 100644
--- a/dev-python/fonttools/metadata.xml
+++ b/dev-python/fonttools/metadata.xml
@@ -12,5 +12,6 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">fonttools/fonttools</remote-id>
+		<remote-id type="pypi">fonttools</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/freezegun/Manifest b/dev-python/freezegun/Manifest
index 44877261541d..840542ef2c2e 100644
--- a/dev-python/freezegun/Manifest
+++ b/dev-python/freezegun/Manifest
@@ -1,5 +1,3 @@
-DIST freezegun-0.3.15.tar.gz 25530 BLAKE2B 866736cfe556da50f8edba55b0b84c7365e6a1bf32d88e84dfcee6046474b30a9ea15522c3356c5ca30f9a8b79096ba17fdaab240f20e4ef1f91b25ec8262716 SHA512 9f3836f8c9f207d9bccbcaec3f1af977b26aa3699ad5f792d052e105a0de530c6dda1641480c9cd551627186bf0c65d92bf39a6f4a61f458f762d8aa999180ba
 DIST freezegun-1.0.0.tar.gz 27426 BLAKE2B ebbe77d50f71cd10ad77dd9010fbc3dd9411a781300a5d196f4f86a76a374a8416980f8779705a943c4638ffdf99250640afe577695203b87e77e2daa1be8b38 SHA512 b6e19cf7799c0689eb756f6ce922797f2f0622f03d13aaf81c62d777d00b660b6619cff996f7a89c54b2e9f33641401e04e72a455a03ba0c7dfca09b64cfecb0
-EBUILD freezegun-0.3.15-r1.ebuild 1116 BLAKE2B 6e5598d208a9594488d9d99d059ff6c321c190992454fcd4509f744baccb27a9704d7f175b73f8a2f7a0921a99a58f1cf144d98220faef3908e5e96aff58aae5 SHA512 2d5d346ba12fdba28d2ed2243018d05c9112b7d31f26f8c0dd48ffd741d4f0246d023e16c9761534e8619a670ac0c71219a06cb5e321d0da3fe01c7bedf0349c
-EBUILD freezegun-1.0.0-r1.ebuild 705 BLAKE2B 99e163b5495ce3c6ed1b670d503f220a23acbea76c89320f98663e600faf6ea171b84ae6c8f23dc86640a1c4b5200a30cc8dccda595cdb289e00d01c1a90f1fa SHA512 0f2dd6a431c5aa8272d2c57fc0d92fb7d323ae4a212e7a08983f260c97edc37c07a4f29df2976c32982b889c981f8f5ea312b7c58d8afcd036d0aa192ea732ed
+EBUILD freezegun-1.0.0-r1.ebuild 696 BLAKE2B 726d26c6b715876968472195562fbe3e02ada3f390482a45ccaed7e61cf65f0fb8c7a690b18051484616476762c25dc29fc7ffd0c24e40bf8209a459942136fe SHA512 01607dbfad8cec5cda95660dc392d767bc12b740800914b79dc1d1df930e22a239e4b8e067a9fa115d9b6c7ff937cad0ef636701d96ce8e7c5d03b109bbb5d87
 MISC metadata.xml 392 BLAKE2B 574f859b6be3de78801f9214b561b366ddb87357be71a6891084da1f3de2e6481692d5da7ca6d5008d3ae963cc1e36ead4aae6115f0008d63d65a089cf70115f SHA512 b39f8a45d62f0c220fb915ad64c6a17e9f9619aa8c358694c3a3a83464eb5fcf50ed658430d9aabfb76e8310d4ab3baf059a8de78ebe46a59d6af187735489ed
diff --git a/dev-python/freezegun/freezegun-0.3.15-r1.ebuild b/dev-python/freezegun/freezegun-0.3.15-r1.ebuild
deleted file mode 100644
index fe945c3a339c..000000000000
--- a/dev-python/freezegun/freezegun-0.3.15-r1.ebuild
+++ /dev/null
@@ -1,46 +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="Let your Python tests travel through time"
-HOMEPAGE="https://github.com/spulec/freezegun"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-RDEPEND="
-	>dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -r \
-		-e 's:(python-dateutil)>=2.0:\1:' \
-		-e "s:'(python-dateutil)>=[0-9.]+,.+':'\1':" \
-		-i setup.py
-
-	distutils-r1_python_prepare_all
-}
-
-python_prepare() {
-	# optional and only works with python3
-	if ! python_is_python3; then
-		rm freezegun/_async*.py || die
-	fi
-}
diff --git a/dev-python/freezegun/freezegun-1.0.0-r1.ebuild b/dev-python/freezegun/freezegun-1.0.0-r1.ebuild
index 4b7260beae0d..522dd126b6af 100644
--- a/dev-python/freezegun/freezegun-1.0.0-r1.ebuild
+++ b/dev-python/freezegun/freezegun-1.0.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+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"
 
 RDEPEND="
 	>dev-python/python-dateutil-2.7[${PYTHON_USEDEP}]
diff --git a/dev-python/fs/Manifest b/dev-python/fs/Manifest
index 0450d3c9bdc9..ae3f8d9704b8 100644
--- a/dev-python/fs/Manifest
+++ b/dev-python/fs/Manifest
@@ -1,3 +1,3 @@
 DIST fs-2.4.11.tar.gz 163986 BLAKE2B 953e50da7002512029c0a1a8e7fe8be3a7c31fc48e2c66f0fe7d71dc908aab734f724e09c16074c3e4cdd86c9c2e1a847aa21176af07311012090375a3a6808e SHA512 fe4596bf213f9b1721cd3c665e6af180d6617eea07afbaa9d83847dc3f7dfe64bca16c8ccb337d48bbb49bf0d2fef90903e3c4aecc63f61faac6a2b6f6c59cf6
-EBUILD fs-2.4.11.ebuild 1319 BLAKE2B 9dfba4f7139ae971a2cd8bf7ae6382aed92d4bf8852f1b5f907cf10517b86f2990a7e3a50f43a6389504368bcb2a34c099964be9baf67035de30f237f852cbd5 SHA512 d60967efe003b4e3d93de241c97df66545a7c864e0c322771d85cc4a8bb9f1cf68a195d25c27c9dc94dd1013c0505c8789e6f2e599e40d0e4e4fdbfc6a586cb6
+EBUILD fs-2.4.11.ebuild 1326 BLAKE2B e04e402594e9e4c35905fe189d773a751a89f028e13853f230cf8951469091f8895a6f4c272e53d781d821bdad2c78e2a555c095a0d501374ee8f67a393fe705 SHA512 77969b7e5b93c8b6c600c1e274d1c093591f79e38296eb229d638bcfb9946703cf7127637a3e6ea8a360a67bcbc995ae53435e3cb06550213367d40292c470d7
 MISC metadata.xml 580 BLAKE2B 7fa906a1331fb39671795b92d09a71dd41ed44f08820f20e7fbc8fd9f1edb6aecc7168d9d3bc539fd58767122db918824a46ed9c4ae345618dde439a27299acb SHA512 f675af4b3cca4ec6caa96414f0e72dd03d1ed1208afa46ee9ac28eba16071fd44a03acb24e2b6930475fc906f46a3f50ca4e1d4a59c352dec7b476906a1df1d6
diff --git a/dev-python/fs/fs-2.4.11.ebuild b/dev-python/fs/fs-2.4.11.ebuild
index 9f991e4f1d25..62e0a830fdc3 100644
--- a/dev-python/fs/fs-2.4.11.ebuild
+++ b/dev-python/fs/fs-2.4.11.ebuild
@@ -25,7 +25,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
diff --git a/dev-python/fsspec/Manifest b/dev-python/fsspec/Manifest
index 040142d7ffdf..ab301a6bc631 100644
--- a/dev-python/fsspec/Manifest
+++ b/dev-python/fsspec/Manifest
@@ -1,3 +1,3 @@
 DIST filesystem_spec-0.8.2.tar.gz 238399 BLAKE2B f64f153dd303bd3ec44e5010507704b5cbb50a89ad4a7a2e50b38b139219896be543bcff0fe0a99e06f015450f4b0334a641fabeeeb23583b14665ef8f089159 SHA512 e30badc56871ef20cf4b2ce0f6353b4125632d9e253f68d4b08535c9e1ac5fe428745315cee89a9536bfd1b308a28cc65fff555a7b9d9511225357bf790b9aac
 EBUILD fsspec-0.8.2.ebuild 1125 BLAKE2B 0bccc38c8897fb91ed9b92bdb2c93cbf9533697e8fb7e2f7da99eb8f035abe2aca6ff5fdaca6cf3f208a5b95890aff53ea29e2d0ca6f9efb870a050953806168 SHA512 e46654cdfb0d7f48534c2a1c1b555788e0dbb36792a04aa2e03ded236eeeeceb41d5c4b684dad38236d02e9aa4577686d8ae0cd49be8b902c8822e987cfe58df
-MISC metadata.xml 242 BLAKE2B 17fd7db1343fb7dba1842d5b62d83e56e2816962b0122ec6eee7f9e163f333d69ede2cbdf2a2ba8c77613367fca3d2cee779697fb25b5d8cf0439e1e845dbf1f SHA512 2ce768d5aae91f32da90c62900f556c647eb9806c810a817b6c45c5356e71f504b5a646bf75f553c3a9bfd3f94c4317df4948bae863ef7525b4a013b63618cd8
+MISC metadata.xml 373 BLAKE2B 8932a3ec06759eeef7bb91a181e07ceeef606995e944a6396d21ee6f9b26a7958e9c40f9f54ae27ebdfb9c7974b1ad79963213bb7a5b9bbb282cf35967a1ffe9 SHA512 42e44963570b3b003550ef6f60d1557866a72f362a3d98ca2a7900377422921134e4c8b7bcb6af3ea8bc061b433e4aba96de4fa5643a1f424cc64665a7efd654
diff --git a/dev-python/fsspec/metadata.xml b/dev-python/fsspec/metadata.xml
index e59516686a44..824c1c73b55a 100644
--- a/dev-python/fsspec/metadata.xml
+++ b/dev-python/fsspec/metadata.xml
@@ -5,4 +5,8 @@
 		<email>python@gentoo.org</email>
 	</maintainer>
 	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">fsspec</remote-id>
+		<remote-id type="github">intake/filesystem_spec</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/funcparserlib/Manifest b/dev-python/funcparserlib/Manifest
index 63810bd450d9..631c814c096c 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 723 BLAKE2B 0780acbbba945c08a9b59c01c42cbb5357ee1ed34dc8f0975094cb50946da28bd6f2630c9bff506ff60ad4cc99af578c85fb4b47532fdd2c5df15ef3f4914321 SHA512 533bb67a192e48f9401c75cd201ed837a73a6d03c841cf820cc308195006bdd3845cb5b39933ae9879f74f3bab9d5cb726f312be43fdeef64ae80e99c6b47ba3
+EBUILD funcparserlib-0.3.6-r1.ebuild 722 BLAKE2B b61e334c0fafabbca53931c74cb80ff6a9dad2d26e3eff0ead60278df32af4490d0cc5aa93935518014347167f7b199818ab7e21f5ac09e422dc93e9c1d8cfae SHA512 2b86f364326352280c5d3d136a6ab43146447dc7e1f77087f62cbf2dfe2562beec99c03278900a278fbbe1067bc3be6b372c41a7e85fefde65a0edbf697a421e
 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 b6f9f424b042..eb47dd3838e6 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/funcy/Manifest b/dev-python/funcy/Manifest
index dc463bccc412..dab2a57d0699 100644
--- a/dev-python/funcy/Manifest
+++ b/dev-python/funcy/Manifest
@@ -2,4 +2,4 @@ DIST funcy-1.10.1.tar.gz 29657 BLAKE2B fb2de795a5564f7009ff5717b8eadc3cb24a2cd4c
 DIST funcy-1.14.tar.gz 548493 BLAKE2B fff352d0e0d685fb51fb30302542c2e8893209df1e01912efae06821fbc885b05ab3fea8786d6924b48ddf32cc6bdd6def5e90db1ff949b005437b5d3771c3c0 SHA512 0c7daf1a6d87f56663ae0d37cc65654c79646c313ec530ac57e6ee8de04849b8846556fda10dd762f92e44a5ffa54d32880bed4cd77cec99ae865de0203d123a
 EBUILD funcy-1.10.1.ebuild 427 BLAKE2B 5bef5e2eedfd364e39f99b86a8da7cf57245f280e6115d47e78e054dbca41ec8f3e13b0d8194248e2af6a49babc07635005017baad4d0271b948db4022069449 SHA512 6e126cbd12f1554e34733553b50df2ee835884170d99489080cbd479e493dc969368530d5d7dafed8d7c308b498e4248f99ab16e00a73106ac142f5d6f104f9d
 EBUILD funcy-1.14.ebuild 438 BLAKE2B b0e5f67af15dffb59b2ab2f0df9f0920ca4c5a6e22ff45452c1875ea5c044bf71282ff14a2b74eec7f529570c9897bf0559f862f9e65452d7ba77dda80140595 SHA512 81357b83df479ef25e0b6865caefda24d93dd7d970a37861520c6786b837b152ef535da3b072f2c0f4f1a0f30ac2e8a4d842cdcc972c27816a9b7c6aa5558af7
-MISC metadata.xml 247 BLAKE2B ca08677c4c0af66af431abe578122a2ea0278f7ffabab245eec806167a6226c65f97e9826d64fc4b82eb14b6200cd1e3a31a5b4999e18aac41a4f9af43d708d6 SHA512 fff6c25e644477aaa35b838e10c44ca8eae9824ef8f19795e31201db40c10068f0216dec38deb0ba80782155b43fd1d72fb888cb825eaabacc3bd1ec0d18f3ca
+MISC metadata.xml 315 BLAKE2B 52b30267367a6838d8846e5635823a23d55d16b3ee571d44ce1ff2ed866b1641b4b9dd31017e4f2fb0980e0f3ba74bd1aad168c1c2e7e02c3d193298a3259d30 SHA512 099a8357f523c5c62240f0fc43d7ba5b03b4caf4a6acbdc1a26941ca2f4b551a178bed0802afd9de1ddfe6df6920dc6d48590ba1b2a4cd8741d807ab652964a3
diff --git a/dev-python/funcy/metadata.xml b/dev-python/funcy/metadata.xml
index d0e866f244f8..4484fa7a80e4 100644
--- a/dev-python/funcy/metadata.xml
+++ b/dev-python/funcy/metadata.xml
@@ -5,4 +5,7 @@
 		<email>tupone@gentoo.org</email>
 		<name>Tupone Alfredo</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">funcy</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/fuse-python/Manifest b/dev-python/fuse-python/Manifest
index 63c2c966e5e6..a02c6d6c185f 100644
--- a/dev-python/fuse-python/Manifest
+++ b/dev-python/fuse-python/Manifest
@@ -1,3 +1,3 @@
 DIST fuse-python-1.0.0.tar.gz 46275 BLAKE2B 109202ed60df82a1a637a02627657c27ef48e55225c099385ec4d74554912d89dfd6238922a7588ff8de27e4c700a3b3832e204455997375dc67f6ca36590ae7 SHA512 d5e91be3e43065988053390d97ca6483ce38924bf9a49f694bf911080b7e75c836224e83d09dcbc6fab8d63781b4cd3ae016d66b65b88dd53106b06f91a6ad5c
 EBUILD fuse-python-1.0.0.ebuild 504 BLAKE2B fac8fb53bdb4a16013de4bcadd11542dc9a619ba19fb1d92c3cbb113578848c656465c282d7b277a38bef088020115278ffa7df1e849270144f8a534f25bba01 SHA512 c0d3b19dc22cf7be202e49f58919ce3918c2778fba3ed1a8bb8f16ff92c7870bfee295867f6d2e8b13e6af52c286ac7975795026c53be326999f32c31f01adfe
-MISC metadata.xml 241 BLAKE2B cacf8034dd7b4cfc624467a8d32b4a0f0b97ebf3ba84ee4572d491ab3da93098f7ae1c765efed3a6c2372cc859098ebf0853753c35d7b23d9c92bcb04e426f11 SHA512 fae6c0b9c2f7b479a2ae029b5e79207756486f5c59a9fc5a2094b239464270eb7a18928a34c11237811a3d1537cd35839778da6704ee6ea3fd806c76e3e6bb6a
+MISC metadata.xml 290 BLAKE2B 8012b37994a0cb9cc55883ef4ed4a95ddb3e1dbd42041e1e65ba4c2c4176e98e0976a20896ba026e399755d0e37b89ae17ad938eb18a367403dd744f7da89580 SHA512 99e5fc105a72ef2b238203adb7574817f1295515598d032fbbf6be94a8899cdbc4098e40d9132a243f65e44db944823ac2224b3409680dfa5bb3c926a513a277
diff --git a/dev-python/fuse-python/metadata.xml b/dev-python/fuse-python/metadata.xml
index 514528075df9..eed99a0e5ab6 100644
--- a/dev-python/fuse-python/metadata.xml
+++ b/dev-python/fuse-python/metadata.xml
@@ -4,5 +4,6 @@
 	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">fuse</remote-id>
+		<remote-id type="pypi">fuse-python</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/fusepy/Manifest b/dev-python/fusepy/Manifest
index aa4b111a0663..a00d6962e394 100644
--- a/dev-python/fusepy/Manifest
+++ b/dev-python/fusepy/Manifest
@@ -1,3 +1,3 @@
 DIST fusepy-3.0.1.tar.gz 11519 BLAKE2B c76319b0d0b64a8dc674b803551f32352fed9a1e6e050110963a159259c3fed8fefbb63cfe6dda689738f07cb796c6b9da14e3070c4a1cf5b70892a6ebe52cc2 SHA512 f913dfd9f29412daa8239548c8ad8bcc64f8fc7be1425bf34cd40a5c4d22faae67c5d5575c187395d911f64ad0dda186614ada598b38b9557e18794639d43767
 EBUILD fusepy-3.0.1.ebuild 504 BLAKE2B 052ead5ff081239fe7de63a916fd89f793ee753fac831b89ccc2a58b2017573d2c2955381af2ee4327d4094fb399573a80bbe0fdb0191289c3c3d338fc681366 SHA512 b62001805e0a2f2a56e023394eeb1ec82adf2cca74ab88fc15be30a585b1b7e8531e33569e67c966a78007e4f1a8cd7aedf2a095487cbe8755c62ee98835b982
-MISC metadata.xml 493 BLAKE2B 139e250725d882e24e06330f3d584c640640a89c7225a5e23b207929705b1575cf271b1825e41b5bb0d5d0696653158b1c750352a8fe36427c712144237873d6 SHA512 5594136f5a9883936577a26f48e3cb67cd68be17bfc267d48c2107bd170b713ed9b3a7fb8418421ec6b6d522b14a26a325d84880133f4e12c05df5fd2b20c435
+MISC metadata.xml 537 BLAKE2B bd577b1a9cc36b6d87e709111d118980d1ef6506922dfda669a21c06dd332e9875370ae2c0153661d3035e70342fe40af9c18c208f846aa227eb8ee1aa6ea070 SHA512 d45a93a1a0eb1b70f96e0c6626be5c5996a66b108a2b787df02471b72be1b596e67962ff314e5e67fb9899a49d4d86f932c5d6a34b96c9b36e042cfdaf69af8f
diff --git a/dev-python/fusepy/metadata.xml b/dev-python/fusepy/metadata.xml
index de0f4f2e6208..d8c85ddcc34e 100644
--- a/dev-python/fusepy/metadata.xml
+++ b/dev-python/fusepy/metadata.xml
@@ -11,5 +11,6 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="github">fusepy/fusepy</remote-id>
+		<remote-id type="pypi">fusepy</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/gast/Manifest b/dev-python/gast/Manifest
index c50423ec12c4..a408fa1ed16e 100644
--- a/dev-python/gast/Manifest
+++ b/dev-python/gast/Manifest
@@ -1,6 +1,3 @@
-DIST gast-0.2.2.tar.gz 10294 BLAKE2B ad81309b1dd938a07f0cd39c21d4f89af6d902c136b8fe12afc5b26827c778f12561e06c66648a5b672b1c9d9eb79b3dfde7cad0acf8c7099451841b67c0daf4 SHA512 0be9b2b66b7815153e6f294b4db6b028c321d8a94d97c89d89b026df73e0c95dc2ee8af5c10f2eee51cbfb94af4b5a0da8a682896861870b98dec4c6c59a5dd3
 DIST gast-0.3.3.tar.gz 13760 BLAKE2B 0298ea81d3d133f8305fc6a7cf020213a75c2dbcb09c9648e533b8c2c58cf3e3f363448f905c8295bd34db0023be6dea00de0d901bffb1d55650773f7acc0135 SHA512 36869a5e0976223a5a82be8bf25a01654896f4de70affe0fec5252104ea6d1fea3eb8c5153530fcac8addc47b51535b02e3920a0e82aad11ba1ca8350cd11341
-EBUILD gast-0.2.2.ebuild 457 BLAKE2B f3bbda9a508e4807d87edcb71cb4b69ffa29ebceb6ddfe20e7302b3daffd4c64e3bb3f7d0d6aab72d0dad774eddbbda3703985295a5c59036b5c85ac3961902f SHA512 cfe70fee53cc47118c63e3436789d37144ad954ddeba13141996373b47df254ecadd531ed6e125f793f7b80b6f2efc6fddaaccb95dca6e1641b313089400622d
-EBUILD gast-0.3.3-r1.ebuild 459 BLAKE2B d7b7a5e46c65631bcb48dc61f3b1c1282afed3cefefb247d7185a6fdcbdea4402a4754893f5a51576159ed55d0e17e801dfc5f778067cddb2479a0292b9ee01d SHA512 7cac1089a9e5af3c30d471b240fbf44e79574978f48784f6ac22e1b500e4d0017a1c9e340bf6bce8d16ea974982d6b8232bf24bb513040027b41360fbfb13b91
-EBUILD gast-0.3.3.ebuild 458 BLAKE2B a2523227e20e5c3964df1f21107b3019034f41bea585ec67a3a1cbbb2e41c6610401f1647555b446abe5b18bea1e47d7b57105d1b3d8926a3bffddf9e6e8c1ff SHA512 4c4033f429bfb159b621c290c34eef7b667e163716805ea2bc928b879154dd8ad9281642ac15792f15b4f50a7efb1d267b35667aede0f68f72418f6e5b3e5507
-MISC metadata.xml 484 BLAKE2B d3b8be13b37bd1a2ef98b2f164c901cf21c8b73ef9b13914200c85ea26eb07dedaaca66b008dccde88dfa1bfcb733e25aac9920704625b87ce0a11a04e02b489 SHA512 5a3d09427a29d39047f396c91ad544a6cb5568f2af06216fcabc1aa12d9e4d34a71cda272d38667d8fb0114d54971626ad3de0c9d71a708cccd825ea1d7e2504
+EBUILD gast-0.3.3-r1.ebuild 457 BLAKE2B bc80d69bb91ea33f956ceef9ddcc20ee258556f4a8751fc61acb471d164f1704622db8c10a1cef1f21d85874b7768c89a3ffe101381e5a79371409ee9eac71a5 SHA512 1ceea0475fa38aff597cf8281e15865619ed998238111a8769718470aefbc4bb0a7e9cc0eab4ab09775af53201a230d489ea7f8815f488331d75dc0ea58b22b5
+MISC metadata.xml 551 BLAKE2B 36c398a1c8b3d88eba124f488b45917ff80ee5a1063365a36784ada181c061f9f4af9126e8c6cd1094cffba0e0d7ec38bf3f903b854c374752f1e12437d48da5 SHA512 680218da3e3430f3dbd652e8f226b72705c3eb79755aebcc4e53c8b813b8fedbf8250035368a5c46dd677b5704721072cf4ab6e4e8872f645f75dc58db197527
diff --git a/dev-python/gast/gast-0.2.2.ebuild b/dev-python/gast/gast-0.2.2.ebuild
deleted file mode 100644
index 3d51556cad8f..000000000000
--- a/dev-python/gast/gast-0.2.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-inherit distutils-r1
-
-DESCRIPTION="A generic AST to represent Python2 and Python3's Abstract Syntax Tree (AST)"
-HOMEPAGE="https://pypi.org/project/gast/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/gast/gast-0.3.3-r1.ebuild b/dev-python/gast/gast-0.3.3-r1.ebuild
index a2d5b861bc85..a586568d9b31 100644
--- a/dev-python/gast/gast-0.3.3-r1.ebuild
+++ b/dev-python/gast/gast-0.3.3-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/gast/gast-0.3.3.ebuild b/dev-python/gast/gast-0.3.3.ebuild
deleted file mode 100644
index 1a3aed50379c..000000000000
--- a/dev-python/gast/gast-0.3.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-inherit distutils-r1
-
-DESCRIPTION="A generic AST to represent Python2 and Python3's Abstract Syntax Tree (AST)"
-HOMEPAGE="https://pypi.org/project/gast/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/gast/metadata.xml b/dev-python/gast/metadata.xml
index ca8e3611427a..6ffee76e7ef4 100644
--- a/dev-python/gast/metadata.xml
+++ b/dev-python/gast/metadata.xml
@@ -8,4 +8,7 @@
 		A generic AST to represent Python2 and Python3's Abstract Syntax Tree(AST).
 		GAST provides a compatibility layer between the AST of various Python versions, as produced by ast.parse from the standard ast module.
 	</longdescription>
+	<upstream>
+		<remote-id type="pypi">gast</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/genshi/Manifest b/dev-python/genshi/Manifest
index e6fe5e46d142..3b9550c744e1 100644
--- a/dev-python/genshi/Manifest
+++ b/dev-python/genshi/Manifest
@@ -1,3 +1,3 @@
 DIST Genshi-0.7.3.tar.gz 271238 BLAKE2B 20addd3243980574e6e2024a7c275c157392987c5265aaa71527e78b92bd25ec476de21d08f6b442de420a925654a064a0071bbd8cf056c0eb18cd8fb085af8c SHA512 b153a9755f9791f349dea35e3ab3099af66b1be5b83bdea9d356b456ddd4e1ff88f7a85e822a2c06aea936c2f843bdc8ddc91c74de2a72111896d8db9a195b87
 EBUILD genshi-0.7.3-r1.ebuild 781 BLAKE2B b47f8bee7948fca377cfde4a95ad5c696f5ab3a8edf144fab21a4d2200edf011a59c977d3be76b70e57f22ce83ed83c72d662c5dd3a9a36e02b708785dcbeb34 SHA512 0fafdbcba75cd5f08320bd3f200a807d3931ef1234158f866fff1247df334631336fe12c15b09cfd3853011292f0e2b6eeaf30ced4955c7e19b8ef3894c6c29c
-MISC metadata.xml 271 BLAKE2B 31405284f0b172a72344c5300348da7b62689758b67e08380f46cd0b4d58313324f234550c2d8ffad7cf2c70165edf59c24a8b32ff6aeb82b63f7c40fc4180f5 SHA512 6c24a69f1cf6d89afe9dcea1b07cc8fd3fb9debc3cbfd154dcafa42bb18c84005e83d9204b9a21d91bbb23e952b1069d2f72c753e644926ef9bafd3d86fb4e2a
+MISC metadata.xml 333 BLAKE2B 057ff5db6d7fb34ddbff366996029b7a7c07cc19c837519d6fae5edc4411ecfef3f4b7e8cb0d07f4cc8ad353f9471992d56ca3ca3cfa5f288cc89a07e411c5fa SHA512 38add5af64ef06572ade1323f12a440335b51fc263f2ef4a8759b1e6c0cb3b7c893f5f8a6ff1b43d4f7c53e38b995877029dbb51cd1f571764ca257a55516d71
diff --git a/dev-python/genshi/metadata.xml b/dev-python/genshi/metadata.xml
index ec3c387df89f..026887751ec3 100644
--- a/dev-python/genshi/metadata.xml
+++ b/dev-python/genshi/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <stabilize-allarches/>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">Genshi</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/genson/Manifest b/dev-python/genson/Manifest
index ae49c8bedbd7..c3b7c22e3a93 100644
--- a/dev-python/genson/Manifest
+++ b/dev-python/genson/Manifest
@@ -1,3 +1,3 @@
 DIST genson-1.1.0.tar.gz 26662 BLAKE2B 726b0467edca9ca503d73c914d35392f0784ae8be01a8287b84da3cd5ae4b4cd6e12a46b1a7baf73db40377b915ddb3c4b53f4a135e3923fa775af5b51a5261c SHA512 54264dcc51cd5ece9bd428079fcd5cf833f32ef36afbb7987de9982d33253834c5c8c35d18b21ad4003fc2ffac4da02965a00844457b7d8ca6c6bf3d3facb8d6
-EBUILD genson-1.1.0.ebuild 603 BLAKE2B ff68034091377dfa761c9d926829dab667f0993d2ab7aa60e82558e74fbe3fff2f04acc20c9d611f4735612c86b9d6a0ea6f0b5e5115a903fa3a8d1881276383 SHA512 b7bfe8d1facb32afd3e87cdb1d7e1b567f3d28578de163eff305ee9cdbb632590fdd485d97503845573726630fff7cbb01464ad055769375e54c2958acd58a95
+EBUILD genson-1.1.0.ebuild 605 BLAKE2B 7d2839f2339d26a5691e2fe771a278f56e9ca234e24e4481d691482e8f850ec75f3c20e7344a7d0b8acdfb9235006328969762b99bac6a14abc3c0e740be479f SHA512 02ee13c5cfb2a56c96b5b2f23f42f1e19e3bf7544f54832be80e27a42720fb95d2f0b6f2eeb586c0dae6e73b3bdf86ee5f068de62d4c1e9161de0c187865e9ca
 MISC metadata.xml 374 BLAKE2B 5b656de91f608ed3000284960ac44e8983150d3886c34ce891ddfa5036581a246bd2eef841002b0b8c9e25fb81b96a08e8e7f001446d0a1b8c8a7f8196b96286 SHA512 94125f62b402ca3ef2ce14df0727dc0c777a30276380d61cb3ecde3bce3930d130a65c730f2106b2aae324819e593e1fb4e62ceb20051f74fc56295c7bf9983b
diff --git a/dev-python/genson/genson-1.1.0.ebuild b/dev-python/genson/genson-1.1.0.ebuild
index df79e572b36c..25bf67b797ee 100644
--- a/dev-python/genson/genson-1.1.0.ebuild
+++ b/dev-python/genson/genson-1.1.0.ebuild
@@ -10,7 +10,7 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
 DESCRIPTION="GenSON is a powerful, user-friendly JSON Schema generator built in Python"
-HOMEPAGE="https://pypi.org/project/genson https://github.com/wolverdude/genson"
+HOMEPAGE="https://pypi.org/project/genson/ https://github.com/wolverdude/GenSON/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/gevent/Manifest b/dev-python/gevent/Manifest
index 8ebd40b400bc..8a0c2215de32 100644
--- a/dev-python/gevent/Manifest
+++ b/dev-python/gevent/Manifest
@@ -1,3 +1,3 @@
 DIST gevent-20.9.0.tar.gz 5806581 BLAKE2B 6b1b653fa6e22539e049a9bba3d3a2b9d798a5555ce4ba60ce33ecbdf14bb5201967d22d677e1ce3170129b0763fddfcc5991347186fb102d10ae39e22538c44 SHA512 966efc945b623df2521fffadca3b7e56cae1efe6de904a724765e0593389e8b1305094baa6fbc9f4fa376b1157d0f230b01e2a90de21e4b9650614363edec9f4
-EBUILD gevent-20.9.0.ebuild 2185 BLAKE2B baf4a4a230dfb8d5f46c106521c86d2a7a873281a0fcc62d7cf80060e58ae6124659b9b78ca9f3d5f1608140e2936e95a51ccb9f210c4b573e33fba60838aa1d SHA512 dd18cc4a31ee8d3d28c84c8e5c93c69168c6fc060c55441919b8c0b481e9589e89eaabeb3a4446a2b37ed0b6fa6cbef3493bab4293f69dd87c412b8e0cf22eb9
+EBUILD gevent-20.9.0.ebuild 2185 BLAKE2B 3ab0e07fd999097d3d658821bee3ce5b5435299de761981b2451bba0bc59f645ee54922ceb8e28f93ecfca0deba1bbb984b9d62f1ad03bae3c153d4a4c37d18e SHA512 302d83e431de91e163e8771712bbc4cee8530a7ab6c1dd136e9e817cf8fca2ab1cd01284812fb35952f8c4676e246d19f3072159eceb4b8471d636f1b487a9cb
 MISC metadata.xml 374 BLAKE2B 87fe7f375b08bf4991954e018241ce4b150365409df516a12b79d221a037d718342dae60461663fac1d5af34458d352e287901e15fe68b1074927680055c204a SHA512 443f847333d35cd55f9c33624664569ecc8c2d0b7c74a358a716e0e133072edb0f29abfc36d6fb446db6890ae1319ad9d719a6e65e2bb35f9c9e9259379241fc
diff --git a/dev-python/gevent/gevent-20.9.0.ebuild b/dev-python/gevent/gevent-20.9.0.ebuild
index 0e56fd671801..b51407611f01 100644
--- a/dev-python/gevent/gevent-20.9.0.ebuild
+++ b/dev-python/gevent/gevent-20.9.0.ebuild
@@ -20,7 +20,7 @@ IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=dev-libs/libev-4.23:=
+	>=dev-libs/libev-4.31:=
 	dev-libs/libuv:=
 	>=net-dns/c-ares-1.12:=
 	>=dev-python/greenlet-0.4.17
diff --git a/dev-python/geventhttpclient/Manifest b/dev-python/geventhttpclient/Manifest
index d1e89b82a174..86e8b9321079 100644
--- a/dev-python/geventhttpclient/Manifest
+++ b/dev-python/geventhttpclient/Manifest
@@ -1,3 +1,5 @@
 DIST geventhttpclient-1.4.4.tar.gz 57620 BLAKE2B 20b60cfa7e8221b050bfd95a6e23c2f3eee87c0df1e93171719c7ba1804e88c918471cdd01cf4c6020fb6d44d0a1b911ee09dd44cc1e150b5d18d6052f2904cf SHA512 c6a8580707f3178a3a55eb638b9e3f36f82aecbd8a5ce044f0b8c167d88ad2bec584275bed6b720a5f7a546b0ffd113bec28dd2e1ff4290c60f0b5e13542b737
+DIST geventhttpclient-1.4.5.tar.gz 58183 BLAKE2B 48d44048e7040552824ed19ac49c6dda41536ffded56bae0d942c06f111a327a1d571872f35f388853b479ea1aaa6de518f86e7ee72e362360492530ade65131 SHA512 9ffe00c79b145dab104e1dce336e072060f315d9bee880daf64b5f1f52e661d810dab9a60286320a7d30cf0e794465f201c039cc31fe7ec325cdb3a8350c9f7d
 EBUILD geventhttpclient-1.4.4-r1.ebuild 1528 BLAKE2B e6cb5144775a67001bbaae1298a9a1c545c7b19b4a2f6a780ba33d4c0c6b2ef1c6e613fa897f2269957ec8c9bac757324cef922c21470b9de1cd98fb54914c47 SHA512 b6768d862579ba75522389d6c3e7a5e2c74c123df6759c203b278a654ec5202b819084295b5a39f6961851f68902400e2f8769be6eb5c6469d3354accd9f4593
+EBUILD geventhttpclient-1.4.5.ebuild 1528 BLAKE2B e6f6d20d9224fb3565d4d0be15a975931e650a03dae05fac5c47bb3f919684d33262e8e328e0221eaae2d61b45e23b9c14300f02387e2772f6f20a868013bb19 SHA512 4de62083d325dfcffe1f97839b74c03d692aec2a7e2f97db16a4cae1ae1d9077fdcdc3919ffad820bd93f8d7195b8fa62b8934d6ddd3f9692bb4bfc1d58fd0f8
 MISC metadata.xml 555 BLAKE2B a747ad2f270f2267b197d8489d253c18bc6093063f9cbc037afa0598931a244aa9da1d0d9d5c8e69a98c4f1fdfb8275917b9493dec895db5225a8918c51d0f43 SHA512 61c8affec2fd6d68f40d721842d7a121f6e24fdad560d131acf9e8b0f1a229afd2580fe9f78095da9a77b8dd9accf72b180eef797c4e143776e8beb7b7c36fcc
diff --git a/dev-python/geventhttpclient/geventhttpclient-1.4.5.ebuild b/dev-python/geventhttpclient/geventhttpclient-1.4.5.ebuild
new file mode 100644
index 000000000000..7fb40b48518c
--- /dev/null
+++ b/dev-python/geventhttpclient/geventhttpclient-1.4.5.ebuild
@@ -0,0 +1,49 @@
+# 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="A high performance, concurrent HTTP client library for Python using gevent"
+HOMEPAGE="https://github.com/gwik/geventhttpclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	dev-python/certifi[${PYTHON_USEDEP}]
+	dev-python/gevent[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Avoid ModuleNotFoundError for tests we skip later
+	sed -i '/^import dpkt.ssl/d' src/geventhttpclient/tests/test_ssl.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local skipped_tests=(
+		# These SNI tests require dpkt which is not in the tree
+		src/geventhttpclient/tests/test_ssl.py::test_implicit_sni_from_host_in_ssl
+		src/geventhttpclient/tests/test_ssl.py::test_implicit_sni_from_header_in_ssl
+		src/geventhttpclient/tests/test_ssl.py::test_explicit_sni_in_ssl
+	)
+	# Append to sys.path to avoid ImportError
+	# https://bugs.gentoo.org/667758
+	# Skip tests which require internet access
+	pytest --import-mode=append -vv ${skipped_tests[@]/#/--deselect } \
+		-m "not online" || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/github3/Manifest b/dev-python/github3/Manifest
index 54253cb55634..09785677a903 100644
--- a/dev-python/github3/Manifest
+++ b/dev-python/github3/Manifest
@@ -1,3 +1,3 @@
 DIST github3-1.3.0.tar.gz 35345711 BLAKE2B 37d5b574c228b9e3c7ddd60931140679dcfa2a410964d25cfa51d621a0bc72cf4c5340ae3565c0112a3f5373aa064bdc4663dc2d3c4fdf3d0008239bd3498362 SHA512 0568d9730764fb81975da2ba336f1cdb2196de687fe6e68cb3dc2ac432bbcb201f1d78647ac2606a105ea00e6b244cb79b7222f88ebf305a9b7783c2b21e5a1b
 EBUILD github3-1.3.0.ebuild 923 BLAKE2B beb7815c193a2c10f0f374d0d4243138750501b639c6dc6205e9c3e3e5e73203e932fe59ba809ce2e94867ea74587af40cff369939815e2b16a3169a7737c9d0 SHA512 b7b0338af6d143d6b5353bb1cceb7378ca8f1a3971763528bb75691b2ea823f11a01b1568b2924e316f8f757891f8d17a5e8c18574cf6199c21a1e815311177e
-MISC metadata.xml 626 BLAKE2B 8e8b580d120dd5dee945bebb82e5b8183621a378341bba44918be642a5ada8ecbcc7634824bb0a1b8dcef8dfe8b8effca2296abba3d4d7132a1508b9478c6b2c SHA512 e7d2ee56150217ba65f153d875c0771fc99efdcf5a29682369e1b22d121fe55d77c38f45586f6b6e3723f9356e9004e4d3676ee09c21bda4ce5101b8ac551690
+MISC metadata.xml 674 BLAKE2B 3d9f71f882974596c0b38541d9da1c2884fe1770727962209ced328cade8524034b1806012848ca718d4ec83b26d896b31f9333ac8d7c207ec8304bf51d357f6 SHA512 408b7262a4c1306255f743686deef663ef8e01ec9bf28a6a4bfff40ef602a04e6437365982eb4776c8dd3d4f83433287788f6d57a93e9bb0eb70d5b6fecd6975
diff --git a/dev-python/github3/metadata.xml b/dev-python/github3/metadata.xml
index 556e313bfbe8..820467f62456 100644
--- a/dev-python/github3/metadata.xml
+++ b/dev-python/github3/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
@@ -14,5 +14,6 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="github">sigmavirus24/github3.py</remote-id>
+		<remote-id type="pypi">github3.py</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/glance_store/Manifest b/dev-python/glance_store/Manifest
index f06bfd86cf18..6ef43264fb3f 100644
--- a/dev-python/glance_store/Manifest
+++ b/dev-python/glance_store/Manifest
@@ -1,5 +1,3 @@
-DIST glance_store-1.0.1.tar.gz 185244 BLAKE2B 4841bf9db07df06fe4f0dedc9f06e6aa768118aa363946b3145c90f7d58f452c3b1f419bd3545681161481d88566922f8c3f4eb0612c77a0679729fc460d6169 SHA512 77144f41996e8fcc7b5ec3e4246305e6887082a8f62a84c73d0b546c9f635e8f43b95e45a5e3303e504c01ed3608de6358398eeffee226f640035df2f792dc8d
 DIST glance_store-2.3.0.tar.gz 212933 BLAKE2B 69f54fbb44de0e6e9608e38cf0b43ee6fb7df7758d19b6dee6f15fb00a25ce885610ef9c779d2138c08f5d3a28760121ef66edade0b23619685d5f985433247f SHA512 59499c1fa8b596faba0918219b76e5e7d51f6c7e94d14b99f28b2a9f87b456e638bd42fe33124ae9507043a975db6e5b5762e5979258db35b772f41a08d59be6
-EBUILD glance_store-1.0.1.ebuild 1650 BLAKE2B e1fa2f9adb22fd6f1ebf87fcede37ef8f88088348cb740bc21b665fd8fda0de1a4d8b9c22bdc3f264c27b0f077aed2f9c784d37f3ff77a85821fb0fe2ee5b329 SHA512 9976022de10c8f91491e61ec4d3ed3658e58d8ed53b988afab7ebf8efcd8cea1b2c5bf6c2e0f8207bb7c1d3e6810899cfd72a1261aec16f88de63fe7aa3a8d65
-EBUILD glance_store-2.3.0.ebuild 1659 BLAKE2B 2e869c3d8616a444b3becbdb560130f42e396c8d96d2cd6dac3403426b4c0203f7bde7a2d75b79d2ad40dda8b606026d63ed840071ad0c6550a96aa4f7945f09 SHA512 2761eab8823c91c2eb12d4ee0f6298acf0d4ba7b728a12e4a553ecc54f8a90922f0cd9546e81fea8d4c4e97565c0987e835d7644a58c0232ad064063850c6bc2
+EBUILD glance_store-2.3.0.ebuild 1657 BLAKE2B bda7a23b7de7f5f5a77e4a9649dadf4b310ce19cd98b03513f5bcc6272f383af6ac8d09bb62094144579f9de789b9997e83511743aa432dfd55a3aa0dff58665 SHA512 7de10ac9d197e23b527671ecce5ecbca10d29ff6f26be7a7bff1003c045a8eae6a87e7548d1574dc5046b909679026f093388b4e4d7eb571c646ac7cb28a2906
 MISC metadata.xml 756 BLAKE2B 446a0d4e98d1ceb702e5414c1f2b5b3d7dee58a853779df1aba88d917e24c5699f30b9b88a26b4e28393bb0b7f6e0e86db4fd6d63f1a9e06f9af707936f9c01a SHA512 7f2f27c0d280555cd49b177a1a983a544a40f9edf4b303c2000afbe1ddcaaf8a60dd693c0945c98bcdc15d7e1d0d0ce8a3b40183a54fa4ddc8972da796ff99c8
diff --git a/dev-python/glance_store/glance_store-1.0.1.ebuild b/dev-python/glance_store/glance_store-1.0.1.ebuild
deleted file mode 100644
index 1b21ea54f649..000000000000
--- a/dev-python/glance_store/glance_store-1.0.1.ebuild
+++ /dev/null
@@ -1,48 +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} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="A library for glance"
-HOMEPAGE="https://github.com/openstack/glance_store"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="cinder swift vmware"
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	cinder? (
-		>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
-		>=dev-python/os-brick-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-privsep-1.23.0[${PYTHON_USEDEP}]
-	)
-	swift? (
-		>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
-		>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
-	)
-	vmware? ( >=dev-python/oslo-vmware-2.17.0[${PYTHON_USEDEP}] )
-"
diff --git a/dev-python/glance_store/glance_store-2.3.0.ebuild b/dev-python/glance_store/glance_store-2.3.0.ebuild
index 36beee1e75fb..de6fca8ec603 100644
--- a/dev-python/glance_store/glance_store-2.3.0.ebuild
+++ b/dev-python/glance_store/glance_store-2.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="cinder swift vmware"
 
 DEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/google-api-core/Manifest b/dev-python/google-api-core/Manifest
index b53d72a60e98..be3976c7c515 100644
--- a/dev-python/google-api-core/Manifest
+++ b/dev-python/google-api-core/Manifest
@@ -1,3 +1,3 @@
 DIST google-api-core-1.17.0.tar.gz 98660 BLAKE2B 7959f429dbbfd8de658b11d0ee5be253cb53d930f8b37a140dbdc89a0d25ecdc640fc91476138471603efbe1e6078d668bc3f0e06c1fb1481960970a6f5632dc SHA512 fd609ce85bde22b09653bf46dd7bcc504ed93b19f8832c28f1d26ecb38a01e00380bd715191152a8d109e8c3235951b60525d4692fb4ba0eccb11a3b1df58cd2
 EBUILD google-api-core-1.17.0.ebuild 1224 BLAKE2B 9b4d3118dfa4105a7c701142273e5aa2183869feed9302fcfff72eae45494a038ea7a13c00a6b4238c6fe5f1456ad406b6657462cb07af6e35f1d5992796e43e SHA512 c33c10cb137204895985ae4ef0a857563e99b0a2391db01ef8512c8fc7fe57fcdbc0fe9e457fac6d17ecb6b44626b25c1be2d4d157fb19003aaf04743f0d329c
-MISC metadata.xml 280 BLAKE2B a1973c7508f6f1a2cca51eb3bb625257870e00e31e6227f20a34611c81141e812e6a38ff6e66bd43abd0b238b1f5b36b262cd08a69e606f677ab6b1a6a68fd05 SHA512 7bfe4f6ad469f5ecb38967b5a2413baee476acfabce20cacbd0e784aa2e2d3636ede1a2b97088bec5b6c249c7ada0be3b44218686d1d8663e54f57f2eb6ad765
+MISC metadata.xml 351 BLAKE2B 81b265b23499e957c079d50ecaebdbcd5664fbec610c3d4fecc6c3448aff8cbaeb0eb7cf7bb7083ba0d3b9656cc5ff5130e472b13b86d64efb5463d722bc645e SHA512 3c8e6297e14fe4f13574f89f7e9a625fa51998d682460bb85d5081b5636ae16d96df7a0865d19025f2de13c71df2e51bb3f80bd89fd4e080912e9ca5425ef666
diff --git a/dev-python/google-api-core/metadata.xml b/dev-python/google-api-core/metadata.xml
index a50ee0d43329..8d2a3f04ef20 100644
--- a/dev-python/google-api-core/metadata.xml
+++ b/dev-python/google-api-core/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>chutzpah@gentoo.org</email>
-    <name>Patrick McLean</name>
-  </maintainer>
-  <stabilize-allarches/>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">google-api-core</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 97e916d48bd2..ef009af49e10 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,4 +1,4 @@
 AUX google-api-python-client-1.8.3-tests.patch 1118 BLAKE2B 41900d0b3358128626090b94f8e2a1f767a31dce97efb3c7c5750704a27f9c962cde240caafcc883497b71209c7c8b6733464d1dfee00ad13d2707cb2beee397 SHA512 a14830727ab93bece5c65d303276b6ba85c5fbe8335d97be2f0478a7ab1d37d9be688c859b4ff4ecaf966a9d95f245276c81dd4d7d4e9bb31164a33ecabf32ac
 DIST google-api-python-client-1.8.3.tar.gz 13537177 BLAKE2B 00b1d46f349a8ad66d08a01da31aed224260ad38f0ee2d7a5b68afe29264234475d28b33cd95addf9f7020fa052e9528b01a4c9cdb73e2ca5742134c4f8f86b5 SHA512 7b9138b27bf032cc1b8beb321459ba5935ed31e4965fa783e472b9483cfd0e97c1da6a34e84fb8c939c462fac462d3f0d853266586ab37be8f890a6b873cf4e6
-EBUILD google-api-python-client-1.8.3-r1.ebuild 1388 BLAKE2B 37e8ce240c9f5d099d9fa2079a5e4417645d0aef2b70a6decda30516d0ecc96769f2c41ecae9e8b3a0779876e904c18d4d6d627d09e4a14ca285316edc6f5ec0 SHA512 b4d7cdc945235d85e631b38fc5d92f5c6577914dde48f2ced1497fcbb221ba89d126591add2cb98425a466e5964ff75c99986768ea735203ccc8d1d5af1477de
-MISC metadata.xml 381 BLAKE2B 2a802e6c566da699864dd520badb0a91eed1b7a1f26e3f20d6bd6bf7993325d07859034694d7d510984835369ea27a0c25241d9d202b3fc31fa2b52d26e42b6f SHA512 02a4ce0b16adaeaa44e041a2bfc0a4f97eb63914d10064403dae1581e3fdfda93673bb750a60e56b83c0bee46395266f7a5b846dfd65bf157253c733c8077216
+EBUILD google-api-python-client-1.8.3-r1.ebuild 1396 BLAKE2B 2b24de0fa44c19de9fe1c270d13f66ceba3e4acaaed9d5c28cd7411f87450b6eb31d8c8dcdd92a48d1e882b8d028cec8c2ca5e0deb815cba300258935eea6fae SHA512 2598029b7f1026e9f76d43c3c2e71721d0d31a19b6457894a898549c25be403deeee0b83b55ac5cb66396ba0cce19dbf3172254156e188ebea240dbbda70d056
+MISC metadata.xml 436 BLAKE2B 1f28873a4be7cbd2e01e8e88faaa316f4a55e25913c86668bad33908a9347b9cbcfd954c6b5c3557c7d01b256ae253d9836435846e79be49253a27a801cf3754 SHA512 ac98060c577e0f37530ac2659233bb7e098884f984236dd74f10d47569818bbfe811bb54f795886d899dc90c848abc0c5811a43173dbe4dc57249f63c40d2918
diff --git a/dev-python/google-api-python-client/google-api-python-client-1.8.3-r1.ebuild b/dev-python/google-api-python-client/google-api-python-client-1.8.3-r1.ebuild
index ed2b459505d0..b38bf33e28e4 100644
--- a/dev-python/google-api-python-client/google-api-python-client-1.8.3-r1.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-1.8.3-r1.ebuild
@@ -8,8 +8,8 @@ PYTHON_COMPAT=( python3_{6..9} )
 inherit distutils-r1
 
 DESCRIPTION="Google API Client for Python"
-HOMEPAGE="https://github.com/google/google-api-python-client"
-SRC_URI="https://github.com/google/google-api-python-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/googleapis/google-api-python-client"
+SRC_URI="https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/google-api-python-client/metadata.xml b/dev-python/google-api-python-client/metadata.xml
index 702c609a9e1c..17035ff1c96a 100644
--- a/dev-python/google-api-python-client/metadata.xml
+++ b/dev-python/google-api-python-client/metadata.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>robbat2@gentoo.org</email>
-    <name>Robin H. Johnson</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="github">google/google-api-python-client</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+		<name>Robin H. Johnson</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">googleapis/google-api-python-client</remote-id>
+		<remote-id type="pypi">google-api-python-client</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/google-apitools/Manifest b/dev-python/google-apitools/Manifest
index 1ce783d652de..f01bf46b5228 100644
--- a/dev-python/google-apitools/Manifest
+++ b/dev-python/google-apitools/Manifest
@@ -1,4 +1,4 @@
 AUX google-apitools-0.5.30-py37.patch 5938 BLAKE2B efc0962d612017903092b7ed37561a09eb78f8b2c189d7c8bf902fd11b711676a230fed57f2671ac0d0c9fdddfbe66ac911d84ce1cfab64ed6b3a865d3ba1aaa SHA512 0cbeaf85568a23224c32647c1e3f6ce3a173093df1d40e36a8f2dd9155f19b3211fc926c054add955934104a069787d7cac03aa86efad526556f3255cdff98f0
 DIST google-apitools-0.5.31.tar.gz 364797 BLAKE2B f61ea1f982653998d9c85782f171f1bbb5f1c20dee067eb5b865d4eb87db8287544aeeb94f722f8cd1d04c45974c15c54ec7edd581287323c9336d11e642f1b6 SHA512 b66b4ee17dca9330c036ad93521ec76ece84b2780743486e58f768db8949875710af256fe6ba8e570c1309b791c0fc0d6fca84342e3ced85fc6fba416cd849e1
 EBUILD google-apitools-0.5.31.ebuild 1033 BLAKE2B 318f21685f90478db2d0df945873a847a2ddd2c60a5ba6e585bc3afec45a9781a5f7c09ff60e5390b4c1c90337815e456570980237bf6071c15f42747a1e430a SHA512 ee9b30356982fd08f1e4f098762d4a6749c91f7969608f52e7b5ad498b1e4fa3a6a1d8d539c72f66c1db4db74e80fc6c1159b7a0f448f82efbfca2aefb7f2903
-MISC metadata.xml 330 BLAKE2B cea2ae09b3468b95764b84c8891b9840e918db4961a77f4d514a4c15a33248a011b79f235728883e31a968c69a07c436a31a282f1e4a2baed2cbb2c7ba3c4982 SHA512 a4b6c01f3d8c411c5e96b911585770af30c8a1f262e92bf01748447111798a8e6ede7aa5979f16c3cf7068b3f158842023546e234049e2345f1a2f2891e51296
+MISC metadata.xml 373 BLAKE2B 22089d9370239a2a4378657684c61a9093b442f958990491392c82a196e8ef3440cde1fedaeac7c3b3bf97cee724ef4b279c57af7720f647a39d2afd9dd6bf2e SHA512 d4dd3dd7e9eabbb4be5888fc5538eb3be2020cf58cb29308d8f93c4fc910b9595f09cc4bc86dd07577023714cfeaee0971139217e4e2ca77d65115d7da9d06a3
diff --git a/dev-python/google-apitools/metadata.xml b/dev-python/google-apitools/metadata.xml
index 8caccea78d85..4293947c613c 100644
--- a/dev-python/google-apitools/metadata.xml
+++ b/dev-python/google-apitools/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">google/apitools</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">google/apitools</remote-id>
+		<remote-id type="pypi">google-apitools</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/google-auth-oauthlib/Manifest b/dev-python/google-auth-oauthlib/Manifest
index 07d93e85de33..40cd8d0ad78b 100644
--- a/dev-python/google-auth-oauthlib/Manifest
+++ b/dev-python/google-auth-oauthlib/Manifest
@@ -1,3 +1,3 @@
 DIST google-auth-oauthlib-0.4.1.tar.gz 18687 BLAKE2B 1c9028f6b4c306bbee51fba5b55950d129d56ff5154645a166998c0c720b125202731f1cfed60837b8103d56fcdeeb818e39491b243a8d761969f73d9f88f67b SHA512 123707139353db8e05c81138af834e35007d323f0e19ae79088ad5ca4be86dda6c0df91e2f7794711475227a60312fab9101c91b49817bf8b84866ea6374c943
 EBUILD google-auth-oauthlib-0.4.1-r1.ebuild 765 BLAKE2B 570b9f7c9d1b456e32e11fed4431f9524697f16bb4f2d204122a2b1b40d440d95245bbb5b9bab662dd3017c715ca96c4a1bf82fb88c562c5989b011ee7dcccd3 SHA512 e6b3e48352209d98f604fcb10a99735879af43d3f065c0a5be45e3194bed461ecffd6e3932897ffed0acfee67d619da5e4bdd06a9318b356a600537171cae0af
-MISC metadata.xml 471 BLAKE2B 90a4bf76a2bc13430a090e21d75058f69c550dd5753f6aac13aa554760346bb9f6317f1f886eb49c79a8c94556e1f6e33f5d89eceaf3549efa7d30444ba29bb3 SHA512 867f9e108d33f62666a56915384ba2cfa04cf048a13835ffb9f96f6f45acb2dde77e36a43e68f0f4933ea5a0e79ca0edec7203537b6bd7a948158452c901b69c
+MISC metadata.xml 541 BLAKE2B bc6bd1d6e0a6106e267cd5c2fbb96c39db6d63fd659ea9e75d1391406976426080754de74df8712d9f8dbe434ec63b53210b66d9a5c87a267a17ccfa7c648281 SHA512 02022500c530d62d03eed95f458ce2a32278028bf41d014835e9d85c82e658f59c148d064a79cddbd58f717a75f5a8727e0fe4628dcb526327ec913dd82ac0a4
diff --git a/dev-python/google-auth-oauthlib/metadata.xml b/dev-python/google-auth-oauthlib/metadata.xml
index 28caf6379e33..8b0a33ec2229 100644
--- a/dev-python/google-auth-oauthlib/metadata.xml
+++ b/dev-python/google-auth-oauthlib/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>andreacerisara@gmail.com</email>
-    <name>Andrea Cerisara</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">google-auth-oauthlib</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>andreacerisara@gmail.com</email>
+		<name>Andrea Cerisara</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">google-auth-oauthlib</remote-id>
+		<remote-id type="github">googleapis/google-auth-library-python-oauthlib</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/google-pasta/Manifest b/dev-python/google-pasta/Manifest
index 1d0fa1e836aa..05e34ed9278c 100644
--- a/dev-python/google-pasta/Manifest
+++ b/dev-python/google-pasta/Manifest
@@ -2,4 +2,4 @@ DIST google-pasta-0.1.1.tar.gz 34476 BLAKE2B 04de1237eda9449e4648af0fc43b538d4c7
 DIST google-pasta-0.2.0.tar.gz 40430 BLAKE2B b3f068c0530149d6e8057a2e7edeb76b1912516a8227a837913783060e30f418159b38c77480248dc7a1586b46c9b5914e93c77a9430d963b3538e2197661922 SHA512 1d75d994a5120109677a58472459a632b31568e6ce79b205688913dc2a94e132fad818c73510b2f7d7adca3c757077543abd8b7f15be035a63fa15d38874c753
 EBUILD google-pasta-0.1.1.ebuild 481 BLAKE2B 97b6c1d3acc931792958e574186d793723d991449bfe3e1df5aa39ec72315a5bdb05da5450e73e05fee350392b609884ab2daf98346e2b009d38c13b8a762985 SHA512 144f0b6784b456fd26797dd432f57021a9ce92910585dbf013d9942413d8f7061699027a280c81c87505c8555e8c0c9e24f7a4a804c9442d3d6bc15f9e11259f
 EBUILD google-pasta-0.2.0.ebuild 486 BLAKE2B 47df33c482d490dc5c9a7e7c3f86929173d791b0c8ec765fbeb3164b2109734934633d2f7e94d5f924420ba8c5e86bc41b2d0a061a622f089c2931a44c9a44bb SHA512 826e2518d2820b6f08f1944e05eff31b3485c65399efcfe625f692452dcce304971950750d9610eb43d77d6e1eec9d38efffa1ea217db061dcb367c436b0a08f
-MISC metadata.xml 247 BLAKE2B fad006bd63156a3ffcdfe9e4c216b806d3b341fa5b7e8de2608ad51674b482493f7d0fabdeb6010ce0c41aef65a55abe404b8ba5ba7d72f36822b7d96d58182b SHA512 189f876175728dfb474cf2ccb122ebfe48b068cc5fd65a3cfed7dad947dd9ce0fc7c89ce5c0982fdee5262025236b7d5cccf48b55c67c5cd33e84910c28e0b46
+MISC metadata.xml 322 BLAKE2B 2c65b78f40b5805ffd54dd2c4d9e6b2c142888ce77b6885461f972b744c11a41466e26bdc2cb21fe24425bac32af8676315a42d69a7781e2031659f8693e552b SHA512 3bac4b24cefe900f5ca789cc1b3828002ec4a1041c7b6c9f4610ffa73ee98ce81dba823fc9b65af591c9b57c9b3e14be10bdeca77e952627dbd6f12977395e38
diff --git a/dev-python/google-pasta/metadata.xml b/dev-python/google-pasta/metadata.xml
index 76f45cdee0f4..84a9c1465ee6 100644
--- a/dev-python/google-pasta/metadata.xml
+++ b/dev-python/google-pasta/metadata.xml
@@ -5,4 +5,7 @@
 		<email>perfinion@gentoo.org</email>
 		<name>Jason Zaman</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">google-pasta</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/googleapis-common-protos/Manifest b/dev-python/googleapis-common-protos/Manifest
index e13f77e6a93e..be3b604e2fa8 100644
--- a/dev-python/googleapis-common-protos/Manifest
+++ b/dev-python/googleapis-common-protos/Manifest
@@ -1,3 +1,3 @@
 DIST googleapis-common-protos-1.51.0.tar.gz 35176 BLAKE2B 517004426bb04dc58b85a43fc4268407bbb3a5b6abc1949bda39e03a08a506e727e2bd1741180dc03695b09f4f094c55fe836d275b2c2de146459c399f584355 SHA512 31b6754d5541de4a6ce13e1e54dc54ee29c8153b57de3d0faf40bb236b6af9bee0516957f4b1f64f4404d713e3185126ef782a7825747fede827a8a8e604e303
 EBUILD googleapis-common-protos-1.51.0.ebuild 681 BLAKE2B dc517963dd55216c4782c5bef0b11b34e65b9b036d3f78a8f1e5a158356bded5a3b6351d9a35c35793d32552f593d4f40cd7337e0fa4be02d00d4fd91245ccd6 SHA512 2fc097e384ae7b7a35c4041387d1af7ffb28d9c54515abf9989165851a7d29b3b6c5022a6baeb5c8ce5177db22fb51547a960fb7e8900957554607f84eed8396
-MISC metadata.xml 280 BLAKE2B a1973c7508f6f1a2cca51eb3bb625257870e00e31e6227f20a34611c81141e812e6a38ff6e66bd43abd0b238b1f5b36b262cd08a69e606f677ab6b1a6a68fd05 SHA512 7bfe4f6ad469f5ecb38967b5a2413baee476acfabce20cacbd0e784aa2e2d3636ede1a2b97088bec5b6c249c7ada0be3b44218686d1d8663e54f57f2eb6ad765
+MISC metadata.xml 360 BLAKE2B 817566cf751db360e4d4f0a3002c9fc36067c983b197fee5175d63f58f057c58404aab2a14e4d33132e25078d3d7bd2015e1b89a6ba702793015f3b42af0c213 SHA512 c84b7ec502160c9f7d6f79d446474f6684f710579efc9f4471b0499b21902334d4f3d0e1c6b9ab61fec40c6c411a80821b43756d5e59c6e6649aa3af8d452163
diff --git a/dev-python/googleapis-common-protos/metadata.xml b/dev-python/googleapis-common-protos/metadata.xml
index a50ee0d43329..5d6bf1704c98 100644
--- a/dev-python/googleapis-common-protos/metadata.xml
+++ b/dev-python/googleapis-common-protos/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>chutzpah@gentoo.org</email>
-    <name>Patrick McLean</name>
-  </maintainer>
-  <stabilize-allarches/>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">googleapis-common-protos</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/graph-tool/Manifest b/dev-python/graph-tool/Manifest
index f21d9a340fbd..25dd6a6ebd46 100644
--- a/dev-python/graph-tool/Manifest
+++ b/dev-python/graph-tool/Manifest
@@ -1,4 +1,4 @@
 DIST graph-tool-2.35.tar.bz2 15153787 BLAKE2B 31f815f564510bb9628f43e8afab1a561222d23aabc3417ce474f0db69625954fc46119f61e8d7764d49a291e16e3b32f2e4249304f934c08d17af3e47a39ce8 SHA512 eadb122b75ff95fde165bfe1be8387deb08b48d041236aff11a0b8414d1a5027931a5e4b3216348edb61c53187b191a5e78af4eabb1ce679dd8736651f142bec
 EBUILD graph-tool-2.35.ebuild 1813 BLAKE2B 9d5e874f2cabdad5acf309aecc6255aee0b828a86283d6bbe81d6b4ddd9802cddce88df3991446c3ac2ce6fcb54b02f4f166a4d89374c579f1834080cfd866ab SHA512 e97f000c5b861cb73ebc01d4b9b3459a981ca7de53a6f5d673db6e67a599150beab91ad1dfc02f39efe75c58041c13cb03d7419960ce281767d8dda4778f0136
 EBUILD graph-tool-9999.ebuild 1813 BLAKE2B 9d5e874f2cabdad5acf309aecc6255aee0b828a86283d6bbe81d6b4ddd9802cddce88df3991446c3ac2ce6fcb54b02f4f166a4d89374c579f1834080cfd866ab SHA512 e97f000c5b861cb73ebc01d4b9b3459a981ca7de53a6f5d673db6e67a599150beab91ad1dfc02f39efe75c58041c13cb03d7419960ce281767d8dda4778f0136
-MISC metadata.xml 346 BLAKE2B 69ef980447280fb170c6fc3d23bd775afb2cbc451054214ab0d1628ac5ac4be136a796c1f367d9e5ed2b914627cfe246372fba4f59e810469439b5e160d8aefa SHA512 1f8d51beb2a99ff4ac06f8e13529f09f4ed7322ed05ca281fc2e79d8cf309e3ef38695c57d27f80f25a490edb98ae4660b16fd3f671f232a3e1be2daf253ac7a
+MISC metadata.xml 419 BLAKE2B 0048f985eb17f4acc869103b22064deeafa6ed284e11cb64f631de973d0e6ffd6f8fe24521ac99e77033944fd9228eb81c3efc7ebe7379fff44b529afd4b31aa SHA512 77418d4b6a675576fa8637b9814723062ca3b6c035a96fd22e41cecc2e9effc65af8e71802db2c2505af83abb0f0f2b0e5ab7a29b32207f61d91ff4745e4b724
diff --git a/dev-python/graph-tool/metadata.xml b/dev-python/graph-tool/metadata.xml
index 9718da9a7a91..693dc1a8e746 100644
--- a/dev-python/graph-tool/metadata.xml
+++ b/dev-python/graph-tool/metadata.xml
@@ -9,4 +9,7 @@
 		<email>chr@chymera.eu</email>
 		<name>Horea Christian</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">graph-tool</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/greenstalk/Manifest b/dev-python/greenstalk/Manifest
index 762d45f68b10..ac63f1d00c94 100644
--- a/dev-python/greenstalk/Manifest
+++ b/dev-python/greenstalk/Manifest
@@ -1,3 +1,3 @@
 DIST greenstalk-1.0.1.tar.gz 12898 BLAKE2B fc0b90ba95b09e1490025175339c3f9eb7afed16db40ec34031305a3d487582fc7305b1990424f53a06887a34c30ab4f957db01a640576aa1c5db30511161c0f SHA512 8b57ec0c7fd3a60c24e8ddd7d51f31c0986317cbceb0f7045bbd720ca58e8f3c896f2f9924de7b1e8693844c814ecdebc020972d895468d1b0e7d055bf628b16
-EBUILD greenstalk-1.0.1.ebuild 571 BLAKE2B 73bd90bf5eb3c067a674e3ebe2c693fd4b659126da676500c935cb1f0851e0c1c7d50d7bde382c4fdc31680cd6bf7817e4992264251999b1d16b155d92432b50 SHA512 d7da8b528575eeb6b9b36ae3de7c3d652300c80a652d819402f44b04aefa3af0cdc10a850a0915333e8f4fde50323e089b99da040425a52949a2cbc6af173788
-MISC metadata.xml 253 BLAKE2B 9e177062103bdcc3b73c3ad16693d30f52090aec4f4d9f4c1e29be57ad952aea6bad43d5b984bd292d2af420b2eff36f21fa8170108530feeb7a4d4330f21c78 SHA512 64f4f4c5f42c0a4a9375595c017bf03371f59c36b79da9dd0e819f50a2e9a59b01c96d1ce6dbdec306434960bdfeab97308dbbaeb4c58b7401a206c46599fb8f
+EBUILD greenstalk-1.0.1.ebuild 581 BLAKE2B f87928b6878dff4ba6ee0a91d626049def3958acc2b49f6c362aecfb7d270ac45e57d7052e6b568fc7ce1be4063070f9f4a30f012f5124310398029051ea2a38 SHA512 d843946e6cb0f80239597586f2470f538cfc702cd9cc9e8039f8eca13c07ad5fd8566446d2d04687c9aac6c7f018d35a314a6336f0512bf51e4a0b4ec05b550f
+MISC metadata.xml 303 BLAKE2B 6fdf6537843e7558600d36146243f5e0a374fe164097e1ee631df7a30fc89ce04617599bd0e2ca704af91358b2555d4b5bcbb8ac1d2aaecbf7a6a969dc8d4170 SHA512 6e03cbd05a11691b5e78a8ff58be5765efadb0478180348547948fe2ee9c00e2982d53aed7a4acd93b045e6672fc8c4a9a2bb0546abf2cdd7fd1893454e41670
diff --git a/dev-python/greenstalk/greenstalk-1.0.1.ebuild b/dev-python/greenstalk/greenstalk-1.0.1.ebuild
index 411e09a24d64..5893528dd00a 100644
--- a/dev-python/greenstalk/greenstalk-1.0.1.ebuild
+++ b/dev-python/greenstalk/greenstalk-1.0.1.ebuild
@@ -7,8 +7,8 @@ PYTHON_COMPAT=( python3_{6..9} )
 inherit distutils-r1
 
 DESCRIPTION="A Python 3 client for the beanstalkd work queue"
-HOMEPAGE="https://greenstalk.readthedocs.io/ https://github.com/mayhewj/greenstalk"
-SRC_URI="https://github.com/mayhewj/greenstalk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://greenstalk.readthedocs.io/ https://github.com/justinmayhew/greenstalk"
+SRC_URI="https://github.com/justinmayhew/greenstalk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/greenstalk/metadata.xml b/dev-python/greenstalk/metadata.xml
index 1c4b1a9121ed..ee3916a8ff89 100644
--- a/dev-python/greenstalk/metadata.xml
+++ b/dev-python/greenstalk/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="pypi">mayhewj/greenstalk</remote-id>
-  </upstream>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="pypi">greenstalk</remote-id>
+		<remote-id type="github">justinmayhew/greenstalk</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/grpcio/Manifest b/dev-python/grpcio/Manifest
index 9db085fcbb96..a70b8f26774b 100644
--- a/dev-python/grpcio/Manifest
+++ b/dev-python/grpcio/Manifest
@@ -3,5 +3,5 @@ AUX setup.py-respect-cc.patch 1152 BLAKE2B bc939dd5f28039c8d2a7c5ac40eaff2437c0c
 DIST grpcio-1.28.1.tar.gz 19511346 BLAKE2B 01ebdeddcba5efbb67880693ede04ccd828771fe73def24a91d882c28f5cf6f14215daca212df1d8bb9372f385aff1e31418870437c87343f218e7b78a06b04c SHA512 12feaee3816a5e7b20b648a144d37f7e550a057112f5460bc4ec016885461951148cd4d2900fbfc905f76059ef29ae4c4d1d5a3216e5e3a2d17048c8b45f394f
 DIST grpcio-1.32.0.tar.gz 20809917 BLAKE2B e28cb44d09fd775b9b6dc87dcd52bf7f144643b09912ff8b76bf39cb250743f90bc7e3769252d47f205f9532157ae68b6ac0a9202158cb14e7b9ad448d951656 SHA512 f802a7b83bd166502fdcbfaf162652adcda36da1b2e91b5073e3b3d97d38191fe989a6dcbec6c1bf27fff162633e54bdbdb20a92e74e14280fac4576baa92157
 EBUILD grpcio-1.28.1.ebuild 1027 BLAKE2B 283b657f796910b58c9e307007884fea2fe8ca296771b19063392ca52ebd66e1728b6be2c7bde859153f353c3b264aa751b8f3cd3787e036f4ee92f92d474179 SHA512 027a951f9367400c15f6ec99ea8dab3d67c4fb49749004559a68ea8156158a5f7084cae37be0ae34846f6d485b44c83e3bc00e744ea5977c9a1353a783147756
-EBUILD grpcio-1.32.0-r1.ebuild 1208 BLAKE2B a740044f3e69fcba659d4b950b363ab9fcffccd78e4932d8dd72ccf1e6f9e9e2d412b8a46585b421518ba590f730f7ad4aa0beb33cb1e1e255c90f2336f57146 SHA512 9d72375b52b0158d199567460499c277b8076506c095876dc5ab2cf2fa531c1965cda561f6a99158476fe289bff35a27a7304a42f1a5aa876433034dc34e14cd
+EBUILD grpcio-1.32.0-r1.ebuild 1207 BLAKE2B 220068aa8c870891b85ac2c3ee0c3c676c34082951948ff77467273aeda6a5467286d9608b7d0545601f79e4cdab3f93c51013987732f94b9cfc14f7d958869c SHA512 63bad954d62bc57401e18989fc5093f76d82f7412a3ae14127795fefcd9b1f7253ce21f1b1763e3d5638ceae7fe6453a561935b9604b83c2bbc582b7447af6ac
 MISC metadata.xml 369 BLAKE2B ecee9ae9625e7571842df207d1798107ea3dc8a16b8b3fba8a2fd861d6201061d325b7b0045a4b02c80dff1ddfff28dbe1f9315f73fc6ebb8c8626e5ba2e0c3c SHA512 b8e9539af700e83d3b7311dd26ccb10eec608c2360b0cdfdbc5d55a75fc40299f6cc2b18ad67fdec1df0e42b5cf8d740f3d52b81d54cce5697d5dd06cfa75e75
diff --git a/dev-python/grpcio/grpcio-1.32.0-r1.ebuild b/dev-python/grpcio/grpcio-1.32.0-r1.ebuild
index 6a709cdf780c..a45873f73186 100644
--- a/dev-python/grpcio/grpcio-1.32.0-r1.ebuild
+++ b/dev-python/grpcio/grpcio-1.32.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
 
 RDEPEND="
 	>=dev-libs/openssl-1.0.2:0=[-bindist]
diff --git a/dev-python/gsd/Manifest b/dev-python/gsd/Manifest
index d85634cada99..f2c10c14c6d8 100644
--- a/dev-python/gsd/Manifest
+++ b/dev-python/gsd/Manifest
@@ -1,3 +1,3 @@
 DIST gsd-v1.5.3.tar.gz 240114 BLAKE2B 076d888f03350fba2388c907787354e878a1536c7d85c759eb3513102ee2abffe2c9313a6e9e208726d66d6324dac02ae70d8872342f9bcb162ad13d9a23dbc3 SHA512 893db74dc481da47d6c51ea0d0d9faefbe164edfaeb5a2ed73e25acbd9dc42c3cf28cbc0d9257c6bf0cc0e9911ab85cfa72997886350c0e7c125d30636ec432a
 EBUILD gsd-1.5.3-r1.ebuild 536 BLAKE2B 2c3f396b53c76d5b73b059504b50e09ebb50fbdf62d123ea3c0f6121047f67f0316396a49716709aaa79ea3ebfd082d4bc02fb1aeb3b016a56066cf6b9e07ca7 SHA512 56fc430554d29334fc29389c9c3b355057a7bc76777ff9f682aff2c9a96238e39adbd79f5d1f76988353a3dc6fc648ff3c03d48f74db7a76adff0ac06c907945
-MISC metadata.xml 349 BLAKE2B 92fd987b0f0f73a6f07f9a3002cdca45698f61d9129cebdf2f1756bbe4ac926494bfcae209d18f6283665a95090be82ac6b34c0189da6372368833b62b67b626 SHA512 851f80555da7cbd3b2c2e696eecfe8f2cf19b61359c71d67c917c44a18f55c13aa5047afcf95afe0468ddb84b741cb183244889cd44e80810a0a82756fc033a4
+MISC metadata.xml 415 BLAKE2B 62bed859c6e9780b32b461753791148b79b682832f19d35e9a4e1091b6ba1d709c1f7a7e30074efccb661f4a637a3f14a4ff4a9132705ff0cfe158785e815b14 SHA512 7d46022721ece627d423f441778bfc469e7eeeb2aa73abd567f7e0449d4a07e8cca1e02dc4e37f52d2de13d214607eaa164869f80ea33f227b3305c9eba36083
diff --git a/dev-python/gsd/metadata.xml b/dev-python/gsd/metadata.xml
index b68a232b6ca7..99d3a572301c 100644
--- a/dev-python/gsd/metadata.xml
+++ b/dev-python/gsd/metadata.xml
@@ -9,4 +9,7 @@
 		<email>alexxy@gentoo.org</email>
 		<name>Alexey Shvetsov</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">gsd</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/gst-python/Manifest b/dev-python/gst-python/Manifest
index 0c97a93a2ae0..a6fa7ef22052 100644
--- a/dev-python/gst-python/Manifest
+++ b/dev-python/gst-python/Manifest
@@ -1,4 +1,4 @@
 AUX 1.16.2-python3.8.patch 1400 BLAKE2B 67e870a837f8fe2a2b7a5cc38ed0528a1afc56035074e95437df260fbea52834217617a18520dea55e71fc5b71b4f86120125b1ef35d88daf19f35504ab6fd5f SHA512 1dd7623488f9612ad195f3e920e1ff8bab321c9009dcecc0d359807c2cef6b733777c6aed8f500c0925c3a6dba356a3e2a333991bf232f302e0f028eb3de1234
 DIST gst-python-1.16.2.tar.xz 414912 BLAKE2B 016e59fc7d29047dcf49901d4ccb1ff2e96950dc723cd7e9dd31e0fe92257e881ced1c93e7e4e531320be8fb9d6cb8382d2c31e460448d5d630ec7c8a0378024 SHA512 c274591cb820a2576ca236de0d1a2c2c53a9db11afc689e0385afe3d38fadc59c9230d65198e79e4059abb90c0e5b6d71f1ee4cf1439d92feaaffd2ab5cd3a23
 EBUILD gst-python-1.16.2.ebuild 1611 BLAKE2B 6db4e6b87c4f14b2cbbe9823d9cb60018824073bd4aa7fc7333dc5081f2c3c18549c679de21ce0069519fbd0605f8409c2fee9f86a4cf805d593748057ce4f5a SHA512 481113d7034dbe4d402011d68ec3c8c7d9c7f39c68348a1f5120a1deb6ef03666d8bfddcc7c217a5c359be130ed4de3bb80505e45bb63eef9332626ba1369cc9
-MISC metadata.xml 272 BLAKE2B b1575d88177572e472e66c7cce4fb4c0d98aeb02edb03e800c2b2f2702b5c81c6c012c264655fce8c3170e44bfa117c81b85cdbb9f409714ab216c7a6f2b4482 SHA512 7dffa3bd729f24f9081f6b1c3db474cb26c54e95752a37140c5a9836299f26b3d0aa73e7c448e6b773478cb0112eaaf70f783d2b2f3d2868b1a2def8e6a9b8ea
+MISC metadata.xml 266 BLAKE2B 3180109d2a1479e9436a76fb478dfb1b23db0daedbf0ef264a469fbbfecd858adf6ec01f3fdc5c56270d0a9e1e150ac947f4a1f893e967d6b1dc1f1b8f6d4ccb SHA512 aa2ce82fa0c848119ff309462722e1d7897da904f9e1dc9ae12dd61582823b69cf5a40faf8da0825ec397d2f01d44e82cb56730d9545abd619a17696091eca75
diff --git a/dev-python/gst-python/metadata.xml b/dev-python/gst-python/metadata.xml
index af143d8096cb..42b76fdc5c1b 100644
--- a/dev-python/gst-python/metadata.xml
+++ b/dev-python/gst-python/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>gstreamer@gentoo.org</email>
-    <name>GStreamer package maintainers</name>
-  </maintainer>
+	<maintainer type="project">
+		<email>gstreamer@gentoo.org</email>
+		<name>GStreamer package maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/h11/Manifest b/dev-python/h11/Manifest
index e837a707e42f..106cacccbb68 100644
--- a/dev-python/h11/Manifest
+++ b/dev-python/h11/Manifest
@@ -1,3 +1,3 @@
 DIST h11-0.11.0.tar.gz 97509 BLAKE2B 51e4eee959f36775317ac67450c80a6484309efcdd5adad3737d2d80ab5d9808d5d8aeb0118aa79f88848c052c330542ebfb4c03b96bdd805015fd9ad9f9fd41 SHA512 13dba59afd949d715fd693e5224e57dea5c923eb91b0981a5b5987bbe6e6e00e32552e1602353a48458615a8dd21f2a561961747ae15291eb3462fe42cef3f82
-EBUILD h11-0.11.0.ebuild 458 BLAKE2B 18432d980245cebadc1cf51f3d26370578a30d503e3ee7a326cfd7b5d75ef1968f2dae0d861ac4ced093744179d5b388d69d6d8f7baea87d13f23d97f44c0d41 SHA512 dfd178dd8da7d0d1955b24468a9d505e650188881463bd34d39de3b507b39144d77e6bfb2bcad198cdd51ebdda8c2ce167ec82efce35ee95e796ca1cd28baf00
-MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
+EBUILD h11-0.11.0.ebuild 456 BLAKE2B e209d759131ddb9c968d946c88a02f52a6025bf3542e250be696cb90fb0bfdb6ce9fa7148c9b733b6412d7989349788324c0adbca1bc7555fc703644b0d79749 SHA512 21a2075da34542443c770918a0aa8fa3054a18e3e7d388e9269c7e8bc3d291d205385faf050cca974c3aa0109e00c4482007f3c7b68cca31af68f04f95ab0126
+MISC metadata.xml 362 BLAKE2B c2f92baeb3b7796d39c6001c0df00a04378e3a9c3037e1f547fd8991e6b71fecbd158c88263b26399edd7cbd4645af3dd7207295c1a6d554839e8c983da9c489 SHA512 29c2a05396fab9a3699538cde0f7842823e68ab6d5b19bb6c7cf7c47b7fc3617044562965ff7f706f1a9043d1c7169cb8f69b1828606fa2d42a9d0582faa0633
diff --git a/dev-python/h11/h11-0.11.0.ebuild b/dev-python/h11/h11-0.11.0.ebuild
index f61bd104ce99..daca33b59cec 100644
--- a/dev-python/h11/h11-0.11.0.ebuild
+++ b/dev-python/h11/h11-0.11.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit distutils-r1
 
 DESCRIPTION="A pure-Python implementation of HTTP/1.1 inspired by hyper-h2"
-HOMEPAGE="https://github.com/python-hyper/h11 https://pypi.python.org/pypi/h11"
+HOMEPAGE="https://github.com/python-hyper/h11/ https://pypi.org/project/h11/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/h11/metadata.xml b/dev-python/h11/metadata.xml
index 7f4f33c6dbc9..ecb8704c96cd 100644
--- a/dev-python/h11/metadata.xml
+++ b/dev-python/h11/metadata.xml
@@ -5,4 +5,8 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">h11</remote-id>
+		<remote-id type="github">python-hyper/h11</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/hcloud-python/Manifest b/dev-python/hcloud-python/Manifest
index 44d592ef8fe5..9afb8311de09 100644
--- a/dev-python/hcloud-python/Manifest
+++ b/dev-python/hcloud-python/Manifest
@@ -2,4 +2,4 @@ DIST hcloud-python-1.10.0.tar.gz 82155 BLAKE2B a22ad24863f416b039a04d9e82675fa79
 DIST hcloud-python-1.9.0.tar.gz 88885 BLAKE2B 455f955caddd8e72d02df57da2e08f395b9845f9658b73dd9f96b1fd73d7793fa13319d8365903599c000a803c9374dee7b50c5ad2a9ba449027d3dc602601fe SHA512 6da2a3eb7e4a4d7f13137167199f01f370210e6c139f0cd8a8e447ea3f14101d4b37b104ed387b1713ad62351ae72c8add7970e878571caa4242e6e347ef8833
 EBUILD hcloud-python-1.10.0.ebuild 1277 BLAKE2B ce85723c4555916561b612095e998e4c40f831fd4638041238cd436fab1c7e629ff14ec103262a8e969feeb043ca53689f08b8ad1d1a07ae85f284a5164b2f29 SHA512 b46383ba8af2d2a7741c8575f50620405bdaa4a2a5b40b7c73f96a74da067922cb0edc831f28de641500e2ebf3dde10227af1922d6469045e837f9d5dc366532
 EBUILD hcloud-python-1.9.0.ebuild 1276 BLAKE2B 2088306a31ee63ceb9786443410cc49be7e78ac31aaa7dcba875da04071ff1718830276b8cd6e4e2ba9a301543d803329de75da1da2614d1b4fc32112442470d SHA512 00d995349df255a60a1263b3476a2bd23846cdfa00989baa71c7af5697748bcf504580f43f0c5ab255537e8ae8f77ee7a4f26978720b3d8a67e510369592fd52
-MISC metadata.xml 347 BLAKE2B 4e9c42da7ff606982fb56c60b2eeb1315e862fbd2e55b28a46f8f86ff348fed8fd5a14843e8c41713267d16b378c2e317c672bd561056544dacdad8f09f54eff SHA512 f7a5d3297b23b097ca65415ca87441f9b14dee1f7be980b6bc7d747388fd511aadd12161f5785bbf3c97c3301487e0144fe11c40143ee8b25183c7f68a6d3c9b
+MISC metadata.xml 381 BLAKE2B 704cd7244e080a9bcd1e0acc210b489b65f7ba6a956eddb43f2fed41ff21a5d1dda01a4cd75011caa57e5f6ffb1aa5fc8d9c5b03286a36a2c04bcd4526cba939 SHA512 7197119ff8c7ecb7025b0b9810b447175410e242bc08fc78473b9c25c48611903114f766fdbf9b2a8db50897487c1f971ddbb66fa1f4ff32835de4b307136293
diff --git a/dev-python/hcloud-python/metadata.xml b/dev-python/hcloud-python/metadata.xml
index 7520bcc3afb8..31093cd149cb 100644
--- a/dev-python/hcloud-python/metadata.xml
+++ b/dev-python/hcloud-python/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>ago@gentoo.org</email>
-    <name>Agostino Sarubbo</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">hetznercloud/hcloud-python</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>ago@gentoo.org</email>
+		<name>Agostino Sarubbo</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">hetznercloud/hcloud-python</remote-id>
+		<remote-id type="pypi">hcloud</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/helpdev/Manifest b/dev-python/helpdev/Manifest
index fc830240b253..06193647ac07 100644
--- a/dev-python/helpdev/Manifest
+++ b/dev-python/helpdev/Manifest
@@ -1,3 +1,3 @@
 DIST helpdev-0.7.1.tar.gz 51575 BLAKE2B b780513c8b7af12296c003360c5805e8414e5c82fe459ab1e4ccaf68c9f029c817a6cb86535d26ad0143ea7dc60fb86126f6d87d4a84e85a9b29a9dbe651e2c8 SHA512 ba0af843617c7cc69aae2bfe88d437e90df14afa90dd0a76c0e7c1062f03963270514ff7653c859a70caec0cde3cc3f18ca87573fdb6a1d5e2fd5874cc24e59e
 EBUILD helpdev-0.7.1.ebuild 716 BLAKE2B 81042555e6577377f45b6b8719812511322dadfd57555cafab895d59167c54f116bf07ebf181ae6270ce644a3bc4cacde669ddf11c2d7b6fc773bf1ca03c8652 SHA512 ca9dd61f3776856f157dc4b1c004b67a4ff6d5c2a09ec35c1bbbbcf7d9b8722c7f18d48c873caab455cc9c15797bfb46e6caef122d4ce74e3ad05759216b0520
-MISC metadata.xml 412 BLAKE2B 1c1563b175b955ba98fa211a2277e49347a6e3bdf4aa4fc585a2eeab65b080e2b63ddaaac5958521f9e421ac3c0a8bb5872416e0186490b0185eea76d527dbab SHA512 d5cfa13aa12b5612ac426563ec40fe585231a3a599b91490d81745c5b77c9ea603335fedfac9d62e810694e25f2fa5ed71e47e13c85cb75db57c116db3164225
+MISC metadata.xml 445 BLAKE2B 3766233b1cd7a60dc6a6698262e59b531aa0e247ebe08e93d9528751ed3dd606950316d03c1efc4458d1928d205af1af248568fe3f9e3d0721ad94d42be6c8bf SHA512 990e645ce0d9b22c6d286580383ffe5e13a592cfef876aefd8a277d3eb13a427115617b55e88310b32662589b825acc6dfe98dffadce6c0efca071a1fb014104
diff --git a/dev-python/helpdev/metadata.xml b/dev-python/helpdev/metadata.xml
index dd0bd9c021f6..27e26cd85d06 100644
--- a/dev-python/helpdev/metadata.xml
+++ b/dev-python/helpdev/metadata.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
-    <maintainer type="person">
-        <email>andrewammerlaan@riseup.net</email>
-        <name>Andrew Ammerlaan</name>
-    </maintainer>
-    <maintainer type="project">
-        <email>proxy-maint@gentoo.org</email>
-        <name>Proxy Maintainers</name>
-    </maintainer>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">helpdev</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/html2text/Manifest b/dev-python/html2text/Manifest
index 0abbdbe929ce..85288b7e2d1c 100644
--- a/dev-python/html2text/Manifest
+++ b/dev-python/html2text/Manifest
@@ -1,3 +1,3 @@
 DIST html2text-2020.1.16.tar.gz 49464 BLAKE2B f0331daa63b9e5d7508e0446e19b4dd4d05e5f7af0279efd71dc43b633f8273666189899a27cb598e8afdd5bd8ffb3d566b97327d82870ef44a81310d8e7e7c9 SHA512 14453c98e81d05afb3241b04a9e50caf63e4b6f857337b4bd9f53e6b8fa7146aa6a1f4f64777db9fa350316b19fe62a0033dce5748191ca9fbd17a8757002855
-EBUILD html2text-2020.1.16-r1.ebuild 731 BLAKE2B d366aeee4d0b9804d9c8ba7c7969b5a71d3647c8c9ef1ee2d8b71273b9d89f7f59d20a456a2e8cdf56e8a9b403d3d003429463e248a9c62f94f2f36c4ba1a17c SHA512 be1fa4f0018c6b80509c1a3a7064974225487d9987dbdbca7b281cb50e7c9a3f4e42061972ba6057eb8201a146c0ddbbba294039e892cc4a147d5f20fd607908
+EBUILD html2text-2020.1.16-r1.ebuild 733 BLAKE2B 14fe7a345746164a5ab98eb2b51c7c6681d0cfb19413d81c101bdd45138a21c6de8747797ccbf8d299fdc3e142e4e33a2dc8c00310afc0d082a5035e1b1e1c7a SHA512 db8de01e2193e0be5acc72a069d5cfd79a9390042ebdb935c2d7f80081a37b4569fe2d5eded3ff6c43c553e441e255ba4a8b0010bdcfbca88752dd0014166df3
 MISC metadata.xml 369 BLAKE2B d4f2c4f645c20a9e803e76df75ca78b79d8ccebe56ee8430d38abdcc096be85397b6541ddc2f25cb2c79d955b9ee913437edda69956cb78c1f0c38256b311be5 SHA512 dfa2834eca444d2c56f36b11a193c4e6b012b3a3afab08034c87d9ebb442010f2454788416380a4caf78ebaf47feb2212643977aab3100971fa99f29fe29955e
diff --git a/dev-python/html2text/html2text-2020.1.16-r1.ebuild b/dev-python/html2text/html2text-2020.1.16-r1.ebuild
index 0d35c5ea9fb4..fa61e0c63982 100644
--- a/dev-python/html2text/html2text-2020.1.16-r1.ebuild
+++ b/dev-python/html2text/html2text-2020.1.16-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/html5-parser/Manifest b/dev-python/html5-parser/Manifest
index 5227d104722a..2e9988686be3 100644
--- a/dev-python/html5-parser/Manifest
+++ b/dev-python/html5-parser/Manifest
@@ -1,3 +1,3 @@
 DIST html5-parser-0.4.9.tar.gz 274597 BLAKE2B 7744798d74db1d591490c75eabae5333e90f053a8ba1c5517f08c1b9c253042796e42618ae0a674e1b1cfa97390448ffc595e861234f5b980a1f7c0b9056cc88 SHA512 0fce4b1a18b29a9fa94e3769e2443601a502158056be1c93c1c1ddd5fe84d11d5d6dcae6338ac0a21aae7972625f28c0ba66099fc51081f504cb596626de990e
-EBUILD html5-parser-0.4.9.ebuild 855 BLAKE2B 1cfba7b41fb3ff90ce00c5d27b9569ef99d557b610ed643d1850d342c3b64d5f78ec0db93e55b756de769cdfe2b45ef68140f3c6e268673e68bf0c1e83dbfaf1 SHA512 25b3b7b6c52a019d93a7ba9fe151e4897c9fbdfd890c7c0908b2a94ac4d733ac18f5832831a36ba8ea1b65e8e3b9c929ba1cd565ed6805389ab6f88550e3d5d9
+EBUILD html5-parser-0.4.9.ebuild 857 BLAKE2B 0a5a554e63e8ba12f594e06db256a2078a7e97b5a183d6125f2db11a23933888e1f88f2b1efd6312951cebfb95f1e4efea8beb0f5b602c949a75ceb4e47aecad SHA512 33cb4baa06b1f27ffd9064ca1faf825ef46abf1f427b12feab2ba487cafc7662400e55b60b95ec517be2e0ea223426b5588bfd3a7f5ef5645045708211506d07
 MISC metadata.xml 356 BLAKE2B 8e97cfc61c6249d06916c0c6464637f4d776d81ebb060409181ba40eb91a65485a3c067b50f18dc9d9c9bf29f5a98bd40dc6ff89a0c68b30bc00353917db4e08 SHA512 3452ea432c8187cf09b7ce3b70df1c951ae243c153300093583efc337d9f6c42c41082b34ff6a81c19337ef508c90cff4308d0da63a44f4976d11ff57779baca
diff --git a/dev-python/html5-parser/html5-parser-0.4.9.ebuild b/dev-python/html5-parser/html5-parser-0.4.9.ebuild
index f7c09bd71d51..8878f4a6527b 100644
--- a/dev-python/html5-parser/html5-parser-0.4.9.ebuild
+++ b/dev-python/html5-parser/html5-parser-0.4.9.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit distutils-r1 toolchain-funcs
 
diff --git a/dev-python/httmock/Manifest b/dev-python/httmock/Manifest
index 85fd69ba0659..cd4fc774f06e 100644
--- a/dev-python/httmock/Manifest
+++ b/dev-python/httmock/Manifest
@@ -1,3 +1,3 @@
 DIST httmock-1.2.5.tar.gz 5409 BLAKE2B 06ea90b6553b2d97b72944a05587e07c4c6ffa9282a81dd976c8f875ae92fbeded10dde0c060b2c9883bf2827d7233cde337f3d995e30d9057119632a49ee9cd SHA512 1dc3bd506f76f2e57db5268201faeb7038b9a62873f0113590023c7b889903428fc3c796db4accf74f53cae60a258160c3698dd9cef71024183f0c6f05040b80
 EBUILD httmock-1.2.5.ebuild 482 BLAKE2B 9be220b601f1751d59fe586ba43784bdc749a0eb32bb3555a7220e18a556efa5074348e88659223e04b9507a52e0caf82991574aaad2dde1e3f981f607e4ea08 SHA512 81bc8158780f33a14336dc3dfb6eb2b154a18bb2b6ac452b5a55d1e5542e8588fcdce05642e2ad8acc4ba7097cd755e19983480d0ad50928f99f10e0f2c37f67
-MISC metadata.xml 246 BLAKE2B 7bbbd7b1426aa97da0217eb9a4693facfd85920a077235778070e692ea562e596cc884db84f66223af907824cd0b97f8b1617fedff2dff37ab8802cec0874cd9 SHA512 8e33ef8d63dacd3d70b04a4b0f2e206148f09bb605a51e1d51d069351b498238bfd205574f45a0cd606422364e093023b8dc40bbfa3ab0afe26ba8e052df4f74
+MISC metadata.xml 291 BLAKE2B ccb260617f462ccfb62cc767113bd13d11e76a675e39622be354e4a5fb599a9ba9ebe384c552bbbb2972004e30b38ea864dd272b58ca480cf7de71fdd00b8fd0 SHA512 350ddcb2a5d6c22e80a21ace7216ee6ba1ae0f2a167dd015f6b4461c022e9ac1573a8d4b2fbdd187f1046457617b9a234e49866d70c548797186f5850e01d0cb
diff --git a/dev-python/httmock/metadata.xml b/dev-python/httmock/metadata.xml
index 459fa77374fb..c9f398947158 100644
--- a/dev-python/httmock/metadata.xml
+++ b/dev-python/httmock/metadata.xml
@@ -4,5 +4,6 @@
 	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">patrys/httmock</remote-id>
+		<remote-id type="pypi">httmock</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/http-parser/Manifest b/dev-python/http-parser/Manifest
index 9160b8229bce..665984119374 100644
--- a/dev-python/http-parser/Manifest
+++ b/dev-python/http-parser/Manifest
@@ -1,3 +1,3 @@
 DIST http-parser-0.9.0.gh.tar.gz 101174 BLAKE2B 92b74dffd2c35672bc383ccda59f93723c0f83ecb0fbf0470f5daacdd37f68d4d63de7d4ea53f86d2109349a793b7535cc864f014311dee6ac5e67d0ca751931 SHA512 75e51bef43d9d7698aad69f8bfe651e24784b97603cac55f33bf4c12c86792c8c71d6206f31847d052e4d8621a5ea65a7b34eca5bebdb8189f58e6d98d33139d
-EBUILD http-parser-0.9.0.ebuild 882 BLAKE2B ecfa101214d94aa99f1ce3c56b2dc5694b0b0f3014115997abb30932b32dcaf14e808f7a266f37abc07ef25ae17ae04f3023aca880f723e3ae5bfa62d2da4126 SHA512 1a185dac83873c37d53872ed1a420db1d16f677367cffca5dd6cd24f6b58968aff0306bcb92e71577f86640e7237226852e50b208cbf74ddd8c402bcd850ffea
+EBUILD http-parser-0.9.0.ebuild 881 BLAKE2B 80799d895c734ebf925191e8c753e94fe2a7c1de5037be80be9d81c2fb67b454ffcd1e9e71e86677b10ee180b0343b7d16b8c6beaa86cd55a98c74f53c55e50b SHA512 fc39eae82c92a1a27f6b43ecf12916ff6fd59053e3f6e436438b5da4ac714708b1c07c174255a21febebb125dd98dbaf7e22a13cb4212638b9ce987508e03fa7
 MISC metadata.xml 385 BLAKE2B 16371b248416d43a094b0038919816277b3dbced190f2684cbc6d0ff9cff6007cb7e5e44d867eff942f46173edf5018a4b15383454344fcfe003544aa3e64fba SHA512 5b4b7b992bf4036ee076a2714bd0b91540b071fac6194ade8327e71062d7dfc5597f68934c275d72756c5ebb25e334059df4112946a1a84ab20ca0710ee16760
diff --git a/dev-python/http-parser/http-parser-0.9.0.ebuild b/dev-python/http-parser/http-parser-0.9.0.ebuild
index 7230c49ba818..c7a55b51d442 100644
--- a/dev-python/http-parser/http-parser-0.9.0.ebuild
+++ b/dev-python/http-parser/http-parser-0.9.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 s390 ~sparc x86"
 IUSE="examples"
 
 BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
diff --git a/dev-python/httpbin/Manifest b/dev-python/httpbin/Manifest
index 340a0eb58f80..58206ff0bb45 100644
--- a/dev-python/httpbin/Manifest
+++ b/dev-python/httpbin/Manifest
@@ -1,5 +1,7 @@
+AUX httpbin-0.7.0-brotlicffi.patch 1378 BLAKE2B b8a4ed9df72c8e031e8ee6fe02d1c8372a6114948de59ec0890e288cb2d52e5d08c4358648fdca4ee8319eebee05c4fe4dc2ed9aef36432f40bc82488b7fa7c9 SHA512 dd3538ed6373df0bf1bf648e2253fdc79737aa2abbe8780da0ad088d0438e266a4fa6e873e18a6b50fe56f9dde109f2a2755975740d990084f7b9ea1e4b2a95a
 AUX httpbin-0.7.0-optional-raven.patch 841 BLAKE2B bdf8cd94706b08d6706349ad471212fbda7f78e7125378073e4db43af352b26778706b2c61ca51f6c1c44aae4fd250432793e0ffef463102324ed39069da20bd SHA512 757bbe80463b332571e9d6e2e3266d2db3df519a180a7d3840b6f4813c2373382519e322547feb522c59ec3893d4721e42463d8231b4f5904725b9547af407bd
 AUX httpbin-0.7.0-test-werkzeug.patch 1108 BLAKE2B a7118afed382eeedcfb3e8ff9a31b31fb80c01cf97f19948f9d208d77289f829d3ef24f4cbdde74cc87d2d640b61a51994292fcdf5058f94b8768fd4c37a3cc1 SHA512 3556b921a6daed3dc561d78912b41ca9a3cea1274384f849bba1d7cd7e7014798ce5c9e93491351ca5225e26762be03c73cd0d09c60c90b8a55ff6e6ce0bf81f
 DIST httpbin-0.7.0.tar.gz 92613 BLAKE2B 59252df1d4d0ef853ec65263b472d3ba6c597336d844f9b457f2d0a009048d4222f715a7f6fb120aca00fa641d1687e302036dc151bd2fd67ba98cf5fc47a63a SHA512 82e80058b58943637e9f8191764cea79bf7a6e40f36069f9b5d3f908585dbef20a03ef070d1f865d350920b6e874a93a48a544b05c14ff4911038ec2c20f6f63
 EBUILD httpbin-0.7.0-r1.ebuild 1082 BLAKE2B 63b7219c6e200fa6e846f38d337c54838f3cb1438f89d2976332bdce5172d25b348a9b8df3391df8ff74d19696623745de99e8d73978e64e0f612f68e9c34fe5 SHA512 dc27b9cdcd2a7004e5a84b401540b2a4fdd4bf91e4bfa4dfe7a5dd5ec7d5a2841c6a3ce195d4b1117c558acb1d7c3a898a8373101bf3e058e11d1698d173aff8
-MISC metadata.xml 525 BLAKE2B aece3687c440aa7ad57ca9190e68fc3ee5deffdd79c1c20cb04333c64846273590e3ef3f0c2c5adf8db014b2f15281353cae4b8b9dcfbacca895714cef911441 SHA512 d3d076dd201fe1c920d4b753999bb20bce792e266a5b9d035128a8718be819642acb6141640857b6d740222a839d5a995b0f3346f48c78f0276a5cdfef702bd7
+EBUILD httpbin-0.7.0-r2.ebuild 1173 BLAKE2B 4a65a918f80cce1029828b51c18a4380f0bd0bd78dfde3352d8fa579d84c1169b7e7af63e0ccefb085e3966d7cbc30f91dfdabc33a8563737ad16c548fa5b3e2 SHA512 4bcaa2408f16887fc1d5d09f09d3382a1d2776cbd5d0375958709327db962fb9742f1616e39f5b8c8732e11ca04b8d7bbc4988a1e4ed7a6690616c3f917992c7
+MISC metadata.xml 393 BLAKE2B cf8a612371dbefdf4f9718ea0add3cd52071cc8956852af0c629260e1482840fcf386553d18ca6fdfcafba9c08c0c7a195ec9a07cd1e467079edbbe4c3052493 SHA512 9509a57c48252340258d8a5e3bc655ca7b4e9f0983bfc7b46f2be6f6c03ae87fd611d6ca03cad7ee61815f5d856934207815ad4e6dde9fe4be2a8ffc0f260ee4
diff --git a/dev-python/httpbin/files/httpbin-0.7.0-brotlicffi.patch b/dev-python/httpbin/files/httpbin-0.7.0-brotlicffi.patch
new file mode 100644
index 000000000000..f74474a70aa1
--- /dev/null
+++ b/dev-python/httpbin/files/httpbin-0.7.0-brotlicffi.patch
@@ -0,0 +1,43 @@
+From 69d1e62e69b7f886ebbb41b8e9aae62e76adf375 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 2 Dec 2020 10:42:52 +0100
+Subject: [PATCH] Replace brotlipy with brotlicffi
+
+The brotlipy package has been renamed to brotlicffi.  Update the imports
+and dependencies accordingly.  The major advanage of the new package
+is that it no longer collides with the Python bindings provided
+by brotli itself.
+---
+ httpbin/filters.py | 2 +-
+ setup.py           | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/httpbin/filters.py b/httpbin/filters.py
+index c6268b6..4deeaaa 100644
+--- a/httpbin/filters.py
++++ b/httpbin/filters.py
+@@ -10,7 +10,7 @@ This module provides response filter decorators.
+ import gzip as gzip2
+ import zlib
+ 
+-import brotli as _brotli
++import brotlicffi as _brotli
+ 
+ from six import BytesIO
+ from decimal import Decimal
+diff --git a/setup.py b/setup.py
+index 7f9956b..8e17ef3 100644
+--- a/setup.py
++++ b/setup.py
+@@ -34,7 +34,7 @@ setup(
+     packages=find_packages(),
+     include_package_data = True, # include files listed in MANIFEST.in
+     install_requires=[
+-        'Flask', 'MarkupSafe', 'decorator', 'itsdangerous', 'six', 'brotlipy',
++        'Flask', 'MarkupSafe', 'decorator', 'itsdangerous', 'six', 'brotlicffi',
+         'raven[flask]', 'werkzeug>=0.14.1'
+     ],
+ )
+-- 
+2.29.2
+
diff --git a/dev-python/httpbin/httpbin-0.7.0-r2.ebuild b/dev-python/httpbin/httpbin-0.7.0-r2.ebuild
new file mode 100644
index 000000000000..3a72b9fa95b0
--- /dev/null
+++ b/dev-python/httpbin/httpbin-0.7.0-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP Request and Response Service"
+HOMEPAGE="https://github.com/postmanlabs/httpbin
+	https://pypi.org/project/httpbin/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+RDEPEND="
+	dev-python/brotlicffi[${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/itsdangerous[${PYTHON_USEDEP}]
+	dev-python/markupsafe[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/werkzeug-0.14.1[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	# do not import raven if it's not going to be used
+	# (upstream removed it completely in git anyway)
+	"${FILESDIR}"/httpbin-0.7.0-optional-raven.patch
+	# fix tests with new versions of werkzeug
+	"${FILESDIR}"/httpbin-0.7.0-test-werkzeug.patch
+	# use brotlicffi instead of brotlipy
+	"${FILESDIR}"/httpbin-0.7.0-brotlicffi.patch
+)
+
+distutils_enable_tests unittest
diff --git a/dev-python/httpbin/metadata.xml b/dev-python/httpbin/metadata.xml
index 0c31c1889018..0ca90e9907ed 100644
--- a/dev-python/httpbin/metadata.xml
+++ b/dev-python/httpbin/metadata.xml
@@ -1,17 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="pypi">httpbin</remote-id>
-    <maintainer status="unknown">
-      <email>httpbin@runscope.com</email>
-      <name>Runscope</name>
-    </maintainer>
-    <remote-id type="github">Runscope/httpbin</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">httpbin</remote-id>
+		<remote-id type="github">postmanlabs/httpbin</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/httpstat/Manifest b/dev-python/httpstat/Manifest
index c83a96f18ae6..4857884551a6 100644
--- a/dev-python/httpstat/Manifest
+++ b/dev-python/httpstat/Manifest
@@ -1,4 +1,4 @@
 AUX httpstat-1.2.1-gentoo-tests.patch 838 BLAKE2B 6185274643fc1e67d5cb099f747bd595ddb38fb0ce2f335b3472952298dcb47dac63009d48fe328d22465e777e80b23af1668a6c1da1c62b5208648cb439e9d4 SHA512 a38e8984b9e06b47fb076f449ebc651646b68be448481ce9f197bf995a81c0b81c4ce3070508f597e4dd4bd9e7b5f17f8ae602c4d9978ff3e05b11f7ad7a048b
 DIST httpstat-1.3.0.tar.gz 97358 BLAKE2B e80a3bd6a6bf7dec1e045e39e9b4491cb81623fa432e32f238fedb71a97fcbd3c362d3211b5cee85e8ed293bc7493d8eb262a0821e473f0a7c8df3f2b8c6fa3e SHA512 6620f7d2da8740da9febdc5d0a177890cc5e85a3a41445c3182f6a8906cad05a475b7547737e60331957a5f48e668194d9592f4e53005a5666ef99b704afbc91
 EBUILD httpstat-1.3.0.ebuild 712 BLAKE2B 354747729c2e4d4cbf6afdd7e424e0d04772fc6504970bf090737970f201740cf5b3df5e10e2ae962b6cff5c42c57eb4b251937c2250d3d16e4e00a0e09a72af SHA512 e9861ee10dd6e58a5172b8c12b603871509d24bf7fce119adf5d6075cba55c03b79574e4832134def71b1f94b1ab06d3c80ecd290bddc8f00c11c9b045c71497
-MISC metadata.xml 392 BLAKE2B 31931fd92505a57b10e74968337224c5bc19b3377e622ee8711ee56797e101797a4697f59a0ce38228472490072593b4b44042c8f904d432d502d88ad5297b19 SHA512 46e595a4b6ba41d5353316332d273c063103f39ca04659b56b95fe935603b5441ef5e317ece03de6469240091beb5e12e419fb7e7c57ebfcae7629f74004d7d7
+MISC metadata.xml 438 BLAKE2B 06e46ab9f98e01534d2a49fc7a7715daa4bc621453a6f5799d6f969a2b8925802feba503d3a52d68186035fe9cb59659589bbd9c4c413486609e9cb78d6dd126 SHA512 29dfe149f8c10fd8e9a570f8ba19e601d147acf1b3b969dc99664bbf7dd18a5969a6877b14f04618938f43fecac820317c23cdfa786c9f63cc9f6aba2f01878d
diff --git a/dev-python/httpstat/metadata.xml b/dev-python/httpstat/metadata.xml
index 2dcc864feab4..6a6902f9156c 100644
--- a/dev-python/httpstat/metadata.xml
+++ b/dev-python/httpstat/metadata.xml
@@ -8,5 +8,6 @@
 	<upstream>
 		<bugs-to>https://github.com/reorx/httpstat/issues</bugs-to>
 		<remote-id type="github">reorx/httpstat</remote-id>
+		<remote-id type="pypi">httpstat</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/humanfriendly/Manifest b/dev-python/humanfriendly/Manifest
index 43ed4dc1c576..7d76d27592e6 100644
--- a/dev-python/humanfriendly/Manifest
+++ b/dev-python/humanfriendly/Manifest
@@ -1,3 +1,3 @@
 DIST humanfriendly-8.2.tar.gz 358747 BLAKE2B bc5824e94ea94df6ee93ea44d273ccb856f50b69e52ae6293afaedf06c9f00c67e064f0c85edd88be9954bb258334b1b9af4ab88efc5b352f3efe8d322fc55c1 SHA512 123d8592e6613a70421740648bb8998733b118927a0bd6182af848612e46eec8e35cae95168219c9b7672bed8e18e1c4a493a80248eabe47f8a4cb1813c8b591
-EBUILD humanfriendly-8.2.ebuild 896 BLAKE2B 5b351de246dce297e9aee2ba5149f893c3884446758b618570f8c053b46fa0f0dcf5b0f15082f5b1e52d93aa6ea9786281a566fc365bf865decda7e9a5ac3a5c SHA512 fc28d50dacacd1a48584e33434daed2c781ddb17db6b33b7a14b167468cd482355777f045f264386d3be191b8bb431a9c3fd30f3424710ad424f33c21bf371ab
-MISC metadata.xml 326 BLAKE2B 5db2fb344393d914a42d1b9b256782d2e8286daa33ff4b8687d23e613ae8d168052dc310cab48ef0c49c524d3b5115d2a17cbede518fe93e944c0067c94f9c7b SHA512 1338df242248b37b4d016d8f9a31ffa004eed60a9122ed9ec8f94103271b3136b698a613c0f7c91411f43d96b136777e0ffe808c250f9ece3d29922312457f47
+EBUILD humanfriendly-8.2.ebuild 898 BLAKE2B ed741abb4d4ad5dd59105f707d8dc83e26f16313c62cc9b7beb579924419f35ae346b20fbb867a4954b72c20be5fbac63b73d4c976c6bb75a7a1fceb31f9edf4 SHA512 07fbc9678d7916ff20a70deb4a00194cfebadab778ac8b6c19d1dc751745e24d174410e5c0cf6208f2eaaef7921feb53103dd8266d647b1ead49a4362488c63b
+MISC metadata.xml 382 BLAKE2B dfc1cffeb957908577b82b8014b01d8be706755bbeb701dc5f8d117685bc720bf540722d0d61f47224221331af6237c5acd5c899298e5e29837fd3be3b27fa23 SHA512 4a90e529dc08af1b8701b69618ab8459a35417c33ca70fa024b3a2a7c1c7a1b156b566f4c5d18623d588c06f63f1a56208f50d675667a670d897c40a1b769cbe
diff --git a/dev-python/humanfriendly/humanfriendly-8.2.ebuild b/dev-python/humanfriendly/humanfriendly-8.2.ebuild
index a918f9d2b315..1eaf2ac1e2e7 100644
--- a/dev-python/humanfriendly/humanfriendly-8.2.ebuild
+++ b/dev-python/humanfriendly/humanfriendly-8.2.ebuild
@@ -11,9 +11,9 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
 DESCRIPTION="Human friendly output for text interfaces using Python"
-HOMEPAGE="https://pypi.org/project/humanfriendly
-	https://github.com/xolox/python-humanfriendly
-	https://humanfriendly.readthedocs.org"
+HOMEPAGE="https://pypi.org/project/humanfriendly/
+	https://github.com/xolox/python-humanfriendly/
+	https://humanfriendly.readthedocs.io/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/humanfriendly/metadata.xml b/dev-python/humanfriendly/metadata.xml
index 10691287e903..963d1abe79b3 100644
--- a/dev-python/humanfriendly/metadata.xml
+++ b/dev-python/humanfriendly/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">humanfriendly</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">humanfriendly</remote-id>
+		<remote-id type="github">xolox/python-humanfriendly</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/humanize/Manifest b/dev-python/humanize/Manifest
index 16ea7b51f77a..5bac5ded31e0 100644
--- a/dev-python/humanize/Manifest
+++ b/dev-python/humanize/Manifest
@@ -1,3 +1,5 @@
 DIST humanize-3.1.0.tar.gz 54352 BLAKE2B 0e25f4f7f01244f5b24a33c54546c2b2d82e0e069d2cabbe67ff0e5f8e2bc9d3aa2eb7f4d63d4a01dc8ff4ddcfee030b33015ede00d769dfafccb6c2af95171a SHA512 71cb2766a791481f4dc5e02b77357e8e4e7332e533ee055a207cf145f2b2f9041c5bc4ce25f061f0cc1498f37edbc6243f63b888a322c0cf19e5216e120542dc
+DIST humanize-3.2.0.tar.gz 53976 BLAKE2B 2e9347418ffa103c6a66583136aa0c79bce669b48fcbc01bf482ba16659af14d4b4a88e78167e8013a8ede6467ed7b7f5eea8f46ed4234294a79b0c63fabd17c SHA512 448919e762e0ecc95f5a7158e0dd8bc028d173ee236be8e15fd0283741af037af1bcdc671ed83b0c16c1998dc0a70debf11cb1c349085530e458bc7aa2f6dde4
 EBUILD humanize-3.1.0.ebuild 693 BLAKE2B b8451a66d9f40936d328a924642399b20dae17bb9ebc9f948b5a72e0229dd2cc242573f4c101200d03aa4a49617dd92b95b7263bc4f508a2ebd43acf05a96b8d SHA512 31bb2793727c00e3e18f69893394535403c7a6841759022e2f15cd508ff8ef57e4600725b3317f72145e570ec215eb61da46c77f313e7b6947d6b842301d142a
+EBUILD humanize-3.2.0.ebuild 706 BLAKE2B ea1f49746655d50b60c5a276328d5a8665e7530c5d0afeb3c1f716b8e62602a05aeeb881725a1599369cd2a9ec60018d3417e82004ad54ffa9e2d21a7b0c6b5c SHA512 3af0ec7f150aa79bdc208fe92fce0337e34c23fcbab0a3743a537c2a606c7997f36b7a3d37c3448058e1638a64c9ec16f7f4d29aecc0c66f1e26a5d1aff3d991
 MISC metadata.xml 561 BLAKE2B a7919d3646edc6a4e7c2e13d74b1ae4eb18e16c41d33f27adb2841e80ab12e5d85f42bedab668c1096740e7ed1323e5accac1ba45a78290f0979c55e39c9d682 SHA512 b31a4947368fcbfb0edf93b48f843c49d5209820cf9da1a8aeb8666ab4fffebac765ca4aeb3cf2523837fcfc9c21d858cecaed65002ac23bb9d946a8c818f113
diff --git a/dev-python/humanize/humanize-3.2.0.ebuild b/dev-python/humanize/humanize-3.2.0.ebuild
new file mode 100644
index 000000000000..fa1c2e7585b3
--- /dev/null
+++ b/dev-python/humanize/humanize-3.2.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..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 --via-root
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/hyperframe/Manifest b/dev-python/hyperframe/Manifest
index 65f8e1c6b76d..2eb49864cd23 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 535 BLAKE2B d1a96fd3469b9fbb2c64a32c38a031a4218f393a55347824c8fb2d4ef953a14f663adac1b338cf7eecd4f8a65a1b21b2de476cc6fdc801a151310ab05710e1a5 SHA512 52538c3306ca471807bcc890ead257ff37cb0f1678ff4abfa31e28424edd08b27500f7a78417120cead0fe26989a986fde17abf2677df69c019e02d0b74e002f
-MISC metadata.xml 648 BLAKE2B 4d545280fbd8a57db9b0b93735e0b620bac3057513200e6e2cb06a5b3a52b9e4ba87e63e5ee99168040caa956cc5bc6ed845a393e9c794572cbe00535923f81c SHA512 01212887790743320e5a51451d9dbdfe8807b7d219b164375ffc04e09ecf98676651de13b138a7b43d16f97f8883c5d4b1ffe4d4c3bad2d6aeb5fa7f11a46c2b
+MISC metadata.xml 711 BLAKE2B 0670274d28d20ceafb1a00714879f99711b920b1f5fa81c1441db3bf0c09a5e9bab1e9a73ce4e4a420374159de4ece8c1dad1c03fce9504934cc6a9f23df2140 SHA512 cec7173aebbe148bcbe1726e459970cfc1d44fba7617b82335909a115685cbc00f61d0e736bb8fb0c9658c9152dea4d49f3ffa63af2549dc712277c4290c0192
diff --git a/dev-python/hyperframe/metadata.xml b/dev-python/hyperframe/metadata.xml
index 3734e16b4ba4..0e12dd0b6e31 100644
--- a/dev-python/hyperframe/metadata.xml
+++ b/dev-python/hyperframe/metadata.xml
@@ -11,6 +11,7 @@
 			<name>Cory Benfield</name>
 		</maintainer>
 		<remote-id type="pypi">hyperframe</remote-id>
+		<remote-id type="github">python-hyper/hyperframe</remote-id>
 	</upstream>
 	<stabilize-allarches/>
 	<longdescription>This library contains the HTTP/2 framing code used in the
diff --git a/dev-python/hyperlink/Manifest b/dev-python/hyperlink/Manifest
index 60e268ad9999..a4b3042353f2 100644
--- a/dev-python/hyperlink/Manifest
+++ b/dev-python/hyperlink/Manifest
@@ -1,3 +1,3 @@
 DIST hyperlink-20.0.1.tar.gz 140291 BLAKE2B ee8c741d4cb87e4a577e1c9a45614f5f47e086f27b60a75897b66684ab5927da73ccaba47b16b770f0277a52351cc732cf74762e29c83644c220ed59c67a18d0 SHA512 f935c09d35baf8a8a3c8d4dc6aaf64135d13dda4636187f5d47f3fe4de675498efa29cd93d802c0912db2fa371d0e58213767b1c3c42e5a14bb837ea96a72193
 EBUILD hyperlink-20.0.1.ebuild 679 BLAKE2B 80b69f545a6f258d0eb070292bc5fe40e798d5ee37864bf82edbe49b69c3be88eda2e7155c5e3cf0568c5a45cc6b8d1d24f5648ae92e6d401aba6e97f83333bb SHA512 3a6873bb96a52c491da05afc75bab9444333d0deb97e0d8b3985a8600834b85463fc5bfd2235794bfa91b65714ec3890d29be7cf6fd1d49e63583753c3922a42
-MISC metadata.xml 697 BLAKE2B c5362a0a1a73b8f1d2675539ceb6c13199ac14dc6365b46f268799dbac155b03a0dab0e9302e61e6ca5ce5f2e7ae58be9806f8664c117c430bb52732bf8db927 SHA512 3811b8d737d1531e1355622dd939430085e5e672bdfe36450893f46b84441fd009ba60eb46a9cef4472688070a007e1c78b2b67794eb7d5b2ef8acff2bd801f8
+MISC metadata.xml 758 BLAKE2B 36fe15b27fb5bd52c60917e90c20fcf6db9e7c5eb094420cc8dab852748decbc6a0d40c15f4c0402bab1c8a014ce5346e5a55f497c7ad4fca7c2c1d9cd91c304 SHA512 ec95c17a3743643c0666c7a12aa3a2a2c91fc97a64bb21c7429e00e23d42f82897e57e8eecef2f7fe72e49238061f190a0b1e1b81d3b938051bb17a008335abc
diff --git a/dev-python/hyperlink/metadata.xml b/dev-python/hyperlink/metadata.xml
index 1650d8471c01..cec9c78c27cf 100644
--- a/dev-python/hyperlink/metadata.xml
+++ b/dev-python/hyperlink/metadata.xml
@@ -11,7 +11,8 @@
 			<email>mahmoud@hatnote.com</email>
 			<name>Mahmoud Hashemi</name>
 		</maintainer>
-		<remote-id type="pypi">hyperframe</remote-id>
+		<remote-id type="pypi">hyperlink</remote-id>
+		<remote-id type="github">python-hyper/hyperlink</remote-id>
 	</upstream>
 	<longdescription>
 		The humble, but powerful, URL runs everything around us.
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index a9694778accd..a1e7b7f0a856 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,19 +1,19 @@
 DIST hypothesis-python-5.24.4.tar.gz 9054743 BLAKE2B 5c64c86ed58d8f0e4a07390b1b1b5e405878b9632bf14233e0515ad9d98ec6ddcc57bf39be6b61f53739d34e393b3af64c0d362880019d29a649a9523a0204e3 SHA512 147f4fa47b54bf3ec4dfcebf2a6c98cee26ea6780244ef99e181bada65978375ca7731ed05cb98f1b92f7a44a357faae374d97d489ec6e2318ff94e526cd9a40
-DIST hypothesis-python-5.35.4.tar.gz 9084892 BLAKE2B 5545f2b1f3e97eafb4c83d7918f1558124102b1b58854bf0ca3a75fa3f6f08c0cc862c0ec32f5fdcbbf12e6cfc849e7081fe82ab0bb24e6de8fe41108525816b SHA512 db26d0b8d23b753c4880e0ee54ef89957c68c75496847aaefd538196188e7734513d737e2073bdced5eb7a8677b096b2cf9d6d48e572922d8a3e5a5c930bc795
-DIST hypothesis-python-5.36.2.tar.gz 9088227 BLAKE2B 578c28d045f3b3f288d43765d556f1e7bbde661684b71f6379df3eba516d8ece86f31a38a414e676532f6ecb8a1ee69ac77d207a8637eaef8b9a86584d3292eb SHA512 d6792d5b9f60aea6181018c69eaa12982ef0ab353bff3f46bc987a4633a15b655ed04ee8ae3aca7dbd9e23cf5f85e4a95e455082f4035e246342b72e2dafe258
-DIST hypothesis-python-5.37.5.tar.gz 9092380 BLAKE2B b5bf9f5c5bb1002154ea6041c38b727e926ae65641a05ddd2bfe919fdb7b6457963ddcc5bf1d57a929c57a3912b15a13c52b4568708348f4f308146cf64caa61 SHA512 ddf2db9d8f9318b0b3ae872fdfebbc4ac8376a86816e7c9a0350738a68a4e3adbe41aaf19a8f54471f551542f3252172cc34f5bc140483989ef8c04c5735f044
-DIST hypothesis-python-5.41.0.tar.gz 9094817 BLAKE2B 3025caf9a0ccba19abfd12273edefe1db825a40615a378fb076e8d3ba96bfecc64ec23be6ef72b6fcd89d7d6b5c94bbf12abf3212e4a521a21def892b0d95a56 SHA512 76a0147d36179368d62a3d9e6f9f27effa903476fa0cccdba4574937c470bbfd020daccf9b3df73f457b543b6a94ce0858fe4d9abdfe9c16a8c49858c8bc0e92
 DIST hypothesis-python-5.41.1.tar.gz 9095771 BLAKE2B 29c5c091f4b827d1f1e6276d0401c1a673077304b3ee8b0252536c3eeda066a4cfa764856edb222ba6cbaebb424b08aebc8d8ec00c5e0d445774b1c62ed98593 SHA512 b1f02e32e6c5bdb6ca0a338901715508a03d2734898c673c5b3a5b25dee34922d7fbfcc2534b0c658d003d5de3e97abecb5a9b4f00ada0cc85c457b4b870a873
-DIST hypothesis-python-5.41.2.tar.gz 9095799 BLAKE2B c1743f2e9872cefdd82dd79b60f78ae02bb975be2156bf7c05054627ca8386092588721450dfe14954129e46ea3556b78f7784102640d84368bdc98af2980b04 SHA512 712a6b3a007e4b354e9ed2137b7dd53652abbbf0b324467ce540ca886fb956eae5d00f83cbc1c9b1799a4a3abc64f4d26d9aed85d5fb689e904e1125b87b88eb
 DIST hypothesis-python-5.41.3.tar.gz 9095982 BLAKE2B 3a1b7052b3f71d1f8139101d16f2f74c2d434514a201b7e04e5452ac2c5fbe7288d592c0020769f3a48f73347cdce53f507ab65db7bfb4f3823d0f7997e48058 SHA512 974dee6040222fa55729257cea4e3c4c049625a2a5dfddbc12667dbd58dfe31718474ce8e9de81519e998c7a0c8ff01920e0aa2bca9fb7100754e985177f4b69
 DIST hypothesis-python-5.41.4.tar.gz 9098296 BLAKE2B ef471172039251129d03faea722fc190135ed3d2e94a9bc6d4ad4f9676bc819e641dd0c893352168425ce987128e73d8844f622e57a7c161d33f75ea0f4b7312 SHA512 215f2e4479eca10d8ca590ffe0623f8994c7061fddabfe2737d0f3bba2f403042ad8e75730361417a1c9c32d3e261c8daa84032f6963ef6526e6b0067a156658
+DIST hypothesis-python-5.41.5.tar.gz 9098660 BLAKE2B 6caa742d34a3a2aeb6c6fdec3f8772e5221e1d0b2becc1362b657d383387f2a1152756222cfe86ffbb3e23a53e395050a16325d74ec9e03822a5c0020505b38e SHA512 b220a48e5746bacc6fa257f79feed0dc2c0a9f66862aba74806fb1ac3d06f380620410c9c46c377c50e4fa7c3171d5b31ce2759e7a3e0e2abd0920b237242dd6
+DIST hypothesis-python-5.43.0.tar.gz 9103047 BLAKE2B c9c8262fb32dfdb48b52ad11cd18f907d488802f1af04d7677e260abf24598afd5f89bf3f1a42c919460d5ea48b1d6979da5215ef9877260c601b133076bbd05 SHA512 129760a9c58f264e25c403fcacf9e1ab41267faee637856230341a91d6965a6c2fd05b9a8a12b6977377f8abc26ed7151384ad08195b03ddf62e8445b216eacf
+DIST hypothesis-python-5.43.1.tar.gz 9103292 BLAKE2B aa718b98c7a0e16322cbde38f0768e5ccf6716e2cd08aa97b5ed4d36c7ed9565e5ccba76443d74d253adff557918400ec384ee39c630523a31356c80dce15622 SHA512 428a7f1cfb379ebb3d3bea01727ad1633d2e591bea00de15d7967856af8b1aaa9371d278e51be9a0a902adaeff63215a2e87205309f058e371f6ad331737a11f
+DIST hypothesis-python-5.43.2.tar.gz 9103806 BLAKE2B 7ef4bfdcd12782a3445d5094ab5111b305743c1c11afd33f3f615e6fd863192cff37c9df7b42052a83d55ee16d570adfb08f1e1c610697f2c2a3295cf09528fa SHA512 c348568f00ce66c6cb53398a7f9b471ffa686cb9c4a4180ac00ba0edae76404c0a7e182f5df8a3c0738b9379f79bfb4b89fdb94bfe3529313a9a3c243a2658ae
+DIST hypothesis-python-5.43.3.tar.gz 9103991 BLAKE2B e374edf17571c33e48dc8d259db2fb23b9cc358f56189ebd60f3e9141ade7759eede1bdbd91d924f144a20b1ea0b7ec19817559b7f82a90f026ac101a7feeabd SHA512 392fb794fc5ba06acd1e465cf1500f742d8b056148540778f1ec9c5065be66c0f514f0fa6872337869079636c71235d51d4c6722a63b03037b689edd6f09809f
 EBUILD hypothesis-5.24.4.ebuild 1608 BLAKE2B c52cd842682347491245d4560fba737a85f8dd46e93416047c2bff5ff4dcde85bd337d7e7c65556e61d97bb1c2a1270652bf3dec8126049daa01215ed1424b3f SHA512 7d3450fa374c88dd6206663341a1437d177a7cfe5b0eb99161a85f4e62b97020843e052d28ae0975628d8c299655a35b86ba51cf67bacd296e839d949c06f785
-EBUILD hypothesis-5.35.4.ebuild 1792 BLAKE2B cea3034afb7d809f5c3f8dffd5ef2ad6ded44eeff4e6921318db421e9975ac78c13d9add11a717d678799e4395937a3b3cf8e8f7929d18161c5d452b8f5605ea SHA512 4acec6c9774186c35189baefabfb84d50a4b0a4f94de83b6e6b561cfad3b325c78f4957bc9045460edd985cf0375602938d276e5c73ab1803aea48d0f021b191
-EBUILD hypothesis-5.36.2.ebuild 1801 BLAKE2B 2353fac773dc0ae13f54d9c87645444b4418a7dab698376bbf674ddf01f93f97956af09d314a92f74d716192f1d10657bcdaa885ffaceb22aeead5d1c0c55d22 SHA512 84664f8ab5c91863d349e8e77c39d7b5afac420b9cb35488ea032530bbeb81f1b3d568b74e6c6784555aef71652414e3709a308e76f36d1d3dd05188cc0bea75
-EBUILD hypothesis-5.37.5.ebuild 1920 BLAKE2B 75a8070d9cc3fffa31a5c854b3784b9fc25dcbb11cd5a3e48ed30a0d01f7d0f6c97471e035d0c1be38b2ee81ead13bf6cb4c64cdc0408d9e73cbdb175c17647d SHA512 a66c3b2d8b9c5928bb816ca8f2fca8d0d16447c79222fe8f5c2275d4b8f6307af6b5f8d8ed4b8b52be94950cd5080ff3d70aac5b82970ecd144052add03600fc
-EBUILD hypothesis-5.41.0.ebuild 1803 BLAKE2B 04eac62c585b02bf721763309619d61eec9d526f332323daabe73e8a9829bbf6c2939baf751a196cae120134dfe68bde39e1567795ad5668cc718489e2a3e3f4 SHA512 0ff2d839e09d54bf1ec046f1de9cd29a13ba75d57ea6334a4aa812fba61b15e805596e92ca9a825ae482cd6528e94115bb4cc92e1a5439e691f4e23ff961f7ff
-EBUILD hypothesis-5.41.1.ebuild 1803 BLAKE2B 04eac62c585b02bf721763309619d61eec9d526f332323daabe73e8a9829bbf6c2939baf751a196cae120134dfe68bde39e1567795ad5668cc718489e2a3e3f4 SHA512 0ff2d839e09d54bf1ec046f1de9cd29a13ba75d57ea6334a4aa812fba61b15e805596e92ca9a825ae482cd6528e94115bb4cc92e1a5439e691f4e23ff961f7ff
-EBUILD hypothesis-5.41.2.ebuild 1803 BLAKE2B 04eac62c585b02bf721763309619d61eec9d526f332323daabe73e8a9829bbf6c2939baf751a196cae120134dfe68bde39e1567795ad5668cc718489e2a3e3f4 SHA512 0ff2d839e09d54bf1ec046f1de9cd29a13ba75d57ea6334a4aa812fba61b15e805596e92ca9a825ae482cd6528e94115bb4cc92e1a5439e691f4e23ff961f7ff
+EBUILD hypothesis-5.41.1.ebuild 1801 BLAKE2B 074867b2e76174a9f5569017da28098718d5e478623f47968f6c80923f331a91cf86ce9aaa8fa755804a0bff295577e0d4b940b13bc85cd1d5f36b78607efede SHA512 00c3338e0a97ec3b6491dc9168f85e96b8fe0984785af9530e48288341fc4cba4e6deab2c7940c1a3fb9b4552b3184b529e4ea77e44afa3e17732775415865b8
 EBUILD hypothesis-5.41.3.ebuild 1944 BLAKE2B 72798f2e7d9f5c52c18d9f5628288deadbb2929cb81ce1ab260a6c310bb0a1f081f6f7bf057bc6c7b764ff4294d6c4b8631a352e10fa556d070f0ca1154c357c SHA512 87d5198bc9245a8d971ec781269090288b3e4a86318675fd2d28905e7f97eec43d3e493fcd1a06a1e38bff3807f776cf5b4681e1e14daf4eca862e953512d8b8
-EBUILD hypothesis-5.41.4.ebuild 1944 BLAKE2B 72798f2e7d9f5c52c18d9f5628288deadbb2929cb81ce1ab260a6c310bb0a1f081f6f7bf057bc6c7b764ff4294d6c4b8631a352e10fa556d070f0ca1154c357c SHA512 87d5198bc9245a8d971ec781269090288b3e4a86318675fd2d28905e7f97eec43d3e493fcd1a06a1e38bff3807f776cf5b4681e1e14daf4eca862e953512d8b8
+EBUILD hypothesis-5.41.4.ebuild 1862 BLAKE2B cdaa3bf24e368400cd344062972fc1713ab451303bed278b184c118e8466c3eb374477a4d0edc308e38897029fddd5e28c3b299b2083d97ecfee47ab4a24dead SHA512 23e82dd82c4c393819cc97e70e21362c7c7e456bec93c640fe0a8dd8d4f915255d213053a990a900f41d9db96d1a0df39e1824eaea7c2bd14648c35ada68bfec
+EBUILD hypothesis-5.41.5.ebuild 1862 BLAKE2B cdaa3bf24e368400cd344062972fc1713ab451303bed278b184c118e8466c3eb374477a4d0edc308e38897029fddd5e28c3b299b2083d97ecfee47ab4a24dead SHA512 23e82dd82c4c393819cc97e70e21362c7c7e456bec93c640fe0a8dd8d4f915255d213053a990a900f41d9db96d1a0df39e1824eaea7c2bd14648c35ada68bfec
+EBUILD hypothesis-5.43.0.ebuild 1862 BLAKE2B cdaa3bf24e368400cd344062972fc1713ab451303bed278b184c118e8466c3eb374477a4d0edc308e38897029fddd5e28c3b299b2083d97ecfee47ab4a24dead SHA512 23e82dd82c4c393819cc97e70e21362c7c7e456bec93c640fe0a8dd8d4f915255d213053a990a900f41d9db96d1a0df39e1824eaea7c2bd14648c35ada68bfec
+EBUILD hypothesis-5.43.1.ebuild 1862 BLAKE2B cdaa3bf24e368400cd344062972fc1713ab451303bed278b184c118e8466c3eb374477a4d0edc308e38897029fddd5e28c3b299b2083d97ecfee47ab4a24dead SHA512 23e82dd82c4c393819cc97e70e21362c7c7e456bec93c640fe0a8dd8d4f915255d213053a990a900f41d9db96d1a0df39e1824eaea7c2bd14648c35ada68bfec
+EBUILD hypothesis-5.43.2.ebuild 1862 BLAKE2B cdaa3bf24e368400cd344062972fc1713ab451303bed278b184c118e8466c3eb374477a4d0edc308e38897029fddd5e28c3b299b2083d97ecfee47ab4a24dead SHA512 23e82dd82c4c393819cc97e70e21362c7c7e456bec93c640fe0a8dd8d4f915255d213053a990a900f41d9db96d1a0df39e1824eaea7c2bd14648c35ada68bfec
+EBUILD hypothesis-5.43.3.ebuild 1868 BLAKE2B dbc0309e757938bfc38621183fa804775df68a395e05b2ba01e2ed1c24b28cd2cf94a4d145852d7c6c3157e968b9631464daa9736328bb8787b882bc3e021a61 SHA512 d16e2f08ab141ae378165fa1fcc54f4f354f1aaf9ed63537fcffea8f2e1d451429161078d31452257d9deb7f6ed6069342c0cbbf9c540f39fc5257310766ec14
 MISC metadata.xml 755 BLAKE2B da1fcfe4509905d2058d448b0178dacbb87026a3542368d8aa3ffca38edf1cd3d76d9542f8badc0220f5b5c916fdbb054f65b054a361977e0258e475768e3cf3 SHA512 3f046788581ef05937ec8376538cc60628f9d8e25486fc6e4421dd8461a9a085f51540e1d5203ccf85007adf1a978a23da9ac39cc486d698967412eeb3f2a793
diff --git a/dev-python/hypothesis/hypothesis-5.37.5.ebuild b/dev-python/hypothesis/hypothesis-5.37.5.ebuild
deleted file mode 100644
index 18d37e55ce1b..000000000000
--- a/dev-python/hypothesis/hypothesis-5.37.5.ebuild
+++ /dev/null
@@ -1,68 +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=( python3_{6,7,8,9} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 eutils multiprocessing optfeature
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
-IUSE="cli test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' python3_{6..9})
-	)
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/pytest-5.3.5[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-python_prepare() {
-	if ! use cli || [[ ${EPYTHON} != python* ]]; then
-		sed -i -e '/console_scripts/d' setup.py || die
-	fi
-}
-
-python_test() {
-	local -x PYTHONPATH="${BUILD_DIR}/install/lib"
-	esetup.py install \
-		--root="${BUILD_DIR}/install" \
-		--install-lib=lib
-
-	pytest -vv tests/cover tests/pytest tests/quality \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-5.41.1.ebuild b/dev-python/hypothesis/hypothesis-5.41.1.ebuild
index b817839fd0ac..dcca3c3635dc 100644
--- a/dev-python/hypothesis/hypothesis-5.41.1.ebuild
+++ b/dev-python/hypothesis/hypothesis-5.41.1.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 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="cli test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/hypothesis/hypothesis-5.41.4.ebuild b/dev-python/hypothesis/hypothesis-5.41.4.ebuild
index 30e83a217730..7cd8e4bcc527 100644
--- a/dev-python/hypothesis/hypothesis-5.41.4.ebuild
+++ b/dev-python/hypothesis/hypothesis-5.41.4.ebuild
@@ -48,11 +48,7 @@ python_prepare() {
 }
 
 python_test() {
-	local -x PYTHONPATH="${BUILD_DIR}/install/lib"
-	esetup.py install \
-		--root="${BUILD_DIR}/install" \
-		--install-lib=lib
-
+	distutils_install_for_testing --via-root
 	pytest -vv tests/cover tests/pytest tests/quality \
 		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
 		die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/hypothesis/hypothesis-5.36.2.ebuild b/dev-python/hypothesis/hypothesis-5.41.5.ebuild
index 50437757f39e..7cd8e4bcc527 100644
--- a/dev-python/hypothesis/hypothesis-5.36.2.ebuild
+++ b/dev-python/hypothesis/hypothesis-5.41.5.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 ~riscv sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 IUSE="cli test"
 RESTRICT="!test? ( test )"
 
@@ -48,6 +48,7 @@ python_prepare() {
 }
 
 python_test() {
+	distutils_install_for_testing --via-root
 	pytest -vv tests/cover tests/pytest tests/quality \
 		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
 		die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/hypothesis/hypothesis-5.41.0.ebuild b/dev-python/hypothesis/hypothesis-5.43.0.ebuild
index b817839fd0ac..7cd8e4bcc527 100644
--- a/dev-python/hypothesis/hypothesis-5.41.0.ebuild
+++ b/dev-python/hypothesis/hypothesis-5.43.0.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 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 IUSE="cli test"
 RESTRICT="!test? ( test )"
 
@@ -48,6 +48,7 @@ python_prepare() {
 }
 
 python_test() {
+	distutils_install_for_testing --via-root
 	pytest -vv tests/cover tests/pytest tests/quality \
 		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
 		die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/hypothesis/hypothesis-5.35.4.ebuild b/dev-python/hypothesis/hypothesis-5.43.1.ebuild
index 50aca5993567..7cd8e4bcc527 100644
--- a/dev-python/hypothesis/hypothesis-5.35.4.ebuild
+++ b/dev-python/hypothesis/hypothesis-5.43.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 IUSE="cli test"
 RESTRICT="!test? ( test )"
 
@@ -48,6 +48,7 @@ python_prepare() {
 }
 
 python_test() {
+	distutils_install_for_testing --via-root
 	pytest -vv tests/cover tests/pytest tests/quality \
 		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
 		die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/hypothesis/hypothesis-5.41.2.ebuild b/dev-python/hypothesis/hypothesis-5.43.2.ebuild
index b817839fd0ac..7cd8e4bcc527 100644
--- a/dev-python/hypothesis/hypothesis-5.41.2.ebuild
+++ b/dev-python/hypothesis/hypothesis-5.43.2.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 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 IUSE="cli test"
 RESTRICT="!test? ( test )"
 
@@ -48,6 +48,7 @@ python_prepare() {
 }
 
 python_test() {
+	distutils_install_for_testing --via-root
 	pytest -vv tests/cover tests/pytest tests/quality \
 		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
 		die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/hypothesis/hypothesis-5.43.3.ebuild b/dev-python/hypothesis/hypothesis-5.43.3.ebuild
new file mode 100644
index 000000000000..a4814b9ee7d7
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-5.43.3.ebuild
@@ -0,0 +1,64 @@
+# 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,7,8,9} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 eutils multiprocessing optfeature
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
+SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="cli test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' python3_{6..9})
+	)
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/pytest-5.3.5[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+python_prepare() {
+	if ! use cli || [[ ${EPYTHON} != python* ]]; then
+		sed -i -e '/console_scripts/d' setup.py || die
+	fi
+}
+
+python_test() {
+	distutils_install_for_testing --via-root
+	pytest -vv tests/cover tests/pytest tests/quality \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/idna-ssl/Manifest b/dev-python/idna-ssl/Manifest
index 652a85035976..dd38c4194a15 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-r1.ebuild 908 BLAKE2B d10ab4ca995af2d68d4a1a370dc3eb9cb9dfb264f2ac360eb9b5e34f49c567142603761cb4269ee50098366dd0445ed011f86ace04d0f5c93c5e01c32e4cd4a2 SHA512 dcd79989bd48336cd345024e7fa39b452ab3475366e1654c4855b4ffab5208a5a9a1f5c43f3de04d2bfdff7c619dc049b1952c72e941563f1440da58427031a6
+EBUILD idna-ssl-1.1.0-r1.ebuild 907 BLAKE2B 9f2d2928a4aa517a27ad816f865cad7469bb711bc8277dd50dda26fdb79f8cdab601ee93feea6a6bdd7d5c9194d64a16dbc2bc303fe203bbb221dfd06692c925 SHA512 ea12546bea8a8dd6c83c6517f6513d470b0911d6f12147048f4b82e4150577a1c8a2e144e3ba81de372776229eb2acc5817a5ad018131f4de5db8a121e671e74
 MISC metadata.xml 368 BLAKE2B b2f78fb9dea9edf6f2b2a7fb72412302b014e8b1b536653ae12fcd2bc8fa94bb253ff780aedcfd32fcddfcc2030b363e12440dfa4efef1a886e99b8b0acd8dba SHA512 531bbcdb7ec492aa4c38f4352cb0a93c618c60d9f8920ff476f6f8b7991744ccba2188a9e441e696a02d1c4ef4ea9af3afeb2c81a0d046e700796ee45b7f3888
diff --git a/dev-python/idna-ssl/idna-ssl-1.1.0-r1.ebuild b/dev-python/idna-ssl/idna-ssl-1.1.0-r1.ebuild
index 03a3b1712ebd..e7519b827b3c 100644
--- a/dev-python/idna-ssl/idna-ssl-1.1.0-r1.ebuild
+++ b/dev-python/idna-ssl/idna-ssl-1.1.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="MIT"
-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/idna[${PYTHON_USEDEP}]"
diff --git a/dev-python/ifaddr/Manifest b/dev-python/ifaddr/Manifest
index ffe288521b73..19d4c8fc6815 100644
--- a/dev-python/ifaddr/Manifest
+++ b/dev-python/ifaddr/Manifest
@@ -1,5 +1,5 @@
 DIST ifaddr-0.1.6.tar.gz 6526 BLAKE2B d30b955d42d0266a197214bbe16ff2a8b11e33b4305ae9ed128fca6719e2c86026c97b278b0abaf5f5f35f4c9b744e5b500b4a4c1783dede0ebd4aedff62803f SHA512 911f81c32e808b9e61f7e98b8c67dc9b40cb64de864843cd7239f08538c9ff7cd45c8f16428b2ce200ea5f213a539c7ed8479432e02feb5e82e917f838ee0cb6
 DIST ifaddr-0.1.7.tar.gz 9281 BLAKE2B 3f7d29b69462cbf592899f1b4035685d1e9bb4535b104e6e59b41fd51c4c2681d2502ad190dae633891aec90818bb330c1f8ea403be22d154d9e7de8a5a80dab SHA512 9a428dd6bb022c8f483b77df9e9301f96e9ba64207eda8b3956a7ca5993bfe97f222c451149851135d379db1a819c75d0834566f3b6501456b2f237b0645e300
-EBUILD ifaddr-0.1.6.ebuild 502 BLAKE2B 0bc66c2d9c6a9b6f57e0e5841153ed8fd2675c66f89df15048341c11ad5fbedf26f41e069f2b29a46bdb9afc0445a455240f8c166c166ec8460dcf542e6fb867 SHA512 177d5b4f8158d9585fdcd27da0dc1be2c5c6216ec3bc4914b1a7a044ddfce81d25a2d509ac4d622a1fecac164b7cc7d32fb29b44f192c798eec27707a3442b22
+EBUILD ifaddr-0.1.6.ebuild 504 BLAKE2B ea147ff0654665742be47c6dff8dbeb87e89d2a36d3e585ac2a954cf2e15a201b1c43fca1b4503fdef9129652ba111b7a012cb5e06a28dfdf513738d4839b567 SHA512 e0e78485dc07bbd2885fa74b7ea7bd12ed249a77b1bfb3b570243bffefdaf1e6ddb29e8e2ff09ce3847df8c3263f84e5d116b31984aaa59b01ce54ac2a341ce6
 EBUILD ifaddr-0.1.7.ebuild 446 BLAKE2B 30646fb0b73cede694e27a6c2004a696a86ce6de61c95f3fef88c6f929c474e65fdd83fefcf0a35e8529116be89262120e0331d4592dc3ba18695ab2897c3be4 SHA512 4553fc9d3fe6517b1b5f8d27cd7919d0fa0d45f8930bc1277b4570ca9ab5fe7cd6558470a3de51094314a534a081d70365e3e0b18ed9e259b7f8edd8f5b520df
-MISC metadata.xml 333 BLAKE2B 1a681ac99aee289a919b530bb87037df6fe53b044ce14ce3a9da3cec54a73d7fde58cf01f12678f18397d16b56c9e5bf88d289ddec4469e343d7193502124124 SHA512 a73512d246562e6591eb9c8d13759352cede7f0ae978d02c87bd72b1fe2c9b155cc3908e8489b136387bada61f1257d8e0771e01e26d998b51f9ce13c087ec41
+MISC metadata.xml 402 BLAKE2B 73a3304003cb5705670c9971efbe33ba323081b1ccf7d89403f740a2b11f701dfe879ee50bbd159e7a023d53ff39fc884121c5efe51cf3de1f4ddccc89181165 SHA512 288e58ad845f8168bf651b085e4be1e7f96f75ab909c72d7653f04441762524ca064a6a53c96344d21cb89d25e70cb0cbde67754d6021bf9d44605b4bf792b63
diff --git a/dev-python/ifaddr/ifaddr-0.1.6.ebuild b/dev-python/ifaddr/ifaddr-0.1.6.ebuild
index 2fb4c623a9c6..75771cac127e 100644
--- a/dev-python/ifaddr/ifaddr-0.1.6.ebuild
+++ b/dev-python/ifaddr/ifaddr-0.1.6.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ifaddr/metadata.xml b/dev-python/ifaddr/metadata.xml
index 3ee70120def4..a9f519e26286 100644
--- a/dev-python/ifaddr/metadata.xml
+++ b/dev-python/ifaddr/metadata.xml
@@ -8,4 +8,7 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">ifaddr</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/imageio/Manifest b/dev-python/imageio/Manifest
index 6deb58bce8de..90d58b020203 100644
--- a/dev-python/imageio/Manifest
+++ b/dev-python/imageio/Manifest
@@ -1,3 +1,3 @@
 DIST imageio-2.6.1.tar.gz 302911 BLAKE2B b0ed781b9edcbb93af664ea4e815cf90e56ab2b31abdda88dcd142558efa1c43afb89886f6b3a372fddcd200df802e45c7278fe13067bfeebf119471f573e668 SHA512 e4a4510a9fd0823914a9f511011cb9c191bea1cd78b2c2bba5d559fcdc89c55cd1dbb03a81eaf82c460ebb86cde518f44ff02766a9935d4f463e81a52007fe25
 EBUILD imageio-2.6.1.ebuild 523 BLAKE2B 43871522cc26bf617e0ede0498c3beda522d80dcd54544d28122fb5c889e5d5d93a3c913b0c1529f1f43f542fb70a81fe35c5d1b03790e2d1eb45e8dd50af60d SHA512 8954dbfc693c05918e44ddc2e19c297cdb5cf0c38db3f10d39492ef8c7393581bfb43502a2df350a3a3d9c9a48d8933cc52087bf5680a8bf1e8a4c1d097bf6cc
-MISC metadata.xml 755 BLAKE2B 4e1526c47ffe906176ff99c65e7ca60720ac1d5fb26cc277b3a32b4df8142b6ddcc5b3c8ed094fbb76c7076f4752bd5bcb1578cc92def16c08951129f2516079 SHA512 abc1c69e5271aec0504fc56d5bf4c64ea1977bc217f93c55014ead25e81e0e0edba849644808d9b6de7a407c38c8a6540b715ac89b0b42c422d4c838d7b5005f
+MISC metadata.xml 800 BLAKE2B b24f647cb441a588cd337e424a8c4271006fb8eefa80dd3cf2034e39b8c096b5ae23f3c3c28df16e3591e6cef10fc7c655901594d85be712b5b51f4762ec564e SHA512 027997a713c06dd78c315ff3a72ca2d09a34b1d8e8f78fd76b058d0ffeb30530a87f7b267fdaa63a6cc2cb8f4eabb192effaccd91b878a2fcc1c71c40eae19fe
diff --git a/dev-python/imageio/metadata.xml b/dev-python/imageio/metadata.xml
index a698d92e5532..47a765c2f283 100644
--- a/dev-python/imageio/metadata.xml
+++ b/dev-python/imageio/metadata.xml
@@ -17,5 +17,6 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="github">imageio/imageio</remote-id>
+		<remote-id type="pypi">imageio</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/imapclient/Manifest b/dev-python/imapclient/Manifest
index f623ca3b94ed..cd59c6c30041 100644
--- a/dev-python/imapclient/Manifest
+++ b/dev-python/imapclient/Manifest
@@ -1,4 +1,4 @@
 AUX imapclient-2.1.0-py36-tests.patch 1224 BLAKE2B f3a9a7257f8eed538d9c030e1c8682da0a507d5d9c6f1a92f8d42daceaab214c1d033b4ddeb8f6f5081c53f7e464f72830202b048067d8685eaf761f9aa1bdb3 SHA512 cea2d0b0744cc76d52abda07a031b0e61a96e6019172e0e5490f6e32f757c6850344caa41b22d0db9fd814153c1f78d9d48260281d362ebf1eb2d9a05f9b4800
 DIST imapclient-2.1.0.tar.gz 85925 BLAKE2B 9725be7988c4bec105fda73389241e39e6c006bccd8130125b280041d13becd6a71a1832763171daf25dfb4e7b4a7fc86c0a3afa93216c3dc4370b19348c0a5e SHA512 57e5824504f2667cf41ac4983130e16a5ea73ea37f29cdb16295eb725b56eda55db26a12e380acb579ef6b8540d38ae6badac5dd5b644d4419cbe9151f634e70
 EBUILD imapclient-2.1.0.ebuild 977 BLAKE2B ce8d92bbd367309442c2e26aafd7f47c142def7c81aab5876ba2ecd1edb1e80f2aaf191006d3e8e0732bb15ea0ad674624561f32b60527eb9044e78a9b67dae9 SHA512 5dbf1f6e62d4e82f95286efe73174e9ce203748b8ca2d3ceb868fe6272262d67be71ec6ecafb12a6918529d2bd8a7f605870d7a868e8b57d886257f5bafc05ff
-MISC metadata.xml 313 BLAKE2B 89d6cfc58f1d5e5e5e0737bf8fafc74e26800234041390fdc259aaf4a49b9c8aacbf9c5c2c55e8ddac4b5010dd70a2ca349f41ee15a0812335522354381bd151 SHA512 b8b32e8bfcf59a3f7134ca2f562365c02e590a2d6e8e5eae9c6d3dbe2d4918b973b614aa38650cc67a5c34167b6293f4dede92e53f635f079a050bb26289d48b
+MISC metadata.xml 367 BLAKE2B e8e78992c7b20719db0dbf8ad12b3be2233755a23c252067d4108854721f71e5210154ced2ec1ad17c6e0b2196ca328a5d8b651ae138c66b5d6904f5c97e6fc5 SHA512 d4fcecd0bba2fc7c51b71a05cfff6ebc4c823e7cb0ee56d58ddca5596fb9fd59bf132fb285c3570280fa91a95fc51a75f442854163372ad383506489ede29e40
diff --git a/dev-python/imapclient/metadata.xml b/dev-python/imapclient/metadata.xml
index 918bf0e26c80..810750331cb1 100644
--- a/dev-python/imapclient/metadata.xml
+++ b/dev-python/imapclient/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">IMAPClient</remote-id>
+		<remote-id type="github">mjs/imapclient</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index 9eef194d249f..7973f025c8d4 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -1,9 +1,13 @@
 DIST importlib_metadata-1.7.0.tar.gz 29233 BLAKE2B a8cd97a384ab06201025fcbdc401fb25788c2eb1dd4f1697ca00e79634cbce32b984cb8a7c2aeacfb0871f92857d08f3ce9c3ae43d698df7401db91add07b6ca SHA512 31f7cda6a1149ca2040032945b19b55d2e97ef8be67db1423c2c2cbb79da3dead46338f3c9eb03b46f9202fca08ed7bf388adc25d34903ddff4b2873c8a89aba
 DIST importlib_metadata-2.0.0.tar.gz 29289 BLAKE2B 4ec24db057006affe1dee20e021a47d385770b1aa905db4ff4223d59f19b53dc85c21475875074664a84a0fb6994493735f5e098d38f938816ebc69dced7a40d SHA512 3f789d717f04f7649dd4a75895669b4f9b875671937035c1c76bd089504afff8c2ba5bfb6a91096ba29eccadc88dca98ea1da5107772fd2053541db15c52b16a
-DIST importlib_metadata-3.0.0.tar.gz 28858 BLAKE2B b1d4c7dc8a1fbbd66223c32afcbf43782b42b32ecb41d1fc7fdabb93c0c8ea3797f99c5b98fa5c0fad3b176bccbfd8716d72ed85a15f8ee8d0969c5e48a62478 SHA512 c5e8f79af1f0aaee1c768ef5640c65a76154544d7e900a11d01724e8ca30007ada80fd710e808e66f35dbc9fcf678824eebc5b92ffbc3d5a04e7f8f5aca0368a
 DIST importlib_metadata-3.1.0.tar.gz 29246 BLAKE2B 2144e10601e089e26e1d85269ed067d505de8ca86071524e038e87850420f42701b36fad5e1fe01529230333d5f23e0882f17a279bacfa39da335f3d968987dd SHA512 24d20d7658c2d15d2207d3660bd181016a16d0a2e3c86b8e86f7f95baab18f01f1a8753942d15ab648a40431bfc6db7d5109339575ef1a50802403eb580baede
+DIST importlib_metadata-3.1.1.tar.gz 32217 BLAKE2B 85155574f554146d89fedbaeffa5b5842c5c76f98d0f8488a019cded9fc7e45323b31a9cb612f81c379feb822a0e5a44f86566510c5bccaa344cbe10ef8676e9 SHA512 a0a3fc0c4cb08ba5676ae144a2176e9b2e02d122a09c1be67fe0c1e1c8304aeac4f624fa060898b20f99f67f9cfee2bdf1177d82cd12e5879edfa268e02cdce3
+DIST importlib_metadata-3.2.0.tar.gz 32793 BLAKE2B e99fc4544ec64bc320754b1bac80ab021fd4212930cb2b28fc44cd6f6c9691214fce2fc408aa65147ae45df589e5ad64d4681e29620a16ffd1d3231faebde077 SHA512 3e744ebaa4606477252243b6e473c33b70332879385719835a4187d5edad135f0f9076c26e4843aea4497c2a5a2b51fa7b5654e9ff97a8f5ec3808053dccc734
+DIST importlib_metadata-3.3.0.tar.gz 33549 BLAKE2B 6646cf7f8dbbeeadd7b4e9e572a59c14e2f17444dcd84aef817e27b299cbc3f0fa868657a59221a42ea8c49c5cc75e9e170a787df3e3014808d19eff1f89debf SHA512 af2215405b0f7e120d2745f3736d021174e611ad226abe64b496192a210e85786e78560349f1188deb3bffbfceb36385e9fbac20f4447aafb025a1d735c333ac
 EBUILD importlib_metadata-1.7.0-r2.ebuild 996 BLAKE2B 2e04af2cd739c2f896b5380dd73625c88cc76150bb8ad9ed1f73a71d253132e6afb272263dcb38383965f620e97696ec57eba41e72aed3673dd140a8e2411dd4 SHA512 1d5a62e708c34147dd3a25f77565c1ab4298ed0c0915f4c056cc7199edc854e2d86aff18dff6e5028ec3f03c03e697525d7c06470d0f68e652d3bb62e1152ad1
 EBUILD importlib_metadata-2.0.0.ebuild 1050 BLAKE2B 6657fb32eb94f02f06e5e09c75cf824278b45d8e9411da2eb5279dcc60c7a3be5018782380a44ac12e6c0421346815f0dcf2d9bfd2af38a57e5e5c842c98363f SHA512 990434854cc236cdf4eb6b44525007dd385985783d7e7387eb6c9d0dd0455c9afc152a30f51e932ad909fac3cb5e46c3b34b250705b5f86d1212255b35b6a5fa
-EBUILD importlib_metadata-3.0.0.ebuild 1005 BLAKE2B fb89a4c5ad0415927835120e6c7e5148f8bba72a4048f5190d00669c58f11309a0a2ed053bf4503a47bbf1d46cfea6cf5181f34f7304a475a0066e131d9bdbcb SHA512 7af82a4d41487d952ba44483db56e6e3e3693fa63c7f7f01fbf543999b7b86c496d845b467d82fcb1885d8350e0fded115c8864b8164d180eef6ad7326f877fe
 EBUILD importlib_metadata-3.1.0.ebuild 1016 BLAKE2B 59cf223d538c76d04291195d5c6af921dcce936eb936a168114ef20df8db04cd84eb2adf5e743d0d57d8095b87bc9e1e6fa4e1ef5acad670ec27e017a81880cd SHA512 7dbbd757b1c9ef77646cf095b4b42c03b1d397dea0cb74216b381c03870f9de536b529e8513d41b68def070ded09704530f20feef00724ef875a7c351362e9d7
+EBUILD importlib_metadata-3.1.1.ebuild 1044 BLAKE2B 455410110f0f1e17d7df2cdbb64364b625d3b4140733f33be55d77deb16c0e2c21a4e816924b603bfa87c76c5294954e2996e252f31f04f5a311326f58c26dc5 SHA512 001f3af3e0133c3149755e482322cc5c91bfb74f578adfd165273926b94f22747c217e8e75ea4cae87918c6ba09bd4c11d236e722b1cb552823c301f2700163d
+EBUILD importlib_metadata-3.2.0.ebuild 1134 BLAKE2B 3e75a125614992d4b1edbc736476b96fdecc97e412ae34a7d0661339f59045365097983c98966f97e1c26fc1a08a1c32eac62dd8c055ee2633a256de48b1a44d SHA512 9425d39127e14bc4bdec23fea4156d9b12fc752397f4c60f3b68b5047aa4a98fa9e96572627254e221e0f9723d82e7ad86772489331fafe1badf6b9238e0461a
+EBUILD importlib_metadata-3.3.0.ebuild 1134 BLAKE2B 3e75a125614992d4b1edbc736476b96fdecc97e412ae34a7d0661339f59045365097983c98966f97e1c26fc1a08a1c32eac62dd8c055ee2633a256de48b1a44d SHA512 9425d39127e14bc4bdec23fea4156d9b12fc752397f4c60f3b68b5047aa4a98fa9e96572627254e221e0f9723d82e7ad86772489331fafe1badf6b9238e0461a
 MISC metadata.xml 645 BLAKE2B e0d506f3cb5304b3cb14bd546c997978bfa70d77b16abd318c8e733ae90057b4dae2533107c3157a53df21b9f3046be0317c62367b3de26cfb245f4bf572ae85 SHA512 054fdafb3815ca9fb34178219c48ce5779f2ac8a700112d470fbf3bfdf780a6d98e0f30b6b0c7d6bc48cb12bda304dac01eacfa45d06964da704457311402679
diff --git a/dev-python/importlib_metadata/importlib_metadata-3.0.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-3.1.1.ebuild
index a04ab9b239dd..2b7899349c9c 100644
--- a/dev-python/importlib_metadata/importlib_metadata-3.0.0.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-3.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 
 RDEPEND="dev-python/zipp[${PYTHON_USEDEP}]"
 BDEPEND="
@@ -26,7 +26,7 @@ BDEPEND="
 	)
 "
 
-distutils_enable_sphinx docs dev-python/rst-linker
+distutils_enable_sphinx docs dev-python/jaraco-packaging dev-python/rst-linker
 distutils_enable_tests unittest
 
 python_prepare_all() {
diff --git a/dev-python/importlib_metadata/importlib_metadata-3.2.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-3.2.0.ebuild
new file mode 100644
index 000000000000..7fe2947b8391
--- /dev/null
+++ b/dev-python/importlib_metadata/importlib_metadata-3.2.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Included in Python >= 3.8
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Read metadata from Python packages"
+HOMEPAGE="https://github.com/python/importlib_metadata"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' python3_{6,7})
+	dev-python/zipp[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/importlib_resources-1.3.0[${PYTHON_USEDEP}]
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pyfakefs[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs dev-python/jaraco-packaging dev-python/rst-linker
+distutils_enable_tests unittest
+
+python_prepare_all() {
+	# Skip a test that requires pep517 which is not in the tree
+	sed -e 's:test_find_local:_&:' -i tests/test_integration.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/importlib_metadata/importlib_metadata-3.3.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-3.3.0.ebuild
new file mode 100644
index 000000000000..7fe2947b8391
--- /dev/null
+++ b/dev-python/importlib_metadata/importlib_metadata-3.3.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Included in Python >= 3.8
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Read metadata from Python packages"
+HOMEPAGE="https://github.com/python/importlib_metadata"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' python3_{6,7})
+	dev-python/zipp[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/importlib_resources-1.3.0[${PYTHON_USEDEP}]
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pyfakefs[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs dev-python/jaraco-packaging dev-python/rst-linker
+distutils_enable_tests unittest
+
+python_prepare_all() {
+	# Skip a test that requires pep517 which is not in the tree
+	sed -e 's:test_find_local:_&:' -i tests/test_integration.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/imread/Manifest b/dev-python/imread/Manifest
index e0d5dcafb259..ba0022089b01 100644
--- a/dev-python/imread/Manifest
+++ b/dev-python/imread/Manifest
@@ -1,3 +1,3 @@
 DIST imread-0.7.3.tar.gz 131492 BLAKE2B 060bcd8312f24f2966f840a6403486a9a9a2f6b9d033e92f0268594711f4fa06530c2a825103683b1041570c43c3af584faf10acf45a95e693dc83c81da4190d SHA512 401ec64fd4a65fac1cf2e1bd929cad00a8d704c6c03b8a10256d1e9c27cbc83b47a11567731a42c731aca3df9a5101b7ff90bb51f869695b1405c642e16486e7
-EBUILD imread-0.7.3.ebuild 642 BLAKE2B c753e455f5e5660f74516d90ce6463214070cd013c14aef68435a0430ad1dc63efe6ee52bc61e75145717d485f3c3d767751886d8058afe714a6951b63fdb20c SHA512 c6a33917bac97e4e6ff318390c8c881bfc992db2dd06f61a856965e517fee17a0b6bf18de773e2e09214923be95f17838a8765414118ae87d5a6fb1943a0e22d
-MISC metadata.xml 531 BLAKE2B 5301788b0bb43e3d29e3a5c144f3bf1ef3a1a15526164b32d7ed65cd1794c48e326319882d34f0687bfb0d9d3aed5cb6f547ae8b914405381181c64ce60db158 SHA512 d7a2d7a833d2ae01ccdd595b316f5c02dec0f9b2f3abe72fd77675851ccf64da2e3d6ce4e991b295e2de50431139a59fdfd543def3130987a11b5476d47f2dfd
+EBUILD imread-0.7.3-r1.ebuild 718 BLAKE2B e24ae7b65268e7654db8e9cae1c8d3483cf2eab705a5816fdf985c3a9c6c13861d568af02afaf2ba8f7c8e1017f1a1ffb905a80144bc3aeb9f216b18148ed175 SHA512 60197ffc7081c2cb15af972fbe70592cedd9723108a931aba3fac4c5d1df66586cb7da8a5f96091c7b5cab79f42276435acb9f1f4c7d632a7a3639774c211506
+MISC metadata.xml 529 BLAKE2B 6d47a643338b29640319946240b7fcc67eba512e7be46a30947e5e217153d979ea98c9388c4edb28bf59f20d7ac209cb6a8f8e12d2bb6e6ed374c4401d371d6e SHA512 c41d4453280a1a1c86463351c2960964b211cb209d345d4b36adf7e3a2a234a0af38ee83150bae1d355218699889d4224e4b0a1e5d1830d042d59cdaa95c8493
diff --git a/dev-python/imread/imread-0.7.3.ebuild b/dev-python/imread/imread-0.7.3-r1.ebuild
index bf90e09c7893..fb98c1b82ed4 100644
--- a/dev-python/imread/imread-0.7.3.ebuild
+++ b/dev-python/imread/imread-0.7.3-r1.ebuild
@@ -15,9 +15,14 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
 
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
-
-DEPEND="
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	media-libs/libpng:0
+	media-libs/libwebp:0
+	media-libs/tiff:0
+	"
+
+DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/nose[${PYTHON_USEDEP}] )
 "
diff --git a/dev-python/imread/metadata.xml b/dev-python/imread/metadata.xml
index 7a3dcbaa2b98..327659b45093 100644
--- a/dev-python/imread/metadata.xml
+++ b/dev-python/imread/metadata.xml
@@ -10,7 +10,7 @@
 		Mahotas-imread is a simple module with a small number of functions.
 	</longdescription>
 	<upstream>
-		<remote-id type="github">cgohlke/tifffile</remote-id>
-		<remote-id type="pypi">tifffile</remote-id>
+		<remote-id type="github">luispedro/imread</remote-id>
+		<remote-id type="pypi">imread</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/iniconfig/Manifest b/dev-python/iniconfig/Manifest
index 1eccc54544a8..0413d16ebf1a 100644
--- a/dev-python/iniconfig/Manifest
+++ b/dev-python/iniconfig/Manifest
@@ -1,4 +1,6 @@
 AUX iniconfig-1.0.0-pytest-5.patch 1809 BLAKE2B ccb4383f447f84a88cb020daf0b17ae626c627ce46424ba89591e1feba8ba38b48877e0cac83cef8792cafe283e632cdcec358f6d3929146cc67d2da57848233 SHA512 347295b050cc31108ee013a20dd1135f42a85636d83fba19d509a09856e50ad9343074b965e3b80306a9b73bfcda4c5197800ed3c2e5cba8432d26c5397a135f
 DIST iniconfig-1.0.0.tar.gz 7807 BLAKE2B a77c4d8c6f549db911110505ac5a367be5175adbb580211d4aded14d1108e189fd6d6a229ac4e0e742baafa9b037d58c2bbc810897c8b274c07493c518ef752e SHA512 639a4e765637110f69627fb18a5e719b6d648e5549fd857168183d97da7880434d447c9af1e254dd2aa5d0e36cbd3f5c4ffabf8a949ed3d6294002e7e1b2f6e1
+DIST iniconfig-1.1.1.tar.gz 8104 BLAKE2B 31301484887018a6aa75c944e2f8643f85b2433534ae46a8da893a113f2376eca14cbee88095a3784d1c52f26d4c748260c1df59c46b8f94cd342038f93242e8 SHA512 c9341db7e3ec2204b6a674fca7824cbeb492e3576d5ac3f084b234c82842b28f2f6acbfdb812e183f4334a95b990551f942a4caf548f5ce7ef14885f931535ee
 EBUILD iniconfig-1.0.0.ebuild 580 BLAKE2B ce259dcb36fc087dc75fd6919c2ebaf15c02ecf33bc264242976590d5de397a20d6bb28e5fbd8629516753053bb78eabc5f261b7370d0b96fa3b72672a039dd0 SHA512 77b2c635a013aa21cc3be927d379c516c855154b6dce273258cb75f3a18a3018bc88fe13353677846fe57e8ed68d3febcea9cd3858d6ebeea54cc494eb8c4f3d
-MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
+EBUILD iniconfig-1.1.1.ebuild 536 BLAKE2B a52c461adbd916197518d1b0f8171791d74c29cd5d62bbbb6b31552f244faac1ad4d1d50c299fe016712213e62d9df60d56f3ad3983507058aa6119f04e09753 SHA512 c26851eebe8d527b3435c2098075d003412b87b5c3863e7f0ffce0016069bf47c1a18aebf9660c2692d318b63a02137165bd7b83ec077ab88b85566d07f3bf32
+MISC metadata.xml 290 BLAKE2B 2ce3db3ab43e55c8d7cdb33ef6c04d0242b80927b9b363ae5e0ca3435c4984455cd3c711b50e5e8e1dcef50b814fdff0fa3c82a6eb2fb8199fc2ddb9949dd9f4 SHA512 878fc9a22e172b52509babcafd133caefa1f86153b877641a13447409dd8c0f28d507e71a01587887ee1d01dd5b609e0189cedcd43eaaf519934223c3890b05f
diff --git a/dev-python/iniconfig/iniconfig-1.1.1.ebuild b/dev-python/iniconfig/iniconfig-1.1.1.ebuild
new file mode 100644
index 000000000000..32d95992678b
--- /dev/null
+++ b/dev-python/iniconfig/iniconfig-1.1.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Brain-dead simple config-ini parsing"
+HOMEPAGE="https://github.com/RonnyPfannschmidt/iniconfig"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+
+BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/iniconfig/metadata.xml b/dev-python/iniconfig/metadata.xml
index 266e3f19ca59..7b11afae1bb5 100644
--- a/dev-python/iniconfig/metadata.xml
+++ b/dev-python/iniconfig/metadata.xml
@@ -4,4 +4,7 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">iniconfig</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/ioflo/Manifest b/dev-python/ioflo/Manifest
index cf3df4f728f7..716f658a2eb9 100644
--- a/dev-python/ioflo/Manifest
+++ b/dev-python/ioflo/Manifest
@@ -3,4 +3,4 @@ DIST ioflo-2.0.0.tar.gz 838200 BLAKE2B 876a38df5e6fb953eef6e65bb793fa975a4fed8d4
 DIST ioflo-2.0.2.tar.gz 837382 BLAKE2B 1fe878c8a9a47a9be5083e392e15256f1a566433b4341e2ee234e84332bb72af0c426d04c77ccace33cfb05664745caaa63e910913c3d63bbb2e5d8360a1ec90 SHA512 7485924ce329889afb1c3e0555b54fdbfb11eafce48fb0ac15bacd229fea512c44fcc118bbc4368ebc7c770d62129ee6b895b982f73a269de7131ea37daac02b
 EBUILD ioflo-2.0.0.ebuild 715 BLAKE2B b72173e3f103bf4511392924bbae46d594799e73454c4f997c74a6bbaf33d1fa86a254d7d4d5f512a92d4e8a521e761faabf1e07359920e1d692b3f7a29a09a4 SHA512 b50ab250cddf468e81f5dbd62d78a8a23c36e4fd863ad813a027084b7bbc4871fce17382f0b3cd0268d09e9fa918cbd59e84612aedf1efe8dd62f4ddc3103942
 EBUILD ioflo-2.0.2.ebuild 831 BLAKE2B f1864b510155a325ddc47d8adec69fecbb26079ebb591e9dec2a8acbf1f539ef57d57a335bc230629ed3ee548b79f5aea93cd0616ca6c2143d520d50ec27b94f SHA512 fe628230d1f68ad75f0f5fc6b4407311402c3edcbaa78858e9ee70e675f230cad90326bf919115d6a086a5ffe4b69bdbf23818db2dda8724453ef2ce61ac9e32
-MISC metadata.xml 442 BLAKE2B 26c46608c3b6b62389b07f8a089a0dd6ba91701b3e18758d39a82980a16ce7fd03f4a080e15dc37006919904764a4fe9ce31183d31423e2c177c7c154d2cdc0a SHA512 8d6a727c351749f21566b4085b2355611b40e7a962e99d1a0e52d19d96f3d64db66c17ef01d08b82b4031bcdc637ae0a074423fd1eb92323334d6ee36d004742
+MISC metadata.xml 469 BLAKE2B 6f4917852ab3dfe4f17348f5ef69b0643073de1e4050084dae6deb6b3007869c05357dd17302173da52fa198f51eceaea47a873c3d19be90c83695e2d5b15b57 SHA512 ba0719079195393fcd3b15da3c410e2590d38dbd58877cbb7b0c9be11a575c5f700085d62d1382c217a928637178817d0138965c4091748280ad7b0b2057a13e
diff --git a/dev-python/ioflo/metadata.xml b/dev-python/ioflo/metadata.xml
index 3273120e4e7c..e648c6f51e34 100644
--- a/dev-python/ioflo/metadata.xml
+++ b/dev-python/ioflo/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>chutzpah@gentoo.org</email>
-    <name>Patrick McLean</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">ioflo/ioflo</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ioflo/ioflo</remote-id>
+		<remote-id type="pypi">ioflo</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index 970e47500fa6..d1aa7c8cfa3e 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,8 +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.18.1.tar.gz 5139337 BLAKE2B 936759db4377767537766a2baf0bff2adf1a95d17438899e1e1611d725e796d8ab78fcb8f1ca14d8d41171af64fa67abe9fadf84c6ca3cf17bb1d83fa2ba4268 SHA512 71f495021df56bbea97fb26b9274e54f7662875b7690a9493bdf682635e048d9ec53a947ee9b0d487634a3a8c639f0d93c6639b3a0dd20bdfefbb4c53fb53799
 DIST ipython-7.19.0.tar.gz 5225775 BLAKE2B 1909d8336e7fc90959da4ca33ad7edcb8c2dec0a5aa20ca6f643ef53482fe7bf0d52e2bbec7cf97e72a1fd4d37af45ba01166febb25f35b52d69ffc062f0f0e8 SHA512 5350a125da3050acaea4899939a3b9d779009a2f5769fc9f3aa514ce029df050069ef9310d3255ad62f28912b4dec39207267248d3a2c3e9131cffd691322622
 EBUILD ipython-7.16.1.ebuild 3652 BLAKE2B 70be8a367fb2c221e9d9b176445d7a3c2d8e9f21e7f5c5c3e395d6238bd92ff00aae8d061ff384d3da3c5635dd09c79965d1c755074add0d101f26c9c3570c8e SHA512 7281469503c7e301048343ad8ea65784026b6822382bdf08a02490c0ef1f67c2f5d5aef5bf9bb731aaffedca60472dd9af99ae4de4489a0f262b1de195e75843
-EBUILD ipython-7.18.1.ebuild 3628 BLAKE2B 941070e41b31139e8201c75da4e518653f2e3d78e41b8d0b41e2fce5ff0d036dc437ade7ca68639030732f0249d8682b6088127b149787066b8db9f53fb70746 SHA512 ba29ffc6ec8393397212934fc55a333a144f42875b6c1d7bf4d21820b317a953ae3ea0a27c270f5ba5d114356428d55dc0e47b17e2ca5a15028b170f516edc98
-EBUILD ipython-7.19.0.ebuild 3660 BLAKE2B b9cd3976082f74001253cc52b333559212f1d195690b0074c7ae91f21088ce5c5170cb0461826180e5fda8281c2b3fa999a9ec4419e23d8997e776574b3ef01b SHA512 c3c19166047d6a72febe550ee2b374fca7824c2f5f267ee8cc716a1f82d2db1103cb0bc610ed3b04cbb187e4017b466b7df8dcf68e303c16ced553f3f638d667
+EBUILD ipython-7.19.0.ebuild 3656 BLAKE2B 1ef2908fc1d302ceade7cc92763847cdc2fab3d9f9a5a70959c888884d57bb85dc3e93a718b833e2422753ee29958ab949c7f49948d5abd15eb81d096bd88640 SHA512 f36d910b155c928d4df7b959df50d67319a88ad59728a1137811f391013b9ee2c89b4d400139dce812a67b6e22ff7bf955f6ad0e660d4411032dc4be4f0fe1e0
 MISC metadata.xml 2882 BLAKE2B 189477b4ccde9051b61d2a4ff5134907886795f97c5201fc2bf9c012526333151931a1445b6315f286474b71af84253033cbe9bf89bffa7813bfa49a4a07ef6c SHA512 f54fef4552d09a03a8d186c45f917c091928f1de84dfbdd80f1db80912d616d509f10c588de533916d9c494f5b3ca5e6e50a6d8b8c59ea47781311ad4319442a
diff --git a/dev-python/ipython/ipython-7.18.1.ebuild b/dev-python/ipython/ipython-7.18.1.ebuild
deleted file mode 100644
index ec8488a4d51a..000000000000
--- a/dev-python/ipython/ipython-7.18.1.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.10[${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.19.0.ebuild b/dev-python/ipython/ipython-7.19.0.ebuild
index dfdb4d403f3d..b963c464a38e 100644
--- a/dev-python/ipython/ipython-7.19.0.ebuild
+++ b/dev-python/ipython/ipython-7.19.0.ebuild
@@ -15,7 +15,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/isort/Manifest b/dev-python/isort/Manifest
index 56d042cebd6a..d66c2573f055 100644
--- a/dev-python/isort/Manifest
+++ b/dev-python/isort/Manifest
@@ -4,5 +4,5 @@ DIST isort-4.3.21_p2.tar.gz 158539 BLAKE2B 316703ca754c939e4af0db4a1060fb13a5164
 DIST isort-5.6.3.tar.gz 161712 BLAKE2B ffbc2977016807d2bd5b1644377efad021af2ad27fd0e27feae1e5dfdfd112c7b5bf4b296ebf47ea6bfcbfe7f56cf3bfa8e1e7cf03963935660e678223397afb SHA512 fa2d9be306d03fc802aab3915bee2c41f4fe0c28353d9d99aa6604755e1602027cd81afca92b4302f80497c88a9dcb2701ec02ca55a5f9a2866669a68368d957
 EBUILD isort-4.3.15.ebuild 447 BLAKE2B 05640fd2f8789ab7457e0081519c72d6998623a61d6f5c8c6e2a7d2b7c7928949a578f283723d89c6a63f08e7d81670fba6f9be2905a033bab32a23dbcd35955 SHA512 b719b23a49a47897d115d38448ec3ca32a1f3e762113ac2f7b1e0493413afa2127599ff0282eec818ad914b15c9093055657870ac7e4d329a53428fe4087acce
 EBUILD isort-4.3.21_p2-r1.ebuild 789 BLAKE2B 555ce31eb81a5cc99196fb73c98472368f191aa3614bde3ecd9d06c5c9b7956d1d4211b0a08c2f626c8d7a24c8ad346e427b074884d9960a620dd7a49204fa2e SHA512 eb8e7ba2fe0b40a90bdab8b06a8ea71655c6bf2d84ce2119780cce907ffb09c4d3d50d9813e0390b98ec14603072c3307342e66fb72a494b578dd98aad8be57f
-EBUILD isort-5.6.3.ebuild 1646 BLAKE2B 76dfcdc4b61eb36ba990710e2dfccbd278a9c1e7b240d232fa1b0d7a5ab3d09d3a81712b5ea86aa3ddbd511e035b6db0a20065f747188de2ea7b19dfe2137891 SHA512 fba2a46dd3d2e321f77379220837e5c2908b0b9c5db60191c0e131f4fc5a8ed0b486985d0095a169e0e2686f33b63f38dfdef0860babaf2af01d67ff95b72a4b
+EBUILD isort-5.6.3.ebuild 1669 BLAKE2B f3be16ba2614503915dc355caf0083a4ce349747840e011eba353582179286f700f6984e150ad3bcac6d294ac5d56e30f9ae8f20af489beaec014b55fbd4f0b2 SHA512 10e17791a219d62393d33ce53dafd0f2ebbfddda97f51409db8346c6b78f62301f8ab3e1356fab1109dc353f66ee365b8cf36393f898ebdb3a833ce12097aefb
 MISC metadata.xml 573 BLAKE2B 025e9dc210ba42b2d385c75897d233aec2fa2810b5a2699339d1f33da94a8b5057001af48fe68af1a1c0a201c1ef73971433498e7f8c72cafaf306b51af17375 SHA512 369e47a3727a5c48720f9275ee6dd6b3dc5ee2fa05391da8bcb256d4c35af8a76bf33149a63eeae2a7259f59632f6cd56f32910ab10d652752c481609429238f
diff --git a/dev-python/isort/isort-5.6.3.ebuild b/dev-python/isort/isort-5.6.3.ebuild
index 65d91d48b06f..5a17b30f6087 100644
--- a/dev-python/isort/isort-5.6.3.ebuild
+++ b/dev-python/isort/isort-5.6.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ia64 ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~x86 ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/itypes/Manifest b/dev-python/itypes/Manifest
index 2e304067ab1f..917af8937794 100644
--- a/dev-python/itypes/Manifest
+++ b/dev-python/itypes/Manifest
@@ -1,3 +1,3 @@
 DIST itypes-1.1.0.tar.gz 2188 BLAKE2B 5b24790944b130530d4bb3f0ee266c897ebf7946a37133535622f823cc66bd2d2aba838170769b326d706fb123ccd1f4ed7aea8e877b9fe0a9d19692e0c9e0e2 SHA512 fbaf82a82e0685f54eb98bdea722cf9fa230881d1940e2a74306972eb9f99958cb0cc62b858c340b649e092262793b83dcf76d11d36d04755ecf05e7a2c77d81
-EBUILD itypes-1.1.0.ebuild 423 BLAKE2B 75f52c4b1ea7eb167af4d04ae4eca6a1c25569018b791d4dbae54661a06b8ef3453567c4212cdae19bd86b4db5cbe71f24ec7c4f47488b8dce9f259d3b7fc863 SHA512 55d17e54537ce87bb0a75c56bcdc8739dcf3c3def62a5d9467cda344975d3d22f12196d3039de535e171d47681b1097cb285e35ec03a9d2fb66a30283208f4b9
-MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
+EBUILD itypes-1.1.0.ebuild 422 BLAKE2B 1e3a9e19a58e9faaac5d97c1f347976a3c29accfa2470200f5ee43269c5654ae2951fb32a2fce80b6a0bb0ebf489df7c1eb6ba3751448b84eb5b41d37b2a8e9c SHA512 f727970fcb67268388e88e217552ba7a5f358cb5aae62618f86a3acac8b5cfa29826c42ef5c6e359ab80be893e70ed104976041bd63362d41ba86ca2d2306647
+MISC metadata.xml 378 BLAKE2B c3b8c660a9e8cc55ab6a931d7824ba49939bbb55b6116556b3e409644af9adea4ca84b134fdb078a9318c27079a710740ab70268946538633b26c7df90118cb8 SHA512 f10e26c3707772d18e82d027cf5dd897d560ae5bb99cc626ad3b8fda492bf75c3e91e85957d042e73e6e8c914a92523a844423c0fa571600c249ffda04f60fb8
diff --git a/dev-python/itypes/itypes-1.1.0.ebuild b/dev-python/itypes/itypes-1.1.0.ebuild
index 76e5dd50b66a..77145fda65bf 100644
--- a/dev-python/itypes/itypes-1.1.0.ebuild
+++ b/dev-python/itypes/itypes-1.1.0.ebuild
@@ -3,11 +3,12 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 python3_7 )
+PYTHON_COMPAT=( python3_{6..9} )
+
 inherit distutils-r1
 
 DESCRIPTION="basic immutable container types for python"
-HOMEPAGE="https://github.com/tomchristie/itypes"
+HOMEPAGE="https://github.com/PavanTatikonda/itypes"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/itypes/metadata.xml b/dev-python/itypes/metadata.xml
index c36c37139fad..7b8ffca6831b 100644
--- a/dev-python/itypes/metadata.xml
+++ b/dev-python/itypes/metadata.xml
@@ -5,4 +5,8 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">PavanTatikonda/itypes</remote-id>
+		<remote-id type="pypi">itypes</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/jaraco-classes/Manifest b/dev-python/jaraco-classes/Manifest
index d7f0c2641628..3c1d63a59898 100644
--- a/dev-python/jaraco-classes/Manifest
+++ b/dev-python/jaraco-classes/Manifest
@@ -1,3 +1,3 @@
 DIST jaraco.classes-3.1.0.tar.gz 11616 BLAKE2B 5b438f7582a9a93ca4fc97a71725c1fe3275e4bfb48f5e06b549f7ac8fb6900262165b1ad0638114d3a8d11c10f449b7930d4c2d66fa928665aaff820af88937 SHA512 697d892a01c4e8ad83f57e69dcd744f976cea67fa3efcd55b10eda02f6bf1916162c0fa952d0d711e62f62fdff62740ee55a93be9fc46ebd4ab22416092f0ff6
-EBUILD jaraco-classes-3.1.0.ebuild 1656 BLAKE2B e96cf83eb855012ed2e6cc746e7ae753daeeb7dfc492fc83cded7090fa6b1a36e546e46e26f5a5d935b84b69161c1d885762b14f475eb4639d52284993b29406 SHA512 0a001e545903a24bef8252f60516e65cb877794ef376207daa053e3d38c37ce5d968968d4551b30138461b349b88a58127478d0b774995d531bad1d58dba62f9
+EBUILD jaraco-classes-3.1.0-r1.ebuild 1605 BLAKE2B 87d513ff106c61f8db96b9af2fdab664e36e7fe49771e10038e0af3b05a314fe9cc5a4ee7fd2560bb64fde2271686396f456e3ce0f1b5c0e84e90ea1b5c8623d SHA512 1486e36e9f8fcfd4540e29788d47ed42b1d29fe9b03543c8fd2da70c98146349f7c5c4814463c146fc09d471d5251b98e5f00a47ec62ee2ea114ea4a570cb462
 MISC metadata.xml 577 BLAKE2B 5daf4529f9a92c285bd3ae07a6e75f2ea5ebd4466721c65d529b51bf9b32b72d17181e5f89410182138b2e94f6b22eb6f1164744f5871585d38004cf6ee1ee3f SHA512 259deaabde7595f7978dfe12b2b90327263edec17aca918675f14fe87fc8ce041cc337632af1b6cfc55041338087c060d5e88b5b018bf2c1c2c21781f179c601
diff --git a/dev-python/jaraco-classes/jaraco-classes-3.1.0.ebuild b/dev-python/jaraco-classes/jaraco-classes-3.1.0-r1.ebuild
index 8b8c724c4ef1..3c40afa14813 100644
--- a/dev-python/jaraco-classes/jaraco-classes-3.1.0.ebuild
+++ b/dev-python/jaraco-classes/jaraco-classes-3.1.0-r1.ebuild
@@ -20,7 +20,6 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 "
 DEPEND="
diff --git a/dev-python/jaraco-collections/Manifest b/dev-python/jaraco-collections/Manifest
index 157f865718b6..1a41e2fed596 100644
--- a/dev-python/jaraco-collections/Manifest
+++ b/dev-python/jaraco-collections/Manifest
@@ -1,4 +1,4 @@
 AUX jaraco-collections-3.0.0-pypy.patch 977 BLAKE2B 528835efbb2d7c6f60e9f49b35032649f81d5b3ae08a8dbaa6ff1e362619eb886570c14240f1660f2a8cd63f54ab4651d26a2e401c01557582fcdd9294a037fc SHA512 6bf4b43230ce7cfaa4971cf1d8bc243378284ef2381d910a9b6932f067c689ae46a3e9caec9ef696f72aaf2d0fa9f5226f79abeeba047c847926a2f588ae27f9
 DIST jaraco.collections-3.0.0.tar.gz 16439 BLAKE2B ff3690d85d91da8d88945e9ab8d16d13c7d0f67a9334f706701f9b392d8cffdd9450b2d6051a92799564cfc81310e45f50368ab729a0b68c08a9c8b0ccd9627d SHA512 c6c5d28fe4b3940c81c68bf877249805db3f508d83a0071947c7a5596d3636631df91cc6e87802b0fa6cd5c8bdd1ef2f39b924471666b44d2147cb64ad1533ad
-EBUILD jaraco-collections-3.0.0.ebuild 1583 BLAKE2B 1b308f18ddc23c2b07b363cad25b17436a823ddf1267e72cedae9677b650911f5cb896d3875002813223caa13181e874e8b06967f2528cbf26694e9e35777716 SHA512 49cf4c17fef34a68fef9db43b7c41df26b91b9ee4b7f1233a1ca4adec4dfdad658262d0bdb3c22d6051d305411fbe828c907f69a11fda2e44fa72f095e17c166
+EBUILD jaraco-collections-3.0.0-r1.ebuild 1532 BLAKE2B add04d630b8b0126853b02c3dc9e8016dea9a682f40cd6b7eaee8747f1167b62ee1315da8f075dc0b6477da3612cfb9f8f0559a39e37be1006882c240cdde582 SHA512 55e4902449b653f49c80f4e30a9955eedb6833b13436bc878859a4ea1f2d8b5632ecec805e0a7a71ddb92eeb38780f26966e7037a3194189163795db0669cbc7
 MISC metadata.xml 659 BLAKE2B 93e69bff80e5efb51d41b24817d5aba23bf2a6cc6c45a81bd4b0fb43ae5da538f377ebc0441b14f3fdedbda8b3a7932defa5255087fec9cdf6ac4d35f86dfd1f SHA512 1609b6fb022a1880fde31a5e9c7096e373a3c5da4f8a7b2e256241bfdaa591d4247b259a7b5dfcb6c9ee06182c3b899eec468992b50a04eb3f1e1fba43f20b20
diff --git a/dev-python/jaraco-collections/jaraco-collections-3.0.0.ebuild b/dev-python/jaraco-collections/jaraco-collections-3.0.0-r1.ebuild
index 6c4405351517..7b1da731a63f 100644
--- a/dev-python/jaraco-collections/jaraco-collections-3.0.0.ebuild
+++ b/dev-python/jaraco-collections/jaraco-collections-3.0.0-r1.ebuild
@@ -20,7 +20,6 @@ RESTRICT="!test? ( test )"
 # TODO: remove six when the following PR is merged:
 # https://github.com/jaraco/jaraco.collections/pull/5
 RDEPEND="
-	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
 	dev-python/jaraco-classes[${PYTHON_USEDEP}]
 	dev-python/jaraco-text[${PYTHON_USEDEP}]
 	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-context/Manifest b/dev-python/jaraco-context/Manifest
index 41c88db5dcab..0e736a8903c9 100644
--- a/dev-python/jaraco-context/Manifest
+++ b/dev-python/jaraco-context/Manifest
@@ -1,4 +1,4 @@
 AUX jaraco-context-3.0.0-useless-deps.patch 2133 BLAKE2B 8db1fea20763661a3d6786536de6ed956a1e3f2952a96f7242b5735f2ed782496dcc662259921e4eb2967655da4f94ad7262f282caf3bf15428c704f4a38890c SHA512 16608605a401fbd002714043da0a7a28fc770f8972a808d71da19733fe1992f7f1f27f1d87462900c980bd14ba4c493349e5802f735e795a2e2c3d7012d2773f
 DIST jaraco.context-3.0.0.tar.gz 12901 BLAKE2B b0a18d8799de211c9827a708302798372dff06767fbac08f4bff8ed48e1dde4cca8d3896a3c4dccd186efdc4d80ffe2b972a05e8f351ec53dcd0c7dec45cfcea SHA512 fd48a9af65edea3212c194758ba1a8fc2d7efc35f7eaec959a7f327ad46d1bf15f295af29d62726f813d35baaeaff35bc3fcd6e27a0e0f272232772e1cb87c17
-EBUILD jaraco-context-3.0.0.ebuild 1015 BLAKE2B 68668c295aa8f7f10f7b503db50fde24a0f1d797626c3c7cc6a736d3d32d0d1266b093d1c3daf90ee10d0bdbed2ee7d201b88055d39872766b6ee2a97840464b SHA512 b88e47783b469ca13b30a93a2febabc0230e3f8643d3b2abd395a635bf3565c8fa104bea4aa686425d233aceeabfc75eb7492aa1c74ebc7df0ebd90850c16c87
-MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
+EBUILD jaraco-context-3.0.0-r1.ebuild 952 BLAKE2B 3b3f04a0f99f2cbda874a0f47b7ed850195bc667ff14b66432d3cfac4635e2c551d0c5a694d8b9df1ba8a61b42b1ae8ef509dc8ab9cb159d203e89dc220b8111 SHA512 21c7400d31e13fb83da0192f5f2dc9f2d99b577adfc4498a9c93a5f699abcb81d0ecd34de06b5422bca5730c24e4aa6a2b008ce2d97cd664bbb861930f9a08ff
+MISC metadata.xml 317 BLAKE2B cfd50bbe9635fc0ceb2d21cf84d762cf58fd40f66e9ede979905602ff5d2845795f28df6064478076030f3b56ed4799cb92604f1be2a81bb55201295d5e98b75 SHA512 b519a157b94749a5fcf760018711e956b2bb7dfe776843493afa04dc37e7c46c659f47ce4d4b8e220fd57f26e030576b5f4acfd8c6e76d1fe97609046419e721
diff --git a/dev-python/jaraco-context/jaraco-context-3.0.0.ebuild b/dev-python/jaraco-context/jaraco-context-3.0.0-r1.ebuild
index 37dff8f76a75..9b28336a584e 100644
--- a/dev-python/jaraco-context/jaraco-context-3.0.0.ebuild
+++ b/dev-python/jaraco-context/jaraco-context-3.0.0-r1.ebuild
@@ -17,9 +17,6 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 x86"
 
-RDEPEND="
-	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
-"
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/jaraco-context/metadata.xml b/dev-python/jaraco-context/metadata.xml
index 7f4f33c6dbc9..1450a0c4f114 100644
--- a/dev-python/jaraco-context/metadata.xml
+++ b/dev-python/jaraco-context/metadata.xml
@@ -5,4 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">jaraco.context</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/jaraco-envs/Manifest b/dev-python/jaraco-envs/Manifest
index 0c2a87bdd2b8..a2568f0aa2aa 100644
--- a/dev-python/jaraco-envs/Manifest
+++ b/dev-python/jaraco-envs/Manifest
@@ -1,3 +1,3 @@
 DIST jaraco.envs-2.0.0.tar.gz 10018 BLAKE2B 8ad47fb7cb8f68081bba0e83368fe3a2f069130153b78be375a7a4543cf85e00ca1e365f9fb5a76d54f771879e87ff4737fe2991a9c520a9f86f21cf5d9aa8ce SHA512 f121c25ecce75beece7ed7218e69616f7cec6e493f9734b8ce040368d0fedc1ca4d7d343ba41c1367451a744f28ed98d9d2f3abc4610bfa8709fc29480c5ccbd
-EBUILD jaraco-envs-2.0.0.ebuild 1041 BLAKE2B 1d707480f89f1fc5bbcccd053614d15bdc9740b4f7407ebc6f865d9946a3841bfe5e553b8b723aeff9c37ad732fdc5610ac4af617883e88444e91a7bfb9da9b3 SHA512 a6b19559ac9a66f6ad85aaedc3545c4cc240fd0fbbc49d6aeda0e9ad341cc6c863a400dc74d8d5fa55ec9f5b150bbca41949114f20f3ffd9eb837931891b284f
+EBUILD jaraco-envs-2.0.0-r1.ebuild 996 BLAKE2B b8eed4d050e9ced43863392fd0c125fd1e2d6a561b207c227619c37579a429099a8eacd88f4208136ad448ba5342b702bd8a03caa75cb887d139c672cf193c79 SHA512 ab88701a748ead9d2b060c0b3b24006d177cc4830e7679611a02f5ecda55183f103ba198b3445c4242c0780cc7e345b9da38424bc577bc7b71dd748a03e0183e
 MISC metadata.xml 396 BLAKE2B e6dc26e54f94142429135696cc42201a0ccc3331a3e87cb3294bdae386b84a0f804bb91410294dd076badeae53d93b5da2158e8114aefdefbb91bd93ebb14ba6 SHA512 1456e135ae43a738ce79411b5040513a24acfadc4ea040cb93adcde5f61e6eed7c0798f42b32ce473d4bdc6563c755f5f4387f5e3cce350d557cc00a6efa899a
diff --git a/dev-python/jaraco-envs/jaraco-envs-2.0.0.ebuild b/dev-python/jaraco-envs/jaraco-envs-2.0.0-r1.ebuild
index 5e0418fa03c5..ed385575c2d9 100644
--- a/dev-python/jaraco-envs/jaraco-envs-2.0.0.ebuild
+++ b/dev-python/jaraco-envs/jaraco-envs-2.0.0-r1.ebuild
@@ -17,7 +17,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 
-RDEPEND="dev-python/namespace-jaraco[${PYTHON_USEDEP}]
+RDEPEND="
 	dev-python/path-py[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep 'dev-python/contextlib2[${PYTHON_USEDEP}]' 'python3_[67]')"
 # toml is required by setuptools_scm
diff --git a/dev-python/jaraco-functools/Manifest b/dev-python/jaraco-functools/Manifest
index 0be9a37aa52d..5a8f272bca73 100644
--- a/dev-python/jaraco-functools/Manifest
+++ b/dev-python/jaraco-functools/Manifest
@@ -1,3 +1,3 @@
 DIST jaraco.functools-3.0.1.tar.gz 16996 BLAKE2B 8cad1532753ae5c941038d4b8cda17b49f2d131405bb010d3747ecafc1ea4f72ad2c91b1ce2c499cd2885b18a9fe2cd1ac1bf06d58ed6f13a7a379cf9deb0e66 SHA512 96696839d3405e571bd0120443c5494f13d737b7e0fd9324a7a003c88ff45bdaa89a717c81b9c5ecb4eded9781ba2c05f4735e5cf24c1d1c162fc3d55d38eedb
-EBUILD jaraco-functools-3.0.1.ebuild 1434 BLAKE2B 896e1c5abef40258894590a50dc2e71d5ca24e7d65b625103e0d5cfd1df105ab5ba70c4e1a703c87188be5f1ff18303ae2e9673dbfb106b5fe5eb0a8d04b577b SHA512 c294f693d572a3328c7769a3ff64d9810f561b505dd4b7cd5b1a616b4a2ac8259cfefce49432bace152cbc14de81447676898f74873cb506c668582a5e58e0aa
+EBUILD jaraco-functools-3.0.1-r1.ebuild 1383 BLAKE2B 3d7e180ae928ad3aee0205f7b4a6f2c5270aeaa4619923026bd7da4f269456073201f584c56ba79e45f7e297d5aea64151dfb76d7889afb054959188af3d39bc SHA512 d73deca407f803d1f41062c7d030a284385821dcb874356e08c33f5f42ba960b8520166c67bb92c387bb96f930536f9a785b56acdfe6fda539216433d1bf76af
 MISC metadata.xml 675 BLAKE2B 64f36f8fd58d397d3efe5f8a5026eba903a37a6db1a1b2cc33fc893b3cc5c3b9c191adbe814f508bb1798b0e7e5ea6cfba61257982495eb536aa1d244dd86ed8 SHA512 abc84c4f12b89d334309821d54b4d59b2f1b490e83656bd375ed932835aca4dd9fd3299fd496fd33a34a5ef0991af115211b28ff83179632a13963b68ef9156a
diff --git a/dev-python/jaraco-functools/jaraco-functools-3.0.1.ebuild b/dev-python/jaraco-functools/jaraco-functools-3.0.1-r1.ebuild
index 95877b4e1d17..92ec34693964 100644
--- a/dev-python/jaraco-functools/jaraco-functools-3.0.1.ebuild
+++ b/dev-python/jaraco-functools/jaraco-functools-3.0.1-r1.ebuild
@@ -20,7 +20,6 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
 	dev-python/more-itertools[${PYTHON_USEDEP}]
 "
 BDEPEND="
diff --git a/dev-python/jaraco-itertools/Manifest b/dev-python/jaraco-itertools/Manifest
index bb10575d9fbe..b0ec55c70950 100644
--- a/dev-python/jaraco-itertools/Manifest
+++ b/dev-python/jaraco-itertools/Manifest
@@ -1,3 +1,3 @@
 DIST jaraco.itertools-5.0.0.tar.gz 19517 BLAKE2B b38bbb75daa53ce9390a51099b3ebad16696924c26c6674a7c5b9ae5e219db6560d1bae24b4c491d6e424b7fecea66dac2eab673d0cfa91fbdb3a4246b852944 SHA512 38ae2cbdd436b277e3d3c252fadeb5239e2d32b2291686b2a3dbaca69328392eb1db4318b2144954b17302e5b15b94ad89f1ea8a1b2e354deec7d4516bd7ec85
-EBUILD jaraco-itertools-5.0.0.ebuild 1744 BLAKE2B 971dc647df3314bb97db44399ef44e41782086623d16a078d45aa69dc70c7b8f18c33900bbd23b34982f4e3731f916d819a1dc6874fbdc77e90c4b8c38c47512 SHA512 212d65ac2feaa259a4d606fb470b529156d28218047d22b44939c44612f5660e841885cca6103ab7a60533e279ab5150aa488df8efe2b8b0df5360ed04a2399c
+EBUILD jaraco-itertools-5.0.0-r1.ebuild 1693 BLAKE2B 30cee651d0a6f5975e07ec488d54e7a9b6028bb15c3c699a23b4bb9628e94261ed1de7932af9d277c584aa83f6ef402952bbb697d2ccc89df013349dd64b0873 SHA512 f2206bc99126ab9bf7755089e9861fd45556bc1ac99a7fcd5078941450a9fb1c6168686dc64c35f6f458fe576ae22c510b1be9ecc3c4ec11cb1ba8b420845074
 MISC metadata.xml 574 BLAKE2B 34119daf42496fa9353422fc70d8d5bd03936b9382e02cba2f554a4da87069e7e2de34458a99bbb7a894089ea5ed8a119dbaa6ddb120fcfd91b0fd4aa49da7e0 SHA512 33d73c1d093721f5037ab3ed2f8121827d9de51194dfef1794f6abf4ff68db118569ff8ff19fa3433c804be422d1b9ca08aa62bfdbbb696297ad1970d6ac011a
diff --git a/dev-python/jaraco-itertools/jaraco-itertools-5.0.0.ebuild b/dev-python/jaraco-itertools/jaraco-itertools-5.0.0-r1.ebuild
index 4b4b9f83e466..a39a0c4dbf98 100644
--- a/dev-python/jaraco-itertools/jaraco-itertools-5.0.0.ebuild
+++ b/dev-python/jaraco-itertools/jaraco-itertools-5.0.0-r1.ebuild
@@ -21,7 +21,6 @@ RESTRICT="!test? ( test )"
 # TODO: remove six
 # https://github.com/jaraco/jaraco.itertools/pull/6
 RDEPEND="
-	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/inflect[${PYTHON_USEDEP}]
 	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-logging/Manifest b/dev-python/jaraco-logging/Manifest
index d271ee9fc0f9..533895c59537 100644
--- a/dev-python/jaraco-logging/Manifest
+++ b/dev-python/jaraco-logging/Manifest
@@ -1,3 +1,3 @@
 DIST jaraco.logging-3.0.0.tar.gz 10739 BLAKE2B c5cad0b6d7702a1216869dd0cd388d51a0a8e7bd24000108ef818623b54d23ce1adf0de2e017b869d764342484bf25d676ee18af9647b82964933ebb184cec0e SHA512 bc0edeef6223d0eb78110d51159a70afd16542e830e3cd37dec7628e582bce44218cd7669c03c41125db9824b6fc774f608dd7f6540224659f4dc2f1927d681c
-EBUILD jaraco-logging-3.0.0-r1.ebuild 1402 BLAKE2B cc9fa765e0c996bc38ab8fd20be6d69a02669308d56eebe9d045c9e7c115ed21a07f63bba71a0cc058667b11f03a17a27fc384bb7d16465dc4baa34498520b22 SHA512 91b6ec00683cdeee1adeece0d3532af12c3cf3c9c1bd14ecc72b3918910732c5d1ace07c778df84ad1d9c6e56454208ef871e5c74f7cf99dbca3b231d8754dce
+EBUILD jaraco-logging-3.0.0-r2.ebuild 1351 BLAKE2B 1165fccb26fcdc96abc740127cda40639a24c127066d380e6e950e889a5a9363cf0cfce4c44d4998b59e6eab945474b69799c49e02c5d09b96424fd48c34147a SHA512 816ae9b0296816741dcd3efb49e5b66d7df4b8309ee89d7921b27f37453f8aec85c60f54e43f6992fdda23abfdf9b34b4f73682a5575f567692aaf8d919a7eb1
 MISC metadata.xml 452 BLAKE2B 6beacf543b6c6ba9482609f0374283438dab3bff1ba25c53f1ec6c6441ddd0e185336766eaaae3ef89277874c6f12652a68b79a934919c8fe70f8bee88872b43 SHA512 447053b09d211ddbe1b2e98f7c1379395291f1331c75837ba1dc036a3b5d1e05e1f78717c419c4dfdc7d687001992f4c926cfc61bf267aa925024180646a3296
diff --git a/dev-python/jaraco-logging/jaraco-logging-3.0.0-r1.ebuild b/dev-python/jaraco-logging/jaraco-logging-3.0.0-r2.ebuild
index e90771dce5f8..2d2fc9b1d226 100644
--- a/dev-python/jaraco-logging/jaraco-logging-3.0.0-r1.ebuild
+++ b/dev-python/jaraco-logging/jaraco-logging-3.0.0-r2.ebuild
@@ -21,7 +21,6 @@ RESTRICT="!test? ( test )"
 # TODO: remove six
 # https://github.com/jaraco/jaraco.logging/pull/1
 RDEPEND="
-	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/tempora[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/jaraco-packaging/Manifest b/dev-python/jaraco-packaging/Manifest
index e14638e6bd5e..940b5cf043b6 100644
--- a/dev-python/jaraco-packaging/Manifest
+++ b/dev-python/jaraco-packaging/Manifest
@@ -1,5 +1,5 @@
 DIST jaraco.packaging-8.1.0.tar.gz 15322 BLAKE2B c354bec458a319bd9df0667c155203efa5c3de2d95218d0dd3a5878011d2d8fef694a490a2bac0035bff8daa18d1a3447c2c8dab7c0bd7bb09b62969f91d4709 SHA512 99996765cb047f2f0416d6afc4ff6ee0d84d03da0e07c7a7121518fbaf668f587c044f567c1d66a455372897ec1634ba5ee490552ac92064ca072e20b8f60a3b
 DIST jaraco.packaging-8.1.1.tar.gz 14580 BLAKE2B 6ec709571d74a9c840652b565e42b5301ab1ad71df823df6fb972c110d7bc0dbfdbae0dd3cc7123b29076a42de0d2b716ef2bab8dd58ffeb2563a868d90bdc90 SHA512 c0724e8694c3019bf3be24d99c7cde6dca65851e288ae027eb0b0fdfde9e1260804db3f8690b3bf69abd1e1e50733178c0387a859b0d634e8096dc49537f5877
-EBUILD jaraco-packaging-8.1.0-r1.ebuild 1551 BLAKE2B 79d0807586bbc88b4d8146bec1338b10cb91101669efb91d540ca4630b6cf8d4d36a6dc9f2347a3fd36a93a1ac001951fd6409ce1b108887d6bf626650b290d7 SHA512 ac66e72cf3d93afb185855c543c6c1f480869a8c418042ee28b0b2d2198c8888a193dfe60f321b101a0c89997e77d13e2a19b1215647737504dbbeaf979ad831
-EBUILD jaraco-packaging-8.1.1.ebuild 1340 BLAKE2B 6ec2b025e9a1b56561377118c995f312fa9f3fab4dc32ff9a62ad70b65e14019b055830b097b6c9368f93587d08b6483c8f443ec557298c1c4bf57ea252c8daf SHA512 913e62cbfcc91f44569ed9dd45ee5b7469af86c63444731f0a718e0897c23303d18e7fc61fb731b3ef173d20ab414bd24c19dfc297ec16876b2b0bead9196391
+EBUILD jaraco-packaging-8.1.0-r2.ebuild 1500 BLAKE2B b16412d8ebc5dd59a8f38e9a381519ee3fd2da24aac01ada77a2adf99eaa30e60a7c0b411774a9c2cd3b99f4687d40c5151fab2aa75bb50284da45d8c6477bb6 SHA512 9a0375ddbe696a4106e42d74b8ee286e7433f02f6b72d65fec7e6a78d5f4e25757c10894ca85c6e7380fe313769df3eb709bd067db1ea50de2e034e79948eef1
+EBUILD jaraco-packaging-8.1.1-r1.ebuild 1289 BLAKE2B 105f30e334efe976c6cd7ae2a77ada8883dc5d8df1eaa66fbc22e38f8f15c29cbbf4d5c4ecc4783e40ca1c8db098c671e4e10f16bf9f51bce44005ac777747b1 SHA512 6d4295c490703bd1c7b41387cff0f5532af811d3f8adc23f1a3ebe3d555d9f9be5171730284c7f19fbad545148947fc1440ea2c8d0e1431445fe8ee930abba6e
 MISC metadata.xml 675 BLAKE2B 36430dbb7cf6f29c913d02aaca81aeafa88e15cf44529c81835ae95c1b7a023a60d0116d50f04fbc424ee6aa49a2fe0eb56ed93b3a91cdd9d3bdda3d0377be91 SHA512 1532e2554229bec8576d60f8bd6b1f170fbe7a869f6b3505bd84efe33472b66b83cb08a5b4cbf201966d7e140a0571a89ff9dc3f821ded1181213841e551c506
diff --git a/dev-python/jaraco-packaging/jaraco-packaging-8.1.0-r1.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-8.1.0-r2.ebuild
index 2e4dfe36ae73..f4d1e11c9cfd 100644
--- a/dev-python/jaraco-packaging/jaraco-packaging-8.1.0-r1.ebuild
+++ b/dev-python/jaraco-packaging/jaraco-packaging-8.1.0-r2.ebuild
@@ -22,7 +22,6 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3 python3_{6,7})
-	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4[${PYTHON_USEDEP}]
 "
 DEPEND="
diff --git a/dev-python/jaraco-packaging/jaraco-packaging-8.1.1.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-8.1.1-r1.ebuild
index 3562cc7c22a5..22ffbf992716 100644
--- a/dev-python/jaraco-packaging/jaraco-packaging-8.1.1.ebuild
+++ b/dev-python/jaraco-packaging/jaraco-packaging-8.1.1-r1.ebuild
@@ -20,7 +20,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~
 
 RDEPEND="
 	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3 python3_{6,7})
-	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
 "
 DEPEND="
 	dev-python/toml[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-stream/Manifest b/dev-python/jaraco-stream/Manifest
index ee1f5768f55a..8d7e2fd2486b 100644
--- a/dev-python/jaraco-stream/Manifest
+++ b/dev-python/jaraco-stream/Manifest
@@ -1,3 +1,3 @@
 DIST jaraco.stream-3.0.0.tar.gz 11838 BLAKE2B 9d26ff8f78a3f090d79ccc8cbc41819a8290ebdb7770f56a57938ad9311ca1fd168d633fec78ee102c2c08156c9e0ae6f521dd5cafcb9df22928ba9f3f832734 SHA512 f2ce7e65d9a3bcd81985f45d03f7cd56b2f2939f13a423b8b65714f19eb249493d89cad774460dd08c1345124d3d10f85ce6875b5f7049705f993c0a3146e5d9
-EBUILD jaraco-stream-3.0.0.ebuild 1363 BLAKE2B b5b93ed975041dd8b0b9776ece91cf595f858d51e03d191a6516f68c81abfed8db831841fe6a45bdaa5512f2c67019fee934e5cc245c9a035ec75864b8135589 SHA512 f2ef8e893f066f51a8e3446e910d6d5769ff24752c7b937f4363b2d0bbc38c307cbad1ebbeccd9ce7618b94e4c40214fac4ad916387aee9208a8f4b50c89be74
+EBUILD jaraco-stream-3.0.0-r1.ebuild 1290 BLAKE2B 793e1cbe36b44c2356a6465bc39900a3d5942f48e310e583ddb4babd585b5cfe106ba1d2ddf85f19235440220811263f67319df2f206755628a3c4b8d2a72941 SHA512 f21b815930b51829c46c8be7f568fe1f2d4aa3128a819894a777e9d3c2ebf6d6a2064f623821f5f185c5a7d967c47affde1c32f1d1c379d973c5c3bf4cc63c82
 MISC metadata.xml 602 BLAKE2B 3875bfb93914028b263ef5b6f7af81ee9f3fc08f1217537363a02b12e69f273ad9344c5078ea284ed5edfee1389bace975f2745379c3b4b17db4fbeee4045494 SHA512 3a6635e6f38260c76979248878ff326451273bab021f3e85c23a0ae7e29d71daa53ccfa319c8d8457faa00c6fdf5ad3dc68e0693e951ecdd419182f1861a36c0
diff --git a/dev-python/jaraco-stream/jaraco-stream-3.0.0.ebuild b/dev-python/jaraco-stream/jaraco-stream-3.0.0-r1.ebuild
index c50cc19bb17a..010491d75d8b 100644
--- a/dev-python/jaraco-stream/jaraco-stream-3.0.0.ebuild
+++ b/dev-python/jaraco-stream/jaraco-stream-3.0.0-r1.ebuild
@@ -18,11 +18,9 @@ KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-RDEPEND=">=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]"
 BDEPEND="
 	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
 	test? (
-		${RDEPEND}
 		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
 		dev-python/more-itertools[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/jaraco-text/Manifest b/dev-python/jaraco-text/Manifest
index cbbb27bd20bd..d6b0219aad66 100644
--- a/dev-python/jaraco-text/Manifest
+++ b/dev-python/jaraco-text/Manifest
@@ -1,3 +1,3 @@
 DIST jaraco.text-3.2.0.tar.gz 14279 BLAKE2B aa8c8903bac61db3d1017408e1aa525f66060422c27b754af343a64e586b64c6623b66881bea62b9b2e89821a40c933d54c9a8cddc7bda08ac108ad08a9524dc SHA512 4107ef1078b44714b6ee5fb6ebd2bb7c35415debc6eaedd8bc18a70a2936cc7c7757acd7b3fac9587201ef52a25d9b29e49f2385a0a08afffb1d0c3de6ecc377
-EBUILD jaraco-text-3.2.0.ebuild 1483 BLAKE2B ee1a49037beaa9d71d1a000cbed914ba9974991c61485a82789e83212cbd6d689b17d8fb79b00326fb2f0e91e71579e96dae64286c56d9bea6d122c83fb70f39 SHA512 41a91dac99a61b19c01ac2bb075822099ad87e937c971073655a8561982421e508f057c5201560f02c64dfd0cc897f615deaa4d333fe3762a11666876a13c552
+EBUILD jaraco-text-3.2.0-r1.ebuild 1432 BLAKE2B b7e019195825f6797bd9a1e8b43c7d4ac96ff91287da0f0ddcf2a274a6ec70c6e02c88da9ed91bbec5938bee8b865a86a53b3069570c095de81f4a3454943280 SHA512 e0039d4a9db245807bc2d5b66e490bca2d98fbc7e5013d11e594be9de8c8300891b7f267797c4118a8e208b76156a6007b0260bc6159393c75e933bff57e18d1
 MISC metadata.xml 631 BLAKE2B aaa62e5e0d4cc048c1a279b16890d035cd0a60cc41e9b4c99b37876a21286248b5a00d193a2036d0c6d447ff57e635245583f571834daa5a2e994653570122b8 SHA512 84c01b2578aabd0fd5be4347ade555ca4f4ddd96e7009f7dd1b9d021465bc55f66431c72ed05a7e5633a81f3b401f8f77568bacc872198e145b5421aed05491e
diff --git a/dev-python/jaraco-text/jaraco-text-3.2.0.ebuild b/dev-python/jaraco-text/jaraco-text-3.2.0-r1.ebuild
index 1084d2d49d18..f3ca6a7ac900 100644
--- a/dev-python/jaraco-text/jaraco-text-3.2.0.ebuild
+++ b/dev-python/jaraco-text/jaraco-text-3.2.0-r1.ebuild
@@ -21,7 +21,6 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	dev-python/jaraco-functools[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_6)
 "
 BDEPEND="
diff --git a/dev-python/jeepney/Manifest b/dev-python/jeepney/Manifest
index 8bdd33ceab1e..055f7e735128 100644
--- a/dev-python/jeepney/Manifest
+++ b/dev-python/jeepney/Manifest
@@ -1,7 +1,5 @@
 DIST jeepney-0.4.3.tar.gz 28121 BLAKE2B 2c9b5b5ec26a9af25d28af602827c73c8ec9377a88a4aa79b9a986675c1ef3f195763a338f3efa4ee371f7751dcf05a9f9cfed06c8d6677d81da3699773d5561 SHA512 bfb12c9259a57324759f8be44d1faf2c0535762e72db5f1370e64cb144c0fc537c9bc9cfb9b075932fb3a20e3ef4e0c990c10905cc5a69e3fb088e8de4193689
-DIST jeepney-0.5.0.tar.gz 48460 BLAKE2B 5ce1fd0315ad839cf2e0ec5616a448da840d1d3b1720528a0cd858526815b062929ebdc92916820008969092bce470c88704deb96c6120c086f631d1312985b9 SHA512 ae80a363cac4944cb6a499450835176d63e29545b8025c6dd0241a08b35e7b2564beaab578cbba319799ec5530fd6fed7e9f910e401d68b46290617e5f739992
 DIST jeepney-0.6.0.tar.gz 49513 BLAKE2B e5f9b5104cf07dbcd2d40c2d22b690dfd56c456ab56daf44f4abee83f0bfe7e1dfbad797348044d51e3dc20fbc6ce68bf8df54f9c1e46d7a86ceb22d3ab30f8d SHA512 140be9dd28ed853d2d41b6a8bbeb2f22c0270ce7bf33b943ec2ac010db17d4f06e253fa8637fbbb3044fe9ffdbfa1e15f0c663eb44bdd538f8c47c2e7dab3ca5
 EBUILD jeepney-0.4.3.ebuild 802 BLAKE2B aefbece367f00496eaf9b986ee25c8b470dbac4d4ec4c9715b8b1d29b8c31f4307d6b0ce67154b9fd78bd518f984c8fd109185610a7b9dc89efef7b57568fd49 SHA512 13e500ebc659528d61478f15329c0b084c5556779e742144c5d3e5d3bff1c3c9eeaec607974c58e74c730c8893ff662223adca2fc2971f8a4672af687e339fb1
-EBUILD jeepney-0.5.0.ebuild 901 BLAKE2B 8a3f0123b780ceb28472ae42413935fc9275d3b18f7afd38bb2b6f63c42b5e917b7d649de0a9e34166879cb4d6054426570479ddfffc318f7be785019b956167 SHA512 f803c084da92b733fda5e044c6d0a055cec364e927d2f02f94e34986691c056a06e87a64ba2d1502f892e5207aa79ae36d7f23c4153763fc1e23874583efb023
-EBUILD jeepney-0.6.0.ebuild 925 BLAKE2B 478e5425a65766d465b41ad3eb302eba226c920178a30614d5c9341d128c770d9f33bfb924279f11f7801def9a9aaeddba75ab300af304e942fecc6e40f4f12d SHA512 8499b55449a060f5a640208b5f63092da83fa6bb45d91d7cd3f6bf04488b1b940ae688aa821c15c965e6344be694238941b8e6fb7c988af5b00ebf137e52fc00
+EBUILD jeepney-0.6.0.ebuild 932 BLAKE2B 7de2a523889d9d54bfb61f8b3e6def9747aec1beaef87ab20eb6e30143a147749612e8d81f037abe07c622b744569cb124731755692265baa208e196f0b75497 SHA512 64e6149711ac1b43ccfd1fb11d33553bc4d26710e4f6442dbbabcaba3104e52a15572f2d873ccf539374b33d0837492c51d0eb2e7da53d5f8d9c892f94f9027a
 MISC metadata.xml 456 BLAKE2B e597aacc0128f9cd06d21a03ca156343861a56adba6449e12127025265c6019308ba2e8f360d7a4f43bbca3f95a78789d964bdd3e5bd5fea7d21d7b8eb413c74 SHA512 6cb3b5fae02190cce838221a1d5269bc005f985d5935f77880b066999340818338a747a9e24aa5d39ab71f69c842747068e3b573dcf475c7d552af1bc9af031b
diff --git a/dev-python/jeepney/jeepney-0.5.0.ebuild b/dev-python/jeepney/jeepney-0.5.0.ebuild
deleted file mode 100644
index 1c412f4100c2..000000000000
--- a/dev-python/jeepney/jeepney-0.5.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, pure Python DBus protocol wrapper"
-HOMEPAGE="https://gitlab.com/takluyver/jeepney"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="examples"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
-
-src_prepare() {
-	rm jeepney/io/tests/test_trio.py || die
-	distutils-r1_src_prepare
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/jeepney/jeepney-0.6.0.ebuild b/dev-python/jeepney/jeepney-0.6.0.ebuild
index 37af4f03c001..a9562c3433a3 100644
--- a/dev-python/jeepney/jeepney-0.6.0.ebuild
+++ b/dev-python/jeepney/jeepney-0.6.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
 IUSE="examples"
 
 BDEPEND="
diff --git a/dev-python/jikanpy/Manifest b/dev-python/jikanpy/Manifest
index 75cdfbc748f5..c0d0da82bf57 100644
--- a/dev-python/jikanpy/Manifest
+++ b/dev-python/jikanpy/Manifest
@@ -1,3 +1,5 @@
 DIST jikanpy-4.2.1.tar.gz 536588 BLAKE2B f6bf531cc57814d2740e1d325bc521dc92651a1a467b65277086130d9c00de7b592e81a7f82e12cb35ac8d8c7f1bcc6201f945ab9c49befb8b89093e627eacc1 SHA512 7f690745a790836ddae95aaffdaa59ea60d0c2b2d9c64be7548372719c826239d3d650931652ca75d8e35f1d4354c0b80ebf0d7e80a4fa4b65ec3bbd4bef1cd5
+DIST jikanpy-4.2.2.tar.gz 536658 BLAKE2B b8f34f506aa93c68586d59d0ba37e1731e509f8ce2e0cd4f157b6ea5ae8b333271f528992998c92c19e08358ca14508a2bfae6fa167a750bb732fbcd3ccb13d3 SHA512 117aed3c968214aae659437b795cd4e326e0d94a536005861edad861b6e08d50be346063d1d75c3874ae2d1b3670cfa2ab566e340aa58ff6137a94dbd6369bed
 EBUILD jikanpy-4.2.1.ebuild 531 BLAKE2B f2f93f4cb7c8b70e60ba93d5d41d5576cd000afd0580c7ef51d6e4b9ca550001ad1f8869629f69f3f3c7bc5df96234ee7b49a7689509210d72d144b8eda0e3c6 SHA512 bef6153db43749fa374d9cccd08245789ce474f5613e461273d9b963238d158b65e7a11557f73b17ebe62207d1cd5a9d886bf3a75eac81faffae1f336b25b72f
+EBUILD jikanpy-4.2.2.ebuild 531 BLAKE2B f2f93f4cb7c8b70e60ba93d5d41d5576cd000afd0580c7ef51d6e4b9ca550001ad1f8869629f69f3f3c7bc5df96234ee7b49a7689509210d72d144b8eda0e3c6 SHA512 bef6153db43749fa374d9cccd08245789ce474f5613e461273d9b963238d158b65e7a11557f73b17ebe62207d1cd5a9d886bf3a75eac81faffae1f336b25b72f
 MISC metadata.xml 378 BLAKE2B a984a5ec0db760455227f9506abdd294feab0fe6e5c18c1a489c789e80b38c0ab854b0c195edd7c132932396c4c5628be65677f6ab945371d0d8414fc08a03a7 SHA512 4ef2469712d9af410a4000b3ea5bbac2bb3c837042cf3bd0348b53d57ba463652eff2ae5dec045fcfc897740f2810a43c03b94e79a55b72ac15154e31be230be
diff --git a/dev-python/jikanpy/jikanpy-4.2.2.ebuild b/dev-python/jikanpy/jikanpy-4.2.2.ebuild
new file mode 100644
index 000000000000..a901c883c33e
--- /dev/null
+++ b/dev-python/jikanpy/jikanpy-4.2.2.ebuild
@@ -0,0 +1,22 @@
+# 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 wrapper for jikan.moe API."
+HOMEPAGE="https://pypi.org/project/jikanpy/"
+SRC_URI="https://github.com/abhinavk99/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-python/aiohttp[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/simplejson[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/josepy/Manifest b/dev-python/josepy/Manifest
index 79011caea80c..048e06f821f4 100644
--- a/dev-python/josepy/Manifest
+++ b/dev-python/josepy/Manifest
@@ -1,3 +1,5 @@
 DIST josepy-1.4.0.tar.gz 54174 BLAKE2B 67117e7399422d0cfe2c47f9e5ed11a3b93617e673cf9ab1344334f7f11f0c884f45202e8e5e65ebacc00f527becfdbdda9ea246b8e96ba15e516bfc2fb33ba9 SHA512 a5038a4bb42c5a55d665a551743a976b209c24d8aa368d2b6acf0957e953bd4044d9dc41bf9d460283f44c14b7dd7ce2a860563fe107663d4a4deba0c7834e40
+DIST josepy-1.5.0.tar.gz 53979 BLAKE2B e08b3d7a9ce5b123ec8731de27bff63638e68a052f2e6c8715c77f6e4ea644eae1c8200d6d2135853f27eb8caa2e24a04cfc563bfbd01884eb247fcdcc4c9d4c SHA512 39ace649ae4fcefee3eb7fa749001645711de39dc17fd47f1ebf52981929e21bee9b6316d09c61b5478d3d652afc0659e7d5110d1e222e8dcbdc2bb831cb2d8d
 EBUILD josepy-1.4.0.ebuild 803 BLAKE2B 6b676ed68e693c54940d95df787de0c7c2159b71d303032aca5fcf1c97d1721183ca5538fa9cc2dc407c409608e38e9d8a9bbf9fcf33fdcc8e2e70fb543be36a SHA512 b532c2ef85e85b7bb05f5626c5ab2f7118d3d1c45037bc4e621cfcf0110e2af839c0a886206485762ecd451dacc729d3c3c93e4a657a4e230e36c1824cebeb30
+EBUILD josepy-1.5.0.ebuild 805 BLAKE2B 33a425040e9da1de093813064ca138ec2ee650dcf7719c24e29b191c74fe475d84ea7b14ca95bbdad8894bf3d71e411242ee2532b4943188f1608281408d83ea SHA512 06dc270383dbda9fe3062f7022c0d561a8e0c30bc48f9091c14932bba383d6600b47f3d5d8f4e5de879a62f505e174fd6a4bc6cda23f3afad1ceb4f030b51a5b
 MISC metadata.xml 719 BLAKE2B 658dee515235de05c2e9bb0f806feac685ca20ac9950982503eee109cc110ab84c2959542c2425803e38d5925eb95bb04c53daf21f6d8aac478a7f76fdef92fb SHA512 8fd99401c198b6a0a5d440d90daf80e085e16bd7d0872b1794338bdbe23ee31893346486e57d6c6ebbc892c7d9ff4351d9254d54726bec5cecf5510468a6df99
diff --git a/dev-python/josepy/josepy-1.5.0.ebuild b/dev-python/josepy/josepy-1.5.0.ebuild
new file mode 100644
index 000000000000..5acbb31edeab
--- /dev/null
+++ b/dev-python/josepy/josepy-1.5.0.ebuild
@@ -0,0 +1,32 @@
+# 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="JOSE protocol implementation in Python"
+HOMEPAGE="https://github.com/certbot/josepy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	>=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
+BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Remove coverage/flake8 options
+	sed -i '/^addopts =/d' pytest.ini || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/jsonext/Manifest b/dev-python/jsonext/Manifest
index 1a5628bdf261..986e8c64f712 100644
--- a/dev-python/jsonext/Manifest
+++ b/dev-python/jsonext/Manifest
@@ -1,3 +1,3 @@
 DIST jsonext-0.4.2.tar.gz 9574 BLAKE2B cba417bc116e572f383a6d396d33fab0f6b63534ae89c402b6cfc0297a0c2fce336bf63464252fe9c87a9617f7f00ed82fe9de9d4e95356b60ae555963d4951b SHA512 2b47b48b529ad8f3b9662ce19f6ea9250648e17cb94e4a59a52ab6a9aabf64abb74f3c76a1edf274fe1e52863352456c0f95c5cd7406c44ca917b6addd09a2a7
 EBUILD jsonext-0.4.2.ebuild 583 BLAKE2B ba108f50ba4417074a0f387def677cb36e0a1ea89537116474f0973b2f5d556aadb460e3a24aac02909010561147a7e36968a2aff57939fc8750c85809f5c688 SHA512 ccb96dff92e3eebacf63e1ba5d9165ad8a72e347a4fa7ef4ac2f5264ec76d2871dfc65848e41ce80c11fa381156b2388f5f3d89d174c57154ebb5454d8951280
-MISC metadata.xml 333 BLAKE2B 1a681ac99aee289a919b530bb87037df6fe53b044ce14ce3a9da3cec54a73d7fde58cf01f12678f18397d16b56c9e5bf88d289ddec4469e343d7193502124124 SHA512 a73512d246562e6591eb9c8d13759352cede7f0ae978d02c87bd72b1fe2c9b155cc3908e8489b136387bada61f1257d8e0771e01e26d998b51f9ce13c087ec41
+MISC metadata.xml 403 BLAKE2B d4649f94cfff182ded2bdaaa3ab292720a396fb074cba35cee2d3efe5e98959ff798b692025d80e841cca4696b4b4c2357ad8094f257e003147bc8978054695f SHA512 1c906478df150a82bfef259258e5bc3b334936b54c27950a0a334867698e9238b3904c3a3adfa2c6853bcc420926374f2206563588cc43715defd5672ee1f519
diff --git a/dev-python/jsonext/metadata.xml b/dev-python/jsonext/metadata.xml
index 3ee70120def4..909536b074ce 100644
--- a/dev-python/jsonext/metadata.xml
+++ b/dev-python/jsonext/metadata.xml
@@ -8,4 +8,7 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">jsonext</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/jsonpatch/Manifest b/dev-python/jsonpatch/Manifest
index ed2ce3dc8721..41510e7e0ca3 100644
--- a/dev-python/jsonpatch/Manifest
+++ b/dev-python/jsonpatch/Manifest
@@ -1,5 +1,7 @@
 DIST jsonpatch-1.26.tar.gz 24440 BLAKE2B 345831bd9a9fc1902d0959685ed2dbbc0bf04d191bbc78567d27283e9ae52f7e22f50e9f400461300d1c3388712afa51d4d6a2ddd0a06dbc0a1b576b02bfe807 SHA512 1ab25c8e091cd0b772062a8c448fee4772081d8bd715489b2f7a76e4c0bdff8b26dd38b26c3037cf9bdf8780b97e62a20b6a5bdc43f43af16fdae51d1291bf52
 DIST jsonpatch-1.27.tar.gz 26599 BLAKE2B b3481b4dd01d4fc6c2ad129141fb2b72d53d04744da54c1e4c989b2869113c15862d1ec5c84390758ad495ac36a9156f0e7b730ad091f96f6cb42fe96dde7fcd SHA512 297ca02d114e6b199bd516f69dca147fbe309f0a1b031046859271720645322607236f97b489c242575f7e1ad3cab0c68b1b7f11894c5af82be24013e376c0a4
+DIST jsonpatch-1.28.tar.gz 26829 BLAKE2B 1dee89500be23c49e5d7fdcaacb05da7ea089b691e133c5187c9558d378ae3714ad7fc6f164d0b7eea7b3cf1afefa39b7748a4637b0456051fab086e0e8f15d0 SHA512 2884cb95307cb607c8cd80e688491b4449f953e43e5b232d4d57d7249c590652ecae0856806ade6bf2807a04180e992fd2cdf61590ac058d573d653382bf7a28
 EBUILD jsonpatch-1.26.ebuild 841 BLAKE2B 5568878443867eeb529b3c513dfb9d31c924588ada8af0f5430e9fb25b6b3253ce69e82d81695fa98ab0bb7caaf99e9df1246520d34ee9f7c294974f64df349a SHA512 780d8d1a2e30a13df1c792a4b2cea0f970e8d3ab26e8692f8a2d1a0fcc8bd484472c10346b7d61c7cb3dec825615dee5cc478bd68e0fcbea9d7f5de90e0f58f7
 EBUILD jsonpatch-1.27.ebuild 845 BLAKE2B 10f66c19b9c2bf4c0bd578a05d1489fef2f1cc9d6e3d4d79cc9cc6106697026a842e5c6f0c2cbc98f398415763c135bfcbf5ad6d05bde0c7eb7a20f89a0013b9 SHA512 1bd8aa5beee9ed0da82d288c8c28d1a9700299825dae5160eed09b05b6f48eda41cc6382391d993152df62b40fe072742c80e198253f5f360aff30d846c281bd
+EBUILD jsonpatch-1.28.ebuild 845 BLAKE2B 10f66c19b9c2bf4c0bd578a05d1489fef2f1cc9d6e3d4d79cc9cc6106697026a842e5c6f0c2cbc98f398415763c135bfcbf5ad6d05bde0c7eb7a20f89a0013b9 SHA512 1bd8aa5beee9ed0da82d288c8c28d1a9700299825dae5160eed09b05b6f48eda41cc6382391d993152df62b40fe072742c80e198253f5f360aff30d846c281bd
 MISC metadata.xml 704 BLAKE2B 774410010ca5fff3237e4864e88e19fc80bf705a166d2d278763a047cc37d2b7cef314e3c96185a42a97d32693ccd27403b990ee59acc2c30be6a8cb22ecae48 SHA512 2e2dcc4a81bae9412ffa008ed17010d1a06505a9f6be59a3c45dbc0e6b9f25f627f25f3c7ec64753e39e10e56c62ad0bb2b28c648e677ce14179678793f036e8
diff --git a/dev-python/jsonpatch/jsonpatch-1.28.ebuild b/dev-python/jsonpatch/jsonpatch-1.28.ebuild
new file mode 100644
index 000000000000..7b86861b301e
--- /dev/null
+++ b/dev-python/jsonpatch/jsonpatch-1.28.ebuild
@@ -0,0 +1,28 @@
+# 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="Apply JSON-Patches like http://tools.ietf.org/html/draft-pbryan-json-patch-04"
+HOMEPAGE="https://github.com/stefankoegl/python-json-patch"
+SRC_URI="https://github.com/stefankoegl/python-json-patch/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/python-json-patch-${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=dev-python/jsonpointer-1.9[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? ( ${RDEPEND} )
+"
+
+python_test() {
+	"${EPYTHON}" tests.py || die "Tests of tests.py fail with ${EPYTHON}"
+	"${EPYTHON}" ext_tests.py || die "Tests of ext_tests.py fail with ${EPYTHON}"
+}
diff --git a/dev-python/jsonpickle/Manifest b/dev-python/jsonpickle/Manifest
index 5068b5af47b0..6ff85c58760b 100644
--- a/dev-python/jsonpickle/Manifest
+++ b/dev-python/jsonpickle/Manifest
@@ -1,4 +1,6 @@
 AUX jsonpickle-1.4.1-importlib-metadata.patch 1198 BLAKE2B c37f21cb8102eb1f6ec2bb178a0d38552bf013a4557fff990731a15eec24ced69210c38ac0abe28e7f8dd7707016bee51844faa2acc35b582a9871ca44d87104 SHA512 574ed4cb7492483c516b96b74502ba3b94d66e149000395781f2eee49b5e649bcd4d8f433e2dc257ae74b036ce314c1fd23369c1ac2ea2cdf7c89185d3abc076
 DIST jsonpickle-1.4.1.tar.gz 104564 BLAKE2B a3ad6f9c712f39153186b6ccdef515581012ad4ba1251dcb094074f2093eb4b158b9357bdf2e8668073cb21dc3bf6dd2fc3a0058c8597252c558a797432068b9 SHA512 ed6bf3472c59ba907a973c5c6f05de13dbfc75eef103796b8f8a63d388f769527f22667ca8761092d1649ff2caf5a73de0593e370df3e7fcabe06e73b265da35
+DIST jsonpickle-1.4.2.tar.gz 104745 BLAKE2B af12141c867cd3dbecace5b7bc637b554c51c245d4f584c4d94e73e694b74f66fc59a65a62b7a0af361a7a8010b9398a9b04ee838c4f76c168b21dba6f2c9542 SHA512 a6da661a69daefbc9393a4a4c88aa1da1b8bd687b6eeaed3d833ce1683bd1fa9d7943fdeecfe927e0492945ee2910b6f2d5e53ddb2b928b21f7b099ab79d45e9
 EBUILD jsonpickle-1.4.1-r2.ebuild 1460 BLAKE2B 6bfb7c132ccadded3b493b49ccaa0358c34ca8c18c80224dfb96080d9e15c02de1ca8d2fb3a61e009f1c1097577787c0f8f08fc4e42abc51b86d04423fe996e5 SHA512 d219db2ab875546fa2f4b7a39918538d251f068089e44647ddf4434f550a460a72a503b4ab9c77a021e4bc1dfc8a4e79e94b5a6915e5fdb0af85188687b91d36
+EBUILD jsonpickle-1.4.2.ebuild 1443 BLAKE2B 16245528b721a13d638f807a0c44fb891b43fdfb6a6e511b7cc1188a6ee0b7017b0086d1a81dd53695d81b2afa26ae9711644dc362e78baff0af2a34ff3ec57c SHA512 f97e165e995498ff59ff83fe5f96278fe397438b38acbb2fe20f530570827dfa7a108ab62e3a5d91bb425b5d93a1a40a15593facc06f7efd1c835b23dcfb9d84
 MISC metadata.xml 386 BLAKE2B 486aa3823ac1ae6b816068ae775da293fedab7120df504f2bb64cbbd026e1ad4ac2041acfb48035b5816616dedd46a5f4bedf8c63daad2315727cdbaedcd15ad SHA512 12590542127c674ae6c8123b20ce5c7ed6815f9129eefb95ef3a8c064fdc25477765d397cb7d7e62772475306c0ac7389a7155655576845b936866470302b759
diff --git a/dev-python/jsonpickle/jsonpickle-1.4.2.ebuild b/dev-python/jsonpickle/jsonpickle-1.4.2.ebuild
new file mode 100644
index 000000000000..0305f827e625
--- /dev/null
+++ b/dev-python/jsonpickle/jsonpickle-1.4.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="Python library for serializing any arbitrary object graph into JSON"
+HOMEPAGE="https://github.com/jsonpickle/jsonpickle/ https://pypi.org/project/jsonpickle/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+# There are optional json backends serializer/deserializers in addition to those selected here
+# jsonlib, yajl.
+RDEPEND="
+	dev-python/simplejson[${PYTHON_USEDEP}]
+	dev-python/feedparser[${PYTHON_USEDEP}]
+	dev-python/ujson[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' python3_{6,7})
+"
+# toml via setuptools_scm[toml]
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx "docs/source"
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# too many dependencies
+	rm tests/pandas_test.py || die
+	sed -e '/pandas/ d' -i tests/runtests.py || die
+	# broken with gmpy
+	rm tests/ecdsa_test.py || die
+
+	sed -i -e 's:--flake8 --black --cov --cov-append::' pytest.ini || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	pytest -vv tests || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/jsonpointer/Manifest b/dev-python/jsonpointer/Manifest
index 3a9d9e737502..2e65e90838b6 100644
--- a/dev-python/jsonpointer/Manifest
+++ b/dev-python/jsonpointer/Manifest
@@ -1,3 +1,3 @@
 DIST jsonpointer-2.0.tar.gz 8699 BLAKE2B 7b52955aa691a1bba327df6674704503b009101d0dd94587620a684ca9310128e3afcc62cedabd92106deffc3a6a3434a72123fc804224ae68ade8751462bf14 SHA512 e8e2b03c12c3fc5f65816fc71d1c07135ef74a0c912286f5b8bef2d9e21b8ae6e766d1aa2104b3eeb0e53928034321f25b203386ac3f5641b54b0641f6a08137
-EBUILD jsonpointer-2.0-r1.ebuild 598 BLAKE2B 3d4fe2d4feb89108888b733f8df3ac5bb232d84b533fd65ebb89504ed3fdbf8976ed63d317425f1618feccf07b60838a5c70331f0133909704b77168ad0035b4 SHA512 65ff5789537310c6e106cf3c40d23851dfaf5a6090b1e11e0e4f2a3167dd277234f9f272d4bb76ecb7dd0260c196f675e7490fd2b43a9a77e40322a55c0dfe6c
+EBUILD jsonpointer-2.0-r1.ebuild 604 BLAKE2B 4a4c6f5b33ebb96f695bc70549abfd10085784c49187bc1e23d66aa4af18c8aa85133b04ba5abd14748fd5f739200b4f8310130b557c822bb622cad593e886ef SHA512 7b9a601360ae2c6a9636cbc8c5003daaf2336a1f4c3f42b148bc9398d975f88a7fad65873b65e4bb578a2d15a48a4c40833d4ee39705879ad4660d7f28ea69a3
 MISC metadata.xml 702 BLAKE2B 20a9bbb2163d360f6797170b59d71a8233c7e7bc9f66f1809bd5c70d4c460a464fc0d8ad831f4ff08bb28df0c2ff77c0a0fd483a6295a7090fa73d1a3a4902ec SHA512 0f25c1d5667c07fc6382d958c6f150412de3208a9f21218bcff55c32354e86e17338d3b2480dbb8c7633f1b0d95211c9510aa4cbc9e5392490b6c3904babb9f8
diff --git a/dev-python/jsonpointer/jsonpointer-2.0-r1.ebuild b/dev-python/jsonpointer/jsonpointer-2.0-r1.ebuild
index 30330a213fc8..3c939dd22807 100644
--- a/dev-python/jsonpointer/jsonpointer-2.0-r1.ebuild
+++ b/dev-python/jsonpointer/jsonpointer-2.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 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 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 python_test() {
 	"${EPYTHON}" tests.py || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/jsonrpclib/Manifest b/dev-python/jsonrpclib/Manifest
index f6f98d721d6e..0571e5b08ab8 100644
--- a/dev-python/jsonrpclib/Manifest
+++ b/dev-python/jsonrpclib/Manifest
@@ -1,6 +1,4 @@
-DIST jsonrpclib-0.4.1.tar.gz 58293 BLAKE2B 29beafb412402549d625efb2cbd00d75d70a9582a48eb9223d9b8f8778bf186a80936dfb35ad47186634aab862311e048d556958a4133d0f8461163a51ead4e2 SHA512 9e0c06c016a9e117bb0b8e0fa1dd9e472ef2e280ef5efee51d491f339c8792477430390918fc46a2d8bfbbbe4baa9d4289f67775b879d2a49a35fc7bd1e8ecaa
 DIST jsonrpclib-0.4.2.tar.gz 59590 BLAKE2B 4201d62c9be469d7016943acfc84dca56606f17383ac26e86f574c34927ee6131c5c1a9bc5c3934b8324049ac35b1ff5e4e49ca7ef850251ebdf9a42a53e59a4 SHA512 8d9e5ebe8de960272a1ea0a194544d41851f96c5bc16b9eb6984ac4e48ec1aeaee8e4c3846cfe747a737612934d43a3df72bb1267f0608b1cd2d6faba2acc7b2
-EBUILD jsonrpclib-0.4.1.ebuild 757 BLAKE2B 8d05f99d40a33ae49d891715d24c09abe566c185133646451e17f1c2806d8b83823af32ab49c46ac9d16e3efe71edc081b82bad35a93104430214760642eab21 SHA512 8d377c9ba2459590de3e45b60d9514213be1a9e93bb5d4e10160d1424340e59ff2662240e6802c92ddd3cb4c0a9bbbbd20fef8ea6182de712422e86cb9d6c394
-EBUILD jsonrpclib-0.4.2.ebuild 650 BLAKE2B 75b567c08c747d92ec4ae263c876851c1d693ebc93cde144e2071fd3a5b0e5f7d2460ea68b68c4f9dea2d769c6a6f5e0e4757b8823c4e2212c6afd5243899745 SHA512 1bf177f6e4d84379ddfeeae133b26576fcda28c6fd209b3d098fe53a53a55b2e467bba88867dafee1d973f5962707e9abbb82eee31730fdbdba8e790ccc7df19
+EBUILD jsonrpclib-0.4.2.ebuild 646 BLAKE2B 1481ff2ac47c0a3e1d3534a412b3bb349a24e68f7954cb07c237ee9d73b4597bafdb74b1d7a5ccedaaf00385020566a763540a4788046967014af6d307e64347 SHA512 b5e9283df532591e0c33396ec9760ec36f6b66252de8d865bac1550e74227a171648d058f3202c9bc8f80c451a450687b3aca59919d26207cbd99ec97476bf06
 EBUILD jsonrpclib-9999.ebuild 754 BLAKE2B 673ee6982603f06789bb9180006adc269ab05c00ed91af8a367e2adc705f1a45c0fa2424fafe44e9c4a741448f0ac5f44bc0d8502657188249d025911f7d7410 SHA512 3a7badfe2c8731311549a9634603024935e8503ede11ca42f4ac3371ad3f5eb4f7915faea463350575e33aff1c4d7749b5f618594373d962589e45839a42005b
-MISC metadata.xml 478 BLAKE2B 251f517c3f44194e274c9fff1bd653fbb960886a48fa2cede1be9caa1f3d592a57eb1374732b5bcc644753fdf00b2f21e39cb2a1318743242dae032c4004bf9e SHA512 62b40dbb4e594391c2e628d043df1361c9b41f7b162fa3ab533ff1a1839efdfd2501858e8f06325ef80d9a4af612f2df330f6184f5bd57ecce72cf56a8bfafe7
+MISC metadata.xml 509 BLAKE2B c34a7216797604e47ce2663ec7fdcaab476541695782a6bbcf51b48cd143eb77147d78987e0a1be5ee4a91bc02b30774f08c89e7e40d8bfe6cd7cf1f309330ed SHA512 a24ed1f64378a7da8c422d830cdb910f068ddf07939441390d86d6afb5e4efa1aeb058f33f28dd160207b85042fe0539d53f2b666195e7539b33ef7765514d33
diff --git a/dev-python/jsonrpclib/jsonrpclib-0.4.1.ebuild b/dev-python/jsonrpclib/jsonrpclib-0.4.1.ebuild
deleted file mode 100644
index da371501d210..000000000000
--- a/dev-python/jsonrpclib/jsonrpclib-0.4.1.ebuild
+++ /dev/null
@@ -1,31 +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} )
-
-inherit distutils-r1
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/tcalmant/jsonrpclib.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/tcalmant/jsonrpclib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~mips x86"
-fi
-
-DESCRIPTION="python implementation of the JSON-RPC spec (1.0 and 2.0)"
-HOMEPAGE="https://github.com/tcalmant/jsonrpclib"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND} )"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/jsonrpclib/jsonrpclib-0.4.2.ebuild b/dev-python/jsonrpclib/jsonrpclib-0.4.2.ebuild
index 5934ddc40bb5..c59156b5aedf 100644
--- a/dev-python/jsonrpclib/jsonrpclib-0.4.2.ebuild
+++ b/dev-python/jsonrpclib/jsonrpclib-0.4.2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/tcalmant/jsonrpclib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 
 DESCRIPTION="python implementation of the JSON-RPC spec (1.0 and 2.0)"
diff --git a/dev-python/jsonrpclib/metadata.xml b/dev-python/jsonrpclib/metadata.xml
index 1c7bba27c5da..db4bd215b0a9 100644
--- a/dev-python/jsonrpclib/metadata.xml
+++ b/dev-python/jsonrpclib/metadata.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>blueness@gentoo.org</email>
-    <name>Anthony G. Basile</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="github">tcalmant/jsonrpclib</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">tcalmant/jsonrpclib</remote-id>
+		<remote-id type="pypi">jsonrpclib</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/junit-xml/Manifest b/dev-python/junit-xml/Manifest
index e0342770b177..5fa6663c8341 100644
--- a/dev-python/junit-xml/Manifest
+++ b/dev-python/junit-xml/Manifest
@@ -1,3 +1,3 @@
 DIST junit-xml-1.9.tar.gz 11111 BLAKE2B e40914263421e7021d6bd697a03ae74b596d915479f24e8227d8b0b0bda51529df58f7aa54b27e981bb1df0aa36d7876f4f30fff8924188143bc4dd6b1d80b17 SHA512 73d5245f4a324485370e91d0d4d9a754133e0f90e5ad9ae7070bbb7aad29bee5fda4103548483358d536834c5fee9c8bd5fef79c4b66f905a2aeb0823ef02d22
 EBUILD junit-xml-1.9.ebuild 808 BLAKE2B c502aa77aa0a4f405ac02aef99f0010366eef2458beaf5ff9485b8feeca335c9ccaf3631ce95c466ab7fe7e5b1c045602606c97d847e13a8c72e2d6de15134ee SHA512 c65c75c6f2b46a49a034b736f6f5d16897d059f670d299719cf189aeafc1486c4035ac1ab31dea9bfbdaae0cc02841636d219160376c8cb33e0dd7293d06693f
-MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
+MISC metadata.xml 352 BLAKE2B b9135785d54696f96b866bd4dff1baffea1b4b5027f16571277ffbfa166cf742837a2b58113c3c8ea5d11fa52248f0bd44f9f846460cda3b17ff719b90f11fdd SHA512 56dc272a16d2943fb571610db4443a3fc7b60be3ce2a90b086dd75f1f83491a8c4e232e5ab85e7786164c2df5108e5e10c1b09f8a25546457221cceb652fb466
diff --git a/dev-python/junit-xml/metadata.xml b/dev-python/junit-xml/metadata.xml
index 266e3f19ca59..ec10daf2a6bc 100644
--- a/dev-python/junit-xml/metadata.xml
+++ b/dev-python/junit-xml/metadata.xml
@@ -4,4 +4,8 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">junit-xml</remote-id>
+		<remote-id type="github">kyrus/python-junit-xml</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/jupyterlab_pygments/Manifest b/dev-python/jupyterlab_pygments/Manifest
index cf2ec677fa16..b28c5f286056 100644
--- a/dev-python/jupyterlab_pygments/Manifest
+++ b/dev-python/jupyterlab_pygments/Manifest
@@ -1,3 +1,3 @@
 DIST jupyterlab_pygments-0.1.2.tar.gz 561989 BLAKE2B 85d6b59b2c959f838746c7c6fed99ad5adda89a514a77327cc8e9ba7d6a91b1c0206d999c09149e6c5b9c67911ca16914f0b17a67b3505db73c23a7194fe4566 SHA512 0b4f4c13017f8afbd83e9fb575b3c4ee44272bc01421761ae7b140ecab743d825aa195432caa5f6153bda0ef84fe3ab92dad61ffd9b048927736a916dd267b5a
 EBUILD jupyterlab_pygments-0.1.2.ebuild 490 BLAKE2B c80fbf8a5be7841a64485d2feca8479e18df0f7679c92a86d2ce72af44cadfdd35dd423ebe8a8a3da0c78904b538a87bf053efa296330fd07d2e9798b73d95ba SHA512 fe3961bb7fd1a76e83dd39fb56a8daa6a77c929f6bd01f5bd6bcd750397a740a9f489c2a1a25032eca3a63b683594724861852a564febb6d2bbc6b73f8cefa2d
-MISC metadata.xml 384 BLAKE2B c047f8bd2673bf34d6a1f17af9d3e6ca58fb54a8b237e433cf55f6c6bdda863cd8c39b41d44b7119d2b8c2ff0b3c3ac67a5e0a0cc606a545a46ada4e64704345 SHA512 fe21650260f3a89af0dbaaa7d4953e7e5396b94cd1ff630601e8c8bd82d0c91870380bc3da3a7d03aaa212ac278c834a19c2c83ca23b7a2a86d09460878e2813
+MISC metadata.xml 430 BLAKE2B 76c31c9c34c245dd076500a07cd506a4673716c16ba4af9f7a444ebf2238d5fc3fdcad3ce52a046aa91032d9927436841cc051b9ec45abe58e861657d8a77f0e SHA512 0be5b66170f81b0c209b406f7ce33971cac7972cbcd87def1fae2a09c91e7a7ae18a42c36733cb3e247309be44b2eb6bf1d2f803f8d8aeb5e943247feb308312
diff --git a/dev-python/jupyterlab_pygments/metadata.xml b/dev-python/jupyterlab_pygments/metadata.xml
index f97ba7497b13..704b86b0536a 100644
--- a/dev-python/jupyterlab_pygments/metadata.xml
+++ b/dev-python/jupyterlab_pygments/metadata.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <description>Python</description>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="github">jupyterlab/jupyterlab_pygments</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<description>Python</description>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">jupyterlab/jupyterlab_pygments</remote-id>
+		<remote-id type="pypi">jupyterlab-pygments</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/kaitaistruct/Manifest b/dev-python/kaitaistruct/Manifest
index a73ada5c7fae..efb914089ca6 100644
--- a/dev-python/kaitaistruct/Manifest
+++ b/dev-python/kaitaistruct/Manifest
@@ -2,4 +2,4 @@ DIST kaitaistruct-0.8.tar.gz 5158 BLAKE2B 802435e81c8ec2544f26109762d43d7761c867
 DIST kaitaistruct-0.9.tar.gz 5497 BLAKE2B c3f4dae4269b8bf5102a120aa8792ab710607efd854d01e1239e0269fe696d38183f82a4d93838756d5283cbaa36bd137ddc8b0ea6c91bc474eb89dfba4a76e5 SHA512 4654f18d72f31745f27eed035899231e69f9539a8e8322055b0dd99ad701dbd4d484357d0bc42f5a1953abc6947a90fc5ec9da80aeb862077c175c1295549682
 EBUILD kaitaistruct-0.8.ebuild 398 BLAKE2B 1a9b0e6574eac57742064f7bcedd92a9eeaf0e4ca6a56c66d421e2d03e56b478ab5f5a38cefdcb106831b7a6aaccad095aad3ea032356c4351dac916f0d62523 SHA512 d903a7dd447dba871ac6f5c74c357857663c459bc75ce1869860650dbbd2d7f2ecc8270d70e468045ec2d55962d22452f1cffbe8045c38221fbc519ca396fa1a
 EBUILD kaitaistruct-0.9.ebuild 348 BLAKE2B 12d8144d8982478897d0bc76aa1d1d343e50e6d0fb4f078ceec4b8387e6041d5867cdb35207f49cd1b4a59edd61b1dd0f0c13d81cc01dd84344ec20209f11ed6 SHA512 e7b9b41500127ea192e38a6bf6b711d9e40a298032a776234b099cec691fa7752c936c0cea377f99a0330cf61474046030dcd3fc348d19bcba26b5b1ef32fa53
-MISC metadata.xml 752 BLAKE2B 743726aa6868d3973bf1218efe848d90599192b3ced2e47b4c2c9defd90e8fe784e7e556bfe3cc2f3db2f65b07caff767ffdacc36fbc009ee6940fef044eee0b SHA512 865d70e44c72b031ee005935fd0d82fe66e559e2190077c0f10c5feb8fde320a6fc042fe6473561a7afa7b220b5014896f21e007d292286acfcc9d4c7282fb33
+MISC metadata.xml 754 BLAKE2B 2e243bfaaeb4bf110e5a229ded97a4dc9021031f527415f4f59978aa1f37df1d00b76142ff13de317e8cdc28665555800465696c4f13b812d199a523b15c8cfa SHA512 a50ba1aebf1fe3d7ac4f294b9edf20709a542ac263ae3a2d33029dc424136c6a689680933430075c9783032cb893de5563b810974da724bb17b556ee5d6d08fc
diff --git a/dev-python/kaitaistruct/metadata.xml b/dev-python/kaitaistruct/metadata.xml
index 65d46603f159..cc1ef567f767 100644
--- a/dev-python/kaitaistruct/metadata.xml
+++ b/dev-python/kaitaistruct/metadata.xml
@@ -17,7 +17,6 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="github">kaitai-io/kaitai_struct_python_runtime</remote-id>
-		<remote-id type="pypi">mitmproxy</remote-id>
+		<remote-id type="pypi">kaitaistruct</remote-id>
 	</upstream>
 </pkgmetadata>
-
diff --git a/dev-python/kaptan/Manifest b/dev-python/kaptan/Manifest
index a709bc59c801..55ca5c59873b 100644
--- a/dev-python/kaptan/Manifest
+++ b/dev-python/kaptan/Manifest
@@ -1,3 +1,3 @@
 DIST kaptan-0.5.12.tar.gz 10539 BLAKE2B 678e1aae6053a7075218a0fd9ef928685e7ce9ebf385c6953275b06d1bbf67d4c8434838a7a8f0b0ec8b02e7bef434d7f68698060bea2b4232cd5ef7fa83f0b3 SHA512 fccf767749e9473947bd7cb493ddb30f7dc1b2e10ce932ca327ae3423bc023fa9c76910ac249269ee546eb9162e4ce151e2ad0b9685d888854a7185c855ae143
 EBUILD kaptan-0.5.12-r1.ebuild 534 BLAKE2B 13d108f0be7f1c2dab3a8ab7a5bf026afe0d4fc4a48469ce3dd221f2ca3bdffd9aca766aee06cf80616591634672ebbdb649a59a9dddb89a69e0950ae2bdd22a SHA512 c08ec74ba4508dfcdbda08177f45b5540248adb50e529100ec23972c0eee002a5cf641c0b9f99cf89e87d345e602aef1c8a3c9a46026c0c6d219cd4068455f93
-MISC metadata.xml 255 BLAKE2B 2bb3830b8cec850703f7912f4c22f5b0abeabeed0715222bc56141779d02160773cfd0f85417c553c1cd8f2738bfeb78c56dffb8e648e572019319657646d1ba SHA512 522158915afe67937f81ba572a918a2de8ca1f8591e097da56799c97870d7c44756c1acd8224d63bd3375c2b9ebc0e1ce50816899117948a48065a27804883bf
+MISC metadata.xml 318 BLAKE2B 48394615db06281f01d093cd2519cf8fa5698b12f5a165f7a955c44379438d07562a5c13e1463de19f1a4dafadbd5592d79a052a815d503398444c278c348856 SHA512 d59c74d409e9dc3daabd68cc696108930757171d52e1dbdc0f36ff631eabf55512df01dcbd503cd33048241974d2843ec2064558529cb9fdd3cf5c3578a56055
diff --git a/dev-python/kaptan/metadata.xml b/dev-python/kaptan/metadata.xml
index 56cae167d372..c0014ed738bb 100644
--- a/dev-python/kaptan/metadata.xml
+++ b/dev-python/kaptan/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>chutzpah@gentoo.org</email>
-    <name>Patrick McLean</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">kaptan</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/kconfiglib/Manifest b/dev-python/kconfiglib/Manifest
index 4eca58f52632..48d3b188a1db 100644
--- a/dev-python/kconfiglib/Manifest
+++ b/dev-python/kconfiglib/Manifest
@@ -1,3 +1,3 @@
 DIST kconfiglib-14.1.0.tar.gz 182990 BLAKE2B 1e5a5f7e6d1003f4fa005b2b08abfa17cbf9f6837d9320f313b23f19c6e9e7aa7c8fddf5ff38871634257ea050390b279becec0c4e0638cdb53182347217e937 SHA512 929a75f9b9f74ad7d4190c15d7178b94ee0a6d1fb71d85e2942935e3a9370a4f2483d8b49123d41d6610841ad9efde1dc4c14fc5231a08379d438a486ed3f97c
 EBUILD kconfiglib-14.1.0.ebuild 958 BLAKE2B 2aaaa00cf318f100964cd381d92f796a59dd85c0af70cec9bcb70a275ddc6bbd843d70653258688140cf8bb711157f835e0510c9f604ca5f5fdc42a966680851 SHA512 8ea59a3ebba351c25b23c84bd7910b2dcec8ff23011d50fb95b48ea12b158c28293948498c2f8e95218e6868386c8c28ddfde6551cd6cf915c45bfe3da787885
-MISC metadata.xml 252 BLAKE2B 6168f627d7d7a462a653d72ac1aa881bf809d46df71c15503bcba346e6d80c551ebfd7393a2a9467943142cdfd7cf99a661b94b53fa25be0989a51560567cce3 SHA512 72bfa8a1df14b104e2d1265bbfa2be6d5d32d61fe11485c6c8122cd0f96832c08259258a508122ef5f4ee5f0464d711c5c1209952a2811e0992742d7707d1b9a
+MISC metadata.xml 300 BLAKE2B b96ed30e5d52a5f7cdc50c5cde5ebd9dd3e344c633edd15f206fe8c7f3218049fc3d9a837e84673bc55bf666bf1ef6d5d0c5d77104f6109c5b123bc3bc912e1f SHA512 b751519e8df47167b3f2c25444c9aff6da4dcf7e8d08533e28dd99628af1ca26aa739042987939ba4680d615186546c449221bb1642cde640aa7ec5d750ac47e
diff --git a/dev-python/kconfiglib/metadata.xml b/dev-python/kconfiglib/metadata.xml
index 1e8fb02d3209..58a75ad63532 100644
--- a/dev-python/kconfiglib/metadata.xml
+++ b/dev-python/kconfiglib/metadata.xml
@@ -1,8 +1,9 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">ulfalizer/Kconfiglib</remote-id>
+		<remote-id type="pypi">kconfiglib</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/keep/Manifest b/dev-python/keep/Manifest
index 0915f0e744a2..b7076a59809f 100644
--- a/dev-python/keep/Manifest
+++ b/dev-python/keep/Manifest
@@ -1,5 +1,3 @@
 DIST keep-2.10.tar.gz 12959 BLAKE2B a6c7c507f3e6f905fcc4878909cfaa56c767266499a12fa12b6850a1dfade3b33d5ade1d2f53b69ecc0480816b496c75250742672fd1a9de14c747abeae7f3df SHA512 a72901e1f66d756626ceca1550b0e539e4c9f56ebb80d96f87696482420b7f75e07d06eded538acf8866e0d1e65e83da00a23ed328a4e37a6f82a607bd5c3bfc
-DIST keep-2.9.tar.gz 11277 BLAKE2B ea9813b725e9cbc93a0fdcab9d7a6b8927b69de8e960bf5b91696a8fcd9806f4ec0646bae147355206c05b91f2a828e2a20728ed16c9ca97b2592887b1f9f185 SHA512 36d6c4d268fe72f05bf3ccf6006f3ec1d93e6320f5dc810814d15274f3e63b29e97678089178fee99e9bb5b119079895550e8f48627d1dc1612140f13e7f02df
-EBUILD keep-2.10.ebuild 619 BLAKE2B 369557338bc23e8c8e3bd82fe8b1f7da03477b3101b6c00dbc7b82451a68da4f3abbd0aa59c9c5b921411a1255d33723bef87f72d222baf69e6ee333284c5743 SHA512 bf6138783db8ca187fbc1fab18854d282e46f905a756073e02c7df285489f17bc38cc9500659257b99cc3712fa4829608a4202913d821fa41cec98cc6c09951d
-EBUILD keep-2.9.ebuild 619 BLAKE2B 369557338bc23e8c8e3bd82fe8b1f7da03477b3101b6c00dbc7b82451a68da4f3abbd0aa59c9c5b921411a1255d33723bef87f72d222baf69e6ee333284c5743 SHA512 bf6138783db8ca187fbc1fab18854d282e46f905a756073e02c7df285489f17bc38cc9500659257b99cc3712fa4829608a4202913d821fa41cec98cc6c09951d
+EBUILD keep-2.10.ebuild 625 BLAKE2B 695a288aae0642378e092ca5223014e676b3a4650242e6abd620a992a74a152cd56a5c8d8b1f6e5b3c2e55b52c1048df75d6df12b24463751fb155fd0c6b1d2e SHA512 5ce5923cb482f1242b77e6c28d682ebd2536cf85440cdbfb9e29c200bccb186ba888cd8c6f8f75aa260a9a1a5446a26d1cb31d959b676f140a67e81e09b36611
 MISC metadata.xml 343 BLAKE2B e768980bdf2f3b10c05892c41970b1a763cd7e4c4c405267496653beac320170bfa52c90798e6b4961245e22fe96802d3ea06acb3401400c920b162496b4de21 SHA512 55420d5e10ee9b5da9f15ab6faea642041d7a040410d3c1cd399d2ed8b0346948f3c45639cd38e5956c452cae00e530a85e4d71713785572e93506b61d3af67d
diff --git a/dev-python/keep/keep-2.10.ebuild b/dev-python/keep/keep-2.10.ebuild
index a466bbc6e430..4017856890fa 100644
--- a/dev-python/keep/keep-2.10.ebuild
+++ b/dev-python/keep/keep-2.10.ebuild
@@ -3,8 +3,10 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_{7..9} )
+
 DISTUTILS_USE_SETUPTOOLS="rdepend"
+
 inherit distutils-r1
 
 DESCRIPTION="Personal shell command keeper and snippets manager"
@@ -13,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/keep/keep-2.9.ebuild b/dev-python/keep/keep-2.9.ebuild
deleted file mode 100644
index a466bbc6e430..000000000000
--- a/dev-python/keep/keep-2.9.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_7 )
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-inherit distutils-r1
-
-DESCRIPTION="Personal shell command keeper and snippets manager"
-HOMEPAGE="https://pypi.org/project/keep/ https://github.com/orkohunter/keep"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/PyGithub[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/terminaltables[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/keystonemiddleware/Manifest b/dev-python/keystonemiddleware/Manifest
index 05045c45ffe5..f0c272812c46 100644
--- a/dev-python/keystonemiddleware/Manifest
+++ b/dev-python/keystonemiddleware/Manifest
@@ -1,5 +1,3 @@
-DIST keystonemiddleware-7.0.1.tar.gz 177439 BLAKE2B 645cade35a1b310b9a897b17fc96a7f1f33ca26efd3dbe482c8d76cca9a9639364cda6d2798c0b2956f5b905c166a67fe3f334cd0ae276e7b0124956f9a9cfd6 SHA512 2c3890a395fe03c19e121a1d315180bf2bf5004351a5dcabb1f455bf22514c682347a3c387da361075a81c3e931f6ac802aed1a95fa3763b90a2ac77adbec306
 DIST keystonemiddleware-9.1.0.tar.gz 179846 BLAKE2B 0ebae088d48f4f8444902c229e6d3df7835d847b99d9620cbe154a1ed6f12fa9533a9c62aae670d9d16a5696e5245306c8180437c772297000b8cf4490264568 SHA512 839d2c0150f305d7642bf1031508d11cb7d26e560198bc900979615838ea0a143843fdfaf363699313d7c968850153eaedba0f4a813891f5aaee46a2444181fc
-EBUILD keystonemiddleware-7.0.1.ebuild 1466 BLAKE2B 3be59200a860cb8097c5bbff3774b3e80b08fe85d9e4b3e04838dc3d1f7d27031d6f8dd11fb63fd5c2df04c1272df28dcc81ec1dc80836b82f32298fee393d39 SHA512 7771e244dac935eafc985eff418dee5b4bf6babecb6d19f1880e29132d1bc5679c3b56b517d5a3be53392a47f1590af2cf361e70310a60d2abf5bf16504a15c1
-EBUILD keystonemiddleware-9.1.0.ebuild 1407 BLAKE2B 053418f065a73930b327e6d1ce12ec0e9f7e4916101600b8c30013840b9502224cb198f108266d5c3f2ee9cc2e991118bbf05e7c6996c0f28d321860c803e8c8 SHA512 be978ba99e588b4a7d83729c9408f3b197e45f212639bc60c948eb4b506602455ce492a7bd82179418d969ed9be22bfe7815cc64599a3a403fce2bbf575840e1
+EBUILD keystonemiddleware-9.1.0.ebuild 1405 BLAKE2B 65e3b88ed5597c39667a4942c4ca77c0fed1543cd2d44621baebbdb68e84dabf03742bb9bf1a3c9cf9dc8eec12df07a0f18937fe9177f563154390f49c3653a1 SHA512 ee799aa9fdbb96f9cdae2e26a8b5db96bb4d9a7c550736037760dc5675e6af002900ce98ae6fe1879a905cfefa1c575be21a72fbca66691da7fa9f3c7345e905
 MISC metadata.xml 553 BLAKE2B 7ae9cc31354b5f88e1975e402caf885cd207190d9f3841131893d8583957bb53c53a1067506233909363c6f52bb6e3602ffa2ccadb9f5d8662beac9702777051 SHA512 fc565d408c098400d7c2bcf223cc691e5dc62073076082f0b04b4d4a4a0a80e0bb62f00f6062a33d957033b4846f2bd5d4e00cbd3f0ee6eec65f1b8abc1f68ba
diff --git a/dev-python/keystonemiddleware/keystonemiddleware-7.0.1.ebuild b/dev-python/keystonemiddleware/keystonemiddleware-7.0.1.ebuild
deleted file mode 100644
index aec07f809a6a..000000000000
--- a/dev-python/keystonemiddleware/keystonemiddleware-7.0.1.ebuild
+++ /dev/null
@@ -1,48 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="A middleware for the OpenStack Keystone API"
-HOMEPAGE="https://github.com/openstack/keystonemiddleware"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/keystoneauth-3.12.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/pycadf-1.1.0[${PYTHON_USEDEP}]
-	!~dev-python/pycadf-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]"
-
-PATCHES=(
-)
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/keystonemiddleware/keystonemiddleware-9.1.0.ebuild b/dev-python/keystonemiddleware/keystonemiddleware-9.1.0.ebuild
index 62d99b468be0..d5e0569fcf1a 100644
--- a/dev-python/keystonemiddleware/keystonemiddleware-9.1.0.ebuild
+++ b/dev-python/keystonemiddleware/keystonemiddleware-9.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/kiwisolver/Manifest b/dev-python/kiwisolver/Manifest
index 913048e4916e..657f98684442 100644
--- a/dev-python/kiwisolver/Manifest
+++ b/dev-python/kiwisolver/Manifest
@@ -1,5 +1,6 @@
+AUX kiwisolver-1.3.1-darwin-build.patch 793 BLAKE2B fdcbfd2966f7f5e18859ca02bc85ef2928f053e49d4fa9bf9db5f086b32d74fd6d04488566ca63915cbd57b7a5b5fd0f3a9329c0b79918e40d487fcc3938f365 SHA512 e3031229d0e0ca18d3f0a9abe84aa3e0d8d62e212ea93551cecdd1be11698d2a73db5bc52c49b65a59681b0620f1718fab8c4093951edbffa6891495ec116931
 DIST kiwisolver-1.3.0.tar.gz 86440 BLAKE2B 931a230909a7778aac3bc93fb24538c7b9e0a3cf1dea33fcf374fd6576d56b80a50597d14c6431f659326222c8810416897fcc9ce2725ca5341891f65aedc5b2 SHA512 64bb475f86e6f409318c5030cd2874bf060c26bf6c1ea62bfb96c1ae27f7326fcd6fc575cbdad7351808d18ae9b9f6664eb312019d432cd6a4c0b8af4fa317b6
 DIST kiwisolver-1.3.1.tar.gz 86948 BLAKE2B 4e03547842e831424aef5be880021aea8d0fef372900bcb9b55f2367fc89f728250b936702fd737807579be34e4ff7489d5669f5113e95612352a293d9f883ea SHA512 0f5c1e516c334d358b8679313035dd45386381965853005271c73e3f4421fb27e3ca5a43b4f2dc85d693f4151427dae9b34d372fe72fcc1a186abd85a54a225a
 EBUILD kiwisolver-1.3.0.ebuild 567 BLAKE2B 7039acf9b8ee3492399301babea6e376710837f7743d365562e098e779d8c3f59e8bb55783d510977d046ed5865fa82a3beb4c6027e050a0fb083e861eff4553 SHA512 df956b9396107fac591cb927ca718b0f56d35f9a3b4317a42d9829be473d497b83d8379a627786885a2727b3c46e5b12ffb52c9d999b2894c58c6551546f51f7
-EBUILD kiwisolver-1.3.1.ebuild 571 BLAKE2B 2b911a5cb379e0f87d88ed7e2530ca1507ed4748e25884a2f871d82e7f0cca942c9738525b3157b03159c0482f6f58f8d8cd620563cf883e2b70fc9d65a3ed9f SHA512 e2aa1023324a18fad9c8819766683d93f7b99145147be49cf4a7ef3a01e68b545273a96b34810ff1c8c043d52a62682ca84d12fb898eb18a83f40b9cefcaf295
+EBUILD kiwisolver-1.3.1.ebuild 630 BLAKE2B 64f99b09f46aef2ef797a49989cab3d8df6ca125c1f4a8f4ad7fd0939195ac70d6ae60338de8d8858dc07d26215eee0c0212f48ff340f1fab0d105056e0de55b SHA512 283f9d9289170188316b75282211eec5f9c64d7c998cdda3065da96eb297c448cd23e81801f8d2c4a2eb158e957358c4e084f98e7fe96bd4aee2c71fa739792e
 MISC metadata.xml 589 BLAKE2B b855a937dd7e70011622983e63e7b227aace077f4fddbf2fdc558a941e446384561b3f0f798e97db23ce0b6cc2f2aab6af9a0eb7e2d6b221c7f511d5145d239a SHA512 df0848bd49ea1b4ff9d1fff0a60e288054c319acf1fd82776b24c07ac1dc8587d2db0d6ab34fb0d194dffa8734b44796b4f2599a20dd8cf6f68b4f68489696a9
diff --git a/dev-python/kiwisolver/files/kiwisolver-1.3.1-darwin-build.patch b/dev-python/kiwisolver/files/kiwisolver-1.3.1-darwin-build.patch
new file mode 100644
index 000000000000..a56770bb5729
--- /dev/null
+++ b/dev-python/kiwisolver/files/kiwisolver-1.3.1-darwin-build.patch
@@ -0,0 +1,16 @@
+Fix build on Darwin with GCC. May need some adjustment for LLVM/Clang,
+but I couldn't find the docs for possible compiler name types (for now).
+
+It'll likely need a hack in the ebuild anyway.
+--- a/setup.py
++++ b/setup.py
+@@ -54,9 +54,6 @@ class BuildExt(build_ext):
+         for ext in self.extensions:
+             ext.include_dirs.insert(0, cppy.get_include())
+             ext.extra_compile_args = opts
+-            if sys.platform == 'darwin':
+-                ext.extra_compile_args += ['-stdlib=libc++']
+-                ext.extra_link_args += ['-stdlib=libc++']
+             if (ct == 'msvc' and os.environ.get('KIWI_DISABLE_FH4')):
+                 # Disable FH4 Exception Handling implementation so that we don't
+                 # require VCRUNTIME140_1.dll. For more details, see:
diff --git a/dev-python/kiwisolver/kiwisolver-1.3.1.ebuild b/dev-python/kiwisolver/kiwisolver-1.3.1.ebuild
index 2d2ec37813ab..d49c2b5c587f 100644
--- a/dev-python/kiwisolver/kiwisolver-1.3.1.ebuild
+++ b/dev-python/kiwisolver/kiwisolver-1.3.1.ebuild
@@ -19,4 +19,8 @@ RDEPEND="
 	>=dev-python/cppy-1.1.0[${PYTHON_USEDEP}]
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.3.1-darwin-build.patch"
+)
+
 distutils_enable_tests pytest
diff --git a/dev-python/kombu/Manifest b/dev-python/kombu/Manifest
index c82cfe1d2034..1b43d0178afa 100644
--- a/dev-python/kombu/Manifest
+++ b/dev-python/kombu/Manifest
@@ -1,5 +1,3 @@
-DIST kombu-4.6.8.tar.gz 406196 BLAKE2B 43ddb45e7e6a5bc1aff55867a816ebf7a1afed68bd41d9d74b6179a45d951ac4a4f0f687bbaebd23cf81b67fe2b81d47498b3e25eead0822e16d9acbb436338a SHA512 65b4ebb283ae380388de5d9f8fdc1ec0f41a9910744906b23eb150bc62ecb55ae6d65bb96ad31d8a033f26c2a8dc386939fced393866b6467e77a9760dfa17cc
 DIST kombu-5.0.1.tar.gz 404428 BLAKE2B 89d4c2daf70c3dcd0a990c8f045074780f2d4f13f39899c0ab3b73b473948469746cf8872aaa8565f5c4b071bf18ff510cd565e8f9b6a3735a0bf1d0af55e9b6 SHA512 aa5d35b7753f5ec8d95512c322fabf0163628b9afbd228faa2be910a1cd4ea3236a7e43485e17650e1aa9aebae59a91a2b0bdc1950e4e4c622b499a4ae29ea0e
-EBUILD kombu-4.6.8.ebuild 2368 BLAKE2B 8626497de01426d473a5784a31515b4b3be59c406aa5d7b2b6490de2b4bd8f2404c2a6b1b63c4f1c679e9d70e62268b7ed4cf71083d20ee73674fffe1a320534 SHA512 9a6918db2a8805061f5b7469258ba528135da5a5c009c04978bfc75a76d689c5f2fd8c006db6ed14518ff95d9bed598746511cd18aa89b5fbe8e161c83a3c94b
-EBUILD kombu-5.0.1.ebuild 2413 BLAKE2B fe70b4d51580e42a6cd54a11632e005acc03337c3e68d67ecb7f172b838193f93fff2112704163b7aa99653e9364ae3a31c065c185e7c38d42b67eebf0535dc0 SHA512 dffd5c990013ff739812a09c706df439d6cfaeb212d6fc581cf593a2eb9a0dd02bc6ef381ec013fa0a377f8a32c840ece00012d9a7c30363611f53c3d81f0c4e
+EBUILD kombu-5.0.1.ebuild 2411 BLAKE2B fd75c9569d0122d2e7be230ca114a5fd8cdf00a17723062f6512ff69182d9d2aa2422110ec90c6950dd58921901c8cacdd922ca15f0600a914e9b55af6bf0203 SHA512 7ae55e46441cbb05c983b897ede2c2ba6edf7ac9ebb89af07b6dd305679f7833b520ec20af1872e1efb139187ece41bf38bda2f3879600846fbf71b083b7947e
 MISC metadata.xml 699 BLAKE2B 895ddd1afe0b826cb3ae4e279b2bd12eabeac29c68104aa4b819b412a66bbad8fc0da49dcf8aadb779573247094f8a6ea60a18c967b6385515cc2fd6420a3622 SHA512 3d1f92614be2f17ef5188d0d987d17721db7af60d27cd9901ddc8adc96c0b7523afa26210e36789bc8a9096994be7cebd7df72f624610f11b45cf4aea6e56cc7
diff --git a/dev-python/kombu/kombu-4.6.8.ebuild b/dev-python/kombu/kombu-4.6.8.ebuild
deleted file mode 100644
index 3fb47be86b10..000000000000
--- a/dev-python/kombu/kombu-4.6.8.ebuild
+++ /dev/null
@@ -1,80 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="AMQP Messaging Framework for Python"
-HOMEPAGE="https://pypi.org/project/kombu/ https://github.com/celery/kombu"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc examples mongodb msgpack redis sqs test yaml"
-RESTRICT="!test? ( test )"
-
-# zookeeper backend support possible via dev-python/kazoo
-RDEPEND="
-	>=dev-python/importlib_metadata-0.18[${PYTHON_USEDEP}]
-	>=dev-python/py-amqp-2.5.2[${PYTHON_USEDEP}]
-	<dev-python/py-amqp-2.6[${PYTHON_USEDEP}]
-	>=dev-python/pyro-4.76:4[${PYTHON_USEDEP}]
-	sqs? ( >=dev-python/boto3-1.4.4[${PYTHON_USEDEP}] )
-	msgpack? ( >=dev-python/msgpack-0.3.0[${PYTHON_USEDEP}] )
-	mongodb? ( >=dev-python/pymongo-3.3.0[${PYTHON_USEDEP}] )
-	redis? ( >=dev-python/redis-py-3.3.11[${PYTHON_USEDEP}] )
-	yaml? ( >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}] )"
-# Fix to https://github.com/celery/kombu/issues/474 obliges dev-python/pymongo to >=-3.0.2
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-20.6.7[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/case-1.5.2[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}] )
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		>=dev-python/sphinx_celery-1.1[${PYTHON_USEDEP}] )"
-
-# kazoo is optional for tests.
-# Refrain for now, no established demand for it from users
-
-# Req'd for test phase
-DISTUTILS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-)
-
-python_prepare_all() {
-	# AttributeError: test_Etcd instance has no attribute 'patch'
-	rm t/unit/transport/test_etcd.py || die
-	# allow use of new (renamed) msgpack
-	sed -i '/msgpack/d' requirements/extras/msgpack.txt || die
-	# pytest-sugar is not packaged
-	sed -i '/pytest-sugar/d' requirements/test.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	# Doc build misses and skips only content re librabbitmq which is not in portage
-	if use doc; then
-		emake -C docs html
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto examples
-		dodoc -r examples/.
-	fi
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/kombu/kombu-5.0.1.ebuild b/dev-python/kombu/kombu-5.0.1.ebuild
index 60d86b72d311..25a13582c429 100644
--- a/dev-python/kombu/kombu-5.0.1.ebuild
+++ b/dev-python/kombu/kombu-5.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc examples mongodb msgpack redis sqs test yaml"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/latexcodec/Manifest b/dev-python/latexcodec/Manifest
index f37689f76641..716f51d4c770 100644
--- a/dev-python/latexcodec/Manifest
+++ b/dev-python/latexcodec/Manifest
@@ -1,3 +1,3 @@
 DIST latexcodec-2.0.0.tar.gz 29919 BLAKE2B 163fe7332aba7628265f1462570c8d22ec4044dd7b7383de8280bbc617ba4dc26e90f12e6777d690c7a8ae4f6564dbf7519bd6f57cf3dca2820a1fc647a1d7ef SHA512 3c0540b4e5dbc88908b26c68b4c6fca573b45a6b17053733b35a16716510bb67ef6099fae8e48e094a6f08be4e4eac48e889366f035ab38f80e31dd61f08a3c1
-EBUILD latexcodec-2.0.0.ebuild 495 BLAKE2B 43632826c58ab7e82c9ec0f42cea7739d7bb3476890fa44480b1d3a446c87430e4c410bfce6cccb1fc2b33255ca9d134485760d16ddb4df5902bffc1fd23d0d6 SHA512 103439066102f8ee5aed09316925ed45903adbc245144cf0429934017d6ddac1353138182cc21ec651d7434284a8d36d7fb0e6afc22f0548be340c11bb5b73f8
+EBUILD latexcodec-2.0.0.ebuild 499 BLAKE2B e57fb6b0e42779d7bbd90b87de402c43b68a993e33f35be8d3de5d92ddba7a782fdb0966c8ed48116194d0cac39ab4ed5c8e88a879a1e5905a1b3d691d91fd35 SHA512 6f21b8fbb172a9cc12bf2f1edee6dc1eaf6dea03a0cee8a19b16e67b0e6dbb995434c0cd71568eca5c7188beeb0097573c6717f579771d3335c809499beb5dea
 MISC metadata.xml 1105 BLAKE2B 888095a4dc47b0dc263a532afc635f4e673a3ecdfb268e0c7bdea292240aae883c9c477a11621991a9291fd528e72756da2dfcf83a1ca38c1e2ab2335abeaa49 SHA512 1643cfda1ab0bde15b47bfb5bf2ddb8f5f0c94981fc4d8cab9568fa8569b3ff7214419d2685699486cfb96bcfaa0e88d2da350d44f11fa321e23ab0a6571ffcf
diff --git a/dev-python/latexcodec/latexcodec-2.0.0.ebuild b/dev-python/latexcodec/latexcodec-2.0.0.ebuild
index d3f8bec601bf..eb517529d165 100644
--- a/dev-python/latexcodec/latexcodec-2.0.0.ebuild
+++ b/dev-python/latexcodec/latexcodec-2.0.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="Lexer and codec to work with LaTeX code in Python"
-HOMEPAGE="https://github.com/mcmtroffaes/latexcodec/ https://pypi.org/project/pybtex/"
+HOMEPAGE="https://github.com/mcmtroffaes/latexcodec/ https://pypi.org/project/latexcodec/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/lazr-config/Manifest b/dev-python/lazr-config/Manifest
index a13473919015..9f13666f9357 100644
--- a/dev-python/lazr-config/Manifest
+++ b/dev-python/lazr-config/Manifest
@@ -1,3 +1,3 @@
 DIST lazr-config-2.2.2.tar.gz 31957 BLAKE2B 5bfee9ae556e6b4109fa43ca36cc2676fb805dc6b9d9f788224ccd29e7836313affa55dd031496c2a252c5e64b150fd8f21c2934da3699ba95e0968ee8022879 SHA512 3427d2be4b4763238bd8378ec5936d38d0b944074d56f6ada55d0e3f232fe0846630a0ef3900c169b58092d029297d7c937ea4ad349aaa2745ed25b71df9c7a0
 EBUILD lazr-config-2.2.2.ebuild 689 BLAKE2B f10d928eeb61e44b02635419e5fd75241f7a4e5ba79617ffc91bc833d6c9ac2bfd1434ced65656ea3a7b38ad88e5078a53811cc9ce4a2a41de5004d2756d91f2 SHA512 c4ac3e559976d8bce1fa4d948046d3cad6d72d3e459f2566c2d9efb077da35414e47a1c698287f9f7a7dff86d67441a5f1e5760c273abe14a88ae989342b048e
-MISC metadata.xml 333 BLAKE2B 1a681ac99aee289a919b530bb87037df6fe53b044ce14ce3a9da3cec54a73d7fde58cf01f12678f18397d16b56c9e5bf88d289ddec4469e343d7193502124124 SHA512 a73512d246562e6591eb9c8d13759352cede7f0ae978d02c87bd72b1fe2c9b155cc3908e8489b136387bada61f1257d8e0771e01e26d998b51f9ce13c087ec41
+MISC metadata.xml 407 BLAKE2B 309f8de2c8180787ddfbf2c96df9df76ab324465e03d82fb4a3538bb1ce61c57374f688ed44700a95cc968090b917070466088495179255bc6adf0ff7e0093a2 SHA512 b41c8f97ae6ff851d406c414d5e528e63d43660facd3e9a7591a635395512ecefb3e58da8d8d745f799bfdc8089a8c9eb223822010611da096168e940def7bc5
diff --git a/dev-python/lazr-config/metadata.xml b/dev-python/lazr-config/metadata.xml
index 3ee70120def4..6edd3801988f 100644
--- a/dev-python/lazr-config/metadata.xml
+++ b/dev-python/lazr-config/metadata.xml
@@ -8,4 +8,7 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">lazr.config</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/lazr-delegates/Manifest b/dev-python/lazr-delegates/Manifest
index 1dd3d0a9d548..9a7b99eaba4a 100644
--- a/dev-python/lazr-delegates/Manifest
+++ b/dev-python/lazr-delegates/Manifest
@@ -1,3 +1,3 @@
 DIST lazr-delegates-2.0.4.tar.gz 14168 BLAKE2B b9388a869e7f83e0bc30dc5a0cfb184a935db2b6272c2a9a93bb12d3db375114453a224703ef05b3f34232860a16fc087b7d398e94d164fbf77af61ba8abf102 SHA512 0c0b32a4fa4c132646d601870be0f0c1f1856aceb91bf979faa9a675fcbf94f76c7c6f548978a402842633cf4e53275c052cff7dfd776a4246691c067eabe501
-EBUILD lazr-delegates-2.0.4.ebuild 598 BLAKE2B c98b0256b9e4b1a9dcb829e99a8248273488ff2559159673b868d38cd19e18611e47d5297cf94d8a5290d36f3cbe1fadf517a0cf0068f3071e9ad9776d468f1d SHA512 d4a3a1f04f8742e3477e128793643109c8f59b890dbb2ca5d13f3cd3ba86c21ba6b084e5698929cd0c445af075f8c15cb19f010689a1bbe212264991a2eb3099
-MISC metadata.xml 333 BLAKE2B 1a681ac99aee289a919b530bb87037df6fe53b044ce14ce3a9da3cec54a73d7fde58cf01f12678f18397d16b56c9e5bf88d289ddec4469e343d7193502124124 SHA512 a73512d246562e6591eb9c8d13759352cede7f0ae978d02c87bd72b1fe2c9b155cc3908e8489b136387bada61f1257d8e0771e01e26d998b51f9ce13c087ec41
+EBUILD lazr-delegates-2.0.4.ebuild 598 BLAKE2B 34542272a1fc8c43ea2d5c5f94c6ec2ef942c663f5eff6d2931e5305976249f4895f287e06956db1a3bb55f27d6c51ba6c01896578448cf9ab04bcec99c0e0ad SHA512 ebe0288e482ddea87307e928feb1fce4980fb25f08669ee4360247d54b4ac65ec4e5ea077b428e1643ff8bb00430e4c6adce1efa110e0032bfbdcb29d48663da
+MISC metadata.xml 410 BLAKE2B 299b41c39c31df7aaca8748d6adccbb348061e4fcfcfcd9ec9c9b14679c40ac530fa31eb7133b008d3fe2e979d7ec0a3f20867ca6d41c7288c4ec6a40a216148 SHA512 97b0932ff2b5e2b3f6e32a9af52d12c37fc737ef48b0ab453e858b7722d4c495807eb83a7acdcecbf129d2c9bf054504fb588fc661c2b625693be2759de24afb
diff --git a/dev-python/lazr-delegates/lazr-delegates-2.0.4.ebuild b/dev-python/lazr-delegates/lazr-delegates-2.0.4.ebuild
index 26ee52990e7c..6fd425e7e89a 100644
--- a/dev-python/lazr-delegates/lazr-delegates-2.0.4.ebuild
+++ b/dev-python/lazr-delegates/lazr-delegates-2.0.4.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 MY_PN=${PN/-/.}
 
 DESCRIPTION="Easily write objects that delegate behavior"
-HOMEPAGE="https://code.launchpad.net/lazr.deletages"
+HOMEPAGE="https://code.launchpad.net/lazr.delegates"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/${MY_PN}-${PV}"
 
diff --git a/dev-python/lazr-delegates/metadata.xml b/dev-python/lazr-delegates/metadata.xml
index 3ee70120def4..ca82a0d0b4a9 100644
--- a/dev-python/lazr-delegates/metadata.xml
+++ b/dev-python/lazr-delegates/metadata.xml
@@ -8,4 +8,7 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">lazr.delegates</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/lcdproc/Manifest b/dev-python/lcdproc/Manifest
index 8ec1d6f134e9..f4c76c3b1f31 100644
--- a/dev-python/lcdproc/Manifest
+++ b/dev-python/lcdproc/Manifest
@@ -1,3 +1,3 @@
 DIST lcdproc-0.03_p20150508.tar.gz 337211 BLAKE2B 426ddb2e951d096dc8ec149e47dcaa4c31501c9993e27c6a7fd686baa7e0799c92f40bba4eb3250c846625e6f82d6a202dc9f55a7044e6d4edb08437edb9d2e9 SHA512 344a15566587a1f7e3a50314138fb320ee341a41484061cc143498c86e058badefd38589b74a6668e3c082b1cd4ceb3aaa8a9369eb9d8f900af5da0aa7823430
 EBUILD lcdproc-0.03_p20150508.ebuild 587 BLAKE2B 79af44286e8d1b6472055b729c286c1969c2295d0aff8d063a1e76c247bc376dbff99ef865396045afcfcc90d94a028150c54e8e29ac22e9f09788886b87c7c6 SHA512 c011a236e862bd0bd76dd04be3122e7d9fee4872df9b384ebcb297ac1a5de4dc66d07fdfa212fe5f17a3d6f8ef0aa64a712cbe5f3da01e7e2dde3cf16544f2d5
-MISC metadata.xml 577 BLAKE2B 02061be0f12439329385b14e9aa1617e52cba5504998851ebe0fbaf63ea30a5eda5484a96674719a0c53144222aba71c808258ba1d4c3119efba3301c0a2ca16 SHA512 82db5affeec0a6e1f007bd927e4ce8b68c15ff395ff39298b2c6dc3fed5454e46e7bbde0d746ebf12ff7b528d6bc889665ef4be01263b4f1b845f4ceef47d4e5
+MISC metadata.xml 622 BLAKE2B 2f18955cbbb7efd91a6ef29be088a91006bf0cf81ac924a8338aa3eab7403f9ddb0e045eecaa268d6ff9029f26f459a2ae2dc445ea712f01770e4f37a8204a5d SHA512 041d0b83528749b6d79aeed66898eebee395f2121ba81afc762126f13cce63a923d7289b5c43cc978d30206b98a4b2116a19262540af53ce4085b0a8464c923f
diff --git a/dev-python/lcdproc/metadata.xml b/dev-python/lcdproc/metadata.xml
index e62d5c1a6a04..7be5fe20082d 100644
--- a/dev-python/lcdproc/metadata.xml
+++ b/dev-python/lcdproc/metadata.xml
@@ -12,5 +12,6 @@
 	<upstream>
 		<bugs-to>https://github.com/jinglemansweep/lcdproc/issues</bugs-to>
 		<remote-id type="github">jinglemansweep/lcdproc</remote-id>
+		<remote-id type="pypi">lcdproc</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/ldap3/Manifest b/dev-python/ldap3/Manifest
index ea2f79edc081..d85e655d7e30 100644
--- a/dev-python/ldap3/Manifest
+++ b/dev-python/ldap3/Manifest
@@ -2,4 +2,4 @@ DIST ldap3-2.7.tar.gz 956927 BLAKE2B 7cc93df5b807745e6013b62bb35c281934cc7f191fe
 DIST ldap3-2.8.1.tar.gz 961648 BLAKE2B d6cbc52512efbe4f6fe5e7d19ee2ce1af3e03a8d6d08d2235eeff0f00c61fd12583c4b9fb452206ba161961c3438d109fa106a50a0edc858c24f5cd6261b2561 SHA512 f37e76e1008c990290285a757def6fe70e227393fbbdf84eb1130d5fdfd17db724c544848cc424ca7831f8cc9e8d25407fc139981ebd10818064f588adbafebf
 EBUILD ldap3-2.7.ebuild 614 BLAKE2B a02ecf7a24f304e47516156468bc5147275dc97156eaca3cf8d603f68639f8ece45b65c90357a412d42009d2b8412e90c789ae7f56517e35d0ca0390bf84b307 SHA512 c60d138e73cddd440ceba51e30247c341909cfd1440a3f3bc531de77600579c7d46154f8a1a724a3dae8529939dc32213b6b0359f5acac1ba801f29c53768cdd
 EBUILD ldap3-2.8.1.ebuild 618 BLAKE2B c46a4ec4eb2b66b6f8aa0de0abf7953da6ebabd602e4df0b79a289ef3e6efa9f6f9a147c6d74cde0dc0e690d5eb9bcf57deadb661b783cb1958e28b27a11723a SHA512 c5c760fd0f14598e56f18c834c1bebd1310249caf4a47ad0332b009ab8e022ea356dc4a1609b131827fd741b1c77f9e005e149a415291f3cd34f640b23fee996
-MISC metadata.xml 667 BLAKE2B 3dd9eac5fd53006653b3e1416ea1b7b4445daee2d041dce6672043effb4a4dc919503ab06b18b6e077981749f25b787657a3f8ab7d68572eefcda78af4c15faa SHA512 f92f6b96a6d9c32f959d278edd654495b0e8350ade72dde717b285667c0a6a9f472ca164b8c5f7e96b6f4aab1f48368a4a5836f75ff5e55941f8953b6b02e747
+MISC metadata.xml 691 BLAKE2B a926c6be14399c92366a31682660ec3e2122196b113f0f02dcd78e0a2ef99844580b1d80f5e233fab157834a1eedeb42d1fb56d7a40823ea322e009e82c33156 SHA512 6b0982bf886658ab5f54ebe2154305bc94dc5c32797d4a3142143eb19e65ac86800671a3494b3868a94b7010e9a5f72629617e979a02eb9886b220b7a853e2d7
diff --git a/dev-python/ldap3/metadata.xml b/dev-python/ldap3/metadata.xml
index 3e6256f8c0b6..37afc4de213f 100644
--- a/dev-python/ldap3/metadata.xml
+++ b/dev-python/ldap3/metadata.xml
@@ -9,6 +9,7 @@
 		ldap3 is a strictly RFC 4511 conforming LDAP V3 pure Python client. The same codebase works with Python, Python 3, PyPy and PyPy3.
 		This project was formerly named python3-ldap. The name has been changed to avoid confusion with the python-ldap library.
 	</longdescription>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">ldap3</remote-id>
 		<remote-id type="github">cannatag/ldap3</remote-id>
diff --git a/dev-python/liblarch/Manifest b/dev-python/liblarch/Manifest
index 1955f33dc419..c39a26842967 100644
--- a/dev-python/liblarch/Manifest
+++ b/dev-python/liblarch/Manifest
@@ -1,3 +1,3 @@
 DIST liblarch-3.0.1.tar.gz 55564 BLAKE2B bb3b3b67f9a64403e1a57e9b47217aa1a9b066708d70e1387a8b864a81dbdc4202b6b75012365f9c93179bbfcc4304116a33ebd3bd892f24334e0c200ae94b56 SHA512 591854eae54f5e644882f8ba486434f85196115a3c06f249cf7b343bb0e029b78a818610881d9d656f6342748c956cf5a213a22843e95b2ed05246a8013ff8ca
 EBUILD liblarch-3.0.1.ebuild 740 BLAKE2B a777bf021212e85eec452394c76c8e8a164af61d442e9f46dfd123b986b83783b4be1bb57a45335126d86d56d674ae2cf860c94dc73acdfe87b87303e6039259 SHA512 cd0b5ab20f247aabc7d580bd41957ea041cd1283d498548a2d1addd226bb6fe03222e92666ad7f82204d97579761675b85ae127eb171fc1df1e549554e0b49b0
-MISC metadata.xml 804 BLAKE2B 6a21220336fefcd5a5fa629d326ab9d08a00d8cfcf6d2198013d2437c0f2eae98a9d49fff9001cce05be900ead10c8dcf28daaae6f37567738935b0951b1a7f3 SHA512 ef436ba3e8779289ba2630dfbd546a5df56728317d4f41a16a11b8795388bbe0d87218a9d954a13719856504990e1a2c63b9a9be1660e18161d137bfdbe8aba4
+MISC metadata.xml 816 BLAKE2B f8e5369478e15d5db78b5298cf7102130d5598da60d897c31391a58733bacf3ec9965b85f72c1efbe61f2c5d5adab50e861602d3251c3587dd4a6559f83fd612 SHA512 8a18df9c51da63c8f04131dc16e1d554d2df244ae45cc738289fc3760462a7f3eab8f9b66d3d032dd1550f7716a2e673647173c531ef099829c2bc9ada7c42b0
diff --git a/dev-python/liblarch/metadata.xml b/dev-python/liblarch/metadata.xml
index e9c1e606613c..85f6916eb38f 100644
--- a/dev-python/liblarch/metadata.xml
+++ b/dev-python/liblarch/metadata.xml
@@ -10,6 +10,6 @@
 		Liblarch supports multiple views of one data structure and complex filtering. That way, you have a clear separation between your data themselves (Model) and how they are displayed (View).
 	</longdescription>
 	<upstream>
-		<remote-id type="github">liblarch/liblarch</remote-id>
+		<remote-id type="github">getting-things-gnome/liblarch</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/libnacl/Manifest b/dev-python/libnacl/Manifest
index 2556422760f1..38e13b3fb8bc 100644
--- a/dev-python/libnacl/Manifest
+++ b/dev-python/libnacl/Manifest
@@ -1,4 +1,3 @@
-AUX libnacl-1.7.1-py39.patch 1082 BLAKE2B 34d9a6946ec9cd7435d2d2b9cab427142ee394cecbd45604028d713bc76b390f2c4c6c6d78072e997885cdf57244bbf6344944fdc1f669d604c2f938ca25d975 SHA512 6696e1d9dcfb553fabf2982ab947a29dca46e22b7c143e2f6fa7917920a3f7999e1dc3ccbedec976af914c52134c2c4a7d13993ea683cc88aa021f9620a9bbc0
 DIST libnacl-1.6.1.tar.gz 39789 BLAKE2B 7c73f67d4faec8d6e53df21eb3c394d4f36754cd9ad1dfa63ef45aab43bb1832cace7446688b2b29b9923539e00d59f3a78c719b8b8770b2c6c217db19dd2f6d SHA512 90fd9302cdfbe84acfc7dff0ac95eeb05fd1bb346cd8b220613174d5d1ae5f627be06b4d588fd4a939c49a119ca557d68a06d3cbe1c0d409a253fdca96d944ac
 DIST libnacl-1.7.2.tar.gz 43343 BLAKE2B 4f7d03661e1385033c51821bf673c81ced11a1523b371ec7da42ed9cf75bdaadee1e679059dfae85871530652b5fea80bfb91c19a8a1eefb4ecf1b8661f11e19 SHA512 a4efbf73f73d9493ac365efa5a5bd6481f85ce4c880ad236bbf7478090bdea857e78e33e445c4e467d2a2032040863b835f32f9a942d2f1e467015bd76b0d469
 EBUILD libnacl-1.6.1.ebuild 539 BLAKE2B ccb3670d51307049905a0c83b804f84ab665209d74c701ff3c03a629bf8a5d4a5d97a5fdba12e28e6f067584ad12c6a5bc2250296bac19ae79aa9d08fe404bad SHA512 231d321231c039dc696d18494d964e2df61aab1dc4fe27d2f8cb70794ffd28dc58670a8f5000c518f2dae723140eaf822670159ae9c4d02687a723f817b7a9b9
diff --git a/dev-python/libnacl/files/libnacl-1.7.1-py39.patch b/dev-python/libnacl/files/libnacl-1.7.1-py39.patch
deleted file mode 100644
index 62fc1e30258d..000000000000
--- a/dev-python/libnacl/files/libnacl-1.7.1-py39.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-commit 53c1576b21b53156fc30d357b40c88c7eefb50de
-Author: Karthikeyan Singaravelan <tir.karthi@gmail.com>
-Date:   Thu Jan 30 22:22:58 2020 +0530
-
-    Remove encoding parameter json.loads for Python 3.9 compatibility.
-
-diff --git a/libnacl/utils.py b/libnacl/utils.py
-index 412d518..e06e078 100644
---- a/libnacl/utils.py
-+++ b/libnacl/utils.py
-@@ -1,6 +1,7 @@
- # -*- coding: utf-8 -*-
- 
- import struct
-+import sys
- import time
- 
- # Import nacl libs
-@@ -31,7 +32,10 @@ def load_key(path_or_file, serial='json'):
-             key_data = msgpack.load(stream)
-         elif serial == 'json':
-             import json
--            key_data = json.loads(stream.read(), encoding='UTF-8')
-+            if sys.version_info[0] >= 3:
-+                key_data = json.loads(stream.read())
-+            else:
-+                key_data = json.loads(stream.read(), encoding='UTF-8')
-     finally:
-         if stream != path_or_file:
-             stream.close()
-@@ -95,4 +99,3 @@ def time_nonce():
-     '''
-     nonce = rand_nonce()
-     return (struct.pack('=d', time.time()) + nonce)[:len(nonce)]
--
diff --git a/dev-python/libpy_simdjson/Manifest b/dev-python/libpy_simdjson/Manifest
index 84dd68ed4c99..e17d2c5be94e 100644
--- a/dev-python/libpy_simdjson/Manifest
+++ b/dev-python/libpy_simdjson/Manifest
@@ -1,3 +1,3 @@
 DIST libpy_simdjson-0.4.0.tar.gz 3319968 BLAKE2B bb24af861cda5973af73718f098a514e74e852f59703c694a7bd4875f183cb0daacab7cedca9757df42557f6d1d9e2408e15443977a1dbdd6bb12cd09a488774 SHA512 c3a8c1a24f338d1fdcd0a07c64da8887b0e6e44dc701ddc23f27d569319c01d9f7ff9198de6d828e2925c2fd6444b64e3273f4e16fc9d5c1a173c6edfaccd83f
 EBUILD libpy_simdjson-0.4.0.ebuild 809 BLAKE2B 896829304781f000adbbce4d122b4ea2af7bab4c4ea87f9e02356e6ed10d67f0ae3b20fb4011a9eddfd8aac8645726bf7e918d8bebadd990aae730172a613fac SHA512 2d27e143ede23969f8c7167cb8a0bef3b3ea3b9d2f748a131e89e5a70596164919ab3814b574f2ebaea819c60700c2fc7922022c74d785ad21ce725f671b0fec
-MISC metadata.xml 249 BLAKE2B 9e4529cdac0a55f14c36fde3fa54e30645a61a73d58e83ce460edf84d729bb3cd4cdc3e52d588690945508bc7d253b1edfb7734ebee94a88b75fee249a043c84 SHA512 ecad16da7f98e9b1cb1882147e6d8b7d541e4839d92fc26f3db1bea69ed633637da9259947b2b78d204a11d0edd3daa84f173613b6dc19110b5406c6fddfa7f0
+MISC metadata.xml 326 BLAKE2B d9cdd08ce79cd3cf7338ef165c60775a1206a0c50790d49cc0cafcce8a41a2cce7ed67bf3d97ef9acbc4962ee06c55ba5688cb3985f66a2b07229dfbd6cb3742 SHA512 f112b368ba56e3decb44e8f7fd29d59098b39091633f16adf762f151afa6b86a41ee0bf2aeebc0569c9180ee7381b662f06f73c54df4c3a5951aecb37d119b62
diff --git a/dev-python/libpy_simdjson/metadata.xml b/dev-python/libpy_simdjson/metadata.xml
index cee379b15409..a2b84c6311a1 100644
--- a/dev-python/libpy_simdjson/metadata.xml
+++ b/dev-python/libpy_simdjson/metadata.xml
@@ -5,4 +5,7 @@
 		<email>chutzpah@gentoo.org</email>
 		<name>Patrick McLean</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">libpy-simdjson</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/libsass/Manifest b/dev-python/libsass/Manifest
index 987c7518e173..5961e6f6774c 100644
--- a/dev-python/libsass/Manifest
+++ b/dev-python/libsass/Manifest
@@ -1,6 +1,4 @@
 AUX libsass-0.20.0_rename_sassc.patch 1710 BLAKE2B 410f1256dbe433d5836a0c7f94a30b0fbe174285408d5c3c0589a7f4f58d2417c9be37af6ae137031365450ad2bca51ebb2cd6083c625d95a33ac8c0eb3bc80e SHA512 3e30b6a5cc387aac526ca2159d5854b28090ab41d7d4b2512627cc1e5b392569b81c0b1c845d3311a9cd44c73a6ed109b2a06a9677cbe15a4a39c7ab0c7c4a6d
-DIST libsass-0.20.0.tar.gz 321750 BLAKE2B 215bbe8d4a60d3f6851bfe92a7fb79e58bdf86fa5334a39c7ed051ad2ffc598e59afcb381f6526d25d6e3d021fd5eda51371a6628c01111f8bed42bda9581cb7 SHA512 ad6054f3e02b39730c4680b64d3ed20ba05443c7019c8a7a47ae557a6f52c60be1326a2cf2421f13de0a57a5f37347dffff1146190d1fa0eb8fd985f27ebf7d7
 DIST libsass-0.20.1.tar.gz 316227 BLAKE2B e4b4955a2ad0722d76e79979405c8e549b911d31c3fb828563e1e52cad9f9fe72cf543bd5e2ac2383faf85a44f4f0258253f7d45394f37d30076425660ebd031 SHA512 8918154f9fc4b0618d4729195414b2d8c5818a3e4dde2d4e084a73c01c3f6a2d46028a35b4e11759bc001266bcf03423319230682507c6952c9b0eb2df17feaf
-EBUILD libsass-0.20.0.ebuild 880 BLAKE2B 2efb02d977f7a5882ac76b4e5303fce24090b4cbe2ed8376770e5f4c27016c56b004d5fed0209b74df1c4efa0ec237c07cef40b8fff0f459098ad033cb818e96 SHA512 c97b6c5f00487efbc32b0a72decac4bbc5e5e3964cee52328cd5577ed3971edbbc87ec38e01eca4f05da402a57617f7a11b846656713a1e602d814d522e1ea12
-EBUILD libsass-0.20.1.ebuild 890 BLAKE2B 35bf7806ab68b864e95354f664d092ec2701a45fccd12ce816dc0fddddb6099e3f5b98239677161379cb246acd3e5338b9659458b9d8b7d6f865a2cce59dad1e SHA512 2ee5a699f5f32e445dedca329b4576175957e4a4f8f0c0cdf1a80f04b9d96fb752251c83933bdbc19b5931c2b75593925ff0bfe9dd37d6071f3e905ba3d2a27b
-MISC metadata.xml 412 BLAKE2B 1c1563b175b955ba98fa211a2277e49347a6e3bdf4aa4fc585a2eeab65b080e2b63ddaaac5958521f9e421ac3c0a8bb5872416e0186490b0185eea76d527dbab SHA512 d5cfa13aa12b5612ac426563ec40fe585231a3a599b91490d81745c5b77c9ea603335fedfac9d62e810694e25f2fa5ed71e47e13c85cb75db57c116db3164225
+EBUILD libsass-0.20.1.ebuild 888 BLAKE2B a499e857aed68591e8c62b052eb682715896798ad6da7a3d89604be98f203bd1dcc90d0837b6f91f2fec94163677c5146ae2b54bcf23d181bb2c55833d126408 SHA512 9f34572774bddd1ad84c22afc4428d55cdfeb9b02f16a67364e8d2e3e9e9b141471d11c3d2f3e8dda446486c9894b31043693ae4f65ccd790c32134ba2ea3f9b
+MISC metadata.xml 445 BLAKE2B c347b1db66e282f3fe602fd5f81a667bd839cd5134abd65e069d075ad16d5bd8e6b4bdf447dc605cc9bbe044ecb103890ddedf47b28c9388ddafc78c9e8bc1de SHA512 ed72a3d8b34495479c4e2fe9af937ea18687bab675394f04f3504a66d741e20edfd959f0e7c850265da709b667a0d94b52ce59e829500a62af660cfaf905a43e
diff --git a/dev-python/libsass/libsass-0.20.0.ebuild b/dev-python/libsass/libsass-0.20.0.ebuild
deleted file mode 100644
index 4db2ec619f46..000000000000
--- a/dev-python/libsass/libsass-0.20.0.ebuild
+++ /dev/null
@@ -1,34 +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} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="A straightforward binding of libsass for Python"
-HOMEPAGE="https://github.com/sass/libsass-python"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="dev-libs/libsass
-	dev-python/six[${PYTHON_USEDEP}]
-	test? (
-		dev-python/PyQt5[testlib,${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-	)"
-
-# Remove sassc, in favour of pysassc, see: https://github.com/sass/libsass-python/issues/134
-# This avoids a file collision with dev-lang/sassc
-PATCHES=( "${FILESDIR}"/${P}_rename_sassc.patch )
-
-distutils_enable_tests pytest
-
-python_test() {
-	"${EPYTHON}" sasstests.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/libsass/libsass-0.20.1.ebuild b/dev-python/libsass/libsass-0.20.1.ebuild
index 065c56e9574f..5b492be38be2 100644
--- a/dev-python/libsass/libsass-0.20.1.ebuild
+++ b/dev-python/libsass/libsass-0.20.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="dev-libs/libsass
 	dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/libsass/metadata.xml b/dev-python/libsass/metadata.xml
index dd0bd9c021f6..2bcd0001e9b1 100644
--- a/dev-python/libsass/metadata.xml
+++ b/dev-python/libsass/metadata.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
-    <maintainer type="person">
-        <email>andrewammerlaan@riseup.net</email>
-        <name>Andrew Ammerlaan</name>
-    </maintainer>
-    <maintainer type="project">
-        <email>proxy-maint@gentoo.org</email>
-        <name>Proxy Maintainers</name>
-    </maintainer>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">libsass</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/libtmux/Manifest b/dev-python/libtmux/Manifest
index 9acc4151b32e..5a3f2833ccbe 100644
--- a/dev-python/libtmux/Manifest
+++ b/dev-python/libtmux/Manifest
@@ -2,4 +2,4 @@ DIST libtmux-v0.8.3.tar.gz 131928 BLAKE2B 7979dc907d5c7805cf56422aa0fed554c89f0b
 DIST libtmux-v0.8.5.tar.gz 222445 BLAKE2B 5af148555eb89c66bdc66f3f214967f7e901d9b86ea85e02a9fba64f2eb3559828519ba8120eaee5eb86ec75bee2e599a08384dd096de8dc0969129c58172c1e SHA512 d456725c3ca41a672ee5239bfb5f42a262674638d308fa141627995be8b8fe348bb8713b735eb05c5a3cc73f35fe3f6fac12024f6254c950a3048b2e07606363
 EBUILD libtmux-0.8.3.ebuild 904 BLAKE2B 8bfe4291e9a5f72b367ac75810efb7558d4f5daef054a702da55597f0e5f0a08962d9cbb281779770c30f061a52bd03a7d77073aedd51e67624b4b0d166d6b11 SHA512 bb462d811dc4af3658e37f109f88790d2e0dc2fbde1d5b6e4414b783ac10a5a85b62f5585cd6225bf639eebdf2a664a4f505b902360e68b3d670b26c53545106
 EBUILD libtmux-0.8.5.ebuild 899 BLAKE2B 3aa62cc70d968e171b733c71ae82309c9977001f068da947639a164f10fb5f2ba733d502b77fe3c12b386071da39e25596395e63377d524e1fc1f5bd6b0cafe0 SHA512 547279cfe76093d7a729541189319bbbe80e74663c3effafb753fa4ef954496e84b9cf7d69305f7dcc9ddd741b74ef319ac06e0e667a3ce090e3b6d754fbd5cb
-MISC metadata.xml 255 BLAKE2B 2bb3830b8cec850703f7912f4c22f5b0abeabeed0715222bc56141779d02160773cfd0f85417c553c1cd8f2738bfeb78c56dffb8e648e572019319657646d1ba SHA512 522158915afe67937f81ba572a918a2de8ca1f8591e097da56799c97870d7c44756c1acd8224d63bd3375c2b9ebc0e1ce50816899117948a48065a27804883bf
+MISC metadata.xml 319 BLAKE2B 9a43d483758dc4878ed0f0bcb6dfcfcc310ba7bbc62b0c081bd6c885b3072c7e008ef8996343507f1b5c9bd06e6e9e78ea30486abaa7c21a0f068cd6f6ad9da3 SHA512 3a03561417ce6c530cc3b05eabba72d8f4625e7fc56a330f62023a388137485c156f52684cdf1815da66dd526b9ff6c5704f4ed9c1c2ad3d2a9679846084485d
diff --git a/dev-python/libtmux/metadata.xml b/dev-python/libtmux/metadata.xml
index 56cae167d372..f8886f632e52 100644
--- a/dev-python/libtmux/metadata.xml
+++ b/dev-python/libtmux/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>chutzpah@gentoo.org</email>
-    <name>Patrick McLean</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">libtmux</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest
index 192aeb8f4ae4..d09c6c624bc6 100644
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@@ -1,8 +1,10 @@
+DIST libvirt-python-6.10.0.tar.gz 212567 BLAKE2B 0ba583646c16c8e298a4cde789dca9c0f4920a3ac7e241134e251e5d0fc426a37c297870571acc673de2ce14c3de5bb7069316805581ce33cc044090930dd599 SHA512 bc9d65fa82cf021c0929c8f2760a31de606d52c860d15d1961438fd763131f05fa3f4e12f0030b45ad12c3ae40d84b21167091ae810376487b7aae11c2e3ab2b
 DIST libvirt-python-6.7.0.tar.gz 208597 BLAKE2B 335bd89133b688586a55193635b4b75dabe6dd4a741a450e49067ac8a9b9d9da54787b50c23bc6d5322a7fecbe513422f02450e09d541cb112ccfd499ce18101 SHA512 7d5a7f87abc01285c2030c9408838d4e1496d0d0316b9ab775749e49719fa66c20114aad2bd281d6783e2cb4d47ceac5ac60ac584e881288d0b0d9cc76d5b2cb
 DIST libvirt-python-6.8.0.tar.gz 210034 BLAKE2B 667c2713bf9c0936f444c5b621f5af4e5273deda31496bc01c8834286a0ec0eb1c056006549cc5d129ef597264f8582acee62db3a2fd375daa4ebbceacb8fcc1 SHA512 6d2f82fafd414047cff16f0ad655fefd69c8c0da04be07d27da44e3ab17dd03e4e4ff102be1c30948c361268f57ea312978f9198fd128bfb54a3c1a07150e6af
 DIST libvirt-python-6.9.0.tar.gz 210366 BLAKE2B 384d8ce4d6c91f7185484e3ad35572a3245712c59f416d0f117ce7936d1e6234458c3454a8d773ee287de4d529eae7229e3dd67111df7955369cd36b028be1cc SHA512 d15a80de5418586f769101525464efc88154c9038f59c805030a60b4b711f11f15531f4e1fd01575e1646397342fefa38fca9371e8146157b61f607b3c286fe1
+EBUILD libvirt-python-6.10.0.ebuild 996 BLAKE2B d69bcd8d363de78b125f2dc20d521451b21435016d6ee433e981aa79e9c35801927234dfe720640af8aead5793284625399aede929a581a2e5d5baa5065203dd SHA512 30fae0e3cf62d452fa855231b79122f393a6e47f4a1e0161f14cee8679345b4ccf9ac0e39efca968a1c724be181a9170c4cc31d0a2db8f77d4e48da6bfe38e48
 EBUILD libvirt-python-6.7.0.ebuild 994 BLAKE2B 59cb3b545706226b8fb90dd7e76d4bca7893cd8b6593a0f51578f4ad92185eca39c26eea80797fd2b20428a3629db8db3a94b735cc1c5b70cf99f3db7bfae598 SHA512 12540c4bee991e3e097d02700aab5105cf4bd23a69eaf34700c38b3217f11d12a69cd6e0401642a7d1564ee8e3f89bb6b7e23d542c00a4d89e54d58945826e1e
 EBUILD libvirt-python-6.8.0.ebuild 994 BLAKE2B 59cb3b545706226b8fb90dd7e76d4bca7893cd8b6593a0f51578f4ad92185eca39c26eea80797fd2b20428a3629db8db3a94b735cc1c5b70cf99f3db7bfae598 SHA512 12540c4bee991e3e097d02700aab5105cf4bd23a69eaf34700c38b3217f11d12a69cd6e0401642a7d1564ee8e3f89bb6b7e23d542c00a4d89e54d58945826e1e
 EBUILD libvirt-python-6.9.0.ebuild 996 BLAKE2B d69bcd8d363de78b125f2dc20d521451b21435016d6ee433e981aa79e9c35801927234dfe720640af8aead5793284625399aede929a581a2e5d5baa5065203dd SHA512 30fae0e3cf62d452fa855231b79122f393a6e47f4a1e0161f14cee8679345b4ccf9ac0e39efca968a1c724be181a9170c4cc31d0a2db8f77d4e48da6bfe38e48
-EBUILD libvirt-python-9999.ebuild 1001 BLAKE2B 727bfa4e64601efefa1a16aa24ee29091a8cc8060563c32e06a3bfd93c5dc6cd938d05973523f5666cc823017d18b7816079706ef4dd45ce6219dd3b4a055da6 SHA512 e56bb3138bcbb68a8b98dc5f134b6bbb319aff2d6a21bf63676c85c153e3a75072a9ca9db2a798beb2691e958e2a0d08e038549f1c8fcff719770d3df0872e0c
+EBUILD libvirt-python-9999.ebuild 1000 BLAKE2B 77f19380e25a04c3e5fed8dbbc439a75afea067281b4bdc47e99776a02592749e80067d23f72ea6b6ae368a739c306da07a4b56b0824914e8cd167e1175b3ad8 SHA512 566e17cca7b587b120cdd42c9a193fab9676d52e3b285227bf08b95331e106a27c28bcf58ef7d79a1032f6e85f01cfbb41cfd6058f634170cf37cecd40774478
 MISC metadata.xml 518 BLAKE2B ac9993d622790a5cec52f737de0494b7ac6a5a6e17e66ccad8e4862257ba8926d688fa4b6e68cd96ea5a4f2d35825204219fd79bc5917d05a6f39787f80bc1df SHA512 243b815c70c65046d672bc2b4a05d67f61c6e70dc6677ef7e8b76783979d801793f8d864a33ed9c64072c4fa30786d4455c82c82fa37933dac0b0efac2264083
diff --git a/dev-python/libvirt-python/libvirt-python-6.10.0.ebuild b/dev-python/libvirt-python/libvirt-python-6.10.0.ebuild
new file mode 100644
index 000000000000..234224f5717f
--- /dev/null
+++ b/dev-python/libvirt-python/libvirt-python-6.10.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+DISTUTILS_USE_SETUPTOOLS=no
+
+MY_P="${P/_rc/-rc}"
+
+inherit distutils-r1
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
+	RDEPEND="app-emulation/libvirt:=[-python(-)]"
+else
+	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	RDEPEND="app-emulation/libvirt:0/${PV}"
+fi
+S="${WORKDIR}/${P%_rc*}"
+
+DESCRIPTION="libvirt Python bindings"
+HOMEPAGE="https://www.libvirt.org"
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+DEPEND="virtual/pkgconfig"
+BDEPEND="test? (
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/nose[${PYTHON_USEDEP}]
+)"
+
+distutils_enable_tests setup.py
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/libvirt-python/libvirt-python-9999.ebuild b/dev-python/libvirt-python/libvirt-python-9999.ebuild
index 9fd68025b030..a8d6ae5dc1b6 100644
--- a/dev-python/libvirt-python/libvirt-python-9999.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 MY_P="${P/_rc/-rc}"
 
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 07fd415ad9ef..a4229a8bc156 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -1,11 +1,11 @@
-DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
+DIST llvmorg-11.0.1-rc1.tar.gz 122777435 BLAKE2B 23b520d33cf4b641027ee52bb10c6171d60356c9167d5b94012929e6e547c526cda1a6177c295ed19592dfb83b020f63b2cef4cabc70ce9a2a8e098fe654a3cd SHA512 605c7bbff1610f335be8ea4f1204df797fed21185a54c77565f6ff2d00794d1967e9c5fab7c87633e242f2f999bdffb76da83f756d261c1ca476114599409ae1
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD lit-10.0.0.ebuild 863 BLAKE2B efe99feb8f7c0b6b4121591f240120a47f3f2c673d5b5d3908184a6a395b206a84abcf0f524f3106357a35b7217122875b6b4d5365af26676a48d3e1194a0158 SHA512 a3cdcf3d5af68f02e0ced1427c0babc7470b1268f7400d6c4db7d9961d5f944191777a03e3ef2c30a55ce75f003c1cdea382f2a0218e5c32c1d0c4a0b2cbf523
 EBUILD lit-10.0.1.ebuild 893 BLAKE2B e23af1f7a6d50e660ccf67a800375129465f3fc0c89e0be4e8013318ba9882df788baee745ddc9e932e1d42664cefbc5b08c1ec550a162a3d1ea39e1f22e66b0 SHA512 20206b54df19decdcc35112630b734351a9aafc2093f8ea3b5a57baa2db822bc3583252fe784d8af4ca729a0ee5f0cb1ec53e2eba85e94e21cd7b6c4d80e5302
-EBUILD lit-11.0.0.9999.ebuild 868 BLAKE2B 2ee1ed99d09450178ee1d188a464b80681534c04a4c96df18213b884804bce1f4182fdf578f5aac54489aa370f2b6ff39d72af7f96113d4ab4f110658e12b5c2 SHA512 44b3c4890bd0885b035d8eb9fbe1fac5b5285bc47080f2ff2b47eb3171af4c9144b20cc033cf2b907c62a30e945ddd809729429b4385ef8bb8f5e52ed5f198dc
-EBUILD lit-11.0.0.ebuild 893 BLAKE2B e23af1f7a6d50e660ccf67a800375129465f3fc0c89e0be4e8013318ba9882df788baee745ddc9e932e1d42664cefbc5b08c1ec550a162a3d1ea39e1f22e66b0 SHA512 20206b54df19decdcc35112630b734351a9aafc2093f8ea3b5a57baa2db822bc3583252fe784d8af4ca729a0ee5f0cb1ec53e2eba85e94e21cd7b6c4d80e5302
-EBUILD lit-12.0.0.9999.ebuild 868 BLAKE2B 2ee1ed99d09450178ee1d188a464b80681534c04a4c96df18213b884804bce1f4182fdf578f5aac54489aa370f2b6ff39d72af7f96113d4ab4f110658e12b5c2 SHA512 44b3c4890bd0885b035d8eb9fbe1fac5b5285bc47080f2ff2b47eb3171af4c9144b20cc033cf2b907c62a30e945ddd809729429b4385ef8bb8f5e52ed5f198dc
+EBUILD lit-11.0.0.ebuild 900 BLAKE2B 0224887621d00008b892a1549721c41e7495ea3ed80a34895ecdcd117b48be5d88607b1ab5a31c0e8441691c91ebd6b19ace2ac6e8ba919dde8fc8ba9b12ce27 SHA512 e418060f8cdc1654aa5be2345ff65c47aef24257ece4682092ae4c2663d68ef7ac9836491a79f6a4c084c6f3ad4419dc17ce0ff2f252dc1da1c8e5e1c3cb2d10
+EBUILD lit-11.0.1.9999.ebuild 869 BLAKE2B 0338f86d2256fc370fc708e65482eccdc101917726ffaea02dbea297d114e52abfda416673cc94f8029671c705396d36321518c080d38cdd5ee68691a5854136 SHA512 54c0401c0d4b07ba0cf2fa4b69975a58d2fab218bf7925488637069844d8e891eca2d76806d4a12ee26b04030d0f8e5d68d034264469620d95c880e867d90d3d
+EBUILD lit-11.0.1_rc1.ebuild 869 BLAKE2B 0338f86d2256fc370fc708e65482eccdc101917726ffaea02dbea297d114e52abfda416673cc94f8029671c705396d36321518c080d38cdd5ee68691a5854136 SHA512 54c0401c0d4b07ba0cf2fa4b69975a58d2fab218bf7925488637069844d8e891eca2d76806d4a12ee26b04030d0f8e5d68d034264469620d95c880e867d90d3d
+EBUILD lit-12.0.0.9999.ebuild 869 BLAKE2B 0338f86d2256fc370fc708e65482eccdc101917726ffaea02dbea297d114e52abfda416673cc94f8029671c705396d36321518c080d38cdd5ee68691a5854136 SHA512 54c0401c0d4b07ba0cf2fa4b69975a58d2fab218bf7925488637069844d8e891eca2d76806d4a12ee26b04030d0f8e5d68d034264469620d95c880e867d90d3d
 EBUILD lit-9.0.1.ebuild 861 BLAKE2B c4d1a504e922e182102538cc19ea99683500c533af440179bbc99f22aa21558585a7d4f6bdc8ca4159c2300150ffedba1cc980c448fbf5f146d4168e65a3c9e7 SHA512 7916fc0e882021c5b3bf21b4b565e73e83380d9c221b61b31af0acb5939ee3413a1a6638f7328b0815081316300b78836273ba20448b4d8c9d5baf73278184d9
-MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
+MISC metadata.xml 282 BLAKE2B 36e6403814edc8e79eca456ef9648a7b261f79d4823082a8dce876127b11bf89182dabb02e58b2a42dec3cf9e21fe2f5c474ee4a8416213901f82cfc481ffcda SHA512 fa292059e410ff5e751980c5f5b0145c579b373d77970b797850c3d92641bbcf27b2c18a33d665e76e59553ba7dcc124ae09ec34fcaab4b2caed74248ace0e57
diff --git a/dev-python/lit/lit-11.0.0.ebuild b/dev-python/lit/lit-11.0.0.ebuild
index d5ada9e0bb8f..dcd0fecf0cca 100644
--- a/dev-python/lit/lit-11.0.0.ebuild
+++ b/dev-python/lit/lit-11.0.0.ebuild
@@ -15,7 +15,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/lit/lit-11.0.0.9999.ebuild b/dev-python/lit/lit-11.0.1.9999.ebuild
index eafbdc683987..8e876ebd8594 100644
--- a/dev-python/lit/lit-11.0.0.9999.ebuild
+++ b/dev-python/lit/lit-11.0.1.9999.ebuild
@@ -10,8 +10,6 @@ inherit distutils-r1 llvm.org
 
 DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
 HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( llvm/utils/lit )
-llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
@@ -25,6 +23,9 @@ BDEPEND="
 		dev-python/psutil[${PYTHON_USEDEP}]
 		sys-devel/llvm )"
 
+LLVM_COMPONENTS=( llvm/utils/lit )
+llvm.org_set_globals
+
 # TODO: move the manpage generation here (from sys-devel/llvm)
 
 src_prepare() {
diff --git a/dev-python/lit/lit-10.0.0.ebuild b/dev-python/lit/lit-11.0.1_rc1.ebuild
index a61d6f3ca2be..8e876ebd8594 100644
--- a/dev-python/lit/lit-10.0.0.ebuild
+++ b/dev-python/lit/lit-11.0.1_rc1.ebuild
@@ -4,18 +4,16 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
-inherit distutils-r1 llvm.org multiprocessing
+inherit distutils-r1 llvm.org
 
 DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
 HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( llvm/utils/lit )
-llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 x86"
+KEYWORDS=""
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -25,10 +23,18 @@ BDEPEND="
 		dev-python/psutil[${PYTHON_USEDEP}]
 		sys-devel/llvm )"
 
+LLVM_COMPONENTS=( llvm/utils/lit )
+llvm.org_set_globals
+
 # TODO: move the manpage generation here (from sys-devel/llvm)
 
+src_prepare() {
+	cd "${WORKDIR}" || die
+	distutils-r1_src_prepare
+}
+
 python_test() {
 	local -x LIT_PRESERVES_TMP=1
-	./lit.py -j "${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" \
-		-vv tests || die
+	local litflags=$(get_lit_flags)
+	./lit.py ${litflags//;/ } tests || die
 }
diff --git a/dev-python/lit/lit-12.0.0.9999.ebuild b/dev-python/lit/lit-12.0.0.9999.ebuild
index eafbdc683987..8e876ebd8594 100644
--- a/dev-python/lit/lit-12.0.0.9999.ebuild
+++ b/dev-python/lit/lit-12.0.0.9999.ebuild
@@ -10,8 +10,6 @@ inherit distutils-r1 llvm.org
 
 DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
 HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( llvm/utils/lit )
-llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
@@ -25,6 +23,9 @@ BDEPEND="
 		dev-python/psutil[${PYTHON_USEDEP}]
 		sys-devel/llvm )"
 
+LLVM_COMPONENTS=( llvm/utils/lit )
+llvm.org_set_globals
+
 # TODO: move the manpage generation here (from sys-devel/llvm)
 
 src_prepare() {
diff --git a/dev-python/lit/metadata.xml b/dev-python/lit/metadata.xml
index 89c4bdb96049..9f9e9cb580d9 100644
--- a/dev-python/lit/metadata.xml
+++ b/dev-python/lit/metadata.xml
@@ -4,4 +4,7 @@
 	<maintainer type="project">
 		<email>llvm@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">lit</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/livereload/Manifest b/dev-python/livereload/Manifest
index bbb8ea65521d..c73d67996d09 100644
--- a/dev-python/livereload/Manifest
+++ b/dev-python/livereload/Manifest
@@ -1,3 +1,5 @@
 DIST livereload-2.6.1.tar.gz 28324 BLAKE2B e6b9d107b5848916548e3665461dc90c1a37124496b4066aab45c62c57f0287f23d3883321bc2c67a053f981336c84ff47d1a459c9f10bb8965ea11236d07d2d SHA512 c7f058687c715a46e24537105bae2788395c6664a69f9a78b1c357464818d17826515c66c537ab625ee5eeb99f162b1304006455f4da9b0bab9a67bacf12d3dc
+DIST livereload-2.6.3.tar.gz 29407 BLAKE2B 39f030dbc21bec1b132fd9d43f9072f4c35d23ccdca56819e2c6b35277e9eac9caeeff7052fc766359e34bf415319f809ebd45927bd2cc223be7ac88594feef7 SHA512 ccccb17cb4d835eb9e812f8076f871164f6afb2fdc1aee9e35c5ef2d75be2c0403cee51d4eb30b029d7b35522f357ee8c3e9df926fd93511ba7d010ed2a69e8e
 EBUILD livereload-2.6.1.ebuild 1131 BLAKE2B 9119bb291c148c3cf967dcde3798f05a2a5f4f912adc38a83a04f943ad8146854a7cfc2700cacc17ec0e2a2936cadfbf184b15b681f0c9f8b2e77997529918a4 SHA512 de832a862afc9260cfad474bf4650a134e50d5c30f40dc2f026f9d11e592aab559b08a5121663cb6b5dc881e80efb002e2297fefdd4befedaedcbc3a4bf285c8
-MISC metadata.xml 465 BLAKE2B c5c9dce51449ae6c628969c4536a7ea37677438224c4812dc4162d7f8ee59d7505e0d8bcea05db1c4dddf0b5bc675246d500ba5f06bbecb779294cb1b8b83dd7 SHA512 4daacb3b576db362b14af380cb1b4616ef8a6aa206a539533d8119431c66e7f566a8f1678d3744d8644a0db8c2b047bfbf68729c1520683d167224725e0f5d52
+EBUILD livereload-2.6.3.ebuild 1134 BLAKE2B 9ec958011efe4874a60c00101c823ff2582062a0f3215c00a636312595cca4d64b8689295891bc6c359ef5fc448adbb3b8f58cf51214c508df3d820f5871432b SHA512 e672acf890d0ec499461807d5c45e46095c7e990cc22ced30384fcff7635ebc85aaf1e6fcea0304a75f5f1aa4451ddd412b3807af6440d31f598b6a0038df3c0
+MISC metadata.xml 513 BLAKE2B 519fabeeac705d381964dcd412a8cd9d8d9754c14acb06bf284098b72a0e53f0c2477da043cb3f2120d3a5b1d7c04019dc24826abd789e702bc2071d5f45b0d4 SHA512 01fdf336ba48d40540c3ca133df5ce6bef8f93301163572259fefc9c77001b63ab3877ec4a239258b3be600df5302bb7dd60a0de69b0faa45e94294f244e4b7c
diff --git a/dev-python/livereload/livereload-2.6.3.ebuild b/dev-python/livereload/livereload-2.6.3.ebuild
new file mode 100644
index 000000000000..4fee92546853
--- /dev/null
+++ b/dev-python/livereload/livereload-2.6.3.ebuild
@@ -0,0 +1,47 @@
+# 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} )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Python LiveReload is an awesome tool for web developers"
+HOMEPAGE="https://github.com/lepture/python-livereload"
+SRC_URI="https://github.com/lepture/python-${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="examples"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	www-servers/tornado[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/python-${P}"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs dev-python/flask-sphinx-themes
+
+python_prepare_all() {
+	# AssertionError: assert (None, None) == ('/var/tmp/portage/dev-python/livereload-2.6.1/work/livereload-2.6.1/tests/tmp/first/foo',\n None)
+	sed -i -e 's:test_watch_multiple_dirs:_&:' tests/test_watcher.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	if use examples; then
+		docinto examples
+		dodoc -r example/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/livereload/metadata.xml b/dev-python/livereload/metadata.xml
index 5a0914daffe9..21b4756a086d 100644
--- a/dev-python/livereload/metadata.xml
+++ b/dev-python/livereload/metadata.xml
@@ -11,5 +11,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">lepture/python-livereload</remote-id>
+		<remote-id type="pypi">livereload</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/llvmlite/Manifest b/dev-python/llvmlite/Manifest
index e2081488e19a..28e27b8ddf01 100644
--- a/dev-python/llvmlite/Manifest
+++ b/dev-python/llvmlite/Manifest
@@ -1,3 +1,5 @@
 DIST llvmlite-0.34.0.gh.tar.gz 210438 BLAKE2B 832ec28047a51b2874a0de5885445b9d77942a70f86620dfb0b25ff0b17395b6009d31d5e9f27ddf02c19ae97bd5b325fc49227fdc0499a9f5fa3bde44e6b564 SHA512 5540df4ebad835e294c00cc09ab1230a530566f563f751f890752f6e22f7b2a04aedcbb53dbbb8e323198d05c80bc9699b593d919eaf1af60fa6f94ff6f50bb1
+DIST llvmlite-0.35.0.gh.tar.gz 228089 BLAKE2B 5cee01244552cfc1c2ba979709170484ed253f52c5c47a4a254bf7d26c935ff0d2a858b7a7f4ec7719644495383128adab11a1287849cd426b7997da4a59efeb SHA512 345b6321277749a169cd87e152261ef499edbf18d18ef7085017c111f2892eac0241529cfae9c6eaaeb68cdb4d726965ed03b4d5a836501dcbdaa73d3c0796fd
 EBUILD llvmlite-0.34.0.ebuild 1354 BLAKE2B 0479672c088a56c7f27bb2a7cd615448d456f5db3e042ce608ec1f12dc69b4fbcb95db79efc8783c9333d6e52672ba7abecfc3b68accc5bd15618003206fb660 SHA512 97248a6a08962e07dd5dce71bf52eb75c76630d634d9e423ed02b1bd6dc178b24bd38fc5f1436edb563a9475555218f39cb84bf086ec82457e5403c6714903b6
+EBUILD llvmlite-0.35.0.ebuild 1358 BLAKE2B 30c83734202847c4e5da441445bac1c17928d011c87eee2d966d42b924d853529d2cc94f260a955d4a4570944f9e437c785ec1e8c8832c656567fdeb90d7275d SHA512 8775329a09c3ac903be72b4d3e329ab2971eda6596687231a096e0942daff6c78d15d66a68b8334a5fe5f647ef67d6ef4e7aec69efba466f61a53a4f8bf63170
 MISC metadata.xml 792 BLAKE2B 8247c0ac546df47bc70b8e525d776dd391fa553d75d7bb0507986ac2f7efe1d023db7259f8938c13b383ef719a10acb3e1357bca4dc398a42b68ba756c0c351a SHA512 8dab7bc4b6d33f9a3c458dde08e07fe22680238185e8f144ada7ce7374ecb3fbd38149f67d2a11cba7a816384c556edf618e45ec331e6054b97aee60c529a35a
diff --git a/dev-python/llvmlite/llvmlite-0.35.0.ebuild b/dev-python/llvmlite/llvmlite-0.35.0.ebuild
new file mode 100644
index 000000000000..3fa3c11d9cb7
--- /dev/null
+++ b/dev-python/llvmlite/llvmlite-0.35.0.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} )
+
+inherit distutils-r1 llvm
+
+DESCRIPTION="Python wrapper around the llvm C++ library"
+HOMEPAGE="https://llvmlite.pydata.org/"
+SRC_URI="https://github.com/numba/llvmlite/archive/v${PV/_/}.tar.gz -> ${P/_/}.gh.tar.gz"
+S=${WORKDIR}/${P/_/}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+LLVM_MAX_SLOT=10
+
+RDEPEND="
+	sys-devel/llvm:${LLVM_MAX_SLOT}
+	sys-libs/zlib:0=
+"
+DEPEND="${RDEPEND}"
+
+python_configure_all() {
+	# upstream's build system is just horrible, and they ignored the PR
+	# fixing it, so let's build the shared lib properly using implicit
+	# make rules
+
+	export LDLIBS=$(llvm-config --libs all)
+	export CXXFLAGS="$(llvm-config --cxxflags) -fPIC ${CXXFLAGS}"
+	export LDFLAGS="$(llvm-config --ldflags) ${LDFLAGS}"
+
+	local files=( ffi/*.cpp )
+	emake -f - <<EOF
+ffi/libllvmlite.so: ${files[*]/.cpp/.o}
+	\$(CXX) -shared \$(CXXFLAGS) \$(LDFLAGS) -o \$@ \$^ \$(LDLIBS)
+EOF
+
+	export LLVMLITE_SKIP_LLVM_VERSION_CHECK=1
+}
+
+python_test() {
+	"${EPYTHON}" runtests.py -v || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/lmfit/Manifest b/dev-python/lmfit/Manifest
index 75fa020a4fc9..d39b36e86bf0 100644
--- a/dev-python/lmfit/Manifest
+++ b/dev-python/lmfit/Manifest
@@ -1,3 +1,3 @@
 DIST lmfit-1.0.1.tar.gz 258368 BLAKE2B bd2956cb9519f9303d0d2707b0333839ce471f62f53c907870bb6b8ab867cbcd1581d82a1959a6c3c734bd6b8074a769f0587706b3172800cbdef979db3a148d SHA512 1ae3e2cb25625a9b24c261d81c8f1ba0389266724581762f6e0a96140c84e43acd527ab1b83b862bf7b3b4c0b1b9755ee38d0c52e63fe89ea41f2d010b1e5c0d
 EBUILD lmfit-1.0.1.ebuild 678 BLAKE2B 53d04290468c205d7ada1108e1d278694444be1a75fba39ef48753b8eb897d469d2cc9c09c34327f348e26439647168fba5dd5d948f0c47529d5773ee366ad6d SHA512 0a90ac6c188fcc6e8c90f34833a86eba5eb82eed8494825985db4e32ab08b1fc68108ce26db6368c036366294d3f5c04c24d65e58dc9226a3475025f596f1446
-MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
+MISC metadata.xml 284 BLAKE2B e4fdd5384c149d5805aa66db2ee08b98575d7a49c303879a347a7b43f2dcc938f05c228ab68586988ee226e49fc7babdbf7ef6295dcd59b5d9ad78761b750f4e SHA512 33ba33822f91ac037549650f0d044528dbb694d74bf229b6aa5a1f4fcac552affb3ed2860b8279dca83c6ed8bc1ad7193513450b91ec0f8d10a4d1ee12aa3196
diff --git a/dev-python/lmfit/metadata.xml b/dev-python/lmfit/metadata.xml
index 020b40648ee8..3b1d3048e0a5 100644
--- a/dev-python/lmfit/metadata.xml
+++ b/dev-python/lmfit/metadata.xml
@@ -4,4 +4,7 @@
 	<maintainer type="person">
 		<email>pacho@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">lmfit</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/logbook/Manifest b/dev-python/logbook/Manifest
index f7218fd072cc..8d178b3cc06c 100644
--- a/dev-python/logbook/Manifest
+++ b/dev-python/logbook/Manifest
@@ -1,3 +1,3 @@
 DIST logbook-1.5.3.tar.gz 371901 BLAKE2B e37924e06613ccf27380004b159966b7b42ec7b766afb6904751eafb3d774c5a9994b9d63f834fbe949fe345953c0da4693e093d717b589046412bd4056322bf SHA512 c9068324f12a189ced98e2c02753489847fa533ce3a3af07b62c73e9959c2e014d47515d47e756d031639cb220a2c4a9a380cba4cb3ea1b190c50106decba686
 EBUILD logbook-1.5.3.ebuild 1069 BLAKE2B 092ffbc85d696fe4cfb38cf5279b4d734df1744a67e2b1b5bbb122900d45ed4985b8f2157a40afc4f2c0623df3fe28b9013c9f2f776ddede847138e6925d3f3e SHA512 793bb1593bca3d6d4e1683a35da9e8c05d093418ff73d22be3b357aa31525763c6f9c0adc1bef32643540d92be4702714f5ec37324bead4c591365db3d2f43ae
-MISC metadata.xml 505 BLAKE2B d59b5ef93abf0902c8e9da54d7d2637e79f3e1c5d60ad2db60feaae4133e54a989a8c4b9cdffa51f36cb504385a80e1cfdcf69158f1e4ced2a3904ac85be6b06 SHA512 badf998d9f9d7096563ff3dd2246020a1c7dae59ffe8a62c532703107fe38b866d418f9eada3416300b5474e756ca5982157b62bcc7c493119fa7bb6cbca752f
+MISC metadata.xml 488 BLAKE2B 4546c024069f161d3d4e0a7f110255ddf8ca0bba8b6bfa2b13f5b8180a0fc750347448736edfee66b04a4c3e714037e137a1d7110338cb4d2d5302cd929fe467 SHA512 bca11f6fcacdd0bd1cb3a39457a1bca71761cd08c3295b8598b5e16cf900705bf2ec917dad3d6ccd78f1fd58c736d813edb12a6e1779dcff2a57868b4aa2f2d2
diff --git a/dev-python/logbook/metadata.xml b/dev-python/logbook/metadata.xml
index 8490647c2fb9..afcd9f5e9ebe 100644
--- a/dev-python/logbook/metadata.xml
+++ b/dev-python/logbook/metadata.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>a.zuber@gmx.ch</email>
-    <name>Andreas Zuber</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">Logbook</remote-id>
-    <remote-id type="github">mitsuhiko/logbook</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>a.zuber@gmx.ch</email>
+		<name>Andreas Zuber</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">Logbook</remote-id>
+		<remote-id type="github">getlogbook/logbook</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/loky/Manifest b/dev-python/loky/Manifest
index d7665048cc7f..a711809991ba 100644
--- a/dev-python/loky/Manifest
+++ b/dev-python/loky/Manifest
@@ -1,3 +1,3 @@
 DIST loky-2.9.0.tar.gz 115019 BLAKE2B 2aa2042e32821b67db8b8de12d4b380d22af93d308bb35878271a4859325d6740a3bdab70b464a2c0d0af143903c8af3da81b4b804605cdae88779fefd7971a6 SHA512 d49354b834251f6f05a689ac44464aafa5a7a5b4a8ef84a308ec3bda138e810fc3dc31aa628307984dc69386a210f442d4c202b9499ae3e3864837b47a5b0cd9
 EBUILD loky-2.9.0.ebuild 869 BLAKE2B e393af893d7dcb07d18d362326dab66b2ecac7d97fda6d14879a378649a689b7f2ac9f139a71605592d6391d0b0c4b7b073ef3ba3c536da6f3aeea2e1ca11776 SHA512 7ba50004fff3e0c1c49ee3a9997b66734048ea156eb2ba738c56f8658284b6e5377876ce22ce397b6422501a5153176fe1fc09f6df332222e5fb7879cace5b7b
-MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
+MISC metadata.xml 285 BLAKE2B 0a3a6c5d0dd5f4ba9ee472ae8d58d5ccc0c0a4677793e1b0350193fce534d96513ce5b16610e90ba5f8cd3cb71e03db6c45566e1d55ebc5fb52bf6f30b740d66 SHA512 ab759fe515785fa9dfc92ed5e3e71e67b32eea0f7c1d0ad7165bc41713e8345ddc04549bb771dd92973365ceb53b4465fdbad914b4d1f7f76232e278edec2577
diff --git a/dev-python/loky/metadata.xml b/dev-python/loky/metadata.xml
index 266e3f19ca59..d826a22b20c5 100644
--- a/dev-python/loky/metadata.xml
+++ b/dev-python/loky/metadata.xml
@@ -4,4 +4,7 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">loky</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/lunr/Manifest b/dev-python/lunr/Manifest
index 7cad55d26c3c..8f91f7ca69f2 100644
--- a/dev-python/lunr/Manifest
+++ b/dev-python/lunr/Manifest
@@ -1,3 +1,5 @@
 DIST lunr-0.5.6.tar.gz 43815 BLAKE2B 0d68dc098a71c1fdaaddee80605fc63a0d30492b6e329cd8f963dc740bc40fc79959bf20b159af6b88c4eb2736db6793c6fea5b74968f74923741f220a372a89 SHA512 48167c90ac1351fd3aeaefbead752d8b96b941e79edb33a4232ac588a2fa54775972c883564ea23e3d58f3f5a94ee448c27049f4410016032f5a8f36aa4c6709
+DIST lunr-0.5.8.tar.gz 834919 BLAKE2B 970cc12fb30bc849d4ef846818f93fa7b7701b1155c9b7880f3a63384a8f353c760be5dc6c37188db656e7424715aa854f20615ae652b0a5c9e656871be490af SHA512 90c279b9e91744f19c4a155947526bff749aee5d727bc38cc36ee05228a6624419a54bef4214e8195a69abcf1a5b40b29c4fa8b14bece0befbde02d13af969ac
 EBUILD lunr-0.5.6.ebuild 875 BLAKE2B a551c6710b019444bc2c09e6afd5fd32a787b4d1f39e33ca59b63790f1bfd6db465073efe26b59653ee6bdd16ad3688d5f609df881dde1f5f85f80c9da234d8d SHA512 60e37e211f31fc8009d2539bb49e4236797fa2170386eaa9806306baa2b516db9e9eb2e2392beb55d8104fce3e126e2b49d074bff001bc43f8eff6ce9ce4309b
-MISC metadata.xml 465 BLAKE2B c5c9dce51449ae6c628969c4536a7ea37677438224c4812dc4162d7f8ee59d7505e0d8bcea05db1c4dddf0b5bc675246d500ba5f06bbecb779294cb1b8b83dd7 SHA512 4daacb3b576db362b14af380cb1b4616ef8a6aa206a539533d8119431c66e7f566a8f1678d3744d8644a0db8c2b047bfbf68729c1520683d167224725e0f5d52
+EBUILD lunr-0.5.8.ebuild 1063 BLAKE2B 00306b0652d883befd55bf11ba4336a6dcb5577639a1d3c50739728930b7c1603fc9fe3fb170ec7c91ed684556b67bcebc9ad3eac8a9b1e54739cbf46f0b9c07 SHA512 7de1832c9280a3420e9802f112894cb5bef765199b1cf053e54559d5cd65ac6be8baaa2ce6449135a7c369773786858fda92b6d970ce75b27684896c7fcbf079
+MISC metadata.xml 507 BLAKE2B f5dde74aaee3f47e370ee15e48d9f81ff209cb4639ea7805bda73176c649f70f6f468018765eb561a19c9b9d5e67f802196df3361d96a380dea4e30652b4d47e SHA512 bbfb375a50de20a953e4792d440a5fd6e5b972f1feb1522d993a3eed74a16c06758420ba90a274dcce74fa4b31be04aa07aa931f8d6654d97ad8060114d21bdb
diff --git a/dev-python/lunr/lunr-0.5.8.ebuild b/dev-python/lunr/lunr-0.5.8.ebuild
new file mode 100644
index 000000000000..36c77dcb3bf7
--- /dev/null
+++ b/dev-python/lunr/lunr-0.5.8.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DOCS_BUILDER="mkdocs"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="A Python implementation of Lunr.js"
+HOMEPAGE="https://github.com/yeraydiazdiaz/lunr.py"
+SRC_URI="https://github.com/yeraydiazdiaz/lunr.py/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/future[${PYTHON_USEDEP}]
+	dev-python/nltk[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+BDEPEND="test? (
+	dev-python/mock[${PYTHON_USEDEP}]
+)"
+
+S="${WORKDIR}/${PN}.py-${PV}"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Tests in this subdir all fail
+	# Command '['node', '/var/tmp/portage/dev-python/lunr-0.5.8/work/lunr.py-0.5.8/tests/acceptance_tests/javascript/mkdocs_load_serialized_index_and_search.js', '/var/tmp/portage/dev-python/lunr-0.5.8/temp/tmpldbff36d', 'plugins']' returned non-zero exit status 1.
+	rm -r tests/acceptance_tests || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/lunr/metadata.xml b/dev-python/lunr/metadata.xml
index 5a0914daffe9..749310d9a909 100644
--- a/dev-python/lunr/metadata.xml
+++ b/dev-python/lunr/metadata.xml
@@ -11,5 +11,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">lepture/python-livereload</remote-id>
+		<remote-id type="pypi">lunr</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index 0215bbd70c04..b433c2427ea4 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -2,5 +2,5 @@ AUX lxml-4.6.0-tests-pypy.patch 17417 BLAKE2B fb4c8452f1401c5d617ebbb3a944772c4d
 DIST lxml-4.6.1.tar.gz 946461 BLAKE2B b1ea8e15af1130b9f9683614bbc2480ec5008ad697f70536a332c1faf4bda4aa9525b2ef5d82d32c415c91e47ab54c7b3cb644e9a2933517946c3fc8ab7ec7c5 SHA512 3cc917e7535ac1be3db8939f72846313267c8b1f0adccc92a2155a160ed7299d0def718bdae1379e42398ca1b959b1130505597febca00f02cb87c8666f1f1c3
 DIST lxml-4.6.2.tar.gz 948652 BLAKE2B df6ec7e183df48c0edc6cce0fbdd6ab78eb8d1b7e8fb81a76bd9f4a24f05923c757d5b21f508be9be50c7bb187927c4e3a66146d480f2d40efc05388d26d3bf5 SHA512 81dcf5cade7b05c0e831beae7cdfbdb21e876fa55b23da98b89cbfa7960a4737efc13346ea3ade22a2448f20e036173cf5e32d43df6656c3231bfba07981f9ed
 EBUILD lxml-4.6.1.ebuild 2237 BLAKE2B fb05a57bbe17e7fa4f6f0e0aeb666ceadf4cbc3654ef331f3548cc5916900a3692d3eb748a0284ab053d91e6691a568d703b96c9a446b035413d617b9bc6608a SHA512 5bb200f0e1759dd660fe9fed714add77fef4c883eb804f40b0fd623f3c2de5d394b0dded79f39a78f5942872a1168cceda43690635cd764317eda196deec8fb6
-EBUILD lxml-4.6.2.ebuild 2245 BLAKE2B a6ca94023865cf68cc0153d97be94a03ba48f2f52d844eb2909cefc4e5e7ee0636bf98c2fa26c11bc3747d3ba6d48daadf27fb743c3eab8389de9e8c9dc8e061 SHA512 4d9b2d797538f11f663fdadb20d98c13e243e81fafdf3cef39ac49c9c6fdcf10a8095be351014ffc29303dcd3d8f67cbf3f36bf4b75817f2a3402c1544019ae4
-MISC metadata.xml 317 BLAKE2B ba93bbba5105423b6640b86b29f2a54ff50c9daf42424915cfe25049e983ca03c6f2fc066d4e27fe42292e8290b7091bc00d5a40f49d368a3dd6acce42c4504e SHA512 900609bfd7cd032821afb5d1f6e5c25287178f06a49e59431a710d4e76187a2b41a4a0da383d257777a2120b60f15620da37c70d145eca4a84aa30a08b824fae
+EBUILD lxml-4.6.2.ebuild 2237 BLAKE2B fb05a57bbe17e7fa4f6f0e0aeb666ceadf4cbc3654ef331f3548cc5916900a3692d3eb748a0284ab053d91e6691a568d703b96c9a446b035413d617b9bc6608a SHA512 5bb200f0e1759dd660fe9fed714add77fef4c883eb804f40b0fd623f3c2de5d394b0dded79f39a78f5942872a1168cceda43690635cd764317eda196deec8fb6
+MISC metadata.xml 356 BLAKE2B 2fec6d393695217c863df74503bb69c58a24e9fe8bee31f68ae9f4bf5bc290fce6fdb80389f2694f4b94f9b8c4fba6c5c90faf2a68cae21a01b105c5a99c9640 SHA512 36358d7b4791b190fd5e168aac89cb32581e056b417ecfdd04c3e9b83a9c90f2ae3ab89d2a671f2a5c09f39198264ee9c59f3fb587dc907185dcfa376fbea04f
diff --git a/dev-python/lxml/lxml-4.6.2.ebuild b/dev-python/lxml/lxml-4.6.2.ebuild
index 1a7bf27b9c58..80462dacdab2 100644
--- a/dev-python/lxml/lxml-4.6.2.ebuild
+++ b/dev-python/lxml/lxml-4.6.2.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/lxml-${P}
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 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 ~sparc-solaris ~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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples +threads test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/lxml/metadata.xml b/dev-python/lxml/metadata.xml
index ed72c69d7530..d041f72bd36a 100644
--- a/dev-python/lxml/metadata.xml
+++ b/dev-python/lxml/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">lxml</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">lxml</remote-id>
+		<remote-id type="github">lxml/lxml</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/lz4/Manifest b/dev-python/lz4/Manifest
index 9c963c240f86..33df17b5eb87 100644
--- a/dev-python/lz4/Manifest
+++ b/dev-python/lz4/Manifest
@@ -3,4 +3,4 @@ DIST lz4-3.0.2.tar.gz 152443 BLAKE2B 3bf452b5b5ee65caed13b21fd7c39f32ccdea18e6d9
 DIST lz4-3.1.1.tar.gz 154325 BLAKE2B 2d40728087aea735aeac4d39c415edf94f9aca83c77e4a36fe53f6f32f6c1595c0b1ad97c11f6e58cacafb95e0e12d29336d9f072d4f0d47f2d522f552a368bf SHA512 b6ddcabcb323b88eeff1fa9cb91d379d6435ab51b2b51e080138892fbce57d92c8175e2ae1ef72e8a2f95429aaa4be66a5e8cd9d4dbc5bcd6b44ec26b7df96db
 EBUILD lz4-3.0.2.ebuild 768 BLAKE2B 240a49f561a7eaeb2cf9ab75c39e58b3d3750f0e1f99619f0dfa91decfc69dead74461f3e514f0b4fff2343351aec04251c610b17d65d503f21a125372743942 SHA512 645e3a986abc2a5a4587365dd3a0f2cc379bb06e63e6c3ec2bc7aade8e2f57779e9478ae9ec820e4b8f7822c707aa788831147fae95087f326f05e02a7bafdec
 EBUILD lz4-3.1.1.ebuild 773 BLAKE2B 707ba911be1bb5efaa9ba7e2968cc3b1038d11a5ea5af1143f30886958795a589ce81cc5b849de7af8dbe60beb84d9cbf8bf25f15aeb2a4707cec4cd0cdba842 SHA512 03fb2d9f98901a8faf4f87f6a6b6cb3a2c806545557a8bc3f056109d24c23989193045d3451c745f158dfd4def2edbc563d33c8c6f9b077d061a64d3e0860b42
-MISC metadata.xml 465 BLAKE2B 3eeb9b063e836d19b4ebfed81a89895f9d4e650b1788ca602f77f4cf3b5ad94cd6af93788293b9656baac1bce29a90a957c8d4afd02ee25b2aae42aefe211a37 SHA512 e5f75916075710426f9a7b875aaeb1239b948f11ac97a8d8bc45032d99985d6659916cd3c126bd37fb0fa53c97cca5b4eeeb4228180633809edc01af3b89ad91
+MISC metadata.xml 453 BLAKE2B 50a9701ace3633dbd38132d90aa352056bd40a14f04ba2e38f5ee644a15d1f0df3d1b8289b060b5778fcdd865189b76767e445b9e4c204acaa3684b7ef165e5f SHA512 7945fb025f4da1ff27cdb803bbdf5c6ba005a66def1b80ac35c5676ef7310c1764524f97b0de7177679f8ca41627c0955f172ab1e4594122e1d6e4338fcc3c3e
diff --git a/dev-python/lz4/metadata.xml b/dev-python/lz4/metadata.xml
index 503d76895130..8ec21efc87d1 100644
--- a/dev-python/lz4/metadata.xml
+++ b/dev-python/lz4/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>prometheanfire@gentoo.org</email>
-  </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">lz4</remote-id>
-    <remote-id type="github">steeve/python-lz4</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">lz4</remote-id>
+		<remote-id type="github">python-lz4/python-lz4</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/m2crypto/Manifest b/dev-python/m2crypto/Manifest
index 50b0380908c0..e6be9d0bf772 100644
--- a/dev-python/m2crypto/Manifest
+++ b/dev-python/m2crypto/Manifest
@@ -1,6 +1,8 @@
 AUX m2crypto-libressl-0.31.0.patch 8211 BLAKE2B dc36c1e77f6fa9f260d465c0e61168a9ddd82f382c46f31c06a3ef5972cbbe225f665eac17999f7c8a0b74e1702f82451fed5a39691577b050f477bbf7a2ee2e SHA512 ea100feabae82cf1c1237f55354847935a9c49e05c780e01d8fef959d2a10abc4b9f14c56ea50cba68ff59eb67c3cf5136ff92e9dc456960327e0c582b55720d
 DIST M2Crypto-0.35.2.tar.gz 1117706 BLAKE2B efa15e023be7755b94c642bb23eade912edcbbb76bcdfed3414d27937cd705ec4c83069ca620fe20e58e126549ba7f98e84f6f8330b78133a8a8b953d18f467b SHA512 3608b29a8e7d0732a2359e35fcaae191447aa7c0211ca3d057eed6cee7f0819f5c1121e7d41caca8cdea3c7911f8c447ee475b1b3d125e8dc3adde2718a59f36
 DIST M2Crypto-0.36.0.tar.gz 1127584 BLAKE2B 5cdbbb11ff67d4ddffb2853a72383f3c7f1e1aa53ab84166aeda4fbea1b0d7f506761bb07bf8cb5b36f94bdbeb2ea2b46e0693da8355f81b4bf5c4c1c1cc18b1 SHA512 5b7d6d10c943ff0e09e0e9748d5578e7e0f7659a73de4ba49481152bca05871aef2bfbb869e1636a7cebcf2dd8b9f67fb0d299a833d1d4ebd538031c35d7bca1
+DIST M2Crypto-0.37.1.tar.gz 1247031 BLAKE2B 3628150b8da15d7356298b6e52e0d8fa7875921a184a0eba3a97eff0588c9e0fee340c92fd486919057d900d6e3b2b711174dde9761fe247848f92ac6434df0a SHA512 9a5e0220704b4897a9ca7efa4b3b57447b9175c52e8039a85bff7bb1a43b709c69f3c8b5903df461f8de39d3f8a20f9bf494df6f5882771846adfe2c03fbea9e
 EBUILD m2crypto-0.35.2-r1.ebuild 1423 BLAKE2B 92478c705a27ff450272dcda5111f612fe0bc5c096d0059859d1e5b3ab349a70f8f39c150658fec1d2c02e7aaac1dff95f2af77b190c790d02b222187334a9ea SHA512 54dff1c9e7ee5320f6a4c6f527db81135af475425c70c71516fa96589cb8ea6dc6e43df3a6f46d325adeb15619ed71c448545ab1ad6fee8edb6f7401dc0830b5
 EBUILD m2crypto-0.36.0-r1.ebuild 1553 BLAKE2B 0658aca2425aaffd659237def2152368c775ff72d94db787cdc687a6de90368445407267cdcb23db3e4d0dd323e556f7d2e5205f8d37827e0297384b2ebe758b SHA512 491c04ef3f8bef87a6e7be22af4a45e30ba726c97a46e4e2d17a344d930cda747e40a15517901389061e69131581cba039300552af4cffdaa5cbf3ca70b527ad
+EBUILD m2crypto-0.37.1.ebuild 1535 BLAKE2B 28a6c7f03d916220278f27330bfc737917e354711ee83d74af1725322bfb3c0ce5365460cf1fe3b16086024dab50d0180e583c60fad30224852748d1356d83cd SHA512 75f9c878ca42f19f6ffeb9720ed01983be399167e3a5f2684d166337bfed4c505014887f286068643b09d47eb1691a60c89e85d21040982d28be33b96dd1a020
 MISC metadata.xml 380 BLAKE2B 99a1c8e8202bed7c6d0ff8cdff3f17b664791405b082be2b7d72b3fe2b77bf89c886666d9bdce6a96c540b9518042b9d49b9af926ca10ab4c5b3b416182de01c SHA512 f2e3b4228c45471f0132b3bb412f017f4006eb82bd63e187db3efdfd3f412c1db19bdb79d37630bb059f75ef69f110687b8924d22c2aef0101cb40eb3486f1e6
diff --git a/dev-python/m2crypto/m2crypto-0.37.1.ebuild b/dev-python/m2crypto/m2crypto-0.37.1.ebuild
new file mode 100644
index 000000000000..3b64631d0aa1
--- /dev/null
+++ b/dev-python/m2crypto/m2crypto-0.37.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 2018-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 toolchain-funcs
+
+MY_PN="M2Crypto"
+DESCRIPTION="A Python crypto and SSL toolkit"
+HOMEPAGE="https://gitlab.com/m2crypto/m2crypto https://pypi.org/project/M2Crypto/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="libressl test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	>=dev-lang/swig-2.0.9
+	test? ( dev-python/parameterized[${PYTHON_USEDEP}] )
+"
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-libressl-0.31.0.patch"
+)
+
+swig_define() {
+	local x
+	for x; do
+		if tc-cpp-is-true "defined(${x})"; then
+			SWIG_FEATURES+=" -D${x}"
+		fi
+	done
+}
+
+src_prepare() {
+	# TODO
+	sed -e 's:test_server_simple_timeouts:_&:' \
+		-i tests/test_ssl.py || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	# setup.py looks at platform.machine() to determine swig options.
+	# For exotic ABIs, we need to give swig a hint.
+	local -x SWIG_FEATURES=
+
+	# https://bugs.gentoo.org/617946
+	swig_define __ILP32__
+
+	# https://bugs.gentoo.org/674112
+	swig_define __ARM_PCS_VFP
+
+	distutils-r1_python_compile --openssl="${ESYSROOT}"/usr
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/mako/Manifest b/dev-python/mako/Manifest
index bd436e39cea1..b7f5daf19d38 100644
--- a/dev-python/mako/Manifest
+++ b/dev-python/mako/Manifest
@@ -1,4 +1,4 @@
 AUX mako-1.1.1-pypy3-test.patch 822 BLAKE2B a6c66e8ff7f430c005843dbdcdb874b520de0ef0b727415745a53bc153e87632be39257124b5640c6e22cee8cca40c2e6dd059302adad9089a40bdac6224be61 SHA512 60eae74863f44c50f45b51519dc887eb60f45708fb2cb272e64b82938b00c3ce3f53933066a56e3385930654ea2295c78aee5cbe82a51c7e2001c8d5e6a54da9
 DIST Mako-1.1.3.tar.gz 477440 BLAKE2B ffa148815d64f1fbfac0291e6afdbcf967d7445e13f364e1e2a492330ad1cd71a788255776e07bbec95877f65440073ec873b035d6f6fc1293a299b0478524a3 SHA512 a9b94fa34a61e7794b6e4549fa0bada6ff84dfb0d9edb8d5c7f9b95d12184fa4499f42303cfee720b576a9f7e986a57d91ad3aeb26c9f93154dbc08fb2975952
-EBUILD mako-1.1.3-r1.ebuild 1102 BLAKE2B 57832cbd95c5df2621c6ac16b1e0615c52bd1f5826bbffec41b3bd6a4f6d0f210a521fda567a22f51b83e6650ee21f1459b5c961c5781ee40c48fac17dfea6cf SHA512 2e78728ac0c31dbd3d35864fb0fb78833150853a098a1a22b6851cfc41a16c96b2eec386fa44519dc3b823c6b4aa42ea1f72a0bdf4b36df3dd6625414dd5f658
-MISC metadata.xml 464 BLAKE2B aa08f15bb15d98ba21a42c4cddab014f83b701ada29a2e8f9e445e4055885da957d2029189c895630d914ae0de040a47fc6e088a04c2a33fd47b92d1e564776a SHA512 dbd099adfc1137934764551e38ae97b9a5a32473f86402375e70fb638131e748392f7e0a3397ee7850de3142fb840160269f24be53ab4f532490869397952279
+EBUILD mako-1.1.3-r1.ebuild 1109 BLAKE2B 41ca7c3df8ca9610fe65302e3d1d23a19add5f7634c18b43707840f8fcc371e610da271f01b14ea8509132b7a8921d4a5dca15a9a655efe11bb9cb70fdd6da97 SHA512 889669a72a631015b058c58ac34fad1388eb5a60ff49c5d5cc06549fc488fab885ab4654a1ef4004baf869faf23e91d138e66686ac86b72b4b653b4be4262549
+MISC metadata.xml 449 BLAKE2B 335ad5322f8e6b149cdc07c161bae35957f1d387ad0ab1ae4563ed1896211aa2889e9b285d8209b57397da95b5791d526d71f0eb1cc768c3ceee4be5af84ba6d SHA512 94e6ec358a7de187702ffc41becb7792714498195c6a384d5debf10186af534506955d5575a68442de0e41140800fb134c128e22ac919dcd40b8b11ce2a3da26
diff --git a/dev-python/mako/mako-1.1.3-r1.ebuild b/dev-python/mako/mako-1.1.3-r1.ebuild
index 57d49ddcdad7..14f55ae24402 100644
--- a/dev-python/mako/mako-1.1.3-r1.ebuild
+++ b/dev-python/mako/mako-1.1.3-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="doc"
 
 RDEPEND=">=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]"
diff --git a/dev-python/mako/metadata.xml b/dev-python/mako/metadata.xml
index cadb6a16b5ab..28fadba7c330 100644
--- a/dev-python/mako/metadata.xml
+++ b/dev-python/mako/metadata.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="pypi">mako</remote-id>
-    <remote-id type="github">sqlalchemy/mako</remote-id>
-    <bugs-to>https://github.com/sqlalchemy/mako/issues</bugs-to>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">Mako</remote-id>
+		<remote-id type="github">sqlalchemy/mako</remote-id>
+		<bugs-to>https://github.com/sqlalchemy/mako/issues</bugs-to>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/mando/Manifest b/dev-python/mando/Manifest
index 9a92ee13f769..60d585e1176f 100644
--- a/dev-python/mando/Manifest
+++ b/dev-python/mando/Manifest
@@ -1,3 +1,3 @@
 DIST mando-0.6.4.tar.gz 36560 BLAKE2B 9878746485d4b896c3e32512b77ac02739940a1398eee12056fd6719cc3c99f8c526c8e573d2556b6a9d0d8d26e20fb45c97119e626b1d44f0a5b5f4655adba1 SHA512 457fa0db4e8e5dbfac6146d254181213814ef1975c919b4573007face27749ec3a50eda850558ebdc0fdff94a5e9819fd825b10cb3023078b2b426c2825fdbf0
-EBUILD mando-0.6.4.ebuild 1075 BLAKE2B 10bef0608169294ecb7b4a401ee4e3d717190be854cb1889f4dfad437bdb88d7bad7455d30e3d56a398b0d3aa7264e4b8f0795a62be75fdd9671a8991297c893 SHA512 020a6b52299fd794490f87c77c8dc3b4c224c1079c5efb04cc73bee5cb9c047854b3def8c03a3c477afd74bbc4610ed5a4d2b3252b0ac883c41192c0b1aabaa0
-MISC metadata.xml 241 BLAKE2B cbc5b40c8cc94046b0c3f22ff09d1d4808cbb26026213495d792da8c605df005a5670fd55586aee9ec26e66862695768683dce22127e5af344ea529302b4cd31 SHA512 3ac90d64a94a1c32453b3fe9e3fbde47602aa1257f1a15bb08e8d5c1abf779eef08378376ab4910904a672fc66b1b36f781f1ab144eea0be3c1d36f35ea6337c
+EBUILD mando-0.6.4.ebuild 1075 BLAKE2B 9810d337d4ea58c67e38832a49db992c06de08fa5a9d19485180be8b57a03032e54b043e22b819b6a9ea101ccc7b2e27e4e6694cbfcd2253f5f11de650786b22 SHA512 6fd1984ac48b2de3ab536441117c69325b8c5e992acc79b9685777697fbb17d71c425d59f5f38e4f92cfb43aba86624093cb7e1f27b0634c6dd864885d638430
+MISC metadata.xml 284 BLAKE2B 2ac79590ac3d86444a048221b350828e6b8ab5c575144eb2bdd5aaa9838b10d5bdb9fc1ff94df85b0912ed1e540185e1f232ad329768470fa544178cd0fccc15 SHA512 5dea54f42d9854c6e4ef70112a31c073e18ccc6af76ba95bfd72cd370e2bc720b564935abfd73c8d3c743361f824a608ba99bf848ed8da222cfaf83076403e8a
diff --git a/dev-python/mando/mando-0.6.4.ebuild b/dev-python/mando/mando-0.6.4.ebuild
index 6beb7fda2860..bb31bb9e4bd4 100644
--- a/dev-python/mando/mando-0.6.4.ebuild
+++ b/dev-python/mando/mando-0.6.4.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="Create Python CLI apps with little to no effort at all!"
-HOMEPAGE="https://mando.readthedocs.org/ https://github.com/rubik/mando"
+HOMEPAGE="https://mando.readthedocs.io/ https://github.com/rubik/mando/"
 SRC_URI="https://github.com/rubik/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/mando/metadata.xml b/dev-python/mando/metadata.xml
index 90a9955a56b1..ca797ab51e36 100644
--- a/dev-python/mando/metadata.xml
+++ b/dev-python/mando/metadata.xml
@@ -4,5 +4,6 @@
 	<!--maintainer-needed-->
 	<upstream>
 		<remote-id type="github">rubik/mando</remote-id>
+		<remote-id type="pypi">mando</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/markdown/Manifest b/dev-python/markdown/Manifest
index 521ca830a383..7a07322e5ad9 100644
--- a/dev-python/markdown/Manifest
+++ b/dev-python/markdown/Manifest
@@ -1,6 +1,5 @@
-AUX markdown-3.3-pygments-2.7.patch 4422 BLAKE2B cdc9c1520ae780299cdcbef675e12009bcd9626b306cfc49800df5998e8ddf90c354316c540c5a72d88f3c9b67c7bf58c81fdf850f841b34483a71de51f39779 SHA512 853431ab2f16ec89178008f8be4fc87e1da584283ac9ec9e0930140d10883e4f5d1a6f6c5c0da86759a404dc10e003076c06518e0ee3ec3bae51d228b9dde95b
 DIST Markdown-2.6.11.tar.gz 274132 BLAKE2B 0d14d308c97d925db83d71f3b9be5622e77ee4a159fced15c811390b39950e81bff9ffc567f32e878cbc44014640ab0a2f596258cfd0dce6b66029105cec7370 SHA512 4e7dd3e04f181fa2751a359aede301fb29a23b9af74867ff9d1d0fdd051dcd16d04a5891e37aff0b309649c5fd13363802ec7e10fc33896e9453991efcab4a66
 DIST Markdown-3.3.3.tar.gz 319531 BLAKE2B b7a527a7d202ee955106ecddb75541285589cb006a0cb3e587f06bb06aa3be8bdf8e976a35cc2ca63b2f085a8b462f8e8d5fad84710561dc105e533939c04204 SHA512 b8e42c1471d155be6cc9aa0b6ce649454b09d36df1de51ef7e45043ae3c1c87b9b09e1fae4c680a771bee52e7fa8ea82548b78b2ffb1d38e85785f0b0de25b36
 EBUILD markdown-2.6.11.ebuild 843 BLAKE2B 0152b3a4257139792a50a10fe8835d4b4b21bf3d452d9ade9d9094ad830fa4dea59f9e519297449aa5e42911ad219efcbce7f8bb08cd7fab717edd951fdf36b5 SHA512 3221f6253071760598e33c5c2483361308dd424e7504e05ebadd84be18fa789407d841a66e4aca3001a5a14c13d50395487e1ed646db397140cc703d0c8fdc61
 EBUILD markdown-3.3.3.ebuild 1086 BLAKE2B f854426f76d902c398021367f4322663cdd4d036f22a77dbc19487aff451925d701c203f3bea1bbc2ed281dba2c7b5919bd3e5ee6a0eed5505cb93b1f6a7ed77 SHA512 07be66953a44d4483c1e707f29964280a5026d85c0834a60e6c1b28d4a13a2ce982c739ad2cea9fa83c1fe9ef8b15c8067480657a1783c2a4e7c53f834ef4d58
-MISC metadata.xml 410 BLAKE2B 933baa8eaf3a60970578ffa8490985e509403b0bc63e99e72da94e2bfc77f821c0df57b8d957a0a3dd1e0c521091aa6f63990a0a8023f04e85faeb8a8f3ae9de SHA512 a4cab000bc793355213d53d84ecb541001afa1b91b0f284d8083c2ac9218e12e7bd01f3eb39768a97cc7e8f214aeccfb9b3227eb8bd12c8649873028da629fe1
+MISC metadata.xml 399 BLAKE2B 675bf8fa68dad4dc02b4572a74a7e4cd8c7876a78d7a9769b118551ae2f4217028a67f1d206537a08d2b0e26763ef0d396b007d0ca86b498397b6aec5d516435 SHA512 713fe9c2390fc8726140a5981c63bfd901e9288fac25b3b9aa5b7d6a1d5502334df09d4b9f57a1d0f4766ce6e2c36695161ddb796c1263bc090940f99bc1d689
diff --git a/dev-python/markdown/files/markdown-3.3-pygments-2.7.patch b/dev-python/markdown/files/markdown-3.3-pygments-2.7.patch
deleted file mode 100644
index be94fe028755..000000000000
--- a/dev-python/markdown/files/markdown-3.3-pygments-2.7.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From c2904eac1a6daf8a3aaef6af0791b101e1971544 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 7 Oct 2020 15:01:07 +0200
-Subject: [PATCH] Update tests for pygments-2.7.1
-
-Closes #1030
----
- .../extensions/test_code_hilite.py            | 22 +++++++++----------
- .../extensions/test_fenced_code.py            |  2 +-
- tox.ini                                       |  2 +-
- 3 files changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/tests/test_syntax/extensions/test_code_hilite.py b/tests/test_syntax/extensions/test_code_hilite.py
-index 8d5512d..3e36ae5 100644
---- a/tests/test_syntax/extensions/test_code_hilite.py
-+++ b/tests/test_syntax/extensions/test_code_hilite.py
-@@ -205,7 +205,7 @@ class TestCodeHiliteClass(TestCase):
-     def test_codehilite_linenos_inline(self):
-         if has_pygments:
-             expected = (
--                '<div class="codehilite"><pre><span></span><code><span class="lineno">1 </span>plain text\n'
-+                '<div class="codehilite"><pre><span></span><code><span class="linenos">1</span>plain text\n'
-                 '</code></pre></div>'
-             )
-         else:
-@@ -259,7 +259,7 @@ class TestCodeHiliteClass(TestCase):
-     def test_codehilite_linenostart(self):
-         if has_pygments:
-             expected = (
--                '<div class="codehilite"><pre><span></span><code><span class="lineno">42 </span>plain text\n'
-+                '<div class="codehilite"><pre><span></span><code><span class="linenos">42</span>plain text\n'
-                 '</code></pre></div>'
-             )
-         else:
-@@ -274,9 +274,9 @@ class TestCodeHiliteClass(TestCase):
-         if has_pygments:
-             expected = (
-                 '<div class="codehilite"><pre><span></span><code>'
--                '<span class="lineno">1 </span><span class="hll">line 1\n'
--                '</span><span class="lineno">2 </span>line 2\n'
--                '<span class="lineno">3 </span><span class="hll">line 3\n'
-+                '<span class="linenos">1</span><span class="hll">line 1\n'
-+                '</span><span class="linenos">2</span>line 2\n'
-+                '<span class="linenos">3</span><span class="hll">line 3\n'
-                 '</span></code></pre></div>'
-             )
-         else:
-@@ -291,9 +291,9 @@ class TestCodeHiliteClass(TestCase):
-     def test_codehilite_linenos_linenostep(self):
-         if has_pygments:
-             expected = (
--                '<div class="codehilite"><pre><span></span><code><span class="lineno">  </span>line 1\n'
--                '<span class="lineno">2 </span>line 2\n'
--                '<span class="lineno">  </span>line 3\n'
-+                '<div class="codehilite"><pre><span></span><code><span class="linenos"> </span>line 1\n'
-+                '<span class="linenos">2</span>line 2\n'
-+                '<span class="linenos"> </span>line 3\n'
-                 '</code></pre></div>'
-             )
-         else:
-@@ -308,9 +308,9 @@ class TestCodeHiliteClass(TestCase):
-     def test_codehilite_linenos_linenospecial(self):
-         if has_pygments:
-             expected = (
--                '<div class="codehilite"><pre><span></span><code><span class="lineno">1 </span>line 1\n'
--                '<span class="lineno special">2 </span>line 2\n'
--                '<span class="lineno">3 </span>line 3\n'
-+                '<div class="codehilite"><pre><span></span><code><span class="linenos">1</span>line 1\n'
-+                '<span class="linenos special">2</span>line 2\n'
-+                '<span class="linenos">3</span>line 3\n'
-                 '</code></pre></div>'
-             )
-         else:
-diff --git a/tests/test_syntax/extensions/test_fenced_code.py b/tests/test_syntax/extensions/test_fenced_code.py
-index e5de0b7..8fa75f7 100644
---- a/tests/test_syntax/extensions/test_fenced_code.py
-+++ b/tests/test_syntax/extensions/test_fenced_code.py
-@@ -629,7 +629,7 @@ class TestFencedCode(TestCase):
-         if self.has_pygments:
-             expected = (
-                 '<div class="python codehilite" style="background: #f8f8f8">'
--                '<pre style="line-height: 125%"><span></span><code>'
-+                '<pre style="line-height: 125%; margin: 0;"><span></span><code>'
-                 '<span style="color: #408080; font-style: italic"># Some python code</span>\n'
-                 '</code></pre></div>'
-             )
--- 
-2.28.0
-
diff --git a/dev-python/markdown/metadata.xml b/dev-python/markdown/metadata.xml
index 367b46477ac9..c0df0fb62a2f 100644
--- a/dev-python/markdown/metadata.xml
+++ b/dev-python/markdown/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="pypi">Markdown</remote-id>
-    <remote-id type="github">waylan/Python-Markdown</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">Markdown</remote-id>
+		<remote-id type="github">Python-Markdown/markdown</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/markdown2/Manifest b/dev-python/markdown2/Manifest
index 7eb06ef29ec3..9c452b241e43 100644
--- a/dev-python/markdown2/Manifest
+++ b/dev-python/markdown2/Manifest
@@ -1,5 +1,3 @@
 DIST markdown2-2.3.10.tar.gz 102543 BLAKE2B 78c20c0b183c90d2f7e0a3e92660619761f1cd754bf3f142e5d6e29736242fb847e1ab4e4aa316378a8943912bd3a0270c0f26cfe74cf224969974ad1632cf77 SHA512 0d695cae9e131930ef67b0f389e0c14b062ddd009e441ec8b70553e4a71d7f4a0ec63f9e039624059c3fe09ad37480e3ddafcf31ffa1b031be26490c6b6b89c4
-DIST markdown2-2.3.9.tar.gz 101067 BLAKE2B 4b1ba9e90e2cd370edaff4d61bec9182ca30952351274c4aa508e2e3573a79bac7ab70a1d29d279eb2a94da56a823222a9413b0f3f871f3bd2dfb2ed60621158 SHA512 1be193b27efff9bd084da94cf4121fc91cffda57165333ac644a4ad31b33da62bcda1df0fdb450a02421c0199484de5d6b65131a0afe2dd941c52a3f81bb218d
-EBUILD markdown2-2.3.10.ebuild 661 BLAKE2B 6f07e42d74cc19e4a39fe27fdeed042019b52f2c7c478b93a1d0fe118b9400ef7ccfd6cef00e14676b2bb92d30ae644f2711c79c6d1610af5b9fffe5535bed5b SHA512 9710844e53bd92c99a5427ef94d1e452cab08d766cfa2da857713fc05de450824c2f18cd69a4b307b9e36dd343e89123153c7b5be291df90d5ad0ab47a3bb3bc
-EBUILD markdown2-2.3.9.ebuild 648 BLAKE2B 30c5e1f545dc38f0e0b4c7476c477076d716fe390d9613ecf74756e6a5edaf969cf68d45f1c1b44b19c1ec4ddddb3daec158232ccafd67a8a7a0c6d581314738 SHA512 40eeee036cc9f5d2531b708fe558e7fe1f23e872566c5fb6c296abb3cee3ababdac93cb5136d73f18be1e49d3948f658f8dedc91948f68ec6b4881ed1f36dd6b
-MISC metadata.xml 641 BLAKE2B f1c0e61b9c9e1229be9dbc2d913af9398d8ed41dc69afa0d46dcbc3c74aa583eedea6e1c8132de436b10b288f76a9657e3c74f7e546d357bba817e38b01606f6 SHA512 ece3faf6646450ac53797ac77c91f7e7a9953dcc419f98738cb8529722d04fa00a9a0e9fbe0958c2119b6e0909fe1ca6eee50749a133e2aec8b2d242071348f7
+EBUILD markdown2-2.3.10.ebuild 657 BLAKE2B fd3fd250b35c7422e03469d8da0805d16db4e127e167f3c35c83d7aafb1fa79d14ac876887439b647493556f3e2dc59157ab829d59ba971f70480dbc139a2cf5 SHA512 af795ca0fb3e58428e484f43464f2955b14d3ac1f512438e4640b4bacc816c43d743b28bb03d978c734ea181c49f95cba367fbd703c1c11dc23cdcbe39e8bd69
+MISC metadata.xml 666 BLAKE2B 92f4a6e130d5d7650e28e7b437f905b335d67e0c9ffe04106b2202fbace4b5916525ee59fa1611e4a403e8923fda6678e21b2341bb7c1c1ed1e791594ee0ccd6 SHA512 4cd3c51a3055c1ead3341de8d243942f49eca2cc467b4cef7b5993077a59800842ff89641c713e21dd3eae44aff2c5f57374f3e1dd469f54cdadf095c0b02872
diff --git a/dev-python/markdown2/markdown2-2.3.10.ebuild b/dev-python/markdown2/markdown2-2.3.10.ebuild
index 6cbc3ac52606..9739546f9a32 100644
--- a/dev-python/markdown2/markdown2-2.3.10.ebuild
+++ b/dev-python/markdown2/markdown2-2.3.10.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/trentm/python-markdown2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/markdown2/markdown2-2.3.9.ebuild b/dev-python/markdown2/markdown2-2.3.9.ebuild
deleted file mode 100644
index 0974d2171651..000000000000
--- a/dev-python/markdown2/markdown2-2.3.9.ebuild
+++ /dev/null
@@ -1,30 +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 Markdown language reimplementation"
-SRC_URI="mirror://pypi/m/markdown2/${P}.tar.gz"
-HOMEPAGE="https://github.com/trentm/python-markdown2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
-
-src_test() {
-	cd test || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	"${EPYTHON}" -m unittest test_markdown2.py -v ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/markdown2/metadata.xml b/dev-python/markdown2/metadata.xml
index 671860593b2e..3c00760d6607 100644
--- a/dev-python/markdown2/metadata.xml
+++ b/dev-python/markdown2/metadata.xml
@@ -9,6 +9,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <maintainer>
       <name>Trent Mick</name>
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index ae722412352f..7ffe05d446b7 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -10,5 +10,5 @@ DIST matplotlib-3.3.3.tar.gz 37944403 BLAKE2B 30358d7b7df87b0b15724c4eeb132acdac
 EBUILD matplotlib-3.2.2-r2.ebuild 6536 BLAKE2B b1e13fa0b6247a6f8d70c7ffbc8e3c32af8a4da4aa110ff276b730bc58304c3311fa595d675dd177e9712a4eebb636938dc4f6d0c88a8ed3f4b4d14205afb40d SHA512 534db15787c1c773c70c6e0a322fe872cb9acd8a6b2c660e72265b6066e8f142a214f150e7b7c7ff47e363bfde3e763ad6d1001f4dbbafd705db3972a459656a
 EBUILD matplotlib-3.3.0-r1.ebuild 6658 BLAKE2B 37583fb82f1833e6615bff7aad7449e17dbe5f4a3f2d590ab8ed9cb04c454b780f9c945282e006022d687ab95be2f9097f2405aeb495aeaabf4c919be7bc9746 SHA512 240eae8dc22b41b9511fe55b38e637eba26daadf7ab6a7aad9b8e75f063ec2da0def8efc764c4908a5993e19ad2aac3337885009eb28344fe3c38fde48b49c6b
 EBUILD matplotlib-3.3.2.ebuild 6774 BLAKE2B eee51d9d7d703d02ee1f910cb3de90c6bc109e5f61e6926030d035463174299ee3f94b09709c8ad7dedd34cfb1aa89e2c2d1986bc83deb1d41955a4f13c90dac SHA512 c4db6e53eff7e10ec9ce534bf159640a2ccb81a89cca67015456fe87abc3ef316f2d0b5b4c459069bb63e61ab6b6af3100a83cd25179eb6cb53ede339ef10523
-EBUILD matplotlib-3.3.3.ebuild 6846 BLAKE2B 28b0efe8b7948f96eb74a5872a7dd62ee79014a039150063d899a276b7e93b94dc06d66ad11132b2130c08c7f64168e5a945d0979407e31f39bd12a2c0cb2973 SHA512 de143a19c45dba937cf500fb339942b73c8cfb75b5649f8a5d0e869cf24d600414eb956f8adcbb7523b643e4f5eee6c4548f32a6026b49bc43956be23fffd02b
+EBUILD matplotlib-3.3.3.ebuild 6863 BLAKE2B 80a21b2486e3ca49fa2e71ccc0ad63d2bd79395a5fefc129a092414341b576d7ec57b3005130025b8ae68fb6d4af985cec085b73952d68b608b3c3f39cf4d0b8 SHA512 8070103c8844b710bb4320032a00b4c5484f381fe934bc630e6497ecc1cd479ab81d38abcce45bc3b752b039a3b6862be31eeccaf64388131491b07f0c4048b2
 MISC metadata.xml 1013 BLAKE2B 7a02989dfd3230db1225c97927adcf0b6b3fd0dc6d81cca69db3472f4f9fbb185daede39e35ad3477b1592a5deba76fb970be8559bc8b30791484bbe0624d417 SHA512 e1b11cfb0dc4f534f0a0b25bce759554906d5656b7c3607f56ae3b3cc53f8d30a3f5be1e6c96c3942dcb1b7ee0936ddd02c9560507d2d1d2fb46c2f4dbeba608
diff --git a/dev-python/matplotlib/matplotlib-3.3.3.ebuild b/dev-python/matplotlib/matplotlib-3.3.3.ebuild
index d3fa270b2d58..1f794c150269 100644
--- a/dev-python/matplotlib/matplotlib-3.3.3.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.3.3.ebuild
@@ -201,6 +201,7 @@ python_configure() {
 		agg = True
 		gtk = False
 		gtkagg = False
+		macosx = False
 		pyside = False
 		pysideagg = False
 		qt4 = False
diff --git a/dev-python/matterhook/Manifest b/dev-python/matterhook/Manifest
index fec894bcc9b5..129a950d81e9 100644
--- a/dev-python/matterhook/Manifest
+++ b/dev-python/matterhook/Manifest
@@ -1,3 +1,3 @@
 DIST matterhook-0.2.tar.gz 4458 BLAKE2B 83dae9d38eaa9de3abdca4925378475660ab6f9571565f9275425cb9579397c2f3d106735d4268b7045d6af2572bdb8e1f60aa89030b1fa44c4c5c1b19fcd106 SHA512 aa476a00a5b571c5c8bb21eccc5b1c325e0932da7e4f8095e3ad29356afd4716384abfa9e4927a820e6d1fcf8e62a516943f6372d90cd7a9e76d0292c352c483
 EBUILD matterhook-0.2.ebuild 494 BLAKE2B 14f5af598f16368c6d26fc2ed631f32b8d84e58ee5a8d10d0df2dac84279396b0c909d5aa57fb0f3f29cfd381a2665a5c035e81058d5c7937d10e79d182c3c06 SHA512 454d714e7618be61c5da34208d7c5d703875ca70754ef0594d238e78aaf93f1e5203032abfa1970c1ddcf09aed385a53578f70faddf3778e6e1af86343e7f0e7
-MISC metadata.xml 336 BLAKE2B 1e7290ae691ca7a715f9dc60546340501b3ee5854f6d3960557c76039f90b8b96479d3a603b9d8e60d4fdc6a6551eaac3269946c0784d3c308e9d874f008473a SHA512 85d15317337059f72b1b2451d00eb95a6c196a9b09d180d0583ef8675a269615a8dfe91b726c6ffaa9b9a5eb4fe5da2357a5973fe85a6e77106daa8232406bdf
+MISC metadata.xml 375 BLAKE2B d2d840486a6a20a7ff78b82e2c01f093105087b052a5821e7641f0ad21b323b22ec1b5c6e71f5cec885c8e229f7883eb1857ab2476ae11b990944f432be8054a SHA512 f08667b90c99152dc61387c1307aaf8fde1853202772f75de89f0b696b28ef7b7154d016aa32617c8bac58af0d7b007cc26ec1ec9c87a68aa6d77b8fe7ca94b5
diff --git a/dev-python/matterhook/metadata.xml b/dev-python/matterhook/metadata.xml
index 4c76899f3eeb..95c54986ef29 100644
--- a/dev-python/matterhook/metadata.xml
+++ b/dev-python/matterhook/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>ultrabug@gentoo.org</email>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="github">numberly/matterhook</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>ultrabug@gentoo.org</email>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">numberly/matterhook</remote-id>
+		<remote-id type="pypi">matterhook</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/mccabe/Manifest b/dev-python/mccabe/Manifest
index c130cc2babdb..b01988a76ee6 100644
--- a/dev-python/mccabe/Manifest
+++ b/dev-python/mccabe/Manifest
@@ -1,4 +1,4 @@
 DIST mccabe-0.6.1.tar.gz 8612 BLAKE2B 6828dfd852cf9b47de10bd889dd4c32dc1ee95910fbd27e0921cd7d9975a0831b1c2763eda5b2d77d7e4b44b5a9d0e89f0818cab71de655954cc87cacfe8d382 SHA512 d8fc251a29790887c14c5932c5172b4cd578cd37ccf14cb96e80f0b97f27023427ea032d14e1e2a99d72627b055eb285f60db69e679ecd79d90a34b0255703d8
 EBUILD mccabe-0.6.1-r1.ebuild 746 BLAKE2B 633237e22e2fd9516d06d076a2308c9acd4b1cdad7feadd446f4ffc78957675ef7ed6fd902c672bc1df0a4ba79c172fa61bcf92bfa47b00882d51fca532dd761 SHA512 b6476932275c77cadc7f5875c6eef4347bd161ff5e9a237f985263bbf3bed787f93646e7d036f9f432f9456a02cc1ac456dd093d26f5db1d8c0198a34bdf1cbd
-EBUILD mccabe-0.6.1-r2.ebuild 705 BLAKE2B 93f0c4dc46c88a1f1f8088973f0f9a9317cafacb0ac7d517d24636112e2ce7edd387a830bf2bd6f1f2fc5ab86077dc39b11c0a9fd7cd620bfc35a1a08e7ef90d SHA512 91c40849db5ed9d5ef44ac547809301df67e75987f3665a4691e2e80dac1a7db77ee7bdcb7617815592f364f8e71d49ac231b5014196acd64fb2d72568792072
+EBUILD mccabe-0.6.1-r2.ebuild 712 BLAKE2B ee401880b86ac5dcbf3663ce7caf1797fe7c443278efcda3b0347ebfbdec70394eba6052fc47a38ebe31ceea648340bbd8fd8d696a37fbedacf66e445a12ff88 SHA512 fcfbd75e1d2312f19647676b4515769a5fcd166e85601409b4126fcf2d9053513fb5e12403a3c61ac72180d12b983870204d104d35410b521dfbac5d7f4592b1
 MISC metadata.xml 398 BLAKE2B 868cbcff67488d329190b54ddbb2fcf9d7be6c3ed535d8437161b6ac35f067d8585d8de67874ae87615656073ab113f0bb10ecd164d32f92844cb489489085dd SHA512 a23a9f2c7bbdfee2547cba6c99cc8112d900297c76a6e2ff739177e32a1877156379f341b6c2d3565e4e503f3999f51317ea35b1ac620e8c18911c1c1e0d1b40
diff --git a/dev-python/mccabe/mccabe-0.6.1-r2.ebuild b/dev-python/mccabe/mccabe-0.6.1-r2.ebuild
index 71e71d8c8e7c..d32055af4453 100644
--- a/dev-python/mccabe/mccabe-0.6.1-r2.ebuild
+++ b/dev-python/mccabe/mccabe-0.6.1-r2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="flake8 plugin: McCabe complexity checker"
 HOMEPAGE="https://github.com/PyCQA/mccabe"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 LICENSE="MIT"
 SLOT="0"
 
diff --git a/dev-python/mdx_gh_links/Manifest b/dev-python/mdx_gh_links/Manifest
index 72ef36afd906..66284cfcdaa2 100644
--- a/dev-python/mdx_gh_links/Manifest
+++ b/dev-python/mdx_gh_links/Manifest
@@ -1,3 +1,3 @@
 DIST mdx_gh_links-0.2.tar.gz 4961 BLAKE2B 02a391d3a0dde532cecbd4f025a7624a90aea698815ddb797cc4f74e2be80f5b55013b9cb3d358f92dcdb43fa9a160880c881ed3ac2a4f2c306f16dad06e1f3b SHA512 0a6be387e4b3d5f31601a365679733647f9669d61537ef3b630321d61f1d645f633098b92cf2fbd61faeb8469094bd89a5df8a561d15b8908645314ded4dd42a
 EBUILD mdx_gh_links-0.2.ebuild 472 BLAKE2B 764a56bac04236ff08c9abc0db129609e8b9c2523b680e881f1b1311cb4bb994fbc9a279e88f13a6c149afe60844e6be43cce83087c1f2e5a4b00dafcedca42c SHA512 58017d91d6a03cbf2bad5da031f78458f497751c2142cbf96ef15dd3f6c016f8a2ea458b9c3b9988fec2928ab2735be869782b56212719ed128019024c5f23b6
-MISC metadata.xml 375 BLAKE2B 393138e315b4eae4dacb9339fbb5766e9dbaa84b7482babaddc08d524fb8b9939f6622ee9c6d09b66c61ac270fcc483fac39996a12ba87ccccf7cafd4c6d36db SHA512 9a44b6b9de4d1a61d6af9256519473541d5513cef349c15178c025dee3aaaa3f6772b1be56576411a985fcd9c70029c00743d8f577be8eaec4c5a44646c9cbf6
+MISC metadata.xml 450 BLAKE2B f5d8a19aeb44805912dd44cfea84f45c74dcc989d5ced9e33d002d9e2ed806939714ee79eee5893ea1bb2d3d5ab925e1bd57acf77b87b3c516d675973bfe67a4 SHA512 81ce8f4a5a1c80552c82f0dae939484bece0244a985377203e0336fe4a39dbf9ae13d01dc2bc2356728137062e471873fd5424b2dfa114ff162ee70846e285ed
diff --git a/dev-python/mdx_gh_links/metadata.xml b/dev-python/mdx_gh_links/metadata.xml
index d22e99d73577..ffb6095beaa8 100644
--- a/dev-python/mdx_gh_links/metadata.xml
+++ b/dev-python/mdx_gh_links/metadata.xml
@@ -9,4 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">mdx_gh_links</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/mecab-python/Manifest b/dev-python/mecab-python/Manifest
index bfef4d604170..2eb3c6e50b70 100644
--- a/dev-python/mecab-python/Manifest
+++ b/dev-python/mecab-python/Manifest
@@ -1,4 +1,4 @@
 AUX mecab-python-python3.patch 253 BLAKE2B 979ef7ea020bfb405faa366a2b87a42d5c5e03e6b49b04ffc4ac0586e4e09912e6afe333072a47d676c4c3e7829ae336e61c402da280b6fffca80fc89323c00f SHA512 7937766e44c014149c64a3ad4226110f83868df330e5c0b22b65ce4624d3e6b710db972e18d446e535a76e0b0c763b2245d50280567e1ceebed15bd20c351695
 DIST mecab-python-0.996.tar.gz 62338 BLAKE2B d2f8749bf4ea0b30b9f7ee68a4210a3af600803296197f48091d1c9fe90f5baaff3eb94ecb3aa04d994771512c1ef5b68a62e0a045da95992bffd1710725e832 SHA512 08954ed801419fd7f65d055244227364bc37b063f8d21babb6ceeb02ca40e0146fa4401d1426255f3656ac1a5e51439bde981414613153dca5972f624289447e
 EBUILD mecab-python-0.996.ebuild 610 BLAKE2B 7bdf32941cb067ba54043992e1409caa9f1534694a6ea69178030663e7c9587beafa9a0dfc0dd6ef0d2162417a8c888cdb114b44577424288ef864171d05171f SHA512 6d13e9c0bdb89b93527ccd56b91250cdded84c70f571fadab7d9949dbdbdc10b1c88b6619e39166707686bd2d46d90d0c96d5db047ecb5dc284ab5f1336095ca
-MISC metadata.xml 412 BLAKE2B ca6440887d39a7ded3f9d000ec965344164f69dfdf0e98bd070cdc531804d7c94d74fe9a6a3ead7876fd9bf39eacbe5649b3e5357b1083f30d78ac51fd0a7afa SHA512 78feb6a8557ee197f02071540a3c6836cebec69cffc3d32a22f8563008614da66a6b26fafa0dae24b0c21cb7492e203c096f67c5482d1ffe617098b0db0670e0
+MISC metadata.xml 462 BLAKE2B 1341dd7d469fcbb4e817571363e5a7dfd6c2be1732512e034c485af4f0e7f1afca98762fdb940c65e29bffa5ce3bb33f385bb5b5a42ccbb37975b7a96ca5121c SHA512 8ca5e0936fd23b1e2aed226d570e90d0b9004ab2b21fe360dabfc8ee39a50d868ad7ac848cb824f5df91c281b3e67cc8f42d5c2d8a285585d6fa49c9790a847c
diff --git a/dev-python/mecab-python/metadata.xml b/dev-python/mecab-python/metadata.xml
index 82adca0f7b81..0f7251470f3a 100644
--- a/dev-python/mecab-python/metadata.xml
+++ b/dev-python/mecab-python/metadata.xml
@@ -9,5 +9,6 @@
 		<remote-id type="github">taku910/mecab</remote-id>
 		<remote-id type="google-code">mecab</remote-id>
 		<remote-id type="sourceforge">mecab</remote-id>
+		<remote-id type="pypi">mecab-python</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/mechanize/Manifest b/dev-python/mechanize/Manifest
index 361127da11db..e04cc4d9ac49 100644
--- a/dev-python/mechanize/Manifest
+++ b/dev-python/mechanize/Manifest
@@ -1,3 +1,3 @@
 DIST mechanize-0.4.5.tar.gz 216908 BLAKE2B 67951ad8295a32799768b3719525d45d502bc773c6f2a5e762e3dae97f309c8c265a2cb3efde95c9e8cb65e89dee6ad6ad8585685baa4e9ff1acfd146f115f6f SHA512 51706d5c073501d02fb7395eda30625ed9191324f948073c7d1589df0e507d8b7641ca514ceff55e7d82e899ba6e10c55507c79668976c7654ff0004671d09d2
-EBUILD mechanize-0.4.5.ebuild 622 BLAKE2B 83fcc166f719ce330e75d3b8d2bc5e45d3001cd7086a49de2f1bf58a2397183178faa1197124ac699c2131673aa1ff1ecdf92a45c3d6984d2eabfad42729783a SHA512 34292b0a52a6cdb732923e7e3af2a1c886048b687037aa6117b39222a7e78bea763cc91ce7d325343ae13557e71b9b231e6d84461f0579b47f8daf8aaf60bba9
-MISC metadata.xml 959 BLAKE2B 7e3bc231d201f4b49561f1594301f1d2663744d4a5da0e9f277f2434f80eef016e98e5317016f3e330b1f8daa6a4559db6207720888b99dbb9634c605bcc0472 SHA512 37015b73d1166a75a206306eea97957f23cee6f558bafe54b18c99b7b70b966569a87e9d70466ed50393c1968aa1f7dd884cdf98bd401f274d1e6510d927afa8
+EBUILD mechanize-0.4.5.ebuild 624 BLAKE2B 891c159bc37bd2313d0594a7c99eb01db8e537386e13a66dd1425d2c1d34ba8fe6722eff3c31031e11486c4c89194d98dee10cea78c6be70e8a861cde27f29fe SHA512 37ceb50c9345821858b54a8eb782f04a0744f2deee298d888e44d6542d9943a13b558d56dc9f56f50057b7067760375b332f5076addb69ef2e1de7e811074346
+MISC metadata.xml 978 BLAKE2B 1c2cb6d7489e09531a0c96862eb12ac53d30b940e940002e69820e7ff51e2fa56d9145d732250d68892690f63663847ff3f711847dd98ee8803fb07e0d5b496c SHA512 ebd61b86ab4c9bbfedd1d1892b3dab26040025f348b56601437999d13817e7147a5b89e3ac8454f6689f3978b289a6893433bde81705d52c4f7d236ea0dd6291
diff --git a/dev-python/mechanize/mechanize-0.4.5.ebuild b/dev-python/mechanize/mechanize-0.4.5.ebuild
index c9ee10e59bcf..8b63084ba831 100644
--- a/dev-python/mechanize/mechanize-0.4.5.ebuild
+++ b/dev-python/mechanize/mechanize-0.4.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/mechanize/metadata.xml b/dev-python/mechanize/metadata.xml
index cc33db8a685e..b5b7f28a7b62 100644
--- a/dev-python/mechanize/metadata.xml
+++ b/dev-python/mechanize/metadata.xml
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <longdescription lang="en">
-    mechanize is a Python module for static programmatic web browsing in
-    Python, after Andy Lester's Perl module WWW::Mechanize. With the Browser
-    subclass any url can be opened - not just http - and UserAgentBase
-    offers easy dynamic configuration of user-agent features like protocol,
-    cookie, redirection and robots.txt handling. Other functionalities
-    include easy HTML form filling using ClientForm interface, convenient
-    link parsing and following, browser history with .back() and .reload()
-    methods and automatic handling of HTTP-Equiv and Refresh.
-  </longdescription>
-  <upstream>
-    <remote-id type="sourceforge">wwwsearch</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+		mechanize is a Python module for static programmatic web browsing in
+		Python, after Andy Lester's Perl module WWW::Mechanize. With the Browser
+		subclass any url can be opened - not just http - and UserAgentBase
+		offers easy dynamic configuration of user-agent features like protocol,
+		cookie, redirection and robots.txt handling. Other functionalities
+		include easy HTML form filling using ClientForm interface, convenient
+		link parsing and following, browser history with .back() and .reload()
+		methods and automatic handling of HTTP-Equiv and Refresh.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">wwwsearch</remote-id>
+		<remote-id type="pypi">mechanize</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/mediafile/Manifest b/dev-python/mediafile/Manifest
index 53efff1ee4ce..e236c40c9ea1 100644
--- a/dev-python/mediafile/Manifest
+++ b/dev-python/mediafile/Manifest
@@ -1,3 +1,4 @@
-DIST mediafile-0.2.0.tar.gz 509689 BLAKE2B f79da210a74d55c4709b6fbf08a0675f445001ec49d042fc4a1101def07068bebccb155e770c5cbe8d051d7f101a213e9fcefbcb9590a650de99cfde837a965c SHA512 0fa79f77e0ac9a021b569e78f0edbe8cc63308ad8c89526d8e15dee455a284cb90d29b51aa476287e306717315c3cff290634fc6e4ac0b1726163dd922ee3b0d
-EBUILD mediafile-0.2.0.ebuild 981 BLAKE2B 8ff43c3b8a6ca86eb34b567f8fd06760c5c10ee6189c7f35b7625569ee25e30f41cc5d80bb399e1275172762b579869ff59af6676189cce04256fd09b478ddc7 SHA512 ed45b8af622a2744e3baa9f048eae6c3cf8de732097ca133cef00dd8bf40a4a93f4ee1d1a1bcc6cbe27235009b95ef493616ef6b07709cd82e8548b72a25c2cb
-MISC metadata.xml 535 BLAKE2B 8972f54007dfdf2efb711cdb2239d4bd932e55604781e10d63d128097b3708ef0c642460b0ab77c0917acd7177074e60e8cbff0c29274139fcfde1747ce16359 SHA512 d3ef291f2ec776e1b231a7e253fe890ede924f42b2428b21708774b349365ff2718aa4ca3e3acde61d2982f14368377cd359842bbc110da320e1ddde360b2dab
+AUX mediafile-0.6.0-wavpacktest-fix.patch 391 BLAKE2B 6ef2b9f82cdb7c261c5c56d86f6087402799ef4fdc0fa8f58c8309de43e9f2b76b8883507b979d5fa7559b16eb3cf32496d0f1a4136ce2ffa9a30fd8aefea4a8 SHA512 76b1600a96d8f2b43cd140b067c12a6846cd8ca83827d5ba2a922fde6412cf4189a0848ec3bbdb14cb94e3f6a73936e17bcaf9b5e95c1f494209391344987e3f
+DIST mediafile-0.6.0.tar.gz 509351 BLAKE2B 5b8d97be6bd7becd44053d2d1b855252161779d5a01e8fea29443db0b3f524ba3b58dfa372b48451da76672ea5fdb521cd8a2a5c6c110d37e637dcfefbc0842b SHA512 7fd7d8a1d53311c22835041c39413d9dc7e1b4d8afc94a8c578aa4de7f65361f6c998062bb1b2804cae1f672c6b8e7c109fcc3e459e2266b8f19a0bde8673945
+EBUILD mediafile-0.6.0.ebuild 1080 BLAKE2B 4b6ca786140042b80a5231a0017292d0072afdee6936e90d0fa37a4bc9429316d99daf746623c17275c1762e5a1934f95f42d33258f67bbd328f81181f6ab837 SHA512 b005e0d0ed3d5df47c31aa7cd1697e2775c3824ea3f42a930af1655b88401b8d7a8450d77d6b320cef706f6e348b32f655300c7326d880b993af0fc322abac4a
+MISC metadata.xml 606 BLAKE2B c6778e311bbbef2eff21b456cbbddaafd0a5737e6115d125b25615fcb670387527d5477c561463b6d285c2ebfdcbd095d5fd70f740b0a49dc0b9559c3841bd78 SHA512 2c7a2fd654d9aeadffe519c4c913d9a8312ac7232c9cb6fc8b3a78a9f3492b0d879f997e2f67864fcfbad6cdccf1aeeb6209460f825e968adca27df546c6f6fb
diff --git a/dev-python/mediafile/files/mediafile-0.6.0-wavpacktest-fix.patch b/dev-python/mediafile/files/mediafile-0.6.0-wavpacktest-fix.patch
new file mode 100644
index 000000000000..e1427b1eb914
--- /dev/null
+++ b/dev-python/mediafile/files/mediafile-0.6.0-wavpacktest-fix.patch
@@ -0,0 +1,12 @@
+https://github.com/beetbox/mediafile/commit/d2fc3b59f77c515b02dfe7ad936f89264375d2b4
+--- a/test/test_mediafile.py
++++ b/test/test_mediafile.py
+@@ -907,7 +907,7 @@ class WavpackTest(ReadWriteTestBase, unittest.TestCase):
+         'bitrate': 109312,
+         'format': u'WavPack',
+         'samplerate': 44100,
+-        'bitdepth': 0,
++        'bitdepth': 16,
+         'channels': 1,
+     }
+ 
diff --git a/dev-python/mediafile/mediafile-0.2.0.ebuild b/dev-python/mediafile/mediafile-0.6.0.ebuild
index d7bb592f915a..a3cd7fdc59e9 100644
--- a/dev-python/mediafile/mediafile-0.2.0.ebuild
+++ b/dev-python/mediafile/mediafile-0.6.0.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
 inherit distutils-r1
 
 DESCRIPTION="Read and write audio files' tags in Python"
@@ -27,6 +28,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-wavpacktest-fix.patch"
+)
+
 python_compile_all() {
 	if use doc; then
 		emake -C docs html
diff --git a/dev-python/mediafile/metadata.xml b/dev-python/mediafile/metadata.xml
index 921814ec2eb4..d1864821cd5f 100644
--- a/dev-python/mediafile/metadata.xml
+++ b/dev-python/mediafile/metadata.xml
@@ -2,6 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
+	<stabilize-allarches/>
 	<longdescription lang="en">
 		MediaFile is a simple interface to the metadata tags for many audio
 		file formats. It wraps Mutagen, a high-quality library for low-level
@@ -10,5 +11,6 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="github">beetbox/mediafile</remote-id>
+		<remote-id type="pypi">mediafile</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/micawber/Manifest b/dev-python/micawber/Manifest
index 6cc8d79b09eb..300eb27bc156 100644
--- a/dev-python/micawber/Manifest
+++ b/dev-python/micawber/Manifest
@@ -1,3 +1,3 @@
 DIST micawber-0.5.1.tar.gz 34210 BLAKE2B cc3be0dfdb52a733ff37f249d589f37812c5f6b641b1dd2092faffcfeff9cd79c3989324def721859584280405a28c046ec98aeee3a89106fec0e3f27ed4fede SHA512 888826ced322a0584d827f7e0c58691281d8147e7c3ca9e940493a8beba41fbf6d005b0ca7c4ee6eb8e9c37edea4fb8244aaea9f553b886b1410d91aecbae4ee
 EBUILD micawber-0.5.1.ebuild 670 BLAKE2B 7c8079710773d453e544edb8cafc0df0b0e4bb3fd3c809adec1ab7324765b27aae4671723f0b0fc916028657293e63db0b14f5f29a7d3acb0a369df280f4e432 SHA512 aa101c9f5eccc1e8d666c42628695c175a2fa8da499f3396da30f8ced3145a7fafe3d85838fba267d6f5d9952e15249a60a97a1ed7274e7301879afeda8d7813
-MISC metadata.xml 332 BLAKE2B 1d2fa19b717b98bac1f2ad6fd261ce54360b6185671a3d1a51bc72080a6708196c0abcb5d5226dc0e4c693258caf85476a53d4b19d452b847e67a88adfed275c SHA512 9815d1b8eec3bf22a430737bc5a7dfc9e576f0f5ca79ca318a419dd911af378f94b63a6d457cba32bbf4e4939cea3690bad4e6be918ed79324f06f7eef42aaa0
+MISC metadata.xml 368 BLAKE2B e6fb6533cace706d2feb6903ebea740cdc9a043e609027fa88d7f980212fb5daebdc195da3382099842cd0b6446c44a381de850b28c050a6526b2a864293923f SHA512 6043accc7969996b66f8639ec5338d8df340d5bbf87aa16db811dffa6ef7cc84a10ff0a270b6ae090520767b41fecc8dec1b3249aa02d3b21b32e2f6c992f815
diff --git a/dev-python/micawber/metadata.xml b/dev-python/micawber/metadata.xml
index 740d13d52312..51ec6ca51d93 100644
--- a/dev-python/micawber/metadata.xml
+++ b/dev-python/micawber/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">coleifer/micawber</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">coleifer/micawber</remote-id>
+		<remote-id type="pypi">micawber</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/mimerender/Manifest b/dev-python/mimerender/Manifest
index b6cac1817ba6..b37d5c5f0f2d 100644
--- a/dev-python/mimerender/Manifest
+++ b/dev-python/mimerender/Manifest
@@ -1,3 +1,3 @@
 DIST mimerender-0.6.0.gh.tar.gz 16677 BLAKE2B 55db5bf97cd65de89271af8713d9dbdebab6254fa2dc62cfcd78394f4333093fdc508ad6e93f104eee2f3d8a1ceb9197353b4ca085e3b4887b4560c2c65c45f6 SHA512 68c584ba8ae608097b739078dd729bd8b5493087901ba281959abdb81d4e6052ff045c487fde4f67744b413bab36d7f938c68b162049ebe33bff642571b8fd98
 EBUILD mimerender-0.6.0.ebuild 686 BLAKE2B 38cab1f1526fc58afa897136e0c37521a84aa16c0ecc2c05b4e4342933ddadf631f5e5a0daa3a442326a7de15742a530fe7240bab44a4c41df3382fa7e399e39 SHA512 0e8e0b21d9632ba8248b5f3edfd003c7edbbc126e884d999b45055e133eccf04dda4cf8489834d605af2ae119e65a09b4746ba8ab873684af1aba16bc3ac4e91
-MISC metadata.xml 313 BLAKE2B 0af0e6a1a8f423a445bf88ca13d771c3dc7a8e7db97d21446a5c5b7967dc232a18c1062ef01e11dfabea9fe47c36825bb2cf44bac98ef651cbfb5d941cf281ae SHA512 69420483f170abf2482ef947c26bbe7dacda158cc222464d35d18b702694b73b6205fc4d66150265962e28ba1965f7c555ea033778fb04eff73a58ef804e157d
+MISC metadata.xml 375 BLAKE2B 61ad72d6f5d98a750b8ec2538dacaebb68522ca8045bb0d45f085f01aa9b3d9b30fff2eb2aab8b2b052ee4dc522e65e50b1312ceacf8200ae55ec13950fa00a7 SHA512 36ddbd51b0fe68f36b4ad55d683517d5cef7d7057afb403748fc89e59efacd6d073ce65232aedddbf87afe68dd1f2ab31881cf7d79ab09190b3a3e080a71af6e
diff --git a/dev-python/mimerender/metadata.xml b/dev-python/mimerender/metadata.xml
index 14833db55be2..9aee8e0d5516 100644
--- a/dev-python/mimerender/metadata.xml
+++ b/dev-python/mimerender/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">mimerender</remote-id>
+		<remote-id type="github">martinblech/mimerender</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/miniupnpc/Manifest b/dev-python/miniupnpc/Manifest
index 4b22ed9e6601..a9e68283555b 100644
--- a/dev-python/miniupnpc/Manifest
+++ b/dev-python/miniupnpc/Manifest
@@ -5,4 +5,4 @@ DIST miniupnpc-2.2.0.tar.gz 98348 BLAKE2B 3464dc7f0b5416b558d0dd49121f3b851d9808
 DIST miniupnpc-2.2.0.tar.gz.sig 543 BLAKE2B c75dbc54debc77e63ea3534f8f424a3904131893fc31d6485163ee6ecdafdab02fc0db8e290d28c834ac0efc5a37c34cbca7f14e1c78f859d22abc4e0b2ae48f SHA512 54f8cccea5886e06fbdaa04d270c12bd95d219be0b275491d9168f1089b1efe96e8a6f30ebf428091a3bae4bc349c0b8c94a22e94d56845a0a8b9724b1f9f74d
 EBUILD miniupnpc-2.1.20201016.ebuild 906 BLAKE2B 7719aef18f2ed3829e8005d67c6e6b3c381cf6de6c5012c5a2ca1a543057bb6a21aadafb04708a45814a28675582bbc0fa0fe899c1ac3c2fd0d1d5ced4d712ac SHA512 ca4c2772c17e29910d8cb90c2b5c9f611a395645f813b4daf81ea3cc8448e357c8082c669fc4500d67f92c35a998f5eced9defde665db117b2bc6e096069bbbb
 EBUILD miniupnpc-2.2.0.ebuild 910 BLAKE2B 590fca42dd99e1160c081fb36605cd9b4a8ae36c75b2e4bc90c9314524c0f8323ca129c3eb098f439f2f37476e8b89f7efa08ac93df568a83870cae12a6d9e25 SHA512 f0c00f3509b5e5479dd964282bbdcb960def37519725acc65a8d1f3da178970465299d87def8602d4290eae481a466df93107758e3234494c05addf34a230b43
-MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
+MISC metadata.xml 319 BLAKE2B 7f3ef8f9588fa7c1f464aa78a5edc9b8d43d3d163ea0f1172b2f9bf2305e3cf0b92b60ac6c9155ace330c646f9ac9fe36e0e6829ce06508fbcb9a76e0483f032 SHA512 4d2f45df1390d755a9539ab1e94542b234df04ab89549be6d3f9e9cefb43985cd2d4506bce76db1a6b64d0eb8f43ac1f6c3f093ef27d004b001b16c02594c875
diff --git a/dev-python/miniupnpc/metadata.xml b/dev-python/miniupnpc/metadata.xml
index 998965a402cd..54d17516bff8 100644
--- a/dev-python/miniupnpc/metadata.xml
+++ b/dev-python/miniupnpc/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>mgorny@gentoo.org</email>
-	<name>Michał Górny</name>
-</maintainer>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">miniupnpc</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/mkdocs-bootstrap/Manifest b/dev-python/mkdocs-bootstrap/Manifest
index ad20da47d0b5..c65d9a6ca8dc 100644
--- a/dev-python/mkdocs-bootstrap/Manifest
+++ b/dev-python/mkdocs-bootstrap/Manifest
@@ -1,3 +1,4 @@
 DIST mkdocs-bootstrap-1.1.tar.gz 233231 BLAKE2B 64470a4e5ca6d44976944c16244daaefa99702fa68d68fb14e31201fcfd5f927dc2b962fd0b1967a6fd7eec8719389a78dd13cbfcdc387fa6de5f21c9c1a4960 SHA512 a494afa614f96771fbc640862b5cb5674d4eb5c978a56e86e2f523137fed315808067f20cfadca463cbeb5384de062c91001b6eaf5f3ebdce329f167b461d2b5
+EBUILD mkdocs-bootstrap-1.1-r1.ebuild 469 BLAKE2B 97fab41002010319a3e9efa89abb991c8877a4467761c24c41d55fea785698169dfeef69627b30d74d5bc6fc7d7c184bd01b0a1e97188768dc987b1ea00ab822 SHA512 ffb7d14d89fc8e93a42a2925de3e54a2eddfe9c87b6fdd0a1d0edf7f4f3dca26e23223312bb0e6fd69b7f3665d730920515df13ccd40d4590b530f81301fca35
 EBUILD mkdocs-bootstrap-1.1.ebuild 681 BLAKE2B 09261a96412e41a75d59e096c2d209bd4751f33d1d472725c27ea4aaa7a8fd1d16a7b6ee3c51a617368dbea6a7fe6133d23ca54f518975f55e3f67115150d8a8 SHA512 9cc237da10d39e465792afad64fb5cad41f9cdc6222e714b84066a791e68af569067cfb9a8185e4b392b05f6dde7e015ee1dffb5b8054b2e67cf7a8838bcc3fb
-MISC metadata.xml 454 BLAKE2B a04b5ede94af2bae3761a94d865459150ea448baed4dd070d868d202eb9425836bf5e001238efd9c75f95489d2b0927edbb33723d54dde0c7984ad86a42e3e90 SHA512 56c8bf33debd320089a4886e3af540eae08686db30aba3bd56daa7ac7dae926a0abdc484a0ae43f296bc7bcec26de8c2956f3e26a0152594c70aeace3d6f56fa
+MISC metadata.xml 517 BLAKE2B 5ec9b229c40f371ee85312cc7617c48fa57aa6e119b246ff19b11c6476d65ff0412f2749b7135d398284f9cf60addf329a45589b4dc3c59e6b202046198f01fb SHA512 767109c07e26d63e55d90be4f4dbc227fdf26e828d329b4e52adb20749d3435dcb671ce83fbfa529ff72998b1723635e426949dc8598fb022b3f8a03a3c588f7
diff --git a/dev-python/mkdocs-bootstrap/metadata.xml b/dev-python/mkdocs-bootstrap/metadata.xml
index dffd79f75c7e..6e06cfa5f1f8 100644
--- a/dev-python/mkdocs-bootstrap/metadata.xml
+++ b/dev-python/mkdocs-bootstrap/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
@@ -11,5 +11,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">mkdocs-bootstrap</remote-id>
+		<remote-id type="github">mkdocs/mkdocs-bootstrap</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1-r1.ebuild b/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1-r1.ebuild
new file mode 100644
index 000000000000..7d7ccbe6b6ba
--- /dev/null
+++ b/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DOCS_BUILDER="mkdocs"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="Bootstrap theme for MkDocs"
+HOMEPAGE="https://www.mkdocs.org https://github.com/mkdocs/mkdocs-bootstrap"
+SRC_URI="https://github.com/mkdocs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/mkdocs"
diff --git a/dev-python/mkdocs-bootswatch/Manifest b/dev-python/mkdocs-bootswatch/Manifest
index f9fbc3a96bef..e7e8db0680c2 100644
--- a/dev-python/mkdocs-bootswatch/Manifest
+++ b/dev-python/mkdocs-bootswatch/Manifest
@@ -1,3 +1,4 @@
 DIST mkdocs-bootswatch-1.1.tar.gz 1514738 BLAKE2B 0ee80c7816a1a8d6c8e09494f3e07d94cfa8fd1fe8d4dfdd44c55974edf9811be20c22a6aa0424b07f21ca89764e1c15617cc43aaa1a6503365b237905f010e6 SHA512 1a3305434a11aa5dbb79b6a9e7162ddb458f987f44f2e48bcf74776e6ef33d172b2f38e6b46c288401af344386f62d9c814d015be70d38f66b7635ff87bdbdb3
+EBUILD mkdocs-bootswatch-1.1-r1.ebuild 472 BLAKE2B 46e69979231cf4da365f3d67af8c5cf82f2291963253727649f88c43046ee4bef64d578cb6579b418f108ecde5cc5dd667f3daff44b7e311855f61461db26284 SHA512 ab56b80d19caf52350d7ed3011f39543a1819961528f8311cac6d3bfa9ecc254fbc56d4b134817dc66b3e64c4fe4ac31e7b48d965258f1d87c13527cd4a5d85b
 EBUILD mkdocs-bootswatch-1.1.ebuild 684 BLAKE2B ce0a229db0818af7450d2711a789f1ebdd7fd779aecc705a09ec9f69b7549439a95dc431ef25828ebfc83a1987b786426cff17d9ad1324074a85b6e0dd8d0445 SHA512 933427ef910927f7fbc0d688f1cd90184985533f37d4923f17ebfc3428fe6dbdcd60e8db14c6f323f255a5f444cb774a2f23f7eb4b556a0c0f450155d09e9476
-MISC metadata.xml 455 BLAKE2B baf1c6309a414120d78311ab6ab98a54def434d5db9423f4913392277e58fb077cd90ecc01be7502f4fc4754ba5b16ad38bee675928635509b842e5a0d872b52 SHA512 73d4c31dc3bdcd888d50f0d7d84821a0398707ec2f99770f972f4e13cd9c757cc6cabde3a91f074bf729728febb682de9dc7cdcf4386bbc81ea10bbda1378df3
+MISC metadata.xml 519 BLAKE2B e70f9963c86a54c5cdda25d71bc42a81ea0549500bb1d7484b99bd578652f2fe130ae203ba5d54f199f972309ddec739cfd63e9355387dd81cdb248ecaeedebd SHA512 b80a906addf6c39025c1233c4118686b4bc5945a399515271fb32bf7b9eefa2440ef8c67137af16a5fe2ba91b490afb6af4c8f09325e09910e414b6a07182ead
diff --git a/dev-python/mkdocs-bootswatch/metadata.xml b/dev-python/mkdocs-bootswatch/metadata.xml
index 7255a4f3bc43..af2e042302e1 100644
--- a/dev-python/mkdocs-bootswatch/metadata.xml
+++ b/dev-python/mkdocs-bootswatch/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
@@ -11,5 +11,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">mkdocs-bootswatch</remote-id>
+		<remote-id type="github">mkdocs/mkdocs-bootswatch</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1-r1.ebuild b/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1-r1.ebuild
new file mode 100644
index 000000000000..bb9630d5c055
--- /dev/null
+++ b/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DOCS_BUILDER="mkdocs"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="Bootswatch themes for MkDocs"
+HOMEPAGE="https://www.mkdocs.org https://github.com/mkdocs/mkdocs-bootswatch"
+SRC_URI="https://github.com/mkdocs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/mkdocs"
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest b/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
new file mode 100644
index 000000000000..2be9cf960a9e
--- /dev/null
+++ b/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
@@ -0,0 +1,3 @@
+DIST mkdocs-git-revision-date-localized-plugin-0.8.tar.gz 364352 BLAKE2B cfd1709b5c9e1f99ca1a2d8d194634afde6d57aecaca1d2cb70edc21c28d0b210c3497a4214d6a95592bc5a7aad3b88d96b275427f3218aa198ab7b3ae8f364a SHA512 84f19aa13189b74f18f98433939935052f1d757f66972d4f1cc1bfd14b614f8fd57b0ac0dcf41fcb678eb8dddba93ddc78dc776d6a81977d096920128d31f58e
+EBUILD mkdocs-git-revision-date-localized-plugin-0.8.ebuild 1157 BLAKE2B c371bd9d3ff8aacfaaf9df302c6bd6bd03241c939c28ae39168e2a5556f28a65ddd6b04d13db10a02354cfe14a4c44c7b333f5ec94dd88d77706d25e0c504483 SHA512 04e0a37040e0006c71c6899d4a55bf013e117925fd631fc025d62d8e1af4cc732991328e5c6c2054d340c360e62a1cd94b62e3d6da95a87961b0bf88be122f3b
+MISC metadata.xml 587 BLAKE2B b3e4153e7597a2174cb069dd1152530513a2ec479cd06b17514a4b205d716048526b1dd318cebaacfa41f7b8457d7303ce1703bebb429bfafcc85bc934ae2721 SHA512 6be3633fa700424d843bbe6fb5e39286c91f589b1f60900749d0bd18a49f5e207fb78d568c82ba5b1f2cf24b8a7cf13375dcc7acbbe36e719dde817ef2e0dc8b
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/metadata.xml b/dev-python/mkdocs-git-revision-date-localized-plugin/metadata.xml
new file mode 100644
index 000000000000..bb319d114c9b
--- /dev/null
+++ b/dev-python/mkdocs-git-revision-date-localized-plugin/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="person">
+    <email>andrewammerlaan@riseup.net</email>
+    <name>Andrew Ammerlaan</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">timvink/mkdocs-git-revision-date-localized-plugin</remote-id>
+    <remote-id type="pypi">mkdocs-git-revision-date-localized-plugin</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.8.ebuild b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.8.ebuild
new file mode 100644
index 000000000000..fdef23498c41
--- /dev/null
+++ b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.8.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Display the localized date of the last git modification of a markdown file"
+HOMEPAGE="
+	https://github.com/timvink/mkdocs-git-revision-date-localized-plugin
+	https://pypi.org/project/mkdocs-git-revision-date-localized-plugin
+"
+SRC_URI="https://github.com/timvink/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/Babel-2.7.0[${PYTHON_USEDEP}]
+	dev-python/GitPython[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-1.0[${PYTHON_USEDEP}]
+"
+BDEPEND="test? (
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/mkdocs-material[${PYTHON_USEDEP}]
+	dev-vcs/git
+)"
+
+distutils_enable_tests --install pytest
+
+python_prepare_all() {
+	# mkdocs-git-revision-date-localized-plugin's tests need git repo
+	if use test; then
+		git init || die
+		git config --global user.email "you@example.com" || die
+		git config --global user.name "Your Name" || die
+		git add . || die
+		git commit -m 'init' || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/mkdocs-material-extensions/Manifest b/dev-python/mkdocs-material-extensions/Manifest
new file mode 100644
index 000000000000..ca6c0022c5d3
--- /dev/null
+++ b/dev-python/mkdocs-material-extensions/Manifest
@@ -0,0 +1,3 @@
+DIST mkdocs-material-extensions-1.0.1.tar.gz 12259 BLAKE2B 464b0856f10f0b9311d5c6fe15def4af9384354ab86e62392052ae1bb7450bd09ac56b5d3e9f40b252b30c924f1cf35597ffc9c898f0cffb2c11a74b45da4090 SHA512 68bfdde71f654a9ae42cb6d4545005eddc235e74f6a4c49707853de9cb30261c77ab8c8534b15019c7030d01b97a32645f5355a9e6511470466bf0e6f17b6890
+EBUILD mkdocs-material-extensions-1.0.1.ebuild 974 BLAKE2B 5aff45ced7b694314adad5854b0b792caddc074eb3e3ec44d30452b80cf2ffd5ccda2a632bbd89b8b5cbe085058ba81ef93c09cba1cb363ea926b1e0277a0fb2 SHA512 ed80b80442a4483238356f5fc7b6373d8a8c8f3b3bd73e5ae29512c8ef869de28004dfd914869a6c5c17bf81e4f6fc171ecab4ebd10be7c48757e656edd45285
+MISC metadata.xml 544 BLAKE2B 4010ea926a1bfc27af9d61e1d57f34521409ad6ef838f7fe10d7bd57031a636a88e73bd29c76c250ed27df27339e68c509e7ebc8198ea329154daed39624d207 SHA512 b7b65c65a66e718e402a954adc4b40916e3fc7d776b1172fae0fe3b4d098d89938b305b4281741863fe988edbc3d9a2b90426752d59f25375a9c778418b6fc0f
diff --git a/dev-python/mkdocs-material-extensions/metadata.xml b/dev-python/mkdocs-material-extensions/metadata.xml
new file mode 100644
index 000000000000..878e3e670559
--- /dev/null
+++ b/dev-python/mkdocs-material-extensions/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">facelessuser/mkdocs-material-extensions</remote-id>
+		<remote-id type="pypi">mkdocs-material-extensions</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.0.1.ebuild b/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.0.1.ebuild
new file mode 100644
index 000000000000..a5b3893e994b
--- /dev/null
+++ b/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.0.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Extension pack for Python Markdown"
+HOMEPAGE="
+	https://github.com/facelessuser/mkdocs-material-extensions
+	https://pypi.org/project/mkdocs-material-extensions
+"
+SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# mkdocs-material depends on this package creating a circular dep
+PDEPEND=">=dev-python/mkdocs-material-5.0.0[${PYTHON_USEDEP}]"
+
+# we still need mkdocs-material for test, but the circular dep can be avoided
+# by first emerging with FEATURES="-test"
+BDEPEND="test? ( ${PDEPEND} )"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# AssertionError: False is not true
+	sed -i -e 's:test_material_svg_injection:_&:' \
+		tests/extensions/test_emoji.py  || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
new file mode 100644
index 000000000000..4df7a595902f
--- /dev/null
+++ b/dev-python/mkdocs-material/Manifest
@@ -0,0 +1,3 @@
+DIST mkdocs-material-6.1.7.tar.gz 4580050 BLAKE2B 9919a94b008be298dcff569a33c6dacfa783b338cbf1a09afde6f14c85636b9f971f65863d82f9616c527c3521490c945c0d3ad3647adf69ff8e2795a1b43166 SHA512 ddca360760db8a29055bbf41b58d568943965ffe3bcce5b77fbd4af17caaaebba94f41a9dec6d1042c537054ab92eb6da41cc267ef4421d91ed69373417cde99
+EBUILD mkdocs-material-6.1.7.ebuild 816 BLAKE2B 6ce78beccf0bdb6e185e0ca97ba608c0e66ac08628452a8d422f56bb9ad060d65b28b72ca4494bae0c7793795d3e7832dbb2ed382e412574cda083c3b0514758 SHA512 5262baf73d87bc9c6dcbab632c0dc42177925d9601abc784be9050aad2b73256e6a814fd38a8a2be960e14a93c3fb267975b8f25769ee3afa12840f4cb742c07
+MISC metadata.xml 1131 BLAKE2B 908836f444c410650ed620f0346d3d9fd1d34527cb7605ca9ea16c5327a21399423842a857db2804a8dccaebad4ae61bd4cf0dff2362833ba38756aa6dc17879 SHA512 da9a3f27bd04808da31cc9ba1a7fcfd1064a89f8fdda5337110e2472b3e2b95987b01332ea9dd5f70c092bf8ced4baea22e016f7ec3dc813e99053c2f6ea4ecc
diff --git a/dev-python/mkdocs-material/metadata.xml b/dev-python/mkdocs-material/metadata.xml
new file mode 100644
index 000000000000..14b90ae1b176
--- /dev/null
+++ b/dev-python/mkdocs-material/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="person">
+    <email>andrewammerlaan@riseup.net</email>
+    <name>Andrew Ammerlaan</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <longdescription lang="en">
+What to expect
+
+    Responsive design and fluid layout for all kinds of screens and devices, designed to serve your project documentation in a user-friendly way in 41 languages with optimal readability.
+
+    Easily customizable primary and accent color, fonts, favicon and logo; straight forward localization through theme extension; integrated with Google Analytics, Disqus and GitHub.
+
+    Well-designed search interface accessible through hotkeys (F or S), intelligent grouping of search results, search term highlighting and lazy loading.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">squidfunk/mkdocs-material</remote-id>
+    <remote-id type="pypi">mkdocs-material</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/mkdocs-material/mkdocs-material-6.1.7.ebuild b/dev-python/mkdocs-material/mkdocs-material-6.1.7.ebuild
new file mode 100644
index 000000000000..cef41ffedf26
--- /dev/null
+++ b/dev-python/mkdocs-material/mkdocs-material-6.1.7.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-minify-plugin
+	dev-python/mkdocs-redirects
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="A Material Design theme for MkDocs"
+HOMEPAGE="
+	https://github.com/squidfunk/mkdocs-material
+	https://pypi.org/project/mkdocs-material
+"
+SRC_URI="https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-1.1[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.4[${PYTHON_USEDEP}]
+	>=dev-python/pymdown-extensions-7.0[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-material-extensions-1.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/mkdocs-minify-plugin/Manifest b/dev-python/mkdocs-minify-plugin/Manifest
new file mode 100644
index 000000000000..ae1a163adbd3
--- /dev/null
+++ b/dev-python/mkdocs-minify-plugin/Manifest
@@ -0,0 +1,3 @@
+DIST mkdocs-minify-plugin-0.3.0.tar.gz 3101 BLAKE2B 6b3451734d2d87f967c46521350f53cfd3cacdb555777328056ca61ed80e2341da86041be32fe87a0174241e3f36f0f0d7ca43538d0a8ca7a45cc06b6b4254e3 SHA512 97d8cb1ca3b0abfa362b9f71c7f881c889eb08963519ff0a356778b446c62140edb70ec344cbf54df7990e94ef515202b567799d0426e518a1abd6c3886a4281
+EBUILD mkdocs-minify-plugin-0.3.0.ebuild 619 BLAKE2B 21bc69da07457a68305d4fe09e8e624af1de6554bd611de1a1ba66ec30438143acc4b2874792c6e5aa4b9453b1f1d3cb70312f157f2d7cc11e5e6537c4a56294 SHA512 e24e345cfd128b0eefd7770a1e8a868c6be60ef10b90122442336d88eb0673bf711754b144cac5bdb0a9ac385b63f33848f82887b2b513e0946ae80b21a0aa9d
+MISC metadata.xml 530 BLAKE2B 4e36cb35c704c21112be2be62ad527339beeb4aeec3d4b42d1b1f35849403bb32fdda46a593741c6fda4c1e33cefaec505d382f3bea1ad6e17b82038223a48c8 SHA512 e522a55624c75108a9758a2a4faac669e9c980526825b9a1dc3a0175888e8367753f5eb16ae70075580905b0c1c199e883f045d6153807240e56403b601891ba
diff --git a/dev-python/mkdocs-minify-plugin/metadata.xml b/dev-python/mkdocs-minify-plugin/metadata.xml
new file mode 100644
index 000000000000..c68438d47fdb
--- /dev/null
+++ b/dev-python/mkdocs-minify-plugin/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">byrnereese/mkdocs-minify-plugin</remote-id>
+		<remote-id type="pypi">mkdocs-minify-plugin</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.3.0.ebuild b/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.3.0.ebuild
new file mode 100644
index 000000000000..5f83e7011163
--- /dev/null
+++ b/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.3.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="An MkDocs plugin to minify HTML and/or JS files prior to being written to disk"
+HOMEPAGE="
+	https://github.com/byrnereese/mkdocs-minify-plugin
+	https://pypi.org/project/mkdocs-minify-plugin/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/mkdocs-1.0.4[${PYTHON_USEDEP}]
+	>=app-text/htmlmin-0.1.4[${PYTHON_USEDEP}]
+	>=dev-python/jsmin-2.2.2[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/mkdocs-redirects/Manifest b/dev-python/mkdocs-redirects/Manifest
new file mode 100644
index 000000000000..97f522997951
--- /dev/null
+++ b/dev-python/mkdocs-redirects/Manifest
@@ -0,0 +1,3 @@
+DIST mkdocs-redirects-1.0.1.tar.gz 5772 BLAKE2B e48a35b18690c040efcca2e3e6a97650a3f951b89d537537b54b297e61c590099c6891dd1d64f21dd4efcc4a20d3d709a2815280c2846324f9f57b5a953a31bb SHA512 e3eb31ce920aceab2e4c93988853fc0e63ba789db229ac798791061b26252416c5c68b2c221f82e3a08ce7522e6b2aa58ca606b9a31653f782e31c415861f7d0
+EBUILD mkdocs-redirects-1.0.1.ebuild 542 BLAKE2B 81db33554f47e2998252eb9c47c984740453cb8ecb81569ded3997d8b91a03174121a67befdbd84df2cc5e482869d8428193ae263928a0ad9940ee964bd15987 SHA512 08db637eeadd621fe4d9d0c60b0e7a46b9e089bbf9f66dc1ccffed7643e46eb999b8f6824f72b03e2b6832db52f2323da45de2bfe138cbce651c0d53666b92c2
+MISC metadata.xml 521 BLAKE2B b80668d53661025005cf5543f3a760fef99c769f442d2f9b8229806ce13c24fd10af333e85efd3c3cecdc14bdeccad4faf5bb8de1ddcdcac70f16b2cc8c8a96b SHA512 49ecee5ea894994a5a486125bb8775f043052c71acc31fec85e8adf8d8401cc8ef059cbe3523e19fa59372c43d9e6bcbd6b83d53f13d166b9481191d4b61bdd6
diff --git a/dev-python/mkdocs-redirects/metadata.xml b/dev-python/mkdocs-redirects/metadata.xml
new file mode 100644
index 000000000000..de03ad6b9f39
--- /dev/null
+++ b/dev-python/mkdocs-redirects/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">datarobot/mkdocs-redirects</remote-id>
+		<remote-id type="pypi">mkdocs-redirects</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.1.ebuild b/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.1.ebuild
new file mode 100644
index 000000000000..a273917c3f3b
--- /dev/null
+++ b/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Plugin for Mkdocs page redirects"
+HOMEPAGE="
+	https://github.com/datarobot/mkdocs-redirects
+	https://pypi.org/project/mkdocs-redirects/
+"
+SRC_URI="https://github.com/datarobot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/mkdocs-1.0.4[${PYTHON_USEDEP}]
+	dev-python/twine[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/mkdocs/Manifest b/dev-python/mkdocs/Manifest
index 0eaf9a49d619..38b48a76a4a8 100644
--- a/dev-python/mkdocs/Manifest
+++ b/dev-python/mkdocs/Manifest
@@ -1,3 +1,5 @@
+DIST mkdocs-1.1.2.tar.gz 6987352 BLAKE2B 98bf604aa15eac693368e77e6658c3906909a0cdc323772550a65c35cc301929cdc136919a612438563cefd74c9076b2e273cb89e3ffbe04bff2a419e6e36513 SHA512 bf0e5ba8a15524ebe433fce9f2d16404922850ca562339d60e7860e243f9523321cbab5dca1f276a71d3158c7b1bfadfa25b134da50ef1cedc0b1a9658b6f10c
 DIST mkdocs-1.1.tar.gz 6984465 BLAKE2B 878d0351ac477651094b5f33a26d5faa444fed430b72df723d4fe020ee8d6953ee198a9e923aa79a04286445ff673e1d6967ca1740d8f02b37426b33038f76fb SHA512 3e846eac816d9a4f380e2cce856a1785b67c9d855392af8be2eb0de5c9aad7ead19e675fb36ff53e9e3046798c8691908c1d6bfec67f8c74dcaee6852b9c50cd
+EBUILD mkdocs-1.1.2.ebuild 1357 BLAKE2B 11fb2eee3bc8bf91c04dc52ff8c476a7494394c863548f8a4d5a2bb38edeab7dd67c0fb0c0409b5efa6d163e77015190d2f834e025735879d46bfe1466195df7 SHA512 988278e9467ce68ec1a57c0972ca9044c686f075d2ea47f4d439e9cc0963d5eb0ea5a6cecc698973295891e6b6916cc4d10e9b2723b02a05bf4762747925b10c
 EBUILD mkdocs-1.1.ebuild 1323 BLAKE2B 8e6895c8a148781362fcc55ac3c8b12bc693eaacd6aaedc190bdfbb3e321ed26865148d3703b0db83596d4a63bd38041d5f472987a19ffa9aa4e796d9c24cf71 SHA512 3fb4a4197d6894c9916f2ce5e35714db62013dd612e1566f1de4b6ced0de308a5e3a322a6730294b39c0a0da1a7d923964ef155023e1a47b7dd9a8a3ba5a45d8
-MISC metadata.xml 458 BLAKE2B ce343abd6776491064d2ababef8e680cf279e8413ec5007cc9b19a1a4f996706d5e51fcf9dfb74e0f977d6c8067320bf6cd90c28818768c7b3570c27b7f97680 SHA512 f94bcfe8a93ad939c54e501426bdc879a24638d88a434144c5fc2beb5d737845fd79989a204ca92f9fa3209610fe5bc81b74df242ded15ab06d805d9209f6e2a
+MISC metadata.xml 497 BLAKE2B a2efc2d62664734a3756abe29200ff12fc97fa6c4aa761c7fb7ed306af8e25649ae653c42b3a3f134f60f690e798cc841dacc0efb634c88464491ec38feccfb0 SHA512 326222acf4aace54b390b00242acae8ee65ead203f0d83d8836f4db9cddc5b1f86543ca4772efb423eaa235cf8d021ee2b22a873b4ee53ace184e90c119de135
diff --git a/dev-python/mkdocs/metadata.xml b/dev-python/mkdocs/metadata.xml
index 5d57d454ac2f..8284d44ebea4 100644
--- a/dev-python/mkdocs/metadata.xml
+++ b/dev-python/mkdocs/metadata.xml
@@ -10,6 +10,7 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">tomchristie/mkdocs</remote-id>
+		<remote-id type="github">mkdocs/mkdocs</remote-id>
+		<remote-id type="pypi">mkdocs</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/mkdocs/mkdocs-1.1.2.ebuild b/dev-python/mkdocs/mkdocs-1.1.2.ebuild
new file mode 100644
index 000000000000..f5a0614afd59
--- /dev/null
+++ b/dev-python/mkdocs/mkdocs-1.1.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Project documentation with Markdown"
+HOMEPAGE="https://www.mkdocs.org https://github.com/mkdocs/mkdocs"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="doc"
+
+BDEPEND="
+	doc? (
+		dev-python/mdx_gh_links
+	)
+"
+
+RDEPEND="
+	>=dev-python/click-7.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.3[${PYTHON_USEDEP}]
+	>=dev-python/livereload-2.6.1[${PYTHON_USEDEP}]
+	~dev-python/lunr-0.5.8[${PYTHON_USEDEP}]
+	>=dev-python/markdown-3.2.1[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.2[${PYTHON_USEDEP}]
+	>=www-servers/tornado-5.1.1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# Tests fails if additional themes are installed
+	sed -i -e 's:test_get_themes:_&:' \
+		mkdocs/tests/utils/utils_tests.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	default
+	if use doc; then
+		# cannot just do mkdocs build, because that fails if
+		# the package isn't already installed
+		python -m mkdocs build || die "Failed to make docs"
+		# Colliding files found by ecompress:
+		rm site/sitemap.xml.gz || die
+		HTML_DOCS=( "site/." )
+	fi
+}
diff --git a/dev-python/mkdocs_pymdownx_material_extras/Manifest b/dev-python/mkdocs_pymdownx_material_extras/Manifest
new file mode 100644
index 000000000000..bfe08ec5ebb6
--- /dev/null
+++ b/dev-python/mkdocs_pymdownx_material_extras/Manifest
@@ -0,0 +1,5 @@
+DIST mkdocs_pymdownx_material_extras-1.0.7.tar.gz 17995 BLAKE2B a7a8715ec07b9ef5551eadb37e618f45ca2f8f3c707aa5269eb7d2587db70ba29cfaa8027bb606c4264bbf93d7b3950d7a5dc03640b71afc677658b044d064fa SHA512 33fe8fddd0ee5856fdfb02068e2698f26a8db139458d7736715b776fbc2d8ae8ccb3170dbb786c52338e4e7a1612006046eb429f2268469f6f2bb5ba7f8e256d
+DIST mkdocs_pymdownx_material_extras-1.1.3.tar.gz 40029 BLAKE2B faa17e6e4d27a5d5e34a98a6830e34b934f8623fafb87a73051eb424cf95d29c5dd185bbfbbe49dd3e93eeee00a8310ac0543d480ab70e5abee4047b1cecc774 SHA512 340818ebcd8f9cf175e5049028d0932a0d6208de3d8f86cf5ea47747680079c6b9b3bf27e0c32ee10ee6a1bc7ab8ffc6cc3aa48470be43ed32adfde74f44d5dd
+EBUILD mkdocs_pymdownx_material_extras-1.0.7.ebuild 559 BLAKE2B a7f74cc62b62fac5f12309b34a9e458ba69b4e40903cdb148b5e0b3796208298f5fb15f4ed0d471ab1a7c8c2907bcd36292fb12d9f2b596941c5da73b668afce SHA512 6bf499a431ccac63b1235da6d386aaf6dc2e15b2f417a8c83a113e97b20be0654a08580e86c26069a726d57221aa6e08949745c7b584ec05eef3209f5112061e
+EBUILD mkdocs_pymdownx_material_extras-1.1.3.ebuild 559 BLAKE2B a7f74cc62b62fac5f12309b34a9e458ba69b4e40903cdb148b5e0b3796208298f5fb15f4ed0d471ab1a7c8c2907bcd36292fb12d9f2b596941c5da73b668afce SHA512 6bf499a431ccac63b1235da6d386aaf6dc2e15b2f417a8c83a113e97b20be0654a08580e86c26069a726d57221aa6e08949745c7b584ec05eef3209f5112061e
+MISC metadata.xml 1113 BLAKE2B 299eb7a3b73baea4bbe7b4de3646c1eefcec2cd387ca4706b75813722ebb7e63284eb7ec5547ca9bcafae207d837adc057ecad6c553fc9c9df63abde55d5935c SHA512 cf9c484755948b144593a79bbd1594c0993ca875c0c12c6a4f0ffaec3911c0681617c179ed34008b2e578475385a64912dca12709af73831fdc00fc1bf552dfc
diff --git a/dev-python/mkdocs_pymdownx_material_extras/metadata.xml b/dev-python/mkdocs_pymdownx_material_extras/metadata.xml
new file mode 100644
index 000000000000..4f0fe0e6ec8c
--- /dev/null
+++ b/dev-python/mkdocs_pymdownx_material_extras/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+	<maintainer type="person">
+		<email>lssndrbarbieri@gmail.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">facelessuser/mkdocs_pymdownx_material_extras</remote-id>
+		<remote-id type="pypi">mkdocs-pymdownx-material-extras</remote-id>
+	</upstream>
+	<longdescription lang="en">
+A plugin that for MkDocs and specifically the MkDocs Material Theme. 
+Adds additional resources that are used in the PyMdown Extensions documentation, and other @facelessuser projects.
+While this is not specifically meant for outside consumption, and was originally written for @facelessuser projects, it can be freely used if desired.
+Files are copied from the pymdown-extensions project.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.0.7.ebuild b/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.0.7.ebuild
new file mode 100644
index 000000000000..463f6ecd3f86
--- /dev/null
+++ b/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.0.7.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Custom alterations based on Mkdocs-Material"
+HOMEPAGE="
+	https://github.com/facelessuser/mkdocs_pymdownx_material_extras
+	https://pypi.org/project/mkdocs-pymdownx-material-extras"
+SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/mkdocs-material-5.0.2[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.1.3.ebuild b/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.1.3.ebuild
new file mode 100644
index 000000000000..463f6ecd3f86
--- /dev/null
+++ b/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.1.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Custom alterations based on Mkdocs-Material"
+HOMEPAGE="
+	https://github.com/facelessuser/mkdocs_pymdownx_material_extras
+	https://pypi.org/project/mkdocs-pymdownx-material-extras"
+SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/mkdocs-material-5.0.2[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/mmtf-python/Manifest b/dev-python/mmtf-python/Manifest
index 1f96561a89c4..a6c35533f703 100644
--- a/dev-python/mmtf-python/Manifest
+++ b/dev-python/mmtf-python/Manifest
@@ -1,3 +1,3 @@
 DIST mmtf-python-1.1.2.tar.gz 46309 BLAKE2B b21d53f7cfbdf6f6bd4f0f3ac31a846e83ce0ee98faf77fa8d06de7520c4aa64a259e8b43a744a440a6cf1a10ad461697334683364698a68222b690301bc5554 SHA512 92afcce48c2de186cbf9c2cb39c94c5df14ae0eb613862d41b674b7d2f338855ed81be23fb14d16d2dfc8d33415d3904537ef4a422e3a52b78d461b609e968ca
 EBUILD mmtf-python-1.1.2-r1.ebuild 464 BLAKE2B b316e8f8cd44fa02f3991d751e8a0567d952dd9e678a6984fd5d23b0f1a1ad6b1e9473ef5a36e86dee79c2136c4f1925784fe60911931a9f2aabd38256ee164d SHA512 9d80eb7f34c2ac5296bca41d83ba0f29e23b3bc4c7f673d8152ca0ea4c6da8ada252c500d4fa7158590fdb5e789c33dde9cb1fe6029ef09b2e718f0ea44dfc4f
-MISC metadata.xml 430 BLAKE2B a69050101da1e1dccf6b335506250cfaac02f1b87c87946d72aa1c3649c2f5ca107c4772b9dc410088397be824c59b2c9e6e611ba548b7b007aa22e7d9a12a46 SHA512 1245d1c1479afc4dde1a787d65342997754715a530a81d73fac1512a5d20e54fb36c80c1be1fe017b1ff9c14ee786f3b0da6b1a7bf689619285c7a86d5d376b5
+MISC metadata.xml 479 BLAKE2B cb1085cd5b0a4a95c1dbace69a4bc2b7119f3537e65781f9cbfcbccd0b4b5155eb57000964238136b139823728becb6e88c3bb476d6c6728e6c6b6f601be6730 SHA512 971b1ebf30a386f214bf3f1a3347a4277f7de0a3388a81fc1628920f5cdc1b9c7d628d8235b93f9a4d70ecb9141a531e26c5750af2a1fed3b623d42506607ed9
diff --git a/dev-python/mmtf-python/metadata.xml b/dev-python/mmtf-python/metadata.xml
index e4904232b6f2..8c129ea8bb2e 100644
--- a/dev-python/mmtf-python/metadata.xml
+++ b/dev-python/mmtf-python/metadata.xml
@@ -11,5 +11,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">rcsb/mmtf-python</remote-id>
+		<remote-id type="pypi">mmtf-python</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/mock/Manifest b/dev-python/mock/Manifest
index 9a225e006e78..f1da0909d1fa 100644
--- a/dev-python/mock/Manifest
+++ b/dev-python/mock/Manifest
@@ -1,3 +1,5 @@
 DIST mock-3.0.5.gh.tar.gz 67887 BLAKE2B b9c49b3627275889d73aff9ea9c7925093f9cafb304448b2f06eda2fff26152a031aafb4844537e4d58bc112709e59a44e08d32602776386a30d039743def29c SHA512 9ab4f0c794f5701ba1367d982cf79a5662d4233753d12ed9c88ae20282db1f44be73f84c4d9f6d03ff64926b8c1b6d0c9a79b2a4724a3eb36c247ffd4ab03e2d
+DIST mock-4.0.3.gh.tar.gz 80318 BLAKE2B bc0dc8b97129eaa2f0f9c89898157ea5de398f59f4e2ebc07318cf745b74d1f1bcc989774600ec88ce1956f9fe16f9464f101ea5df5cd23b3a58b432d19feb8a SHA512 adfdab253eb3bc1b6cb767c58ffa3a8a5c5f88da0f04ea6680e0d87da59177972d2d99bfe0a770ac2ed4f809ca6a090a9d0f789eea8f4365ef2c54f8e8792e89
 EBUILD mock-3.0.5-r2.ebuild 1480 BLAKE2B f1d156fb43b69ee9c8aaafd77c8d0179b43e3e8ea14a53d61b1e82799d7ef4e388039564fe39f9fae67e31c39c546850ef85f13f5e3f9b8c84807bb3300316cd SHA512 ba39fad32df534db43a31031485e3ddebafa314a2ac26d168f40822f5d6bedc8d4811c16de2cadf9b39fd7ca70735087126d88f1645c962aa95f1e0dcf9f27be
+EBUILD mock-4.0.3.ebuild 1682 BLAKE2B e2fd5eb9736dd3c7b70a91d2c7b983707b5fc71393ea9caafeb3a35c75e5298c6453175b92f5cdef18b2a18f057da332872a2c936477f67ec5910a567012dc37 SHA512 63e76153b85ec64187806491f969f171bb3c56aee189b0ae8bf01cef6f9cecc79e11451f5c2264070b28c1f0a0225223e65c81de6d0b5e3a9f38e15ba0a174fe
 MISC metadata.xml 365 BLAKE2B 80ce989b7585192744838e804490286b598d6a4e082a2e88fce1efdc34c3ef3185478fa6ce3f08c81dd680c62b4de0c7eff3fe7c926d96479ab856aa46c69250 SHA512 89eda97d1f0ece91d573a9fc4fb5d357733b757b1214a56c7bb14a10f84e1c275d2cc49ed773597c4e320df03f751fb093fef7f3805deb450380df4dd83d875f
diff --git a/dev-python/mock/mock-4.0.3.ebuild b/dev-python/mock/mock-4.0.3.ebuild
new file mode 100644
index 000000000000..d658150ed21e
--- /dev/null
+++ b/dev-python/mock/mock-4.0.3.ebuild
@@ -0,0 +1,58 @@
+# 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="Rolling backport of unittest.mock for all Pythons"
+HOMEPAGE="https://github.com/testing-cabal/mock"
+SRC_URI="https://github.com/testing-cabal/mock/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/funcsigs[${PYTHON_USEDEP}]
+	' -2)
+	>=dev-python/six-1.9[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-17.1[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	sed -i -e '/  pytest.*/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# Upstream supports running tests only in their dream pristine
+	# environment.  pytest doesn't work at all if mock is already
+	# installed.  We can use plain unittest but we have to reinvent
+	# test filtering.
+	cp -r mock/tests "${BUILD_DIR}"/lib/mock/ || die
+	cd "${BUILD_DIR}"/lib || die
+	if ! python_is_python3; then
+		rm mock/tests/*py3* || die
+	fi
+
+	# https://github.com/testing-cabal/mock/commit/d6b42149bb87cf38729eef8a100c473f602ef7fa
+	if [[ ${EPYTHON} == pypy* ]]; then
+		sed -i -e 's:def test_copy:def _test_copy:' \
+			mock/tests/testmock.py || die
+	fi
+
+	# Avoid pytest dependency
+	sed -i -e '/import pytest/d' mock/tests/testhelpers.py || die
+
+	"${EPYTHON}" -m unittest discover -v || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( CHANGELOG.rst README.rst )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/mongoengine/Manifest b/dev-python/mongoengine/Manifest
index e0666ae5c5ee..9677dee5dbff 100644
--- a/dev-python/mongoengine/Manifest
+++ b/dev-python/mongoengine/Manifest
@@ -2,4 +2,4 @@ DIST mongoengine-0.20.0.tar.gz 311698 BLAKE2B 11bae8d342a77bcc241884beb92d67a6d4
 DIST mongoengine-0.21.0.tar.gz 320173 BLAKE2B 6c53c8dd967209039a3c2b6e279e6a27cf7073a6284b0df70aff25004c8499e88088d934eadf2e23dc3f43cd2ebc0d3c202cfbee618772b8a794a6ef933a9a75 SHA512 37642e9c9333fb4480262e916d678ef04a1f839b62e7d58528485b7df7cb9b22d3cb0b093084fcb92e331698c7d5bf2411df5d0c6e6b9324748189b9084c3f54
 EBUILD mongoengine-0.20.0.ebuild 1497 BLAKE2B 0282934e3d29ee3944cb62e5de1cf7a26e64f3b08325c80fac6459a47c3740689f431051837789ed75ebf4d93c3c39f730aa512ddb5b1aa8ddc5aa1ab435c87b SHA512 62fccab4b550fc85724528571b476f5c901ca6cf86725914d416b5ed4ec7726d8c576d73fb3bc8051c805e2dd92d3da345933f5aaa0367a6eb7a9bd0a0c35c5a
 EBUILD mongoengine-0.21.0.ebuild 1499 BLAKE2B e7e1f7991a765cd0e39accac336cc42484953a90f8ac8b0ac351b434d41610f301ee09e5076421ecb04ca21cf8329ac2edc2dcdcfcab2b2a4a56509f9f8c9e4a SHA512 03ec2d70d29d93b827f17cc7742184d6be0b76cf53ec3036772a39cdb8e7374bd5f949920411a653e12345e6c85cda3b4504ae02ef7cefe8023c74293951da4b
-MISC metadata.xml 338 BLAKE2B 5ecb99b784399bb9e25c094b38e6585d5dd6dad6bade4eebd9b986e5022ef89417e11151de2528439754717c76c9601aedf24dd3295eca09bf0c59f9bc1130cf SHA512 b25628f5af0a4c32d9ec8d7bc4e39ccf6bf2c9d9bdaa60bec2a3da846a9a290944822a1d8233cda735a4cf3a801acbfa47826f6bb537ce5c7efedc669282e523
+MISC metadata.xml 377 BLAKE2B 737ab5a0b7b3a591a55f04554e53f1f88396ea8e75f9025bcfee270be90e049f8c18e8d4fbd5e667dedba8634b4d0ac8582377b10fa96899ae69f71f3346bbc0 SHA512 60f782b55ccf2a21a5b92af459c6feb04d859bb74cc257be820fdd9bbd4adfb989daf8ca64fcc965b9f7f2f1798be109fdfb78c5e2d1f6a291beed497aba4f8f
diff --git a/dev-python/mongoengine/metadata.xml b/dev-python/mongoengine/metadata.xml
index f96ee66ae8b3..1fa49211b39d 100644
--- a/dev-python/mongoengine/metadata.xml
+++ b/dev-python/mongoengine/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">MongoEngine/mongoengine</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">MongoEngine/mongoengine</remote-id>
+		<remote-id type="pypi">mongoengine</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/moviepy/Manifest b/dev-python/moviepy/Manifest
index 0829ba400b06..37bd0f358b5f 100644
--- a/dev-python/moviepy/Manifest
+++ b/dev-python/moviepy/Manifest
@@ -1,3 +1,3 @@
 DIST moviepy-1.0.1.tar.gz 25746520 BLAKE2B 5e18841596e967a1531eef5d7cef8f96a636486923a874606c453bfda92d8ca8657afef9eb46c2b4b3bf7ae58d138866d7497cd088509d403dd6722fca8e8ec5 SHA512 3cdccaa13dd31529a17d480fcd01b5f89b421eeb618425e9fa9a114159d65aac979022507c3f9c64921af60e4c9d7970e6a3223d7942c08e67d7e696618e9abb
 EBUILD moviepy-1.0.1-r1.ebuild 881 BLAKE2B 343ebb41f22c67e33320ed191f55c6619df50b4345784f14a4173a968e83dcd8eea7fe4d07f633b2940156f94387d01848ad89a44c20ec612d443aa489c1ba92 SHA512 ac55907988b14da0b23e2906310bcaa9fea580b6509155b6bd64f216493272b93e37a105df290395f274a668b998a1b07853a1b8ae2f535c9f0ba2113a698ef8
-MISC metadata.xml 724 BLAKE2B cabd74d74df2e210cf78302b569cc0d2d637f4019ba1daa3434d4788b2e9403efa800c0b4f0d28cabbb8ff57f4249ae20ef2dbfe25f7fa5356c76e93ad779bbe SHA512 8eeb09b7a3471cf2b989ea66a78a3e0d57d71ead56d3131dc53fd411cc9ae9db928259ae95a8e7d4894f1c5d8346b7be3c41e61ad7a51273a2709bcb0f3815fc
+MISC metadata.xml 769 BLAKE2B b71506e3017e5b8226ffb1999e44a6f6206f274662a535fc17a30316269a82ed295e1c6e9b397d516ccbca863692114e47650e13eabd1bc0aaeaca3e13205d50 SHA512 27fb69a47176ec71e174b8ac35b84a59c781317ab3baaa83575d8828facdd31f78f31712d01da0ef6b82b29b17e6c3e6e6e69fca3db8b4491288e14afa43bfef
diff --git a/dev-python/moviepy/metadata.xml b/dev-python/moviepy/metadata.xml
index 2d8df5034830..3168f6c9453e 100644
--- a/dev-python/moviepy/metadata.xml
+++ b/dev-python/moviepy/metadata.xml
@@ -17,5 +17,6 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="github">Zulko/moviepy</remote-id>
+		<remote-id type="pypi">moviepy</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/mpdlcd/Manifest b/dev-python/mpdlcd/Manifest
index 1223169f5b74..b8015a4473f9 100644
--- a/dev-python/mpdlcd/Manifest
+++ b/dev-python/mpdlcd/Manifest
@@ -2,4 +2,4 @@ AUX mpdlcd.confd 275 BLAKE2B 995143391e3c30486cdb98f1633005c9a059124ff2fe5a3c2eb
 AUX mpdlcd.initd 367 BLAKE2B 01dafb969e424a3dd57578890676b882e47757beeaa077cbdd76fe92cecd507901d01182a26ba7569975067548f3d24625736e03797f481c29ecb2d216e53f1e SHA512 09124a0b71a1425fb8a8bfaf0c021131a5e738856433a33e716eb691a353108b0bebff8459db190be5068e1dd5927a272cb859971bb7958d7e1eb7019325e8d1
 DIST mpdlcd-0.5.2.tar.gz 30748 BLAKE2B 5609ac149a9aa806e516202adf1b9d0f4fc88e8370f331edc836082d7b3b85c519097149dd2b5cb838d8a9ff353421e17daf9236397e4b37e2923948f8dc9dac SHA512 e000120eee1ce99b549c5ac0cd00fba394ce1a373cce3dde819f6aabd6fc3b616e59ade6d6868b1e9f14afea4897cf541f2c3f5d0eaebcbbd03b15781a63b6fc
 EBUILD mpdlcd-0.5.2.ebuild 692 BLAKE2B 66a22c6a7d13c492b8c27e734743bd882acdc6293204ff11ad08ea0f64160a0ab8c3fc4b2395f5aaa98f53fd8cc2d1878effbe4c7a3f5e34633b2494b82eebc5 SHA512 b3bc07b011fed884623134dc3ea7fb4f0a4ddd3c2e8ab7b7b955cf2b32e0dc04447d9d85af6c78b7c9dbf022d2f44203bf2bc88ae4e60f7b34d9f77d02ffe233
-MISC metadata.xml 631 BLAKE2B e262838d612d40e33e7294517b2321c74c3a10e9e7757653db0d3206da191d239b717d8b63a67bbaaa8d90ce205665e175e7c7e69e936d900296727fd0218fe7 SHA512 755679357afeddb0ced255516a993bc6293fed76e2a876d8ff58e44b5292d65b2686f0593dd103460d64a83115094ec0257b053f7ffc88ab38e7d44cd4baeb0f
+MISC metadata.xml 675 BLAKE2B fd025f2d957a2f981cfce0cd485ab5fd8ef2310bea5d3d2b9e0c31626b8b654b0d8f099197fb65e7487a98ab2e7b819681ca6d72dd82ca511cd05d6677fd9314 SHA512 9c73530f9f573c3a7fbddbd69e670270ae9960c633ca285890a6f4f5a03ce8eeef96e88b474b5bbfcea2a27df67b78ab2c5b158212010a86cb767d3ecfffbe27
diff --git a/dev-python/mpdlcd/metadata.xml b/dev-python/mpdlcd/metadata.xml
index 47a1342d704b..cf6906910be0 100644
--- a/dev-python/mpdlcd/metadata.xml
+++ b/dev-python/mpdlcd/metadata.xml
@@ -15,5 +15,6 @@
 	<upstream>
 		<bugs-to>https://github.com/rbarrois/mpdlcd/issues</bugs-to>
 		<remote-id type="github">rbarrois/mpdlcd</remote-id>
+		<remote-id type="pypi">mpdlcd</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/msgpack/Manifest b/dev-python/msgpack/Manifest
index 710183befbec..979dd9ee8986 100644
--- a/dev-python/msgpack/Manifest
+++ b/dev-python/msgpack/Manifest
@@ -1,5 +1,7 @@
 DIST msgpack-0.6.2.tar.gz 119062 BLAKE2B 6b20a0d31b811ae66e66dbfaacec6f0cf2152b2937423b78f3e6244bfa49c87767788c5ee1db41b9020801b8777a4c15b1fe1853182718adf622bc7e1bff858e SHA512 95b92e3d35e0500dd4256d18bf76e586e57cc66319b4459ac5daef599277a5049177a89ad86e291dbdc4c7a918901a89d9218353ddc4a7d0b399e8a98afef363
 DIST msgpack-1.0.0.tar.gz 232331 BLAKE2B ab7b3aede06c31e0cf70a7f7fbdf2b1dddd89aa2d5d9847b11117c66a2f4572ac468674cdbcaf79bc571278f02429d223aeeb0ea8cb50c31ad251142642cc05f SHA512 6dc168b111cd37807e8e8a09840d1b116d7f38d56f4622b9d36ab7dbd983ebe2f34e763f48c6348148c6945c9f1c9a0f83f5f03e12d12bc18f7b8e0cbd669f87
+DIST msgpack-1.0.1.tar.gz 123151 BLAKE2B 4f040d6e292c588f20043e0091702e9a848d94357784ec7ef7a2ed2d1b5a08cae0bfea4a16cbb67e32b071260f25a43b0507d154ba7f6e180e65a60e3a2b4e9c SHA512 87412cc4022ce7ec82cfe376fbb3c663e5b7a430c2178cacbfe95b35489d95f314bdaf83a6170a7956f42939535ada3c5cbe45c6d7c105410494fe7e9a5cb870
 EBUILD msgpack-0.6.2.ebuild 965 BLAKE2B 22e255852af105f9ff8076270f05d98539d4524f18334fe688222e271d52b775bea7017bdce52e3055a551fe90c5c3141bc3ae7399ab2ddb0ffb23c1e5154bf7 SHA512 a8b61e21a45683de30bf09f9faf22b926d47e38215e756b9735cc856789832a2bfe18dafad61d073049d5211eb1621be3d77536b024a74cf8241ebd34b3426f5
 EBUILD msgpack-1.0.0.ebuild 923 BLAKE2B dc80e570b84b80441c093f501ea2f412c6517b733dfc64c4235a61bd87fc705e9efe5045bdc81294685266edade3220983772297993376783d3960f6ef929f70 SHA512 53faf2e7be9c48b133f4872af4683b055bd9a4d8a43129519b7ecbb2f648f758522457d132501ebd54a15db9113a20ea3fc1f966c842537e45507505d906ea74
-MISC metadata.xml 550 BLAKE2B 6627bc6b0f417157d1728bac9f8bbf3cbd69eaa4f2b5ba25ada62f01295342ddf5231563e1ab7210acaca476cb807572208a26a20674aaff79bd8c4a47755d92 SHA512 519d1c9d2ce1825bc350fe4b1338246c37d38cfead466989976da6dceca8d033ac33b135b94d9feea79fc555017d681031f414aeb6a09de302ed9f11b6e35416
+EBUILD msgpack-1.0.1.ebuild 939 BLAKE2B 5b6a858a380ad896b10d531ee36d75231ce15e93aeb7d41aa01b2761368fc46aea22a17b64e4bf084091c022647c42da23a023cc281b87b9474109cb64c63ea5 SHA512 6644271c146dd9a72cd68c422c683d70509999e5414bb9c009203ff71143d332fc5f1501c2bcaa371d3c9c0669495319dbe504f05bc8e09605e912dab93efffe
+MISC metadata.xml 519 BLAKE2B 2947e6ef092dec03d89e409684e08b7f8f2bdee001e0884424f75f9473bffa9cedc99d0932f83bce5a4e255ea29a02819611ec9eb3d16767b50a24982172e1e0 SHA512 27e121bfde1989d5018dc5c87d29b8cb317b264a41ab4480d6c13332d78219e23cb4cb9f803fdbf9198305af1d831000d5e1fa2e2e975d76425a73864561390e
diff --git a/dev-python/msgpack/metadata.xml b/dev-python/msgpack/metadata.xml
index aef3152754b4..fde6cfdeaac7 100644
--- a/dev-python/msgpack/metadata.xml
+++ b/dev-python/msgpack/metadata.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">msgpack-python</remote-id>
-    <remote-id type="github">msgpack/msgpack-python</remote-id>
-  </upstream>
-  <use>
-    <flag name="native-extensions">
-      Compiles native "C" extensions (speedups, instead of using python
-      fallback code).
-    </flag>
-  </use>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">msgpack/msgpack-python</remote-id>
+		<remote-id type="pypi">msgpack</remote-id>
+	</upstream>
+	<use>
+		<flag name="native-extensions">
+			Compiles native "C" extensions (speedups, instead of using python
+			fallback code).
+		</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-python/msgpack/msgpack-1.0.1.ebuild b/dev-python/msgpack/msgpack-1.0.1.ebuild
new file mode 100644
index 000000000000..52f240229934
--- /dev/null
+++ b/dev-python/msgpack/msgpack-1.0.1.ebuild
@@ -0,0 +1,38 @@
+# 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="MessagePack (de)serializer for Python"
+HOMEPAGE="https://msgpack.org
+	https://github.com/msgpack/msgpack-python/
+	https://pypi.org/project/msgpack/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~x64-macos"
+IUSE="+native-extensions"
+
+BDEPEND="
+	native-extensions? (
+		$(python_gen_cond_dep '>=dev-python/cython-0.16[${PYTHON_USEDEP}]' 'python*')
+	)
+	test? (	dev-python/six[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Remove pre-generated cython files
+	rm msgpack/{_packer,_unpacker,_cmsgpack}.pyx || die
+
+	if ! use native-extensions ; then
+		sed -i -e "/have_cython/s:True:False:" setup.py || die
+	fi
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/mss/Manifest b/dev-python/mss/Manifest
index f0354c77a83a..daf0f61fb639 100644
--- a/dev-python/mss/Manifest
+++ b/dev-python/mss/Manifest
@@ -1,3 +1,3 @@
 DIST mss-6.0.0.tar.gz 90010 BLAKE2B 0e4f0a2dbd720d83c496dc3fe618a2fa8057c378426a5b758ccaa931a819a354732d6ec6d220ec02292d08ddc111bbccf89676f32bd124ba084dbf5e4d1287ed SHA512 751fda0fd988ff14e80d7a8bb35c3ae9101a85f4e37dc297b6fc8ac23f7484faf19b07424081183157c7617c95a41f31f74f2dee0ff3bcc8d6bf1a699732af6d
 EBUILD mss-6.0.0.ebuild 763 BLAKE2B 36e6e807fc17be6e38c4b9f54fb4de534787d76db17f074eb748ca7823a10fdbbb869b376f5349b65005f2a14b3831031661b3d4f680ac7b2e0d8716ac0795df SHA512 5f88720683c5988908b763742c88df4e67ecea223a9dd8ba6cafa2ab5f0ffcb62df77fc22c36116b8709f922380826072d21bf18621fc66789f46a7c9994e7c4
-MISC metadata.xml 375 BLAKE2B 393138e315b4eae4dacb9339fbb5766e9dbaa84b7482babaddc08d524fb8b9939f6622ee9c6d09b66c61ac270fcc483fac39996a12ba87ccccf7cafd4c6d36db SHA512 9a44b6b9de4d1a61d6af9256519473541d5513cef349c15178c025dee3aaaa3f6772b1be56576411a985fcd9c70029c00743d8f577be8eaec4c5a44646c9cbf6
+MISC metadata.xml 441 BLAKE2B 4d0da1440a36048c62588619ad04edc4a3229d7a36d68907f73c26abf1a989d082475b2773fa5647f73316cac6450d7af5e2511db98daeac177236e891f3f150 SHA512 d8b7b52688c123eff1038d6b7f612d05ff7eb06af37588d73474eddb225c3feb88832d1b2a1102dcd5d1a2207a766961b228610c80cd61e72f4feaee80d1310f
diff --git a/dev-python/mss/metadata.xml b/dev-python/mss/metadata.xml
index d22e99d73577..33e44966d1b3 100644
--- a/dev-python/mss/metadata.xml
+++ b/dev-python/mss/metadata.xml
@@ -9,4 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">mss</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/multidict/Manifest b/dev-python/multidict/Manifest
index b1efcfbd6fa1..732be70a380e 100644
--- a/dev-python/multidict/Manifest
+++ b/dev-python/multidict/Manifest
@@ -1,3 +1,5 @@
 DIST multidict-5.0.0.tar.gz 57790 BLAKE2B cad5cac04ab8ea204bb98199a8b5985bd308f7db59e71514a78f0bc79cd92667f24329b101638d5cd14254187c344549a8ce8dd6c514b322b50bb05dfa15cc6e SHA512 067bad79b331a4b86d023f59af842e5fa99fa50d09df13538a86e6c1c754b1862b8fa812381149f2efcd19f1a7ec6934f583cddf47c635dce909ea8c7847f411
+DIST multidict-5.1.0.tar.gz 58801 BLAKE2B 9b9194447a7d91d673b07e440d5f1d2068c79b15890c63a5ab679016b02471996adc73173bb303c14609b2aec230d8ebda36ab978b22b67c008f6b03e6f663f2 SHA512 7dfc8862048d274f37341dda72d93c0fab6d5463fade4f5e241f5b8bf65dcea5c0b5120376847a77f00c7246e87a1cfe14502b6f64bf97e4d00594fed6735466
 EBUILD multidict-5.0.0.ebuild 748 BLAKE2B 28bdc7b96cab9f7925e56e49e870ac3d72b3508684cf2d1292d85ace9fceed9b50dedf081c5c98abb311c513fd4a43526cc587450c97d72755ca50c8c8f646f8 SHA512 40b09ed07bd4ceae2e1e923765fe835c6e3506a72faf2f1aac8bcb3bc7cb9eee69ddaadfe533bf73b8d94a0c420a8e3a8106741619843229346838ba90f9dae1
-MISC metadata.xml 428 BLAKE2B 3f7c1f816583b35bd0150ae21c61142bbb7ac5b216edb5011bc032410e408f2566801db025c8f6274dafbfc555b0b32aaca2708684a3601ffe8d371b23e0d556 SHA512 edb199503c42c55b838b5338656b41e760c90ec3e81114106dd352e2c3886f0161a0c6ef258c5c0a0728d2420bde5d26dea41b25b030eb947dbacd702cb2b594
+EBUILD multidict-5.1.0.ebuild 756 BLAKE2B c01d3fc49376c03ad0d491b356469d513df63f2757d992f0cb5e2713b52eee82288901c8930e14363d0e07d88c81a4c3e3be76c2c878c02071bfb3ae04585c44 SHA512 32afbfe5b8d87e667baa14d4632fb2fb0bbeb728f3225678974d6d63d0a15c5c0982c55acc939410c2da9a488b5872d8be528ce495b73fc97ead6ea9d1ec6450
+MISC metadata.xml 475 BLAKE2B 29991d1ee4ae7390538396f192e103c82dd62d6aa29bab5e90ed7f9f0b7ecdf144bbb77ea40c9874cffab5dd345944554cae08e46d9cf3dfb723444eea7cab3e SHA512 1d99cd5f4b1c2a09f3e890ba2b0cde53633f56230397f33f82012e6e3aee6e4054f959788f04247002c824abe71faed324d8bec425ba83e206719eca84864e17
diff --git a/dev-python/multidict/metadata.xml b/dev-python/multidict/metadata.xml
index 3d66a95ddcf0..73a1bb0ceb7f 100644
--- a/dev-python/multidict/metadata.xml
+++ b/dev-python/multidict/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
@@ -11,5 +11,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">aio-libs/multidict</remote-id>
+		<remote-id type="pypi">multidict</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/multidict/multidict-5.1.0.ebuild b/dev-python/multidict/multidict-5.1.0.ebuild
new file mode 100644
index 000000000000..1d0bc89295ad
--- /dev/null
+++ b/dev-python/multidict/multidict-5.1.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="multidict implementation"
+HOMEPAGE="https://github.com/aio-libs/multidict/"
+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 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+BDEPEND="
+	>=dev-python/cython-0.28.4[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs --no-autodoc
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't enable coverage or other pytest settings
+	sed -i -e 's:--cov.*::' setup.cfg || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/mygpoclient/Manifest b/dev-python/mygpoclient/Manifest
index d3bf6ae1436b..de2598db5fd9 100644
--- a/dev-python/mygpoclient/Manifest
+++ b/dev-python/mygpoclient/Manifest
@@ -1,4 +1,4 @@
 AUX mygpoclient-1.8-tests.patch 1635 BLAKE2B fb92cd995755013dbb2b35424de88d5c949485e818be45e00c89192bb60b9506690b971fd586c08d7be31e7680c54586a015cd8dee299320fbbccf87c9ea70ab SHA512 9036f3328ed4980858db07f57661300e429c15ca8159118067d1385f8cf0ed5fcbcb7ef498dd12336c9fe2b8e5d22c944b8cd1f4043d418c5ce2b706a47aa239
 DIST mygpoclient-1.8.tar.gz 43671 BLAKE2B 0a1c10c00a9ee034acc17bb5e28d1ebab50a14f3eea534f4a4277172251ce567a26e7ab66859a66d89d4adc06f44dfe5899edb0aeec45e90e461a4a8cb3ff337 SHA512 1edecd5ccb116c7f4017ebe6572439d87ff76501ed0628934e548dc0c9c041127a11ec9f4def4a54a6f7fabe46a461c863ec2ff2f8c14c3c67b5d1fd9285bb9f
 EBUILD mygpoclient-1.8.ebuild 1166 BLAKE2B 782fbeeb8c3f2d88e476ba6450b64ef94b17999a3cc6b99b08f8dd72d90962c3024a2b228b5a2b7078e50c8a7bc959a28fe4ea74d8cb532f08ee5929e60ad319 SHA512 b19c05cb7dd7f3fb231780829c4441e8a395352c914aeb31c744134a7691865ff9ebf3506837e474ccf8caccee4b55d51478c20535320886dfd05ad93fda9298
-MISC metadata.xml 346 BLAKE2B f7a2d7e94b509007e77797724c67413616c4833eab04227f65088bc01cee098da763738c810adcfd0be1b13de261240b24d80ca2940925a847df4638709cfa1e SHA512 83fb6ffd70d907e1fd4be3ba91e781cf9131a980338b2fe66874fecde7673bd40df0005b34f5f52c2a7ec88e4b3e92ef2417d293474c1b51ecd06ff4ee6edf2f
+MISC metadata.xml 428 BLAKE2B 58802ae7221566997ff991e63cb65500ac5dbdb8b07279a8470de8fd3255887490dd42c3dd263aeddf4c44bb86363fb252f7ca8894d220d05a0b2b1b21ab36cd SHA512 2e65449c464ab66671afe5d64085b8f8c5ab0213d362e27d2a5f9dd70320522f8aabd9a0a65e8092a8eb4b22b1f276d6ba621ab82dead4c25e58c8bab608c7cf
diff --git a/dev-python/mygpoclient/metadata.xml b/dev-python/mygpoclient/metadata.xml
index 920281b72fbe..20e1365b4c74 100644
--- a/dev-python/mygpoclient/metadata.xml
+++ b/dev-python/mygpoclient/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>sound@gentoo.org</email>
-	<name>Gentoo Sound project</name>
-</maintainer>
-<maintainer type="project">
-	<email>python@gentoo.org</email>
-	<name>Python</name>
-</maintainer>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">mygpoclient</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/mypy/Manifest b/dev-python/mypy/Manifest
index 0b1fed72bbd6..6a6f4bfb344d 100644
--- a/dev-python/mypy/Manifest
+++ b/dev-python/mypy/Manifest
@@ -6,5 +6,5 @@ DIST mypy-0.782.tar.gz 2529814 BLAKE2B c75771fb40524c2c8675236eaaddd6e39d13b4fd4
 DIST mypy-0.790.tar.gz 2082487 BLAKE2B f8efcb701b4b7533306948721968c9a01ab6c6e56ec99fe6c36e35aca50b52f29f518aee2268a628539a372b8024094ef2d4d87da580b4dd667f41133351596e SHA512 be670456bb64cd197bb6a73832b7e0fd6439ae4af128212328a41cd93d9f644a82e79ffb05bf4695e99bd9788244a24916bf765cf30a6f162cf3b471f45c25b8
 DIST mypy-typeshed-5be9c91.tar.gz 583006 BLAKE2B 08ab2b6d479ccc66493524482051e825c65c0a94ea5cac8e56a8ea1dca85eda6104e4ed3188b7d5ce1ea99058019d66a21a7e270e3ad9df694be67ea1e6a7ce9 SHA512 2912bcf66e0f550941eb9c1f34979644857448a4bec478cfc0d662e9a401ade93ccfb2f57b5348504b4d6f0f23e576da609167f1ec3a0861414fc9c7dea80243
 EBUILD mypy-0.782.ebuild 1732 BLAKE2B 421a685a5fb0be2387eee68c456deec4f5192758005d50692a1dcf0eb99a07aefed0a042edc7c8463de571b72031f87773b3531c9a1a9033655acee54bffdbf1 SHA512 b56841be9080cdce87d8bd8b8ccac677dc0bf67a50e6390d6ea894ef2c528563f692d4cf278d78c6d7a1eec0daa198d7f3a05486d3067942009555302d6732d5
-EBUILD mypy-0.790.ebuild 2384 BLAKE2B 63a59328bf11f2f86c25361c4359ffa330d4a540a255e9bc3ea10ba58e21426de2fd82fedae1713d8963468315cd72251bcaba59ee3a49ac5bd5e06cfb997c76 SHA512 513c8d2ef8533084fa81adb656f729fb4921958c5b39035b0027bb1c899e496ba7f3c419f9542c5adfe871f13f191de62253d02ca727adc29b90fb2920faffbd
+EBUILD mypy-0.790.ebuild 2408 BLAKE2B 59eb841aa110a345b41cae5a6e50ec2b37067c4c8b16120c1fa303dacb3cabf141499bbd330568a51853c291c9dddb5bf988e9427b0a82aa8c6769d184f4dc3d SHA512 7bda31f31997f13d9fcb72a23595d855d53d92ca2869b3a0fa0a59af082e0e05ab319724979dbcae75b765827d3f281b941d5b7f189b6a79bff3449dcf56b9c7
 MISC metadata.xml 586 BLAKE2B a75692d2b46a9bac5362c4a5111de861297ae5829654d14fa7eaeaaad8eee2ab784017e073423a0e4c8dc845f035884de80c72c73921c01d5fec5b05c3a71c2c SHA512 79916a4aa04010ce67ad08386f0b7e03dfdc6fc0a6195b376c4cd1207ccc408b275efbb3338313db467e3b8fef7abaf93445dc92defa8b9043e497216e0f1045
diff --git a/dev-python/mypy/mypy-0.790.ebuild b/dev-python/mypy/mypy-0.790.ebuild
index f2b26d130ce1..47ab71ae5e49 100644
--- a/dev-python/mypy/mypy-0.790.ebuild
+++ b/dev-python/mypy/mypy-0.790.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ia64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 
 # stubgen collides with this package: https://bugs.gentoo.org/585594
 RDEPEND="
diff --git a/dev-python/mypy_extensions/Manifest b/dev-python/mypy_extensions/Manifest
index 5629973ea543..2c18c731a4f8 100644
--- a/dev-python/mypy_extensions/Manifest
+++ b/dev-python/mypy_extensions/Manifest
@@ -1,3 +1,3 @@
 DIST mypy_extensions-0.4.3.tar.gz 5545 BLAKE2B 8f1f988562390ee1ba3d90cafafec73c6fe080eef6b4321252d3b3aeffebf1ad13bdcae7ae75c69eac7bef91dcf3f846ae7f9a3f2ad6bad9de2bc8cfe5eed29f SHA512 22d8dc538cf6f77d97f4113dd34fce8095dd98944c7613fab2b3e71a3e9b7df1374654af41ead5c934f789ef1b72f54d980ab06f3ca28b8b4c6bb14ba1ca3ce2
-EBUILD mypy_extensions-0.4.3-r1.ebuild 828 BLAKE2B a790efed16c4c7bc7357a9d915b40f1c0777189316267f29093f8976631d4eec6d79c63752f1ef8f5e131fea79b3e36a718ec01d0f6fa1b166096621484eeb1d SHA512 882a73f42d99c59ab04e0aafc57e411e4f48836752627d5abfbe4af27ff99208ebcf03e25f819f72f5c1bd4d3b7188951c3e8b47cf6fb873e212b3e3fd2247c8
-MISC metadata.xml 352 BLAKE2B 932d22dee01e3a1e586176e5e32423d36100c8d3116cf6b8eb1268665ac7a5456535fbb6b855a4e6849767d31dd6c2066eae3d08868662c211596d7c02f39ec7 SHA512 2eccb85a7150b8592717ee60ecba338f59563fbdc12c172924f8d7743d33c1a32cb9a0bfb41f150e86bfee3748488f32ae9d57bbb240cb7fae4b9f3a00621e4a
+EBUILD mypy_extensions-0.4.3-r1.ebuild 827 BLAKE2B dc0e78f9fd72e799d762b6ab372963a529aa26d1bb2007fb5a3e12dbb2372595e5ed641ff9a9585c0cdb94ddff94592669382745a7a4dd1e653febe779a5392b SHA512 bc30956e12bd298ba5e8bfed180756f045facca4a6165734806d0d581b54eed884e4443d72a635ac6204a877c9f30527780b56f5e1db59e9c95d8d77ea537763
+MISC metadata.xml 406 BLAKE2B 39bbd87f1c027d9f608a8cd91378b03741d8c7fe480bb800907fcdbbfe17f27f5df105259bf88ad4614c43dd2e4e2943c87b8c89c8ca866878c27862c4648f37 SHA512 327a3958e787e4d2cf43a4ec78ee534d644883a627cc7a690af90e1440f49f2f04d80ddbf9fa6dfc0048b499a441955699bf277d53f6cec1a407cc4a31c770cb
diff --git a/dev-python/mypy_extensions/metadata.xml b/dev-python/mypy_extensions/metadata.xml
index ddbd57b96d8e..bcdc78cd8238 100644
--- a/dev-python/mypy_extensions/metadata.xml
+++ b/dev-python/mypy_extensions/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="github">python/mypy_extesions</remote-id>
+		<remote-id type="github">python/mypy_extensions</remote-id>
+		<remote-id type="pypi">mypy-extensions</remote-id>
 	</upstream>
 </pkgmetadata>
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 57eafeb24b8a..553b31b3220c 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 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 fi
 
 LICENSE="MIT"
diff --git a/dev-python/mysql-connector-python/Manifest b/dev-python/mysql-connector-python/Manifest
index 7a494af189c4..fe09d324840e 100644
--- a/dev-python/mysql-connector-python/Manifest
+++ b/dev-python/mysql-connector-python/Manifest
@@ -1,3 +1,3 @@
 DIST mysql-connector-python-8.0.22.tar.gz 12081967 BLAKE2B fc6b724ec2eb47a92294f7316093d4a4d2f4925981adeb07b305e946a047dbdaedd96c6ff9a07426fd56185f467cf6473bc84e0896d2e8fde70a188af16e9df2 SHA512 07f380922c18f9ade38f95d8e107fe8f90b8a7901fb9a36bbdfdb2b29f9cb79b0b6387a608e89bf90e9344c635d47184c750a206beacb2c9cc7615d6a7df2c29
 EBUILD mysql-connector-python-8.0.22.ebuild 1525 BLAKE2B 1afce32cf4c3cb952155526234febae20205fdacff2599c8dbf552f7df696bf0efc6ca5e92ca748d9cf21b950c908ea7837d9b88e389bf5ffef70a67576b1762 SHA512 84e59d0cd95c576a2d54ebe9c1b8f487ff1cc1c872f95b8a19b750126defcdab464726a23e692f3dabef251311a5677403167ac845a7893afc114cbad98c8391
-MISC metadata.xml 336 BLAKE2B 280111bac38fbd60e25601789026033a61dab0c2706af1874a765aa3a697cdba5d5b051a0dc28490782cf135104f92e793c68d02b74bdcffdd113252b9a3ac7d SHA512 27da38ceaf7dc44250dcb4651e2d171f1ccf0d5a3a2c04845dc6369e1a264b71ea909f7d799d3eabbd989f4c9c37c201f511887956613bf7176697da63378838
+MISC metadata.xml 429 BLAKE2B ecbfe7e88466287141bd923db191969d384118b464659804a4aad33d811a6042b8082c9675a103e3e50b1ccbf74357be609ed714890412d2534bc77388f6b61a SHA512 812597d8918eeb1c0b94b8afb0b605cf98fe6e0f3d4f79b644d90e78f026a13d1233c7c0665022c752818acf07deea7151b988a701c8a5060aefe9264c2a592f
diff --git a/dev-python/mysql-connector-python/metadata.xml b/dev-python/mysql-connector-python/metadata.xml
index 5487ad62c5e1..e0ade4ef344e 100644
--- a/dev-python/mysql-connector-python/metadata.xml
+++ b/dev-python/mysql-connector-python/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>mysql-bugs@gentoo.org</email>
-	<name>MySQL</name>
-</maintainer>
-<maintainer type="project">
-	<email>python@gentoo.org</email>
-	<name>Python</name>
-</maintainer>
+	<maintainer type="project">
+		<email>mysql-bugs@gentoo.org</email>
+		<name>MySQL</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">mysql-connector-python</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/natsort/Manifest b/dev-python/natsort/Manifest
index 295730c4cbc5..26302282b696 100644
--- a/dev-python/natsort/Manifest
+++ b/dev-python/natsort/Manifest
@@ -1,3 +1,5 @@
 DIST natsort-7.0.1.tar.gz 139272 BLAKE2B 81f75df0868a0810fbc8fef5a499135b5291adde7561a1b0e6b8a94a7f5afc27cd156939119c24749b1ed6983b4a6d63cada3f4a220e785dc06986db099803ba SHA512 48bfda8a42b951287d984e38c474b71233d56a578d8bec12e657413b3cdb71dd27103acda8dca359d87efd761e775deff0775a81d8dfa18df24c364921028c2b
+DIST natsort-7.1.0.tar.gz 143534 BLAKE2B 3ab6c977aca40330fac0af9e4be36d973e88d931799b3135a81daf0a475988af5cc2f9abb30ade1498aad07d9c986e514c7c8cdbbb63da195a81dded4f6f25da SHA512 41293d70c3dc2214f9dc1c123f31cd7886341ae25c6342ac49f3d53d06ba15ecd8d666f1763fe790848c93668940a81b7e7f1fe896f0b91f180ca557dd922ac3
 EBUILD natsort-7.0.1.ebuild 541 BLAKE2B ddd431048cba983503130fcc879f86e6359ee499bbd7ad21cc0ed4827ba5f2f24013fb0773b0798c703d2b05ee7af679eb62b291cc5e51848dd35d0eb9049cca SHA512 55650944db07af4205587345af17c27a948884076db51029438a22908e2535dbedc078f675941648ba01f3d9626ad58b11f4224e97990397ef3f7ad82731603a
-MISC metadata.xml 320 BLAKE2B 96cd91c11b726c96e73c34ec02c004d240cc88e5e3991ad5bbbe5db1052a21faae41718d467e0e26f9a0813d55c7309d23320f55fcaea41be57a4f8af4ab9520 SHA512 6ddb8e2538028ac71b41a224ca0c2f8a322aa12cf1eb779c422bdcb7796aa342394dc4f6ed46695deb46b5172cf156f81244935db0c4a5eb340537d7caab8916
+EBUILD natsort-7.1.0.ebuild 545 BLAKE2B a91dfe940d2b2c89795141afea0dc628e70c7a00e747009ef3391c9f696c40164daa784d5cdb70fcc780e57a050a0320148a9898145ce7dbb25f1fe1397ea67b SHA512 37c33ac8a012aabb0cbd3f75b5ede9baebbec9d2a0e59c3c3405de7a075fe37d19ced0f37a0f81829a30b20f7854283f4307235161fed12b83cfcd25342e7b6f
+MISC metadata.xml 406 BLAKE2B 1bd6819234aa6417e45d2e38c65863145930ff04eccd05690ca9d210fc9572394c18ef59e0d2c5adbd6791047fc8090baca5d6ec0c1118aaaa3fa23e2fa9427a SHA512 693524d7b020bdf70374c4ab784d6e230963dde0ba168fb9b5a4c39652a81bf67feecf091720f1fc1c853830705bf7aa4da64f2c3b4e921cf316507c8a79aa17
diff --git a/dev-python/natsort/metadata.xml b/dev-python/natsort/metadata.xml
index 9f76f3b0434f..48db21f5191a 100644
--- a/dev-python/natsort/metadata.xml
+++ b/dev-python/natsort/metadata.xml
@@ -5,7 +5,9 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
+    <remote-id type="github">SethMMorton/natsort</remote-id>
     <remote-id type="pypi">natsort</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/natsort/natsort-7.1.0.ebuild b/dev-python/natsort/natsort-7.1.0.ebuild
new file mode 100644
index 000000000000..afce600684fe
--- /dev/null
+++ b/dev-python/natsort/natsort-7.1.0.ebuild
@@ -0,0 +1,25 @@
+# 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} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Natural sorting for Python"
+HOMEPAGE="https://pypi.org/project/natsort/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~x86"
+IUSE="test"
+
+DEPEND="test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/ndg-httpsclient/Manifest b/dev-python/ndg-httpsclient/Manifest
index b54ab96e24ba..9fb6241f9b0e 100644
--- a/dev-python/ndg-httpsclient/Manifest
+++ b/dev-python/ndg-httpsclient/Manifest
@@ -4,5 +4,5 @@ DIST ndg_httpsclient-0.4.2.tar.gz 25062 BLAKE2B 740075cf3031547028afa3ec2e005e54
 DIST ndg_httpsclient-0.5.1.tar.gz 26665 BLAKE2B 1c7f0a8d41b945d2b2a51cd69397ab0943cb91e25013c931f055c5608bc3a0106a99d9b126e8caaac9f8d9b409ec117631fb23f19dfd3194b783548ce3536050 SHA512 b2b4c1b1df87ea1a94811b9ae831e7bf32af27258f487fd5ec319e0e6e0d79dfdb1f7bfadaf397d0693a8a7f0720df170a7fc946aaf10c82e3957ac5464f672e
 EBUILD ndg-httpsclient-0.4.0.ebuild 786 BLAKE2B 6967c45cc141118acb98dfe34e4067553a0931b09fd35472c32aa5ec6dfa6ad5dfe132b1d565f1057f892791096dde0891414a467f90c35c86146f37ea23c6c9 SHA512 95faed72c02e8b2db8da43931b03aeacf217c358b9ca11c97d9f702ac097227eb9383db98c906c57b4de7b28043bec3e2c26f17666795584896ffed8469a463c
 EBUILD ndg-httpsclient-0.4.2-r1.ebuild 1642 BLAKE2B 26b8fba6fc5fce373c2f9633d28f12bb2b74d6ec8bad90b497b675eb678440d408e9df97168bc3265c4d1783d9ea2337450ce5b606d1c471fd95e79359dc5100 SHA512 57d30e42f7892258da946454c3185f4ec0bca672a7fac4d0b5636892badaa95b005009fd8ef70aedfe082f655a0d39a5c50af0f328019efa1a3091df9db6dff9
-EBUILD ndg-httpsclient-0.5.1.ebuild 1161 BLAKE2B d6dff728fba2b7691821f0cbacba9120f5a801b501f12c141223731ca747ecbe6fac3bb82083e332520e3e310151a0ffe13dc256ad5cbeaf2f669483763d1c4d SHA512 fcc39f528db7a8f16d3723fae68a71623ab5d803cc20ec84e7549186f8632257bea39cd890e1302a5db176ba171e727df242ac59d9545d81f0364b495e04d2c4
+EBUILD ndg-httpsclient-0.5.1.ebuild 1172 BLAKE2B 00a079242a7765f14d3b9f954d6ea6dcd35e18d33043e5a3609c1c54c20293ce6103fb1eb1f7a7f0b6d7d80cf829afeafef4f83fa4fe73132e62247597270d88 SHA512 931e106f898cc003e210718ee0dbcab70f2c434610d84bfe2943609bd065446bbedf2040c2c8f6a5216c6ada0f09d16b21a7d60a139de1021761d981a649a624
 MISC metadata.xml 418 BLAKE2B d8bbb595e8483ff5072ad8bb4dd0558aa87e0bcc9b01dc59b5816c42d9e465ab1bbfcb5073479a06b58a2bab3d637e4ed23abeaf899c5c5be6edda057afd123b SHA512 82ae35467b503a3fc7e5382efc7f023917bcbf67b7bd9ed2a01628c76865154e46ffd9e2f7f7eefe6a161c745d0da92585082a27b88b5e957839690803e99de5
diff --git a/dev-python/ndg-httpsclient/ndg-httpsclient-0.5.1.ebuild b/dev-python/ndg-httpsclient/ndg-httpsclient-0.5.1.ebuild
index 9a2da09643e4..16064024037a 100644
--- a/dev-python/ndg-httpsclient/ndg-httpsclient-0.5.1.ebuild
+++ b/dev-python/ndg-httpsclient/ndg-httpsclient-0.5.1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P/-/_}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/pyaes[${PYTHON_USEDEP}]
diff --git a/dev-python/neovim-remote/Manifest b/dev-python/neovim-remote/Manifest
index 6d4108cf2058..465065896030 100644
--- a/dev-python/neovim-remote/Manifest
+++ b/dev-python/neovim-remote/Manifest
@@ -1,4 +1,4 @@
 DIST neovim-remote-2.4.0.tar.gz 438687 BLAKE2B 0dfbe3d660d9b2f6b7a4f1016d4d230d63612306ea99079364ed5c6dbae51df7a19c4d1bca51a7bfad142ffe5811e286b843edf6b0715c7aac921c584701030e SHA512 073bf95a0238c76c19258d886fe71e23ec85f9cba200b8a490014a2842d1a84b3c95092afcfdcc8ca80122639b9e07652594faa24ed6a6aff537192ec3a3d14c
 EBUILD neovim-remote-2.4.0.ebuild 703 BLAKE2B 133f32a1f6e90a206c87b7e2e8dec5bfbd85d559203ef5500f882c9103d2e88f2379e924e8cf00c0902cb1f843bcdfb27050113089a74bfe3771a3ec6d97247b SHA512 f890bfcd8698a49718942f8c3ce23a0adf5cd4173063bd4f875648241b91ccc7e5b715779c19cb172e54e2f6de77d9377ce9e701874b95fb43d3956646550a38
 EBUILD neovim-remote-9999.ebuild 650 BLAKE2B 1a539de9625bb01d8ae01757f59fb373e4664e2e2cbab51720a7d571214047d882074845a61ade063e00c83f72a786692fba0d3eadead8d93c4ec4c326a40ddf SHA512 1c4f39e444c14ae4d6a27ec80968c91377c6d97b1aa9fa6216ac1175ea2755011fe2cdd50d91441e5f4414559627d7b2986392dbf87984bc66b64dec6b1a32e9
-MISC metadata.xml 361 BLAKE2B 8cbaa82fad1a726eb2e09bc74bf9f6b18579fa767d56ee20d14c39d8bd7726d8ac044e5072e4cc00686f9acc41e0c9a2d4578705c79a3e84af5318c136c910e0 SHA512 b7a6d140b5642f8326e0d69752c0479319ef0746eaa440fce0a4bb2d36d4428f5bbe42364430906a1baf2dc953283130c5fb3eb7b9f9d45add2a398a1e9f5b64
+MISC metadata.xml 437 BLAKE2B 9a9450a94c9a14df768aa3b7c14cd46e2cb08c39cd1de5b91d5b9eb6ad6f12f4d359a1756f9f59bc034535a95c6f761f4088d03bc61889cff56efe82ac8ce9c4 SHA512 4a1bff2728dfda4de79b6adc9dd84362ed5d44b4dfb6d602ae773dfc40b96538afbbf7197afc840c1809e52ce99844de7bd3eb7a3fc9e64c069aa3a0073aeebc
diff --git a/dev-python/neovim-remote/metadata.xml b/dev-python/neovim-remote/metadata.xml
index 0c432dd1d7b2..847453aa122f 100644
--- a/dev-python/neovim-remote/metadata.xml
+++ b/dev-python/neovim-remote/metadata.xml
@@ -9,4 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">neovim-remote</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/neutron-lib/Manifest b/dev-python/neutron-lib/Manifest
index 4f5c92e46212..6647d222723c 100644
--- a/dev-python/neutron-lib/Manifest
+++ b/dev-python/neutron-lib/Manifest
@@ -1,5 +1,3 @@
-DIST neutron-lib-2.3.0.tar.gz 444674 BLAKE2B f572c58f21034522ff0d30ebabadb19aa291ddb257757bcc25fbec24d46206ea9b44d36d547f454b43bc1fe611be4046fd186837e64b8cc54d681f301bc6494d SHA512 c2b0b36474d0a83c3720639b107100292dd65ad80986848b4c7a9e4304832ecae2342e451bcec68e21232901259d7b7d2a3a6f1b232d70014d262e6c7b594a80
 DIST neutron-lib-2.6.1.tar.gz 453572 BLAKE2B 6b79394a91cb7e6efcf66c0c8bab3b722de9a5408182472fa9dfe26b4a6c630889fc9aae0f7f0bab4917eaa830cdb230788d9a3520b4b8a526dbdbb361e0379b SHA512 d2da2b0d73cb5accda8219ced9fb68344a2c75d98a0d33cf5d52e703a8ea0afb3c6bb0a85445e453b512918f1c3fe7b97fa1a587a648e6731205b421c05319b0
-EBUILD neutron-lib-2.3.0.ebuild 1938 BLAKE2B 783d99d9a8b53a142e7bf0f148e69248d5f5c8c048199fcaef308c911fb89b1d341c6921378d45b312ce8cdffbd064e66e68321079cce4a4a39547862982e330 SHA512 1af9fb0f697a07658cdae45082a31dcbbd087e389c6e4c8a5d328a283d70dfbd98aa3781d6a3de554ce45b5cc0da816ece80b2a869bfd56919a4c65fbeb224ac
-EBUILD neutron-lib-2.6.1.ebuild 1973 BLAKE2B 68d9e6e6dd923050c6374a41a4f1c16988ee5ccb5ce0b6896154fba1e64f83ad113813360c4dc0066053c292517bf25740b661b0122252748a34fbc0db8840a6 SHA512 4378ddb8093302d3c056be10968109ffefcea4d8f9f10af6add6fcf64cb5f832933689bebb5d13e44f1ecbe1cd54b53b1668f77caa04c36cfd4cfa4c035f5329
+EBUILD neutron-lib-2.6.1.ebuild 1971 BLAKE2B 1ed9006a4a65790bb41b0f3502b0b8a2162c80dccaf07c00e02ae0b2cfd25e5e5c10c653b0f976853a4bb23eef6c5af37481805eee1b4d0be39b9e9d3f4225e4 SHA512 ea512f2e59a0c714b7924109b14cf845edb245e0e43ceb0a0308aeb0512dd409582baee692d739b3c0097c043437c21debedf83ecacbe77c1f696d846ca91ce1
 MISC metadata.xml 413 BLAKE2B 658517cb94e25afd7f2c548c4510272b3b34c6bd288fb2c210556b905160227b17fcbe1e5a6f0c0fa90ed33a4f709d7c0c55f16462880e6d9806f181845df056 SHA512 d04274afc2cfc3ef4ea7cc385eb5e6c5f3b4b06f42d66be6c6f11b8d64f992486a3f47c40c568c86ffe367e2a122b4416e0df676971af43e4e57f4b84e556bdd
diff --git a/dev-python/neutron-lib/neutron-lib-2.3.0.ebuild b/dev-python/neutron-lib/neutron-lib-2.3.0.ebuild
deleted file mode 100644
index c043b621eb46..000000000000
--- a/dev-python/neutron-lib/neutron-lib-2.3.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Neutron shared routines and utilities."
-HOMEPAGE="https://github.com/openstack/neutron-lib"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		${CDEPEND}"
-RDEPEND="${CDEPEND}
-	>=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pecan-1.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pecan-1.0.2[${PYTHON_USEDEP}]
-	!~dev-python/pecan-1.0.3[${PYTHON_USEDEP}]
-	!~dev-python/pecan-1.0.4[${PYTHON_USEDEP}]
-	!~dev-python/pecan-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/os-ken-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.37.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/setproctitle-1.1.10[${PYTHON_USEDEP}]
-	>=dev-python/os-traits-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/neutron-lib/neutron-lib-2.6.1.ebuild b/dev-python/neutron-lib/neutron-lib-2.6.1.ebuild
index b8db7801b5e4..5b7271263894 100644
--- a/dev-python/neutron-lib/neutron-lib-2.6.1.ebuild
+++ b/dev-python/neutron-lib/neutron-lib-2.6.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND="
 	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/nltk/Manifest b/dev-python/nltk/Manifest
index 4418f86a036f..02768479ca60 100644
--- a/dev-python/nltk/Manifest
+++ b/dev-python/nltk/Manifest
@@ -1,3 +1,3 @@
 DIST nltk-3.5.tar.gz 2805844 BLAKE2B d2494d831cf5503ac938b203e405ebae606166dbb907655113d3a5267bd54f03b6d8d5ac9e545fefd0b7855ce0c985064c9e746e402c540e19546e2d11ec151e SHA512 056ae219af607c158f1f2adc6fb9b4f402721778c13bf5ebc178deaf631142ad3e571d8b1fd96145067833cbeac4db25fc07c3fd032188c2d8ee7e5d7bd824f6
 EBUILD nltk-3.5.ebuild 1671 BLAKE2B 50c081592a8ce900b70ca324e80376fea3d7827037fd006dea04a9603cb83f545ec51ffb2192a7a26ac1081d5a219a9ff6e083fc526baa75a9ae6dce9ca8d8ab SHA512 48ff46c607c87ff00823855d58b22b597199b96aa232b7617b8055b2dc153e38a8c6cb72ae4511115fdb20001d60e8fea648c8d45a0686f8b8d1d1cb1cb12259
-MISC metadata.xml 369 BLAKE2B 71cbdd71c636a0ad09350ff40d6f8852ccba6058d32b5ea7dfb2202d5909524fb78b4eff17b6af044ea65d67c67cb19cbc8fff1d20dcd9d4ed9906a0b5a49271 SHA512 7ee1d09e28699e68fc04a1ada4aa7fe091a1624cdf5e1be9568163829a0ae832bb26c58abb7509226c212f0d34d6ad549afb169a67167f1ae26b66ef431db65b
+MISC metadata.xml 405 BLAKE2B fe64d9154b1ae508bc30bf6aa0f5f6daf1b72f1f08cd9a57ac4421d93d889609eb1a656b8e95671e0235cbd8d0bbe1ddba1ec1eaa78d97b10d8cbff9225cc7c4 SHA512 a57e3953db801948b62deb294b66421e209c75995715d23483b75afe150144a821f0f88d4faad2564aed8bdd1ecf61153431c5f2fb8e42b6d017ec1c9762b3a4
diff --git a/dev-python/nltk/metadata.xml b/dev-python/nltk/metadata.xml
index 7cfca4fc39ac..6562cf1e955a 100644
--- a/dev-python/nltk/metadata.xml
+++ b/dev-python/nltk/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="google-code">nltk</remote-id>
-    <remote-id type="pypi">nltk</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">nltk</remote-id>
+		<remote-id type="pypi">nltk</remote-id>
+		<remote-id type="github">nltk/nltk</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/dev-python/nnpy/Manifest b/dev-python/nnpy/Manifest
index 6e98c3a1efbb..ccb20aecabb7 100644
--- a/dev-python/nnpy/Manifest
+++ b/dev-python/nnpy/Manifest
@@ -1,3 +1,3 @@
 DIST nnpy-1.4.2.tar.gz 4830 BLAKE2B 7e1e3d3ade400e96e43504e490f22e5595850d54e80d4591fa0a519a47a492aaf569d9937c4ee05fc9504c4beb5cb2ef8496a65874e64b6162087eade6762906 SHA512 b0908e3b53ac62d8a41ecadd412b2c4bff69773d5eeecc2eb72cad2667c3a14405dc1dfa6f2cdf4f81cf76b9eadbcdca5bdfa1499a2f0c3beddbacbd3e21b7d7
 EBUILD nnpy-1.4.2.ebuild 575 BLAKE2B 28b815d6579648c455e2b55c0742780ab6a54a6e085d90f903ecb942a80e4614c34a622a10ace747dfc2d696ae970f28915e507f4b44319e6f4fea07ae090034 SHA512 02cf486080d0ea7bc6b1850903b0c0569916565e52ff5d95d08b19524d901401540cdbf86ca140d3aabbceea7fd7868614fafc3027a488b545c8fc6242a15bfc
-MISC metadata.xml 326 BLAKE2B 03dd528c2b81ae0fc058b038ecac2c5121841b355ca6a04c05399d785595bbb5de08f88c0a12d157bce2561b08543be97fcdc747d34753c388a0cafeed6844f7 SHA512 256f8684cd755d04a51a8a5bc6df6e001cf9123fb9097301a446d9481ac9f901c79fe8ce8c6e5c83ceca60322fd0b52311f2808a3d099b2b4c9179d76333e670
+MISC metadata.xml 368 BLAKE2B f04a766df19b69d8809dc33df2b2b7e3785a5a00576d1f32696db4a007cf8ab71826cd01dbd78a5dacd25618131205d62769e2e7eadfdd7f084a517fca5f2dae SHA512 0a9b6dee67972e06ff0dc379314c5da2b31c038f4520136ff9b49c22063dc295054483aad90b617c61c1529651a64cbf1244bb1c9a8e0c9c9a16d2f856ded892
diff --git a/dev-python/nnpy/metadata.xml b/dev-python/nnpy/metadata.xml
index aa31df7c4341..4ae30afb0f71 100644
--- a/dev-python/nnpy/metadata.xml
+++ b/dev-python/nnpy/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">nanomsg/nnpy</remote-id>
+		<remote-id type="pypi">nnpy</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/node-semver/Manifest b/dev-python/node-semver/Manifest
index 53adbcdf1717..32eee5a2b587 100644
--- a/dev-python/node-semver/Manifest
+++ b/dev-python/node-semver/Manifest
@@ -1,3 +1,3 @@
 DIST node-semver-0.8.0.tar.gz 18449 BLAKE2B 171374808e18b1f3fc2807abb9b99ecfe18a392afbc59ad056f0524e374ef4a27e5a56acf0c3927c6f351503981d743e4e63f108bf0e5bd5eda62f04e24191d4 SHA512 665ae0dbced16e0f05306614b1577464aa1bdac666b35cf2e7ad4b8844a6814dc7e8672f0dff3043c7bd048aa455d671efd268052ac59166293b91d1dff17784
 EBUILD node-semver-0.8.0.ebuild 757 BLAKE2B ec2166006aee96340d40faaf26b81b529cbf86221f94a59062a87d6784ae1549a81d6522bdda9f8f729e39a1292e47df3bcfaa574144b83131f22ee95ad5aa7c SHA512 7bdf6a003e42e1417518d35bdf4af99335e75c499b5c31a565dd9ad9dbd9a2d6940b4a3d26b1d3d010c48f42167a7118dbf7a8434fa2b54c42c1d69a0e119264
-MISC metadata.xml 678 BLAKE2B fd7f2ace72fa8748c1ab94c2583dc49527273f10f09724cf63e44a053e1c8030935605b5abf500711037bcdf1f0863372177970ddfb8f7d54135ebc37487ede0 SHA512 5ffd4bf5a5823c487e20c3daf566748e095ace0ee75a93a2fef7be8837ba6eb0a371d0dbf682653579c1071ba9988c0d469ef075c7d71f8639df0869cc3e4dbb
+MISC metadata.xml 605 BLAKE2B 7cfe8d1f1753673c5a5884ae1bf5c036c781eee42276b6710a95b017f94ba377e6853fa57d9a3db26cf06efa18898aa2af5352ca208b3da7be1b477328cce73b SHA512 2e9de4eb6887f874ef872f0749d103098e115030ed705fe6498b60789e2e75883c3fe210fbca7f48c0eaf379393a81adfbeb385d886ae22ad87d1250bbb63981
diff --git a/dev-python/node-semver/metadata.xml b/dev-python/node-semver/metadata.xml
index b3e552861741..94f09142203f 100644
--- a/dev-python/node-semver/metadata.xml
+++ b/dev-python/node-semver/metadata.xml
@@ -15,7 +15,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">node-semver</remote-id>
-		<remote-id type="github">podhmo/python-semver</remote-id>
-		<bugs-to>https://github.com/podhmo/python-semver/issues</bugs-to>
+		<remote-id type="github">npm/node-semver</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/nodeenv/Manifest b/dev-python/nodeenv/Manifest
index f0433816c229..12b9132f2ee2 100644
--- a/dev-python/nodeenv/Manifest
+++ b/dev-python/nodeenv/Manifest
@@ -1,3 +1,3 @@
 DIST nodeenv-1.3.5.tar.gz 32824 BLAKE2B 4f9e2c14562ff9c396142c5980876a97103d9206f796e9d9d1f67f29819a04db0e8ed232eb3f841a1e2efde84e55d6d7213082f6be568d7a6291562c5624a9dc SHA512 c7e9068a220f183a217b15e724aa8197fca8f2234c76eafd230899963b6796e66e151c20c529e6540f7e3c59849bda3860d563b38f5feeff73601043f79cfba0
 EBUILD nodeenv-1.3.5.ebuild 444 BLAKE2B 07355be0bb8db7952e044c9a0a645b50edc9cc6e20928ebeebf059c6b6c58098aa0925ce0102e667d529eccecbcfc11dc8e8b7fdd706aa0c5fe95b50b8c16684 SHA512 42bb169a4e7f8ea8f7d1f73c64133a5d9ad05e4b17971de6756b6aeb21544833139e330b060b62de09cb73c04156d090b6f92a69b2d76ee745320fd7ea8c6034
-MISC metadata.xml 362 BLAKE2B 5e3b70f0d8049ba6ece30933fcb91db7f533fa647091c6f8cc240b4f074043a0da1b3d1078d10ef41c05311c6ea991ca52b978dafbb8f3591348871f168ddc33 SHA512 16874c2d41c9d85485115c5128ebf55439ed1b163f1e919d847177971718e7a113afa36216c35a8d19f6d92f474001084013bf75797fe82f6d25a369d42e8fd5
+MISC metadata.xml 377 BLAKE2B 10309882a21ce0f0f8b7ec7d4d6c057a1741e27d548eeac8126f39b8a564c8e0e2a1b26cb09f01402b928df40dfeb1169fcae44ff629c901ef68b51bd12391de SHA512 7cf97ad2163fca6b4bbf962373052497e64926848dde74beec8e6a194de669709474af570a35e9ffc31134d2c252852cec8167420d54ea5745a6d377a878b2a5
diff --git a/dev-python/nodeenv/metadata.xml b/dev-python/nodeenv/metadata.xml
index 8df7ead50ee9..bdb9e7f72df4 100644
--- a/dev-python/nodeenv/metadata.xml
+++ b/dev-python/nodeenv/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
-        <email>monsieurp@gentoo.org</email>
-        <name>Patrice Clement</name>
-    </maintainer>
-    <upstream>
-        <remote-id type="github">ekalinin/nodeenv</remote-id>
-    </upstream>
+	<maintainer type="person">
+		<email>monsieurp@gentoo.org</email>
+		<name>Patrice Clement</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ekalinin/nodeenv</remote-id>
+		<remote-id type="pypi">nodeenv</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/nose2/Manifest b/dev-python/nose2/Manifest
index 185d483aac7f..7e7e35bf507d 100644
--- a/dev-python/nose2/Manifest
+++ b/dev-python/nose2/Manifest
@@ -1,3 +1,5 @@
 DIST nose2-0.9.1.tar.gz 152411 BLAKE2B 39f2d992e5cab4b9e5cd4401ea9285884eeeac7d2e126b5aad5582186efa0f325139480a446950019e91a376b5992fea106064e5170c9ea7961f128b895a335c SHA512 48cfe3956a3cb696e344ea03e5e0ac8d52831b8272b7cad2bdee34681d1e4e7968fe9da9b71cc9db40b6edf289509c2af766e73611f3a6f23ebd5062f4d52c9e
+DIST nose2-0.9.2.tar.gz 153381 BLAKE2B 9339a31b664561bd86817a969a64a3d80dacdda3ed25bc0a0b6531812e56c7e2bfaadcad3712d8af1a7ce585e27ff6de54428667e44e7c6b0003db5d52703971 SHA512 9af69f0cc9db2e8ef37d2c4ea4fd2d661a38df73fc984d261a1c7c39fba07e44afdf494f0939362b84a03e80c3d93ee75c9352ef333616bf8ce6e6f019b811fe
 EBUILD nose2-0.9.1-r1.ebuild 869 BLAKE2B 5f63c8827e7e60adff75f12143284fe71f8a7377f5be24fcb6726630396f2a234a4fe848aa8d79edce794c03448600efd950cba54e982991de350f487b87fb54 SHA512 8fc0a02c36123e9b0df6d88334148fb5d22a866d69967ea11b7d8c037481c03df89bd00a70f6c052784dc4e82233d9c5500c24ad2b321f1e90aa6566fca1d7ff
-MISC metadata.xml 245 BLAKE2B 3add0b4d7a53d7fe522e4b78a567cf1a8b1fe89d9abfd8fd5ccbc70104ccf52b15c4081cea951454752df03f43de328c975f280a42f8b248e83fc37a89716fdb SHA512 1ecded9f7a627a77dd609108d3bb95d70fea72e3fcc70436a6f0e54abe609bf9553644a8aaf2333e1aa0b14095768dc8f5d35b510173ccb194f4f8ac4243e33e
+EBUILD nose2-0.9.2.ebuild 878 BLAKE2B 6af2612a615c9b7af5faeee33a50e81097b8cf0fbdcec9263ea61dfee490d9528bbf19b51d0fc4ecebe1371e2f3e0ebbcad3658e77818a66b9a6f50a34503776 SHA512 2588f1f8b63358ced8367ceb4baaa62c9c9080e8cb9a4332914d49487c4d0cd1b8f351c1388a1f6ab4808d5c7b85006fc8311a811801a9d6dd8a4013273b4dd2
+MISC metadata.xml 288 BLAKE2B c446ac45d7ff957c9c8a73ecb4702edf87d6e6a112e602f743064887c10bcebf9a2240a4705a5a6bfd8bdd4b72b264afacd64bef6f9095d5ed274374a8eea5ef SHA512 d0cff4f56e4c84629eb665cc88209951f65cdbb327727a906254f4d8c997c24e8e71d3a6e27cb556554440a3302acf75e04e26ec4923ae09c7414b7fd806ce7b
diff --git a/dev-python/nose2/metadata.xml b/dev-python/nose2/metadata.xml
index 684f51f49353..507e890c359f 100644
--- a/dev-python/nose2/metadata.xml
+++ b/dev-python/nose2/metadata.xml
@@ -1,8 +1,9 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!--maintainer-needed-->
 	<upstream>
 		<remote-id type="github">nose-devs/nose2</remote-id>
+		<remote-id type="pypi">nose2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/nose2/nose2-0.9.2.ebuild b/dev-python/nose2/nose2-0.9.2.ebuild
new file mode 100644
index 000000000000..87db50c78a37
--- /dev/null
+++ b/dev-python/nose2/nose2-0.9.2.ebuild
@@ -0,0 +1,41 @@
+# 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} )
+inherit distutils-r1
+
+DESCRIPTION="Next generation unittest with plugins"
+HOMEPAGE="https://github.com/nose-devs/nose2"
+SRC_URI="https://github.com/nose-devs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+# Failures need investigating
+RESTRICT="test"
+
+BDEPEND="
+	doc? ( >=dev-python/sphinx-1.0.5 )
+"
+DEPEND="
+	>=dev-python/coverage-4.4.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.1[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	"${PYTHON}" -m nose2.__main__ || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/nototools/Manifest b/dev-python/nototools/Manifest
index a891353d34da..891f2d2af803 100644
--- a/dev-python/nototools/Manifest
+++ b/dev-python/nototools/Manifest
@@ -1,3 +1,5 @@
+DIST nototools-0.2.13.tar.gz 9574809 BLAKE2B 8c5f59721ed3294162d9578955f0493007fdcebe5aecb3364abf22add5cedb12de99c63064574ea84b553cf2547af2ac2203e68b4a380527695edd72cf05f6c7 SHA512 8e46ed8d5c683dd93a14890df059a86824fda7f39011570cb414a471c380ed5464cfbe2ee6c8b0c2819d35fabf51ed5495df4c49d5c562fed5467ac2bde135e6
 DIST nototools-9731cb825a5c7c7c88c043009f15d4d1e5708df1.tar.gz 9703187 BLAKE2B 9767b79514b8d7da8cac879c71fa76054993d17bee41f978ccca1648bed525567cfec48bfe06ae2b1de2146d2c2898afd4e53b746d5b03c0e48e6c93632407e6 SHA512 6888b00a11fb7d54947c438ba9e654f97e4ccd1ba292ad6219c7a2f4cc56fc75d249b89eb688b2f99ea3f321472eeb5103b33f4641d17e9983c70e9ad3cf6cb3
+EBUILD nototools-0.2.13.ebuild 1029 BLAKE2B 20c86f5e5e8358eae00461d9c2f47049e0e474478afb1d48214cf7e803ea1c31abfb1d5d84ce15d9b0962771d45efb861bbeda50d864984805c83e4d6e1774aa SHA512 ec266118599c18ef877a98f35df992b954652d2a9bcf52b32856f4fa7b4ff6a24a1dd86a368c0e142eab6abce5c72c2bfd7c8aa71c962581b6913b8eddc3c7d6
 EBUILD nototools-0_pre20200207.ebuild 963 BLAKE2B 8796ff981ed169017cd99e72a7f05bf4b9d0925c145e48d919ad4f1df0e6c1eb0027237c81d31ce8903745bf72fa27075a394489f878e7a929090d509e2d58e3 SHA512 40b0922f7f6feedc85ba4110bdd4a5e480473f896190b3f4cc64ac11d4ac6e83719158e3f4a0f88ca643d69d8ac91e4845a206395648d39ec66936de2c49e095
 MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/dev-python/nototools/nototools-0.2.13.ebuild b/dev-python/nototools/nototools-0.2.13.ebuild
new file mode 100644
index 000000000000..fe9dc691005d
--- /dev/null
+++ b/dev-python/nototools/nototools-0.2.13.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+MY_PN="notofonttools"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Noto fonts support tools and scripts plus web site generation"
+HOMEPAGE="https://github.com/googlefonts/nototools"
+#SRC_URI="https://github.com/googlefonts/nototools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	media-gfx/scour
+	>=dev-python/booleanOperations-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/defcon-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/fonttools-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/pillow-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pyclipper-1.0.6[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_P}"
+
+# Some tests weren't ported to python3 yet and lots of failures
+RESTRICT="test"
+
+distutils_enable_tests setup.py
diff --git a/dev-python/ntlm-auth/Manifest b/dev-python/ntlm-auth/Manifest
index c6aaaf684114..bf06e88a22c6 100644
--- a/dev-python/ntlm-auth/Manifest
+++ b/dev-python/ntlm-auth/Manifest
@@ -1,3 +1,3 @@
 DIST ntlm-auth-1.5.0.tar.gz 41826 BLAKE2B fb313cdb4f1022e0cbc1ffcb048a587baca400a75e053ea8943d960f21746e847080db20169f55e6a3060a8b8502637ce7dc269b66bdaffe98c3f769b2b22358 SHA512 cf08b23e49d45c528404b70b6be88f6c3edee9fd0d4584f3962931a08a0982cdad4089963a95aea911b6eb4db32a932536cf6d9c02c292cd447e0a9c6b3b802b
 EBUILD ntlm-auth-1.5.0.ebuild 515 BLAKE2B ffbc2ac4faafdf85be7ed0aabd7a36403ee3e2cf8daabb480020041b3731e067dc7fbcd19cbb7c36c76f2c66c1f48acabaae40f9121adba44eed3c302f6205c0 SHA512 664ff7d65ec506432254078a0bd30e9091a24f912a7aa6084c19ce5041f3e44e47d91c4aa3d5c291499a54c4ef8579de7a88a8e70ea2b3b9ed20bbbe49fed95e
-MISC metadata.xml 425 BLAKE2B 791b65f110ff47908b2ada3e140cbd1fb262f0cce02e5ac083cb4fecbfba686a44aece6a3d44a69b6876c4603dd74d343fd9a61638f908836250bf3badeb9524 SHA512 a38de76267e3e44d11a8e3571809031b94697d270e3c752629764300893e95ccb1e8daf8a9bf897a442fb3b097fd6da4f3d4d34fbaead847474335a53ab91768
+MISC metadata.xml 484 BLAKE2B 4c2fa6f77f0f6ffca89dc62dcfe9a841b96b04594d142392e3878ac920c72ee73369cf399d1b336519dc4a3b18e3e2a7eeb441ff8696c37ef85e79bc7acbadd8 SHA512 66e8db35c0d39bd2a5b4f957378769a977579baab33a3f9f4e06248af4f38fe7993497b2c59cc8dde94b2c836a1d3475e53537909d4b1d4b2315221d670123a3
diff --git a/dev-python/ntlm-auth/metadata.xml b/dev-python/ntlm-auth/metadata.xml
index 68bde49cc71f..779742f9d395 100644
--- a/dev-python/ntlm-auth/metadata.xml
+++ b/dev-python/ntlm-auth/metadata.xml
@@ -11,5 +11,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">ntlm-auth</remote-id>
+		<remote-id type="github">jborean93/ntlm-auth</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/nuitka/Manifest b/dev-python/nuitka/Manifest
index b09f8dc99e01..9af788eee5e0 100644
--- a/dev-python/nuitka/Manifest
+++ b/dev-python/nuitka/Manifest
@@ -2,4 +2,4 @@ DIST Nuitka-0.6.9.1.tar.gz 2470517 BLAKE2B b3162eed308d98846a6266fa822d851757773
 DIST Nuitka-0.6.9.6.tar.gz 2472086 BLAKE2B acee6dc787f24afb6c1843e82bd4fdcda3a45c4c8a74cb5635d5fb2aec6b1a8db64920993b1732e21f3d0866e47f81cd958f42fe577c592931053248976ab33a SHA512 9a4d2b0e947e26118c9e81fc93c63ccc344a0a4d577e2ccd2d6b1ccafacef3eb3d7424283e681b63dde44fa51aad84d86f76e2c839d22d7d1503730e0ab72ab8
 EBUILD nuitka-0.6.9.1.ebuild 1041 BLAKE2B 631478c3ec34f885be0750eb43db77ac833966e7bcc9747d85179dda67a9beb1cf3261cf10cffe668007dc009a06a917168c6a6acb87fdd5aaaf840e0d6000fa SHA512 5d5910f7cc1324fbd0ff44c964f3f4d09bc130933edd88873fbbba8dda9b5fb7c57bc0e9c00fe611384e2167e2c9e31204650e6b8efd6bab5862ba2db982b1e0
 EBUILD nuitka-0.6.9.6.ebuild 1041 BLAKE2B 631478c3ec34f885be0750eb43db77ac833966e7bcc9747d85179dda67a9beb1cf3261cf10cffe668007dc009a06a917168c6a6acb87fdd5aaaf840e0d6000fa SHA512 5d5910f7cc1324fbd0ff44c964f3f4d09bc130933edd88873fbbba8dda9b5fb7c57bc0e9c00fe611384e2167e2c9e31204650e6b8efd6bab5862ba2db982b1e0
-MISC metadata.xml 750 BLAKE2B 28d51b40a9b4cbffc26310e78df58c5ee54c80c20ef750b945f3940a1f1a1c207b9efb2f213a4d6991500ad121af51abf184cfe07944bec076bb69b71d430d75 SHA512 db3ba8bd282db53cbdf1509f73102b023a81cdf62e0a4b5fbd567c3bd038911396f2d17e25b2d778cab66fd848aa967afd7a2a92ecd3ee88a71fe70f43362a83
+MISC metadata.xml 811 BLAKE2B b82c8f4dbb8b39e58fae657df8945060c91fce0eb33f0e1e16ecebffa91c41fd306e8c04bcd799dc736dc3bdac3ce843f30af04b18bb4d36407a43c07ec65d12 SHA512 368becbd858e0963f23ceffa612de4f15087a9b879d3a4efad209668a5c897d7881b82c0de9127d31208825af39c60785601a3f31f3191af7fe99285f103d18f
diff --git a/dev-python/nuitka/metadata.xml b/dev-python/nuitka/metadata.xml
index 50c557ea4749..1fe2db787345 100644
--- a/dev-python/nuitka/metadata.xml
+++ b/dev-python/nuitka/metadata.xml
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<name>Oz Tiram</name>
-	<email>oz.tiram@gmail.com</email>
-</maintainer>
-<maintainer type="project">
-	<email>proxy-maint@gentoo.org</email>
-	<name>Proxy Maintainers</name>
-</maintainer>
-<longdescription lang="en">
-	Python compiler with full language support and CPython compatibility
-	This Python compiler achieves full language compatibility and compiles Python
-	code into compiled objects that are not second class at all. Instead they can
-	be used in the same way as pure Python objects.
-</longdescription>
-<upstream>
-	<remote-id type="github">Nuitka/Nuitka</remote-id>
-</upstream>
+	<maintainer type="person">
+		<name>Oz Tiram</name>
+		<email>oz.tiram@gmail.com</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		Python compiler with full language support and CPython compatibility
+		This Python compiler achieves full language compatibility and compiles Python
+		code into compiled objects that are not second class at all. Instead they can
+		be used in the same way as pure Python objects.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">Nuitka/Nuitka</remote-id>
+		<remote-id type="pypi">Nuitka</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 27d83ab25ec3..9546e268d61c 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -10,6 +10,6 @@ DIST numpy-user-1.16.4.pdf 596203 BLAKE2B da3ad1f0ec1c965d20656f73a970911cbb58ef
 EBUILD numpy-1.19.0.ebuild 3726 BLAKE2B b7ff98d3782d037656a810490a46f8d6a1f9ffa407577b910fcc7a06ce900390d341a06213c5f8d3b6073c7b20053f151f65636beccb07cb055e4dd5a965cc9c SHA512 36ef418f6e17a0cb364bb0f5cef4890fdb84d3a2b748733e35f576574a84cdebfb1e086b8764aa6a14ab887d1730f12cd7f6550a70a792d942622b7ed8602407
 EBUILD numpy-1.19.1.ebuild 3734 BLAKE2B 39e3d88c8f374fc7c6a3bfaaf71c33ffe711891e6bfab8074ee7bf65d39bcc71b1452397f770c56bd4adbe84ba994c5ae14e52eb0b7b3c89b06623eb271c3184 SHA512 7468e68b5e4c1e0a85566a1ecfab03127a06998b34a548202cc78be181219c90dde824a150293464d942ee6a8051d67815c7b968ccf9f4f351198ef20852a561
 EBUILD numpy-1.19.2.ebuild 3734 BLAKE2B 516cb3fcdd3d26da409ef8bf3522f8638ecaf4e02fff6025311d3fe874f114e95cfb88a0b167c4058d214aea6d805ea6b914d574e2af90b859901b94dd109832 SHA512 4e77f799e2600998180438b6cc6f7f3a224f5b342f78cab23bce5abee59b36f16e9646829a3ef9f3bce7daec6eaf8a07625369924b87dd4829cd0f7b60f26e9e
-EBUILD numpy-1.19.3.ebuild 3741 BLAKE2B 3d16e9b26a02dc4c6a5a0d34bb5734aa73e161e198cc7e4311de287676c9b4cfd1d4fd982fe6572c71553d284be16978c06f5b170a9674dc747c3c99eb3728b0 SHA512 984cf6adc67ae4dd627ce0209522080f84a12cabac4c809fa17589e5acf1cc59060753d3a5f11cf3e5139904e3b8eeff2aba3f3490ff4551da23d0551756c235
-EBUILD numpy-1.19.4.ebuild 3741 BLAKE2B 3d16e9b26a02dc4c6a5a0d34bb5734aa73e161e198cc7e4311de287676c9b4cfd1d4fd982fe6572c71553d284be16978c06f5b170a9674dc747c3c99eb3728b0 SHA512 984cf6adc67ae4dd627ce0209522080f84a12cabac4c809fa17589e5acf1cc59060753d3a5f11cf3e5139904e3b8eeff2aba3f3490ff4551da23d0551756c235
+EBUILD numpy-1.19.3.ebuild 3734 BLAKE2B 4b9b8959e74734c345637f661bd3b92bf05cd2c189cdb62867a1c535803e6081087d54f4287f8c678fb93ecbf392412d0f812f88c5cdca40eb00401945aa1b6c SHA512 5d09662fbfe7da320b3da3b39863f6f71383dc02b68aa20248fc377946757755e023b94ae267ee10c2e63dfd4e9bf03711a88c0b2f127ae4ed58fe6b70c412c7
+EBUILD numpy-1.19.4.ebuild 3736 BLAKE2B 0e594d617cc0c35831bf759debc03d3b0a865f7687badd41fe354b346e763a42b5158550bbb673a77baeb589be71f7a355f9b13f111881312f94c30bb11296e5 SHA512 15fd71fb0db0e5de1d10b09993079dd0572f282797014eaf844f03523c3c7f8e02d5564e7c0a31ada31106edde1e002fb7534d38257956dd3a34ef8e7fc6ed35
 MISC metadata.xml 876 BLAKE2B 5e257d6ea3c59c5819d854db7b7db3ebff53b5c87b5ce9348786085f09db12aa6fc8fa86393b9e6c06760ac0d9f36a52fdfb1865c9d1d9ad5526d74d3d53e8b1 SHA512 d35d0954ff8f21e370edeab3ce3e5ab501bf216c93399e807ede6f1910ba0ea41359425bf894d813a39442fb92a724fe83ec8a5c64e6bd97de9422f67700d549
diff --git a/dev-python/numpy/numpy-1.19.3.ebuild b/dev-python/numpy/numpy-1.19.3.ebuild
index 48984ec1246c..848573d5b850 100644
--- a/dev-python/numpy/numpy-1.19.3.ebuild
+++ b/dev-python/numpy/numpy-1.19.3.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/numpy/numpy-1.19.4.ebuild b/dev-python/numpy/numpy-1.19.4.ebuild
index 48984ec1246c..e18320d1bf13 100644
--- a/dev-python/numpy/numpy-1.19.4.ebuild
+++ b/dev-python/numpy/numpy-1.19.4.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/numpydoc/Manifest b/dev-python/numpydoc/Manifest
index 89019d7ddecf..5bb66f7f89ac 100644
--- a/dev-python/numpydoc/Manifest
+++ b/dev-python/numpydoc/Manifest
@@ -1,5 +1,5 @@
 DIST numpydoc-0.9.1.tar.gz 27583 BLAKE2B 91764f74b35a740790efa9faade69622d48777fe97a62824b91d78ebf62f806f8c5ec34b1e6c4a4afee6e87358edfa40ca0d316ea41f7ed8501733a51797611b SHA512 85a47ed86823baa3125dde4bb2760ce56f6fed9bb29dc64187dee4101f6344b5065146209f603d50a84a5d9cf0b7f4e5134fc0b495219e68100e05e028b61f2a
 DIST numpydoc-1.1.0.tar.gz 609482 BLAKE2B 475be835a760dd148b7132a3149a1b79193425b70bbaa51b29a3909c73ed11a933181c917a0f0d0b56d8d30baced2142897e0a931b5eeb6449092d0a2a81632b SHA512 10dfc5e40ca851401be7d7cca3cbf24bf8ded8573c01344976321cd65fe351d985ee0bf48a92a485a43f8fb191c246e4822545a1583c87c1214d819a5fdfc106
 EBUILD numpydoc-0.9.1.ebuild 782 BLAKE2B 8c0c94fdaac4280ce66502dcdc254de03a8d33384586be2efa249728c93bae31a655f90869d33ee518ae8bf9edb97b56de4785ece4d076caea896efa6bfcfe03 SHA512 4bd71ffd4a8fdc1b61e853d39773cf1500933df899abdebb9fe4cc57bdbbda91e7f917038caf548abd9710bb58e6f3499e3db62fa54eaa0681fde58ed4483010
-EBUILD numpydoc-1.1.0.ebuild 933 BLAKE2B 0d9ba3fcd91ea8dfb990a6b46b4d793caa9d20f265506572a3bcaf408688676cc669a432b9ef0ac4dba81fd00233d42a54edd4f024eea35c9cd6a436611546f7 SHA512 4bfc101c5525f8ebc7e3d5848926a95bfb9d1a0351948d2ba9b415c7fb861ca6e6bbd9feb13984707830686d4b17f47418c3851445fc292e83d26f091e94db64
+EBUILD numpydoc-1.1.0.ebuild 944 BLAKE2B 7f6589b4f2f4ff46d6823306337caf88b0e8058e36f89e1bd697f7a54419c5d56d5e08d6d61a2887a7d1020e3a47000d83c24e2a11ab7831d024232fa9c968a5 SHA512 ead4b0493fb756c1e499d77422b85649394862fe25b4dd3dd7a4f1910ba0215451fc666cd2eead7faae46807d732c89ef6ad2344853487f550723df22b21f766
 MISC metadata.xml 346 BLAKE2B 4cc694f3ee24d59fb18bc7d1ecc4b2cce5931d450efb57b75765c2762a06ff10458f55a4c472a75ca6d64e4e1a79dac0b5ed610e4963f52498ab4a3701d18ede SHA512 737d553f25d503f5257b1bfd36bf295a528e600070b00cbe5b0fff9c1fde9f967c89b5be92968b2eef617bead31780d7cad4a0deb419f0a816c806c2a688e9b5
diff --git a/dev-python/numpydoc/numpydoc-1.1.0.ebuild b/dev-python/numpydoc/numpydoc-1.1.0.ebuild
index 5163fd43f16a..b4ed68905b1e 100644
--- a/dev-python/numpydoc/numpydoc-1.1.0.ebuild
+++ b/dev-python/numpydoc/numpydoc-1.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/jinja[${PYTHON_USEDEP}]
diff --git a/dev-python/oauth2client/Manifest b/dev-python/oauth2client/Manifest
index 90d1db0afb64..7c2af3b3d0fa 100644
--- a/dev-python/oauth2client/Manifest
+++ b/dev-python/oauth2client/Manifest
@@ -1,4 +1,4 @@
 AUX oauth2client-4.1.3-py38.patch 1782 BLAKE2B 751b62649cd7222230f809c7e957636e351cddb3588c1da112443b09067c73cc6ada588697dd36f9b6ed2115238f8f811bc5502b17c75b2f65be655b4199dc9f SHA512 3e03d7105e76206e63858a32a25dfd5bbf997ced6abafd75d0f4973528ee91cb28200854ccfa519945573992f454c18d2acad5784693acffc7509ddcb13908a8
 DIST oauth2client-4.1.3.tar.gz 185589 BLAKE2B 6cd61448e0d55cef7f2ba640c8cbb50ac83e76d0993391eb0acb3e156f937fcdee80576c9d45d505235a9f266495069664ccbfafd649a4e2d7a0990517ee8cb6 SHA512 80f49e09a6dd6767307a2c278544926fbf20b4f55e4cf83563ac7a7c1043622bd3c8c7fcf6de62896b623ca8c7947b309a5e6bf2b7cb0fccff3ff7634386b287
 EBUILD oauth2client-4.1.3-r1.ebuild 1720 BLAKE2B aa1429a130493987dc7b7970135d55edbc45502866bc8bbb187874a4b117365dbc3c7f50ed53c08483efd976297aa72740b068da03470d77ea1d46cbc5b3572c SHA512 4770227dc48a378f76cd6cb8397a7824cacbe31f6437f6917286f20b70547bed1d19df2564db794b216f351a2f76051aa11dea106882f254e2a07b193174fbb2
-MISC metadata.xml 363 BLAKE2B 7c5e946ba58960ecbb9458b57dde2175f003d827f4178c51c2746053333af96d55d973a81668d7bae5c7d4e706e870678da540467d23b5d43c020691552314da SHA512 4058fc7b16017ed09f27da96d66e9d142dbffd476c8c7d4c2b31127ee2dc43b002e0f431391784465101a329d172bf7650c5ee42e09a1edd21c11be8a191ab6a
+MISC metadata.xml 402 BLAKE2B 4d44ad9db895336e82fdffa585bd3a49f8cae95609e1d468f6271a7d29476b3f9a919c552655e076703ef9611489e0c027db02504d5a6de8057c354e8deadeee SHA512 827ef30649344156ad5f936091ecd8fd4433edac019da92e94f0bfd79dadb45e31044773d57c760832b603763735e9ae76214c91b07cc9be13c862e144de6723
diff --git a/dev-python/oauth2client/metadata.xml b/dev-python/oauth2client/metadata.xml
index 84013d57af40..28ef25289206 100644
--- a/dev-python/oauth2client/metadata.xml
+++ b/dev-python/oauth2client/metadata.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="github">googleapis/oauth2client</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">googleapis/oauth2client</remote-id>
+		<remote-id type="pypi">oauth2client</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/oauthlib/Manifest b/dev-python/oauthlib/Manifest
index 1b116f87c8ff..ef157fcfb58d 100644
--- a/dev-python/oauthlib/Manifest
+++ b/dev-python/oauthlib/Manifest
@@ -1,3 +1,3 @@
 DIST oauthlib-3.1.0.tar.gz 155362 BLAKE2B 83e9331589305c85acc755f9c4dab8558a19aa247aff5be0fe6c51d047fb9e96b64f17d07a3e33378f6ebc73a283e0162bab56e110aca581f73b628544042600 SHA512 c295de232e0215532c501d8f0803bd501a15fe89a746179ba4facca878e4927c8c05f07825f483c4a846922fb49d6d89f559a8b49bb72b19903f902d772b790e
-EBUILD oauthlib-3.1.0.ebuild 734 BLAKE2B 0474d305655f08f4fe3102a487b6c4e250480d9dec1169c9c2f6cec7ab750123a858b22a9dc3a2dafbf54524230d5fadf76934e51119af9c916a65d1c6f0c276 SHA512 bfac2cd29c2125ab4c201ff0aed42000590efb4ee44031893db46f94623a475c2643a91710e33e6e60e7f380cf442520e233855da76022bf50e63ed347e24eaa
-MISC metadata.xml 380 BLAKE2B aabec34e131c6054ca301f037676730606c49f70870b4ac17d887fba068d6ae1bae2ca8fe74366f306903655665de5d93ded051bc2a61e5b97e3b09cd725fdda SHA512 920b499fff04028ef2a6e0df9ef5e71a7d598833ea41113b020eb8d7ff5b77a87d99ea8754d5192510901c84cb8c3b99709fcfee38d27c52a51afae7d917e058
+EBUILD oauthlib-3.1.0.ebuild 733 BLAKE2B e5f2c06e36c1e828f9df76c5b38a8e28b1c57732bb734222872f0a2b7d5bb57e5322de964d81163aded8fd0d6b9b044e8d99fab6c279a1b399d6fa05b3f768ff SHA512 a1f7c09336bbef1c1c5a7e7ec5ef9d5ba7cc5f50e39fe0fc3b36e051af1327a7a0ee51435e3e2282e20f802d4b5af72d95b44f76da3857cf9847857feba0388d
+MISC metadata.xml 368 BLAKE2B 537cbafa42a979bb60e657d4bfb49fb6dfa3d6a0c749af96bc4daa6d1c7ad070026d9cd0b089426b0f9a5e07ce609325484f66bbfb9a275b31ca1552acb70058 SHA512 9c38212110ac83cd19c1397ceaa7ec1451e58d41400084b3bfff0ea8afe14ff72a161dd9726950cc31e3ab6b5efb4962356de92f32a3c50e3e61009e40627297
diff --git a/dev-python/oauthlib/metadata.xml b/dev-python/oauthlib/metadata.xml
index ce755adad218..22ae9fda5336 100644
--- a/dev-python/oauthlib/metadata.xml
+++ b/dev-python/oauthlib/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">oauthlib</remote-id>
-    <remote-id type="github">oauthlib/oauthlib</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">oauthlib</remote-id>
+		<remote-id type="github">oauthlib/oauthlib</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/oauthlib/oauthlib-3.1.0.ebuild b/dev-python/oauthlib/oauthlib-3.1.0.ebuild
index 45791c624a97..e702e83304a2 100644
--- a/dev-python/oauthlib/oauthlib-3.1.0.ebuild
+++ b/dev-python/oauthlib/oauthlib-3.1.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="Spec-compliant and thorough implementation of the OAuth request-signing logic"
-HOMEPAGE="https://github.com/ioauthlib/oauthlib https://pypi.org/project/oauthlib/"
+HOMEPAGE="https://github.com/oauthlib/oauthlib https://pypi.org/project/oauthlib/"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/odfpy/Manifest b/dev-python/odfpy/Manifest
index 6306fabca263..47dc966a6274 100644
--- a/dev-python/odfpy/Manifest
+++ b/dev-python/odfpy/Manifest
@@ -1,3 +1,3 @@
 DIST odfpy-1.3.6.tar.gz 691122 BLAKE2B aaaf2c1613beb6775d22e4d1739b7c144d8046e687f0dc8f7b7b1ea7400cc32dd572ed5a1cd12cb01c5fec27b5c37950b710b279a46d60da8735154d2b2d7030 SHA512 09f3fbce633949035842cff16d2e016271b7f6abf04d74fcaa712c9b3afa18943dd566a2d88a7256a0a52d88ea689d6ef8262f6d8d67d6ea1025aa56e10300f8
 EBUILD odfpy-1.3.6.ebuild 602 BLAKE2B 695a1b03048846eb367f54bc8b608bcb6ea9ea08ee7250773e5e50487c394bb085b11735af45e4c5a095349c2aa7f33027c53ef6405a0b39f5ba539de84c7a08 SHA512 5123d852f5a84ad068d55f7a2a6a3126f7d37861261e671486c57767db72f028e64a7ccd94134fabbc450dde85533653cf4a87d4508e989642ce89db1aefe2c1
-MISC metadata.xml 308 BLAKE2B 4d370440c480d97acc4b9b2e51aeb78f27227e8dd2c5acfdb99747b6b2eabdd624f8a8f90af28287849216d874bbcc81bb9ca8cbf78c1221e947fd479476b1db SHA512 919a3c6c182828bf99396da71e83f0b982aadcdf0e0c5e6e7f29e15cab19e2d3c6d5afc26864a324055e97be9563cc30ef10b701716678c7cd44e8403adaccde
+MISC metadata.xml 357 BLAKE2B 96888cda20bf2f6b6419b542fcf92ddc59eb9107f910a48e1b9c7bfc60f52eda47d4551596fda7bea9cdaf1ae5e7ee66497169c1ce2d32248210200556bee646 SHA512 2c33929495b2fc2260fd181c5c6fb1554a15790b1c1cdffbb7844973763c8c36240720fb23d79702849111eacb15b22b275281e379a7cc0583a107cc0cb08b90
diff --git a/dev-python/odfpy/metadata.xml b/dev-python/odfpy/metadata.xml
index eb4477be8452..f952ae688764 100644
--- a/dev-python/odfpy/metadata.xml
+++ b/dev-python/odfpy/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">odfpy</remote-id>
+		<remote-id type="github">eea/odfpy</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/opt-einsum/Manifest b/dev-python/opt-einsum/Manifest
index 480895b4da0f..31feebf31573 100644
--- a/dev-python/opt-einsum/Manifest
+++ b/dev-python/opt-einsum/Manifest
@@ -2,4 +2,4 @@ DIST opt_einsum-3.0.1.tar.gz 66204 BLAKE2B a8d2d1246e890d24ea73d129ed1ee99e8fbbc
 DIST opt_einsum-3.3.0.tar.gz 73951 BLAKE2B c8e39c9589bb6b89150fd5699fafd77c5ac6022f66d1b778a55dd61e606067be4b6df85972dd4078df084e34a39463f5e59d69426b0ed9152e93f93798417eea SHA512 f34c58bd3aa4a15794cfc604167c0e3175b9826da2a2449bb48ea5c3095f8215e3f990daec51e77e505a03204201694df1a09360ee51b8a4a793b9844d9c2d5e
 EBUILD opt-einsum-3.0.1-r1.ebuild 465 BLAKE2B 2370a26e5968781a186cbf59671c0c25cacf3d6b0004f353a30d2fc7e46f7fe7b27cb924b587d22fd71dd51f0450da0519ce0fd327bc8be4f116945751e1136c SHA512 31f2702770b73ffa9d6ee3ce758e5f130d3816a8b11cc8ba73112ddb3a0482c20638bf18ff86f4308452ae45661cbc25157f5d951268f8ac7d49531a9c4c4c53
 EBUILD opt-einsum-3.3.0.ebuild 467 BLAKE2B a66a47c4c1c0dca4fb5ba352a272b3914362e667a5b4e844ef2dee5d4f346dc6f9e26e044ad83ef762840ce7167a05e7e4696b90696de680601765d566256129 SHA512 9a22177c4fc787d795d9590c3fc95f28f6997c1aa0dfe95a3be51318af8d1c807e6d2bba8b3647b4accbc2bd4cfca5a985cf3973a222823f9a44ccada61d20d0
-MISC metadata.xml 397 BLAKE2B cc07d001bcec6324ebd4b904946a8c3414aef9172f6f273228bcb82006e7dd20f04266258bd44a8e98efb34444e3aa92f7f6da3166e0a634dfde03747fbdca23 SHA512 aab566503b3fe1b26eeda8fa76be5f304790a2f53c50051e7d684844da47cbdc6cea03d24878e721339bf408f9dcc90b1aabb4f63627e8941a3f01a56c155c00
+MISC metadata.xml 470 BLAKE2B 7dd0dfa92800286393d304a888994092cd7b3b673f84f2a542edd166e02c65f91f3248248f05f6cb5b4ac0bc34b557c55db50d4c1fbfdd1483c49b7b1c5db011 SHA512 090fd5fd8157e7118c60700974c6fc94736a23d529572de49ee57679d2dfe5091358e940e5ed34846d5bc6dd236363ec07800d7d12813342c388ce726cda7d58
diff --git a/dev-python/opt-einsum/metadata.xml b/dev-python/opt-einsum/metadata.xml
index 93afd7bb77ad..92050163befe 100644
--- a/dev-python/opt-einsum/metadata.xml
+++ b/dev-python/opt-einsum/metadata.xml
@@ -8,4 +8,7 @@
 		Optimizing einsum functions in NumPy, Tensorflow, Dask, and more with contraction order optimization.
 	</longdescription>
 	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">opt-einsum</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/os-brick/Manifest b/dev-python/os-brick/Manifest
index 315059766b35..fe0a2eff5b49 100644
--- a/dev-python/os-brick/Manifest
+++ b/dev-python/os-brick/Manifest
@@ -3,5 +3,5 @@ DIST os-brick-3.0.1.tar.gz 189358 BLAKE2B 331e06a49afa6d973149425946ffc3fc2b2173
 DIST os-brick-4.0.1.tar.gz 192821 BLAKE2B da1037e33288a3a20c6858b8620c5905c9a1d218ab858659bce844445d6b33a9b9c629df21eab68419e755bddebc43bf20afc197eaaf4a29dcd7365d19b27b0b SHA512 7847cae82e1ef726eb1189d93f13325d57abdb52286887d6b55e256d9a9f62b0afe71580c5ff30008f5827ba76cac8e423ee5da0d2d01f5794fa3556a6c2cc64
 EBUILD os-brick-2.8.2.ebuild 1458 BLAKE2B aadfe1bb39d49f87e8da9f8bd14291eb8d414a1b38acca29fd12022fec5c0d58a944a46bb2eb29796ff65fb9a417fc2cb2e6493ca59fac90557891367e88c55c SHA512 46ff984e089bd29223627f368b31ec34e60ffa42fb22fe64525b4404de638dd8d9c6cbf1a6906d4a9bd68520bb7f31f7f5d19e6354f03fa342bbc89ba54eb73b
 EBUILD os-brick-3.0.1.ebuild 1598 BLAKE2B d22959e8795da0fbcb48f9ea06385585846d25be8713a3dbf806e04249670905d63d2b04dea87b1fe4369ecdca7b62c5f0fd3fb8739887a2014bf9a5988bc75b SHA512 355331e77ed709f4f7306e349afee02191256bef8f2c80ca7c3873cfe35240a5f65d53cdcf9246c969e8dcd759ee50f80b4305ce5735c55bb60d608e1739d3f7
-EBUILD os-brick-4.0.1.ebuild 1220 BLAKE2B cba1a0599e63e87d148c6c038583d9cd8b90b4f198d2f80758cd4c366dd3bc5e002d63a757fa63e946db58c97b67fd81525017b0945e22f62628dcecf00021df SHA512 0586e374965576405b7dc7ab6869f524434ce2e974178f87197fd13268b24b1274a2f66b6d4a31dd3f898b784288aec39c3e25d538bca41739be3ab0a2181e54
+EBUILD os-brick-4.0.1.ebuild 1218 BLAKE2B eabb2f15d2b80fa9fb548cf4e0c0c98f1c4280e198298c6e71ea11a5ee90ade7ae465db36dc95b7498d251a1a8747d3b23d0cf19ecefa64bf101fa922436ef0e SHA512 6cade2a5837947065d64acdc01f437a5d64b8b54599001fbfc981f9567797d8a635f99df1bec21c1424797b7ea63bcab36b9af0df9a21a4be1e567ed78b71ddb
 MISC metadata.xml 405 BLAKE2B 136d3cf6a74f9d90ed05a9c80e83b168dce1012acb95f9c1281410894d695994318992798e719639d63e36c466d8bd66ac2f67eeeaba720f18933e0a65167cda SHA512 4bf564ca91331cdc58c0ab3f9f372ee155947124e43e4d44dc38d7aa4ce8c1a043537ec262fdb793759bd50ad8ae213a2817ca41dc95618e138e3523432be6db
diff --git a/dev-python/os-brick/os-brick-4.0.1.ebuild b/dev-python/os-brick/os-brick-4.0.1.ebuild
index 64fca94f9bb9..12b80504c96a 100644
--- a/dev-python/os-brick/os-brick-4.0.1.ebuild
+++ b/dev-python/os-brick/os-brick-4.0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND=">=dev-python/pbr-5.4.1[${PYTHON_USEDEP}]"
 RDEPEND="
diff --git a/dev-python/os-diskconfig-python-novaclient-ext/Manifest b/dev-python/os-diskconfig-python-novaclient-ext/Manifest
index 8b7c9bd472ae..50a68fed8dd5 100644
--- a/dev-python/os-diskconfig-python-novaclient-ext/Manifest
+++ b/dev-python/os-diskconfig-python-novaclient-ext/Manifest
@@ -1,4 +1,4 @@
 DIST os_diskconfig_python_novaclient_ext-0.1.3.tar.gz 2543 BLAKE2B 07fb502eaa1fa4340c2adff63e5ecbea17292bf7a7c69171507be83b51e9fe65870b0716cdc857d49fe31d01a6522cd265950a7ccf9487599cc19dd0c808ca55 SHA512 4733c4ef720d0fdfabaa26c4288b933ac7d9e4433b20257cfe206399b71154dc6ee98ab621e67aa4c3446df2ec1929edfb9341538d7d4ab69d71576652a9d591
 EBUILD os-diskconfig-python-novaclient-ext-0.1.3.ebuild 625 BLAKE2B 7b465440c09dd957f5e1c65576b37963af23f8f6a55add7ecee5629442a84403f1ce0e3e05b4015ffdc8b442a1e75f8482354e9a6a3353d74236a5dc80ca2e37 SHA512 077eb1265014835165c0afd158b8e9e57a72469546f95cb5de6a68333e3cf51f4ea9755654e81df69ff01f8cab2012a55a06c4b95f52a8c401521c1490155397
 EBUILD os-diskconfig-python-novaclient-ext-9999.ebuild 544 BLAKE2B cd8be386da925fd094d7284ec44d361feca2a6ddc11a9a8c3b30f196e0085f761e2e8030b7c91b9e030c29ed0f10019184940750a26a2cf471a63cf8d09340ea SHA512 448ec68e242ae0defb319eb29639543597c46555cab0be0b7524194766defdbe7f08058d60a7753662292deac8ed1e1216bda0d653884ab66f49652b4dade5d1
-MISC metadata.xml 449 BLAKE2B be304cfb7485f5882cec34455cc7d918f7b96495f886c18de6898fc978a73c326d66164501a499d81f85a13546df44e9c1df92dddecc812fe1c4e800fc13754b SHA512 b9eea726f932e84333dec6d86d50ddf2a3030c31e729e25c24226e0a98e34e3f1662c55afa65605b2bb69af40112c781fe3ba41efff040404bef8ae461b4010d
+MISC metadata.xml 438 BLAKE2B 39e0d54ba264ffdb0551d2a4fb7e218873cad4f9a25b3453ec51fb5af62222d61019511004a09a3e74553a2fb2f7fdcd95667227b949f19f41757456f701e7fa SHA512 5b893d963b4e63da85ced84f039a31dfd680db8c7d277400762a98734b3caabd7fbe265c36ea383b7a1bb2da91ebeb5841a3a6b44b1ea586d422f545a1595919
diff --git a/dev-python/os-diskconfig-python-novaclient-ext/metadata.xml b/dev-python/os-diskconfig-python-novaclient-ext/metadata.xml
index 23ac45501758..34927faa5730 100644
--- a/dev-python/os-diskconfig-python-novaclient-ext/metadata.xml
+++ b/dev-python/os-diskconfig-python-novaclient-ext/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>prometheanfire@gentoo.org</email>
-    <name>Matthew Thode</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">os_diskconfig_python_novaclient_ext</remote-id>
-    <remote-id type="github">rackspace/os_diskconfig_python_novaclient_ext</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">os_diskconfig_python_novaclient_ext</remote-id>
+		<remote-id type="github">rackerlabs/os_diskconfig_python_novaclient_ext</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/os-vif/Manifest b/dev-python/os-vif/Manifest
index 7966f378303e..a36ccf29e652 100644
--- a/dev-python/os-vif/Manifest
+++ b/dev-python/os-vif/Manifest
@@ -1,5 +1,3 @@
-DIST os_vif-1.15.2.tar.gz 88591 BLAKE2B 0a272332b238590f9a0cb5a457babe8a26b97196370c0e0f4c1e4d89e814e424dcc5f0e2786cfed3729bb5608434507966ab22d9c68b90e7deef0767381a8cb0 SHA512 36d7ff16fa5b7cecf738d9e867657ce7ff416a514cde2796306d2e21a1ae1985528dfcecc95498a24fcfc16687cfdbc898550520ac6e17d202ea554e8d8c7b1c
 DIST os_vif-2.2.0.tar.gz 88781 BLAKE2B 99cb3337cc8b67fc6977e284f2e3370b47ff9346752cbe99fff65fddec80f8dbd0ca4d67527a0afcfb0e35fa8e42084a8e45a0dcb7ba66a1046ff32c752e5702 SHA512 eb06e0fcee7f061670438f81098f69c6d480d5f901c7dc8f0e38f4ed1494701c7711444907abba989d577230fc05d863697b7b813099fe1fb1820b25de677901
-EBUILD os-vif-1.15.2.ebuild 1406 BLAKE2B 4953125fa71b7fe0a5f2237dc384aa0b60f44ca1ef8df572c0cb83341c221f7b6c07d4fee858e06d704c121731eced3f0413321e4cfd2ef3afaa2b7415c314d2 SHA512 13481f3bb47f1b454f71b27e92e43203e291ae42d467924f394555bdd060a0c2e878e7d554f36686aa697620d23ba7527e6c14cb4b08fc57ee38e08ee7de4e19
-EBUILD os-vif-2.2.0.ebuild 1203 BLAKE2B e69def0404edeb6aed83e7cd8090109f8da803ec2cb8bcc2cf0f0a30045551f404420f622757a172eca9ceab18587783f5ab25f493f7faf475bd7573dc338ce3 SHA512 4b9b136a81149a91d24ebde6a395d93f372832586d07221243f0e42fe0f9f86bc3e76fa2f2fb762a56de234228e61d2f5392f1ad9678aaa95d7c116e216ff949
+EBUILD os-vif-2.2.0.ebuild 1201 BLAKE2B 0c0c4e7c855da384fa664a04d71bfa3fb8bc54f3dbefb3c13d3798f538d21f56d7baf2b8656a30b83afa37b3b9be14b3bae16ac2dd8f60b84c1435a12d41ab4c SHA512 bdf57324b37ccca700945c71ac0f292b349cb17a7681743cd541e0ec62bd06debd6d6112a51d65e284c7d561ec19da95a164a70ec255738bc3d76230b6271616
 MISC metadata.xml 403 BLAKE2B 8ecaa24247dde21adef589cd2cc3cc755a43e24b98ee766f02fd8559b671b918cba49f7cf4fec82e05761899f1f23732fcaa5a685ca438137f5752d1691bab79 SHA512 c911ab128071c7c64ea08892d197864801f89dc8192cc947d9c79145ed0a82e01aefe45d78cf116096f2b0eecafe10d184b00efc90d5f0aadb785969edb11bb9
diff --git a/dev-python/os-vif/os-vif-1.15.2.ebuild b/dev-python/os-vif/os-vif-1.15.2.ebuild
deleted file mode 100644
index c39f1e165e71..000000000000
--- a/dev-python/os-vif/os-vif-1.15.2.ebuild
+++ /dev/null
@@ -1,42 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack Cinder brick library for managing local volume attaches"
-HOMEPAGE="https://github.com/openstack/os-vif"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/os_vif-${PV}.tar.gz"
-S="${WORKDIR}/os_vif-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.30.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.23.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.28.0[${PYTHON_USEDEP}]
-	>=dev-python/ovsdbapp-0.12.1[${PYTHON_USEDEP}]
-	>=dev-python/pyroute2-0.5.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.19.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	sed -i '/^pbr/d' requirements.txt || die  # pbr should be uncapped in stable/ocata
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/os-vif/os-vif-2.2.0.ebuild b/dev-python/os-vif/os-vif-2.2.0.ebuild
index 66f17c9dcf39..3aa9f655c6ca 100644
--- a/dev-python/os-vif/os-vif-2.2.0.ebuild
+++ b/dev-python/os-vif/os-vif-2.2.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/os_vif-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/oslo-messaging/Manifest b/dev-python/oslo-messaging/Manifest
index f73c673b541f..b1ff61f9e3b2 100644
--- a/dev-python/oslo-messaging/Manifest
+++ b/dev-python/oslo-messaging/Manifest
@@ -1,5 +1,3 @@
-DIST oslo.messaging-12.1.1.tar.gz 255540 BLAKE2B 54ab60244090d3602de9395ea4f6ffa4bfa78783642aecaf7bb37db62c1a5cb63d69c612d2d1085ef96611429a8c7b337ac1849d93ed857a2cb51bbae6265ed2 SHA512 0f55f2c21dfd5f83efbf53f8c0cfa65d8572166662a183998c896c61475a38c47ae6e2376c5a153049d2f91e3321d6a75accf4de4ef11b4ec8626b448c0637a9
 DIST oslo.messaging-12.5.1.tar.gz 256120 BLAKE2B 73ed3c8fa356d63d3641626e823a87dbbfc238f9136371aa81c1b7e6be327c2f93d22bb0de4aa0906972bc2e8e0f09047cae06d2b96ef24a3c062d644ba34f68 SHA512 ad29c8a80c1f423b91d0725e8ce85015feaa8db33c911626a90c5efcb5d9c1bf55711b610e3bed4a63370627cce86f48b50658605344d1ade503673c8415de65
-EBUILD oslo-messaging-12.1.1.ebuild 1665 BLAKE2B 158d297eb479ee1e5285f0767d33276e801e8e1c919ba478309e83c5b2d21c54becafb67be46a33bb746936cbd025e31b44ed3ac2a4325dbc36abe0b660914a9 SHA512 d34237c79ce7655dc18561dcfb510cc0b95bf612d7be0da66e33be4390b7dcf3d65bf17a2c462eafd37d7cce11c8bf55559da8b6fc803fcf58c1d1ca9f39f27f
-EBUILD oslo-messaging-12.5.1.ebuild 1514 BLAKE2B 6ed5a7071a8ef0203dae65376db5f06faf3bdcff077ebf43d802cad66fc72db54d241c9ae246665f16d0a786d667552c31539c16549beca6c1b6d4cb59a2ff99 SHA512 39550dd1a0c67f825fe79fef666dc8672fbc65b8cc03a56cc7090bac8c415716e902eca7936d6095c6b84c8be3531aaac1ee8b803028f13e4dd75729726ad435
+EBUILD oslo-messaging-12.5.1.ebuild 1512 BLAKE2B c2aa0911fe81f8d20c15a9b9ec673dad638c72391a07464bc4e8056c4a71e1d91eca990d12fe57f9e6e6febe4f39bd6ec77cd1330848a6ff2a156b171ffb113e SHA512 fd49347ae3d442827ebee05b3705e4fb7dc644c280d6a62487dce56a803d715600c1d92f286a5a043e63563c31581a6d134d4a5ebcb2220aca39d7b71032da40
 MISC metadata.xml 473 BLAKE2B 4a509bf6918118dd444bd8e6f3b1f89652fdc08a5c2cf975d8bd1aeee4c615356b611df28d85c3ce5a8fc16d4c8fc31c97bf6bf9b00314bb91f69d31fa68237e SHA512 a9bc655b7837297edc633e0b135ffa873659058b29b4ba6c7dac8e370f1fa672f9b0fc825908d81abf3f1884a3b080c6de63e8d6741cbf50069dcd6221701fd5
diff --git a/dev-python/oslo-messaging/oslo-messaging-12.1.1.ebuild b/dev-python/oslo-messaging/oslo-messaging-12.1.1.ebuild
deleted file mode 100644
index f3a9989e9c84..000000000000
--- a/dev-python/oslo-messaging/oslo-messaging-12.1.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 python3_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Messaging API for RPC and notifications over different messaging transports"
-HOMEPAGE="https://pypi.org/project/oslo.messaging/"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.messaging/oslo.messaging-${PV}.tar.gz"
-S="${WORKDIR}/oslo.messaging-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.37.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
-	>=dev-python/py-amqp-2.5.2[${PYTHON_USEDEP}]
-	>=dev-python/kombu-4.6.6[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/oslo-messaging/oslo-messaging-12.5.1.ebuild b/dev-python/oslo-messaging/oslo-messaging-12.5.1.ebuild
index f8d32ac4e969..d8a9e436950d 100644
--- a/dev-python/oslo-messaging/oslo-messaging-12.5.1.ebuild
+++ b/dev-python/oslo-messaging/oslo-messaging-12.5.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/oslo.messaging-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND="
 	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-rootwrap/Manifest b/dev-python/oslo-rootwrap/Manifest
index 5f30c0373136..e48dbc99dadf 100644
--- a/dev-python/oslo-rootwrap/Manifest
+++ b/dev-python/oslo-rootwrap/Manifest
@@ -1,5 +1,5 @@
 DIST oslo.rootwrap-5.15.2.tar.gz 45566 BLAKE2B 1755a52d1e380a512c50f5314f7a4f249da9e62030abfef531bf973277a98f1f42f1c27a69a4e6e5cf64441e6a7263a3780355da4860461cfafed172ea087946 SHA512 9fc4c4678a25ebecb08026e71ef8da44bf1214f177d5330de8d68cfce8c3d85f4085a9e19f282bc8b498a36d8a7e384cde354a95619a800e3a68aba088df5aad
 DIST oslo.rootwrap-6.2.0.tar.gz 46850 BLAKE2B 0ad998aecaf8dfe0616094ed08e64380d38fa663dc63f192b58b95a07deeb690f16f1b8de2d0666c80bc49c11c06dc7221e9b9fae7243c3569971745884b752f SHA512 bf3e91ec8a18f92f6f5974a6d8369ae73dba6e61fa3001996678b85d0bfb2426536d27097ad784169e6eca50ad23471505d5089e8d4a6a84c9e0e009a6a38f5a
 EBUILD oslo-rootwrap-5.15.2.ebuild 1662 BLAKE2B 29c4e8045b94a195c475c519abd71fd0c7e228759eaa3851398670d193bfe240fed41b96c54c96b4a4b4bd9bf8d8ca62c284ee84fd54a6d5a5cacc443b411de0 SHA512 29439dd9e4955a7ed36c39f4703df4ba1c6b14fd88c1460909d6c1ca2c3452e4f511e85bae5e5972c92568d245710aa6096c2b044381643f8d61d26f0779798b
-EBUILD oslo-rootwrap-6.2.0.ebuild 626 BLAKE2B 54937579e1cbce0457dbecdbc9612c3aa201588757b44c391be4e0afb388ca0e330451c05749da18c03fefa264c8f0fd4187f519da8f3daa710c580ba9e32942 SHA512 aaf28bdb6606e0442c3d1df0fe981536453704a30bf80ee23c20f048f715d759cc0494df8dcb37c1441eb8e6b75a364995b373dad55309cdabfe828dd98674af
+EBUILD oslo-rootwrap-6.2.0.ebuild 628 BLAKE2B 17d80e4b27918f81f1217cb8cf27a81df882852fc563de46b29525c94e17680a48b167c399e3f3ee43455626c0c8d245aa2abb9b915e2ad024ab09dd99166e42 SHA512 49e38f64a0cf9c37c0a3c512a6917557580b6e974b437b84648800ddace9f35125af649aae13cd6c847b3f8c54bdbd7a91251de2ef762b969f65dd9301649270
 MISC metadata.xml 472 BLAKE2B 6c4058ba0c3695c7fa295423a826cceb2b962e7c6900a32e6508ccca4b72ab59ce186432e80afd6f81eddf0351aacb69234f36aed7cf0831f444f652ca1d2b93 SHA512 31cd44e892d75b3f89b8719a8eb0b66fae9c7c3a17611e8c65e6e2adea1bc948eba02cf301562807020080971bb8a9f7b1965c02afb5c652a0d2eaea43f44276
diff --git a/dev-python/oslo-rootwrap/oslo-rootwrap-6.2.0.ebuild b/dev-python/oslo-rootwrap/oslo-rootwrap-6.2.0.ebuild
index 5f1b470af9ed..9c2d8066199e 100644
--- a/dev-python/oslo-rootwrap/oslo-rootwrap-6.2.0.ebuild
+++ b/dev-python/oslo-rootwrap/oslo-rootwrap-6.2.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{7,8} )
 inherit distutils-r1
 
 DESCRIPTION="Allows fine filtering of shell commands to run as root from OpenStack services"
-HOMEPAGE="https://pypi.org/project/oslo.config/"
+HOMEPAGE="https://pypi.org/project/oslo.rootwrap/"
 SRC_URI="mirror://pypi/${PN:0:1}/oslo.rootwrap/oslo.rootwrap-${PV}.tar.gz"
 S="${WORKDIR}/oslo.rootwrap-${PV}"
 
diff --git a/dev-python/oslo-versionedobjects/Manifest b/dev-python/oslo-versionedobjects/Manifest
index 07f1747274ba..358ef6192d8b 100644
--- a/dev-python/oslo-versionedobjects/Manifest
+++ b/dev-python/oslo-versionedobjects/Manifest
@@ -1,5 +1,3 @@
-DIST oslo.versionedobjects-2.0.2.tar.gz 152102 BLAKE2B 6b7d19d0a17d895e65eaa15ccf4fcbf71dab10ada019ba9c2d7701ba8d7b3111542bb5be6be9d4ebe9d659c4b74f6d406a354f9e1f5990983ad36c6576ef8e80 SHA512 0c544ef33c213f8823a7ec9c2714d3053e9db0a6bdc69f8c41654c0117a2f2b43c94bc6dcd2d6f98c8447e85694382be5df9d57fe21b4718cc811d9589582f66
 DIST oslo.versionedobjects-2.3.0.tar.gz 149912 BLAKE2B 0a4636e35832a5d6574d35956d6d2c894db1972bf5d8859174b0e05bb1d613776d3a1546f2f523acd882f89d7dcd3675c29f3b415b02e419b381cbf4867afa3c SHA512 57078411f765b5b6d044f4f87286a2ab07a4dc1d3f3e247a8887d10b1c68a2fc40e4635f490ecab4041af1244d36cdcedafc0528ae842e1c5fa5434c08b2f4ad
-EBUILD oslo-versionedobjects-2.0.2.ebuild 1302 BLAKE2B dc1763bcb1c10a66d363f3868fabe0b68d2ab28cb73a37800bceb1063b509c97186dc9887ad50a9642a007acd581667ec7a55e33ee448224c3b8e1d3b8f39b9a SHA512 28f2a9f2ba4f930846249cb6a52c106c2c5000ff4777deeffd6ee79d923249b7a92b3a439c08ed77a4aaefca8f6a17b702e67d3ee4713cb9f04b3e533bf9a727
-EBUILD oslo-versionedobjects-2.3.0.ebuild 1325 BLAKE2B 7fdf109037ba0ae4901c49c49d050d31e9dca72caa4e7e71f1113679c4fd553cec6ecda4e11a70f6740841868a52180874b897a9886d3e28997939c0a41254ab SHA512 130326a63363b74c5d740b7a8f760224b107015849819aea1502a6aac13eced2eb696b8cd40ead2772bf1842000077c0bf9508db243833bd162028302be9d236
+EBUILD oslo-versionedobjects-2.3.0.ebuild 1324 BLAKE2B 46b17ea2a9b176d3b7da2cb775486932797bcd886477f6729adc1cf488cde9411457eabd94390c9757c546047993ee21dc47a1d4141c4001b8468017c5c72805 SHA512 0b919bcd6574d467ff858f11c11d4ac1a07ecbd2f84f5b74428f4fbbdee4ba0f2457cb5ed1632aac44d671e71ebe3b7df727dd87960f87da466ba35f9d1c2d8b
 MISC metadata.xml 362 BLAKE2B 892515fad3ac8c18b630f358ec44dd94ef3967315289e793904e89547b5ef93278324964fdae7fdf75511f2e2436f922c8792530002ea3a14e3c7c6621d1bc43 SHA512 66c7e8731fdca9cfdea72226a747f94b6622c63a88ef610417125b2fed3bce40964fd3516e3072c6976a0ade84c3e8ef1901258a018c78948ebf04612b9959ca
diff --git a/dev-python/oslo-versionedobjects/oslo-versionedobjects-2.0.2.ebuild b/dev-python/oslo-versionedobjects/oslo-versionedobjects-2.0.2.ebuild
deleted file mode 100644
index 2118dc15f719..000000000000
--- a/dev-python/oslo-versionedobjects/oslo-versionedobjects-2.0.2.ebuild
+++ /dev/null
@@ -1,37 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="A library that provides a generic versioned and RPC-friendly  object model."
-HOMEPAGE="http://docs.openstack.org/developer/oslo.versionedobjects"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.versionedobjects/oslo.versionedobjects-${PV}.tar.gz"
-S="${WORKDIR}/oslo.versionedobjects-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-versionedobjects/oslo-versionedobjects-2.3.0.ebuild b/dev-python/oslo-versionedobjects/oslo-versionedobjects-2.3.0.ebuild
index 8b9b123b0efa..25b372c7ee1c 100644
--- a/dev-python/oslo-versionedobjects/oslo-versionedobjects-2.3.0.ebuild
+++ b/dev-python/oslo-versionedobjects/oslo-versionedobjects-2.3.0.ebuild
@@ -7,13 +7,13 @@ PYTHON_COMPAT=( python3_{7,8} )
 inherit distutils-r1
 
 DESCRIPTION="A library that provides a generic versioned and RPC-friendly  object model."
-HOMEPAGE="http://docs.openstack.org/developer/oslo.versionedobjects"
+HOMEPAGE="https://docs.openstack.org/developer/oslo.versionedobjects"
 SRC_URI="mirror://pypi/${PN:0:1}/oslo.versionedobjects/oslo.versionedobjects-${PV}.tar.gz"
 S="${WORKDIR}/oslo.versionedobjects-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND="
 	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/osrf_pycommon/Manifest b/dev-python/osrf_pycommon/Manifest
index 905bfc26ea55..ad272c3b0a9f 100644
--- a/dev-python/osrf_pycommon/Manifest
+++ b/dev-python/osrf_pycommon/Manifest
@@ -1,4 +1,4 @@
 AUX str.patch 1041 BLAKE2B 35abd358988af1cf45975094758d56648d56cdc302dc507a3e5077e90142d31076d89592a06d1d9eae1dcfdfbc434efbb176990af955c06ce414603cdf7efa62 SHA512 94a8f4d42c3929ca7aa077142c4e5ec91ef2848b6f402b0a9a7beedd96865178ccf431aa8a68cf332927e783e56fdcdf4b8321679c0bdcea4e76564dc7f72d7b
 DIST osrf_pycommon-0.1.10.tar.gz 46303 BLAKE2B 3f18b8683a6363e1f15addfe75b8dee31f64fff7c286379d18355dc1f3467063c2cf1a9eb7978c5f9de5d64cb23d18a3922a416fe24fafa618f50f0ba89cddfe SHA512 5d53ea0c3c410a99964330dc22dcbcb3cd8892a359fee2061acc15ddb46e334ff757e8aa5b776fef381246c58e9834003ac818624da4b8e95552f214f3d9e6bb
 EBUILD osrf_pycommon-0.1.10-r1.ebuild 707 BLAKE2B 97b2fd2436b770dbc707b49e7fd1912d0144a9924c69ae5e97d8cf240bba8bcae3efc6692746200185edaa069a435c3af35bba898ccee46f955c68f387dbd57d SHA512 567c9814646ea221b6792ee4887bb6f3339dafed17984542c7c16bbf2e2575ffefe4cc7a285857a55721a133e252e8a11b3083c829c7c9279fa61fbd78fb70a8
-MISC metadata.xml 332 BLAKE2B 646ed0c829539be3417268e0b8fcffda5a51492f9083d5d20ba037e794b27f54347c8bf5119fc75ddb38760942b8af2ea7d22c379408d02d9e407a9696bf866e SHA512 ae0c307ed8e480f49cb5ba866ad6990fae1feee6bfd6adffa9e1b00d7ff56d8a7acde8e19559a6ea4043f262f8e3cbfa8baa9ad96f053f240694aec3badf56f2
+MISC metadata.xml 383 BLAKE2B b1a438df1b9875183113757feb0d88423209f774e28d840056ba11c11ff1dd8590f0e86308e4181d8c433be35124857189c1351d1191f1b4ae042aad95565d69 SHA512 aad17247919afc3b5878b929814921bf3954288d33b8e729d67af134449f52ee6050ba1e9054454e8a29bd92a1fb08a0263096e8ac4e448e70edfffb5e1285de
diff --git a/dev-python/osrf_pycommon/metadata.xml b/dev-python/osrf_pycommon/metadata.xml
index b48cc9c2c50e..e726c5a74008 100644
--- a/dev-python/osrf_pycommon/metadata.xml
+++ b/dev-python/osrf_pycommon/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">osrf/osrf_pycommon</remote-id>
+		<remote-id type="pypi">osrf-pycommon</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/ovsdbapp/Manifest b/dev-python/ovsdbapp/Manifest
index a3840af45205..c57fe88c5098 100644
--- a/dev-python/ovsdbapp/Manifest
+++ b/dev-python/ovsdbapp/Manifest
@@ -2,4 +2,4 @@ DIST ovsdbapp-0.17.2.tar.gz 82830 BLAKE2B a9c7661685aeb215f79b9c14fb7069019ae364
 DIST ovsdbapp-1.5.0.tar.gz 88970 BLAKE2B 8ec73d73b159e7e45aa057d24a58388057e50ea006d8cb15be739a39471d0d6fed1542e0bcceed8e9daae67eb3c0b543a8131955a246832ef4e0480950f4f4d6 SHA512 d98ca56dc63aee22315b4181b9d3084e82d611489da7764cc44c14f805dcd874bd7aa72f6e1cb4f44234a118accb77d7412479b5f2224312c7105f56fdbac991
 EBUILD ovsdbapp-0.17.2.ebuild 726 BLAKE2B 5c7b9ac30b8431c1d26fa02a68f240bd5eb1db020f00e2e1c4e5c836847ff7a939d0726f9772bd19dbf161dc33d43a37d12dec73beaa85ff29aefe550f4383b4 SHA512 7f474eeba18f7972b3b8e595732f909d3eb6fd4f61d807f574c61b111af72ca34a6370f43ede70f71ce9a1c7bf386979ddb290d027b961deb623edfd9aad9445
 EBUILD ovsdbapp-1.5.0.ebuild 722 BLAKE2B 61e5c8f7e0452bc70940f9cfbe784d58e2cd532d25707a452dedd2267699ebbb26ae03a21a03479d19d76fe0d23b200ac3b627cdc7704986d91a7bdc6a717dd7 SHA512 df5accd72b925474caca52de46ceb85f59491fe8bff3f2bfdfbe3af5b9b77e0f25235145bbea552f9d042717cbc45e3eb1216ee197a63fa877d35ee98a7c2048
-MISC metadata.xml 357 BLAKE2B 05722f76dcf8c454fb3eb76c2b98cccfb7f2a3d67a72a7e5d79a5444dc89e042261a711d89ddfed8c3cd705bc266b1a17a5372bf59207090c8f856998c2a267f SHA512 1fb9193b49c08c22fed7e498d31551d5f8afcb0551bf63bb9ed605a6b39e5e059276739170b39765ae56ee4faa42fbda892fd54363955a35f3dd874968cceae3
+MISC metadata.xml 428 BLAKE2B 6255c05b58f8e9ddd692f5ab4d32385daf15462cc7535d9e9732ebb869c12de971bcc4c9c7bfe1af0610cab4ab37f6b15b65e4367a73a407cd76ad5bd2b444a9 SHA512 7ac3c0c1253ac95cc22bee56acd7dd4c7720ac8356cc0320c729663d5cd8f59be433fd2d309e291992fcff8543580a50d616afdbfc4b1eda7cd709e306d7aa2e
diff --git a/dev-python/ovsdbapp/metadata.xml b/dev-python/ovsdbapp/metadata.xml
index 631e40d11e7e..fcfaa55e7514 100644
--- a/dev-python/ovsdbapp/metadata.xml
+++ b/dev-python/ovsdbapp/metadata.xml
@@ -9,4 +9,7 @@
 		<name>Matthew Thode</name>
 	</maintainer>
 	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">ovsdbapp</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/owslib/Manifest b/dev-python/owslib/Manifest
index 9838fc149845..739e6e1d0cdd 100644
--- a/dev-python/owslib/Manifest
+++ b/dev-python/owslib/Manifest
@@ -1,4 +1,4 @@
 AUX owslib-0.20.0-no-privacybreach.patch 1213 BLAKE2B 482a7cbbf12f335aa9367a1d7e311f625069c197b48fda85f063e0f227c2c2300b481b8b71f6572f71a8eb1ac55ff9738c14857d7d99c35423e358394045c628 SHA512 da4955ad7c1175929f3d303dbd7e3f713e26742b270c060b182b158ad4bfafd6e14aaae09f209a12682430655103e6c943ff24a1cb13b6e2bc5aa14a3cc7dfac
 DIST owslib-0.20.0.tar.gz 912319 BLAKE2B 9f6e44f76554d67756839bfad1cdce6e2e7a4db6c3517ed308256745a3ea1df77488718f307bcd59dfcae7bab7801ba1974131f358db1bd070846640ccf08ada SHA512 c30e14d0a310617d2dbcca436f38d4a942b8c5efb96506554e650b20b34580fd0119ae6bf17892bb09ceff7141b9cbfd32deb582d14d81b6518dbbc223116d07
-EBUILD owslib-0.20.0.ebuild 1013 BLAKE2B 476f226768e360f66397b0d768395709f1e9f336bac49390641478829897f2fa9427d385b42f20a55123dad00531d91c221f38601d0de715e78511e11985fa02 SHA512 4204654aa5d97de0eeba8e7cf605a69afb68d3afe2891b345a442c6bcc9ecd22a63f7c137ad7442f5e2499c5b88427c4dc74d6531ab495c00bbfd0792ae70416
-MISC metadata.xml 451 BLAKE2B 82a1e52487ebd5bc2a728a26c46f8e26a15d5736da20a50fd8be71fcddc088dacfbe178ca2cdb9841418723175c0631455393e5735b78767e58287c1542991dc SHA512 7c41ce77f3d6126a0fc61c39c953f044f94c39738b4fff7c7c38a9da9c972f16957c44d60df9de59d1c03e3c5384582efa3986e7ac31e546e28fb8ad5b1673f2
+EBUILD owslib-0.20.0.ebuild 1014 BLAKE2B 3231eadc30c7c7e1be365b1e3b6363053fb6a7487c6936f846dd6f363227c12521d28797bd226260682feb43b735559e03cf348e0fadee54233a0d8872136e96 SHA512 8ed3c9897ceb5d8cbaf43a90cd6c3a732a4a4187facbba6c90b5908d6c9d1fdd78ffd9334587c5f8ea86d0feee0d04054b79ea4b68a99f09e5827c3eb758d2e9
+MISC metadata.xml 495 BLAKE2B 44c7949db04a0807d9ac656408f6be9f248912657c5c59a88b5af21461f3c3cb94cdf8e578e68713e08efa40c82d07b8f4cb9e0f49fa7a4dac93e4036a7c34bf SHA512 084f0218507ea0d975446da66ef260ebc1cf50568bccad5f509da3192530aad99f62b42da5722248f7a689df95774aeef03262cfbdad84e996972df9512dce79
diff --git a/dev-python/owslib/metadata.xml b/dev-python/owslib/metadata.xml
index 01e0addb55f2..8d25693e1f30 100644
--- a/dev-python/owslib/metadata.xml
+++ b/dev-python/owslib/metadata.xml
@@ -11,5 +11,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">geopython/OWSLib</remote-id>
+		<remote-id type="pypi">OWSLib</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/owslib/owslib-0.20.0.ebuild b/dev-python/owslib/owslib-0.20.0.ebuild
index b34690b142dc..7349839b7ad3 100644
--- a/dev-python/owslib/owslib-0.20.0.ebuild
+++ b/dev-python/owslib/owslib-0.20.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{7,8,9} )
 inherit distutils-r1
 
 DESCRIPTION="Library for client programming with Open Geospatial Consortium web service"
-HOMEPAGE="https://geopython.github.io/OWSLib"
+HOMEPAGE="https://geopython.github.io/OWSLib/"
 SRC_URI="https://github.com/geopython/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 S="${WORKDIR}/OWSLib-${PV}"
diff --git a/dev-python/packaging/Manifest b/dev-python/packaging/Manifest
index cab7662fdfe3..698c0a3c98ce 100644
--- a/dev-python/packaging/Manifest
+++ b/dev-python/packaging/Manifest
@@ -2,7 +2,9 @@ AUX packaging-16.8-distutils.patch 447 BLAKE2B ee667f6aed01fc273092b896acafc676e
 DIST packaging-20.4.tar.gz 74402 BLAKE2B 3c667c1605445aec37d264ec3846a1a6678f13a12aecc09a6d16e09ea27041fcd65d23538acef4f6272ab0458ce479c42906b15cb6eddd9c8001b1970c23e4fc SHA512 d53912041a9950efb5d221fc968adc328c2ef1e54ec9806d2158fd6db1b170e37afb05213f5750b10c59927504083ca3781c958caa0c802b1c7c0fe1ac1682a4
 DIST packaging-20.5.gh.tar.gz 75111 BLAKE2B b088b85fc042b48337878c0f663934f32f90eb792ba53257b1b0879a097ef042b67a9cff56b23f5e0187a3df0f89092e0210939382851f0ae917f6ef00ad73ff SHA512 ef3c4853c30d9635b9372d6861cc0df8f7fc5a1d784e5f3effe3f315da0f24662ac939e70f55c6e9bb8864da95b9f75bc0df093f12c0f5c2af654b5354a5f081
 DIST packaging-20.7.gh.tar.gz 75182 BLAKE2B f3ba27ec33db576273609f28aabb5edab4acd07d8174c96e3a1608eacdc1a571d2ce96cc4e38c50c964ae5a716bbca077effd6dea039b25ac7bd6ce5707ae08b SHA512 4da8f66af066ac92b47664d21af34a02526cd1639cb766927670bec0ac8c7416116834c847678a29862a46faeda7e2f2393744be315cdfbbb8bd55a04ceb942c
+DIST packaging-20.8.gh.tar.gz 76310 BLAKE2B f6a220bf8ed61e4ced5cdb93eac8a83310d5c1abc11861e3eca64ef08e3fa2617a9dedd9006fd833df37da5bd7a33c216fb78b9151b1c72121fbb0a27e7b88d3 SHA512 77c77da9298635274de58b856b8738ab279749f736264212e6ecdeab47db607ea9c6ae696952f0702e9557d1fd2b89c7277a2c81ff55081593f49ebcd6eb74d4
 EBUILD packaging-20.4-r1.ebuild 1403 BLAKE2B 32cdfc7e75e27420dc234bbd1695b21e8b7183941ab590d6eae30d16510d93f323580c19c0ff00da78c6c352e8fd82d610dc6b5bd2f913c7d277c71126b0fc0d SHA512 9aa1b1e682839c0d23f514fd66d9436257b77c2cdcca975106e544ff057d71f84d8c52c8d108d2b996b7341669a07cbf98c64eb37754a6eeae473312d93b5a39
 EBUILD packaging-20.5.ebuild 1012 BLAKE2B 8aaa25b51d42e8ead7aca7ccc20f2fe2f42a00a152bb9cae41a1a724b41af864252e4de09e5a395294dfe6e950a789e06379cf816e2c607687747b1c451103dc SHA512 6f104ac4154b63e8715f44a43be0337e55d565eead686283b795cb5ed66e31ae32607d1039de3116a327ead44575beb22d039f93942ef0adbbda961d6c6ada2a
 EBUILD packaging-20.7.ebuild 1012 BLAKE2B 8aaa25b51d42e8ead7aca7ccc20f2fe2f42a00a152bb9cae41a1a724b41af864252e4de09e5a395294dfe6e950a789e06379cf816e2c607687747b1c451103dc SHA512 6f104ac4154b63e8715f44a43be0337e55d565eead686283b795cb5ed66e31ae32607d1039de3116a327ead44575beb22d039f93942ef0adbbda961d6c6ada2a
+EBUILD packaging-20.8.ebuild 972 BLAKE2B 56f8bf51653d85d94a700dfb4906502828a72479b0f191af36f02eb6b5d3f2c59a5159ac7a9d38b289f56babcb9cbc50df056b9a4ba16e5cb0682821c0920131 SHA512 6485864d69bb92a39ac30706b3ce906cee016b41647f9bf83cfb973214c3b1108a043f6e6304b51d92940e2615663119466963a4952bcbd788479769c9527934
 MISC metadata.xml 390 BLAKE2B 98afec1f8a7889d12e1a44ef1ff2bf1db635818b7fcb8d86dff0d820fc8fc92920615cd5de63f35cbb6eae6c29f8d6942807f0a7bd48b320c9a0d55a7fa0de69 SHA512 d082f5d387c5d71f0f6cfca4572d4637081daa863186d8b05050738269559617b910c95de97ac3eddd41434cc528e34597125a6973b7b239734c91bb2c588235
diff --git a/dev-python/packaging/packaging-20.8.ebuild b/dev-python/packaging/packaging-20.8.ebuild
new file mode 100644
index 000000000000..5ee05520d810
--- /dev/null
+++ b/dev-python/packaging/packaging-20.8.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3  )
+
+inherit distutils-r1
+
+DESCRIPTION="Core utilities for Python packages"
+HOMEPAGE="
+	https://github.com/pypa/packaging/
+	https://pypi.org/project/packaging/"
+SRC_URI="
+	https://github.com/pypa/packaging/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+SLOT="0"
+LICENSE="|| ( Apache-2.0 BSD-2 )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/pyparsing-2.1.10[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	pytest --capture=no --strict -vv || die
+}
diff --git a/dev-python/paho-mqtt/Manifest b/dev-python/paho-mqtt/Manifest
index 0a3b94ca9c08..259e83442d59 100644
--- a/dev-python/paho-mqtt/Manifest
+++ b/dev-python/paho-mqtt/Manifest
@@ -1,4 +1,4 @@
 AUX paho-mqtt-1.5.0-strip-test-dependency.patch 801 BLAKE2B ae44e567fea5cb08d116790191a69899c95714db4e76735fc4658174e37595b8a354e8c5fc470c035833fe3b7d27a6e47e7db77db0bab1884306144ca69379ff SHA512 aebc29ede887b5818718a56e933e9ac2342478b528f82b9d72b1132138ddbd2c97b3be2f1e5dadadec38cabf793818c6f55ea16b44336f4a40c8295b9cea0602
 DIST paho-mqtt-1.5.0.tar.gz 126869 BLAKE2B 2dce27c1fcfe7ae422dc6da76fb58e7901de00c0c349b9715c56a3603da26e1f46af9bb8c0bd982043ba54a2070655b483d251a0a847e1c3afb36bcd4cfcdba8 SHA512 7e52180bf1783ee1f39aa5248730e82fae47fe3db7c4579b0b7207a29f5337c7c0af58d58aac1c265b1ed91fa9c240187d5e3005f55c6e28623e6cbc36750294
 EBUILD paho-mqtt-1.5.0.ebuild 740 BLAKE2B f07a45db3985811ee14680056c398ebb6a46798831eede1cd6e295c78e62d506f4907c111b5063b659b741557928ea95af87685fb215cd03c9005aabd0e26aea SHA512 bdf6026fad5ab85c81b74af6be1523ee740d09fff3718ce55820e08743dfe04e1b40df20a3d79e0901ee26a9e7aa9f41208c4b2924f4e424c02143abb972b9a8
-MISC metadata.xml 335 BLAKE2B 840e64ff57099b20e9d7d8d30ac5a6ffc88689d2294c3d111819d820bf3e9652cf953eaed1ef962e39b088d65ebbbdec0a768fbb83db309bfa683fa4f357bdbd SHA512 49bd82f895d2396e6de201769c4dfdf9dff96a7853d5afcfe2bc559fa472bcb36c3ec5cc8f26d81ae7bacd1b6e997a694ed21265709f4ba46e7190d0bf638944
+MISC metadata.xml 382 BLAKE2B 4b8014f52a3e0dc85819059010281ac9a570f2518c213697f736153333330ed616069f1b34810b9e74b600cccb2762089b9f81b8b04882dd6fdacd52f2817921 SHA512 8aa74f0eb6cb5a6d0cf897bc87514263cfb417634d76aae4299facab44eab8f199d31288e6bfe5f8c6a473f4c647dac9545b1215d6a66af17fb8a4b06dcb9a9f
diff --git a/dev-python/paho-mqtt/metadata.xml b/dev-python/paho-mqtt/metadata.xml
index d09bbcbb0d9c..21bd771b3389 100644
--- a/dev-python/paho-mqtt/metadata.xml
+++ b/dev-python/paho-mqtt/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">eclipse/paho.mqtt.python</remote-id>
+		<remote-id type="pypi">paho-mqtt</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pallets-sphinx-themes/Manifest b/dev-python/pallets-sphinx-themes/Manifest
index 9a7fb26e768c..e41266d05d42 100644
--- a/dev-python/pallets-sphinx-themes/Manifest
+++ b/dev-python/pallets-sphinx-themes/Manifest
@@ -1,3 +1,3 @@
 DIST pallets-sphinx-themes-1.1.2.tar.gz 17054 BLAKE2B 2c106be4a8ba68c6c270035ad6764bf87c65a20ca3515991f6287e3bd6a280d3ad0df121c6bad995fe8964425bee4c6ec4d229eef15489c3ae4e4e98eebe4d22 SHA512 0537f1e24b22612720909f1e19f2893b35622411d72298a407cb19318eaf33a0f7c97ee6f69874a172c135b65c9c16726115c1decd6d7a3d6cbda3e1dbdb50fb
 EBUILD pallets-sphinx-themes-1.1.2.ebuild 604 BLAKE2B d3ce3f78755b5bcfd6c7dab09cdcdc519715325e2d4af69b3b3533dc664c73ba5bf5be5ed406ed302c4d6734de7ddb0035fb35c7ba0c2b6643bd12772e426ac8 SHA512 55fdf70ae94eab3f43b93ae62bb04a90f6d66b2a7db1539c9e64fe1c095bd3854bcc213d919a1f9a72296420a97faeacc43b69582404faaf5eca2c6d8d14e4f6
-MISC metadata.xml 324 BLAKE2B 270575fc533cde85d524756cbbe22ce43375a25f5d2b83ec37423b8af4a54fea9c679ebb66433a3c3ee090150201551c8804ff86fefe12636a6e0a83da25f417 SHA512 dd0d1c39fbfdcae041c6cccee7855d5fb6eac3037be3ac79cae0d36122f3ff75ed86c7ad63aee8a5fcebd936cfd2a03bfde52cc009655aebb1f25db77a18e698
+MISC metadata.xml 393 BLAKE2B d8c69e0e27a8f43412965ccfc92643aaa7d0fb258a40562d4beb00704b05f6fe17471a4da12040e585dc8264e115e8bf3c88001eb24d6a405a183009c4651506 SHA512 338abb6db5323bc85ac5eaf97ce9e1c7d51449c0e78625f344b3b5d63373a88bbdc6ae7f3291cc5e0f0a5caa36034eb1ef1ef96f1c0ac192b061e94257f1442a
diff --git a/dev-python/pallets-sphinx-themes/metadata.xml b/dev-python/pallets-sphinx-themes/metadata.xml
index 8c8ac13155bf..5181bb3dd815 100644
--- a/dev-python/pallets-sphinx-themes/metadata.xml
+++ b/dev-python/pallets-sphinx-themes/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">Pallets-Sphinx-Themes</remote-id>
+		<remote-id type="github">pallets/pallets-sphinx-themes</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pandas/Manifest b/dev-python/pandas/Manifest
index af7d95a3b7e6..08d526a33946 100644
--- a/dev-python/pandas/Manifest
+++ b/dev-python/pandas/Manifest
@@ -1,5 +1,7 @@
 DIST pandas-1.1.2.tar.gz 5220166 BLAKE2B 3351bf0e539335b7f13dd6e6590309989c3bd5d36c0fd188808be14a147b828f1a3a14007fc499e2b5f580072b02de8587885629a8ffb1fc70b2577fbd034001 SHA512 a81e9f82b866cc48eaf55c288610b150fe3fa6ba6100c0b13516eb0ce4b569397127b85161e53454d0b2b24f276aa9806baa007a521623aad2345e7b7168cbb5
 DIST pandas-1.1.4.tar.gz 5226971 BLAKE2B 9386eefdd1be566dee7e950d6c791a1127f5736b61a2f062f0cfbf1a83879c68b39fade863ed77acc38f619b681060b0e73ff290fbcba6d8d2d2d3332f4e32e4 SHA512 abc6e23ccc066bd9aaea5688df4803ef2fe2f038df9f45bd59696e94b589174d9bc79bfe6b36315307ab39b31a4e8cf32217f9135ac977320bf29968e12cb271
+DIST pandas-1.1.5.tar.gz 5229894 BLAKE2B 5b47774e33c7fccd7a9110e8971e8ce63cafd68273ee870b386aa8562be4c8f667137a4a078eafb2a62847bdd6f73c390254e8024d483c21e1834a8c49d44d32 SHA512 a213690ea658554b78e003a30cc88a59e34195457401d84b1cafdf74433ad27c801c12b8138371bb0206f6dc083ae882eabf0e33cb5733fa313e9f3257d48823
 EBUILD pandas-1.1.2-r1.ebuild 5855 BLAKE2B 3c9648efbdaa93e97d46b3b322230a23e690072279a8bac47ad0d2c2a001ce8818816b434b73e8165a12da303ed26ea139b15c905f8b877e10e2ebfd69453b44 SHA512 812b77f89aceb831036b041ecd45a7c24154297b496d020153d06dc98e81c40094dfbcf5dab89b38ae08a0ae96b342d50b2609bcfcfde17599c92a7ab69da421
 EBUILD pandas-1.1.4-r1.ebuild 5821 BLAKE2B e7e7dd14d6d5ad5c15b2d6f7323707dd213133ceee80f10eb72ec0c8bb1aad521f384781a463b6bdaac66375dae7acfa093760b95fbfa6b9233259ac4d6d9bd2 SHA512 54cdce3e68ca8bfaa786f55e63208d9a118c0d189ab75f3f65340aa501df67251f44003ee9bde87f122acdf460062945d22f1832131f8936128af1e4912f9385
+EBUILD pandas-1.1.5.ebuild 5821 BLAKE2B e7e7dd14d6d5ad5c15b2d6f7323707dd213133ceee80f10eb72ec0c8bb1aad521f384781a463b6bdaac66375dae7acfa093760b95fbfa6b9233259ac4d6d9bd2 SHA512 54cdce3e68ca8bfaa786f55e63208d9a118c0d189ab75f3f65340aa501df67251f44003ee9bde87f122acdf460062945d22f1832131f8936128af1e4912f9385
 MISC metadata.xml 917 BLAKE2B 52ce164457db6dcf39fe8cd3482021ca88bb1d8d35f09adbc189e23f31b098229d2d5381ce2df7e68f996f50dd5b41b8ccb851fe877d5a7c468c8e42d1cc457b SHA512 fdfd49c8327288be612fa5f5a7a230a278d0634b090ac8da1dcc63c732db84dbcd7cb37dee74a9996127c4062bc73a5be1a9f911715166ed6af16758a578e333
diff --git a/dev-python/pandas/pandas-1.1.5.ebuild b/dev-python/pandas/pandas-1.1.5.ebuild
new file mode 100644
index 000000000000..ec902a8752af
--- /dev/null
+++ b/dev-python/pandas/pandas-1.1.5.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="threads(+)"
+
+VIRTUALX_REQUIRED="manual"
+
+inherit distutils-r1 flag-o-matic multiprocessing optfeature virtualx
+
+DESCRIPTION="Powerful data structures for data analysis and statistics"
+HOMEPAGE="https://pandas.pydata.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/_/}.tar.gz"
+S="${WORKDIR}/${P/_/}"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="doc full-support minimal test X"
+RESTRICT="!test? ( test )"
+
+RECOMMENDED_DEPEND="
+	>=dev-python/bottleneck-1.2.1[${PYTHON_USEDEP}]
+	>=dev-python/numexpr-2.1[${PYTHON_USEDEP}]
+"
+
+# TODO: add pandas-gbq to the tree
+OPTIONAL_DEPEND="
+	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/blosc[${PYTHON_USEDEP}]
+	|| (
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	|| (
+		dev-python/openpyxl[${PYTHON_USEDEP}]
+		dev-python/xlsxwriter[${PYTHON_USEDEP}]
+	)
+	>=dev-python/pytables-3.2.1[${PYTHON_USEDEP}]
+	dev-python/statsmodels[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/xarray-0.10.8[${PYTHON_USEDEP}]
+	' python3_{6,7})
+	>=dev-python/sqlalchemy-0.8.1[${PYTHON_USEDEP}]
+	>=dev-python/xlrd-1.0.0[${PYTHON_USEDEP}]
+	dev-python/xlwt[${PYTHON_USEDEP}]
+	>=dev-python/scipy-1.1[${PYTHON_USEDEP}]
+	X? (
+		|| (
+			dev-python/PyQt5[${PYTHON_USEDEP}]
+			x11-misc/xclip
+			x11-misc/xsel
+		)
+	)
+"
+COMMON_DEPEND="
+	>dev-python/numpy-1.15.4[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-python/cython-0.29.21[${PYTHON_USEDEP}]
+	doc? (
+		${VIRTUALX_DEPEND}
+		app-text/pandoc
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/nbsphinx[${PYTHON_USEDEP}]
+		>=dev-python/numpydoc-0.9.1[${PYTHON_USEDEP}]
+		>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
+		>=dev-python/pytables-3.0.0[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/rpy[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/xlrd[${PYTHON_USEDEP}]
+		dev-python/xlwt[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+		x11-misc/xclip
+	)
+	test? (
+		${VIRTUALX_DEPEND}
+		${RECOMMENDED_DEPEND}
+		${OPTIONAL_DEPEND}
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/openpyxl[${PYTHON_USEDEP}]
+		dev-python/pymysql[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/psycopg:2[${PYTHON_USEDEP}]
+		dev-python/xlsxwriter[${PYTHON_USEDEP}]
+		x11-misc/xclip
+		x11-misc/xsel
+	)
+"
+# dev-python/statsmodels invokes a circular dep
+#  hence rm from doc? ( ), again
+RDEPEND="${COMMON_DEPEND}
+	!minimal? ( ${RECOMMENDED_DEPEND} )
+	full-support? ( ${OPTIONAL_DEPEND} )
+"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	sed -e "/^              'sphinx.ext.intersphinx',/d" \
+		-i doc/source/conf.py || die
+
+	# requires package installed
+	sed -e 's:test_register_entrypoint:_&:' \
+		-i pandas/tests/plotting/test_backend.py || die
+
+	sed -e '/extra_compile_args =/s:"-Werror"::' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# To build docs the need be located in $BUILD_DIR,
+	# else PYTHONPATH points to unusable modules.
+	if use doc; then
+		cd "${BUILD_DIR}"/lib || die
+		cp -ar "${S}"/doc . && cd doc || die
+		LANG=C PYTHONPATH=. virtx ${EPYTHON} make.py html
+	fi
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	local -x LC_ALL=C.UTF-8
+	pushd  "${BUILD_DIR}"/lib > /dev/null || die
+	"${EPYTHON}" -c "import pandas; pandas.show_versions()" || die
+	PYTHONPATH=. pytest pandas -v --skip-slow --skip-network \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
+		-m "not single" || die "Tests failed with ${EPYTHON}"
+	find . '(' -name .pytest_cache -o -name .hypothesis ')' \
+		-exec rm -r {} + || die
+	popd > /dev/null || die
+}
+
+python_install_all() {
+	if use doc; then
+		dodoc -r "${BUILD_DIR}"/lib/doc/build/html
+		einfo "An initial build of docs is absent of references to statsmodels"
+		einfo "due to circular dependency. To have them included, emerge"
+		einfo "statsmodels next and re-emerge pandas with USE doc"
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "accelerating certain types of NaN evaluations, using specialized cython routines to achieve large speedups." dev-python/bottleneck
+	optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1"
+	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup:4 dev-python/html5lib dev-python/lxml
+	optfeature "for msgpack compression using blosc" dev-python/blosc
+	optfeature "Template engine for conditional HTML formatting" dev-python/jinja
+	optfeature "Plotting support" dev-python/matplotlib
+	optfeature "Needed for Excel I/O" ">=dev-python/openpyxl-1.6.1" dev-python/xlsxwriter dev-python/xlrd dev-python/xlwt
+	optfeature "necessary for HDF5-based storage" ">=dev-python/pytables-3.2.1"
+	optfeature "R I/O support" dev-python/rpy
+	optfeature "Needed for parts of pandas.stats" dev-python/statsmodels
+	optfeature "SQL database support" ">=dev-python/sqlalchemy-0.8.1"
+	optfeature "miscellaneous statistical functions" dev-python/scipy
+	optfeature "necessary to use pandas.io.clipboard.read_clipboard support" dev-python/PyQt5 dev-python/pygtk x11-misc/xclip x11-misc/xsel
+}
diff --git a/dev-python/parameterized/Manifest b/dev-python/parameterized/Manifest
index 57f94c18ea4a..d8d79d3cb8a8 100644
--- a/dev-python/parameterized/Manifest
+++ b/dev-python/parameterized/Manifest
@@ -1,3 +1,3 @@
 DIST parameterized-0.7.4.tar.gz 23389 BLAKE2B cc1ac334c0209a7471799587e1d35f6d8db84df91f559514bf3067ec8b2110948a6148613efd1d0111a65d43c52f7be16ab56cb69dca339fe7049f64484b7889 SHA512 71c51ad57900f5b1b6f4866c60ba4d23649df7740e7f7e735a2e0faf4810bc8dc552a1647da8c174f8a0b80db7de5727ce24dabc9fee6b4cfe12ee98c18945d7
-EBUILD parameterized-0.7.4.ebuild 426 BLAKE2B 3aa972ab3197b3b627a53d9bdb71dea6f78da1eec57e17aecd578575bc3417f2c82cc3037814587851f8ad91734fcc5b1fd20459c83afd71c9938a86b13133a7 SHA512 d9a5f685635e68594f7e0bd6c2a366cd4ea25f25eb6173675e6e2d47dd26dcfda8643b044cd769218a970bac49d1a84ea393b226bddc65541569c1b24d1dfb13
-MISC metadata.xml 217 BLAKE2B b4bd64b91108b5009484a426472b93c0ee864691d060218864452d2e504b491022d3d7bcc4b57ad0b5e5f2e01b1fba019e8f63eb79b4db8dcaeb505593ffa2ba SHA512 9611c83ea0155f3d39afee524c6425ae6d7e07cebc4ee489a45e39ab80e97fc2bff56fd9a8d97536a5bc415da147eb587b20ccffa5baa61440df65bd26576e8a
+EBUILD parameterized-0.7.4.ebuild 531 BLAKE2B 02df92ec047ea11260c13132d4dc58cd7fe9c7c139c465b2342c4f9069a1e07205378b1debff1c3482e5c22821330e305fb503847e5fe63d3ff87150c7061de9 SHA512 3767afa1b1495d4a12d452903efe0e6936642244b3f8df5e969a6739bdd71b25093c53879016012aeb5508911df64c312c5b5eab83e875d211cf880ef0c0b6c9
+MISC metadata.xml 293 BLAKE2B c517b622aca43d34db85ca377dad646f979c601e5adcf20f51ef84f10b92bc3e07ed42eaa4eabad883bf720fb000aa744ca38b2d418370435d5207f3d2f33aa7 SHA512 efd47a3325bd1ea4c343cf4bfb0ee0dbcef1d38939449eb5b4257c6d97eedb9a60e3d2c2930dcbf503c569588ee38317aa82e0e27bcdfe6b39a805b640470548
diff --git a/dev-python/parameterized/metadata.xml b/dev-python/parameterized/metadata.xml
index f728eac91cc9..d0639ce03a36 100644
--- a/dev-python/parameterized/metadata.xml
+++ b/dev-python/parameterized/metadata.xml
@@ -1,7 +1,10 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>amynka@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">parameterized</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/parameterized/parameterized-0.7.4.ebuild b/dev-python/parameterized/parameterized-0.7.4.ebuild
index 58a7aa748ee2..0a60f2d7e871 100644
--- a/dev-python/parameterized/parameterized-0.7.4.ebuild
+++ b/dev-python/parameterized/parameterized-0.7.4.ebuild
@@ -13,6 +13,12 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
+
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
 
 distutils_enable_tests nose
diff --git a/dev-python/parametrized/Manifest b/dev-python/parametrized/Manifest
index 85afeac7ffc2..3049fb0ec4de 100644
--- a/dev-python/parametrized/Manifest
+++ b/dev-python/parametrized/Manifest
@@ -1,3 +1,3 @@
 DIST parametrized-0.1.tar.gz 2246 BLAKE2B 2d6296434aaed324c3b15492d212a9bae025ab0614d349cd1ddc621189a91e593ab84b7a7c4089d6245bf4b91dd48586cdb0d9eb562b99d8de697e66c19a2713 SHA512 ee9543b1c2f4e313ea3a74d91b97b6339770101b70317754006fde7568292d3f175d923896742339302d5e1e625b2c0f2beb05863c659ac3b81869a3f574f25b
 EBUILD parametrized-0.1.ebuild 480 BLAKE2B 4c2b0b43a9ad1fe767792ed52c9aad50768decfd975b43ec7ba64a6f072b9272e2e61bb5a82e4623a1e310cd632c84b294f87b48d6b230cf1d7ae06d388098a1 SHA512 33ade0a3cce73b671ba8a0ec8fe3f549a924f1e3e7c6ea15e7cb7c737dd85240ee32f31007cedb8cef3f4cd8aa3ad546b5e0f4791b2a14fe1e57ec64406bb25b
-MISC metadata.xml 217 BLAKE2B b4bd64b91108b5009484a426472b93c0ee864691d060218864452d2e504b491022d3d7bcc4b57ad0b5e5f2e01b1fba019e8f63eb79b4db8dcaeb505593ffa2ba SHA512 9611c83ea0155f3d39afee524c6425ae6d7e07cebc4ee489a45e39ab80e97fc2bff56fd9a8d97536a5bc415da147eb587b20ccffa5baa61440df65bd26576e8a
+MISC metadata.xml 292 BLAKE2B aadf38d6a2520fd68d40741553e59df1a6a247f0b02ea68466843d695b17e5ab8df26a1c914f6f144e64421d1860c2e36f1e56a3340014b02691a1c60981e037 SHA512 511e70e9b7bad3d16bb57acab9d28b65928d42debee194d3289942c593dd26cf6e84096b94646e7290c021612d2c1e46709717ea90704b8b4d5ba007d5e0d9a9
diff --git a/dev-python/parametrized/metadata.xml b/dev-python/parametrized/metadata.xml
index f728eac91cc9..4ee04ac6121b 100644
--- a/dev-python/parametrized/metadata.xml
+++ b/dev-python/parametrized/metadata.xml
@@ -1,7 +1,10 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>amynka@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">parametrized</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
index a6fe5653ef32..ffb33a9a1155 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -1,7 +1,5 @@
 AUX paramiko-2.4.2-disable-server.patch 1596 BLAKE2B 7e2ef1e216f34086c06d985556dde82eccfc08b835a9b336f1e54e81ddf32567872daec9dadc728bfaab8e3c4728439d704d51f9b1df5e04a64b5064f6d79bf5 SHA512 5e2f9285ffa3ece551ce929c6d50691761da6269e906355bbf79b0664a764083f7d55a9e347e2ed236a4c9a7f934d489315b68ebea984694ee9d1714416d34fd
 AUX paramiko-2.7.1-tests.patch 4618 BLAKE2B 9c1d055e24e360574fdcb63ef01a1669e380da42aa2ca72ba158159a1d618b447936a3c3f746625126a1bf8c945d8000bd09aabc5918d25b3840296b57bb5469 SHA512 6192dadd31c33ccf178cd813b726c5c2cc31a12ac7698377ede19d10b19b4e32b6e203ec2bbf26b486f58151f642c4d44095e9efeabad96e2751fa4631ee11c4
-DIST paramiko-2.7.1.tar.gz 330391 BLAKE2B 0f7a2f3b6c15a68002001d69f8402deea5421a8b1f6cf35061a8a36f4b81b7a291d7b0f0b457f32de4c4769659a2e067f0bdb6cc5dcdd0810ebf917e349e85af SHA512 2cebed2420cf9af77cb0d459b64a74adcffcdb15bd58c8fc9243855ae91f43e16706665b64ce2851f6e99e59ca6a47d7299a2aae35a4c9d01ab97b343569c4b2
 DIST paramiko-2.7.2.tar.gz 331678 BLAKE2B ff96dfd7b114255c15282f4f73e1f9425ccf77106426ccf3ad3f833b56bd5abfde867cf2d322448dc7b3777af6ab080b4e37ff8871ce17f0db17634b7f101747 SHA512 c9bc569428a0a61814cb73941356de5bae7fea7891ba4fd3f5c00ff1ee5083454bfde7e969fb4aaf5254b909f7f0132f590d67803eda8a67503e5c02ec2bf01a
-EBUILD paramiko-2.7.1.ebuild 1333 BLAKE2B 93de0faeea4ad477a36f05460bc6a477574580cfae2d91cb70a9b6b1d39a007a3304b15084db1498dd300f0bb647d3ccd2d04fd0080d79349e8819fce6d14849 SHA512 64d03a22accc103508a3fb98711c5c257d18274f25a212153fc73a8b3d92e6e3880238c930f114fae2eb30fa9fbce7f2af50e427f80c91998189e7629c91b797
-EBUILD paramiko-2.7.2.ebuild 1348 BLAKE2B 4e6c97e7f2a53b8fcf628e424f7de31dda1d65713eab61b9648256693a3793e192e224010b31ff8871b98eaffcc8aec6d53caa57b241676752243231127758dc SHA512 3bc8a986434287b61080ede14f28cfd20fc3849c145eb4e5b45a0837fbe4e5e548ba14f478339cae5c265e0b95c0358f2e28f7a7affb0504e190261499775961
+EBUILD paramiko-2.7.2.ebuild 1340 BLAKE2B 7d0ca17dc881127e3120aebc155cdbee86e3f9d4397915e34754c21ef9cbd560584b13cd9a5bdd030c740b600a22bf7f9ed7dadb3d3c77fb58489baa73480f5b SHA512 9bd6567d3d159684b424587ddb514b0468ef026dff2e59125c2cfbab8bd4e37f22aa44c6069b200f1a9eaa4f51f7d0388c36cd76f4ccbc605357bd6e585aa47f
 MISC metadata.xml 1331 BLAKE2B 4e53a314a1a86c488328a89170e03932bab1944bb133cd8551333da5a4cb80600e1bd5238b858bdc3565334cbc7251782979f4a770b43d064a9bb5096fdec7d7 SHA512 14cad597d85d0778ee8b2ce5c7cdda768e8f3cfb8de084189e7d0b422b77c73c2410448c8c013c1f03864e7b4365a87c1bba16fe49081f728c3bfef3d0ba455a
diff --git a/dev-python/paramiko/paramiko-2.7.1.ebuild b/dev-python/paramiko/paramiko-2.7.1.ebuild
deleted file mode 100644
index b5e4fbde4ab2..000000000000
--- a/dev-python/paramiko/paramiko-2.7.1.ebuild
+++ /dev/null
@@ -1,54 +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} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="SSH2 protocol library"
-HOMEPAGE="https://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.org/project/paramiko/"
-# pypi tarballs are missing test data
-#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
-IUSE="examples server"
-
-RDEPEND="
-	>=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.5[${PYTHON_USEDEP}]
-	>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx sites/docs
-distutils_enable_tests pytest
-
-src_prepare() {
-	eapply "${FILESDIR}"/${P}-tests.patch
-
-	if ! use server; then
-		eapply "${FILESDIR}/${PN}-2.4.2-disable-server.patch"
-	fi
-
-	eapply_user
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		docinto examples
-		dodoc -r demos/*
-	fi
-}
diff --git a/dev-python/paramiko/paramiko-2.7.2.ebuild b/dev-python/paramiko/paramiko-2.7.2.ebuild
index 237c4965f4d0..6d2df7d5a69a 100644
--- a/dev-python/paramiko/paramiko-2.7.2.ebuild
+++ b/dev-python/paramiko/paramiko-2.7.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
 IUSE="examples server"
 
 RDEPEND="
diff --git a/dev-python/parver/Manifest b/dev-python/parver/Manifest
index 0c4d3ea63558..9a83cdb1948e 100644
--- a/dev-python/parver/Manifest
+++ b/dev-python/parver/Manifest
@@ -1,3 +1,3 @@
 DIST parver-0.3.1.tar.gz 29110 BLAKE2B da444a77907beac0bebd2dba812c8843052e27de1b8b802b5bdd37feb4ffe1cfdcabb84a91b6e6fe21275bce22e3b43736617df756570c6438af7ffd81a1ba87 SHA512 2ea7eb7be0c58657f5261d7b4729da6caaf2fac67db3fc3f36d29627bdbeba45f6ecb0e4bb251575b621908eb1ff5fa5ede5fc2ef0e041156dcc00548fd34360
 EBUILD parver-0.3.1.ebuild 811 BLAKE2B bbd121aad3dfec47add88a1f122ee61c303e4f71ea01a7edf942e24032bc8d91632e14b48f0ed9d3fb7bfa3120f5e23ff15e23a300d9b72faec081a0cd86da6f SHA512 121165b477e012b150b7074820cc0b891f8dcc24b94d4b2be203086621d5e0fda478b6edb969270d3179eb45bc0e3df53b0cdfb9c30637d5bd5547ae4ee19250
-MISC metadata.xml 457 BLAKE2B 9271ea5826bf9422de908aa1e80ca21203096d9de419cd4f205cd5af127df053b72667b27c91abe49d32ee67f89d1083dc8565174fb916754d900dd3c872a8ac SHA512 35c1ccbe9ea8a9da9b58570ca4eb70cfa90dee97db8d799111642fbe06febdc48541f9b28c932a93e522cb1cb3a66dc74c1b1b36e0d01cfde359ddabcc396093
+MISC metadata.xml 501 BLAKE2B 7081c9e65d02999668c381878ac70aea35b69ac1fb53a07a712ba0094250efd4889530fd79ed831eecd206ce89ec9a378d388036b032ec60f41b0b2060817d7a SHA512 0ba1f2c5d71cdabfb8fa80dd17f77dc242ca5e0559c6feddb6629209b949bdaf077df1a8672866c0a797bf312e7a641507e3f62b8f9de186f9b02a82dc2280d5
diff --git a/dev-python/parver/metadata.xml b/dev-python/parver/metadata.xml
index 5e56e5f88b96..30d7ff25a6fc 100644
--- a/dev-python/parver/metadata.xml
+++ b/dev-python/parver/metadata.xml
@@ -10,5 +10,6 @@
 		<remote-id type="github">RazerM/parver</remote-id>
 		<doc>https://parver.readthedocs.io/en/latest/</doc>
 		<bugs-to>https://github.com/RazerM/parver/issues</bugs-to>
+		<remote-id type="pypi">parver</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/path-py/Manifest b/dev-python/path-py/Manifest
index d7c253b6d79f..a251ff3023f5 100644
--- a/dev-python/path-py/Manifest
+++ b/dev-python/path-py/Manifest
@@ -1,3 +1,3 @@
 DIST path-15.0.0.tar.gz 73642 BLAKE2B 186b77b6571dd878a5b64b575289bb5ee549145ccd0c7b858f99c9e3772cf98f2cc7ff5da759e7fa660296abc49c053a388ad95466c51adccce2162c682c6566 SHA512 e41684c576b959e27258f60c0d8b69719c38a5a7a04d9646089aea91227781573368a08f01230dca831732ae687741d22caf52efd9a481378b8d4e77627fe3a5
 EBUILD path-py-15.0.0.ebuild 1231 BLAKE2B f895d1549408f31ad7d3514b1186ce75e7a9402177c5ca8e0ffbbaa19d1f73772bdc5e43c4b289269b772666c3444ba7a0488a2fdfd3fe94611ba52463879457 SHA512 d5a71f266529e9f53bdc1c1f05efa736155ab4f5da51eafcfe40cbbd98965cc53e3f4b843bc1c2e3c03d6287187f2d4241e7a7142eae79f855006120ea52259d
-MISC metadata.xml 401 BLAKE2B 5a8d84aaf65dc91b75cd7222e333e75f9bd6654ce4f9d55c91a8d28b141c5fc982b8c8a6a0b3b4f1c04fcf05fa56b13725062233961f323383110ace44089da6 SHA512 415b7917fd35598bd39c03ec7ede5e0e13266927b73647a995abb62d56004039aacebaeade95be39a265ef3944c35f3c61145cdb2100e563d8125753547bb729
+MISC metadata.xml 382 BLAKE2B f4e983fc27f8e9a578a8469a0b432adf91f622d9993bcdf9a0f25f2786680eb26a67d53d1c97deebc8bbbf7d62ac5b37b2d5a44b39c81f3862e0ffe2cbe2e577 SHA512 61909559eb0ad81e607bdd7b9b147f3e9c71e53721ddd99b1cc2afbe8e33ca7de2b9849ff3ff7468183c5f82f108b958ae0ce3042998972dac8eab6338040151
diff --git a/dev-python/path-py/metadata.xml b/dev-python/path-py/metadata.xml
index ca5305593200..f7c4a269b621 100644
--- a/dev-python/path-py/metadata.xml
+++ b/dev-python/path-py/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="pypi">path.py</remote-id>
-    <remote-id type="github">jaraco/path.py</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">path</remote-id>
+		<remote-id type="github">jaraco/path</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pathspec/Manifest b/dev-python/pathspec/Manifest
index 2683cd3907b4..1e24fd4f4003 100644
--- a/dev-python/pathspec/Manifest
+++ b/dev-python/pathspec/Manifest
@@ -1,3 +1,5 @@
 DIST pathspec-0.8.0.tar.gz 26256 BLAKE2B 3d4f2238c515253d83bfd17a2f3319e38024d4fbb22fb0f078bbcca73d3aff45f246a35752c4039b0d88f204ae49b4467b2d9e3b9134e14a7a171895dac770be SHA512 e0cb1883d11506b3d11963397db98a0fd3411f56df7c3e2ab3ac44116ab53977112bb51d1918591afc48b9c08f9cf997d34beba373aafbfbca2aa8749ffaf6c8
+DIST pathspec-0.8.1.tar.gz 26644 BLAKE2B 3591aabbd62a0fa1908cef5478d74a6d3ba64333a540c124aa6e7d25fbc45d44faa83e0822fa776ccf787d72ec9c2a977daddefa07d5d6fea2c8c6345836350c SHA512 f793ecf9bfb6511420a37fefa5a9dbd79d8e7329c305d6f1ecb4ea90e322825471983b56722c680e418e0bab41204996075c83cfc8ba7c6a0e5e09b1d8fd1d2e
 EBUILD pathspec-0.8.0.ebuild 565 BLAKE2B e71bf61b534aea37f91bb49aaddc1b99a1a0f0d8ffed77a26c896f280dc9fba69fd686e8d134ea6e2a3bd72b6a38e752c98cf2da9f4b8708c6ef1e95b358bf82 SHA512 5b64370aa4303c203d7a8eb947e1640aa6dba24abeb750fc36bc588eff3552fcc33d79fad516ce18ffd4f0c749579fb8b9240edf30dd7eb8ee2210b7f34c8bda
+EBUILD pathspec-0.8.1.ebuild 565 BLAKE2B 420eb05f0e5900ea71bd92d38a1729e73430caa06865bba750eb261d37a85564c8332eeb63f2e9975f63dc187422acaf538f7bd865bce15fef99d9a36a06df79 SHA512 d60f076004a6012e892b8f11f20cb755d84a0e4b78e0a0ad2c76b0aedc3c9614344a0ea38058f51dc5b965b24cfaf2d431fd62948b44b6057d50a3f0f74fe421
 MISC metadata.xml 421 BLAKE2B 388eb128b62746868b4ceabca9cc533b64ce5d5cfcf5fd70b235b2e3f569148b8de15443dd9f7406ac7a050dcda0e73999f3451ea51f8a7b7ccf979115ddcd32 SHA512 fd54f8bd2c7ef1515c4f4dc936b7de16c8efaa5c81e0ce313c719172d61874455c342b6c4103b5528cc423624d04cd236aa795d5adecdaa106f7f42277e5ccf8
diff --git a/dev-python/pathspec/pathspec-0.8.1.ebuild b/dev-python/pathspec/pathspec-0.8.1.ebuild
new file mode 100644
index 000000000000..7c5bd2c156aa
--- /dev/null
+++ b/dev-python/pathspec/pathspec-0.8.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Utility library for gitignore style pattern matching of file paths."
+HOMEPAGE="https://github.com/cpburnz/python-path-specification https://pypi.org/project/pathspec/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+distutils_enable_tests setup.py
diff --git a/dev-python/pebble/Manifest b/dev-python/pebble/Manifest
index c230478ccdd3..b8eb29d76b09 100644
--- a/dev-python/pebble/Manifest
+++ b/dev-python/pebble/Manifest
@@ -1,3 +1,3 @@
 DIST Pebble-4.5.3.tar.gz 23411 BLAKE2B 4e270b0de183074e151f3c7cf8754bd3535efce601c0dfdd5bffbe04a4308aa7db6e6414668471d3af6f1fb374230590d90e2503ba223c2e95b17a2a0d301310 SHA512 e3b17fa6b9ca959560d364e84091e7990921eb9a2aef854c391a5d0e46359b57e5ec1a4239ac97f4c0bb485d0475ad8338c3485c9fdeff7e446a989129738096
 EBUILD pebble-4.5.3.ebuild 505 BLAKE2B ee34fee546c5a8f32be5c4cd4dd088e92a23bbd6e6f6d4553b096493859c785161d0b09429020775b8bd0d34ce6367f5f1e96a5da85a209ff6ae3c82f57ef16b SHA512 bbf09e6ed81876e7f050e4b84cacb3b8895e2bfc1d60a88dbe0f4c396075273b4ced9f7fb62dbe324ade0f138b64d385b6e0d4661767d25fd36ec1566aa6217f
-MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
+MISC metadata.xml 342 BLAKE2B 451d73b322064b55aec3ae0369daeaa2081d126ea090c0b9a808932cd32ef1b5f92846d15f5cf11d399c9f822bc11b484107543c0c33434c2ec63b97ee8e865a SHA512 68bc288f46ab7ebfb8676d7ae40452500e39d72f9ccecc69d9e6ccb26d1465d8845333a0430611332eff2d4749a4c6bc476d645105191989120d14e338846f28
diff --git a/dev-python/pebble/metadata.xml b/dev-python/pebble/metadata.xml
index 266e3f19ca59..a85b840f9d1d 100644
--- a/dev-python/pebble/metadata.xml
+++ b/dev-python/pebble/metadata.xml
@@ -4,4 +4,8 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">Pebble</remote-id>
+		<remote-id type="github">noxdafox/pebble</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/peewee/Manifest b/dev-python/peewee/Manifest
index a2b8b6f24c8f..985f357ab33c 100644
--- a/dev-python/peewee/Manifest
+++ b/dev-python/peewee/Manifest
@@ -1,3 +1,3 @@
 DIST peewee-3.13.2.tar.gz 871323 BLAKE2B 18fd9729ddd6ce3fe4a6963b697815d44e91b5078ba0b868e6b4f24f4cec9c5b01239d7f414f4f8c0871d3dc6bd5e0e37e218c9438cf1f7461bf729cb74049e4 SHA512 7304473f8e64df7cb2205900cfbdd52346d89e9639dc79ed6e13d5c4c11cc856e39e366772039097dc5ca86b4768fa4670dccd96a85cabfb522c463b31c40a8b
 EBUILD peewee-3.13.2.ebuild 757 BLAKE2B c9df37e300014ba2926e1e33b6e4e5b8d50b04bb31687ff4dfd21d84da7faa0d7cb843970ccbc817ea52750e97cd8a351ce7c56d6fe0c003312a8a9c53d39004 SHA512 8255962995c158f633702a8d661c80adb7a71e03f630cd39c6297ac863833f2b87649e2fee6a10146e799ced0040fdc9746640d1dc79e8a186c68782f83ef0c6
-MISC metadata.xml 330 BLAKE2B 744abc7ba6933e67a2e85359c870e51ed2e5b39cde3adf64a4e92860805eefc37e8035000b1728a921816e0713c8757f0fbcb40206b72505117b2bead9ed2642 SHA512 a75ad6963c2dd0a763e7f11b42a5f92d536a7b4daf59acea56a91b49c11996d316d3fc27b04fcba9c4e7556305543eb44d87ac909a65f937faaf8fd8c57110b2
+MISC metadata.xml 364 BLAKE2B a14159b1b72a7138b6df21d06f487b2bf4e0d71297eecdd345343996327713a34fbaff5d69d9dbd4664b3aec116b8bebe98f48f5f672922cd0f029563d28942f SHA512 b60eca92f270da62f8c55a42a6b69d26f1ef888afbe62bb58d489b890e748a6bebb1f6048bc30e4f5c85fd47be4f6d95c6b5fbe125ce1be293ce7e7514691356
diff --git a/dev-python/peewee/metadata.xml b/dev-python/peewee/metadata.xml
index 739a565c3106..a16d70d51adc 100644
--- a/dev-python/peewee/metadata.xml
+++ b/dev-python/peewee/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">coleifer/peewee</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">coleifer/peewee</remote-id>
+		<remote-id type="pypi">peewee</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pelican-minify/Manifest b/dev-python/pelican-minify/Manifest
index 5583151b2ad8..5620aa0496f4 100644
--- a/dev-python/pelican-minify/Manifest
+++ b/dev-python/pelican-minify/Manifest
@@ -1,3 +1,3 @@
 DIST pelican-minify-0.9.tar.gz 223517 BLAKE2B 808601e027af7b3970e3fcac08e9f0f656e48fe016a470b4a5b3892a108264e2fff52a9b036861fb9007da263e59c7fcf68867e789f65e20b29278fb8de445a0 SHA512 de28727ed6b39e89461b2d725139b88010def892f3fd23f822a6e84a585b3f93771fdc9ca8f402adc9bb196a0dde03b9d6417317c7e8141d83f0e6460860cd33
 EBUILD pelican-minify-0.9.ebuild 621 BLAKE2B 6076e8c7eeb122135d4d2bd6bc3b951cfb1629511da4f2b6efa7bf8d6140e35151f121b933932be40ff1d3c6f57f1f592458117cae6ac1973b8ad06398450296 SHA512 5c324a17289dd9d4f9fbff151c5a912d3b9848fb28982e2a3490af7857d8253046cc7276ecfdfe31f255b1e52cb10413cffd04b158d1d04b150eb993d23bd692
-MISC metadata.xml 333 BLAKE2B 1a681ac99aee289a919b530bb87037df6fe53b044ce14ce3a9da3cec54a73d7fde58cf01f12678f18397d16b56c9e5bf88d289ddec4469e343d7193502124124 SHA512 a73512d246562e6591eb9c8d13759352cede7f0ae978d02c87bd72b1fe2c9b155cc3908e8489b136387bada61f1257d8e0771e01e26d998b51f9ce13c087ec41
+MISC metadata.xml 410 BLAKE2B de101727b82f76cf71588da4a543aa7853e8acb156f3a6baebcba62b5c9ef029611a7e30470ea929bc8f0cbbef0c852b80208b4b0682ff0aeb8878dbbf4c6889 SHA512 5fa4aa1fa8edf161002bf379cd12f55a78034d6e42d25da288f361234825cb4df23d4d221cdebee750ad49929ff08861e009e7d4a879bf22f2b6407183603dfb
diff --git a/dev-python/pelican-minify/metadata.xml b/dev-python/pelican-minify/metadata.xml
index 3ee70120def4..a1db0cd41474 100644
--- a/dev-python/pelican-minify/metadata.xml
+++ b/dev-python/pelican-minify/metadata.xml
@@ -8,4 +8,7 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pelican-minify</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pep8/Manifest b/dev-python/pep8/Manifest
index d4e73f2c4141..4cbaf292b6a3 100644
--- a/dev-python/pep8/Manifest
+++ b/dev-python/pep8/Manifest
@@ -1,3 +1,3 @@
 DIST pep8-1.7.1.tar.gz 80334 BLAKE2B 71a038c8fbcbd7c94ff713d1eb8fa248106d283fb520f97fe35819b14382eff6e55683b739acd933cfe22001ed262f76a9b6f3f55661938b3b199ec1f4c35745 SHA512 d20d6a6f91bc865580e3d39c50e26f9c6be81fd8e80a1b9a029d7ea9c906748e46080b841dc5507004089e5ee0d0cb3f70a74bb35131c58113ff5571153af4da
-EBUILD pep8-1.7.1.ebuild 857 BLAKE2B 92d49caea55f426384f0ed3ee81cfe5629826e6e82ee2b2e2851fd827b6369ccd9fe0761f7c19e704798367f03ef45cd7bfe111cfaa1bdf3e321368295b25976 SHA512 620d9fa6d68448cde82f658d70454b710e56ada6dcb46e2d2b93b34946162eb0cccf8c28b3c1893a7bc58f30b5f49b14c59eec967d046ef21328cc3597b2e368
-MISC metadata.xml 398 BLAKE2B 36900845777c438858178ad562d5da58efd9e2e39b6ce3a062cb6bdfb48f970dbe6d18e57dce711b4dbf1efa6c65fd4b52329b4a2a293bfc21661670a7c1daf5 SHA512 e700e6ff7cf5fb6e85874a2ef1c07d35b635ae55ba0d9e346b4fa9fe2928691203571a85d2a9f63ddbdb3d51904b4503ec046adf4e732c18e825b005dd7c2125
+EBUILD pep8-1.7.1.ebuild 865 BLAKE2B a678272d798b58917916f162403aefc54146f27f5c7de6f47396a8b415656079a54c6b3d0d37df76ae1a0c2bb57dd01b5ed1e90157fd3e36a4ae14cbc37efe8c SHA512 c50a5d70c2e0e444e47a7e4ac2c4ebb347dcb4b98f0a7febd7ae1009b87eda06a7b51261e5e559fd243758edda8db8e9feac63023878d9709770d1bf6211bb4c
+MISC metadata.xml 401 BLAKE2B 38a3d82a63a9f903a3d135ab620bfdd4a2e8de7b998bd45ca9ada37d7d08aea6e360fc15a0414e3c11276784c4c60aa557d4cc326f220d7b39bbaa96322e60a9 SHA512 b3cc2915ab81da987a14260c611822ea0ee3b550c60c34e88cacc9e760d1b3965aaa101cef1947c34d269ad8fabb8eb8e29403cd961d99a0e99563433f1cf336
diff --git a/dev-python/pep8/metadata.xml b/dev-python/pep8/metadata.xml
index 5a52c4a85bad..2eb1288b3c1e 100644
--- a/dev-python/pep8/metadata.xml
+++ b/dev-python/pep8/metadata.xml
@@ -8,6 +8,6 @@
   <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">pep8</remote-id>
-    <remote-id type="github">jcrocholl/pep8</remote-id>
+    <remote-id type="github">PyCQA/pycodestyle</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/pep8/pep8-1.7.1.ebuild b/dev-python/pep8/pep8-1.7.1.ebuild
index b8c60182e655..82e6438930b1 100644
--- a/dev-python/pep8/pep8-1.7.1.ebuild
+++ b/dev-python/pep8/pep8-1.7.1.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Python style guide checker"
-HOMEPAGE="https://github.com/PyCQA/pep8 https://pypi.org/project/pep8/"
+HOMEPAGE="https://github.com/PyCQA/pycodestyle/ https://pypi.org/project/pep8/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pew/Manifest b/dev-python/pew/Manifest
index a72e920843d5..2424cb34ce98 100644
--- a/dev-python/pew/Manifest
+++ b/dev-python/pew/Manifest
@@ -1,3 +1,3 @@
 DIST pew-1.1.1.tar.gz 19629 BLAKE2B 9db83eeee873c1a9a542372562cbadda37d6d5d52ed220c7018390291a96ae1adf7e168c4213cbcadad04a6cadb7115aed53eb7a8561a0ee0e58dc9137ac5257 SHA512 9b59ab51d4685b6203a944338d8fc5ab0ac65b442adb7861fb3f2ed7437ef8a02f1f87e234fc70124245625ac7992500c11e51902a98511015e90f1ac5e56b46
 EBUILD pew-1.1.1.ebuild 686 BLAKE2B 89ff38fcc42adff534667dfbf3e283d3729a5eef61719c684c4572f051c9d9f8ab7ce3200030be5c63ed26a089e650accb2fea3733e6e43d6261f86b20021f54 SHA512 fb5c41f323aeb30b46045799f3c6d83b990246cf7c024a28abc27cf5bf17eb85856e1bb69316c7fa5a731d69d7f7fed54d5b1fc0eb480fab58666f73ba4b7d8f
-MISC metadata.xml 446 BLAKE2B d4be59a9c95d607bc67b12d4fe5a5310dfcfa5a251e022fb9fb0ffb0a57aaf51c47331d735b76eb651718adfd627d72ae9afa315c9703fe639dbf67ddfe411b7 SHA512 81ea90c5b887670e5a5d1f6933c503fdbcbfe1b59034bc8656a5ecdd5aa954a35edf3aa46b3c5d591194d2f964d4fdf30ede9270d9dc06ca7676b0f864bae20b
+MISC metadata.xml 478 BLAKE2B f5f564d3d5b8fa968a735ebf8d1430fee0d25d5d78a04e52edc418322936e678cd0d930873e6e7441c9c5df1a2002f8b0bb6f43345625a26ce7ebe49ec831964 SHA512 febc35daa5d59db108808817bfe3cab5d6d29aa2e9c79df5a304870814dd4889f988b2debe42298081fdc3e9295fcffa1c6b1900065c58b75461e4136fcd8830
diff --git a/dev-python/pew/metadata.xml b/dev-python/pew/metadata.xml
index ad399639de19..04d8b5b9b5f6 100644
--- a/dev-python/pew/metadata.xml
+++ b/dev-python/pew/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">pew</remote-id>
-    <maintainer status="unknown">
-      <email>berdario+pypi@gmail.com</email>
-      <name>Dario Bertini</name>
-    </maintainer>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pew</remote-id>
+		<maintainer status="unknown">
+			<email>berdario+pypi@gmail.com</email>
+			<name>Dario Bertini</name>
+		</maintainer>
+		<remote-id type="github">berdario/pew</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pgspecial/Manifest b/dev-python/pgspecial/Manifest
index 2f460e0bd36e..a3ace681197d 100644
--- a/dev-python/pgspecial/Manifest
+++ b/dev-python/pgspecial/Manifest
@@ -1,3 +1,3 @@
 DIST pgspecial-1.11.10.tar.gz 45560 BLAKE2B f4554eb812fadad984f746e8035a7a91f22480321df920bd15b96239c571c13cdf397ea38ea122f0a73167924a902955a1eb50dc865ba1e4445324358c3e3cef SHA512 452f217055873d3d1acff6b9b5016a3e721bffd4349aaa975aefe3ae1e25ca576f90eab13e7f913ebbfb796ac7b81dd8ed63c8e6d055c2ad7f8fd9d72ca8c21a
 EBUILD pgspecial-1.11.10.ebuild 636 BLAKE2B bb8c578233cef38b5f96443e878a21513f69f9c05ad228271525d76a2316b248f4cf6ef0c2fe2f31f0ee011fee7962e693eb75f800bf89a7ce5cc16c56879b2e SHA512 5725c7f6b8fd5259a33fa458556445d44c7af66592f7aa560d15c4474171a0c116f6e6ffa56ad766daddcd609d4381800ce7fdbc06969662fd7fd3211498c8da
-MISC metadata.xml 659 BLAKE2B 9c6b1ba6008ee4d04753af092e62e921746b2db86901f5ccfa402be6aeb8faa9086c0d1903b378198483be3f16dbdb331166b550ede12eeb34b01f7eab5587c0 SHA512 6bb18a7a98c1d9df5ceed8f94e905290459c80c1ce38fba0d45b9c6958fd2d4f02e2121921ad7547fcbff805a8b0cf05516bb20dcd6491b8acbbdc3d9d8d03c3
+MISC metadata.xml 673 BLAKE2B ce5e774e5131520d65aacf93e9521aa81a6310b37fbeb1254898f2254d080538d5d0ea90cbad6132faa9af3e227845888fa6b6dacede5f09eaae3fac1b7b6cc3 SHA512 e2adf6f8d7f781a42aab4f2269667ca41fcd1615ba2ef13f7f844efb8a2db74287cf6fc2940e00a1fb00a80d62c928ab083b6e45b2dac216addb731c90a3e6ef
diff --git a/dev-python/pgspecial/metadata.xml b/dev-python/pgspecial/metadata.xml
index 8b85d401f4e9..b02c554129ab 100644
--- a/dev-python/pgspecial/metadata.xml
+++ b/dev-python/pgspecial/metadata.xml
@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>andreacerisara@gmail.com</email>
-      <name>Andrea Cerisara</name>
-    </maintainer>
-    <maintainer type="project">
-      <email>proxy-maint@gentoo.org</email>
-      <name>Proxy Maintainers</name>
-  </maintainer>
-  <longdescription>
-    PGSpecial provides an API to execute meta-commands
-    (AKA "special", or "backslash commands") on PostgreSQL.
-  </longdescription>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="github">dbcli/pgspecial</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>andreacerisara@gmail.com</email>
+		<name>Andrea Cerisara</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		PGSpecial provides an API to execute meta-commands
+		(AKA "special", or "backslash commands") on PostgreSQL.
+	</longdescription>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">dbcli/pgspecial</remote-id>
+		<remote-id type="pypi">pgspecial</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index 6638864efcf0..2ff557e83353 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,7 +1,9 @@
 DIST phonenumbers-8.12.11.tar.gz 2254319 BLAKE2B 2a33978ab0e4e575aefe2f3ed4f5a89ea87f1b38881fa2f4b7a4a38d16c107c62f4e079521d579b8a5419c8b174cf51ae8c530a450b8a8f9ad200b13938f4039 SHA512 e9008086f9cbb13a5772f164b12d3446cd0122556d90522f1e49d0a0155355401f2348a44396c7c26b235e543135471b64c97d67f82406356787c3c636dd181c
 DIST phonenumbers-8.12.12.tar.gz 2257073 BLAKE2B c8e4d20962d53470bfa701ff59ad0d4ddfa5f4913ae2ad2bea83c5b0c3274bddc7ff1c57e555e3b7f877d9230c0fdab5d866e52f9285fdafd773afc2c840f42f SHA512 625746bcf08f4bb5849fda1accf1229a05406439c97228b3f0f38b6fd56a4cd53e719738bed305a9dd89ab94f5f60ff0d9d0dcd3e57d5055daad99cfb94982ac
 DIST phonenumbers-8.12.13.tar.gz 2257015 BLAKE2B 93986ed663b4f78d0b48ff45bf6b5e2b3d360d9efd5a349f05cf24d5a6113d87334be2d72eb03a6925eabd5cd2dafdf51ffc16fe95c73bd164fcfc5bc07d171f SHA512 397eb41e17c0a49c5750bc909fef70d8e2844f872f317a74f306c406fc7d459fe7dc48615dbc82b0144781a89ad376e76fe390688fd227705a016adf19c848be
+DIST phonenumbers-8.12.14.tar.gz 2256560 BLAKE2B 60fdcb14143d4ffb625d1c873a1e262053bb0bc3df6f2576212329726c4578367b817f1166dfbc561669e4e8486a411487627de479e66775968c05574a8beff6 SHA512 fc155095a00d5e776301dde134043dcc60dfdc6812399e92e92f319c568f7e06f3b294833dc385614b14c87cac15aafb76e7c27116445c7d8fc0ec0740314089
 EBUILD phonenumbers-8.12.11.ebuild 433 BLAKE2B 05a63352cb4e9522f74d8bedc829b3f01ca7396c2cafd311ccec56a4079539d9c6784abea36076454ddc5fc27911323130cda292240e3f18b5510f085e0c8cfc SHA512 58baa6deb1d024174a2d019e63420ed0a33817234b643530ed9006e62644873540fe8f8dc4e0fec7152fe153e0709db6d8e66b91c216980dacea323f6dcd6f5a
 EBUILD phonenumbers-8.12.12.ebuild 435 BLAKE2B 79b981b633b68fa232f0c431dbf4a180c9d4596931386e69046e2850e6f7aafc05600776af068613cbfd54484ecb2c5a3ee0653afd0338f12a18b43aeb9d6653 SHA512 e3f59e06254641b3ce2d4433ec1b1a74f786d0ae4ffcc1a407e30c8f4ec57f539925fdbaedbdaaf71ff4cecc9bcd95651f3b876affbf9e86c5b99546a122c17a
 EBUILD phonenumbers-8.12.13.ebuild 435 BLAKE2B 79b981b633b68fa232f0c431dbf4a180c9d4596931386e69046e2850e6f7aafc05600776af068613cbfd54484ecb2c5a3ee0653afd0338f12a18b43aeb9d6653 SHA512 e3f59e06254641b3ce2d4433ec1b1a74f786d0ae4ffcc1a407e30c8f4ec57f539925fdbaedbdaaf71ff4cecc9bcd95651f3b876affbf9e86c5b99546a122c17a
+EBUILD phonenumbers-8.12.14.ebuild 435 BLAKE2B 79b981b633b68fa232f0c431dbf4a180c9d4596931386e69046e2850e6f7aafc05600776af068613cbfd54484ecb2c5a3ee0653afd0338f12a18b43aeb9d6653 SHA512 e3f59e06254641b3ce2d4433ec1b1a74f786d0ae4ffcc1a407e30c8f4ec57f539925fdbaedbdaaf71ff4cecc9bcd95651f3b876affbf9e86c5b99546a122c17a
 MISC metadata.xml 517 BLAKE2B fbbefd64340f179046eff07f02cfc01416d9c99817d8bd4061aa908eaabf59560e704e40876b5d514389766b26697ee811a1a4ef9ee5a306790156892f45e8d1 SHA512 5246cff049767fba3892ae49499127453cc26806d3eca35de98012c71df29cca4192d104810ea21921a1160e736a2225e3538e829016d9712a0b489be0e5a17b
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.14.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.14.ebuild
new file mode 100644
index 000000000000..4d3183b1591b
--- /dev/null
+++ b/dev-python/phonenumbers/phonenumbers-8.12.14.ebuild
@@ -0,0 +1,20 @@
+# 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="Python port of Google's libphonenumber"
+HOMEPAGE="https://github.com/daviddrysdale/python-phonenumbers"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=(README.md)
+
+distutils_enable_tests setup.py
diff --git a/dev-python/piexif/Manifest b/dev-python/piexif/Manifest
index 7acd80cec411..ec9ed96a3f1a 100644
--- a/dev-python/piexif/Manifest
+++ b/dev-python/piexif/Manifest
@@ -1,3 +1,5 @@
+AUX piexif-1.1.3-tests-pillow-7.2.0.patch 1382 BLAKE2B c7ea03ffe0708b975d64602910bf9c228f0093d9cb717a1b1b9f3e7b6358b94f3bcbd6da8f9bac12fe2ee0745d17defccd196bdd8ec018fea50b7d131e148616 SHA512 be1ee541e3bb6c219d6fd9ab68e9143c2131f695a2001d36a0d63b0566d71a542a09d58dc0bcbdb8c1353297156ea7853d483b9a44407cb31c30acc4252310bf
 DIST piexif-1.1.3.zip 1011134 BLAKE2B b27d4419cf545f6205b13c5646dff9fc7b1ce6e5de538f6a7189e6cadb54d301e11cbf0feaed8b073cbf16de95d67c621b68657b35fc0ba2025281ee64be4e51 SHA512 df5f7793c39911af58bbae76cf998e2a7bc820b84dcf9808ee8f6a38f766f824fef28392ef88387e18b10c270c4b27881be310f0368076b6fb65379a11a93270
-EBUILD piexif-1.1.3.ebuild 603 BLAKE2B 8fc5282011f24ea27096c492b2f2be47f87065c9ebc0e79ded616903eec90af0b1aafe2f0abe39a8bc416863183569c84f442fc901902694f44a0b9b863d68fe SHA512 64e98f3d62a54fafed1b2b04e91cc2518b08c08a2439bafa55cea8fca3487fdb94bea972009eeb8acdcbfd0db1f12b70db73e264e08b7c558d69ad24809589d5
-MISC metadata.xml 216 BLAKE2B a7f17874d9514cafd0bbab739d143a00ac66ad8446bce8e05932d122c1631d29ad8077c2bcda021bc92b7e89b77c03d55e8997cf250f3bb55f8a1aca046bb2a7 SHA512 1de1c9f4b223876125a0321126f2d7b1b564a113d24ae86b380c4d67bdf58ed4f2ae1a1f5d686211ccf4851eea8e970c20109977abbc79d0cd855164b6474e23
+EBUILD piexif-1.1.3-r1.ebuild 814 BLAKE2B 724376a8c788cbbfc04e92557666e930721984366e5b85c0352c7669793c61351a2ba06f8e3b45802634e0dfe291d44c509841231efe54284b9aabe050fe8f39 SHA512 8297e04ac2126640d092ff8b868c0755068d3603a15636ca0751d257e057958ddf86820bc3e5a4270154d25d9c4f23d5ce92d0be55dddb9f9f3996654094c18f
+EBUILD piexif-1.1.3.ebuild 802 BLAKE2B 7c266d8a11a7710452d554f7e07d64ff51405c669cf767d736f54a081972deddff5dddf71362112d248cb096a4b6971e6e1eb2bdbcb196c9e4ea92e570331ca4 SHA512 08eba3892bffe7471e2c48739d5c94035c7649dad4d0f748b74f4113eba05d0064300f5d528cdab657d0127053126f3bc612e303fc0b1f151c80a637cd86f222
+MISC metadata.xml 339 BLAKE2B 32abc28c3481c47f9c73594d1ede39100d8dea0ea8c41de777243b78dbda60f4b0ce741465ccd626c89b3924410505fc8edbf3fe8c416800a38b82b16031f72c SHA512 ad095b64f7512a0884d07bae7c47977ef55991a06bec4b4d43c73808a4c902bfd7eca0d2364ddf806301b1b3eb5f5a24d1080abb27157983394fcbc47f6c66b5
diff --git a/dev-python/piexif/files/piexif-1.1.3-tests-pillow-7.2.0.patch b/dev-python/piexif/files/piexif-1.1.3-tests-pillow-7.2.0.patch
new file mode 100644
index 000000000000..b13425a0fc21
--- /dev/null
+++ b/dev-python/piexif/files/piexif-1.1.3-tests-pillow-7.2.0.patch
@@ -0,0 +1,40 @@
+From 5209b53e9689ce28dcd045f384633378d619718f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Wi=C5=9Bniewski?= <vuko@vuko.pl>
+Date: Thu, 5 Nov 2020 16:18:52 +0100
+Subject: [PATCH] convert IFDRational to tuples in tests
+
+This fixes tests with Pillow version >= 7.2.0
+---
+ tests/s_test.py | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/tests/s_test.py b/tests/s_test.py
+index 5d105de..a7cad54 100644
+--- a/tests/s_test.py
++++ b/tests/s_test.py
+@@ -9,6 +9,7 @@
+ import time
+ import unittest
+ 
++import PIL
+ from PIL import Image
+ import piexif
+ from piexif import _common, ImageIFD, ExifIFD, GPSIFD, TAGS, InvalidImageDataError
+@@ -580,6 +581,17 @@ def test_print_exif(self):
+ # test utility methods----------------------------------------------
+ 
+     def _compare_value(self, v1, v2):
++        if isinstance(v2, PIL.TiffImagePlugin.IFDRational):
++            v2 = (v2.numerator, v2.denominator)
++        if isinstance(v2, tuple):
++            converted_v2 = []
++            for el in v2:
++                if isinstance(el, PIL.TiffImagePlugin.IFDRational):
++                    converted_v2.append((el.numerator, el.denominator))
++                else:
++                    converted_v2.append(el)
++            v2 = tuple(converted_v2)
++
+         if type(v1) != type(v2):
+             if isinstance(v1, tuple):
+                 self.assertEqual(pack_byte(*v1), v2)
diff --git a/dev-python/piexif/metadata.xml b/dev-python/piexif/metadata.xml
index 82b7b7953794..ca0382cd67ba 100644
--- a/dev-python/piexif/metadata.xml
+++ b/dev-python/piexif/metadata.xml
@@ -4,4 +4,8 @@
 	<maintainer type="person">
 		<email>sping@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">piexif</remote-id>
+		<remote-id type="github">hMatoba/Piexif</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/piexif/piexif-1.1.3-r1.ebuild b/dev-python/piexif/piexif-1.1.3-r1.ebuild
new file mode 100644
index 000000000000..8cc00f501540
--- /dev/null
+++ b/dev-python/piexif/piexif-1.1.3-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit edos2unix distutils-r1
+
+DESCRIPTION="Exif manipulation with pure Python"
+HOMEPAGE="https://github.com/hMatoba/Piexif
+	https://pypi.org/project/piexif/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	app-arch/unzip
+	test? ( dev-python/pillow[jpeg,${PYTHON_USEDEP}] )"
+RDEPEND=""
+
+PATCHES=(
+	# From https://github.com/hMatoba/Piexif/pull/109
+	"${FILESDIR}"/${P}-tests-pillow-7.2.0.patch
+)
+
+src_prepare() {
+	edos2unix tests/s_test.py  # to be able to patch it
+	default
+}
+
+python_test() {
+	"${PYTHON}" setup.py test || die
+}
diff --git a/dev-python/piexif/piexif-1.1.3.ebuild b/dev-python/piexif/piexif-1.1.3.ebuild
index bb976412ab52..d73f2b184359 100644
--- a/dev-python/piexif/piexif-1.1.3.ebuild
+++ b/dev-python/piexif/piexif-1.1.3.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
 
-inherit distutils-r1
+inherit edos2unix distutils-r1
 
 DESCRIPTION="Exif manipulation with pure Python"
 HOMEPAGE="https://github.com/hMatoba/Piexif
@@ -23,6 +23,16 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/pillow[jpeg] )"
 RDEPEND=""
 
+PATCHES=(
+	# From https://github.com/hMatoba/Piexif/pull/109
+	"${FILESDIR}"/${P}-tests-pillow-7.2.0.patch
+)
+
+src_prepare() {
+	edos2unix tests/s_test.py  # to be able to patch it
+	default
+}
+
 python_test() {
 	"${PYTHON}" setup.py test || die
 }
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index ead94f028b18..3f16eec7fbce 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -1,4 +1,6 @@
 AUX pikepdf-1.8.3-test.patch 1383 BLAKE2B 18ac2e4ad4fd2c1e6db158ecd87505ef3099a5053d3d4b5b96a2b1179eeeb77218ba0582e1f25975f5f94867220fd382c82ca960da404154ea67008cd389ff82 SHA512 6db05c94c09f5474f53bd2dd77b0ebdf6cecb4cf00ae5c344b1795bd81379f072856c7d06c05630d40c878ba2fd9b09c918d0f6fe364b54fea720638135caf0c
 DIST pikepdf-1.18.0.tar.gz 2351789 BLAKE2B b33b69f57fcd5293814ac880376627b7184ca632e09f668fd274eae6b3640d97699681597470c17abe00ec334ec894a073cc1a1eff91ffa7df572ef78542b429 SHA512 9a04fe6ce145a6f28a180261ac004fc0ce3c525c4e9e7c5eb4bb7dbf8aaa6d3e6f726cec5d20033a5aaa60b793666df52c20f13c8ee7c0c3266fb8e557d69c18
+DIST pikepdf-2.2.0.tar.gz 2363761 BLAKE2B d1a8873a2c41e280dc2880609424742f4454ee226ee30469df067ddf0f5ee98ba6ef2965df75e95c2576e3813bdea7cb6bebfc7a1a7d05696b9da8ec67ef981a SHA512 e80874ece09ce6381079f705ab031b121917485d0968578aeb07a83b70a14bb46d549498357acc4df62b51c33fd75a87f65b74ef64464dcaebba3ff84aaa1843
 EBUILD pikepdf-1.18.0.ebuild 1523 BLAKE2B f8f6fc655068e411e21ae4dd2f77e99e5949a9c3d6e50227ea6e48101e5453ba5e2266d261ded3b7dd7d3cad8861c912127c5b80978287505e6d885cc01ed8af SHA512 6c38de65f8d9b7c18edbd664f428ed67a3db2ab64cf30f1a624db1b79c368459b6d230452289cbc18bf9db69ba03da84568c838bec38b221b9ed3f972a4729c2
+EBUILD pikepdf-2.2.0-r1.ebuild 2015 BLAKE2B fe1bdcfedba6bd9267b9757a8104d6c1a67f460c9746880f1f32db4748dd838ef57eab621792fdcc78942d4ec9b926dd17179a3128b999c702df43f61c2c7ad2 SHA512 330e6c9f69e0964d9c53ef09d8b06a9bef6ad4e2d09e6bba78664cf7390f9a8626d8ef3b475fa3d40306c50622d008dad7aeec5a876d63459a42cc0de4510029
 MISC metadata.xml 579 BLAKE2B 010d66d2d00284f744a85bebf5b916e77efc7f46f880886815bc677007ae0f71b5f19b6caf6cc49c05e1e9ce13c954876e8d13b988a533af2fb68de147e6911a SHA512 3f41579208b5354e6361d6cd1f035bf0e5819fd90575e15c684cf501ca33bc14b6c4a7b70040cd5f44796a8ca58810535734787ce84ce8183d0cadc14d6c1f01
diff --git a/dev-python/pikepdf/pikepdf-2.2.0-r1.ebuild b/dev-python/pikepdf/pikepdf-2.2.0-r1.ebuild
new file mode 100644
index 000000000000..06b08e471f2a
--- /dev/null
+++ b/dev-python/pikepdf/pikepdf-2.2.0-r1.ebuild
@@ -0,0 +1,61 @@
+# 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="Python library to work with pdf files based on qpdf"
+HOMEPAGE="https://pypi.org/project/pikepdf/ https://github.com/pikepdf/pikepdf"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-text/qpdf:0=
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-50[${PYTHON_USEDEP}]
+	>=dev-python/wheel-0.35[${PYTHON_USEDEP}]
+	>=dev-python/pybind11-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-4.1[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+	test? ( >=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-5[${PYTHON_USEDEP}]
+		<dev-python/hypothesis-6.0[${PYTHON_USEDEP}]
+		>=dev-python/pillow-5.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-6[${PYTHON_USEDEP}]
+		<dev-python/pytest-7[${PYTHON_USEDEP}]
+		>=dev-python/pytest-cov-2.10.1[${PYTHON_USEDEP}]
+		<dev-python/pytest-cov-3[${PYTHON_USEDEP}]
+		>=dev-python/pytest-xdist-1.28[${PYTHON_USEDEP}]
+		<dev-python/pytest-xdist-2.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
+		>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.8.3-test.patch )
+
+python_test() {
+	pytest
+}
+
+# When ipython and matplotlib will get python3_8 support, we'll be able to add
+#
+#IUSE="doc"
+#DEPEND="doc? ( dev-python/ipython
+#		dev-python/matplotlib
+#		dev-python/sphinx-1.4
+#		dev-python/sphinx_rtd_theme )"
+#python_compile_all() {
+#	use doc && emake -C docs html
+#}
+#python_install_all() {
+#	use doc && local HTML_DOCS=( docs/_build/html/. )
+#	distutils-r1_python_install_all
+#}
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index d30e2306e52f..064400bc4eb6 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -3,5 +3,5 @@ DIST pillow-7.2.0.tar.gz 39125407 BLAKE2B f49015922c34473590740c9fa63435f85f9a51
 DIST pillow-8.0.1.tar.gz 44614653 BLAKE2B 0f8ec178e92a57a55d575fac61779d39e79ff18032a02ad93aa6eca1211436342944b1a5bbd29979b52f0e2df756936ade4bf637ac3c153b5dda5838b58087ac SHA512 41b4ea786990c834f77ad06b64f465bc8f3a65911cf14bb05f452316fdf504e5e49b2bb50a9346f207187e79f83c5b6d310d703d1588f678b606584b1f27ce6a
 EBUILD pillow-7.0.0.ebuild 2638 BLAKE2B bc13ea32fd5b0a25aad6c976bc4776ebadddd6fd778126e0995391e684bab49aac9c8681face6a2ff9663203d820de77a9c18b895ab6ccf48862ad153cc01225 SHA512 a709259b589008d5e745b6011b10f503db7664fd9e52b858e3c45ef91e428b531bf461da9962a2807a5c0058980cbb7b70e0a22b84aa624ecf9690075c202ff0
 EBUILD pillow-7.2.0.ebuild 2694 BLAKE2B 0c5ac7be9523a70ef6b0abda1bbaa1183fde635e608d76b0b99216256d4d63288ece9f9901176d2a405969143f86aa524e09f7a23fc64c53de01ab785e3b6ab3 SHA512 21573a1826123c84025e9706114f6cef7f6c21a8c88237957b23d0e05425ea477e468738af1cc8379e3b4e322d3f1c81248fc70d835dc333f90f7250c58c2ce2
-EBUILD pillow-8.0.1.ebuild 2618 BLAKE2B 3e4314d1bd9c26ea9149e24af9fb695f902b7cb27346eedf9845b166b3ae425a0d9fdb179a6e7aaa427031ce0025c6a9b46217c5ce3d51061cfd158588145129 SHA512 4ad5cac597df00fa08e757d5a15f66b32478621abfd885fcf343e04b942cd8166cd8f0c9ebfd5dc4fb9789d4d5c284d5a169fea175f0b59c163894ca262e091f
+EBUILD pillow-8.0.1.ebuild 2617 BLAKE2B 2618fc049d31b67bd4c06f7b1d83b4cb2dc4f7172b89e0e4a1f21605a884cdfb1f9a16754bf8a259bf2510581a559d9209d7f07c5cb2bbf7272a721c7e094dae SHA512 2b0e20de8daa9794c87bcb6961e6d6fe1b5fd9b5acc51271e29596655f9a9085dc546032a2f366193dc21ff514f4a3bbf3562f6739a08062ef5991517c8a0455
 MISC metadata.xml 479 BLAKE2B 8573c3f71b8e0d548f50dcb630a7c36d773ca8bb80f210bec320dc85bf12b70e9f30068dea615925c401726f0a5430827baa0104300abfd85060b522065c8d37 SHA512 473a9aea70516087faba8abddcd02bb76cb62711a5446fc5c58cedc0f0beb70cdef32e928ec293698b524d2e49440be2328567f84efeea4333477b7b9bd7a7d2
diff --git a/dev-python/pillow/pillow-8.0.1.ebuild b/dev-python/pillow/pillow-8.0.1.ebuild
index 17084a5fb118..562ba1c9251b 100644
--- a/dev-python/pillow/pillow-8.0.1.ebuild
+++ b/dev-python/pillow/pillow-8.0.1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="HPND"
 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="examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
 REQUIRED_USE="test? ( jpeg tiff )"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index 3fa1ad9a9c1b..1581b88d86aa 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -2,7 +2,9 @@ AUX pip-19.3-disable-version-check.patch 872 BLAKE2B b0398674f56b78a066c4308f0a8
 AUX pip-20.0.2-disable-system-install.patch 1298 BLAKE2B a384ee2114e59b8bc719fc14270cf6efbe8914854c404395beb1126db3278683b940e8fcfee83423d78e2aed6521e0bc57566ab0f5618f473262bbd9b7b0bffa SHA512 d2772105d4f4f880606e1e8ab3381af6768a96604a5fdcaa155dd42f8eea731c3a1b733b027d3e591d81f962ba14758b19da4a2c6c12946cd9a9d77c51ca4e78
 AUX pip-20.2-no-coverage.patch 6154 BLAKE2B 743dcacd3107d9c6447197dd01bc85b1b16db5b1da3bf5f84e73801e645848a98854f350d958056eb17aa6b87f8bb2557a27e3bd78582958c3b37cb6ce61d7ce SHA512 67ea11c56b6a7b02faae28c9d941015ca2ba9c125dfcaf01eeaba7717cfb22f23fb84c28f993202f7b648ee64741baaf7545e9951be840d378e39d3af0a60fd0
 DIST pip-20.2.4.tar.gz 8723163 BLAKE2B 4b892950b6752b61af2f6a9d2c0a6f5db124cb7605d6cb9d4787bdbd88911cc6013474dd299f6eb5b1af4a8fa0ab6d3c5253513af182045a50cb463ced8382ea SHA512 649fdc6baa1ebe741717bd1e5ed8f2450d79f8bc0d06f2804c27488be9018f6fa6cc2eccc3ec2801442073f59ac0b8c377612c25116126aa919aa95050f4214f
+DIST pip-20.3.1.tar.gz 8753852 BLAKE2B dbcf719ed6a1e4f39f08c39df0cb4abf4284f6cd68c9fbd1282b17714aff9df9e33dd2a4a1af89f45ce5131a858f7d392c11447fe9aceba9d3be2ebe1529818d SHA512 6061004b51e57e428a7eef02968fbbde02311ee184019c491012758010bffcb49d371c7612bc43cfacf96fe8de37fdcad34e3cadefc46b3b5962b0c716ee5d59
 DIST setuptools-44.0.0-py2.py3-none-any.whl 583230 BLAKE2B 823e6792471660f247e30a938aa869d345a63db7294e5f9b4bd88f15a7694779011d29740fe317149620985f705fc6e18cbb07a18e5680cc11d7c229ffbc74f6 SHA512 7006fd303181afbeeec0e30cafb9fd1e4d3c6f55cfdd6343fedbc32b17dbb96b3d96ae37f4db27bfb168738727474cf425904ec280ff1d2b789fc48077a8fa84
 DIST wheel-0.34.2-py2.py3-none-any.whl 26502 BLAKE2B 3a1bd4571c582245b60ff33c9bf74ff8a2ebafb26e56fc7b9bd215058d059b6bd13bbe21ce46002af257813a54126f27e19253f211e21c4548c7cf84cd15caf7 SHA512 4f1a44f4691ed8baad777d7874f7f4da96a5019eb485fd3a9eed9259aa2a9d5acccc6dc63a72128664347c64ee039a6076c6ca9c3b75a1f94457967864e522ed
 EBUILD pip-20.2.4.ebuild 4163 BLAKE2B cc26eb182a2e0c9c65946a251f9b2933b6a4622482bb1e434a278e1d103c7be044c23de588f5f79f487160672188b76dc580d1b5881d09301aef80d12873ad3e SHA512 403c5f8cf7375eac81ee208b3d5ded807a0c925a5e9bf95f54d17d3444e830e40687bf652657e58700bd71fd571a64298f5f321b2d69000ec75335d6eeac4c76
+EBUILD pip-20.3.1.ebuild 4322 BLAKE2B f149a792176550728a21b30a4e670a9d292cbb06a492c8e023729697c7202a194a68de535bfb672fd1267911d13e3082d69bd07b73a8eabd1fbb14ba9e77fdd6 SHA512 94b10d3ebff504920c3aaa065421da9165edb5140ce00c01c8d61208858265662cb7dbe5fe22782cf934e59f13f185fbb693eb6b93015c6774a273fc8e6c734e
 MISC metadata.xml 391 BLAKE2B d8537d1b2f8886d7c30dad3975568e0198a04f16a7ced44f3682f1b865e25f0b7552a640955dd915b2f059eec78eb3f920a0bea0f5f1503f366731a5d20a96c2 SHA512 27ee4b430cd0175c9eecc279765fd617ce5ab55d36932879a0710c2eb66ac2de449de303b1b70fc0ce925666c87008814d64e62d904fc3b9f800380c53478e69
diff --git a/dev-python/pip/pip-20.3.1.ebuild b/dev-python/pip/pip-20.3.1.ebuild
new file mode 100644
index 000000000000..7987289ca6ad
--- /dev/null
+++ b/dev-python/pip/pip-20.3.1.ebuild
@@ -0,0 +1,150 @@
+# 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,7,8,9} pypy3 )
+PYTHON_REQ_USE="ssl(+),threads(+)"
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+SETUPTOOLS_PV="44.0.0"
+WHEEL_PV="0.34.2"
+
+DESCRIPTION="Installs python packages -- replacement for easy_install"
+HOMEPAGE="
+	https://pip.pypa.io/en/stable/
+	https://pypi.org/project/pip/
+	https://github.com/pypa/pip/"
+SRC_URI="
+	https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	test? (
+		https://files.pythonhosted.org/packages/py2.py3/s/setuptools/setuptools-${SETUPTOOLS_PV}-py2.py3-none-any.whl
+		https://files.pythonhosted.org/packages/py2.py3/w/wheel/wheel-${WHEEL_PV}-py2.py3-none-any.whl
+	)
+"
+# PyPI archive does not have tests, so we need to download from GitHub.
+# setuptools & wheel .whl files are required for testing, exact version is not very important.
+
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+SLOT="0"
+IUSE="test -vanilla"
+
+# disable-system-install patch breaks tests
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/csv23[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/scripttest[${PYTHON_USEDEP}]
+		<dev-python/virtualenv-20[${PYTHON_USEDEP}]
+		dev-python/werkzeug[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}/${PN}-19.3-disable-version-check.patch"
+		"${FILESDIR}/${PN}-20.2-no-coverage.patch"
+	)
+	if ! use vanilla; then
+		PATCHES+=( "${FILESDIR}/pip-20.0.2-disable-system-install.patch" )
+	fi
+
+	# TODO
+	rm tests/functional/test_new_resolver_user.py || die
+
+	distutils-r1_python_prepare_all
+
+	if use test; then
+		mkdir tests/data/common_wheels/ || die
+		cp "${DISTDIR}"/setuptools-${SETUPTOOLS_PV}-py2.py3-none-any.whl \
+			tests/data/common_wheels/ || die
+
+		cp "${DISTDIR}"/wheel-${WHEEL_PV}-py2.py3-none-any.whl \
+			tests/data/common_wheels/ || die
+	fi
+}
+
+python_test() {
+	if [[ ${EPYTHON} == pypy* ]]; then
+		ewarn "Skipping tests on ${EPYTHON} since they are very broken"
+		return 0
+	fi
+
+	local -a exclude_tests
+
+	# these will be built in to an expression passed to pytest to exclude
+	exclude_tests=(
+		git
+		svn
+		bazaar
+		mercurial
+		version_check
+		uninstall_non_local_distutils
+		pep518_uses_build_env
+		install_package_with_root
+		install_editable_with_prefix
+		install_user_wheel
+		install_from_current_directory_into_usersite
+		uninstall_editable_from_usersite
+		uninstall_from_usersite_with_dist_in_global_site
+		build_env_isolation
+		user_config_accepted
+		# these fail with new setuptools + distutils_install_for_testing
+		double_install_fail
+		multiple_exclude_and_normalization
+	)
+
+	distutils_install_for_testing --via-root
+
+	# generate the expression to exclude failing tests
+	local exclude_expr
+	printf -v exclude_expr "or %s " "${exclude_tests[@]}" || die
+	exclude_expr="not (${exclude_expr#or })" || die
+
+	local -x GENTOO_PIP_TESTING=1 \
+		PATH="${TEST_DIR}/scripts:${PATH}" \
+		PYTHONPATH="${TEST_DIR}/lib:${BUILD_DIR}/lib"
+
+	pytest -vv \
+		-k "${exclude_expr}" \
+		-m "not network" \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	# Prevent dbus auto-launch
+	# https://bugs.gentoo.org/692178
+	export DBUS_SESSION_BUS_ADDRESS="disabled:"
+
+	local DOCS=( AUTHORS.txt docs/html/**/*.rst )
+	distutils-r1_python_install_all
+
+	COMPLETION="${T}"/completion.tmp
+
+	# 'pip completion' command embeds full $0 into completion script, which confuses
+	# 'complete' and causes QA warning when running as "${PYTHON} -m pip".
+	# This trick sets correct $0 while still calling just installed pip.
+	local pipcmd='import sys; sys.argv[0] = "pip"; import pip.__main__; sys.exit(pip.__main__._main())'
+
+	${PYTHON} -c "${pipcmd}" completion --bash > "${COMPLETION}" || die
+	newbashcomp "${COMPLETION}" ${PN}
+
+	${PYTHON} -c "${pipcmd}" completion --zsh > "${COMPLETION}" || die
+	insinto /usr/share/zsh/site-functions
+	newins "${COMPLETION}" _pip
+}
diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index 4dea6943a94f..484357ab6111 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1,5 +1,5 @@
+DIST pipenv-2020.11.15.tar.gz 11603983 BLAKE2B 552c35c942f9ece0f52419b6090b87c7dce0c49dd9dc12f8c5b3eb311058fc770ec9e2b141e960d357064c66c6de7cd0892d2dd19868e5cdaee0f302f98fb0ff SHA512 d312059b3fefc97d4cd79bf2b75d6bde1d117d92c0a299c30181a60ebea662a6c3dff0ca7b92c610dd8eb0c873509dd23c9a891761d0d47d0bba2cab738c830d
 DIST pipenv-2020.11.4.tar.gz 11574683 BLAKE2B cb2ac4ba6b07377a3a5540b23756afac38a02691e495ba93031815417d001701b919221fd83d0f9e6b94d4f28c1fa754c2c31e289830305a8c8ac75d847209c4 SHA512 c9015eb9a449fa517f31619d1fec5d99882da915a50e189ba6ab9c7c147862f9734f0df200330d666380afe5d2cf52d18015c539635ca6459042ab50d3ccd059
-DIST pipenv-2020.8.13.tar.gz 11573493 BLAKE2B ac6c6f0336f0c675f73fbecfdefe158eb2a53b5aa4559850b3c9a050404d9d18b0ff2ca3cb62031da027937244a6bbb0d4c1ec433073e429518ec0ea908cb12e SHA512 90ccaf386bc68d856ee9c645084cb65c4213902a8c87e2059cc2274b88d922c3b02c58c15d05945e1f61e8b816ef92a11672cadaf125143bd5019ab25ff0b19e
+EBUILD pipenv-2020.11.15.ebuild 1443 BLAKE2B 18c57f96efc08281410156c8cb4d6ccdfd1c1619d6a03ebe3c2e0dc7d6418a237071cd0e44fa36cfffc0718d00c274a286b3c7ef4416d16bf47a7c570f686740 SHA512 3fbee8337240ff11d25beb5617822b3fc09dd47dd11a69019e3296e53332195ea3aa097b718f07aa0f76baff10b394713918bb555b73a1f0d71a8a5a71c0b7ee
 EBUILD pipenv-2020.11.4.ebuild 1446 BLAKE2B 904eacf558813bcd4b8b9d9a2dcb6f191b73cea1c015a14005b527702cdfb34d3f7a57da2c79f9bbd7378b0183f2c2328b9f61a2afeebe6f62949a3a15095e2b SHA512 c09d4f2bc93f3e65c1f4fb24e82bbb5a8d13fdfc7625155023fe7fe74c341ef658f6599bdb18b0bed0d42c4ecb17e8c2161aa9e283aa4bf530e4912e73842b37
-EBUILD pipenv-2020.8.13.ebuild 1422 BLAKE2B c8966fb2ddba41cad2fee8fca10d331237a96a2e5a0e0d949cf6f37b0a3689c6ed916628caf229ad3f61cbfc771c6f6a9b80628e32b1cde23c96fd801fdc0c7a SHA512 b4640a87842ffd0b6fc82580437232e943a334380cce4851dbeb50cc51f364b0c828bd3468911cf2b016ac55d89081dbf1df0057046839ff1dc17c30d4dc007b
-MISC metadata.xml 587 BLAKE2B 1e496afc6cd4106ead561a0becf969fb53c85b1b874f161e94c4292b4a749ee412333ad3f148d1fd490b71ad5ac23dee363ed8533f72df4444b9928e725a8aa9 SHA512 61da4c2a68ea2727787337ba59a0a1029dec322336c174bbc1697d033ae79f67ea1f3cf694acc18c50d40e5d9807245847d92dc6c9adca1d9b80d23894af9620
+MISC metadata.xml 612 BLAKE2B 98320e022ea9f2425e3a499f769490e2ff0372fbe5c1fc2f77f0b3bc89a9ab10816c7b45571a6526645cbc437f067cb170df28535722d324e1c7e88b4200e7c8 SHA512 c3c4c875d80c3aaf0ec9ea42ffe04641e60f0c54c9b9dae661cd19d488cfa230c8d8bd98cbbcc4e91f53428f66cc44302b0891ffcf6fd6e1501fcb7d258eac65
diff --git a/dev-python/pipenv/metadata.xml b/dev-python/pipenv/metadata.xml
index 912ba1f0a50b..cc9727b55cdf 100644
--- a/dev-python/pipenv/metadata.xml
+++ b/dev-python/pipenv/metadata.xml
@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>oz.tiram@gmail.com</email>
-    <name>Oz Tiram</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">pipenv</remote-id>
-    <maintainer status="active">
-      <email>distutils-sig@python.org</email>
-      <name>Python Packaging Authority</name>
-    </maintainer>
-  </upstream>
+	<maintainer type="person">
+		<email>oz.tiram@gmail.com</email>
+		<name>Oz Tiram</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<maintainer status="active">
+			<email>distutils-sig@python.org</email>
+			<name>Python Packaging Authority</name>
+		</maintainer>
+		<remote-id type="pypi">pipenv</remote-id>
+		<remote-id type="github">pypa/pipenv</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pipenv/pipenv-2020.8.13.ebuild b/dev-python/pipenv/pipenv-2020.11.15.ebuild
index d9f0436d554f..eade778d1d8d 100644
--- a/dev-python/pipenv/pipenv-2020.8.13.ebuild
+++ b/dev-python/pipenv/pipenv-2020.11.15.ebuild
@@ -21,18 +21,19 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
+	${PYTHON_DEPS}
 	dev-python/certifi[${PYTHON_USEDEP}]
-	>=dev-python/pip-18.0[${PYTHON_USEDEP}]
-	dev-python/virtualenv[${PYTHON_USEDEP}]
-	>=dev-python/virtualenv-clone-0.2.5[${PYTHON_USEDEP}]
+	dev-python/pip[${PYTHON_USEDEP}]
+	>=dev-python/virtualenv-20.0.35[${PYTHON_USEDEP}]
+	dev-python/virtualenv-clone[${PYTHON_USEDEP}]
 	"
 
 BDEPEND="
+	${RDEPEND}
 	test? (
-		${RDEPEND}
 		dev-python/flaky[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
-		<dev-python/pytest-5[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
 	)"
 
@@ -41,8 +42,8 @@ src_prepare() {
 	# this should be removed when upstream removes support for Python2
 	rm -vR "${S}/${PN}/patched/yaml2/" || die
 	# disable running of unittests in parallel with xdist
-	sed -i 's/addopts = -ra -n auto/;&/g' setup.cfg
-	sed -i 's/plugins = xdist/;&/g' setup.cfg
+	sed -i 's/addopts = -ra -n auto/;&/g' setup.cfg || die
+	sed -i 's/plugins = xdist/;&/g' setup.cfg || die
 	distutils-r1_src_prepare
 }
 
diff --git a/dev-python/pluggy/Manifest b/dev-python/pluggy/Manifest
index a39387189ac4..04917b937bd0 100644
--- a/dev-python/pluggy/Manifest
+++ b/dev-python/pluggy/Manifest
@@ -1,4 +1,4 @@
 AUX pluggy-0.12.0-strip-setuptools_scm.patch 1186 BLAKE2B 443f5af807826baaca7e956759e7ad7ba3e50c0b0955823ee40d4d95ee85c864bd144104dc2a39cea03aa29ef05f799aa28c14763b85ce3c696baaa9cb249c24 SHA512 031e021a9dfda5b64ef8fcd077cfd6373d2e47bb0d989cc31c59ade70e6d31336b7929dc2e55bd675753487b124f3acd3803f14d112080b67f7e2766c4594364
 DIST pluggy-0.13.1.tar.gz 57962 BLAKE2B aa0a3eec06c988a727bc15511313f12a08bde65da55bcc5e7547a654e3ca8a34c12dfa72166b6a37b524972730f08454b6a0446e071d2710396e868ae3a77151 SHA512 eb747ff341cedacbd90eb20e22ad3d1ddf5588056f14d069f56331f4141a15b7eccaee23ea196d2f4906964ddb77a79b156bbf3ef8c8083e9952c55d13d55f3e
 EBUILD pluggy-0.13.1-r1.ebuild 750 BLAKE2B e8dd8f951b110aac1f93034325c0d70958a6f1555b2b8241a04a533a3442d9a0a8573a2aa278373ae4ffb54f462de6dc2b611ec5db9744075fc86b92ff174d39 SHA512 16b9fd1fb2110b198216db7d640f47f395075280cb065b3680085c0878eb021d10329cd8ebb9f2cf77324fe1d09b7e8d293abba2d4983d2dd9f3414ae4fb0b6c
-MISC metadata.xml 444 BLAKE2B 9b0b62a0670449bdfade395d9766e192088182f724deebd2a2ace8800ac5c0ff6f37da7174186434f727aa3bee08b9416e6dafae443cd01e01baaae741c899cb SHA512 2ecb5fb612627c44f3499080fcde9241daf2f25a974a8e24fe8190b7d5f8baa6a457b7a902e788f98fe9ed1fdb2cd0f46770337e8f836e430b0aa6f0d323ad50
+MISC metadata.xml 481 BLAKE2B 7a2a5d4730cd4ee4589f07273f261c932d4fa173924970a8816fe3c15231ac576ec359974945e332540647a5f0a209198c72a161eeee17d95041dcfd8049b86d SHA512 6fbda8552dac871f2b105cb7c46ec5e8350af42b2c67ac55c9869b1f55915b55105c787a66ccfd981017b060024e8c5a1bcad83fc08c72a38b510a019381209f
diff --git a/dev-python/pluggy/metadata.xml b/dev-python/pluggy/metadata.xml
index 972236293061..9ebf29414a3d 100644
--- a/dev-python/pluggy/metadata.xml
+++ b/dev-python/pluggy/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">pluggy</remote-id>
-    <maintainer status="unknown">
-      <email>holger@merlinux.eu</email>
-      <name>Holger Krekel</name>
-    </maintainer>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<maintainer status="unknown">
+			<email>holger@merlinux.eu</email>
+			<name>Holger Krekel</name>
+		</maintainer>
+		<remote-id type="pypi">pluggy</remote-id>
+		<remote-id type="github">pytest-dev/pluggy</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pluginbase/Manifest b/dev-python/pluginbase/Manifest
index f93a8b876d4c..c98451bb9e10 100644
--- a/dev-python/pluginbase/Manifest
+++ b/dev-python/pluginbase/Manifest
@@ -1,3 +1,3 @@
 DIST pluginbase-1.0.0.tar.gz 41795 BLAKE2B 68d7704b52db39af4f0c2e1f790802eb5f2fd15d91726752605901b3e8a3c736204fad93d96b5dd1a4199586b4d9b42895cbe8290acaed1b4051e8103efb43f9 SHA512 95c3b770980fa5ec745b8d788df29c6219ed6e5af7666f9830d56c6acae01f90831655127bcef69b2dfc423d09429373ae7d4c8b45c76c62a41f909d0747c0a0
 EBUILD pluginbase-1.0.0.ebuild 931 BLAKE2B 6ee3880edfb0760347a590982827f5c1c3335c34256875424cd18a2a2f0da2b5ba409c447a65968c742fe394e32b1c7536cd114cc5c91d890f076d08bf73768f SHA512 f32fa8efdb45e93ba0391001eef6ce4e858e51018f74d9cbbcfb3702b5d7780f0f2b9b8ffef378dc72822ef0e40d879782d11a815a1a40759cb424e405c8f512
-MISC metadata.xml 385 BLAKE2B 0b58f71f7f6e816ba3b2c41212f371d37b0b09b38fc69a1adcdbab7a4537f9e9e7c5c0d9505e5dc72d219f30aeb5a3739c7f58bf4927f75323bd2b34e25733dd SHA512 166cec1bf4ad16e00b937dca860dedef5f8f766c1e3edae03dd29753ad9590843601723243e702344d1d4853b4d1a87c9c0960f9b70ac3dd4ad40995333516b2
+MISC metadata.xml 373 BLAKE2B f6aba121e38caebe2406cceb3ceb2ffe92107c8c4a540f29a9befc70d0651b3bbd6c9e16d4f56c4462e105ad7e8a525c199bab32842b2507e351e9c10030ddb6 SHA512 077cce7d989c18f2a61a634801783f106f2c3839762da37e7835debdad5093cdda3f40934cd99d3c0e0759c4e856c450c9a8e229336de2d08c82a5204ffaf437
diff --git a/dev-python/pluginbase/metadata.xml b/dev-python/pluginbase/metadata.xml
index 0610970f98a5..30a59affa3be 100644
--- a/dev-python/pluginbase/metadata.xml
+++ b/dev-python/pluginbase/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">pluginbase</remote-id>
-    <remote-id type="github">mitsuhijo/pluginbase</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pluginbase</remote-id>
+		<remote-id type="github">mitsuhiko/pluginbase</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/plumbum/Manifest b/dev-python/plumbum/Manifest
index 808b3e3f1527..17c20577d4f3 100644
--- a/dev-python/plumbum/Manifest
+++ b/dev-python/plumbum/Manifest
@@ -1,3 +1,5 @@
 DIST plumbum-1.6.8.tar.gz 309449 BLAKE2B 4112cb99852ebc7e4465ec54bf35a1352ff41a7ac084d3561d23f6da62fb1b25fa65a1f6f118564a677e6b6fde57b52f964a07fb71cae40b7d831ceb1505738e SHA512 2e834b6024ed1892eb91ede95f70641288a76911d58fcb24edaed59d3e54afa72e0533b4510896ecdd5077f70d4d60d9ceb06510c3e6d469afb1befae1961af1
+DIST plumbum-1.6.9.tar.gz 311240 BLAKE2B e5f833a5c762f3e78e5f47649306c7c29e6276b3530ff45fc0c12cc4efd3bf89bad2b6b7f77e4b3e3a0a47671f9b607e667aba8f654c28c05be570e0a7491a07 SHA512 f165f4905ec34cfe072f61fb28b43021ca44c0c3cb1e505faa04332d15920d832bcf084782683c4950113e30a3fa29734846b3b6f31604e1a635c9c125e38ef1
 EBUILD plumbum-1.6.8.ebuild 521 BLAKE2B ee9fe1cf0899628d5c9195355836682f6ade18f2f0230cc9db7ce892f3ac263d3402181437d16d6b979660ed55ddb13b1c5905885bba6cccbbdb5f0cbb6d313e SHA512 c4e477bc89cb1156dfe1e777e4a230cb143fec85a693ccb0163b7189ec870f70dfb3333b0f8f96411110e104c92bba05097aed2517f807bbb3d153d477e92810
+EBUILD plumbum-1.6.9.ebuild 522 BLAKE2B b8813fb0f75ee81d04f5476f5bcd2bdf715a3fdac8a3887502de320659cfd26180c5037935a1a69b69e9438025ca3a57c6e04f155d497d7a40645e6acf39b1e3 SHA512 ee20200dca6055fdec185554e4b4ae95a3261e61b3634161f4a27f3de61b610810c910a27b7d48f564a18f725d30c658bab0e9369d2369a67beed52706ff5439
 MISC metadata.xml 728 BLAKE2B c0f017b6d1dd00480dfbf37aca4f0326fab5f1bcb2c822709b1151521723450528c87873ca098af4f1e7909bb8434451da0d7cbd1ca1494aebffe932f3f8f498 SHA512 1dcf9374ca209dc5ae11fdcc58c9c7493b77be98d0d3d80953e2d0886cc1ba053fa5ebc05bcd4d5b14dc15a070b3df2bdb8c7056cd482bb21cb9901b372cd402
diff --git a/dev-python/plumbum/plumbum-1.6.9.ebuild b/dev-python/plumbum/plumbum-1.6.9.ebuild
new file mode 100644
index 000000000000..f92c5a0cd1be
--- /dev/null
+++ b/dev-python/plumbum/plumbum-1.6.9.ebuild
@@ -0,0 +1,16 @@
+# 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="A library for shell script-like programs in python"
+HOMEPAGE="https://plumbum.readthedocs.io/en/latest/ https://github.com/tomerfiliba/plumbum"
+SRC_URI="https://github.com/tomerfiliba/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/dev-python/plyr/Manifest b/dev-python/plyr/Manifest
index d82950516df9..7a68d168a405 100644
--- a/dev-python/plyr/Manifest
+++ b/dev-python/plyr/Manifest
@@ -1,3 +1,3 @@
 DIST python-glyr-1.0.6.tar.gz 42952 BLAKE2B fd95ef9fd01788c6f6526eabb77cc2c93bd28324066cfb1a4be70a5990bb1599e57e40d607f926a7216c582389e9763bdc92fbd411cdeef52aa86e1ba6138c83 SHA512 c4b04b1379116048f78c3ce5f9d30c92fd0d7198bfda456891d3012d115b86a5970595d9b4bc1d43028e87c9d467c35a7d02c7f3a9f4670dae8a17c22d1ab58a
 EBUILD plyr-1.0.6.ebuild 919 BLAKE2B cde9c0fef131f838ef49893daf2e7755a614ce91cd4638379266b706a10e7460024e3e609bc446723f4bf8440a15ef19b62df116c3118d1445c6901bce6b5bb2 SHA512 077c48f92a7bb4256dd6ac99b559a9fe4a62a296adce46208060b759f0d75716d69e28b68931f8d33f256d18b7e1dde26c47c63829905f750ee3748100f88eaa
-MISC metadata.xml 323 BLAKE2B 6697ca93abe56cb6d2a14920f307f123527cbf570ccae070632877253ffb1dc5dfbfa013f4618b8cc5f22a3c76f5e70654808825ec31d991e704303fa5014f6b SHA512 11f94ab00c03b6a45166db720c0fa897e03fa0f5ecc85a3b824ce51309b672212053b9d7ea703e7f3400501289324b9c4ff6680668c1b6dafe0d009d6265d451
+MISC metadata.xml 364 BLAKE2B cd94849fc6cb34e69150423177bf80677c49954ff4643b63e4dfc92e87b8c581599c55be932becbc0b05789e819a7a99243433e1c8997de7fab52f643509940a SHA512 3cf3744bf5d4fbbbf47cba6942958be48119e4ec8057d04f2818bd47814ca6ffd39ed7a3f58c80012555df9098e38c25433fcac381f6b4b50d8328ab16f18f19
diff --git a/dev-python/plyr/metadata.xml b/dev-python/plyr/metadata.xml
index 1a1144b87cb3..c5c2e533b6cb 100644
--- a/dev-python/plyr/metadata.xml
+++ b/dev-python/plyr/metadata.xml
@@ -4,8 +4,9 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
-		</maintainer>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">sahib/python-glyr</remote-id>
+		<remote-id type="pypi">plyr</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pocketlint/Manifest b/dev-python/pocketlint/Manifest
index 524ebcf7e653..5362f2ffe10b 100644
--- a/dev-python/pocketlint/Manifest
+++ b/dev-python/pocketlint/Manifest
@@ -1,3 +1,3 @@
 DIST pocketlint-0.20.tar.gz 23443 BLAKE2B f3f50c8f54b35e6d1bcf544ed6f55f2e3e461289929a6da5cf3028283fd97781d7b41d6ea458146ae7b563441aa52b757b4a59a0ab44b9016652503b344f1e48 SHA512 02b05f4831b00ece03856938306f0410f2849212d9aa1b686fdf58e6a8e415ce689cdc990125b7baa3e16eeb0e166b49afe6ba574d553f56c7f9981ed01a15dd
 EBUILD pocketlint-0.20.ebuild 480 BLAKE2B a832e848eafcf61a36920601194b978ec33c14c15fd99cd1a2e6e2ebb19dba2f4cffd1d402f5eb1297422a0cf8b672a7fbe8581e9eeb4a000e7d0b298e18d4b7 SHA512 e8878b8497548a6f2a1d85dca5c7d789127e101d0cdbf278a5bb90ff424beee59adf123745f8c8d2a868d73a12f85de4a528e06b46d05ae91b99090682dcb794
-MISC metadata.xml 348 BLAKE2B 832ec69373391ee6c884d446b58ccfb07de61b7519b34be09e3e592ea061c0cf0a10203a5c69bd05e2400366891fc9c74a7b1d74f4a7f268839aeaeb5781602b SHA512 925fd532aab036f7bb18011abfdf98daae08e648aa8b64853d721396dedc431254f54ae2168e5572e2e1f101c6e5ffde2b08a26e423407d84e0e849bd7d4d38e
+MISC metadata.xml 386 BLAKE2B 66a4c2f274af0b1f76bcffd9cf7cc3d67cebe52f79e9e08dde88122f0912005941e4ec45aa20c4cef06775c9bc59b8342067af2aefcb1315b340a8682830270a SHA512 4e7958fb1508b4b5d9462b3ecf3a24efe298aa1af63e9d6746f82cd56410a8607e28e0157ffffcca0ec25bb66257e9072529d4760f2d461444496530848b3775
diff --git a/dev-python/pocketlint/metadata.xml b/dev-python/pocketlint/metadata.xml
index 3b45e273367a..3a2291f0bf12 100644
--- a/dev-python/pocketlint/metadata.xml
+++ b/dev-python/pocketlint/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>polynomial-c@gentoo.org</email>
-    <name>Lars Wendler</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">rhinstaller/pocketlint</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">rhinstaller/pocketlint</remote-id>
+		<remote-id type="pypi">pocketlint</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/podcastparser/Manifest b/dev-python/podcastparser/Manifest
index 6495e7faa6ed..ccf28b29a085 100644
--- a/dev-python/podcastparser/Manifest
+++ b/dev-python/podcastparser/Manifest
@@ -1,3 +1,3 @@
 DIST podcastparser-0.6.5.tar.gz 22232 BLAKE2B 1fcf115954e3394aede643ef28ea7eb13c2969ad3125f82dcfefbb457d61f768247d07d3150fe8adc7aeceb9bb9f0026a2e55f42b3f2a6da76b977528ebd013d SHA512 770d2376eb7d029dc033f46f55d00e02b8040c72c670338ad52ecf065ec4ffd291c6e2ec02cf9b038f8608c7c549808ff14f95017f508bb1526bb79b413e136a
 EBUILD podcastparser-0.6.5.ebuild 408 BLAKE2B e337082a6ccce13c11dc250038fe703cee303d4b812313c2cc49272f9fdc9d306d7e1bb0d8530ead22b83e1b10fd2c7869380a48036ecb0dcd537cede68112b1 SHA512 3b17421f8b554ff6ab9a963ca4e4872997991e030d824dbd704fc3b34d78dd99062b3c70ef1d20adc2e2ebf98817fd19f30d7792d55bd86cf517c01ccd76a150
-MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
+MISC metadata.xml 329 BLAKE2B ec8fcd3d6cbfbbc6d8a6d46278b29b9c8afa96eadca3fe962d45569b4eb583c650b13934de566b096b692470e0093bb2a9830b09a842ab38691a16db9675c234 SHA512 90f6b8348ebe07ed1f86e2705e13259d42f02948cc347de23203d4682e42b7937f96e6a436539d0644decdd438361b9b1da656c397f26a9f81641bcc99a73590
diff --git a/dev-python/podcastparser/metadata.xml b/dev-python/podcastparser/metadata.xml
index 39626a990be5..9330487cd7fb 100644
--- a/dev-python/podcastparser/metadata.xml
+++ b/dev-python/podcastparser/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>sound@gentoo.org</email>
-    <name>Gentoo Sound project</name>
-  </maintainer>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">podcastparser</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/polygon/Manifest b/dev-python/polygon/Manifest
index 4f7e62353b1a..587e67926115 100644
--- a/dev-python/polygon/Manifest
+++ b/dev-python/polygon/Manifest
@@ -1,3 +1,3 @@
 DIST Polygon3-3.0.7.zip 76193 BLAKE2B 57ef62b6652400be057e8596f705e2112caef09208aafa7e46686f86367181dc078cbfc6ade99af22cce7fc0a76ec1de2995885ba4c11263444ca315029c38d7 SHA512 e30cd8e51ad69a2d76b61a7d92ead4ac352e729093546b965f649866fd9c6a860e3cdcd9fcd7f8cc9f8d7735ccd1128fb5af00b3de89e4efd7128e446a70b33b
 EBUILD polygon-3.0.7.ebuild 960 BLAKE2B 20dfbd2898c605e5f3da14eca64d38a3d803d6661547937bda1d417fec312680c96be1e72719c2260002d06dc4467f376bea03175cedffdbaa1f45fca72e3d2f SHA512 3295f0d55ab38f790a1f2088eab9002a3d5694002598c5ea200f88bf2d709657f7f15c9fba958e621a532eb4abd7623b313ec951c5f4a9f2ce8a61eff15d8aea
-MISC metadata.xml 498 BLAKE2B 37a852bfcd8d3b2cb147e45532ff82192c14c415a4cc86671e1ce1b26dd1154778e907421ab7bcd61d602cfd8864dad6bed1ade6e07f4f9257bea072f7623d1c SHA512 f720cc8215dab75ac6246e86d3ee3fe6a07676078a25848924fc0ced02826bb8b2122417d5b27549f9557b486a4e71baff27bc7d54d7f8d15d7a21b4caa0de52
+MISC metadata.xml 568 BLAKE2B e3bdc0a656df511c6ce8de4c7bde5c5acbde8dd6f1b453dc517ffd89a2116c437a9533e1cbe6ece06be7f517b729ea27930584265a130f108c9d16db3bd397e4 SHA512 5724f779e98b0e0d0dd12bc68d697f003f281e4fb2af68c9e7ef4182cd4654a7e2a00435ab5246d2f696dbb6ec673ed5dcdc9bd771d3bde5aa7f63ecd5c1172e
diff --git a/dev-python/polygon/metadata.xml b/dev-python/polygon/metadata.xml
index 9bc334c95381..d7d0469c0a7a 100644
--- a/dev-python/polygon/metadata.xml
+++ b/dev-python/polygon/metadata.xml
@@ -10,4 +10,7 @@
 		Python bindings for gpc, the General Polygon Clipping Library by
 		Alan Murta and some extensions written in C and pure Python.
 	</longdescription>
+	<upstream>
+		<remote-id type="pypi">Polygon</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pony/Manifest b/dev-python/pony/Manifest
index c80ee262f24b..bbc8aef2d698 100644
--- a/dev-python/pony/Manifest
+++ b/dev-python/pony/Manifest
@@ -2,4 +2,4 @@ DIST pony-0.7.13.gh.tar.gz 302541 BLAKE2B a1e6f82c6eb72f8626238cbfcc0bc01d1ad349
 DIST pony-0.7.14.gh.tar.gz 305795 BLAKE2B a0e056d722a205a00567a230628be6ef8a7fe86f594f91ec0e8bbfc6d6eec17ec1d4cf3f57ad10984b8beb0a90da3010d9a32f2f08dca434af39e20fc6e9126c SHA512 ed27fd697dd14948c282dab6b75e41c9309d0ef4c4cccb0f91e4214e81de52a2de3910e413dfc5495ffcea190a5b50255c45b2beecead84eecb601ba2463d998
 EBUILD pony-0.7.13.ebuild 547 BLAKE2B daea6fbb688148b05319f2aba406eb338a6d39bf0869e593f0e9439c2dc333d745e6baa17d116f9fd3f709f451366bfbf70d1ae487ae5ba0a73818e4ea316521 SHA512 7ab067e1f9e62e2fd609432182e96085be1b43364aca23812bb123a6eb8721a9590bced454af275383a7538cbcd5ea9ed964fa50b7cdc0a1b84779b4cb3ee674
 EBUILD pony-0.7.14.ebuild 549 BLAKE2B 3089cd60d0f92e766efebe5030d88f677b9736a38d8bc765661aab9edaf3547dba86595d8ad9a70d0b831c8f135779740073e3d8c1e83a142304c8ad5f478463 SHA512 c471f91dbc141c2799686e27aaf5ab911bffb7cc872a634e7702c9f219b64eccfbb5c90c3a63632b6e4ae2902e54dc62cd5ed4984e909b4a48224a599e147aea
-MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
+MISC metadata.xml 285 BLAKE2B 0c628280b0ed027668938ee25410ab3dac1258a6e482cff1d4dd8635e18dd54c7a0169f4ba409d84bd510f018de46062ff95c5d49dded76c25c83aaaa138ec7d SHA512 64c8e5a891be1b78655d1fe66235450cfd7c46a68f59db885fe53714de45696c257639148ec9f0062d2fb0e98977a9367399cdf9292d9e5629dc33f51021a9ae
diff --git a/dev-python/pony/metadata.xml b/dev-python/pony/metadata.xml
index 266e3f19ca59..08494c170d29 100644
--- a/dev-python/pony/metadata.xml
+++ b/dev-python/pony/metadata.xml
@@ -4,4 +4,7 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pony</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/process-tests/Manifest b/dev-python/process-tests/Manifest
index feb19c544872..9aeb85fb2079 100644
--- a/dev-python/process-tests/Manifest
+++ b/dev-python/process-tests/Manifest
@@ -1,3 +1,3 @@
 DIST process-tests-2.1.1.tar.gz 11522 BLAKE2B 6f6b97da73f1e4f449c3c7f85a6d860611de57e78cb57c352ea4563be07d7866a5c44107fae0ecfaad24b262c933806b59c2c9218be959b2576fc0d8250da4b9 SHA512 4bb520074a9964d3eed4aca7a1952bf1a0d99b475f3f61b5c51137d8f2e804352639187da5b5ff30ea8739466200eb9361e77dc3c43a20d5ea418f63a2765a1c
 EBUILD process-tests-2.1.1.ebuild 646 BLAKE2B fb32427bb1f53b8e48dd47c4f9e0a6c04a6df80a85ed64bd8df380e6931a32e1124d77331c0803feedd88d551e6297bca1eed3dbe08cf1133a62e9aac853cf8f SHA512 be6d91e83d86a15e7564f9eb35deb66e59d1b815a9e5a2f58096f52e1559f1335a8438f5b85605d71c3b68547a3c467f2ee97b9d154bfc8dccd183b92f2b1418
-MISC metadata.xml 264 BLAKE2B f956660bd90e0c6757ce9a7284329bd8f9d14053624a6ac4a017e5a1ffba57ee084542dbc9ac887756dd64930cdb00e33dd56361404bbbd2d2d27213f84da4c5 SHA512 4d8147ee0077ed9f48ca883928f98dd317506bc25a1ba5c96fcd32870dcefae56ff47560cb99eb23a5339f893d19fa4529cc432afb7999dfa04c727cc6989eaf
+MISC metadata.xml 408 BLAKE2B 9b3db07555d5a2939176e7a6628c57510dd02652862027662b225d36c1315d53d3fdcaee98e35cb3b2ea57b759d71a5a63856aab57edd20f9a1cc698c56d9350 SHA512 94e3ab549a93bd8fbb5383300110603d4618da0024bd4b227370e4ffa3af791c632d8fd143ca5599c40fec8c46fe92d85c54968070260f59894ec04afcd776b9
diff --git a/dev-python/process-tests/metadata.xml b/dev-python/process-tests/metadata.xml
index 4c43a15ce6f4..8ed34db5de4e 100644
--- a/dev-python/process-tests/metadata.xml
+++ b/dev-python/process-tests/metadata.xml
@@ -6,4 +6,8 @@
 		<name>Python</name>
 	</maintainer>
 	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">process-tests</remote-id>
+		<remote-id type="github">ionelmc/python-process-tests</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/progressbar2/Manifest b/dev-python/progressbar2/Manifest
index 9182a68eb3fb..6e801173826b 100644
--- a/dev-python/progressbar2/Manifest
+++ b/dev-python/progressbar2/Manifest
@@ -1,3 +1,5 @@
 DIST progressbar2-3.39.3.tar.gz 131839 BLAKE2B 2cbf1ecf04947b3a393b5cc473a696528cdaf38f132a1b0faab5e45dff76aecdee497ca1b2810b9ec5e3b180acfa8e2af1d195e5804c058a7d8880fc3b0a330f SHA512 b8944b319f1133fe7abdd256bed8803e9f426208af5ddc58935121845e81b9f65878e536bd5a1e4810eaa6906b24d114e8681dddf1f77c1bf96cb231f6473a5e
+DIST progressbar2-3.53.1.tar.gz 44741 BLAKE2B 80f406adf42c5c57ecad87002426115e1254339d5cd310dd42f560f48a1123702dffbba8f26114a01f2bd5be75a29cb12cc1c091d5554509b6282ceb2b66fb76 SHA512 4817bbb45d0f51ee2b3feceec56b3177ed5d0561894a13eea53a30e8b9aad5805483b5b669af93f3fd0cc958984b8a5c2a14ba3591e0a85be12180d057bc2f81
 EBUILD progressbar2-3.39.3.ebuild 545 BLAKE2B 9fadb7be761358bd618b86efa15e3c86291570825ce82ba78ccc8c997035a3000a06b0a9df991fe5bd1902e6962362fda2797a342d9f7901829d9e57e2d84108 SHA512 8e3d076935d3036886d975032076230cca5119123f50133fddb628d2537c54e349361e90e6f29d14a07d16e7db2b207a81b1f0112b9cfcd1b16b9229042e1e7f
-MISC metadata.xml 321 BLAKE2B 91ed0719ef7b045724e73976e54e9e99d289ff410fb04207bd51ab9e570b5a03f799487183eb8180813e370d7dd34e779db641e7d228674e32fa14f89046b744 SHA512 51998db2ca2a1835c61326b8f7cd3c491238ccf8853b636d6fb768243785f74f74496092f3e076c485293363da6cc317110d754dec17dd8973dd89a4f57e556b
+EBUILD progressbar2-3.53.1.ebuild 767 BLAKE2B f84800023efe2c9283fd6e760c23eff303151dbf0c1ef9b22bee3411b671c1bf137171ad4efcde02b0ced63077096b161f87c498b7602461caca3293c26a960b SHA512 373dc5e7be262c9fec185b6860178fe7c68dcbe6ee86908780485eb533813bbe496c2a2c4179800850854cef2feee5c9eb5738ce0800798de37cae1170c2923a
+MISC metadata.xml 344 BLAKE2B 812c8fe2236cd0dfaa9ee6772f3753cef9ce3d58c29f1da23f31cb7d0a76db44b3b3369626940f09120e7ac491cf74b4cb31aab16c62d8ec66b4c9c4f493b18b SHA512 5b326b7408019457ec81d540c94bf092358c81ff873a9eac6fb60cc9bc624d2bb194d1d432c53e75673bd52e15fc4bd96a4d881e56c800d111e5faa6dcb9520d
diff --git a/dev-python/progressbar2/metadata.xml b/dev-python/progressbar2/metadata.xml
index f2912434ed1b..829f6e9c6205 100644
--- a/dev-python/progressbar2/metadata.xml
+++ b/dev-python/progressbar2/metadata.xml
@@ -5,7 +5,7 @@
 		<email>chainsaw@gentoo.org</email>
 		<name>Tony Vroon</name>
 	</maintainer>
-
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">progressbar2</remote-id>
 	</upstream>
diff --git a/dev-python/progressbar2/progressbar2-3.53.1.ebuild b/dev-python/progressbar2/progressbar2-3.53.1.ebuild
new file mode 100644
index 000000000000..fc89dd3b9547
--- /dev/null
+++ b/dev-python/progressbar2/progressbar2-3.53.1.ebuild
@@ -0,0 +1,33 @@
+# 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="Text progressbar library for python"
+HOMEPAGE="https://pypi.org/project/progressbar2/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+CDEPEND="!dev-python/progressbar[${PYTHON_USEDEP}]
+	dev-python/python-utils[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}"
+BDEPEND="${CDEPEND}
+	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/cov/d' pytest.ini || die
+	default
+}
+
+python_test() {
+	cd tests || die
+	PYTHONDONTWRITEBYTECODE=1 pytest -vv || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/prometheus_client/Manifest b/dev-python/prometheus_client/Manifest
index bb17640afedd..142116b399c0 100644
--- a/dev-python/prometheus_client/Manifest
+++ b/dev-python/prometheus_client/Manifest
@@ -1,5 +1,5 @@
 DIST prometheus_client-0.8.0.tar.gz 67749 BLAKE2B 570c95de0d4e9e8bd625d55eb3dd450cf933ab7c8b6af74ff56414045f4d845c4a74f60d60e8b29f868801de12ebe2d39b5ac11701071c4998aec66719581b3f SHA512 a9d49bc4dac77168f94edf51344042bc5210b07ed01031dc50e323f86ea8292df7370956a4fbd9d9f85a0857a8ec9abaef30c0c2cd4dc5502df7264816eecc8f
 DIST prometheus_client-0.9.0.tar.gz 68176 BLAKE2B e20f599e6a4d39226e48cafeca879b87389fdb5a6eda401161ce448cb0b46a89ce0cccc1b78e2fc8cb60cc461253345b9ba52809c861f0a187171c33095f625a SHA512 1d68ca35169972c50bb56ede88c47408ee27b3e795fcf03798313aed2dbc5db5532fe6886998c118258b76e431c6e49aa0ac19b9206cad63711901497258aaa5
 EBUILD prometheus_client-0.8.0.ebuild 597 BLAKE2B 5ccbb036c4946393245e4efdd4e872c96425bb9d6e6ee45bc000bb7a4ad1a8bc3bd2af2e2e4f31385f9ff7f8511beaccbac06142ba7b911fadf6eb9215136086 SHA512 ba372c21521071a7d45fd71e1e1b24268a68e95250a83bd02e22ab08600623696393a0f68ed415c853a0d17952bb08c0d229a214ff92442c687d8b58e36f0656
-EBUILD prometheus_client-0.9.0.ebuild 599 BLAKE2B f5a6f288ec77ead44ff5943e439ea33e7b680a4b255ed9c9637b8c00ca367bae521dd8ef292c3d33bf05bc39fe1f1352f36ac9f3d75a64a5051cf14e5173d8aa SHA512 9e431d87b41a9866a9be4a54b0def909cf71542ec9d197fae8340efe2cfde82e343361a17794ec984eaa254a9f3e2ad456be0f5e7d88db8624ec507db40fdd6e
-MISC metadata.xml 339 BLAKE2B 19175465b43ef0c7b56a6241f5e857392bbffcdd12de70833ca0c7c0fb2815dfdf529553721cab2afda053a63caad1621c06508dd1f776511adf5be84cfd010a SHA512 887ce6ef1c7181d5c87e69085c6d58c324260aa7dede8259115131b367b2d60219537fe8b3366ce10ec8904c15fb36626e34e28e6dde2db120c8e20f80fc9d74
+EBUILD prometheus_client-0.9.0.ebuild 600 BLAKE2B baa3307aa9d5068028ee3ddac86c4c2c647498747973460bae5a22a7026ac9938c7d6caa3f566cca10f6d35bc7cb872bedec9a3a61cd50b64adaea06c1a5145e SHA512 3e15d2aff45803bc87207bda831ba751f140daae538bfd962c974e779abc01143e76e247e0e8d94e8ddebf8dfc9a3fa3b30746bc5af0de61785f18ee2a05dfab
+MISC metadata.xml 384 BLAKE2B 22013c3c22bf39fabc380ac09195f871c9fb4a91ff52f8b1ed5ff842a02c17fb0d6564790b539dc472577377198bf2709f6ab0b1e6cb42de985bb0d54887141e SHA512 769b34f552e8b01279ac612ba6716ff6f3824e51969a477a8366305bfc3d94066841255cd262914445366c12553d66fd1396ed714654717216eb01a15e3732ed
diff --git a/dev-python/prometheus_client/metadata.xml b/dev-python/prometheus_client/metadata.xml
index fda0ec1e5910..61e60a89a845 100644
--- a/dev-python/prometheus_client/metadata.xml
+++ b/dev-python/prometheus_client/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">prometheus/client_python</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">prometheus/client_python</remote-id>
+		<remote-id type="pypi">prometheus-client</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/prometheus_client/prometheus_client-0.9.0.ebuild b/dev-python/prometheus_client/prometheus_client-0.9.0.ebuild
index 173bdca64c55..bc359363a551 100644
--- a/dev-python/prometheus_client/prometheus_client-0.9.0.ebuild
+++ b/dev-python/prometheus_client/prometheus_client-0.9.0.ebuild
@@ -7,8 +7,8 @@ PYTHON_COMPAT=( python3_{6..9} )
 inherit distutils-r1
 
 DESCRIPTION="Python client for the Prometheus monitoring system"
-HOMEPAGE="https://pypi.org/project/prometheus_client/
-	https://github.com/prometheus/client_python"
+HOMEPAGE="https://pypi.org/project/prometheus-client/
+	https://github.com/prometheus/client_python/"
 SRC_URI="https://github.com/prometheus/client_python/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/client_python-${PV}"
 
diff --git a/dev-python/psutil/Manifest b/dev-python/psutil/Manifest
index 17cec4fabcc4..078f4bd14cb8 100644
--- a/dev-python/psutil/Manifest
+++ b/dev-python/psutil/Manifest
@@ -5,5 +5,5 @@ DIST psutil-5.7.2.tar.gz 460198 BLAKE2B 203445423ce5e0ef35bbee00a7160a282401108c
 DIST psutil-5.7.3.tar.gz 465556 BLAKE2B 6a9f31fcba571f381c1f4c904a9ff65659d13ed64e91df478aa7df4dabb87a35c4fbd9c0491a3d10b9eaf0fdcc8f2407fcf7144e729043eda605dfe6e6f93844 SHA512 8fcff56dd4e4c1b877c09023721e6f562424f7f84ae5304d518976a1e7f21dd026772f1abfc063bdd0857a375bc869f42febde090dc0b65918d1ebf44e3ad71d
 EBUILD psutil-5.7.0-r1.ebuild 1152 BLAKE2B 323f280e6860ac70a1f026eed3d514f3fc179f9eaa17a69bf229eae00dcc69b157a89b719e3a9e8d73ed753742dfd88f371d026e7d4699eac9c6027b9f779c9d SHA512 a25c28addef5ef2a22931913fbeebfff52ef2d1ac55c30b5483a8c507332c962f35abc683290efe22f23451d22b62b7e5c42a585866d42d3e0d36ad18cceaeb8
 EBUILD psutil-5.7.2-r1.ebuild 1166 BLAKE2B cf1f1e128ca05c7aef5e7e5ac71f13131cddedd966ec6a7b148c0318dc8a50e6e5dd134f7cc825e238e1a0cb28d0b5eae9c6143b3e0188d8ae6fcfb24a413cf0 SHA512 f24ed5db1f7a5b064ceb372db3ff2a9ef823bd14118f4d78dfd35ba42556f64d6b708b23dd5ce359918fd7876381582b67afcc07282201ea5d5acad4bf97e6a4
-EBUILD psutil-5.7.3.ebuild 1164 BLAKE2B 39c368194e8d19b83ebe964acd0f0cb079818be67252d0f301d4662af19fb75542bb500f72800ff34f7f229b8b245b508a660abc1da332f67eb5a5b3f8fffcd5 SHA512 1f43d6f8779fcd0bd5a72f5fa085761c66d7868c6e39ef77e98af3d7c571fbc68d8d94737c16fe11dc24d24f40793a21de4f5ff20dbac90b9448294c7e2c105d
+EBUILD psutil-5.7.3.ebuild 1163 BLAKE2B 87b1e28328043ac061badd18effa9065c2cf0dadd4bb0df2b32fe0275fe035a35cb25ae4ce2b117478951cbe695968baf2b728b7a21f3e8ca40a9396c77beb1b SHA512 229ff532170979280ae5c3382ed33ed0cc340a0bf4b72cb1d06f6c972dabb5b075025bce921de404cf20a80bda4f55ce6a84f8a094fc4a3cfc4035dfaf3701a1
 MISC metadata.xml 377 BLAKE2B 0e671ef95025f24d295ceb5c5295544f4d68bf94459537537e229efd273bbac058b385fa94f1fa1191f23785d2572a5960d84a1d3ece41f10316b38101cb26d0 SHA512 a28e7a1e32a0b2750a4f0956d2252c73d20b4aa9817aac2e776365febd7d03de88e88508aabdfc29ae15d8bf7ebf1ed662c000e2ca8c79e3d50a3362ce1c2d2d
diff --git a/dev-python/psutil/psutil-5.7.3.ebuild b/dev-python/psutil/psutil-5.7.3.ebuild
index c6e735c5f828..2e7ad9a12ef5 100644
--- a/dev-python/psutil/psutil-5.7.3.ebuild
+++ b/dev-python/psutil/psutil-5.7.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
index 397971b641ac..8e5b94899dc0 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -2,5 +2,5 @@ AUX psycopg-2.8.3-avoid-mxdatetime.patch 954 BLAKE2B 073eca8e49dd4d7fd2ec920dfe5
 DIST psycopg2-2.8.5.tar.gz 380874 BLAKE2B 843321175499bf00b080d3e58ce0d586e674585af4be5a08866b5dbb68256ff9232d3c25e2603a3a0920a6c91927eb9fbb5942acd429be5dab9177c65da0c32e SHA512 d4cf9b94573b90fe56555ea5cf841aa0c4c806770f92f35a7ef2531999bb50f98eb1276e56f1540b5f2695e443bac7e9cb8bbfbd24ed82164f99663259d2da3e
 DIST psycopg2-2.8.6.tar.gz 383797 BLAKE2B da0e3f1e143c51c940ba1f51d3e457b492d880ab71267dacd4747444bc767711ccd6c2f54d9e10ce5ad8fae0c3206fb4b6199f267e9bbaf12eb654227f59c2b0 SHA512 1e1d5d8755c6d1a153d84210bf29902afafe853659d709e13abc6bc5772def13779d2394690af1c544384c9c607edc0fe5cf2763244fb346febf9a9e0032b45f
 EBUILD psycopg-2.8.5-r1.ebuild 1514 BLAKE2B 08f45229d2bf8d868ad9c16de2e33c070e17a53e6ea9f8804973935a8f76c81cae103368e9cf9da2456764ec3a54e71cab2c1a95c984f1499344d03d958bb470 SHA512 0d150dbf7d2fc85af31323f18f96710a8538b8030936aae379b4d95094c7e41e2a13a1d99f5de07a695468e7fa172cf3f340c1d44e86e63cd4a3753b433399b9
-EBUILD psycopg-2.8.6-r1.ebuild 1617 BLAKE2B 75de42f5d23c080577379c7dc1df6f81dac4c8525dd79376c3433eaa3ff174322af601fb5981a143442b7c919438e83bcc65539c7797fe0f28aa353487470e1d SHA512 706724d2dcbae4c6d491abf175b8fd58fe21f462caf047d0b6e1709f3bb1c094e726902a40ff4fd197bdde8f55807c4aa951ba85a2a066d0c7b0ebc19089e3e3
+EBUILD psycopg-2.8.6-r1.ebuild 1613 BLAKE2B 2927f71ac16c75981383f9991d8cff3ed60d2c842bc69f25d18f4c07b21cf52bf31016849d3935546f28741459bd8e48b7d3e8509695f6140ed2f2543c6a441b SHA512 c097c2a05ca0926628df5d2255818a4d8c0eb440a65da3a8fa3f947363a76f2ca139e6918d81d283c18de8f607716805f4df900635132fa0bdca924437523996
 MISC metadata.xml 321 BLAKE2B aff48bec04e34b92668aa18214d86ddbedef2376eeced4815118d35eebfb8e6af87234a9470828f465626f7d9ed56fe0fcb8f078c23945371248136533651ad3 SHA512 358b751b3a65f64ab5468bcf4022315f7069a2fb60709c2bb12ac02577866a3ff24ab2dd69577052070cf010a51428cb3ec385ca7cfe48640f4dd25ae478a966
diff --git a/dev-python/psycopg/psycopg-2.8.6-r1.ebuild b/dev-python/psycopg/psycopg-2.8.6-r1.ebuild
index e86f0dfe4ff5..38933e37a6aa 100644
--- a/dev-python/psycopg/psycopg-2.8.6-r1.ebuild
+++ b/dev-python/psycopg/psycopg-2.8.6-r1.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="LGPL-3+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="debug test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/publicsuffix/Manifest b/dev-python/publicsuffix/Manifest
index b07e8532da51..6dc771beda4c 100644
--- a/dev-python/publicsuffix/Manifest
+++ b/dev-python/publicsuffix/Manifest
@@ -1,3 +1,3 @@
 DIST publicsuffix2-2.20191221.tar.gz 99592 BLAKE2B 3e96f2b1d23a70827758eb4440892719deabdb9a67a2144fefd2d4b23e26dec0d19f6d9fd4de504d5d52c0250719ef85e929b4a2b92b7ba8896ed4055480d0d8 SHA512 d863f0937b340958ef7c8bd07d62054aead993ba31b0c2753631f2e75e48f7cea412c6501d8a94d98bf6a97a13eb0716c24a89e336787d5570e9af0386c58320
 EBUILD publicsuffix-2.20191221.ebuild 583 BLAKE2B 81e85ad4edcb595996c7ec8a7aefd611c881bc8f2314f3667361d00c5d4c1869a84b0b24301738dbd1a2950e1dfa85adf4babcb2a4544958aac8147a9b431a5b SHA512 cd988cba733643b8a54ba01b9c2bf9c45fdd9d33bdf4901f98d2dd6118f7af23bb86917d9a97b8442713f0f6eec130555b665c2e48abe9c34fe9d0b517fed5ab
-MISC metadata.xml 508 BLAKE2B 8f17e4b57f751f1ba01c6f757f99a1679938ab371cb5cefee282674deff14ad686a474f2ed2233ca311fc37916d25ae69803668af807ec27fb0fde4791904633 SHA512 04a41bbaed88b09779131328708b70f59a575449b4307d8cc449b1f365e4c12e5edd7cf93927613b0616b0ec90b6539dc4cedcdb46701d74c580350c3926d18e
+MISC metadata.xml 583 BLAKE2B 3519893d41ad0f0d9c52f9ec48cf1e7e03e6975dd941e8f1e6c17c55383c42dafda8653c53879d006295996c6cd9fc9b2147c7e2273b52e851bf60e6cccb7e59 SHA512 0947e97be911b2dc15a80d09b950a77057430e5041d7489d80bf4e02fed669abd23ad8b0a3eef18d3ec844473f22e67a6e4d5f5d496e61605334748d175cc48b
diff --git a/dev-python/publicsuffix/metadata.xml b/dev-python/publicsuffix/metadata.xml
index 1de14ee2fdcd..c604e58d98ff 100644
--- a/dev-python/publicsuffix/metadata.xml
+++ b/dev-python/publicsuffix/metadata.xml
@@ -11,4 +11,7 @@
 	<longdescription lang="en">
 			This module allows you to get the public suffix of a domain name using the Public Suffix List from http://publicsuffix.org
 	</longdescription>
+	<upstream>
+		<remote-id type="pypi">publicsuffix</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pure-sasl/Manifest b/dev-python/pure-sasl/Manifest
index e2ea0dd45d06..c9cae016c42b 100644
--- a/dev-python/pure-sasl/Manifest
+++ b/dev-python/pure-sasl/Manifest
@@ -1,3 +1,3 @@
 DIST pure-sasl-0.6.1.tar.gz 11553 BLAKE2B 17a3728e23b04cfcebd967ec4e40ab40ae72ebd18325579dfac52dbeac58ebee6e467f32a8030214cd976b2ae96e446afbc853c3e4233a61fa149d2910b1ecfc SHA512 f0e34fba460b03fb2348871859f79a21ac27df4be8b125a1652891efacd428a560673f42dff0993e87a3d80439f182e3a6e07b7c968cbfa3c86311c1592822a2
 EBUILD pure-sasl-0.6.1.ebuild 659 BLAKE2B fc7063d1fa80b97a82db0f2ccf49a8a5598be817fcf6a28d20947fdf22efd09bf8b30d1ea870c87d40f3bcbc6ede6a3674122e07483a7b1b64c45e9a01ee9462 SHA512 fefc7a6210f5057f78a02fcc91ade4fd9a151b536e162bfa3d16c647e65ea489b3fdeabec1b841147e91bf06aaaedf5d4e75e706ab418ea71b490d0bf8c6a91d
-MISC metadata.xml 222 BLAKE2B 627c0e9a843219968eef5f67d4a3656240cc8795a1fe885983efab35f57ec02cff5f28533c665c77e1391de3c7d2e1d7025aff9f82213e38f4c5c0e6b504c11c SHA512 b9b20f913c2b6bc8ec843d5d46a97ca2d847ccadd4dcadf7b68a60535e44b721541c72cc74b17c55fe21161a1dcfbc86a3d08e58659a8c431b574729fe87607d
+MISC metadata.xml 290 BLAKE2B 8322f8c63c45531adea5bd73247270fcae565ba12ae0221d2eea4e2ac4583b55d280a9b8b9d4a27fdc87241105e9d445a27af256eb582b66bafda7d3f3715978 SHA512 79dcc8edca6d81bd09ead2069b1cee3798544aa6517e433c811a794a058a101c858968999d5083a9b93ae1471e9d288e35f6d0e6f98a376e75088b87dccdf844
diff --git a/dev-python/pure-sasl/metadata.xml b/dev-python/pure-sasl/metadata.xml
index 3743220e59f3..c36b85044fde 100644
--- a/dev-python/pure-sasl/metadata.xml
+++ b/dev-python/pure-sasl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-  </maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pure-sasl</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pweave/Manifest b/dev-python/pweave/Manifest
index a7879df3988b..a3f6e158fd51 100644
--- a/dev-python/pweave/Manifest
+++ b/dev-python/pweave/Manifest
@@ -1,5 +1,5 @@
 AUX pweave-0.30.3-docs.patch 384 BLAKE2B f965c866a87e4ba7084767e73113d119ca6c1c7ce5d184d843f84cdf9f3237038a2192aa41b834d9b39f584ee5294d802857d1fb0f2d457721b2b82376b00215 SHA512 7a4396e2383c630e1bd8cab770952e8898be157b80dab23ce0f7cabcc1ecda4bed9a9cb4ad46d48e521b05de7de324106128d281ef88e06735425cc430f43717
 AUX pweave-0.30.3-rm-online-tests.patch 3991 BLAKE2B ea2462239edd8cf029a308a0fb3d3464a3932d6f714e7d6501730e62deb6b417482c5dc67a023c467d3efc1456674f0d31fa96f585ba9d81943e4c9dcf0aa875 SHA512 74f496bd263d87b9f63293be843eac78c40c6f66de5b493afe8aca893441e43bf02b157130b8252f893a928c8a03ac6b7594ae2876b4af1c1a2745e0aaf8d3ba
 DIST pweave-0.30.3.tar.gz 2173323 BLAKE2B 13aaa70d424026e58648ee949d8046d1f9fdf6e402df018b120dbb235c7b7a29846cb341aba1642c97be5a8ebafeea33a71be177f92498db186e8044624eebb8 SHA512 d2ffc2a6921837eff471041cc13789ac370d9e00c8a66f451ae53859c110c838e360b4bfd820aa33656fdf509cda8dc24a1d2c1bfcb44ae99de751726c33b3ae
-EBUILD pweave-0.30.3-r1.ebuild 1370 BLAKE2B a4545a0237477885cd40ff819d7b35106dcc46dff632e8a86d13f3bb96a6a83153d240873820b58f25eb46e42738ba090c275306fdc0b637e87c97b0f4570ae2 SHA512 dbee16fcd08fc523e6a92d600c3c0766bb40e331dff51f717c959ed39cc9100cc47d17bbacf84fc9f36a9418f0f1da58fdab81d1dfa4aad4f7c767dcb6d9e169
-MISC metadata.xml 375 BLAKE2B d5aff616cc3473bac743c6d809eba454c54e2fc1514a115be5ae1ca11be7de212fe72f2ffeb520db05a11837d8ff93daa1128cdef7867244b9f829d8e52e6214 SHA512 c00656e8233157fbe266e364bc10a6b351063221b27a73d43add57a50d00beb2e540b491ea671fcc4b7acafd97c4a5e56c73a9937aab64ee2d79d553fd0658ee
+EBUILD pweave-0.30.3-r1.ebuild 1371 BLAKE2B 1f77826512802801e4f18786f7a140ccda82cac14c0644798602d3964c1d47067338d4cfed9d2b54e1771517f78868e780fb3060d5788cc6453a28ac9e9ed978 SHA512 79973c9b0e624f3cd60da235de74c6966c665788f10f46e19a5e8f50204357dbe28dcc060cd9251fe9ecf86fd6e819a0c193b0c90c87b102a7a35a29271e94b3
+MISC metadata.xml 444 BLAKE2B 13ea45e583127a391582adeb305b4bfebe98f667792d77e2379df73241706ba2afacae1aef74db86e97d344c2dab0342c2aa8220eab4d6bdb309a9fd422835d7 SHA512 0275d849386ff44431d6f35279f33a5c971503949535e72bfba94aba6cb5bc1a38369cf2805bcd2b153af52751e1cb0229fbea7abdee1f79330cff197ce5a01c
diff --git a/dev-python/pweave/metadata.xml b/dev-python/pweave/metadata.xml
index 8fc11184ab00..4e2e050964db 100644
--- a/dev-python/pweave/metadata.xml
+++ b/dev-python/pweave/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
@@ -9,4 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">Pweave</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pweave/pweave-0.30.3-r1.ebuild b/dev-python/pweave/pweave-0.30.3-r1.ebuild
index 90ab32fb6192..03a16a520ecf 100644
--- a/dev-python/pweave/pweave-0.30.3-r1.ebuild
+++ b/dev-python/pweave/pweave-0.30.3-r1.ebuild
@@ -13,7 +13,7 @@ MY_PN="Pweave"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Scientific report generator and literate programming tool"
-HOMEPAGE="http://mpastell.com/pweave
+HOMEPAGE="http://mpastell.com/pweave/
 		https://github.com/mpastell/Pweave"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-python/py-amqp/Manifest b/dev-python/py-amqp/Manifest
index d9d6a5389d33..36b1a9b6fb48 100644
--- a/dev-python/py-amqp/Manifest
+++ b/dev-python/py-amqp/Manifest
@@ -1,5 +1,3 @@
-DIST amqp-2.5.2.tar.gz 117788 BLAKE2B 6a6990aca0a43a0c546198b999d0d3680d6c44908e144f81bd8266abac4d2d9b7ea4c65bbf969310f1236970ebe0ef5ed44cc558109ba1f680348e3ba2789e83 SHA512 c540ce39c06bb947e55b4afc56567d5fc5a82b65a2f7e2cc1f769f96da74f788d14e1e9c02852a259a4980c36a4524f07166686c0357f96219fd9f8612a6159a
 DIST amqp-2.6.1.tar.gz 119956 BLAKE2B a575637ca3d39ef8577035ae156f09b87dfb053757cb78b058fcb4f23759707084297e12941c766783e99898c486ea8eca968842464223ea46f42a4e4495c0a4 SHA512 e2c628cfe8075a3014a9fe991ae3e6f49198db2ecd46dd48f980730da692e4d25d9f055b1ccd4743917fc38a8afa69a5902a64275f8f45ef68113c6756f3a17b
-EBUILD py-amqp-2.5.2.ebuild 1473 BLAKE2B 72e985ed942780de340e8e89367411a7df62ffbd1ea7e058304a24814b4f854f2f4f6302642ba84cf688310be29c3c43a48a613e3a1d510ed577dba87a270128 SHA512 3d639b81f1f0d59a1e43853f4878e495e6269e5a826e69c00963bb4aca0f80c2e2dde559de0d83c1d9fe6b13cde0b0b7ff061cf67bf46cfc49a0132bc86d19f4
-EBUILD py-amqp-2.6.1.ebuild 1513 BLAKE2B 16dc72c5dbb4e5831eb7b8fae890ce2a0442fe9f174715300a1127658bec7ac5517854a9511ba4d4263597c44d6f701b7490f18b597ffdb7d9f96a05c3d996e5 SHA512 b059dbbc6903328536d07c2ee12506b24b2e2ee598b9d791c04a4cb6c7950d77ca850e10e8726d284871b4db77afbd4abc2ddf5fc7b1a85a5a098a3dff3fd5fd
+EBUILD py-amqp-2.6.1.ebuild 1511 BLAKE2B 1703fbf5771a262eb1d3c5cc4a918515fd4cbac511804669bf4debe5bc89ff7ed744dfb5f422f59fb6ea6358e719786dbdb7d76e22bd7877f4b936f5b7088b80 SHA512 9c44523c7d6e49a60677973422272fc2e6e224ad062ae073911d84de47df786f8a0b77df5ccdc9920bc41d2bc8c4d2cacfeb7eff91249aa1f8be07ff10666070
 MISC metadata.xml 504 BLAKE2B 4b09bbbde836a690c540191860b0251f329f39f9650df8c0246dcabec3c2444f8f0734a6acd4bbbd17e3f276d6bcba195326a07f19b4a43451257d526dd9796b SHA512 069eec0fc089186f692bd331463d8f6e452545cd0bf8f48e1fba4169c49674b3187a02e0ae25689f2033a65365fa7d3086d23affdb1875cf320a5cd36d9954e9
diff --git a/dev-python/py-amqp/py-amqp-2.5.2.ebuild b/dev-python/py-amqp/py-amqp-2.5.2.ebuild
deleted file mode 100644
index 22fd77713035..000000000000
--- a/dev-python/py-amqp/py-amqp-2.5.2.ebuild
+++ /dev/null
@@ -1,66 +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} )
-
-inherit distutils-r1
-
-MY_PN="amqp"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Low-level AMQP client for Python (fork of amqplib)"
-HOMEPAGE="https://github.com/celery/py-amqp https://pypi.org/project/amqp/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc extras test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/vine-1.1.3[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_celery[${PYTHON_USEDEP}]
-	)
-	test? (
-		>=dev-python/case-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.0[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		>=dev-python/pytest-rerunfailures-6.0[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	# pytest-sugar is not packaged
-	sed -e '/pytest-sugar/d' -i requirements/test.txt || die
-
-	# requires a rabbitmq instance
-	rm t/integration/test_rmq.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	if use extras; then
-		insinto /usr/share/${PF}/extras
-		doins -r extra
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/py-amqp/py-amqp-2.6.1.ebuild b/dev-python/py-amqp/py-amqp-2.6.1.ebuild
index 29b61f57bf43..1a2d585c4bac 100644
--- a/dev-python/py-amqp/py-amqp-2.6.1.ebuild
+++ b/dev-python/py-amqp/py-amqp-2.6.1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc extras test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/py-gfm/Manifest b/dev-python/py-gfm/Manifest
index 1c8be210fe8e..ab8844dc19fc 100644
--- a/dev-python/py-gfm/Manifest
+++ b/dev-python/py-gfm/Manifest
@@ -1,3 +1,3 @@
 DIST py-gfm-0.1.4.tar.gz 21015 BLAKE2B a3060453ce9b2c0a4c3112f003439527c03b7b0be439b63620575e95265d8a65c1053546f9cacf19b6006ef2cbcfe5d8dae762740ce6e6aa035706a94bc611d1 SHA512 4730035b8a6168b6d2987a4a5f9a0ca70564e6797b7c88ec43f04152fa77c5a396f204b6143fc0bb3a53ab364b6d11b2274663b8b64d4640afba2a21cd1e3c6a
 EBUILD py-gfm-0.1.4.ebuild 528 BLAKE2B 399f1fe2690b5b2246b51d5f0b6a6e00894d740185465d6a564761838693a3f69eecfb66b0078f2bb1c9ca87c10170646b034e9905d942b5a85ca6e3c685bb73 SHA512 3539ba5c7f4f4e7b7cfda16c7297aa7e098da7c8ab5bf5371a98a783463410efd820d2d407e4bf8384b9ab225bc95ddd054f708105e4d8028cb3a62bbeb38bab
-MISC metadata.xml 311 BLAKE2B 97f71814ab60ebe250eb61ee7697be94ba6effd3dec0328481aa5d5487b805e6945515bc605cbabed215f982d618f991ee07355c0b6d05e57276a1f949e178f3 SHA512 e8b4170b6b16a408b606625e6ab7dd17d0090310e84d1909c0b81d70c9c073cf40d61d56e434a370489cabec0803a22cb70e830ef7649f031fdf0214312627cc
+MISC metadata.xml 363 BLAKE2B 634b6529b6ba61434592403109acebafcd5d82ae5fb7bae4ba5c35ad505b5b3d29b50612989d6d911b17794de36bd18ece1c409a61068efd155a769f94f7e67c SHA512 6c0d395a85e7a91eec9303cef28cc2020284ad508e4b10687d4bd6c1934171881cf0f931c38c03c724d7c50541f108ba75d3b4a4ed6ee1520e847b77e62a8b9f
diff --git a/dev-python/py-gfm/metadata.xml b/dev-python/py-gfm/metadata.xml
index 06b7854e3cea..cab7531a2b41 100644
--- a/dev-python/py-gfm/metadata.xml
+++ b/dev-python/py-gfm/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>python@gentoo.org</email>
-	<name>Python</name>
-</maintainer>
-<upstream>
-	<remote-id type="github">google/py-gfm</remote-id>
-</upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Zopieux/py-gfm</remote-id>
+		<remote-id type="pypi">py-gfm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/py/Manifest b/dev-python/py/Manifest
index e22fd32aae37..5cf440d5d122 100644
--- a/dev-python/py/Manifest
+++ b/dev-python/py/Manifest
@@ -1,5 +1,8 @@
 AUX py-1.5.2-skip-apiwarn-pytest31.patch 517 BLAKE2B a086d8130c1ead322461e7d89249f07e2dd9a6eee4f7e878bd8c01cf19df695a6a5698ec0cc50770f0514cbedbd2aa88e3fc356a72c78eab4b6bc378b5d1f590 SHA512 01da1bb928fe3b22a69a439481a1ebdac790811da781b7ee497ffa1b7362270628527b33f2d5dc0e83ebc2e57cdaf9fbd2974735f580931222f33e543fd69762
 AUX py-1.8.0-pytest-4.patch 20364 BLAKE2B 8fe8f3b659ef6f586d3de299dcc2e986fec0ede3659c19c08f1c273e3204278620770051603e0c7bffbb47a6b9ecb438f5b7744c0c5894512b0f50877188a6e0 SHA512 ade290d37af218077100f03da5c8ce6e77b93e79317405b9e62059a2c97e14e21e56a11dec7d031f6f2deeff05ce0d6c0c3488535a6d117a02cacc1e18da46e3
+AUX py-1.9.0-cve-2020-29651.patch 1113 BLAKE2B 4a7f69b47ccd27036dcab4e9cd856804ca1d03f57d23c88c7c2577b4e0ac1bf98a3670f2e872e519bd25498dc62dcbc41a60567aef5bbbed11b265e6a70be290 SHA512 cbfc1c1e508fd9326534065ea595679b10f298b5f6084d0d19b95e393a5f49ec5c6e58f635b10ca84c2eca027c1b001db7f01e986f9679530041c763d763b47b
+DIST py-1.10.0.tar.gz 206984 BLAKE2B 94abc8f348a0ae1b64a1417fbb5ea1e29929a0a98130a968ed80d92824c242a9614493c8c7f87c3db8294d2baf3bdb35ce0254fe2aac0fb6af2c151b682c5d33 SHA512 7a0eb964067bc01fa4f8ffe70b043abfd4619134fbee2935713e28382085d0b8972c319ed665a643b879b18ce662db8a9bd722937af7cf36c233214eea211dd1
 DIST py-1.9.0.tar.gz 210098 BLAKE2B d7f9b22ebaedd12534198912c1fa0be80f42e97751701442e060e1c244b06ab82239fe78a3cc7119fa4df5d87ecfd97bfb2568744693d3ffe9824ae1d73e59f9 SHA512 965b2adfe1b13177629ccfcdf6d0a13460683ca7a01d585163deb1af15d926fc86680d9e51660f6cbb8569f822a4d54ce281c029e363d244ddf67e33b102ad0a
-EBUILD py-1.9.0-r1.ebuild 1267 BLAKE2B 3e75fff7e68162c68e9a5c2bc4cd659759741642d4a5eb4957010ce66c555c2a512b3975ee166b696e52b79ce1cd2bb83c414afa02745501244471d6951a48a3 SHA512 1e77587976a6769973f48ae9ca5aa80bb12e77695d45594f390282652fa8971d13507e9ab503aaf389f7c283f077c7827741420996032a0a3fb0efa64de24074
+EBUILD py-1.10.0.ebuild 826 BLAKE2B c872b7bc9392a66b91001efb3df9e9e42dad5c5d2e79edb8fb7badd6d104cfbc141b8c078c7d4b46ca82e30b720e64164916ec7cf5009893b2d6752e0f5cb314 SHA512 2f70207ea82dccb1df4c8273ce838b05ee595d4a58f9f149e383974af318d44063239cadcd258bf479497eb632450f84e3370576589f8e3d891547805c329966
+EBUILD py-1.9.0-r2.ebuild 1424 BLAKE2B 37dfa023d9a6fde1ff40ae95e7fa83c35876b308de3a514d81d4f2d7595d4f66e6d8bd55a1aa4fa5339b7fcf9e9f0db4786299fce002d441fd44b40c58c18b8f SHA512 0a6b72abd7031f9d311edf4ff46fb72b9fc67dff00eb4dc889f827f51c534f3d33cfd7b21c4ddf75cf48b898304e96b803c826ad26da7a14b862d9107e654306
 MISC metadata.xml 340 BLAKE2B 110b7f7cc26818661b98f60f589a782c0a9ed827fb43a89eef8cd7096045b1cc168410d9525641d4a78dee9709679d4d9ee7c38680caef5f37a73f1e726007cd SHA512 ce65db3c076a27acc6af28c1adecf61bfd7d10872612994fd616c72e91264be87460823055182e3b60f6931f22386d3a9f541ddd16c902fd8e02a6a345e65f5c
diff --git a/dev-python/py/files/py-1.9.0-cve-2020-29651.patch b/dev-python/py/files/py-1.9.0-cve-2020-29651.patch
new file mode 100644
index 000000000000..af89fb14808c
--- /dev/null
+++ b/dev-python/py/files/py-1.9.0-cve-2020-29651.patch
@@ -0,0 +1,31 @@
+From 4a9017dc6199d2a564b6e4b0aa39d6d8870e4144 Mon Sep 17 00:00:00 2001
+From: Ran Benita <ran@unusedvar.com>
+Date: Fri, 4 Sep 2020 13:57:26 +0300
+Subject: [PATCH] svnwc: fix regular expression vulnerable to DoS in blame
+ functionality
+
+The subpattern `\d+\s*\S+` is ambiguous which makes the pattern subject
+to catastrophic backtracing given a string like `"1" * 5000`.
+
+SVN blame output seems to always have at least one space between the
+revision number and the user name, so the ambiguity can be fixed by
+changing the `*` to `+`.
+
+Fixes #256.
+---
+ py/_path/svnwc.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/py/_path/svnwc.py b/py/_path/svnwc.py
+index 3138dd85..b5b9d8d5 100644
+--- a/py/_path/svnwc.py
++++ b/py/_path/svnwc.py
+@@ -396,7 +396,7 @@ def makecmdoptions(self):
+     def __str__(self):
+         return "<SvnAuth username=%s ...>" %(self.username,)
+ 
+-rex_blame = re.compile(r'\s*(\d+)\s*(\S+) (.*)')
++rex_blame = re.compile(r'\s*(\d+)\s+(\S+) (.*)')
+ 
+ class SvnWCCommandPath(common.PathBase):
+     """ path implementation offering access/modification to svn working copies.
diff --git a/dev-python/py/py-1.10.0.ebuild b/dev-python/py/py-1.10.0.ebuild
new file mode 100644
index 000000000000..98989aafbc2b
--- /dev/null
+++ b/dev-python/py/py-1.10.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="library with cross-python path, ini-parsing, io, code, log facilities"
+HOMEPAGE="https://pylib.readthedocs.io/en/latest/ https://pypi.org/project/py/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+# This package is unmaintained and keeps being broken periodically.
+RESTRICT=test
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx doc
+distutils_enable_tests pytest
diff --git a/dev-python/py/py-1.9.0-r1.ebuild b/dev-python/py/py-1.9.0-r2.ebuild
index 78e1479659e4..c7102745bc31 100644
--- a/dev-python/py/py-1.9.0-r1.ebuild
+++ b/dev-python/py/py-1.9.0-r2.ebuild
@@ -14,6 +14,8 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+# This package is unmaintained and keeps being broken periodically.
+RESTRICT=test
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
@@ -21,6 +23,8 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.5.2-skip-apiwarn-pytest31.patch
 	"${FILESDIR}"/${PN}-1.8.0-pytest-4.patch
+	# https://bugs.gentoo.org/759547
+	"${FILESDIR}"/${P}-cve-2020-29651.patch
 )
 
 distutils_enable_sphinx doc
diff --git a/dev-python/pyFFTW/Manifest b/dev-python/pyFFTW/Manifest
index 9a4454f30cd9..872f50d98e51 100644
--- a/dev-python/pyFFTW/Manifest
+++ b/dev-python/pyFFTW/Manifest
@@ -1,4 +1,6 @@
 DIST pyFFTW-0.11.1.tar.gz 144045 BLAKE2B dcf37653e8d5259d8d74282699eb8d9820694f21e092528105e07a8c7e05fe213d908590560e83a5a4ad993716fcf343ef0780126bbd689ee4ff584a01ee6453 SHA512 88769fd65b1a9ba3228a920226ac82f9b4e0a9023b6b73fffc0dc52a8983197e4406c376e89d00888526cfe3a9abb3e15a576daa51ba5bea8e8302514176763a
-EBUILD pyFFTW-0.11.1.ebuild 654 BLAKE2B abe30b778c4b86209b79945f5b5f88aeb34d28136c67b6aec041fef503f63fc206f263eb5ed0275e632f1693b4fc9d199a9ae175264b6f6d137c83e3eb5f83b1 SHA512 ae05816c516f8c05d061bdf08a35b89f9e0dd49b00ea5cdb953ae1f8d2018c5f02fb832606da6e3d113ba8eb68b11e9b9556cf1ed128f444fb575b758b0bf12a
-EBUILD pyFFTW-9999.ebuild 654 BLAKE2B abe30b778c4b86209b79945f5b5f88aeb34d28136c67b6aec041fef503f63fc206f263eb5ed0275e632f1693b4fc9d199a9ae175264b6f6d137c83e3eb5f83b1 SHA512 ae05816c516f8c05d061bdf08a35b89f9e0dd49b00ea5cdb953ae1f8d2018c5f02fb832606da6e3d113ba8eb68b11e9b9556cf1ed128f444fb575b758b0bf12a
-MISC metadata.xml 424 BLAKE2B 5d75e20623d795582045a8571aa6c9269619d975bc35598fdac89ff2aad062287f2f44d16ea4fee68923d9dabbdb17a58ee0407fda13af733f0085ea81e219a0 SHA512 1a05bf34de75ceabd0207520d44bfe450958e05bcea410ca7a7cc8b7f43170c2842595b800a178c798bf517a2d060b631633e941da382fb39279fc6c81b044e3
+DIST pyFFTW-0.12.0.tar.gz 147372 BLAKE2B 1ea1f1f8de6759c42781a535b30d7119c0cb02dffea3abfe4130a97c465e000aa9b3064a219718569552304513a77ac51aa309f1be29f9eecae25c63cce70c6c SHA512 e4d7258d5c053b5367d8c4f1892eba8e595f9d540c1c3e6caf61e0c113d598ba872b5e72a21edace66be70d9ad75c599e4b1fbc692e0015c3c1ae35e9a7ba599
+EBUILD pyFFTW-0.11.1.ebuild 652 BLAKE2B 4e01bfc76b6daaf27cd735ab57472505f3c2b0e922ec90887f70198765f66a6285e64ece006e5cbfc23f4ad6e1c8cd3ea7c5810aac4013d7b81f8cfb28e0d0dc SHA512 835d0792835ade896a817824be7d95864fc1824ef7ec839d059beb7cf392f2ef1eb4ec1195dbad17849299c29954a4525e0a8784e989812fe5010e892b053d77
+EBUILD pyFFTW-0.12.0.ebuild 656 BLAKE2B 4401c3cc4994c32b351409ad0322c91e325f4695a0ae4ea680de6078f10ded3bb7a2b5cefa3bf4851743c4d798862d0f2f767e628c13e89f968e1ae124b98e7e SHA512 1f344a4e60e1bd5f19290ea88e64ff8f89f44215cde03c2f183e0c343a2ec47b3e8144008566f6ce20765b691581894608c6ce5596946ef6e7a7ddceaa0d674e
+EBUILD pyFFTW-9999.ebuild 656 BLAKE2B 4401c3cc4994c32b351409ad0322c91e325f4695a0ae4ea680de6078f10ded3bb7a2b5cefa3bf4851743c4d798862d0f2f767e628c13e89f968e1ae124b98e7e SHA512 1f344a4e60e1bd5f19290ea88e64ff8f89f44215cde03c2f183e0c343a2ec47b3e8144008566f6ce20765b691581894608c6ce5596946ef6e7a7ddceaa0d674e
+MISC metadata.xml 468 BLAKE2B e194260c6ef62152730eaba4b41cdb62313327a29397ceb80bb5d01e2e10b90111368becb2d13098ce91d06322c651891882a6e423401e1e5c49d509d26cb0ea SHA512 f21d715e91adee75fbd7d1eb25c10b7149bbb04bd41dadc01292afd80dce349367335e47a294b49033e54f8d26ce91c9dfe5f9fd58a738dacf6ddcc16091ca68
diff --git a/dev-python/pyFFTW/metadata.xml b/dev-python/pyFFTW/metadata.xml
index 5898470d0c54..946e1a15f19c 100644
--- a/dev-python/pyFFTW/metadata.xml
+++ b/dev-python/pyFFTW/metadata.xml
@@ -11,5 +11,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">pyFFTW/pyFFTW</remote-id>
+		<remote-id type="pypi">pyFFTW</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pyFFTW/pyFFTW-0.11.1.ebuild b/dev-python/pyFFTW/pyFFTW-0.11.1.ebuild
index 25dfbd2b9be0..e662251c8423 100644
--- a/dev-python/pyFFTW/pyFFTW-0.11.1.ebuild
+++ b/dev-python/pyFFTW/pyFFTW-0.11.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="A pythonic python wrapper around FFTW"
diff --git a/dev-python/pyFFTW/pyFFTW-0.12.0.ebuild b/dev-python/pyFFTW/pyFFTW-0.12.0.ebuild
new file mode 100644
index 000000000000..eafbb0bb8b9e
--- /dev/null
+++ b/dev-python/pyFFTW/pyFFTW-0.12.0.ebuild
@@ -0,0 +1,28 @@
+# 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} )
+inherit distutils-r1
+
+DESCRIPTION="A pythonic python wrapper around FFTW"
+HOMEPAGE="https://github.com/pyFFTW/pyFFTW"
+
+LICENSE="BSD"
+SLOT="0"
+if [ "${PV}" = "9999" ]; then
+	KEYWORDS=""
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/pyFFTW/pyFFTW.git"
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/pyFFTW/pyFFTW/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+IUSE=""
+
+DEPEND="dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/cython[${PYTHON_USEDEP}]
+		>=sci-libs/fftw-3.3:3.0="
+RDEPEND="${DEPEND}"
diff --git a/dev-python/pyFFTW/pyFFTW-9999.ebuild b/dev-python/pyFFTW/pyFFTW-9999.ebuild
index 25dfbd2b9be0..eafbb0bb8b9e 100644
--- a/dev-python/pyFFTW/pyFFTW-9999.ebuild
+++ b/dev-python/pyFFTW/pyFFTW-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit distutils-r1
 
 DESCRIPTION="A pythonic python wrapper around FFTW"
diff --git a/dev-python/pyalsa/Manifest b/dev-python/pyalsa/Manifest
index af2c6f72a3de..a5dfd9af7281 100644
--- a/dev-python/pyalsa/Manifest
+++ b/dev-python/pyalsa/Manifest
@@ -1,4 +1,4 @@
 AUX pyalsa-1.1.6-no-build-symlinks.patch 682 BLAKE2B 046f4cffa0b08a32360356d82384148b805544b6f05e44ec329bef2299b67e46c68401b800761e9dff2141b22bc029a55fd5cf01cd5cdb533303aef91a2bbe0f SHA512 fd3937df5a69326908da942a8926e10221bb85693c863cc06ca363ca8fb07761173d2b51113615970887442d8779b2e9ff468b927b078acf52620e944b71b779
 DIST pyalsa-1.1.6.tar.bz2 39797 BLAKE2B 3a23dde67ec807d09b2e9ef0f893b8ec2f5902b0fa88f0f02f8127b7a5a8bdf3fa09397dd01ae1cafbce6b9c733a0eca65fda3cd6fd18e533dd4fbace284caa3 SHA512 6c6aee1ad32c2208ab3f91defee5651cca8bb414479ff80e8a1bd6791ec1df2218a61dd8e7c01f95bd5d51807776034ff96cca2b935e9e4e23d13b6c3c40a0dd
-EBUILD pyalsa-1.1.6-r1.ebuild 635 BLAKE2B 4db5cbd9be0c8284c8630d7a787c13789e0ad2eb67801dbdc48a2956e9c6bdc1171027cecac79feaf5589ced5197623fdbf89f06e647856adc16e0558fdeb661 SHA512 ff301a493810864a723ae32ef25df51a8044d3913361a49f587a75dda942eb5668e40becdc905d3613dd56df35395e7c07de6a6021efc6e5e64ff03f040133cc
-MISC metadata.xml 349 BLAKE2B 743c640ee72b49353f6b3b19b958609dc420f187753d9e63e292c9cdfcb6c183092953dd16c3cf0f91ee13df04b9f12a2a9893a56cacad2c70535730294d6af1 SHA512 ef94ac2639e61234b2140a6dae1683f99c3c8bf564a37d22e54612340a2d0147037e590ef8f6c639914df05684f3d62ebc96a9e2176cab82ba85e5d87171ec58
+EBUILD pyalsa-1.1.6-r1.ebuild 642 BLAKE2B 144e50cc121b434ad4ba5bebd070cb913aaa207a01a72276942e384a842bd43b89d67ea952a5b146383f59a8f8a59abd4410c3cf1717202607e692f0030fe067 SHA512 262f942a68943ddcef3931b27015b42cb89769cafcd9e8214958626c3459a71e778da31fa3b81185373e77b8f123f844567c7a2e6855f0955aef54fa1fbd2f8d
+MISC metadata.xml 426 BLAKE2B a331832c36e0a9a857e46b921f5278ac43e16cc33113a1f913feed1935faedcfde22cd53210d7b197693b585c444b97f9fb3f16a4eef9df26e39f72333e1c215 SHA512 9cd209e26fc20a5edba5636cb915b7d6278f4f4a48485b8643efde6ab67bbffb5320328f54c6a39ce6fe625b07d4af2f2a409c2bf763f25237e98fb52a94a481
diff --git a/dev-python/pyalsa/metadata.xml b/dev-python/pyalsa/metadata.xml
index 924dc07b5c11..18a797f3b558 100644
--- a/dev-python/pyalsa/metadata.xml
+++ b/dev-python/pyalsa/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>alsa-bugs@gentoo.org</email>
-	<name>Gentoo ALSA Project</name>
-</maintainer>
-<maintainer type="project">
-	<email>python@gentoo.org</email>
-	<name>Python</name>
-</maintainer>
+	<maintainer type="project">
+		<email>alsa-bugs@gentoo.org</email>
+		<name>Gentoo ALSA Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pyalsa</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pyalsa/pyalsa-1.1.6-r1.ebuild b/dev-python/pyalsa/pyalsa-1.1.6-r1.ebuild
index c3ac63d15799..2bcb27be8646 100644
--- a/dev-python/pyalsa/pyalsa-1.1.6-r1.ebuild
+++ b/dev-python/pyalsa/pyalsa-1.1.6-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/pyalsa/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="media-libs/alsa-lib"
diff --git a/dev-python/pyasn1-modules/Manifest b/dev-python/pyasn1-modules/Manifest
index 5c0cfea2679a..830d7a3689c8 100644
--- a/dev-python/pyasn1-modules/Manifest
+++ b/dev-python/pyasn1-modules/Manifest
@@ -1,3 +1,3 @@
 DIST pyasn1-modules-0.2.8.tar.gz 242864 BLAKE2B 22b6cc27d45d19d8e7f5b12c8aeff1fa379bd567fda6b1dc0fafd00c0f4367d32f21cd48cf3cba140f2f11ba7d258140e8014c8420300451ab1acff475d28da7 SHA512 fdfcaa065deffdd732deaa1fa30dec2fc4a90ffe15bd12de40636ce0212f447611096d2f4e652ed786b5c47544439e6a93721fabe121f3320f13965692a1ca5b
-EBUILD pyasn1-modules-0.2.8-r1.ebuild 785 BLAKE2B 3ced9b4bd477af78e06b7f0c22869cdcb9cd79525d80702b4050ca4a647b7eee699ab6af258022d106270496a93827577b66e688d578c7d39999da750e6251c3 SHA512 233cd20f34bd2c89e78eac966e6ecd6ebd1f0c07ce121e3686c458500d5f0ca7e1d040a9145f620f5faee88e58c860b5031a6925365d1759979e9141c3a9aa48
-MISC metadata.xml 405 BLAKE2B add7a93411177af899c2635b8222655804111e50ebbd82de341a19478a2ebbf8087efa7e473732d131af3db70fefc0d8d495eeb98cb927961156d65c0b8ff06d SHA512 fd42b04e0186119d96caeb401efb0d8810c837bf50a349d1a0ad9a38323c4b42226a5e9202ed4530823343c877895214e6eb92f9760c7599b2a6843a79261246
+EBUILD pyasn1-modules-0.2.8-r1.ebuild 801 BLAKE2B 3517af579a41e1c1355b5889c2580b1dfe4c8c57dcda7b4e01b18f9643d15f370ecdd3fb2618fe1b03f8358f3b7aaf89f948675f509535acb99cd99b357db1d8 SHA512 6cd01efef9b8420278b8e595b20be03227f71e65f3147cd62ef5ed7a65df2a346dcf013df71b96134eb1261470352ddcb389f49048806d24353c29af26800474
+MISC metadata.xml 403 BLAKE2B a00c4608ed5c0b7e379b27fddca36a4c67217468c6eacb08e9af1ad0f0a96f7888efbe39ecc2d1bde100652bd87ab177ef3eea2b2926a9dd2bf43244287d14ae SHA512 ed473b6d2e90b04824dcfac52e0bab4d23c62726ef46bb2568a17cc75526f244e7d66d564f70814fc001f0d44955df9d88147279d2854b0832c96756be5c0f2a
diff --git a/dev-python/pyasn1-modules/metadata.xml b/dev-python/pyasn1-modules/metadata.xml
index 6b1047bfd28e..c99daf45cd50 100644
--- a/dev-python/pyasn1-modules/metadata.xml
+++ b/dev-python/pyasn1-modules/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="pypi">pyasn1-modules</remote-id>
-    <remote-id type="sourceforge">pyasn1</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">pyasn1-modules</remote-id>
+		<remote-id type="github">etingof/pyasn1-modules</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.2.8-r1.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.2.8-r1.ebuild
index 1e11ec9f6bb2..7b25a41bee45 100644
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.2.8-r1.ebuild
+++ b/dev-python/pyasn1-modules/pyasn1-modules-0.2.8-r1.ebuild
@@ -8,7 +8,9 @@ PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="pyasn1 modules"
-HOMEPAGE="http://snmplabs.com/pyasn1/ https://github.com/etingof/pyasn1-modules/"
+HOMEPAGE="
+	https://pypi.org/project/pyasn1-modules/
+	https://github.com/etingof/pyasn1-modules/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
diff --git a/dev-python/pyasn1/Manifest b/dev-python/pyasn1/Manifest
index 5df48dc82774..4d32ea26659f 100644
--- a/dev-python/pyasn1/Manifest
+++ b/dev-python/pyasn1/Manifest
@@ -1,3 +1,3 @@
 DIST pyasn1-0.4.8.tar.gz 146820 BLAKE2B 5c00b47c2014e599d1aa2e14c3004b3688786c7afd160c85709d5a0f324166abb1d29ebbd9f3e13100166e7176710e4dc6e1b8fcf80db5f5bdaa202912f8a023 SHA512 e64e70b325c8067f87ace7c0673149e82fe564aa4b0fa146d29b43cb588ecd6e81b1b82803b8cfa7a17d3d0489b6d88b4af5afb3aa0052bf92e8a1769fe8f7b0
-EBUILD pyasn1-0.4.8-r1.ebuild 563 BLAKE2B 614622b434350048b3fa7c0e0085b37613592cb2f85d17537f86f5c7381178a54ada402eea607d851c54bba5f91df9f6835ad804541b5b090bff28be3f1f1287 SHA512 7d0c66975443d782ee4931ce6ad85b7c1f6b61daaec74316c5c4602ffe9df0b8f2a8244de1c03592563c0f82f339b653e9ff6d0be219786137741d8a5501dc79
-MISC metadata.xml 453 BLAKE2B 0a3c1a0971fb35d969c1c04b7b0a81c82935306249537a640d581aea84979f52f9c762e6761a4d7278bb0e4ad252cb522f26eb2cd9b91a6b80275a7e031016d5 SHA512 17fb0536bb137058ef242036076ba1f7366f03a246903286e7288452b81f84036548bf11dfc0b5c2bb18aa4f7ba83608634c17aa9e1c0d268c99afef4f9edcb8
+EBUILD pyasn1-0.4.8-r1.ebuild 606 BLAKE2B fb2b21b172dd1fcd02311af91952ff5218df13f1a134be4a8a96882164f392b303b99b5bf4bfeb0feb3bebcc27cce26f7c0c233418dc7cff10f346684d80121d SHA512 f95d52cbc5e921b73aae766489505efcacfdd612068703ea1919662f687f8caf27a43ff73df9005649f1a91825ab4b25ee00739ec150de28fcc66b1006251f39
+MISC metadata.xml 400 BLAKE2B 9adf4eaed1b7630e838706dbf581c27980379da5a2067674d642848047c73a90716dca904ab9b1b1147eab772474679b4692c341493b51f44416a49010113e46 SHA512 dc1546a7c210d82019f6dfb188015bf299e58be58e8e3b7a37afb04de85ae875dd63f38b9e2e8983958d86a8a9bb1aa723a3ec57106311605fda146d4d38f055
diff --git a/dev-python/pyasn1/metadata.xml b/dev-python/pyasn1/metadata.xml
index f0c3d55a771d..4d0b9f3334a4 100644
--- a/dev-python/pyasn1/metadata.xml
+++ b/dev-python/pyasn1/metadata.xml
@@ -8,7 +8,6 @@
   <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">pyasn1</remote-id>
-    <remote-id type="sourceforge">pyasn1</remote-id>
     <remote-id type="github">etingof/pyasn1</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/pyasn1/pyasn1-0.4.8-r1.ebuild b/dev-python/pyasn1/pyasn1-0.4.8-r1.ebuild
index 02ba13cbe924..3e16da33263a 100644
--- a/dev-python/pyasn1/pyasn1-0.4.8-r1.ebuild
+++ b/dev-python/pyasn1/pyasn1-0.4.8-r1.ebuild
@@ -8,7 +8,9 @@ PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="ASN.1 library for Python"
-HOMEPAGE="http://snmplabs.com/pyasn1/"
+HOMEPAGE="
+	https://pypi.org/project/pyasn1/
+	https://github.com/etingof/pyasn1/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
diff --git a/dev-python/pybind11/Manifest b/dev-python/pybind11/Manifest
index 46c3ec49c997..bec7e7209e2b 100644
--- a/dev-python/pybind11/Manifest
+++ b/dev-python/pybind11/Manifest
@@ -4,4 +4,4 @@ DIST pybind11-2.6.1.tar.gz 634179 BLAKE2B 33f057e88e45985a0475783b8931ec669a16ef
 EBUILD pybind11-2.5.0.ebuild 1302 BLAKE2B 52c61ccc0c7de0eaaa6f39fa4e6496f72893e948d65bc84f3d544bac9d2d79c13843b4fbfefec6f61f106de4542056323bc2e7e9f4309530a99597d84623ac78 SHA512 9cdb6b256fd146d4d3113e57f8e944bb7e793609c27796c7bb9a5e2076620302413dfd1ed4138ae9ba5f70e7cbcea1f437c7a562f2a618e556cdae827f2b2fdc
 EBUILD pybind11-2.6.0.ebuild 1282 BLAKE2B b5fb119d2df30584784f282342ca1bd2d14ad2d869d4f13b7d7c8408661c957f62209b9b777d682136a8ac676180f3049d7a825931f5e2a3b099c79b10c985f3 SHA512 de8996501cf7879de71242a35250032f95347422d7680cd2e3efcc574f16ee75fe26d258fb4b8f3448d05c750090b37a8e4a9c1869e8b0bc9886c83c8bb3715f
 EBUILD pybind11-2.6.1.ebuild 1284 BLAKE2B 7d753f38ebe4ebdb9a166eb0dd172b768b1fb7aff74f65c65129bd6d53ba455a50adc2de48a6dd32064eebf59c30368668f76799f657c389e7a564d2266089d9 SHA512 1a0922bb491a62c480f53d7b0ed34163c991b672aafc44e1a330afaaa7cbc0973eb3283b10c9daa7eefcf1af1d396120cf8a03a60080da652f3e2f09c2025db3
-MISC metadata.xml 348 BLAKE2B 06ae224547d14422e51d6e07615adf51fee22afcde2391a4483a8e1937b932a4268f0b31b94d4df12bb06804101b0e6b51614f0ffcb601a4fa34616dcc939377 SHA512 02a7f6afd867bf9f7832a9c8b2d1470be6b1fd537ae8f9509143bb6acb3af75c1eefa38b330bad6aa5e2c37a1158b4b0260277c6307a9b97d144d6c3695a855b
+MISC metadata.xml 419 BLAKE2B 4b76037af5a23b231241e9d53f12dd3866cb07811888d1de3e022d3ea812a83a17856107b257f608343aafe763975cfa621061e225c7ecdcc175f3bb0b8a51a8 SHA512 b17fc1d7231812f22077e7feb0400a3c1e9b66f29c125457b5cf568694ef35332d83fdf405d6c849df55e1f0e517a8c25ecd6f24d1d67ca6654cae8522bb10a2
diff --git a/dev-python/pybind11/metadata.xml b/dev-python/pybind11/metadata.xml
index 025838642020..d0a4da3cd941 100644
--- a/dev-python/pybind11/metadata.xml
+++ b/dev-python/pybind11/metadata.xml
@@ -9,4 +9,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pybind11</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pybluez/Manifest b/dev-python/pybluez/Manifest
index c0d3dc763287..874f35c39e5f 100644
--- a/dev-python/pybluez/Manifest
+++ b/dev-python/pybluez/Manifest
@@ -1,3 +1,3 @@
 DIST PyBluez-0.23.tar.gz 97562 BLAKE2B 6a234d5c41dc0bb9f08559431eafcf1d1fb1c881d2cb912cc048e2717bfe8a06f09aae045d2961c9ba5e087422cfc8249a1907368eb6dc45942175bcf97b1841 SHA512 78ce2c014d0055d0220163e7df94de5b6e891aa528ecf4f106f9dd0bdeb94244d18c752f93e62a133f3cec7053cb4646599e7588cf7ce5994ae7abe74ed05d47
 EBUILD pybluez-0.23.ebuild 649 BLAKE2B e031b8336b6455ef6bc395a6387e0189e3421f9c2f38af881bce86f90c11bf4d8ea335fe2abeea672390867169a141f05c1111b127951847ef8250f4469d3e2c SHA512 62a6ad37d2287d832907435e17e0eac8e1f9acf29d4b451ac3041d7ab02097a95a0c1cd5ac1ba84afca642e76993586497c1cc657d5a45b0353201dc77fb3a1c
-MISC metadata.xml 539 BLAKE2B 4e87b2e8a4ae9be5916825471188649fe825c2dc614970a6c9af95098ff4abb97c0c59c3eece1b47e7bbc14d78f172369fa5498b3bb7ca9bac6218bc54ea0a7d SHA512 9560c0dd1afb3fbb49c6d17c0b730ebbee42df60014975d5b46fd07dfb7f40126df9798133f329b829cb235f3f97034a3befa5807499c721073072ddca25ec18
+MISC metadata.xml 539 BLAKE2B 014808d638240aab594d9336125d20f38cf39978e011f3cba1775921e24c0aef6fc3b78b4f1f3a8ddecf5778efcc78f67806c1f6a7ade82eb5efa2601599092f SHA512 4bc0aa09ede8d6fb1ecbb9662b4e5ffb512d94de5b6a7a9694a4bd5e906c00a0fa02044a83202a05f55dedf81fd9399888753aa820d3ecf6468bfec624bcc90c
diff --git a/dev-python/pybluez/metadata.xml b/dev-python/pybluez/metadata.xml
index 7ab1c610c038..e778701ea42e 100644
--- a/dev-python/pybluez/metadata.xml
+++ b/dev-python/pybluez/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!--maintainer-needed-->
@@ -6,7 +6,7 @@
 developers to use system bluetooth resources. It works on machines running the
 GNU/Linux operating system and the bluez bluetooth stack.</longdescription>
 	<upstream>
-		<remote-id type="github">karulis/pybluez</remote-id>
 		<remote-id type="pypi">PyBluez</remote-id>
+		<remote-id type="github">pybluez/pybluez</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pybtex/Manifest b/dev-python/pybtex/Manifest
index 5dd3f637318e..de1a0515031a 100644
--- a/dev-python/pybtex/Manifest
+++ b/dev-python/pybtex/Manifest
@@ -1,4 +1,4 @@
 AUX pybtex-0.22.2-fix-test-installation.patch 410 BLAKE2B 6c9addde727e5e1c0001a92ad39c307399331e6ff6e1b5aa9cd691e4c8d6381f0d911fc8e622e8a2dd76736fbeb24513751651886a9db0b5e790a509b9043755 SHA512 d357f3f0566fb67b1ce2abb8669429b344f8d6f4bc8651ea913fba3337bfb33a1a7f6a6e1361b42b42cdf92ec09f60c42262f5c41f12da6b34593a1033c732db
-DIST pybtex-0.22.2.tar.gz 363094 BLAKE2B 6e59543a1178f2d3528c8b65b63afd720864fb8f31172e3fa76a36bee3d5dd9f32aa6226fa0a599af0a4705d3c37060417f6e902ec7b900efcc8a6f8487c31e1 SHA512 afabae8c47008651fa9c4c6546bf87f4a2c74d3184f1d0c1b4c2bd68ad8110ea37054026b5934312b86d97354a592bae5c0b6d384003b4e56f0157f6520b77a1
-EBUILD pybtex-0.22.2.ebuild 759 BLAKE2B df045fcdcefe4aa66649535908b9ef0fa351eaa65b4ad2b6d2c1b242ecf27dfc903e58bdbe3d28a2724fb4c3fbbde65b95b9bc203cd94de927eaebb76b9bc954 SHA512 68db3f850d94a9baa3324e00f2ee929bb54af9b165a957c02203a14a50c5a3eedb26ceccff8d0834524793b4324711c62074656bc07b400cb6acc25cf879890d
+DIST pybtex-0.23.0.tar.gz 400649 BLAKE2B ae841eb98588fea55dea59a90be4ea5489b115b5594aa2ba7da140d529371c9275d28896d2b3b1d7fdbfe6a4bc7f1a99a8a73505f5d141f7affc0f22e5b08ceb SHA512 11b4c8141f237a25c320726b18fb254df077f4b644ac26fa2bf9f3d85c4301ab839f3544a3c1849243e75bbcbf194b25642b0ef11d354e3711578a4e19565bde
+EBUILD pybtex-0.23.0.ebuild 765 BLAKE2B 9b87c3fc3bc8a04d75572aae949c9b3478cf4a37cea036c808c976282b94423b28a5892d6e5da908e1ccbee1d30eae4384e15a9c887a1de0470ca050c47c002d SHA512 c38693ff4bb4c62d2ff3023c7565c92e1f4f263d7ce496a39e49a191e423aa7ef5b11e8f2f114d1b08afeb31ecdc89aeb55e1d48066cd68ab228b2e824fd3d56
 MISC metadata.xml 522 BLAKE2B 62e314da62e360861bbe2fe0a8c71dab45a03aeb3161adde5680e19b3d42d51c75294d288b7e7d89483e9dd9392f52b935e1ae33e0f732376284d988061743ec SHA512 9a27f72f6b1c15e6f30f33afd02c830949032c5315bd3b4cde8fe136f82602b32b1e1f7fafb12c58d2decb18e14bc88dfc507014b263dc1911e2e4cf74b677a9
diff --git a/dev-python/pybtex/pybtex-0.22.2.ebuild b/dev-python/pybtex/pybtex-0.23.0.ebuild
index 5359af384462..5c9b636aeede 100644
--- a/dev-python/pybtex/pybtex-0.22.2.ebuild
+++ b/dev-python/pybtex/pybtex-0.23.0.ebuild
@@ -11,20 +11,22 @@ inherit distutils-r1
 DESCRIPTION="BibTeX-compatible bibliography processor"
 HOMEPAGE="https://pybtex.org https://pypi.org/project/pybtex/"
 SRC_URI="https://files.pythonhosted.org/packages/source/p/${PN}/${P}.tar.gz"
-PATCHES=( "${FILESDIR}/${P}-fix-test-installation.patch" )
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/latexcodec[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]"
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
 
 BDEPEND="test?  (
-			dev-python/nose[${PYTHON_USEDEP}]
-		)"
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
 
 distutils_enable_tests pytest
+
+PATCHES=( "${FILESDIR}/${PN}-0.22.2-fix-test-installation.patch" )
diff --git a/dev-python/pycairo/Manifest b/dev-python/pycairo/Manifest
index d2da91ebc136..4c0401bf15ab 100644
--- a/dev-python/pycairo/Manifest
+++ b/dev-python/pycairo/Manifest
@@ -1,3 +1,3 @@
 DIST pycairo-1.20.0.tar.gz 344370 BLAKE2B b72a3dfd3ad6332f6be2c0fc0650ef87d97a51881bd239421cdb6355016e952093f9fa05b7872d7cce4a50bc4bac27ff0fb4c11e446e51ada9d7c1adc019a175 SHA512 d32d008b741653d02324b206a438f5fd85f2a433201d6f8b98c8f1adc712abea611a4b5ed95c55258efb662dc579eed6b2f752b10d9fc2b6a7c8e5edd19e5266
-EBUILD pycairo-1.20.0.ebuild 1116 BLAKE2B d6f82f972c10fc7e17f76de827491c811f54ce4391501d48526be5b8db1cb11830a5d075b57159c14891515412e1f5b8d1db92dae303e943c145d5c91bda1e88 SHA512 1ac02783f9660647f2ea515ca560725a1fb73d28ea2c9bd16b7067c7925cc594c7d3f72a38d0bca55e1a0351b22ebe93c3f242b0ea14a2440f7613958566c60b
-MISC metadata.xml 246 BLAKE2B 3a28b3bb42a0352827a446ea608867a7782fe682458527ef441a528a22c9f951dc203639934a69ffb520f63aadce3037df28bf8c5304b3a5921b336142f9f246 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc
+EBUILD pycairo-1.20.0.ebuild 1117 BLAKE2B c5e5620eed372ba2aecb6e6cf8c8128acc1ef4f6103b568cb1a26646b50d2b9b780ff67a8552dbb8c9aeb46d906814954ab3ba5d7a924126be06638173722b79 SHA512 30020d154994c991989ca73cd46ed61c5123f8f1aada665014310dd077acbfd085e30130edbf1d3eb5e41afe16b98065f5e78866453484711d0ac841abd96d85
+MISC metadata.xml 310 BLAKE2B f27144a3f463297efa01ba4b6d7198f455c9e62470e56e004cb2cea621e4f1f7d3adfc45099a60fe54d670debd0cce4aa68e2b34e756df8d593a150ac040d97f SHA512 0280f0bba6101b163ec1304d7f8fbc36d00d86cd7ce6f8c671dee74f7931aa363f5887c85cd8d582d4ba0cb78753a61efdbe38e072d68511ba3a66ac36aa490b
diff --git a/dev-python/pycairo/metadata.xml b/dev-python/pycairo/metadata.xml
index e24dd86faa2a..91515b4585e2 100644
--- a/dev-python/pycairo/metadata.xml
+++ b/dev-python/pycairo/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pycairo</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pycairo/pycairo-1.20.0.ebuild b/dev-python/pycairo/pycairo-1.20.0.ebuild
index 31888e2eb104..9622e67e4f2c 100644
--- a/dev-python/pycairo/pycairo-1.20.0.ebuild
+++ b/dev-python/pycairo/pycairo-1.20.0.ebuild
@@ -24,7 +24,7 @@ BDEPEND="
 	)
 "
 RDEPEND="
-	>=x11-libs/cairo-1.13.1[svg]
+	>=x11-libs/cairo-1.15.10[svg]
 "
 DEPEND="${RDEPEND}"
 
diff --git a/dev-python/pycapnp/Manifest b/dev-python/pycapnp/Manifest
index beb41419c512..5a1ef9f136ca 100644
--- a/dev-python/pycapnp/Manifest
+++ b/dev-python/pycapnp/Manifest
@@ -1,4 +1,4 @@
 AUX sdist.patch 437 BLAKE2B 772ad2962f35c470496d2d13ccababa442183e12df2274c207bc9944e889c14aa72c27c90512dcdda7941ebe68324f706ffd033a39fff2e89ae0f757becdcb28 SHA512 1036fa52cc7df49740d9c4cb06f4fbdce52c2de9181d44559ef4182e6f469d0236bc8d0103576516826b78a0e1d6a841a89d15e1b2283a8fd2099b205fc0b222
 DIST pycapnp-0.6.4.tar.gz 531404 BLAKE2B 035e0f37292275af8d5e292cb98f85f3d40ffe6284c0defecdb6d0c79afac97e4570e0042c0be6716a992ab904b844c9f046c5795b97cd8b7dd7625af1b2b219 SHA512 3f2c9d93bcf226fb39ef233b8b5fbc86af73d796986e82b897a571db5d8223fb4f65cc28a8bf4ed57b787b6e5defdca70388ac865f036daff48d6d6f93cbbfc3
 EBUILD pycapnp-0.6.4.ebuild 796 BLAKE2B 8e2c593a7c6b508987db6f383b0b9691de4e702c18d92ea42da860d30d3df02ad827587b406c32bbbd3b0554894b0b2cb0ad2bc179204253a35aee0df03a3488 SHA512 73c6c07315687638eac8c95d64f82c298b401a89b86b24b2cb2fe6596b2b9b0701b4685c3186e5a6812b21e04127462e2af1846499f44c3c4710a0142f832b93
-MISC metadata.xml 514 BLAKE2B 0294a7ef4293cdef64d7a287cc824e81b4c22b75ea1e7c2f770c756a56c5c251610e006bf63a28b549527b99b9cc958a5535d43a1c822d9ad724c45f1113e5bd SHA512 10bc088e1650bfa18b74023ba1cd5fd78618051febe89be2756ba0aa706cd695ca98548096392a60a38c94ab168660f347c6e73e2789c32acf7eb927de7d2923
+MISC metadata.xml 553 BLAKE2B faaf63d96013132407184ce42b8a389ef88794918fd796a379dba9c32f53866fa66fb0d5ea1f2bfebd1f8411eebf99a286d3457433492d718074f14497c2e2dc SHA512 dd9e0ca80d35bbd8614a3c3bdaeba9d3cc4a8cfaad6b5561669da1ed1288760ba5c85661634684271e82c80938121a2cb01edaf773223a04e28e5923a566127c
diff --git a/dev-python/pycapnp/metadata.xml b/dev-python/pycapnp/metadata.xml
index b488f8a61dd2..697bbb7ab941 100644
--- a/dev-python/pycapnp/metadata.xml
+++ b/dev-python/pycapnp/metadata.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>aballier@gentoo.org</email>
-    <name>Alexis Ballier</name>
-    <description>Python team can take the package if they wish.</description>
-  </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">pycapnp</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+		<description>Python team can take the package if they wish.</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pycapnp</remote-id>
+		<remote-id type="github">capnproto/pycapnp</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pychm/Manifest b/dev-python/pychm/Manifest
index 8579b0f5c8e5..97a4b9908e14 100644
--- a/dev-python/pychm/Manifest
+++ b/dev-python/pychm/Manifest
@@ -1,3 +1,3 @@
 DIST pychm-0.8.6.gh.tar.gz 23803 BLAKE2B fdf3c37eead60455fd5bde1638a010f2788074752f98c32cf4b3431b4a87b8893c23a9fa29995352b35b41f628b7026fdbfa6ff20b75e8a6efdf75fc2da3f67d SHA512 cc1b254b6c58aba038171ad9db1eea3212094d7fb9386b22ada67381d702b388e6a1dde0317b5724587ee135d2695c546a7c2d65af7091dafeb394647597b0ae
-EBUILD pychm-0.8.6.ebuild 485 BLAKE2B cb4ac224b69437c755c9b5ea10be2b7996f3e4bf0624d4923701f98380d62aae88bfb4ef8a8fba37fb5305f6192f19626bda1bd28abd8a24af244e6c222e6759 SHA512 fe6f5f874bf081984594ed8368fe798674c4fee2d9744531ed30c64a1d3a4a40b9aa29775a53f5544b0731948d70ff8b736124d80b10d49ae463d0ad5aa62572
-MISC metadata.xml 981 BLAKE2B 94814a08cf697f65b50efcb43de52d9271f75bda4b058cfc6b5010cf5a159f1d48add1c305ca4318aeb7993c9e689ebe09ad0c1fbc0eb485ad58868fe427428e SHA512 1ff1b79c5b18961a5ed7aefc06c367968d05e14c47e3b4ac898c62ef8b444c75d092b1a10213197523bb107e8d2a5e04fc19c90b1381420a8d40659c6f950ebe
+EBUILD pychm-0.8.6.ebuild 492 BLAKE2B 6df4bff7a517329e57efb62a3c666a5c87138fa0bfe1fc8f4f51e30c863a6494cb5b90c161eda874886b424d98638ecf5fb516ccbb240e7baa439736cae8e786 SHA512 a34e939a8f9d2b1e263842001c2cc5a2c4ac3fcf80284ea8509e6e86c84eaf0db17c1b0c73e3da1acdd42ad9a61fde6b3ee352f4ed6ebb26a43135313c10ea19
+MISC metadata.xml 1024 BLAKE2B 4284f9d29a44bfb1997cc7e529bc28bef911febe769135b5837f5d81482d353e3377e162fa35f677a6ac1e29b1b467ee15caa1607ea789d3287d5a75f6db79a8 SHA512 f67597a0718d67bfc13216966d1a47f7192c17cbf939f10758c1ff09c761a07bfde094b1d4cf1c35acb872c6c6426cc1dc699a10f46448669ae645dd9f07507d
diff --git a/dev-python/pychm/metadata.xml b/dev-python/pychm/metadata.xml
index 5c6fd6400c88..25e51a49d0b0 100644
--- a/dev-python/pychm/metadata.xml
+++ b/dev-python/pychm/metadata.xml
@@ -18,5 +18,6 @@ Chmパッケージは、C言語ライブラリChmのAPI実装とそれに幾つ�
 </longdescription>
 	<upstream>
 		<remote-id type="sourceforge">gnochm</remote-id>
+		<remote-id type="pypi">pychm</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pychm/pychm-0.8.6.ebuild b/dev-python/pychm/pychm-0.8.6.ebuild
index 7857355b68a8..c3b530a605fe 100644
--- a/dev-python/pychm/pychm-0.8.6.ebuild
+++ b/dev-python/pychm/pychm-0.8.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/dottedmag/pychm/archive/v${PV}.tar.gz -> ${P}.gh.tar
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ~arm ~ppc x86"
 
 RDEPEND="dev-libs/chmlib"
 DEPEND="${RDEPEND}"
diff --git a/dev-python/pychromecast/Manifest b/dev-python/pychromecast/Manifest
index 953ce1ac75bc..4d250e5b40cc 100644
--- a/dev-python/pychromecast/Manifest
+++ b/dev-python/pychromecast/Manifest
@@ -1,3 +1,3 @@
 DIST PyChromecast-4.1.0.tar.gz 44463 BLAKE2B 3ee92cfe57134665621c347dda9b21a06fa1d000f840d25b49f843edef86e35e22b82c9d4f80b8e0ae6f5fabcc4662d7c619363686a37903e27d84e0f85c8fca SHA512 688014a115f3189fed5535e70622a7323e4a29fd65678aa14a302047c5246dbc6a932a8f4eabb58f9fcecc0f4bdbe627d1496a4b6d28e680ad4fac6dd902c825
 EBUILD pychromecast-4.1.0.ebuild 706 BLAKE2B 6d6869ec8953db731ff349600fc82cf4fad509c21dedb0092436f00d7da42d8c03ef935a529f0df2216b03c58e5b77eb03deb47b507262e41bd277f3dca86f32 SHA512 89e0e175391bc8567f0802a8951700f5de70317fedaa97e823fea53aa2165839fbca875be91123960851b8957145ca20dd20efc7f06a3267a47af74f83e95c2a
-MISC metadata.xml 333 BLAKE2B 1a681ac99aee289a919b530bb87037df6fe53b044ce14ce3a9da3cec54a73d7fde58cf01f12678f18397d16b56c9e5bf88d289ddec4469e343d7193502124124 SHA512 a73512d246562e6591eb9c8d13759352cede7f0ae978d02c87bd72b1fe2c9b155cc3908e8489b136387bada61f1257d8e0771e01e26d998b51f9ce13c087ec41
+MISC metadata.xml 408 BLAKE2B e16ff32b818b095474d0493cdccce8792c73e817c6fb474744380828085af657c1c8fc6afb35c2f0d568fec1fea21284d0e3273ce8517b98fdad56be2cfd7303 SHA512 82b4e621812f86fdeacfa7972f29b74fa0e6c64664bcdf3bb53939c760d3584fbe6f7750d0f7a3fb8c49e2a69493b5f312d91326dde690b08e7d2a145180bed0
diff --git a/dev-python/pychromecast/metadata.xml b/dev-python/pychromecast/metadata.xml
index 3ee70120def4..fe07d432644d 100644
--- a/dev-python/pychromecast/metadata.xml
+++ b/dev-python/pychromecast/metadata.xml
@@ -8,4 +8,7 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">PyChromecast</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pychroot/Manifest b/dev-python/pychroot/Manifest
index 3c80472f72b8..eeb70036e66b 100644
--- a/dev-python/pychroot/Manifest
+++ b/dev-python/pychroot/Manifest
@@ -1,4 +1,4 @@
 DIST pychroot-0.10.2.tar.gz 23477 BLAKE2B a5145908c565479ba05583e396c669d344193dacaa70b489b152b49cc092cf5f77193324d48917271d01ce67c06ae737815d5c3098d02bc9ed5f1c25c2dca0f9 SHA512 e5ed1b94dc0779890786bb381fba86d13fbcdbc3df411cfcafc868ebb62fe94cf1248d15a20902b4df5dc4420abc0a93fccc7ddcb2f42ad7244a657b5ec99c76
 EBUILD pychroot-0.10.2.ebuild 983 BLAKE2B 49e70ec68b01706d2f4ea37f530b4230616d46c6eb1cc32fd1ece48d0a17ad2b1201a1eaae6268631c33b58fe8e0f5e926d87c56aef0e0445351de1782217b8a SHA512 2e9cdceb10023941fc3533de662ab910fdf07605839275874220da3cb5b208f36571ec153ff777587a6b1d48e416799d3b3b2e15b77ef9bb41a8f2c9ee53f1c9
-EBUILD pychroot-9999.ebuild 983 BLAKE2B 49e70ec68b01706d2f4ea37f530b4230616d46c6eb1cc32fd1ece48d0a17ad2b1201a1eaae6268631c33b58fe8e0f5e926d87c56aef0e0445351de1782217b8a SHA512 2e9cdceb10023941fc3533de662ab910fdf07605839275874220da3cb5b208f36571ec153ff777587a6b1d48e416799d3b3b2e15b77ef9bb41a8f2c9ee53f1c9
-MISC metadata.xml 253 BLAKE2B a0215cb67a8a67c0479698e85af2d05128a8a30ef5652cb102e7b71d141f1a22a900d6d1000161d7988227c5e8c9af9717eeb7178c44b7456fdf6dc11c2193c8 SHA512 d538d66d9b367b3182102e142aa504457ed7ef139c8203deb00bb1ed94dff9ae4b580ba2b6a550784b7eaf92d8d9170f06fb3d80a6b12780b42887f979bc3e47
+EBUILD pychroot-9999.ebuild 979 BLAKE2B c6fcaaf2b62e69bd3ec8fc39969ea57eef99c856ed484b2127c01213ad3b4e3caf2fe94c2606dba8d97c0ed8c6914cf7d19985e865f3b9757fa3c7b718a14407 SHA512 d3dbe156b8d6a378b65a1d3f62a6dca5d4fe612ff62cdbff3bdea964232a0dbd783b0dd6a86da9c3b2c924d54ec73b0e4da434f78c7fa10e03ecd43a15ac8c41
+MISC metadata.xml 294 BLAKE2B 427a6d5592331c03658548594df4542c10736333975a9bf79244056bd57e22d13c3398e33a8aed539f9faf75f4f02fdde792629f56e484ffa57f35d2f96d027a SHA512 d54e8f6f13d17ef8b63894e1fbe2e49985951d897f125b088e565c31b4f1d950b5d160ce0e976860f15e63be08e45d320fd4f2ac3980bddb2cc95cabc4792520
diff --git a/dev-python/pychroot/metadata.xml b/dev-python/pychroot/metadata.xml
index 8b229e4daffa..73e906b8f91a 100644
--- a/dev-python/pychroot/metadata.xml
+++ b/dev-python/pychroot/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">pkgcore/pychroot</remote-id>
-  </upstream>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">pkgcore/pychroot</remote-id>
+		<remote-id type="pypi">pychroot</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pychroot/pychroot-9999.ebuild b/dev-python/pychroot/pychroot-9999.ebuild
index 61c910718795..e037f1a30684 100644
--- a/dev-python/pychroot/pychroot-9999.ebuild
+++ b/dev-python/pychroot/pychroot-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 inherit distutils-r1
 
 if [[ ${PV} == *9999 ]] ; then
diff --git a/dev-python/pyclipper/Manifest b/dev-python/pyclipper/Manifest
index 98ca7dc7edbf..4c059024d558 100644
--- a/dev-python/pyclipper/Manifest
+++ b/dev-python/pyclipper/Manifest
@@ -1,3 +1,3 @@
 DIST pyclipper-1.2.0.tar.gz 53504 BLAKE2B 611a86b4173838dc0c77ad765f1ab9d08e73b147936ec60fae63308d5bb0019b40479222b80565f3d3ba5337c1a436fa63306105bb3a698592160eb8b66f3014 SHA512 2b8966a695fd7916786ab7549f8c867aad1d4879f3d20b87d7a4b6e1fff8a36871a440795548e91256ff89e574c04be4390ffbd05bab6b0bb51441c7f8acf674
 EBUILD pyclipper-1.2.0.ebuild 784 BLAKE2B 0060491695fef4966ebc1041b1a54aedd4587c90affaf89dedc90432e5d9bd5480a2b2b8adab7880b4c7d2c7621ff1aaf9c4b24f42f5d868e81e467e8d6a3497 SHA512 9c01664dcef14a887b1939696052a83979030a4aaf4e26e1dec3d75d5003a9de1f3aed343bd2ffc5c2a2ccb159ae9e85a133723372f3a270f59f541dfafddc20
-MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
+MISC metadata.xml 315 BLAKE2B dfea428911659d721c46baf73e32549fd98d51aa056ef26b98f305f447292b75a1ddde062602dbe03cf4b7f4e08d0a32a7e085463df1e650ac40f997cd6c0c9d SHA512 15f70085b3bba01136c37bc97ab84749d0d6f99e785c753929c00c3f9de7cec360804f44001954db05d650eae634038791533a1d02e9e1286e8fcdffda3bf597
diff --git a/dev-python/pyclipper/metadata.xml b/dev-python/pyclipper/metadata.xml
index 3da97a9953cc..935afa4da897 100644
--- a/dev-python/pyclipper/metadata.xml
+++ b/dev-python/pyclipper/metadata.xml
@@ -5,4 +5,7 @@
 		<email>pacho@gentoo.org</email>
 		<name>Pacho Ramos</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pyclipper</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pycollada/Manifest b/dev-python/pycollada/Manifest
index aeeed4e1444c..f3acc0187a81 100644
--- a/dev-python/pycollada/Manifest
+++ b/dev-python/pycollada/Manifest
@@ -1,3 +1,3 @@
 DIST pycollada-0.7.1.tar.gz 3526373 BLAKE2B 9adcbff206bc856fce1eef1784734c5604800cff350d32a83d53a4eaf965673adac797f510662dffc70fcfd76a7102fdb9321ead89d765954ffccc9338df446a SHA512 ac4d88b2398bf0364beaaf3e2e468be9131dc0f8088bfce8be18d9eb5a7c093db84a364931884fa7c493dfae81036ec63bc7c689ebf49e961eefc0c4853a0131
-EBUILD pycollada-0.7.1.ebuild 988 BLAKE2B 63029d672f1bae4f30bc427cfc218dd18bf26b1de215f3847e7ff144d053be3087cd7b508fdc29acea0561a6d3864373802319cf01f17c56d11022634c5e9f5e SHA512 c617284fc8eda76a481e452f42276fc82b96c53b736dd45af2aad2e3879f97a941597960dcc089601968c4e83703ffff73433f7b83c4a4654e9b1f8a0691f0d2
-MISC metadata.xml 648 BLAKE2B 495f2f5d7cf32e1e85cf3805ffd6e0790fd99ad4a7d2dc1c4edc4e557845417d83fbb1d285747081b5eb77e3e3d14ac1f24af4988d821d9e5ad7571e11f24c75 SHA512 90a2c1331e2c395c7615c2e2787896051082ccde21891d2c5105c9d6158d83a6ecc965adf4a338e3762cfa4dbb49b1846c0d9a06e68c409fd75942cf90b734cb
+EBUILD pycollada-0.7.1.ebuild 987 BLAKE2B a34e85f8deb1ba93e8048735dcb5b04cea927391830b387a226af39c6c5ddd741c337742482f6c4f4f5db34c74edee79192a27aca8d3d2b809a59c411cd1fb28 SHA512 b12bf47dba69835037837347c8c11ab0cfdf1d852f42922c5ddac3afbbde1a7896f040951c6fb88593670b26ca44e2e5f1672474756594e92d71b0c4b3b085a6
+MISC metadata.xml 707 BLAKE2B 361fe9ef7b96822ffe8f53d87919b826aa1baf9b49019d346831ff34418825cba3213e25e63c3910e8265a3b05bd4fecd4a65606edb2224bda063af87c7ff995 SHA512 89b7d7d166afa9e1935ce9a905377d595370258868ca3b17c8f58cac6297794905df5926ab50d03a75e400b576b4a078ad77012cfd5e394eb404429ad1cafdd3
diff --git a/dev-python/pycollada/metadata.xml b/dev-python/pycollada/metadata.xml
index e0cc39c32687..d6b750a874e2 100644
--- a/dev-python/pycollada/metadata.xml
+++ b/dev-python/pycollada/metadata.xml
@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>waebbl@gmail.com</email>
-	<name>Bernd Waibel</name>
-</maintainer>
-<maintainer type="project">
-	<email>proxy-maint@gentoo.org</email>
-	<name>Proxy Maintainers</name>
-</maintainer>
-<longdescription>
+	<maintainer type="person">
+		<email>waebbl@gmail.com</email>
+		<name>Bernd Waibel</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
 A python module for creating, editing and loading COLLADA, which is a
 COLLAborative Design Activity for establishing an interchange file format
 for interactive 3D applications.
 </longdescription>
-<upstream>
-	<remote-id type="github">pycollada/pycollada</remote-id>
-</upstream>
+	<upstream>
+		<remote-id type="github">pycollada/pycollada</remote-id>
+		<remote-id type="pypi">pycollada</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pycollada/pycollada-0.7.1.ebuild b/dev-python/pycollada/pycollada-0.7.1.ebuild
index 034743cccba5..09a5b6a47e87 100644
--- a/dev-python/pycollada/pycollada-0.7.1.ebuild
+++ b/dev-python/pycollada/pycollada-0.7.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="Python library for reading and writing COLLADA documents"
-HOMEPAGE="https://pycollada.readthedocs.org/"
+HOMEPAGE="https://pycollada.readthedocs.io/"
 SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index 11a98550961d..c802da65f5b9 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -2,5 +2,5 @@ AUX pycryptodome-3.9.4-parallel-make.patch 756 BLAKE2B 06a79eff056ecb98313183828
 DIST pycryptodome-3.9.8.tar.gz 15633268 BLAKE2B 8c4f8d4839be0fb09556677514ee6c7f832684f20eb4e355cee87eb5b52a5c09e12712c1865ff89fb5dd6c628ca027374c7cab8a2287aafa4eecedf1095f1a12 SHA512 894e763720df284804fd686d5805980853b86773bb3097bf03d929818b9944e5a257e47414275f302966864751e50ae34dea19ad749910f1ceac31833a53ef7c
 DIST pycryptodome-3.9.9.tar.gz 15551299 BLAKE2B ac89bcc2bbe707cb2a9cf2496a2eb74ff5685f11017d60d67558de7ac6cad5c24c43b4074bff01e99378d7c88462e88e88f363c5329fb800e1a7872ad8a34dab SHA512 a1aad4d52256220fe3d5d7f399c2c5e7338d6eb88058da0571fe1c686d74d33ff4bc1c275d4b9373e0ff22f4ddcded75a25387e76fc65047f8612f8856c1bd4d
 EBUILD pycryptodome-3.9.8-r1.ebuild 1320 BLAKE2B 043de28361a19d129a73c360118f64d602039d3ea9a7a27a2564d709a53ec307fe7ca8589862436c2a44977f23cb7342e08d2fde8a1d32c524044a7cdc02302b SHA512 dcb8e914dd502e4d9335aa41d73551261d2d0645a75ae1389d534cddd693b25013d8551af300132d2093d2379e70eadb81081a082fed3dd551e49b35df3042cf
-EBUILD pycryptodome-3.9.9.ebuild 1395 BLAKE2B 7035c12219198de600b51f739424c508fb9099604424100c413cdb9db22bca1da378350358651b8cb918e18ea7eb3426fb687e079ce0fe72855c1f0fbd38ba49 SHA512 5edb7fee5e37826adb005e1840b5dc88182b9c4a2b4c6a0a9462f161a969ecfd06cfafe9813608fec7988c86f0adcd5f086ad65a45fb669f4b4116afe3b8d47b
-MISC metadata.xml 335 BLAKE2B 7e5036b03371769db2f3a8d0cb5d5cd9078f16d4dccc3bd012f0d4f96ba960388c3025df93bb165f3cdbe05d73da05537a373e01b799aac2dc59dcd44e6206b5 SHA512 a94a7c0c45ae597e5c4ac672a5e9151851448371ddae0fdbd9967651476681440f2d4a6071e2cd0c4a1553038a92f4e6649f0554b636d58a025366c57c80e899
+EBUILD pycryptodome-3.9.9.ebuild 1388 BLAKE2B c04652e3db3ac43bf586982815cb4008769adf7f7d15e39c57e2b85b1c9d744ef654d496a29118c1ba0a3698e163651c3b6ca457f4fae0c1c50a5a3e32e79965 SHA512 355a342e1bb2669c3bf2e6ac60e0d2226b695e40d738e767e2ec693c98e6540825bb4a9545c23e5b3056c74ca171a78deb8409dc48296931bebfd2252bb1575a
+MISC metadata.xml 385 BLAKE2B 8ee308521948e0f6bbc9c70e25c231a02424c9d4bdbf2c6ddda10767d4bf77bbda74607f4dce97ff42bfe6fef8a5ac2ee25e0b91bbc491e977c5cc46b3486699 SHA512 073885df3e0742b6088a537d54bfe9fcfb646ed9a5d3d19940d02fb05d453601b71db583567a4810a8d739c935488291624bc06948c4cb21b28a5500fbea4e97
diff --git a/dev-python/pycryptodome/metadata.xml b/dev-python/pycryptodome/metadata.xml
index 265b2611eed7..8d3def3bc0f3 100644
--- a/dev-python/pycryptodome/metadata.xml
+++ b/dev-python/pycryptodome/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">Legrandin/pycryptodome</remote-id>
+		<remote-id type="pypi">pycryptodome</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pycryptodome/pycryptodome-3.9.9.ebuild b/dev-python/pycryptodome/pycryptodome-3.9.9.ebuild
index db3ad5cb9dd4..146a5db4e6d4 100644
--- a/dev-python/pycryptodome/pycryptodome-3.9.9.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.9.9.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="BSD-2 Unlicense"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/pycryptodomex/Manifest b/dev-python/pycryptodomex/Manifest
index af6eb3fdd201..276792cea24b 100644
--- a/dev-python/pycryptodomex/Manifest
+++ b/dev-python/pycryptodomex/Manifest
@@ -3,4 +3,4 @@ DIST pycryptodome-3.9.9.tar.gz 15551299 BLAKE2B ac89bcc2bbe707cb2a9cf2496a2eb74f
 DIST pycryptodomex-3.9.8.tar.gz 15633485 BLAKE2B 3d7b8a74d2f7cc0f47c73f3f3d1dcf13c8b9feb9f2f532dc48751c4a73915aa081ecf273a81731076070f054f5b2037a5eba9054ca71e549aad18ed0c3148c74 SHA512 bcc5fb27a89c00e6348eacc744a23d687d0b308d5c8ad8f6d955fe2b9e84288a592206336e7fef699800948f8ea7b1ac06d2bec60df0b9ff0fa32d0a05380869
 EBUILD pycryptodomex-3.9.8.ebuild 1326 BLAKE2B 2ad09640a04fc98b7ed803a3b843d52edd55bf14b8b62de34dfd35fd63fdf5979a5fa5d745fd8f675048b130e504aa7f87799f303be6a5efacb30f6f8f1b496c SHA512 5ae9a1e0a9f7db68fa43d13bfc6489f680fb400c651e08ec651c33e94d0181f1a5411b5f0ad31859a66c08f753661034b30aa40da7926fa0e614a98f2d4c8101
 EBUILD pycryptodomex-3.9.9.ebuild 1510 BLAKE2B 1139a7ff5c924c04175db63903eeaea57b3f00c5c1869eb012810243097f1c40fbd78c1421d0366eb8ea0fe531b745061fd1132a9764bec268792dd48137901c SHA512 448c19f7bcca190b531015e0ea25d927d0b456fdc0b44a3c6b4d0d44a159e30579c45395e37683180477bb6d8b9e9c233a3ae38facf913a4741694d240cfc08a
-MISC metadata.xml 445 BLAKE2B 0486ce910a7107f8fd04a495f27f6c830ac8e2176442c3be759aaedfa43439050e8da73d0a0e58343e0fd0fa5ff1845dbe55bfeef814b395cea764104dea52a7 SHA512 957a228f0f1d67f803d5faf5f143bca871f3e83849b5d02ef6b5454247e085f93776eb14880dd9e4eaa18da149a34ff2f9b1e783df40f2a749ac6be813d3ac2a
+MISC metadata.xml 496 BLAKE2B 8ac5f6afdf1dc8341803e415ae9f3c7c845d066c613b0643f80202367ebd44385f9b0a101c154455d545da479358d74852fb15f003c2efbb0cd6da952454d5c7 SHA512 9d8246235e1ee909fcb035b8f968f1134a09b774f182a4d88bdf0e3fb6296412963fd15ea504aa627ccf50f431a4521c27b6c3233603a9eef486f93d03daf2aa
diff --git a/dev-python/pycryptodomex/metadata.xml b/dev-python/pycryptodomex/metadata.xml
index ff92fe1587b7..0bcccd6fc1e2 100644
--- a/dev-python/pycryptodomex/metadata.xml
+++ b/dev-python/pycryptodomex/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
@@ -11,5 +11,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">Legrandin/pycryptodome</remote-id>
+		<remote-id type="pypi">pycryptodomex</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pycxx/Manifest b/dev-python/pycxx/Manifest
index b27182f37a5e..8267dcf1060d 100644
--- a/dev-python/pycxx/Manifest
+++ b/dev-python/pycxx/Manifest
@@ -1,3 +1,3 @@
 DIST pycxx-7.1.2.tar.gz 150865 BLAKE2B bbf78d88ca13fafee1239c354167b56cef2f1d56d20b0fc81d9a5d7d82096ab5d6a88802f411719cc490179314f87ef89b1e53c2b8a3a784566f9ff9d16d7cc8 SHA512 67f8d8d1ec6ce63c39695cd56c3276767d5cb4b6cc2fcf7daf5aea4bac11114f5a1fa4784ecdb35be708859cf07fc88c8e9f00b7fc808169708fd0eef1056a63
 EBUILD pycxx-7.1.2-r2.ebuild 923 BLAKE2B efb45f153e05a8f3be3169ee227c871636060b5b0c5bc05cdfbb7085fb868f97a81eefdd59727f44d66c295943d70b88413cfd163ee0a6f8e3868404271a3887 SHA512 b56d2b467506f817629ed3037978bbc2a933f9c1dc9c7fc5c0814283448b9ffe8123a26e078ffc9431e6314488b21158e81e7f6f611c96968cec799b1559cf05
-MISC metadata.xml 623 BLAKE2B f58248b0fd25b697209c0dd07cefd240cc2bee7eb7ae8b76d3d2e7fa26ce9036e9478b8f07781821fbd2c666ebb4edc09c618d20cceb045acc5e21aac41b0658 SHA512 fbe60226b2e1a989e27652d9449105c6a188bf39ed07e0511901050752d1cd51d74a18fae9f794a341a3f6d772957757275b973a87cd49bf4745a87a509beb50
+MISC metadata.xml 666 BLAKE2B 0a8399e3ae824bcc0eb1e3de5975bd8f13784b23e4f46cb721759ac443c814e431883a99c997f58cca0b9cde91ebc483e1723968ade62fb52d5347f8193cccb1 SHA512 4a948f43e4d44c47982f3ad341b60390bd57e1c1aa3eafd0e20bdf1a8bf4f861c446db90bfa3bcd6c7c206220ea3d5b884805b02ee6efddfb8c5dab4578aaab4
diff --git a/dev-python/pycxx/metadata.xml b/dev-python/pycxx/metadata.xml
index 9c3186ce5bea..7ca375770784 100644
--- a/dev-python/pycxx/metadata.xml
+++ b/dev-python/pycxx/metadata.xml
@@ -11,5 +11,6 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">cxx</remote-id>
+		<remote-id type="pypi">pycxx</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pydata-sphinx-theme/Manifest b/dev-python/pydata-sphinx-theme/Manifest
index d2aa709a8e20..868043c2e9bd 100644
--- a/dev-python/pydata-sphinx-theme/Manifest
+++ b/dev-python/pydata-sphinx-theme/Manifest
@@ -2,4 +2,4 @@ DIST pydata-sphinx-theme-0.4.0.tar.gz 3276611 BLAKE2B fb260de2ad40f9a3b5e524ef29
 DIST pydata-sphinx-theme-0.4.1.tar.gz 3279361 BLAKE2B d3538dea9444272f1cb314d8b2bd8656b5114b916f31c4cca078867b02a24c60fc91e5ac367d09335b3ce4b9c9fb44405f61ed70b19ae9fed5d8919fc68f1566 SHA512 dbca1f7bde25c20a5ffb5b37ac808d84c938e6cadb6e0a6bc2d72101993889f4f7be3bdc50488bed1945779d30ca0f131bf74b16be2df00b5fa093f8491fad39
 EBUILD pydata-sphinx-theme-0.4.0.ebuild 963 BLAKE2B 696f60a0c0a1d9be9ea3d4a1efc8755aeb7a2265d3bddb1a6aff5039f6f5c2e8ffa67fe0f0ea905beefef19b08e0242de5a0bb674f796862f149c078e428c494 SHA512 025bcfcb6d9b871b86bd584d0d252fdc6ce67ec0fa31015f104d56c0852d9fa5ff275e5c3bafa4da7dba1fdf72613136286aed9a21e8bc2e555cb87d51698f32
 EBUILD pydata-sphinx-theme-0.4.1.ebuild 967 BLAKE2B 111231fbe86daf1fd4dbe33d47ceb8e6ee1e5a693a6525d9a1ffba1959f0342ae5a443e967b668d80b934c21fe372303f86afa240a4c0f8853803915383bab0c SHA512 758cf7d70bd3467dba1cb37338d59285daf2193ac24a099bc83bcc168c36dd3a4421dbb2e0d8eb3a6a4f9defe7483c095613fc5c86352754891d0520c41461de
-MISC metadata.xml 375 BLAKE2B 393138e315b4eae4dacb9339fbb5766e9dbaa84b7482babaddc08d524fb8b9939f6622ee9c6d09b66c61ac270fcc483fac39996a12ba87ccccf7cafd4c6d36db SHA512 9a44b6b9de4d1a61d6af9256519473541d5513cef349c15178c025dee3aaaa3f6772b1be56576411a985fcd9c70029c00743d8f577be8eaec4c5a44646c9cbf6
+MISC metadata.xml 457 BLAKE2B 699c90f5d94f9f2a535e30050d649fb4c62cd3f480d7d3519f045e6d1e8d3324565451acf3d8dbba3925f0d0c5c5800bea5dc2f877a23eb85051146d5db9ccbf SHA512 fac321117bb7009c171d4c369f60156a26f736a18db56a0caf45e11a52ec52819e4f35fd88e026534cda6ff946e45dadf3d57a326690e22ca6611635763f5f31
diff --git a/dev-python/pydata-sphinx-theme/metadata.xml b/dev-python/pydata-sphinx-theme/metadata.xml
index d22e99d73577..001562f7e06e 100644
--- a/dev-python/pydata-sphinx-theme/metadata.xml
+++ b/dev-python/pydata-sphinx-theme/metadata.xml
@@ -9,4 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pydata-sphinx-theme</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pydocstyle/Manifest b/dev-python/pydocstyle/Manifest
index b8c2e5042be8..0897401ce9f1 100644
--- a/dev-python/pydocstyle/Manifest
+++ b/dev-python/pydocstyle/Manifest
@@ -1,3 +1,3 @@
 DIST pydocstyle-5.1.1.tar.gz 70759 BLAKE2B 3cdb519d7f9459a201c9b7bc3002e69dae76b79758b155198b3101c6817c66db01616723e789dd8105d0339d6163fec02ab50db2370b13d3a8d1c5a17ecded6c SHA512 70c7408dfa4c8e54a3abf0548a9af26a7ad7ee0bb76f3a41bf6f2297ce09c13c03ab5e066b1b15404ba6390ddfcacbc5e199d8b73ee74e3b184759d88c8b2a51
-EBUILD pydocstyle-5.1.1.ebuild 889 BLAKE2B a0e5a096f030c87843b63857da282977e46fa4f8f73f6157a4715c2abf6fdf717a3cd4964b9fade5dc6fd44fe82eb02a5e907f1480f7041135501aba07665b5b SHA512 0d608ce4382ecc622e02f0e7b44b82be6441c52ba85ca9eaeb685435c07451320fc080b2020ecd7e37fbc10d49bfde783854c5b2294b1b683b2722a19fba73b3
+EBUILD pydocstyle-5.1.1.ebuild 913 BLAKE2B 5ca93c5f6320683b8ef405e58eaff2ad1233d7046bec85681b07cba7d63daac8e915a3d9058d6b3da7c67f0a14f38cc52b74c8ca2254e77536720079a950145d SHA512 a8028bdeca7ac3e08be31f08e70ebb4c33aa26573ba2686536d3ad4ec0405aa95cc9c1e5b2d7508c1488f7a10ea5b968300d27c37ce1f041189d95176923d68c
 MISC metadata.xml 787 BLAKE2B 15d107190e09858b1c4642148e64d288ec11c96509ab438488cb1aba5ca0640a8ca779c585221d6bfb066c5983f6f243c2c74fc099dbd4b09d026ec48dac662e SHA512 1d38ca977db0ecf99ce5c8a8bf6b57f897b7fd1d9b087075dcdfc5891959a6bf15baf0a8ae44202fc6a9645d08a0a0c52fa6e1e39ce08f7d6eb80f797476cd70
diff --git a/dev-python/pydocstyle/pydocstyle-5.1.1.ebuild b/dev-python/pydocstyle/pydocstyle-5.1.1.ebuild
index 028d2af436da..679fcbe1f698 100644
--- a/dev-python/pydocstyle/pydocstyle-5.1.1.ebuild
+++ b/dev-python/pydocstyle/pydocstyle-5.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/PyCQA/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~ia64 ~sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x64-macos"
 
 RDEPEND="dev-python/snowballstemmer[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pyenchant/Manifest b/dev-python/pyenchant/Manifest
index d36e23f52a10..d71d50898d60 100644
--- a/dev-python/pyenchant/Manifest
+++ b/dev-python/pyenchant/Manifest
@@ -1,3 +1,5 @@
 DIST pyenchant-3.1.0.gh.tar.gz 75012 BLAKE2B dde78c4f8e986be7e7b4f82979bc446d68a88c3289d472948bb704120fb0dfc3064b8fd46b1883724b0084eefb9e52dfd522bcda290ed5e7a99ae62c948f828c SHA512 d2bf872c15fca1e2c1aa8de06a9ee2c0e6128a69f728383ae9b91fb0ead2d66f804388671cc8156716e240548c29da41eb6c0678dd889012009c690bd078a7de
+DIST pyenchant-3.2.0.gh.tar.gz 75395 BLAKE2B bff9d4d5038252473fd7673758ecf1304f74f96514d984f5b6cd052042d0b2cf6fe2e149e3675777899107794c9d2fe1c630e87b031f38512ed2499ee1053f34 SHA512 63ca44aea9e7af3fecf554dc6156513c42d278a92170bd6b88b71a737def2e9fe7f7d2ecafd5fea2b860b4d5de55c9e8a6e4b30a58d6f28533bba71cc407850c
 EBUILD pyenchant-3.1.0.ebuild 712 BLAKE2B 171748cbd5f65d678c0288c48848cc04995edd6c1ea3aa597935f70db52c50095bfdffb08b8965c8adf1145f9c9063d8750cf526d0c0e512c31e671c1c909bf0 SHA512 bf7420e73287ae8d13e6f58bcff45ebb578b8059dcecccb494021c712dda291050970f4f9066479c9bbdb262053ee9084623409e96ba02bbea5f3332c72850f1
-MISC metadata.xml 870 BLAKE2B 991969a849f8342f8fcde0b547b58163214703c68ee65864522f6a64d74d8f8a5058619bb9cf00f61533e4cc218da2e3cc217049072b1cd2396cc7fa3ef298e9 SHA512 bf35258041e5664b6cea0a0c697edd684ee32c5a72f3dba7ef4bd87d060f58790d60a120c80dfbe4376cebd8edd9d45b5c2cb6b0fc5562334d8345b398cb565b
+EBUILD pyenchant-3.2.0.ebuild 638 BLAKE2B 575fd8e57251bfc43ee9c3d15a0f2145a9aa7bd04ec26d50dd448594d59b3aedcc426c2d1dfa51286b580d42c17c777f8009ae08ceb49bbb590849d3d5d56de9 SHA512 7795f4ab17d51170ecf6d15c5dbe885352b28496b61358bc2233bf4216650fd94847e4c36fce6af3e8ae15b85229203d574466b80247820dd6c0787e1372e759
+MISC metadata.xml 876 BLAKE2B 4b2b615496f92b395ca4449e8caba7860223101e142d45f3eb703e829d34b27a0e7b3965f7362739ffc16a61d4e5f495754415047b41473303982eb2bf35e528 SHA512 7e69e0da10236e15c70526eb35b2ae8d862109e3aaa81a2613f5a97ba08816eb71e76a845a0656dbe2a6bc92b45a79ab018386110aa7fa0687b3faba18c63129
diff --git a/dev-python/pyenchant/metadata.xml b/dev-python/pyenchant/metadata.xml
index c20386bc1a12..dfd77f62379b 100644
--- a/dev-python/pyenchant/metadata.xml
+++ b/dev-python/pyenchant/metadata.xml
@@ -16,6 +16,6 @@
 	<upstream>
 		<remote-id type="pypi">pyenchant</remote-id>
 		<remote-id type="sourceforge">pyenchant</remote-id>
-		<remote-id type="github">rfk/pyenchant</remote-id>
+		<remote-id type="github">pyenchant/pyenchant</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pyenchant/pyenchant-3.2.0.ebuild b/dev-python/pyenchant/pyenchant-3.2.0.ebuild
new file mode 100644
index 000000000000..a8226a33c22f
--- /dev/null
+++ b/dev-python/pyenchant/pyenchant-3.2.0.ebuild
@@ -0,0 +1,27 @@
+# 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
+
+DESCRIPTION="Python bindings for the Enchant spellchecking system"
+HOMEPAGE="https://github.com/pyenchant/pyenchant
+	https://pypi.org/project/pyenchant/"
+SRC_URI="
+	https://github.com/pyenchant/pyenchant/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="app-text/enchant:*"
+BDEPEND="
+	test? (
+		app-dicts/myspell-en
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pyfakefs/Manifest b/dev-python/pyfakefs/Manifest
index 80109fd86f7f..71b588bdddcd 100644
--- a/dev-python/pyfakefs/Manifest
+++ b/dev-python/pyfakefs/Manifest
@@ -1,13 +1,8 @@
-AUX pyfakefs-4.1.0-openpyxl.patch 1239 BLAKE2B e30306dfcbfe84a26e96550ce7fadaa15a81a229d8cbc32fbfa08f97a71dd1bc558cf984bb5d5a2627ee3e71cfd6dcd1197815195bb6cdb9956b7d82ba61bbdf SHA512 985d3020b7f768723634b0b5ac6f55ec8ee524ec1d7c14fa594a5be7e3dba674e65785f498b36d20b554f9b187fb381e50abd00ed75c070444682ca8fb85e2cb
-DIST pyfakefs-4.1.0.tar.gz 185920 BLAKE2B ee61e5ecda697150374bef035054038aed29e23958c58a3b135aae8dae7b397a194586ef6fd3ae70db1d136572a23a876d7f2dacb7e5814c1bedc9bb4502c3fe SHA512 946e21e34643db2b84e53d14bd9758c8edaa9e5e40b827fd74b245f018e8084995f55256900bf795c23a5aae29f124d9fcb80caf08442f6292adb80ee59d79b4
-DIST pyfakefs-4.2.0.tar.gz 192826 BLAKE2B b1b337f5845075d8c9f32565dc1169ec2fde7e49a0bcf2f446d09f090c8c46c69690259bfc1d8e76b754477303de049790a69a209c0ed11af465bd5ca2b2ddcd SHA512 d70266bac134eca45af3d2838f9f276217305add719aa1ed3606406b33b2d2f8bda20fbcdd4653e2a5e08baf717dd0f20005aa6f66ea519e52247c88fa8d72b2
 DIST pyfakefs-4.2.1.tar.gz 192910 BLAKE2B dd1826b8fbddb9c9f272cd6fe0a286a41dbcf1bba625cfaef22ea1f17089f6acf346c3a84e56e6ad41f501329c06539bcda72cad670481a3ad770d014ad1e93d SHA512 99ee0ece46ed457dcf98c4c59ee905e58bbfe66e4fadcc3d3d9d725c2ce7b4fae25bc3cf847c85045a828beab52f315ec2ee78e6fea4b23cfe9aaddfd49f1829
 DIST pyfakefs-4.3.0.tar.gz 194821 BLAKE2B f7deca18ad019dba12ac35bac44be339fc1eef0ef609f33b2fa8974f3bd65a25fba043f0afef0e332f9a71f5014444eb7c6e890acbfcfc9c8acb780dc88140a6 SHA512 42c6e9da0f098eeb948fbe3f1f26e8fddfb35d3156543ccc2297cc0fb971a87911a94ca925d2fd12531999fd9314b615f49688a3e9a4aef19522cd08bdabe72a
 DIST pyfakefs-4.3.1.tar.gz 194638 BLAKE2B 752fb2ec88d7468ca439e7124e26b9f111f3b3971a47062b598a0d66c9fc5d8d317716ad73648de727ad6072546fd7b02f7f3a65da45998a20d5f5f3e5999bf1 SHA512 9e1521b7c051ef984329ebe9e2003f72a6f54497dcde46b3fe1b14f282ba436dc17ebd6b8e570714eb1ed8de9f484e6bc94ece0a39985a47f7668f350b5a797f
 DIST pyfakefs-4.3.2.tar.gz 194897 BLAKE2B c3b36e280cb73c4bcd2349382eb67726c19627b0c6dc392a0f38ec7f9f001e5ddbe93734de6d177c68ea1e2213c5c7d06827e3aa12af0c7cd744ba35b8d5df5c SHA512 50479d2ac7b8622ee30c4c2f09cb3d2bdfb315b4eb61eecb37f8946f038ec9048d653250a0f58dcef55b1b8347b040ecd416f61f26ecfdf7b083801114770803
-EBUILD pyfakefs-4.1.0.ebuild 738 BLAKE2B f3deaab9c1e94c81db2ffdf999a498dd7e7c221cb7db10f4d728f647d6cd6a7cfb520d271d533d447327d02adfd9287abd685b9ee710b344458bea2a8a856b9d SHA512 8fe06ccd381b0caa5b101d78519c40acdd9b025859ac8225b1783a6b41a4ca8558adfebfdbbad48ac2c471523c32c4623fc02a861f849beb97bb65e5b342ab16
-EBUILD pyfakefs-4.2.0.ebuild 698 BLAKE2B 3c3ba93d28a54eb237c8b2949a86773cd8499c5abcc972706dbeb1e2fd35c96148c4b93300f894a96571035807a51199bf220c1018a9201c111fb4aa7262bb3d SHA512 b71bca1c47aba4f7d1ba85f160fd52e35a10a8658afbd64a75738e6b7c1c391225b8f875ba138f9ed3c665d5c1ba7a9a093e689afb2a788ec8ab2b5c88f9b37e
-EBUILD pyfakefs-4.2.1.ebuild 698 BLAKE2B 3c3ba93d28a54eb237c8b2949a86773cd8499c5abcc972706dbeb1e2fd35c96148c4b93300f894a96571035807a51199bf220c1018a9201c111fb4aa7262bb3d SHA512 b71bca1c47aba4f7d1ba85f160fd52e35a10a8658afbd64a75738e6b7c1c391225b8f875ba138f9ed3c665d5c1ba7a9a093e689afb2a788ec8ab2b5c88f9b37e
+EBUILD pyfakefs-4.2.1.ebuild 690 BLAKE2B ff030a1f00ded2adfc8b128f2dfadde2d02dcdf8c2c5535c2d67c91c21ec07874993e9e6e772ae9fc5af8f4b387b4fa2e1b13e9da0e2af7e33e3d18728a0f6b7 SHA512 e461e9dbbaf75603e855f5d236c8ee6b4b651dc6ec1cd3092a6ebcdd5e167a061ef17fe2d6652558777f765395a0e21ca1f711d5f8f9d68a5cc828f1371ba876
 EBUILD pyfakefs-4.3.0.ebuild 698 BLAKE2B 3c3ba93d28a54eb237c8b2949a86773cd8499c5abcc972706dbeb1e2fd35c96148c4b93300f894a96571035807a51199bf220c1018a9201c111fb4aa7262bb3d SHA512 b71bca1c47aba4f7d1ba85f160fd52e35a10a8658afbd64a75738e6b7c1c391225b8f875ba138f9ed3c665d5c1ba7a9a093e689afb2a788ec8ab2b5c88f9b37e
 EBUILD pyfakefs-4.3.1.ebuild 698 BLAKE2B 3c3ba93d28a54eb237c8b2949a86773cd8499c5abcc972706dbeb1e2fd35c96148c4b93300f894a96571035807a51199bf220c1018a9201c111fb4aa7262bb3d SHA512 b71bca1c47aba4f7d1ba85f160fd52e35a10a8658afbd64a75738e6b7c1c391225b8f875ba138f9ed3c665d5c1ba7a9a093e689afb2a788ec8ab2b5c88f9b37e
 EBUILD pyfakefs-4.3.2.ebuild 709 BLAKE2B 9173aa57fe05213cb4d0542bcfddaab1408992cc44d3a7c25f4fc77f538f5c37de4513ca3db5cf73911a017a94575831a92f835058b0a1efb7c27b3c5af0e3fb SHA512 ca87513a5b5bc21446324e51de8e077f1417e7d4c3ab6e7bfac8534e01e325f6f2b96b14cc191e57fcc824c836b20b740dfa88bfb2d32e3455a64b8ebe4c9670
diff --git a/dev-python/pyfakefs/files/pyfakefs-4.1.0-openpyxl.patch b/dev-python/pyfakefs/files/pyfakefs-4.1.0-openpyxl.patch
deleted file mode 100644
index 44b76b0132bf..000000000000
--- a/dev-python/pyfakefs/files/pyfakefs-4.1.0-openpyxl.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 1d6fabcaccf8dc716f7a49a67f5342d83ef37976 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sun, 12 Jul 2020 21:26:33 +0200
-Subject: [PATCH] Skip test_write_excel if openpyxl is not installed
-
-test_write_excel fails if pandas are installed but openpyxl is not.
-Adjust the condition around the case appropriately.
----
- pyfakefs/tests/patched_packages_test.py | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/pyfakefs/tests/patched_packages_test.py b/pyfakefs/tests/patched_packages_test.py
-index 05ed7ef..f8d8a1a 100644
---- a/pyfakefs/tests/patched_packages_test.py
-+++ b/pyfakefs/tests/patched_packages_test.py
-@@ -28,6 +28,11 @@ try:
- except ImportError:
-     xlrd = None
- 
-+try:
-+    import openpyxl
-+except ImportError:
-+    openpyxl = None
-+
- 
- class TestPatchedPackages(fake_filesystem_unittest.TestCase):
-     def setUp(self):
-@@ -57,6 +62,7 @@ class TestPatchedPackages(fake_filesystem_unittest.TestCase):
-             df = pd.read_excel(path)
-             assert (df.columns == [1, 2, 3, 4]).all()
- 
-+    if pd is not None and openpyxl is not None:
-         def test_write_excel(self):
-             self.fs.create_dir('/foo')
-             path = '/foo/bar.xlsx'
--- 
-2.27.0
-
diff --git a/dev-python/pyfakefs/pyfakefs-4.1.0.ebuild b/dev-python/pyfakefs/pyfakefs-4.1.0.ebuild
deleted file mode 100644
index 4209e0be8c6d..000000000000
--- a/dev-python/pyfakefs/pyfakefs-4.1.0.ebuild
+++ /dev/null
@@ -1,27 +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} pypy3 )
-DISTUTILS_IN_SOURCE_BUILD=1
-
-inherit distutils-r1
-
-DESCRIPTION="a fake file system that mocks the Python file system modules"
-HOMEPAGE="https://github.com/jmcgeheeiv/pyfakefs/ https://pypi.org/project/pyfakefs/"
-SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-openpyxl.patch
-)
-
-python_test() {
-	"${EPYTHON}" -m pyfakefs.tests.all_tests -v || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pyfakefs/pyfakefs-4.2.0.ebuild b/dev-python/pyfakefs/pyfakefs-4.2.0.ebuild
deleted file mode 100644
index a437b0e387d6..000000000000
--- a/dev-python/pyfakefs/pyfakefs-4.2.0.ebuild
+++ /dev/null
@@ -1,23 +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} pypy3 )
-DISTUTILS_IN_SOURCE_BUILD=1
-
-inherit distutils-r1
-
-DESCRIPTION="a fake file system that mocks the Python file system modules"
-HOMEPAGE="https://github.com/jmcgeheeiv/pyfakefs/ https://pypi.org/project/pyfakefs/"
-SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-distutils_enable_tests pytest
-
-python_test() {
-	"${EPYTHON}" -m pyfakefs.tests.all_tests -v || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pyfakefs/pyfakefs-4.2.1.ebuild b/dev-python/pyfakefs/pyfakefs-4.2.1.ebuild
index a437b0e387d6..de3186579fe3 100644
--- a/dev-python/pyfakefs/pyfakefs-4.2.1.ebuild
+++ b/dev-python/pyfakefs/pyfakefs-4.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/pyfltk/Manifest b/dev-python/pyfltk/Manifest
index be3f50e8654c..6684ce6e2d20 100644
--- a/dev-python/pyfltk/Manifest
+++ b/dev-python/pyfltk/Manifest
@@ -2,4 +2,4 @@ AUX fltk_wrap.patch 247 BLAKE2B c6f16fb2c87265c7b1b9d869d9b92454eeab50f6cc8830b3
 AUX ignore-func.patch 250 BLAKE2B 3d2a979b2580881ee1fa1a6e30b2afd639974d00ec7475c005d8ca967a599ef6858d158d2de95501d7397c1cf8c5e68c0bd0a72da5fbf037bf1fdfd0e8e04600 SHA512 66854b2ce487d1182ada54b437ad79ea5395d87e4b08d89c9ed85b67b21d426609406201c19914e0872ee558d3b3109d3b43a7af036ffb98b781e07731239419
 DIST pyFltk-1.3.3.tar.gz 946763 BLAKE2B 28798578e7a90f2c3b6d0be22241207b384643ed5269ffb4bb5940d5e8776e59ae3c2b740ba7ef61f0230e037d1b3488adf78d9af69338204df9572218ed8cab SHA512 dd4bbef8e82d455237dd085622e78e046ac522449fe63610ee5405c24d759482a89aeab07435fefb5223db78cc1f810f1eca8355afb1d0ff3e4b5e10b73bef8f
 EBUILD pyfltk-1.3.3.ebuild 1078 BLAKE2B 3419f4a40638605ac63592b3c8c7042644b8975d0c01110ff2ff2b03e8064a74babf9e476bda65b95e0f084baa109cc05854e0291f7b32be9872730324e80456 SHA512 2f66d1e7f55f4a3bc3e5bc6385d7e8276917514b9a8f9687f568ff78902fe512126ff239d0df3f8a1eeadc62818c6c933cae36b06d3abd19c52809537baf0a75
-MISC metadata.xml 473 BLAKE2B 0e5625017dc5f5196012da6388fd6f7ef598c005cdf6dcb358a230f7b15014f6e77666772bb351862f2e2ac8690d77132b269e9988ea63662855a85a720b321c SHA512 b6f4d80dd9e608ec2b4b1a8d799c5cf0d238a7d908de0b79d30da2d9b60f6745aa1595256e59867774814114ac0abd5dbaf8456c9f0a17f7fbcddb6d8354b4a6
+MISC metadata.xml 517 BLAKE2B eab205b013c01aac7ce7a1fedd4712f17b8e7746a99edb64fa2f2964984034f697a510cb5da27cc8c90cadb282d459b8680747955a87c85edd39665e99f0687c SHA512 fdf6a5f137e6ab778031d142a82532dbcbe31c72a23a127ef3d95bfe9d2dde50190763c3f7bbfcd15011802504a33e00ad587c29eaec8d915da2c6f6772b997d
diff --git a/dev-python/pyfltk/metadata.xml b/dev-python/pyfltk/metadata.xml
index f25f3f8d681b..c912ec01839e 100644
--- a/dev-python/pyfltk/metadata.xml
+++ b/dev-python/pyfltk/metadata.xml
@@ -11,5 +11,6 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">pyfltk</remote-id>
+		<remote-id type="pypi">pyFltk</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pyftpdlib/Manifest b/dev-python/pyftpdlib/Manifest
index 3b9296e1678b..28f89cd5fea2 100644
--- a/dev-python/pyftpdlib/Manifest
+++ b/dev-python/pyftpdlib/Manifest
@@ -1,3 +1,3 @@
 DIST pyftpdlib-1.5.6.tar.gz 188099 BLAKE2B 508e94da6b27b4b1f15306df2916c176f07ca31944398e9ac580fca8d2cdc72ca0ee8e7db282de6745e2e401b23b1fa8cb8de400dc2ba998b93ac45772c78157 SHA512 a3c3c1cac221a8a3c090ee208c03134bb1b8de58099a23ca6ee422f06fb97a0ed561c96e62c62b21fa112dd0b3458651b9fc0c55d72dc0bed79d0583b319a50d
-EBUILD pyftpdlib-1.5.6-r1.ebuild 2732 BLAKE2B 3e88a21fb6c968d686c587b36eb2642a038beaa9f76210042a7368a07ff51a3f8291877f12ea716c2c1b1c53d9c9c248b1f212c07967b085bbcc6b2178b4775a SHA512 cdc40c132a64002a8d112c400180479ce436f9609e43c4ca8e70c1cc51221b363bdcf43efeb76036ca3dea5d45d3d8925cb383709eb0a643f63c54f8b48dafef
+EBUILD pyftpdlib-1.5.6-r1.ebuild 2976 BLAKE2B 2608f5c63debe7242956551516ad823de79fa1a223493a3806cc877ec008606cf27fef44317b85e545ab0bd50934ef7db586f6c2d3973a8f276b3776ef208706 SHA512 62322040b930c027508942527bec34f051ca3d96b26b91a7ef29ac8c11a4a1712acb55f83711528981b3347fce2fcbe44a5901844dc91993b4f72166c134ac70
 MISC metadata.xml 438 BLAKE2B 0e0860eb9d885ec9b432b504bef6a9394cf4a2d6d99751c80fec8441d8910f8a17364e5f32782638ac689abf5cdd3ebcb5fa20e7da3d612a5e8844e8c8a34d76 SHA512 a748827370b53c94fed352cd6bbd7468a22c7ca2f15c4601c98a2689e3a7e652ed28434bcd125fe0f3018d5508600df03130c18d7d67834b28ac0c3480b16345
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.5.6-r1.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.6-r1.ebuild
index c98a11ff0494..12d44dae1d46 100644
--- a/dev-python/pyftpdlib/pyftpdlib-1.5.6-r1.ebuild
+++ b/dev-python/pyftpdlib/pyftpdlib-1.5.6-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+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"
 IUSE="examples ssl test"
 RESTRICT="!test? ( test )"
 
@@ -60,6 +60,10 @@ python_test() {
 		# https://github.com/giampaolo/pyftpdlib/issues/513
 		# https://bugs.gentoo.org/702578
 		pyftpdlib/test/test_servers.py::TestFtpAuthentication::test_auth_failed
+		# https://github.com/giampaolo/pyftpdlib/issues/543
+		# https://bugs.gentoo.org/758686
+		pyftpdlib/test/test_functional.py::ThreadedFTPTests::test_idle_timeout
+		pyftpdlib/test/test_functional.py::ThreadedFTPTests::test_stou_max_tries
 	)
 	# Tests fail with TZ=GMT, see https://bugs.gentoo.org/666623
 	TZ=UTC+1 pytest -vv ${skipped_tests[@]/#/--deselect } \
diff --git a/dev-python/pygame/Manifest b/dev-python/pygame/Manifest
index 73307463b4fa..c83f6a4366a6 100644
--- a/dev-python/pygame/Manifest
+++ b/dev-python/pygame/Manifest
@@ -2,8 +2,8 @@ AUX pygame-2.0.0_pre10-py39.patch 1174 BLAKE2B dda7880b7a57e62612f072ed25c9c661c
 DIST pygame-1.9.6.tar.gz 3223131 BLAKE2B a4d04c933fcad244d32bd512ef8717e60ec923f361e9e0296b5c7d57c5949d3434a040d028249c5b8f3c865ac3dcdbb32e6f0b223186678595a8625213ba2a17 SHA512 d923c554203a7c35e37921658cb4c5bf50215ab0ff4d2b869a1ee6b2e2ca31d66ec4bbde4287f5a777838ffe932cd15b993cb0224b86e43d684de61c35acbcd0
 DIST pygame-2.0.0.dev10.tar.gz 5567274 BLAKE2B 7d78f260318cfabeb33f1073ae210f890d2f772e3ef302f243cca67724c6012355644ba60d4cae6de72db6dd61d320177deff6ee83dd355ec4cc33e841b565f7 SHA512 4cee7599fd8a6d31ddd66bfaad3bbb67cb167c1ae339f37e83322d810fea8746e81a191c224a0eeb6cc43a64bf1730ff0886c82f1a4f642e2e656ca9a837bf9e
 DIST pygame-2.0.0.tar.gz 5522621 BLAKE2B 49773979af53595d3ff2db1a18e4bcd217e26db3ec28d6129d2a588f23a1bd5326fa79fab32c25aa796738cde0e68f5741bee58f62432e86f89cd49ee17a8f14 SHA512 3f65924d0e1d2863b84118a4e468b521a289e2cf174405c6f3ee2b2a2ed399cde7f9f310d57c4166351f84caaea02dd7408ee852dbcee7c205bb2955b6078fda
-EBUILD pygame-1.9.6-r1.ebuild 2294 BLAKE2B 1bf372a3814f5d28db059250e0adfd1f039d7d594801b5b319b77e5137c25957658c6db0a963888f5737dc5850e2385fe4819bb711dab7f0fd021bdbb8375cad SHA512 23959b2a00d38297e146d11a803771e0b18a48ef605e0696f008c23c64e134e8a170f79015169de8652c1384440a7648915a44840f5ac6bcc9f1a1b74689e085
-EBUILD pygame-2.0.0.ebuild 2078 BLAKE2B 335022c652d050e93984fd7e1ec83d86bcc5c981915883b994dbc7186573f92e4cfe6a47e5674792b200bf36976eb4a1d4c1a3ce311d01a1df8e26c44d0826b8 SHA512 62634815ce97906a8742fec6c8e3b1d444e8253899712e444e3a521d68198cb6eb97df57cead16a0042773fe3ce42b8d3f8d8608dcdfd244a58393576ac4b8a6
+EBUILD pygame-1.9.6-r1.ebuild 2295 BLAKE2B 682c814c2c6471f81bf7f4304ef056fe96651d5f08dac9c89e8801ec30eb88c0779cd7425bdb492f888886a9f1058ce999576b62120bb0fbd707efd48805f5e7 SHA512 3a8461dc43baf4970d3bdd1dfa18b2993f7d19858436b562c6767016cc64850a4efaa80f121e87b4ab9badd5db0f1c994e563ceff61b6f53511a3b1475d6ce8f
+EBUILD pygame-2.0.0.ebuild 2074 BLAKE2B d2c44c2be2f39e04f88c5bded248b1ef79d568962a99cd3928521aee39ac735b6d0971afc438817cce47133bc363db7b5a0b9b8f04301b191674ac507011f8f5 SHA512 f01647e5d470537ec933eddce6dca6339cca42321150f2f0ff437bcfcb6f59c85bf9b7aad23ed0306217c2aa6cdb25a1c9c1a5210678624ca0630473b87e0680
 EBUILD pygame-2.0.0_pre10.ebuild 1911 BLAKE2B 1b9feec06c2cad0101e9a966dc9f52d3ea1e879cb425c021ec637e2dbc8f2cb8226d573bd99bd7616d0dedf99a3dc982c405effbd55a271f63c84f23f538d923 SHA512 e08204ab6ec0f7072b175d384c8fe2609e1e488b9b6215d0f4604431f619fc6d6d6e7f21aebdac3b206e9d8f92394b9dbf4fdcf0bf07764d9df7e412938302ce
 EBUILD pygame-9999.ebuild 1737 BLAKE2B c854247d528ccf4aaee3c348d16ee9148d2de2624080e80e233d947249719b1d3f16d0898703a1579b725fabc369679a2a3e113da4ce6af9f64fdf2d7dd983e7 SHA512 c3ff68bc1c97aff762c5b66507f1ae159476a55cc9b7395841c462769109a105bc961cac9e5f7284223d169c0afbbdd305a533b06ecf2966e7c0c07b4833096d
 MISC metadata.xml 408 BLAKE2B ae371ef164069765d0964da714a83c9898ddc190ac295c5ad5bbb6a3c45db5aa415d84ff21dbaa510e5c9852397e6b6b389684c54b67d83d675afd9b3d9a697e SHA512 a6e06c0bed59d5157166577a2dafa53f28a310c56f251bec36af077a79342c6f954fa63a3fa8d3546ca03cc9358e75eeb1ef04c6e0371e43e0b7bff51ffe35dd
diff --git a/dev-python/pygame/pygame-1.9.6-r1.ebuild b/dev-python/pygame/pygame-1.9.6-r1.ebuild
index 6cda47383f18..a5a7b80b7fae 100644
--- a/dev-python/pygame/pygame-1.9.6-r1.ebuild
+++ b/dev-python/pygame/pygame-1.9.6-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 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/pygame/pygame-2.0.0.ebuild b/dev-python/pygame/pygame-2.0.0.ebuild
index a43bd4b42236..487b86f99f2b 100644
--- a/dev-python/pygame/pygame-2.0.0.ebuild
+++ b/dev-python/pygame/pygame-2.0.0.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/pygame_sdl2/Manifest b/dev-python/pygame_sdl2/Manifest
index a9313ddaf5e5..f6a605fb2ee4 100644
--- a/dev-python/pygame_sdl2/Manifest
+++ b/dev-python/pygame_sdl2/Manifest
@@ -5,4 +5,4 @@ EBUILD pygame_sdl2-6.99.12.4-r4.ebuild 1103 BLAKE2B 01f497b66ea90decb55533520ac3
 EBUILD pygame_sdl2-6.99.12.4-r5.ebuild 1113 BLAKE2B 83f99eaa4354ddbb00d7de872ff8d5a72cff5c3d174d0e3f8d11ba1fe88461e59142ab7c3fe575ba7d2ed778fded85b1f4d534b0ca9aee2fb4bacc867e50e52b SHA512 e3a2dd3e3d38859b1bf8e6fc4788dad33bb2f6118ef79db1f07251b2650aaba195027993f2134b2fb401fef7a5195654cf239d8f69635e1808052f0eae3e21a8
 EBUILD pygame_sdl2-7.3.5-r1.ebuild 1050 BLAKE2B 3acc4a3442b315bba46ee780d283f4ca2aab973eafcf4476e194590b434cde5f813fd0835373dec2e9de6b81c730369d850ed287692e04a95fed2d915687fb63 SHA512 530ed75bdcdc03ac211f4a5d2822be1842a92321c22370033ba83fb999035db6eda89ef7a82822cbd66752a3c7ec8a484b567b985af5383d909afa48ea22ee0a
 EBUILD pygame_sdl2-7.3.5-r2.ebuild 936 BLAKE2B f56e68e2a4cb47d8e9761b7d15fbde445c4111810efa2256b4c01114ceacbb86912b4f5f9cfa44b7d8fab073380cbe8b28cdc637122400762d1b6b400a9457d8 SHA512 8210375dae6c47460ec1d021681e21695840180b11e30e636437244edfdbc4ca1e469884814122ac084a21408911ed4d0c1a223efc8dc12a389f5cedc0a7c183
-MISC metadata.xml 332 BLAKE2B 3af5bfcb689c906453097e4bcc7a7b87ccec6bb1f1f8c43766d4ae5c473f9e220314b8591c63ab9b4ddd67eb411a27400a431a043ca5f696069fc4bf31291ffb SHA512 ae1f94e0d1f533a9f2db740f0a1c534456cf5a919262aebfcb501269ca3b508e697750c4bbc6eb60db8dda2182ecb712a10dad5d91efce20f24c5a736d9b3521
+MISC metadata.xml 381 BLAKE2B face1e81c908bd2e35fa85bc3d2ed8473cdfa943b699828de42b38aa89a977c3e07c0b1034180407e1d1a36646cd47649bd77703bfea4e6854899a8ee881d8c0 SHA512 6427a345bfd1e8fe49f30795c50f6253b20199420976e501e5a81a92db0cf882e1db0bca15a417d9a898e71e20124c537bad9c6fdfdd1a848cb59406ea2ae517
diff --git a/dev-python/pygame_sdl2/metadata.xml b/dev-python/pygame_sdl2/metadata.xml
index 88d1d1b3d9f8..33951f65a614 100644
--- a/dev-python/pygame_sdl2/metadata.xml
+++ b/dev-python/pygame_sdl2/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">renpy/pygame_sdl2</remote-id>
+		<remote-id type="pypi">pygame_sdl2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pygments/Manifest b/dev-python/pygments/Manifest
index 0b80c6d8beac..a296b167b67e 100644
--- a/dev-python/pygments/Manifest
+++ b/dev-python/pygments/Manifest
@@ -1,3 +1,5 @@
 DIST Pygments-2.7.2.tar.gz 2350457 BLAKE2B 4a67cd34cc41402e485e2bbb827a00f5184c00d26ca6f341c190457134598bd1cccc87a995eee85eb007a98b6d7b9e3e33585d0c1c0bba4289bedb36d22f351d SHA512 cd667e2cb33261060c316e3b92934dae735e2aa6c427b77852d4d18f28941cb369da05adb8540dd9fe3262b3e30e2fd6456e345bccc848be9dbdba20e97ef157
+DIST Pygments-2.7.3.tar.gz 2355381 BLAKE2B a7ae0ce7fefd8e2ec707ca8cf2d01d1b746d233e36c78ec51055f750e1a508240b706be50e5f1260f93fe19e15dc27d8de8c614260783713dc61c3c683b86c57 SHA512 fe58ce0beb3d2fd88b374d7864e93dba41e4e2ad6dca570e284fd76615c5bb4e78459a4b8c4dd5f61603d4bccd5705cebafd7274369d158af149e838ec63f7eb
 EBUILD pygments-2.7.2.ebuild 957 BLAKE2B 5ba91793dad581672920516e614f0a8b42149e8b7e80c6cd92176b9bea51d60eeaa5e934f6237a9cfc5404ac5f0636a557b717f12980e4529f37751d32894030 SHA512 8fa5d1d43f0230051f3a317f0dd127d789210d162699eb64c2ddfeca3d563fe12d262b31da3ccd39cbb97e4a9b745792f258228b3639276f41f9b8b686f4711e
+EBUILD pygments-2.7.3.ebuild 966 BLAKE2B fa0cf443f46babef9acbd41c69f9c00729f67096fc7a799d7fd7616503eeb53f08abea6dc1164018ea5725c69278e7166dcb77f2f6d36a780fce4f35b80ee449 SHA512 89e82d92a767a1a67e4ec63696c7a453905db1847d660e816a4b730e9c954ee78b2610be456f5119c1bdc57852befa918f7c3b30c54e370fce23ae73c3af74a5
 MISC metadata.xml 556 BLAKE2B 87120b6aafeefb97b45a6895b23d08c6443cb177d5bc337845bec55ebdb59ee9eb19ef41c10b3ce4d61452c602f925b4120a441959b5b5d5fea26e15de4a1510 SHA512 b5f4491bb714e2abef07da4e960609aae651ceae3153102467e19bc4d06b9006418729f0b915cc026842253287786faa083d608c0ad5bd7f5c423922740580bd
diff --git a/dev-python/pygments/pygments-2.7.3.ebuild b/dev-python/pygments/pygments-2.7.3.ebuild
new file mode 100644
index 000000000000..d821d49619e3
--- /dev/null
+++ b/dev-python/pygments/pygments-2.7.3.ebuild
@@ -0,0 +1,35 @@
+# 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,7,8,9} pypy3 )
+
+inherit distutils-r1 bash-completion-r1
+
+MY_P=${P^}
+DESCRIPTION="Pygments is a syntax highlighting package written in Python"
+HOMEPAGE="
+	https://pygments.org/
+	https://github.com/pygments/pygments/
+	https://pypi.org/project/Pygments/"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${PN^}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+BDEPEND="
+	test? (
+		virtual/ttf-fonts
+	)"
+
+distutils_enable_sphinx doc
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	newbashcomp external/pygments.bashcomp pygmentize
+}
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index f1ba02d2cb76..510057862d5c 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -1,5 +1,7 @@
 DIST pygobject-3.34.0.tar.xz 552268 BLAKE2B a9cbeb644e0aa1b23067b591fe5c6299741395656631d39782a8c183a5d3a8e5e7f1a81acdefee186b7cc2bc34dda9271468b1828d5b9613ddc1256e24f1ecb8 SHA512 782195d22e564b88dea8d43469f0111f398b44b51a63df2fe7d07650af94d5cd037f322a5d7e405338823be3419fcdbf0113fe50b220ab1cfd07d4d01dbc4766
 DIST pygobject-3.36.1.tar.xz 556568 BLAKE2B cd38aec8e71ff230926327e77867d07ae0fd5549b71619301bb3be01821ea93e557ecf335ea238292176981a864b269eaa2a86da47e8fb320f187f54caf24dc4 SHA512 5e00dcd03dfe4f92acbf827c13c164b6b9740b2a8cef3b2dce70f96a2156fee2411c84dc669f12b910f4a93daa03ba845282832e2b09d8c887102d43764a345f
+DIST pygobject-3.38.0.tar.xz 553892 BLAKE2B d6add416c3f87ee9d5a56f30dbcaa599682ec5932b204f7c743d50475503ea2705e7943e6a93610d6f1c9d322723d1df6ea0f19c1cf245b2ca7d49395ca36170 SHA512 d63313dea2c143cf8c08a4678f1aa8e5908d503ad29c596eeb9fa1070e1231de57cf934c33031f9c4920b85e391f3b4143b46491ffd16e04e8d48871cb05e5df
 EBUILD pygobject-3.34.0-r1.ebuild 1896 BLAKE2B 2e53e017e9a4d12394fa45b88700a5af9cfb725edad3925c9f6074cbaa446dc7ed159e8a2249d914be697d37f99900a1f379bee6b4efdbd9ac2477eccd96ad98 SHA512 08eaf6f24dc0a71d394a0ac9c2a823f906d25ebdbe8bec4947863226805a7c6f05366dc2754399ef23640ddb2f46011eb8e6596ab0233c6eb8264fe8c88451cf
 EBUILD pygobject-3.36.1-r1.ebuild 1757 BLAKE2B a17f0e79188e09f56bc61c4dfd4c48679c7b9963b82ae3036b629cd50e8b279bba2219baa70faf3bb66e792abb3cb5836e593ee697c80613b069e7616dbcf58c SHA512 4bd3363fd7d8d1184b0dc9e0531bf60d86363c5b747f238c761ce91630260e2a8ee854bd1de3b2db33ab504a1210adef737a36ce9113584aa9f6e5e91191839b
-MISC metadata.xml 1220 BLAKE2B 4f2d4f1091eef503e2ca7457418888071d70509e346ded7c5e77839c8e5e6dd1c27957e6645a7f32bc7ba0810aff8a55874e7225f7a9e7674e4c1bfccee2ce1d SHA512 991d11e7aba9fc7d6ccd6971a150d50ebcd397968a9a2c2c901093f598acfa70eb8719a3a590c10433147fde97603012862fe1fc613f766ccaa2a159705a6ae6
+EBUILD pygobject-3.38.0.ebuild 1769 BLAKE2B 14885783c8c1400d41ca4fba96f2601a83c80dc3e35622d746bd99cd51b7d76f4df93380e5bdaf669a69ef1247bc845133f6f895f5b3eee056d6c35578c968b7 SHA512 f057e880dc3cd8f0d5e2c7ecdacf35cbde57dd4138317cf0227e1a84edcdc6be3c63fed9bc26250a7f8f2002b4dedd5d8ba05bafd0d734f37234cb77a753afd7
+MISC metadata.xml 1292 BLAKE2B ba52782219669d3f01ff1befd8ddcd445c36ac0af2f9e4125ca4fedca7c01665282485b9457b189689c80d4db55de9316ee2dfc19d06340c23a6f00e08e92213 SHA512 7aaf7a98227e36a6d556f225161eecbc43140736f3e79583694d131e99218f887aa6cfdb9991d6fb041bba6e7df2318e65e8cdf181d97bc41301aac6f040df48
diff --git a/dev-python/pygobject/metadata.xml b/dev-python/pygobject/metadata.xml
index a958cbef81b9..255ad1b9c7cb 100644
--- a/dev-python/pygobject/metadata.xml
+++ b/dev-python/pygobject/metadata.xml
@@ -23,4 +23,7 @@
 		library it is instantly available as a Python API without the need for
 		intermediate Python glue.
 	</longdescription>
+	<upstream>
+		<remote-id type="pypi">PyGObject</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pygobject/pygobject-3.38.0.ebuild b/dev-python/pygobject/pygobject-3.38.0.ebuild
new file mode 100644
index 000000000000..880d3b6a6108
--- /dev/null
+++ b/dev-python/pygobject/pygobject-3.38.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit gnome.org meson python-r1 virtualx xdg
+
+DESCRIPTION="Python bindings for GObject Introspection"
+HOMEPAGE="https://pygobject.readthedocs.io/"
+
+LICENSE="LGPL-2.1+"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="+cairo examples test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.48:2
+	>=dev-libs/gobject-introspection-1.54:=
+	dev-libs/libffi:=
+	cairo? (
+		>=dev-python/pycairo-1.11.1[${PYTHON_USEDEP}]
+		x11-libs/cairo[glib] )
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-libs/atk[introspection]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		x11-libs/gdk-pixbuf:2[introspection,jpeg]
+		x11-libs/gtk+:3[introspection]
+		x11-libs/pango[introspection]
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	configuring() {
+		meson_src_configure \
+			$(meson_feature cairo pycairo) \
+			$(meson_use test tests) \
+			-Dpython="${EPYTHON}"
+	}
+
+	python_foreach_impl configuring
+}
+
+src_compile() {
+	python_foreach_impl meson_src_compile
+}
+
+src_test() {
+	local -x GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
+	local -x GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
+
+	testing() {
+		local -x XDG_CACHE_HOME="${T}/${EPYTHON}"
+		meson_src_test || die "test failed for ${EPYTHON}"
+	}
+	virtx python_foreach_impl testing
+}
+
+src_install() {
+	installing() {
+		meson_src_install
+		python_optimize
+	}
+	python_foreach_impl installing
+	use examples && dodoc -r examples
+}
diff --git a/dev-python/pygpgme/Manifest b/dev-python/pygpgme/Manifest
index 46e315cc8faa..c1899cee1583 100644
--- a/dev-python/pygpgme/Manifest
+++ b/dev-python/pygpgme/Manifest
@@ -1,3 +1,3 @@
 DIST pygpgme-0.3.tar.gz 50100 BLAKE2B d55ddc79a569ddf007552909a142836c54f97f6a5e9b503dec0405d1df387a9aac04f0424b3700cf35bb5d1bd891f0b90f2dc3fb7cc88435da83944adfccdaec SHA512 25fc199a7958adfa3bbb294108792974ba96ee7b15dff98f7933e9b089a6044d83bb7c7b77ca84ea0cab5b182f6d401cee42ecab57ab9ba34aa0b14eb6ce7736
 EBUILD pygpgme-0.3-r2.ebuild 531 BLAKE2B a59443b7ec04bb558e9391f5eb7c9949c925cd04ade0da00118eb641720d6dd156c2921772182de78cabf33b8242c18384cbfc65970b32ec48e868763fc3e5d1 SHA512 9219b539befa434ae9f32113f687d4ebf39c2baba95b1558281653407299d02da10b7a49ffeb26a5f3539f1498ed3fd2d9ea6b7c697161dbff2033755c5338b5
-MISC metadata.xml 550 BLAKE2B 93d93ed6170da174718a86d4f2afbe0f1b39d51fe49393ed45b0956ef4c55ee7b74d2376612dd3dd3fd839692bf80e6006cfc87cf68ccf155dea5b6e62cf744b SHA512 aa2f009654855d7bd18be6f2d7f7228bf4b7b532fded48d03173324d26394a1342f0392a373680364387c403210871675763c06e9bbc76e9837f620434dd4030
+MISC metadata.xml 595 BLAKE2B ae2f409ef188769a5b454cda93e565cd3cf2a80ebfc6ca97d4ecf31e87fab1a1641e975212e9bf5196e5dbc1f0c75c4b853301a2e5f33fb2a6b482d1a862ea8a SHA512 c7638d6b3cd9f113fc8b0d159a081ca1ee4381c9f1a9aa1e733c6b41db819fee0da9f4d34fddf11827daf5babaf3f1c2ca5dbe274f38bc8a4845ab45d2d53179
diff --git a/dev-python/pygpgme/metadata.xml b/dev-python/pygpgme/metadata.xml
index e655296bf6aa..4ed7c399c83a 100644
--- a/dev-python/pygpgme/metadata.xml
+++ b/dev-python/pygpgme/metadata.xml
@@ -13,5 +13,6 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="launchpad">pygpgme</remote-id>
+		<remote-id type="pypi">pygpgme</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pygresql/Manifest b/dev-python/pygresql/Manifest
index 2637efaab4fb..80e923d5552e 100644
--- a/dev-python/pygresql/Manifest
+++ b/dev-python/pygresql/Manifest
@@ -1,4 +1,6 @@
 AUX pygresql-5.2-CFLAGS.patch 333 BLAKE2B caa18ab6ba4da14437637faf6cea4d27e829c4f547f9c08e33a452b1e5912a24235af823c9ea385bbd1516c0c80a08d3225e373ad64ad4d13873ff4dc5155695 SHA512 ddafaadb4ebfb68af71727f840f36800d3dd78323f8ab0324a16b50498206c8ac33c76a80f24fff7984195ed5ac0fc383bdcacb9ea334f4b47e5046864728cd0
+DIST PyGreSQL-5.2.1.tar.gz 267750 BLAKE2B 6c0d4bcfe4f01bf3214efffa1be274b4a92b5e173094e1afe217aae9a44f88d023b43a2de9d4977fb8ce28d25718cf1cd5d123e8ffc2588f2539b6c03277ec55 SHA512 b304de447c239e4737571b38f0e0761448bd4e313f5b28708aced12cf190f323b85f80d3d87e054b62733add770c7bcd33be644a4f17a96ecc0cf4ab3dba85f3
 DIST PyGreSQL-5.2.tar.gz 267557 BLAKE2B 92c2c0810a9b763fc2e9fec2e920ca1e21da4eb4ede5f2e20f66fd385ccc623fd9fe74075c6b995c6ea6348df76dcd723c8e4b6d83afdb53c978c02cc5220e49 SHA512 ce1cd29c714ab863dbdc7dde920f8938b115535ae3a0b54c770d7648f05011a716d604eec2d73c321fe2a408e64bcd9208c204856e5ddb0e0675ef7c076e4da7
+EBUILD pygresql-5.2.1.ebuild 719 BLAKE2B f2ed32acda8133a3c918a86d6701770db79be58dab0b8e9f7013f22cda2fc02ad9f60a1d7933933da0a37f3cf2bdccc823262bfa086c49284ebb8d4f24aa4a97 SHA512 feb40d0eb114955475bbb6417cf90a0a566fc51e590cb4af225a6dc35ede1c376ade2fba76ca8f0dbe17cee77f6bcac30c9b22d58f83d6d70f13274168e19f73
 EBUILD pygresql-5.2.ebuild 716 BLAKE2B 42addf8de65496ced3dc58174f46e74b96dd154e0d192bc6c68c1e69ad23971e3ed508f496d9056ebc64c63a665a016907520c1b8ef891b87e2676729f819716 SHA512 ca0e4c3941e87211791ce994aafdf055adb243c94dbf861d22e82c2a6ae479fb9904c9ddcfb4d3c5b69aa2eebb8c1e8ce3b68dc0cc3e3b76692de55349d1cd48
 MISC metadata.xml 452 BLAKE2B 8d60fd06e68e39b5d373f30fec25979a0a67c51eee216425e382b559b908ccd12e425c95995dfd28d8487fb306f03fa10d8a71320a4ff5ebd6349e887af624e9 SHA512 f6877e2fd8cb2b6606a29e421d0f0ab4fd66a5e7446a4307718d1c0435c2e8ab3c59db795ca1e18e58eb79d0474c57bf35a3d0544095d2d7d618cf25e96ff55f
diff --git a/dev-python/pygresql/pygresql-5.2.1.ebuild b/dev-python/pygresql/pygresql-5.2.1.ebuild
new file mode 100644
index 000000000000..85268d8d534f
--- /dev/null
+++ b/dev-python/pygresql/pygresql-5.2.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+POSTGRES_COMPAT=( 9.{5..6} {10..13} )
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1 postgres
+
+MY_P="PyGreSQL-${PV}"
+
+DESCRIPTION="A Python interface for the PostgreSQL database"
+HOMEPAGE="https://pygresql.org/"
+SRC_URI="mirror://pypi/P/PyGreSQL/${MY_P}.tar.gz"
+
+LICENSE="POSTGRESQL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND="${POSTGRES_DEP}"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.2-CFLAGS.patch
+)
+
+python_install_all() {
+	local DOCS=( docs/*.rst docs/community/* docs/contents/tutorial.rst )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyh2o/Manifest b/dev-python/pyh2o/Manifest
index 6100cafd5aba..137dff991008 100644
--- a/dev-python/pyh2o/Manifest
+++ b/dev-python/pyh2o/Manifest
@@ -1,3 +1,3 @@
 DIST pyh2o-1.tar.gz 7327 BLAKE2B 9d6b308d17dd799e2c83a191c346a3d78fc0a097de2a2fd5cb6277a1525992aa18f6c6b61b2c2503ae4a9e7ddd3575e092aef77a0e84223a5a2c702c0a808f1d SHA512 529fa4d8e9c477346fcbd23d7172d41de96789797f0e1ad0557f4c0bdaea8a519a8e8735845d0080cf171182874ce0819e76357ca7c7db1d62a9544f907095db
 EBUILD pyh2o-1.ebuild 502 BLAKE2B dbbe572d0d8ec7d143c35b06d2aa7fd4123d23f45d4d17b546e83a1bd15b0a1d01a5d12e95b102e7d40356e64c542a10f8f03c7565de4976a759f6bdbf634ef9 SHA512 2434a534b3b73d711041d11a0b9da9e91ca3a4758908e4fc1004209029ae60b29646da6460d6e410d8e32b9b8279055e9bbed4511618c61b36c84e3414613370
-MISC metadata.xml 521 BLAKE2B 6f0fd3f19c783f63615643e3f0ff35cad870fa4ea16e4f111b645da056b0984f95ec9f886128c40e0d85ebcddde6768575652021b4c3f9db206a5ca8b5a05b31 SHA512 dff927c256adb5963ae243715b8a50dafece0ee94fb8a7bb416b7d8e2801cb4d6380412ae6ce36866fa27b403f487a1158a5919fc7ba727174ecfd9d5d10e7ec
+MISC metadata.xml 542 BLAKE2B a3847920d4b1526410ae3ee9a17350a12514cc7e0d0a41e6f8cc73167d54323782e545a8e6d0390602a9d76591f0d8dd7ef86b849c57e6ce62b79d9ef3e99611 SHA512 248321593c67549be80ce214c093cf5a9d07557d4dd4d763b405ec2198dc159aeacb27804b5f29e58cfb264c55fd5ded032b65b254a4e87c5c6fa63a399a516e
diff --git a/dev-python/pyh2o/metadata.xml b/dev-python/pyh2o/metadata.xml
index 175983e000a5..4b9474c07b4c 100644
--- a/dev-python/pyh2o/metadata.xml
+++ b/dev-python/pyh2o/metadata.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>mgorny@gentoo.org</email>
-    <name>Michał Górny</name>
-  </maintainer>
-  <upstream>
-    <maintainer status="active">
-      <email>mgorny@gentoo.org</email>
-      <name>Michał Górny</name>
-    </maintainer>
-    <bugs-to>https://github.com/mgorny/pyh2o/issues/</bugs-to>
-    <remote-id type="github">mgorny/pyh2o</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<upstream>
+		<maintainer status="active">
+			<email>mgorny@gentoo.org</email>
+			<name>Michał Górny</name>
+		</maintainer>
+		<bugs-to>https://github.com/mgorny/pyh2o/issues/</bugs-to>
+		<remote-id type="github">mgorny/pyh2o</remote-id>
+		<remote-id type="pypi">pyh2o</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pyinotify/Manifest b/dev-python/pyinotify/Manifest
index 5b6f75f2561a..8f5939fc9166 100644
--- a/dev-python/pyinotify/Manifest
+++ b/dev-python/pyinotify/Manifest
@@ -1,3 +1,3 @@
 DIST pyinotify-0.9.6.tar.gz 60998 BLAKE2B 7fb55cfe5b2c02682b5842d95859a58f218ab591a4eee689b707e804c6fe8cde4cc1fb3dfbf54a044ff743deefa0ee5551bc6e27ca4dda1c608218a6c24597b2 SHA512 b52de43293b06b32236e90b7c33fac061f3095cd7d4aecec89a099d56020db1a85440ab9dcc8b521238c001fc49a1f37d1b16d621bc1acab4d7273aebcaadbc5
-EBUILD pyinotify-0.9.6.ebuild 767 BLAKE2B ae63262f3844340c16bce4df36500eeea7c93505c7629d78a608b4ac5a33ecba6750abff76bf33b070fcc570416f9633f85c7bfdecf16235f2631c9dd396aae9 SHA512 1471ffc5f22e05c0884cda7b3bc69ed0a0400250d64d16ef007e2f1aaf24cd0e5ab4835e097b55d60e2db704b13f8250546fc2ab49153960cd50132fe8e1e42c
-MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
+EBUILD pyinotify-0.9.6.ebuild 733 BLAKE2B 1593b7f3e0dfd019e2aad9c4b12c9643db86360aa21a9a0e4dece23086b9c57018ff24ceab9db79d56701f4bc3701d167fb6c70c1b27f3fe0ecbac214f0b4611 SHA512 f0e28774f22a6ab1e6503cfbc0c19f86df9154654ad8cc8e92eb54c90b4fd41a88bf3d293039e19852935cbb0e2745bc112b7ea34a8577496e619f59afb52b98
+MISC metadata.xml 367 BLAKE2B 5c08d19d51faf9166d5ef8a7660a7c50fcaab71709b68e8dee43ec6d06e02eda7bc5781b72631f8e7b877431e458aa21460c8aaa4d18132d6fe107c158c4033b SHA512 0d8e82046735575615d9bd70b3fea5a9c529368cb48b16fe1c3eb0ad850676b143846cd772ce899d259f764bc3b6260e257ecca3eb50be70d2df6e08feaaf810
diff --git a/dev-python/pyinotify/metadata.xml b/dev-python/pyinotify/metadata.xml
index 7f4f33c6dbc9..4c5bab5fe104 100644
--- a/dev-python/pyinotify/metadata.xml
+++ b/dev-python/pyinotify/metadata.xml
@@ -5,4 +5,8 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pyinotify</remote-id>
+		<remote-id type="github">seb-m/pyinotify</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pyinotify/pyinotify-0.9.6.ebuild b/dev-python/pyinotify/pyinotify-0.9.6.ebuild
index 0fad415c410c..6f1cc0f92141 100644
--- a/dev-python/pyinotify/pyinotify-0.9.6.ebuild
+++ b/dev-python/pyinotify/pyinotify-0.9.6.ebuild
@@ -10,10 +10,9 @@ inherit distutils-r1
 
 DESCRIPTION="Python module used for monitoring filesystems events"
 HOMEPAGE="
-	http://trac.dbzteam.org/pyinotify
 	https://pypi.org/project/pyinotify/
 	https://github.com/seb-m/pyinotify/"
-SRC_URI="http://seb.dbzteam.org/pub/pyinotify/releases/${P}.tar.gz"
+SRC_URI="https://seb.dbzteam.org/pub/pyinotify/releases/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/pykerberos/Manifest b/dev-python/pykerberos/Manifest
index 55e303219c68..9a8bf60cf8ec 100644
--- a/dev-python/pykerberos/Manifest
+++ b/dev-python/pykerberos/Manifest
@@ -1,4 +1,4 @@
 DIST PyKerberos-1.3.0.tar.gz 41033 BLAKE2B 5805df2c258a75321dab5fe84fcbf1de706cb7c14a710c914ae4918dd39f79036a4f4033a068982778f73d9f00a4ca45b80e9cfc59c6a246a236f3c6931bacc5 SHA512 ed2644a236993d9737af43be951d57207fc787a74e82f343b265461b456923763610f1ce1b46d7d56f22d6452be1418b98707b8529b22fd8abf299143e52cf69
-EBUILD pykerberos-1.3.0-r1.ebuild 1309 BLAKE2B a495155c23e6d965de0daf8bdb95a7002b6cde0ed3828df2717091067c3520490ca66441a370970c3bbc92cc0f360c2fc8f2bb28651f900a80b1fe1664ddfd59 SHA512 baaf93252fc62684b180ff6eadf6ed205a2a5d76481acd1721bbf031ce14c3fcc9fd6d527abf1442a03949fa12b76e63e4382734c533b7d29abd0203196065a0
+EBUILD pykerberos-1.3.0-r1.ebuild 1308 BLAKE2B 8de49285c3a28a2bb56effa38b5d37e6022d2f0d3613213fdd1f594c568de4b601e36cd8f655f4e6f473b1835307de909cc903aa457a11a9168c573e47e9f6a2 SHA512 0cb0956462676c4106b4ddcf9dc35c136344b953388c2244bd5693abcc725ab3dba522d75e9456b55e3640dd1310c98f08f566bcfabb1447f5f7453565d924be
 EBUILD pykerberos-1.3.0.ebuild 1319 BLAKE2B 04348fe54a9b06dadf14693e784d1b652317124a81b111b5239cab4420c888fc72aac1323b1da1f9d5f14433a9fdccb7c0e4e45e88492452ad6caa27ecb1ec09 SHA512 46b623a0288cec6f1acec781f62e1bf2ddf3998605999db9c0ce5cd1510f07bdb8b388f04f9efd9f72f7a58a618365f66371aac1d4013dca984ca1f92f326d66
-MISC metadata.xml 423 BLAKE2B bc74606c5e0d18c76749904da2d388a2be603d2aad92538dbc0ab92974903a24a78788094eb6da7775028b8cd178334b243246fb0f4ba85f90f74fa31bd74f35 SHA512 c84e39a4e84b841aed995cd47aa349df5c4d3ec32757e826a7194c7f629e5f109e30c841f4f4bdf949e966937cde58ee555d6dbe02496baecc25937f06244950
+MISC metadata.xml 481 BLAKE2B 5e7a2f53e994e262e3bf3d85dcfcc3b74fe54971f620277b5dfa74682c69a0fe75e578ff863f157a758d784a895d61a7560300de3138c93378a28060d1bce4c3 SHA512 dfb577fc1818d54f4ff97223cdad710b2e1007c31ef4a2455625cdc7ece6f1c10cb13e706c8f1e78824d7fc9de480ba052205e4ac8090fab69238683b74f2ea8
diff --git a/dev-python/pykerberos/metadata.xml b/dev-python/pykerberos/metadata.xml
index 856e0e9fd9ca..85ecc1c2fa99 100644
--- a/dev-python/pykerberos/metadata.xml
+++ b/dev-python/pykerberos/metadata.xml
@@ -10,6 +10,7 @@
 		<name>Python</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="pypi">pykerberos</remote-id>
+		<remote-id type="pypi">kerberos</remote-id>
+		<remote-id type="github">apple/ccs-pykerberos</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pykerberos/pykerberos-1.3.0-r1.ebuild b/dev-python/pykerberos/pykerberos-1.3.0-r1.ebuild
index 0d5435a1f31d..797119545a5b 100644
--- a/dev-python/pykerberos/pykerberos-1.3.0-r1.ebuild
+++ b/dev-python/pykerberos/pykerberos-1.3.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 MY_P=PyKerberos-${PV}
 DESCRIPTION="A high-level Python wrapper for Kerberos/GSSAPI operations"
 HOMEPAGE="
-	https://trac.calendarserver.org/wiki/PyKerberos
+	https://www.calendarserver.org/PyKerberos.html
 	https://github.com/apple/ccs-pykerberos/
 	https://pypi.org/project/kerberos/"
 SRC_URI="
diff --git a/dev-python/pylama/Manifest b/dev-python/pylama/Manifest
index 5f9dc98d83b9..ba446c3f394c 100644
--- a/dev-python/pylama/Manifest
+++ b/dev-python/pylama/Manifest
@@ -1,3 +1,3 @@
 DIST pylama-7.7.1.tar.gz 34740 BLAKE2B a4bd5aed40c2c4e7bdb9f9968030f0954f0309cff80567b2252ee9576fdb4598714286bda63c22676789d4919662430ef2729089faa70b5cb590784eb47ef1f0 SHA512 298fabffcdf38e3e868e3965de87a0e761bc9dfcfe33320b53057c4e05598bcc22045481ec16ccb8df27f49ea41d6fef82b69fe7327905f93ce74d9350682cf0
-EBUILD pylama-7.7.1-r1.ebuild 1280 BLAKE2B fa7aa6ee027ca0351e9c0c02aca5edf080b33b6882592dffa365dba62a9a62cfa243bcca7b6a7250fa457f3d10649ac22ea9d0fa94568ca07478d1de29c0c8bc SHA512 be6282f2a56ac7ef85ee72a6ebc85b4ad3997ecb1de4d67926e421ea2f92abb4e0ee2dc9f818fff360fffb398a788d85a80e5d1a343f3677a81ea69ea66f0cc8
+EBUILD pylama-7.7.1-r1.ebuild 1303 BLAKE2B dfa780b79a6acfd9572bcffeacd44835c546319b07016f0d970c74ab25598458e0317006bc8679b72acb653bb47a9c7e8a13be271b4484299fda34a07b9448f5 SHA512 e19c23d5790b1fa385fbc2e4925a489e2bf19c53eef87ede364fbd96c2024d2fba86029dfb4b2dc4c194414e942538bfa34c893a0e696adc5436d381715ff4e2
 MISC metadata.xml 388 BLAKE2B 9fd8abe101834b8d24d232875dec2f2e84e2d2983b7fe27243cbadb60208df63e7fbc9b450c7587df71a3ad488b104e43b43ec0e013907006e622ca5cac7da73 SHA512 96cd8e9bc7391c28d2625f02521ae93a1ae901c04c144288cfb5a7d7c0de70d2e58f73a51071b4f82f3f043c4f6c94bfef67a2e29ff7187302dedb3a421117e7
diff --git a/dev-python/pylama/pylama-7.7.1-r1.ebuild b/dev-python/pylama/pylama-7.7.1-r1.ebuild
index 87655172923e..99c48bba206f 100644
--- a/dev-python/pylama/pylama-7.7.1-r1.ebuild
+++ b/dev-python/pylama/pylama-7.7.1-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/klen/pylama/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ia64 ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/mccabe-0.5.2[${PYTHON_USEDEP}]
diff --git a/dev-python/pylibacl/Manifest b/dev-python/pylibacl/Manifest
index efcc009a0e0f..40cd58de9bca 100644
--- a/dev-python/pylibacl/Manifest
+++ b/dev-python/pylibacl/Manifest
@@ -1,5 +1,7 @@
 DIST pylibacl-0.5.4_p20191217.tar.gz 40283 BLAKE2B dfe5baababe4cce24bc12dd61263c30160e93be7dc0625abdcad9e4daed19c5ac1ebf43351f9f5815884162258884cd8c7e2edb323ec9ce51247a43d53fea20e SHA512 6d4a84e1885a2000226f956580a8e767216d6280d4b8ae1066e6a1c1f82708d06a4f2eacc3ae45ff7ae3b122125da9fb6afbaae038e117b63cd7d91ac95e2624
+DIST pylibacl-0.6.0.gh.tar.gz 40231 BLAKE2B ba76f5540de62cec8572960b65f65289d7fe2066f76861240849c4c8175a9219b7ced086739b5a9b4d560a125c8fe759cc7b5b688bd4dc3d84ca4dc78897ea75 SHA512 a93ad199d9946490a863906411893a204bf801df71cf70217d6b29940a9365f05fd121116f22e054a3b8d27cd62e35c73566c1e0dd246ae5c0edd2f967df50ba
 DIST pylibacl-v0.5.3.tar.gz 32792 BLAKE2B 005785dda2b7933ff71dd1296b1d4315a6492fc893aba56136c775f78b9aa3bd8f9d4898bbe0160fac53a306329977ddaecd073739531ba42dd0b6cc622b9eef SHA512 ea648acc3df9e1cf2fd68576b0b691a353b257d00b74fc80aa7f60089b9dbc912452ebe6b84da2930cac888b9047740530dd0e38b4d5be52c37fc6d3a29a7ce2
 EBUILD pylibacl-0.5.3.ebuild 928 BLAKE2B 306b483fa1d85458b90480b771629ffd7ae18ef3dfa2a6d8084ec697e0812e13e380f1ce77cbcbf34082aab983fa0937fe71707d0f02d348dc2ea6ad4c3945e2 SHA512 496633a731bbe0c05b7350ff14ed644039a48f9c2d55e317dabd3cebc36ea08e17fa8b4e38d1acaa324ba674944b99cdd8181ccff9f30998efc84db752c9f97e
 EBUILD pylibacl-0.5.4_p20191217.ebuild 1009 BLAKE2B e2a5a73bc61d3243b26c115a7e7945260e59a9bedaddbf88affb5bdf5c8348d3db4d200afb96113f6ac05b87b825bd74f8f672d3aca0ab25e6516377cdf36cda SHA512 ea5e810818be787556024c6264572ef32a0dfa0c3013f857186586545c668cbc7bd24ee1b8430e632abf1ff06bbc8a71f6b4ab3388137472c347f9521cac7949
+EBUILD pylibacl-0.6.0.ebuild 916 BLAKE2B ceda85abf946e016856f5cb7d555c79527e132ed4fc1279c55d41a9f81101bc1c17c1e10151f7b1ae63f5773df2565acbd5d0d0888dbca3748c5d725566e3571 SHA512 b601d44f42c0f31411ed3397cc421c2d7607b6cb0f5a15810a97802f462d369ea5fcad706a5a71dfcce6b90375b11657e20bd76ef9017f0c7b87c99d3359a6b6
 MISC metadata.xml 445 BLAKE2B 01fa6d3dbb4f640a84c7cde4fc2c0c2691345fde557c7d26af9b5aaf5f64ee281a9c50eb273471ef3ec1a4c7cdfd8b48bccfdf3e50804f88981353a7a5433ce8 SHA512 b5fd28a88149cc0afb3535daa5c5e8f67f137e98c0671595a381d9d748212ed93a3226339b4999c7cfce1779fa6fa0cf568f38610ef77fed685e62dff9f9a344
diff --git a/dev-python/pylibacl/pylibacl-0.6.0.ebuild b/dev-python/pylibacl/pylibacl-0.6.0.ebuild
new file mode 100644
index 000000000000..5b4469c6178c
--- /dev/null
+++ b/dev-python/pylibacl/pylibacl-0.6.0.ebuild
@@ -0,0 +1,38 @@
+# 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="POSIX ACLs (Access Control Lists) for Python"
+HOMEPAGE="
+	https://pylibacl.k1024.org/
+	https://pypi.org/project/pylibacl/
+	https://github.com/iustin/pylibacl/"
+SRC_URI="
+	https://github.com/iustin/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="sys-apps/acl"
+DEPEND=${RDEPEND}
+
+distutils_enable_tests pytest
+
+python_test() {
+	if ! pytest -vv; then
+		eerror
+		eerror "If you got the following errors:"
+		eerror "\"IOError: [Errno 95] Operation not supported\","
+		eerror "then you should remount the filesystem containing"
+		eerror "build directory with \"acl\" option enabled."
+		eerror
+		die "Tests fail with ${EPYTHON}"
+	fi
+}
diff --git a/dev-python/pyls-black/Manifest b/dev-python/pyls-black/Manifest
index 7010fe0bdad5..ec78931cbf5f 100644
--- a/dev-python/pyls-black/Manifest
+++ b/dev-python/pyls-black/Manifest
@@ -1,3 +1,3 @@
 DIST pyls-black-0.4.6-gh.tar.gz 5121 BLAKE2B fb1265d40e7c8b85d066d8d3078a60ff719992abcd84efc9d9df582d6fd7e47f211dbed004081413955524e9455218085d78f1d843769a40168ac448139e283c SHA512 e9fa3faec0fb3f2a8bcbdd4c9b8b8e6662d1bcafa88f693b09e2a7a4df8c2d35df8d8f79c50bbb33342a07cde8931e7f136136ff40879898612b13bdff7277fc
 EBUILD pyls-black-0.4.6.ebuild 674 BLAKE2B a41fd5b1d5d63ef5bfc9e653d50129b8fc8d1422fa807f71436e9492098373d879bc440349cc08e950a25c092f2a983f9f0e068b720032c6d1fb007e23b14661 SHA512 ea31936de6201b0070d70a090ed6a691d5660be965b1a40843b57f462b2d88e38c77a72c11bdee80aa3c767f6bc88632f6adefa13b797aee53b69cb323138820
-MISC metadata.xml 527 BLAKE2B 700a1f12dbbc9c6b3b070cf733a231d67e96781cfd738b1042f4da10af849d76ec907e12a2d209001557f71cf734777422945e1a60874ec661ed38ecdc7e7bbd SHA512 091a36453820edf449bbacaaf3b62e0c12f35560d63927530c2d2a67bbdd75e888de97a6f0644526238a102276d9049e713265b74dbdd354b5c374cd02c3c009
+MISC metadata.xml 505 BLAKE2B 7d94d682d88b4bd10bd85d1a0462785d92bd8fb4c655bc1a8ba095ab7504fadfb95d92fa66b6a192a3e35ac0456ef06b01092999a64f490298f6feed05a2c828 SHA512 d7ffd158ced5f40d242e407994df64061691e392ccadcf186d032b5cd1ddb450c89fb09996c34109463559e70a6c59dc5a889ad2f757b1768f013d26d4a08dcc
diff --git a/dev-python/pyls-black/metadata.xml b/dev-python/pyls-black/metadata.xml
index 0d4b1e724e4f..01a6beca43a6 100644
--- a/dev-python/pyls-black/metadata.xml
+++ b/dev-python/pyls-black/metadata.xml
@@ -1,16 +1,16 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <upstream>
-    <remote-id type="pypi">pyls-black</remote-id>
-    <remote-id type="github">spyder-ide/pyls-black</remote-id>
-  </upstream>
-  <maintainer type="person">
-    <email>andrewammerlaan@riseup.net</email>
-    <name>Andrew Ammerlaan</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
+	<upstream>
+		<remote-id type="pypi">pyls-black</remote-id>
+		<remote-id type="github">rupert/pyls-black</remote-id>
+	</upstream>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/pymad/Manifest b/dev-python/pymad/Manifest
index bf59955a2354..baa0de1ce52e 100644
--- a/dev-python/pymad/Manifest
+++ b/dev-python/pymad/Manifest
@@ -1,3 +1,3 @@
 DIST pymad-0.10.tar.gz 26815 BLAKE2B df694f1fcc7b2c6d0d0aa064b60d061ade2240085867b6a12b3ed63a93cbcac20ac40b3929fbf5b8d9c7b6dbc52883130d02b309ce7690addda6c78813ca2847 SHA512 68a7c93031d174ab50dfa406eec4166be2158d39c4231baee18b7d9c879692376cbf491bcd3e5747e65c496b07a40d1597532551aedcdf05d0fa46f6e185a3d8
-EBUILD pymad-0.10.ebuild 526 BLAKE2B b9be0d925ea073b736042b876ecc4a7e5da7ba3055af2a7fbd5af1d2d028d7c9087784666f84adf8efd0b704aba7305a4f96e2d336025049202bfaa100a24b9e SHA512 89a321f19cc74744249c24baf1063fbfe8ca705d87e6d9e10a514a05a7c10c067aaf52452ef5472c40c2d4f31b8bbc4a12de7748b66388a79caddee9a73ced1b
-MISC metadata.xml 310 BLAKE2B ebccbb3d64c5b67a00075bef2ee0bf4d4be2b15c2f661516274ebe5972f0db25667945f0f2917380be74df6e50f6d09d2625f94050f4bd2c10d2df819dd711b8 SHA512 5b6c98faed99761df114172e90e2a338530e9dd9c06c447cc661cbf63c2361364ab3f9fb34790a09122d6e570e51981e7c4d2091539ad9efacff8e39e5951123
+EBUILD pymad-0.10.ebuild 526 BLAKE2B c17b99fb1f5a6c043cddedb69b148e97848082b8e64dcd4b4cf82fc68c23200a108246f9e87683d4d95b9aeff22317d5c38e9bbe6bd388245e30076bc79b4ef5 SHA512 7a83457ab515fa80019f7b90d31af1e191ff2a25fc714c27b746a5ffa2de5753b1864eb95d212145e0d387ec08da0714ca8e3b98ccc343071c7462d17945d955
+MISC metadata.xml 360 BLAKE2B b52717adc48466593ae2457033381b75329e9fcf532cc0e5069264444a273c7bf72f9c1befc933493f6ffb58597bba302e9368bb06a95bd454bb70ec68d717af SHA512 9715084b1b0334d5c49a5b6236b49dde49e59afefb9704271ff58da0e708fce6d963977bfb350050513980a8c038494179a791c0cb3d31ef4608c325f0b4ea55
diff --git a/dev-python/pymad/metadata.xml b/dev-python/pymad/metadata.xml
index e24cb2a46b11..3664c3d28637 100644
--- a/dev-python/pymad/metadata.xml
+++ b/dev-python/pymad/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>python@gentoo.org</email>
-	<name>Python</name>
-</maintainer>
-<upstream>
-	<remote-id type="github">jaqx0r/pymad</remote-id>
-</upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">jaqx0r/pymad</remote-id>
+		<remote-id type="pypi">pymad</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pymad/pymad-0.10.ebuild b/dev-python/pymad/pymad-0.10.ebuild
index 70a673dee65a..2d72b05df66a 100644
--- a/dev-python/pymad/pymad-0.10.ebuild
+++ b/dev-python/pymad/pymad-0.10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6..9} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1
@@ -11,6 +11,7 @@ inherit distutils-r1
 DESCRIPTION="Python wrapper for libmad MP3 decoding in python"
 HOMEPAGE="https://github.com/jaqx0r/pymad"
 SRC_URI="https://github.com/jaqx0r/${PN}/archive/version/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-version-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -18,5 +19,3 @@ KEYWORDS="~amd64 ~ppc ~x86"
 
 DEPEND="media-libs/libmad"
 RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-version-${PV}"
diff --git a/dev-python/pymdown-extensions/Manifest b/dev-python/pymdown-extensions/Manifest
new file mode 100644
index 000000000000..d237de73f77b
--- /dev/null
+++ b/dev-python/pymdown-extensions/Manifest
@@ -0,0 +1,3 @@
+DIST pymdown-extensions-8.0.1.tar.gz 642787 BLAKE2B fe25fd828633bb1a653430431de9fd2f9abc881ff457d2c630befd7c094a147f4d4883088488a66c601190794c15fdfb8297a3252ba3b070412b2f18872f6126 SHA512 3f85bfe9128dcdc63cea4c2eb4d55173d697ae9d112559a74527ed64b3bd63f67eee119b81a54d0ac927bc21b6eb8411c03dc7afc77673739a81772c10ebe62a
+EBUILD pymdown-extensions-8.0.1.ebuild 1555 BLAKE2B c16c2095c8ef9b6f279474c62c9f931257f30d1eb0a98b0cb9bf3120d18ad6171fa225ba3ddce9ddd158798850eca5e0f36253105b7aeedfb8abe9b33be67bf9 SHA512 83c34fb23bc4652ef28ad6290944081bf554663d5ea881f6699f373cc9e34f72ea08542fef2365d439c137329baecd44340df67d20397a34733626b5c45a9b2c
+MISC metadata.xml 528 BLAKE2B e6dbf4de6314ceb13e8142fff18a43a9190e356889a908700fd5276a342364bac2ea63b9b1ca2318c0dd964c250f00bc1c79b52519cbc80174100c94a55dc07e SHA512 00f53e10eaee99abccf5f16ba3412f22ab0803ffee0d34ed7a21e39a973b0d291928f74336dbe562185b2d1d5d61a50b7d7a590b502169a886cb3d932ccf3c98
diff --git a/dev-python/pymdown-extensions/metadata.xml b/dev-python/pymdown-extensions/metadata.xml
new file mode 100644
index 000000000000..6b89dfe643e4
--- /dev/null
+++ b/dev-python/pymdown-extensions/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">facelessuser/pymdown-extensions</remote-id>
+		<remote-id type="pypi">pymdown-extensions</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-8.0.1.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-8.0.1.ebuild
new file mode 100644
index 000000000000..bb8e5e1c5cae
--- /dev/null
+++ b/dev-python/pymdown-extensions/pymdown-extensions-8.0.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-git-revision-date-localized-plugin
+	dev-python/mkdocs-minify-plugin
+	dev-python/mkdocs-material
+	dev-python/pymdown-lexers
+	dev-python/pyspelling
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="Extensions for Python Markdown."
+HOMEPAGE="
+	https://github.com/facelessuser/pymdown-extensions
+	https://pypi.org/project/pymdown-extensions
+"
+SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-python/markdown-3.2[${PYTHON_USEDEP}]"
+
+BDEPEND="test? (
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-vcs/git
+)"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Fails on whitspaces
+	rm tests/test_syntax.py || die
+
+	# AssertionError: False is not true
+	sed -i -e 's:test_no_pygments_linenums_custom_class:_&:' \
+		tests/test_extensions/test_highlight.py  || die
+
+	sed -i -e 's:test_default_override:_&:' \
+		tests/test_extensions/test_superfences.py  || die
+
+	sed -i -e 's:test_tabbed:_&:' \
+		-e 's:test_tabbed_split:_&:' \
+		tests/test_extensions/test_tabbed.py  || die
+
+	# mkdocs-git-revision-date-localized-plugin needs git repo
+	if use doc; then
+		git init || die
+		git config --global user.email "you@example.com" || die
+		git config --global user.name "Your Name" || die
+		git add . || die
+		git commit -m 'init' || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pymdown-lexers/Manifest b/dev-python/pymdown-lexers/Manifest
new file mode 100644
index 000000000000..34babeb9296b
--- /dev/null
+++ b/dev-python/pymdown-lexers/Manifest
@@ -0,0 +1,3 @@
+DIST pymdown-lexers-0_pre20180905.tar.gz 2596 BLAKE2B ff08ac12fbb242ab5b51b80f91d18281cf8cd9bf121b1a6d389ef47a069c614991d6fb99ff05cca9802e68b4dfc2c89d9f6d4b02051a133968ab9ee24943756b SHA512 d0a509cdd9924053b79259b873ec3a3671869b37f7a97112370d21c360f6315961d13610cf08a00e10f58d5e25ac360b3844fc997392dfe724ec14f02a079596
+EBUILD pymdown-lexers-0_pre20180905.ebuild 558 BLAKE2B 9f9f3c1a239fbdf3abf143926d83a8066b7b500c52b0410b31ecc49245b0b82b5d47b51a7faabf476b1f3476ee2063ee2d943685f8553aa0b8c11290356d5d1c SHA512 8eb46df0690ef63d4913bc06cc938b39bf01ad5862d51992112bcbce0d8258dcb87f23649b87fae1ccb8f97e2822303f359c06147833be6fa3baef0ed3651bf1
+MISC metadata.xml 588 BLAKE2B 55ab9bfc993d7325dc4401566659f63d6392f9421b083e0d7033088fc2157da85fdb6b4a7cd79ca1f6adb51c940c798f52d737389449fb474ad3fc0275a845c8 SHA512 93ed978bdac93d4f0fb46ab6b2ddfd6b6fcacf0b8723ec3091415fa6ed84983c06347a90a8de3b8bd7d7b34a04897b8a4821aca46bbc8f66d4f4752e14200dd6
diff --git a/dev-python/pymdown-lexers/metadata.xml b/dev-python/pymdown-lexers/metadata.xml
new file mode 100644
index 000000000000..c0315f8bfff0
--- /dev/null
+++ b/dev-python/pymdown-lexers/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+	<maintainer type="person">
+		<email>lssndrbarbieri@gmail.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">facelessuser/pymdown-lexers</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pymdown-lexers/pymdown-lexers-0_pre20180905.ebuild b/dev-python/pymdown-lexers/pymdown-lexers-0_pre20180905.ebuild
new file mode 100644
index 000000000000..ab51a2552894
--- /dev/null
+++ b/dev-python/pymdown-lexers/pymdown-lexers-0_pre20180905.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1
+
+COMMIT="fa422cb95b794157760259c5c20a1235e4a459be"
+
+DESCRIPTION="Additional lexers for use in Pygments"
+HOMEPAGE="https://github.com/facelessuser/pymdown-lexers"
+SRC_URI="https://github.com/facelessuser/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/pygments-2.0.1[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
diff --git a/dev-python/pymetar/Manifest b/dev-python/pymetar/Manifest
index fddf4e63397d..fd1ec593ab78 100644
--- a/dev-python/pymetar/Manifest
+++ b/dev-python/pymetar/Manifest
@@ -1,3 +1,3 @@
 DIST pymetar-1.1.tar.gz 3162533 BLAKE2B 43cc79a0c8b27f7146a0f89d4271830ace0bd25790e8df006c19205419eabec88b90645d473019951b21952ee67df25261f6eea8c2d58de95e13186ab4bce214 SHA512 3e830065d3201373695c381f45969e7b532d69de8218cb32e107ed72235cd7cff8051e129c6ae4761154ed9d3fca81c530938520d6a54e7bf467cf28ebf9de02
 EBUILD pymetar-1.1-r1.ebuild 457 BLAKE2B a3c6dacb74e8e4d03381deffb34517cc6013c36ff0d068a28cb4be7cae6f604463e0b791bffb872a1eec5a59b3a3852152235afeb2068c186777ef4412494b76 SHA512 d5667c9978cc42cbe110f59107954001a697238bec3a53b5e27dc8dd4ade873191147c2d74106c92c2d9db5cd563dac7019dda0515381674675d6158a241c895
-MISC metadata.xml 959 BLAKE2B d9fc6e95f4c432c64667a617894a8e86e0c69801fb73d1a2d4dfbfcc490f84e32f97c3b2ff425eb30d30769b799d79f39863e4bf6dbc4cb848c03025a34d40d1 SHA512 de0134cfbc608c80cccfd3029faf769fa6e8fae8c3df9ed2bb7afb6231f6d68c68a6bc97fd690987b552aa026c40358e3dbd70d8a8df2633f4c6368ca7651143
+MISC metadata.xml 1035 BLAKE2B fb5f0b1a2495780614d229252c840b9937c2f385a18d4473dc9b151cbe73d2a2fcd98fc3c856d5fd13dacc7f72b32c26ab27fabab21437372b21b63fb0b8bae4 SHA512 38987451c572b1da0cb240bcead18b9a4b2d2611d152f9174695a884df932bbde6408a989548ef1dc92eda209b802199a077988a5cba83161852bd402dae024b
diff --git a/dev-python/pymetar/metadata.xml b/dev-python/pymetar/metadata.xml
index 55440a29c549..c739026bcfd3 100644
--- a/dev-python/pymetar/metadata.xml
+++ b/dev-python/pymetar/metadata.xml
@@ -1,19 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>python@gentoo.org</email>
-	<name>Python</name>
-</maintainer>
-<longdescription>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription>
 This library downloads the weather report for a given station
 ID (get yours from http://www.nws.noaa.gov/tg/siteloc.shtml),
 decodes it and provides easy access to all the data found in the
 report. Documentation and a small example app are inside the tarball.
 </longdescription>
-<longdescription lang="ja">
+	<longdescription lang="ja">
 このライブラリは指定したステーションID( http://www.nws.noaa.gov/tg/siteloc.shtml で入手)から天気予報結果をダウンロードし、解読し、予報データから検索するのに簡単
 なアクセス手段を提供します。ドキュメンテーションと単純なサンプル・アプリケーショ
 ンはtarballファイルの中です。
 </longdescription>
+	<upstream>
+		<remote-id type="pypi">pymetar</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pymilter/Manifest b/dev-python/pymilter/Manifest
index b3f3619bfdcf..9f53a723c3ff 100644
--- a/dev-python/pymilter/Manifest
+++ b/dev-python/pymilter/Manifest
@@ -1,3 +1,3 @@
 DIST pymilter-1.0.4.tar.gz 1023222 BLAKE2B 1e5ce42af76ae1ac2f7cda87d40bdce404ed7e9fce9e88909572ec065f05e2c9effc8bc62d4fad113753ff7dc7e87c790515a9116615191745097cb2c3390042 SHA512 b356a10ffc0ba0172cdb228e4e15034e67c0fd82b4b8bbe1193e54e45e518626fd647033d824f2cd5a9d456154c528027726977d3ad2f2c2fe0e0155ad50d294
 EBUILD pymilter-1.0.4-r1.ebuild 686 BLAKE2B af48c5e7d54b5a0afa71edf48c7f5bec7b6e398ffaedd42d65dbaedcb1bb91d6bf585a5f288599859e0e10c1e0821298a7c51f735417c481565b6d7f297627a9 SHA512 c7a73e898c9052ccc3e4cd1dc082c2471caf3d7e6d5c692aa6e03fb29c1d373977decbd1acdb28585329f6aea7a8f41ae49e10967ba1daadd99939c8e6fecc64
-MISC metadata.xml 745 BLAKE2B 20fb9f28930e8252bcbf5e678a4c53bdbdaf2dd0ae2d06a1ecabb993c1f172fb462419377b5a44d57d2e71a15b41676beee93c371a6b58642b5db02dbed868d2 SHA512 03a63f23eea33c7ea8d0de9b121b7edea4dc96199cc390a5488085865ed41272d7e599ff3f5043cdfe7582c3ed0dab7afb3d2bc6b173620390a118a282f5e800
+MISC metadata.xml 791 BLAKE2B e9cd350b7cebd044c9ad0f4d1d827ad3d96ab85ee5179a3566193ff991ee21053da9acb676cfeaf28587bd80647958976b6447dc0cb575a24e9dbac29276f27b SHA512 662e6e7e25c11c44515014ffca38d808b87425844106ee0654cade5fa5a258e1e6659d43eacf70f1664815072d7763576951f1d51f8efaa702a0a155c696100f
diff --git a/dev-python/pymilter/metadata.xml b/dev-python/pymilter/metadata.xml
index c653356fd77b..e2404273484c 100644
--- a/dev-python/pymilter/metadata.xml
+++ b/dev-python/pymilter/metadata.xml
@@ -18,5 +18,6 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="github">sdgathman/pymilter</remote-id>
+		<remote-id type="pypi">pymilter</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pymongo/Manifest b/dev-python/pymongo/Manifest
index e60e33bcbaf3..68b79ea0de8d 100644
--- a/dev-python/pymongo/Manifest
+++ b/dev-python/pymongo/Manifest
@@ -1,5 +1,7 @@
 DIST mongo-python-driver-3.11.1.tar.gz 981098 BLAKE2B 27c24a16fe685dda728eadee7784596178ef8ca50d4017bd38ec1bd5ffb29a6eb2e2b24db82cb7d1fe545c58575b3e83d54bfda645eb6dca0d4678e59f7d201b SHA512 459218ae2b4783dc1ec0fb63be62f38c138bc074b6685e3785840b7ed38472a579ba3bd92ceee3a27757b38975963911dab3235f0eba1cc261e083d8e020f462
+DIST mongo-python-driver-3.11.2.tar.gz 982527 BLAKE2B 3dcbf57a1cb0a09f9747c1a4770f4935b1c5f524f14392a3a1ce2ee6d3c6f72dc08d96d81300dd7bf7fcd7e5eeb0d6d8af7ac8240f41b460952046d30e8fa3a5 SHA512 110be1c6301f0f5511ed0d8a0cccc1e79c4a1a217bef486afebd2238522735d1e0e2a930533d05194aa485db65c4555bd46dbcf5808a33b2b07bc907055f2b7e
 DIST pymongo-3.11.0.tar.gz 771691 BLAKE2B 5ae5b78caac335656c1005666c5633882da517c512bbfdb0df2c4569ec5060fa9623a23f48ffcf0c6ab2cdc69f6534f36ef18c929047bbb22cfbe9055a0881b7 SHA512 4f8a185013cbb3c07774d3c6aecc9e97dabb4ba55176fa8a51e17bcdb7cbbebaacd16304e580b4c6aeb26aad964401249313b59dde3c5c248c4496d64d18b22c
 EBUILD pymongo-3.11.0-r1.ebuild 2642 BLAKE2B a7f5f89387c694c125b20859f8b494d34e2eba8b197b14c0533e87635024e615ada3ec7408b092d4ab105a50f17a8b150e1dcd72b1118fb4fe21256647aadeda SHA512 819b922f0f6d55730a5a630fa66ea6fe42c321e8c850539b0d5a228d32d50c75e50500476534663930c85cb2c7305792dee94d05ea6754f1fc950a30d98ff3c5
 EBUILD pymongo-3.11.1.ebuild 2745 BLAKE2B 29f5f2c188f1f8deebe0f7ac55826c532eb25fe2ae82095609fc24a9af6873e49d92f1d10a6a4fb971eeb936436ad3eb059fe998f97b88581184c7bf57340803 SHA512 da84a037623e708d3fdbfc1ae3d815764281ab8956c08ee2d4970b5e023b4f94bbfc91fd9ba49bc294919ca0e4374cfc806ec893eb305c1877cb57938d8840d8
+EBUILD pymongo-3.11.2.ebuild 2745 BLAKE2B 29f5f2c188f1f8deebe0f7ac55826c532eb25fe2ae82095609fc24a9af6873e49d92f1d10a6a4fb971eeb936436ad3eb059fe998f97b88581184c7bf57340803 SHA512 da84a037623e708d3fdbfc1ae3d815764281ab8956c08ee2d4970b5e023b4f94bbfc91fd9ba49bc294919ca0e4374cfc806ec893eb305c1877cb57938d8840d8
 MISC metadata.xml 672 BLAKE2B 48cf6ce2f03ec2865a99fd033455a1b0a53cf9e55240ab6e993483929a6dd93661afcea7fa255095b66536f0a8cc05b5c4e6a12bd044547a5cf190559a9e480f SHA512 89b8a3551a5b0bd495bc98ac2f9324daeb3f3d81d0f6b991e5537e02c7b369201f9692be5acbe228ddcd3581002a39ac777ea5fc136957e9ccb9683f205e38ea
diff --git a/dev-python/pymongo/pymongo-3.11.2.ebuild b/dev-python/pymongo/pymongo-3.11.2.ebuild
new file mode 100644
index 000000000000..0327e9903e41
--- /dev/null
+++ b/dev-python/pymongo/pymongo-3.11.2.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit check-reqs distutils-r1
+
+MY_P=mongo-python-driver-${PV}
+DESCRIPTION="Python driver for MongoDB"
+HOMEPAGE="https://github.com/mongodb/mongo-python-driver https://pypi.org/project/pymongo/"
+SRC_URI="
+	https://github.com/mongodb/mongo-python-driver/archive/${PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~x86"
+IUSE="doc kerberos test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	kerberos? ( dev-python/pykerberos[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	test? (
+		>=dev-db/mongodb-2.6.0
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+DISTUTILS_IN_SOURCE_BUILD=1
+
+distutils_enable_sphinx doc
+
+reqcheck() {
+	if use test; then
+		# During the tests, database size reaches 1.5G.
+		local CHECKREQS_DISK_BUILD=1536M
+
+		check-reqs_${1}
+	fi
+}
+
+pkg_pretend() {
+	reqcheck pkg_pretend
+}
+
+pkg_setup() {
+	reqcheck pkg_setup
+}
+
+src_prepare() {
+	# network-sandbox probably
+	rm test/test_srv_polling.py || die
+	sed -e 's:test_connection_timeout_ms_propagates_to_DNS_resolver:_&:' \
+		-i test/test_client.py || die
+	# relies on exact exception message
+	sed -e 's:abstract methods:abstract:' \
+		-i test/test_custom_types.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# Yes, we need TCP/IP for that...
+	local DB_IP=127.0.0.1
+	local DB_PORT=27000
+
+	export DB_IP DB_PORT
+
+	local dbpath=${TMPDIR}/mongo.db
+	local logpath=${TMPDIR}/mongod.log
+
+	# Now, the hard part: we need to find a free port for mongod.
+	# We're just trying to run it random port numbers and check the log
+	# for bind errors. It shall be noted that 'mongod --fork' does not
+	# return failure when it fails to bind.
+
+	mkdir -p "${dbpath}" || die
+	while true; do
+		ebegin "Trying to start mongod on port ${DB_PORT}"
+
+		LC_ALL=C \
+		mongod --dbpath "${dbpath}" --nojournal \
+			--bind_ip ${DB_IP} --port ${DB_PORT} \
+			--unixSocketPrefix "${TMPDIR}" \
+			--logpath "${logpath}" --fork \
+		&& sleep 2
+
+		# Now we need to check if the server actually started...
+		if [[ ${?} -eq 0 && -S "${TMPDIR}"/mongodb-${DB_PORT}.sock ]]; then
+			# yay!
+			eend 0
+			break
+		elif grep -q 'Address already in use' "${logpath}"; then
+			# ay, someone took our port!
+			eend 1
+			: $(( DB_PORT += 1 ))
+			continue
+		else
+			eend 1
+			eerror "Unable to start mongod for tests. See the server log:"
+			eerror "	${logpath}"
+			die "Unable to start mongod for tests."
+		fi
+	done
+
+	local failed
+	DB_PORT2=$(( DB_PORT + 1 )) DB_PORT3=$(( DB_PORT + 2 )) esetup.py test || failed=1
+
+	mongod --dbpath "${dbpath}" --shutdown || die
+
+	[[ ${failed} ]] && die "Tests fail with ${EPYTHON}"
+
+	rm -rf "${dbpath}" || die
+}
diff --git a/dev-python/pymssql/Manifest b/dev-python/pymssql/Manifest
index 995e30eb28a0..ed170dd91fab 100644
--- a/dev-python/pymssql/Manifest
+++ b/dev-python/pymssql/Manifest
@@ -1,5 +1,5 @@
 AUX pymssql-2.1.3-DBVERSION_80.patch 451 BLAKE2B e9ab70a24db87e2f69eb502c491746ed3b83d5b50c8e87330c5e209c4f0b89d889fbba980721958db0fea2c2e0d944d7fd1692f018089946c8dd7c0d6f46ff58 SHA512 e596231f5d2ba6354b8e942d270079bb6ff65ff362640f99e631407107ec11e1f8c20097f9fb614066fde83dcd89d5c64181dddb9bf8c52f12b355e68f248f28
 AUX pymssql-2.1.3-remove-setuptools_git.patch 243 BLAKE2B 51f598a199867a6278518a0d204a3bfffcba662e22377d0b927e404a420a32a771a56ab23c99b8fa819b216e95efd8efdb8f61955da1ed79e64c84cb6b6634d1 SHA512 e8a24dfd4e4c6320ef854592d890a8e34870884ac05e0e60a52bd4e05f5eb7fbac86311da98d1ba8be2a55233788e070f7dfc529570c1cefe25471abbd22fa20
 DIST pymssql-2.1.3.tar.gz 897987 BLAKE2B e105dd8d5dbbad5de566b9179f799ad66eb420f60464e8061470b1abb6ecf38f35ad7992ded40f2cd62c76a8e04255eb647e30df5c9bc4059334a1d5d4677e73 SHA512 a659cb8f077ddbe5e8de0b9b118d8bcc0c87128c0be4ff14343983e7029594e63ba6fb8a88992dc1f058df3c1ebbbd69cf371bf95a0918954cd0cec14c1cb5cb
-EBUILD pymssql-2.1.3.ebuild 1081 BLAKE2B 16cd75e938c7979ea847d9d62d5143be08f310e34b11ff2108e9b189f55466a950e6f28d0f34a674d99446976737e0f3de87faf5d74ee60fbd336a09e234dc83 SHA512 888ce0adeb628130a2dbf2eac7386cdbb4151adf267bc4313590d919799d50be821cd3d00e4b0517f05c64c25e849f83b2ec3877c85ea37df956ef29d394c75d
-MISC metadata.xml 396 BLAKE2B bc47cebbbeecb1c410ad5ffba2ebd275b9463e73f984ed9bac84720e3993365aca52a7b32a010c61a7e4e98e14b17aa3fdccf74692e327717fd1113ce087e263 SHA512 dea6de0ceb2f3661fad588992687c8bcda6204b731756390ad5d1a0f2ca2bcee77075e72b80f72a31ce681b57aafd830ffe984279cd8cfc96f520c04aa2e0eed
+EBUILD pymssql-2.1.3.ebuild 1079 BLAKE2B 8556bfd1e2241664145f0ee5a9345f5b8bfcfee1f77bec1979e0e6f869720f74773fb7a6817e2023c3f185ea2cb4733e31fdedbbad97884187b2af8c163c3063 SHA512 fb5952e1f67ca6de3c7366df447bf94224a38b5912370fc4ddfde8781f4e845a7ed0c7afdf39a6f50dbb9e47b6025a8f2d55bff916a56f9706a00363893b114a
+MISC metadata.xml 441 BLAKE2B eb215221b6fd9d5cb5e6cd1dbc0cba46000bda0b44024dd85b43f26f33bc9f15701ba6dc7dde0d2b8f1766912701c6f9811782a1f8d9717014a3e19bcab5be4a SHA512 dd55cdc653ea5c7cfdf08deeff8c0fe71b5129a768b65ac8747e04ae86997394e5ac7952dea90e0780cab81ec9c23cea79550d3640f73626fb1fe6b325644a5b
diff --git a/dev-python/pymssql/metadata.xml b/dev-python/pymssql/metadata.xml
index d8a463ccc80d..5d445274c46d 100644
--- a/dev-python/pymssql/metadata.xml
+++ b/dev-python/pymssql/metadata.xml
@@ -10,5 +10,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">pymssql</remote-id>
+		<remote-id type="pypi">pymssql</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pymssql/pymssql-2.1.3.ebuild b/dev-python/pymssql/pymssql-2.1.3.ebuild
index a7756b26df62..57d4d9a497c1 100644
--- a/dev-python/pymssql/pymssql-2.1.3.ebuild
+++ b/dev-python/pymssql/pymssql-2.1.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Simple MSSQL python extension module"
-HOMEPAGE="http://www.pymssql.org/ https://pypi.python.org/pypi/pymssql"
+HOMEPAGE="https://www.pymssql.org/ https://pypi.org/project/pymssql/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
diff --git a/dev-python/pymysql/Manifest b/dev-python/pymysql/Manifest
index c75e2131781e..651a5b1a0efc 100644
--- a/dev-python/pymysql/Manifest
+++ b/dev-python/pymysql/Manifest
@@ -1,4 +1,4 @@
 AUX pymysql-0.10.0-fix-tests.patch 1471 BLAKE2B 058afeda49c45bbb2421301d2ad270a9de111e3d24322c268d2dcba2867d3dd169117e9af9d7d63bc8d3b59f6ef0e570febc0d3d2232531c91942c3d13dc119c SHA512 312e37ae1943bd1db3b44a28832a55dade62c38b8ff042b4ce4d7beb8bc2c74d87e61d7b1e44dc583072450a3951dc05c504cab15a0d9b9f0fa562efa276ae36
 DIST pymysql-0.10.1.tar.gz 86441 BLAKE2B 8e33fbba0544dad68c3eeb5bd538c4bce121222b4660ad06c3c0224b5db6a6c9f45d6697a98d5f0ba20429afa204d46c9ce57a4d9696dbc2a35649c6253a645b SHA512 edc702c54a33350f75648765c60d4cf455449e88818948b018585d557bea280e626d23b1279a410765f2de8e35b3c22ea5c8e0ef3dc72588b674c93a2124a224
 EBUILD pymysql-0.10.1.ebuild 3575 BLAKE2B 67ef1a309f7f85b3236763c26f177d03db95c1c9fbe00efb83a4afa9bb91942ab75fdad70ae462e35d9c27f98950f8dba873e99bb613abd47bba3a8dbd0a2699 SHA512 8ba4d4dd61735e605eb7a37b0e85a1b526a8c52c94eef59ed474ce4055938afbafc7136cfdd78a30b146af3271481d19cc7536729b3097e05fd40e7713ff2c7e
-MISC metadata.xml 465 BLAKE2B ee6efa9aac32699c9746ecfe59dcb9421ed350712358e6daba43cd881fbca8cea649974509069a62555af49d7e9f771b8610e805d79f0857ded1926de3386f08 SHA512 c30ff59a0b772428c9c64b6f70871132251deb94d3a074a2a688b90f627bf1d953d6a3d3fd6c6216072f8ca5bfe53bd8707f7c6a125d41a2267cbbb4ca262c65
+MISC metadata.xml 493 BLAKE2B df91299acd855c04a29b3c0cf33b450de6a9687b3c45a0c59cc55a69c544d561f107da1d90a1b52dffaa13fe218cef978edb4b7036eb62651da7de39568fdc00 SHA512 ae8cbe0ea29c8457dbbfd4cc21169fce54b868f93045f5ebbd9c8909b052c7efa2cedacc1ba5ec13d1ab9476b39cc595a52ee9ceb489b6aec3f824f2027fc4c6
diff --git a/dev-python/pymysql/metadata.xml b/dev-python/pymysql/metadata.xml
index 1a0959784174..fed09325cd17 100644
--- a/dev-python/pymysql/metadata.xml
+++ b/dev-python/pymysql/metadata.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>mysql-bugs@gentoo.org</email>
-    <name>MySQL</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="github">PyMySQL/PyMySQL</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>mysql-bugs@gentoo.org</email>
+		<name>MySQL</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">PyMySQL/PyMySQL</remote-id>
+		<remote-id type="pypi">PyMySQL</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pynacl/Manifest b/dev-python/pynacl/Manifest
index 9b1f1dc8389c..86db4bc87156 100644
--- a/dev-python/pynacl/Manifest
+++ b/dev-python/pynacl/Manifest
@@ -1,3 +1,3 @@
 DIST pynacl-1.4.0.tar.gz 46396758 BLAKE2B 9575bca05ecaf33e798f2abfee7a1af26bbb10b5dbd4e7ca70af8032866e26b88736c2a2ff52e4496e4862f92042fb125df7cd1f1427b16a2313926162466343 SHA512 2a11a623452cea60199cdff83db6f5922698237267c11f055f2fd7768e0875a819dcc08c477113ad89461797ab36d66e0b9c7700eee335eb6b16af6b378b9e88
-EBUILD pynacl-1.4.0.ebuild 955 BLAKE2B e20e1d8a026cfb118e890715de6cf2f6c3dfa77b2a236f7928172110c9ee179563d12d0dbd8ab2165a4051b46588ed45fe704818d7f255bde3eed7735443c47e SHA512 428a21a64ffafc3d402c38705c97efef46f160eef8d091ee9805cb04253bc4e19d7193917b2f48753ce7e7e016244e64df61feeec6ae7e8e9b7b34e73da0f18f
+EBUILD pynacl-1.4.0.ebuild 954 BLAKE2B 12124857b5fdfed995069f8d6e0b2107845c8b239bab722d185cc5f210215538a1909738cdd8f9a8dd882f56bbeed263a2b4810e5d3613e7adf982255342b13c SHA512 92f6c7d63fca8d8df9e0a5936ca2e9256ce15f4c339c4257eca6c23d8c8f306970043e7b9a40e2d9b432110b0530359cc367929befab5a6b03c69d5e2073a56c
 MISC metadata.xml 753 BLAKE2B a735a91bb099911df938224e8f89baa564a86855655a5fbd2d9027bc108001052c7793a6675dd2d301c083bde38d4eb03015628d733055d1938e2dee12f8e784 SHA512 f9c8f52b3c9069f3500c5e7023636f9866c90b5c904e7d66443b620f523474e3f695f66e666de679b3b8b4c362cfbc5c9268727c68d3d1ca462b1ef93b0ec6e4
diff --git a/dev-python/pynacl/pynacl-1.4.0.ebuild b/dev-python/pynacl/pynacl-1.4.0.ebuild
index 7a7a44ef1cf0..d791a662f273 100644
--- a/dev-python/pynacl/pynacl-1.4.0.ebuild
+++ b/dev-python/pynacl/pynacl-1.4.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pyca/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/pynest2d/Manifest b/dev-python/pynest2d/Manifest
new file mode 100644
index 000000000000..12446226b206
--- /dev/null
+++ b/dev-python/pynest2d/Manifest
@@ -0,0 +1,4 @@
+AUX pynest2d-4.8.0-required-flags-from-Libnest2D-target.patch 1422 BLAKE2B b42ac90f1182e38d31e9dac877d8e94baa01db734dc31381d674f000a9982ed65f316c4613f0cfcc1910ec086c3e3bf51cb08d4d72624fc684ec658a8260f8f4 SHA512 2957da641a52a457254bf53a83a7f83085306f2158ca814feeeee6a230c4d6b9bafb29dd0aeb7244857a4152fdb927fa02085d2a19b77b8f990128491a051ce6
+DIST pynest2d-4.8.0.tar.gz 18174 BLAKE2B 3720815b3d5ba5d4a0dd24ec4104af318d2d7f2e86e66ada68ead8249ed28184d9a153995f143cc4e00d603804da959a086a27decfe2b1e0ef00256a891e0d17 SHA512 1304450f94589b5212f11d83fb228f0deb919698b44b1651f248105c23b65cf3d233e67526bbfb47df74b9b18d0c465f4188d02a0a6941564b551f50d9a3c84f
+EBUILD pynest2d-4.8.0.ebuild 892 BLAKE2B 513a0f81ba0de1a72550f19f8e521269f1c8fa162161006b6e6351133e0cb2f2aa6694a23a184c193ca24e924cf5a48160cc5ccd36b6ee55a14cf81888184b63 SHA512 0beb2834dea7c184953f9368fa1073c4ac3882b0437a673a5136697767bffdfa3fceeab2fefd435a47b9c65aade2e7fec2ce6b7c999a73310ff411c682292bf3
+MISC metadata.xml 343 BLAKE2B 928ff1dd477a69f0e796bcebe542313551f1ce8513714d62fcf3d4d929e9a5fb555bc74e7a613ea7b4e2b4affe87dcb03f2a44d4ebb042e25d4e26caf510eae1 SHA512 e494a21cde8c8d11c72a4c9705e5e841dad900ab00966718a397ac9d95e06e926621736ae609ff4b1ab9448c4830e07e0542b295c0d288a07864db44d5808485
diff --git a/dev-python/pynest2d/files/pynest2d-4.8.0-required-flags-from-Libnest2D-target.patch b/dev-python/pynest2d/files/pynest2d-4.8.0-required-flags-from-Libnest2D-target.patch
new file mode 100644
index 000000000000..c2c9452756fb
--- /dev/null
+++ b/dev-python/pynest2d/files/pynest2d-4.8.0-required-flags-from-Libnest2D-target.patch
@@ -0,0 +1,24 @@
+See https://github.com/Ultimaker/pynest2d/pull/3
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -10,11 +10,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
+ find_package(PythonInterp 3.5 REQUIRED)  # Dependency of SIP.
+ find_package(PythonLibs 3.5 REQUIRED)  # Dependency of SIP.
+ find_package(SIP REQUIRED)  # To create Python bindings.
+-find_package(libnest2d REQUIRED)  # The library we're creating bindings for.
+-find_package(Clipper REQUIRED)  # Dependency of libnest2d.
+-find_package(NLopt REQUIRED)  # Dependency of libnest2d.
+-find_package(Boost REQUIRED)  # Dependency of libnest2d.
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DLIBNEST2D_GEOMETRIES_clipper -DLIBNEST2D_OPTIMIZERS_nlopt -DLIBNEST2D_THREADING_std")  # Tell libnest2d to use Clipper and NLopt, and standard threads.
++find_package(Libnest2D REQUIRED)  # The library we're creating bindings for.
+
+ # Some build options.
+ set(CMAKE_CXX_STANDARD 11)
+@@ -45,5 +41,5 @@ set(SIP_EXTRA_FILES_DEPEND
+ )
+
+ set(SIP_EXTRA_OPTIONS -g)  # Always release the GIL before calling C++ methods.
+-include_directories(src/ ${SIP_INCLUDE_DIRS} ${Python3_INCLUDE_DIRS} ${CLIPPER_INCLUDE_DIRS} ${NLopt_INCLUDE_DIRS} ${LIBNEST2D_INCLUDE_DIRS})
+-add_sip_python_module(pynest2d src/Pynest2D.sip ${CLIPPER_LIBRARIES} ${NLopt_LIBRARIES})
++include_directories(src/ ${SIP_INCLUDE_DIRS})
++add_sip_python_module(pynest2d src/Pynest2D.sip Libnest2D::libnest2d_headeronly)
diff --git a/dev-python/pynest2d/metadata.xml b/dev-python/pynest2d/metadata.xml
new file mode 100644
index 000000000000..52add8ef7465
--- /dev/null
+++ b/dev-python/pynest2d/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>3dprint@gentoo.org</email>
+		<name>Gentoo 3D Printer Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Ultimaker/pynest2d</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pynest2d/pynest2d-4.8.0.ebuild b/dev-python/pynest2d/pynest2d-4.8.0.ebuild
new file mode 100644
index 000000000000..5f57d42dca50
--- /dev/null
+++ b/dev-python/pynest2d/pynest2d-4.8.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit cmake python-single-r1
+
+DESCRIPTION="Python bindings for libnest2d"
+HOMEPAGE="https://github.com/Ultimaker/pynest2d"
+SRC_URI="https://github.com/Ultimaker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/libnest2d
+	$(python_gen_cond_dep 'dev-python/sip[${PYTHON_MULTI_USEDEP}]')
+	"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-required-flags-from-Libnest2D-target.patch" )
+
+#	test? (  )
+#	""
+
+#DEPENDENCIES
+
+# Clipper, a polygon clipping library.
+# NLopt, a library to solve non-linear optimization problems.
+# Boost, the headers only.
+# Sip, an application to generate Python bindings more easily.
diff --git a/dev-python/pynput/Manifest b/dev-python/pynput/Manifest
index c4c373fdae60..192e07eeef5a 100644
--- a/dev-python/pynput/Manifest
+++ b/dev-python/pynput/Manifest
@@ -1,4 +1,4 @@
 DIST pynput-1.6.8.tar.gz 94483 BLAKE2B c04714fb9cdda9527ed6d3c0e7c25214a7678ee908f1a638023b95c2f63242fa7dc28f193b2055338a9cce10c26399eb4f4af0ec69a6ffaa1be0b7e85481ecc4 SHA512 23cf2e47e0a284aeb2e294529a1f47a01a42bccae146500eee2ff74704cb5ef7ff33327cca5d6ebec338369b1341c489431891d9f034801cc6be9aac2af90442
 EBUILD pynput-1.6.8.ebuild 755 BLAKE2B 2f0f4e4a7b6cdebc3b26da6577e9185cf2430cd2a324bf7abb777e9644a25a3f35b0678d9a6a1d3379a2ffeded3422bf4f5af2a21340d1e9c1fb4b14ca8dca64 SHA512 e2684bdb3ed7413f2d1633837c9e8ad73fd47e92779f035483a77a231da66e65b1685b281a80920f3f2232be90f847b7af57c42fcec1a399c194a993f9175e40
 EBUILD pynput-9999.ebuild 755 BLAKE2B 2f0f4e4a7b6cdebc3b26da6577e9185cf2430cd2a324bf7abb777e9644a25a3f35b0678d9a6a1d3379a2ffeded3422bf4f5af2a21340d1e9c1fb4b14ca8dca64 SHA512 e2684bdb3ed7413f2d1633837c9e8ad73fd47e92779f035483a77a231da66e65b1685b281a80920f3f2232be90f847b7af57c42fcec1a399c194a993f9175e40
-MISC metadata.xml 247 BLAKE2B 0aa7491a8e9a68ed7ad1c53c8442fd44a9dbdfbd7ef0662e838195b44ce72a77f5dc3b846cf9951bb61de78e05aac37649b78dd4c27e304780e1223d607a4252 SHA512 3344e220b20caad7bc32141ad5d51630ff0738ab14608334576638297fdd2a48d5169ef54fb33e36d27bd448d92f8ef9e41880df388521efd4a2c58d102c7c69
+MISC metadata.xml 316 BLAKE2B 2436cb4bcccc5db69341ebeb751a27a5345f11e3fbce8d0b1ad46f95ece6382ada902c57eb942e6edca48ff8686c4d39c0b1bd0d3578d8526dba00ba30a0ee12 SHA512 72139df9d1f90049feb73789d554f9e487251ee74d8c7087edc7c4d836f1e7b4eefec696399e115420d2902a9216e71bdb69c3d21848e5fc060d41a4c5af40da
diff --git a/dev-python/pynput/metadata.xml b/dev-python/pynput/metadata.xml
index 2b9b4266ca5b..270fb0722de2 100644
--- a/dev-python/pynput/metadata.xml
+++ b/dev-python/pynput/metadata.xml
@@ -5,4 +5,7 @@
 		<email>zerochaos@gentoo.org</email>
 		<name>Rick Farina</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pynput</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pynvim/Manifest b/dev-python/pynvim/Manifest
index 24bb11909436..599c293ce42b 100644
--- a/dev-python/pynvim/Manifest
+++ b/dev-python/pynvim/Manifest
@@ -1,3 +1,5 @@
 DIST pynvim-0.4.1.tar.gz 52340 BLAKE2B 4efddfbb8d1eb10aeb53b77f665d6ee186f697cc9cb6b3be2001468755a80b0a3bd4e105fda498e1310be9f65da3a0a8b12209c46a7122bb70f860c0a91c12a0 SHA512 78cb343ad02603a0d1c8f56079b46a9d341d8808a19112e758e5299994fe12a433cd61a4dbbaf0d5ffe00c676bcff844a53e910093efb862ad48cc4b4326f7de
-EBUILD pynvim-0.4.1.ebuild 667 BLAKE2B 0a9ebbfb2783d30ca57a161a36251b652c440fe02449515f505e43dfffd71052f5a4b11366c62739f1da9ccbc2b506ace742b6285c339caffd819cf503fb46e9 SHA512 bf989a719c18238d2a84275eb479a2f41d8884aef6f2826e5af78eeeb9a271adc86c5a9dfb9985e58137f334256d5885271973ef3d77c28f711e05cf886129bc
-MISC metadata.xml 344 BLAKE2B 0d15c0c8d8736a7622e98357e02c92eabecb22c853cba110c893b8cb681f0d7a16534329ffba68639e0a2455cd1321601dd56dabfd17b10ade3e23545aab6579 SHA512 32963ee9f09db1c9edef5a1179cdf0974b62c05d714636faf8f677db5f3205333d64eaa228ec2d35475a7efcb744759a857c6888dd055766118a19a288415e52
+DIST pynvim-0.4.2.tar.gz 52809 BLAKE2B 0bc2c3b509b602d7c46df9c54e867d1833bcadc792d5e1b27e45d99a57c33ff531e85841d8cbccdcb104892a994fcd71ac1c6ba2e86b4785cf890b1f8445d577 SHA512 d24d18fd158b318396cbd4e4ca3a0a304cb12b6790b84fc5f78bbb4aaa4b325d0fea6e281ff3cb27efbec0130d193d4871806750f6d1b792ef8a3558b5c37501
+EBUILD pynvim-0.4.1.ebuild 669 BLAKE2B 37adcc208e8a7ee5e4a439d5984e232971f02d09cc14630a5ee1a52d3ffed855dad1160c998458f8821b4ced49dc0c305ce434ca384c1b7eab1b8762e42dc6c4 SHA512 6eaa32d656e76544982044fcf8c34173d199d337996d648a389be618eb912ba95fde5f3255871843b0757195d745a7a017ac7d6ab04464a0615b936bef15a15e
+EBUILD pynvim-0.4.2.ebuild 670 BLAKE2B 50e011929299c752c2119b40808327702a08a09af4b1ba2d7aa8e245dc3d4641ac223ab17344c8b775f57d0525293124ce872d0a0470c04bb7e0517b7e55e60d SHA512 fb855ed4dd380624b71e3e174decb7f0406a068afa16249621b396d52b2b14c75caa94a44b453641aae74b424fd9444756651cc46df2f29fa5655f638e213205
+MISC metadata.xml 395 BLAKE2B b13f075786aee42360ea1a5bcea9fc1341e36faf2c53738630040860db48ea70a35cbd9879db9d0300ea5ead161b3f1fdaa183278a64cb4642a6bd29184a8f37 SHA512 597821983f5e1a07fc771e071fb0e97bcbd3aa075e6e9d63158ac51cffc8e8f19d4f7a92c09fd099c559320acf65aa89936a6f79cbc9546f4914f6dc5536c20f
diff --git a/dev-python/pynvim/metadata.xml b/dev-python/pynvim/metadata.xml
index 2cfdf28024db..b6149ba8600f 100644
--- a/dev-python/pynvim/metadata.xml
+++ b/dev-python/pynvim/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>vim@gentoo.org</email>
-    <name>Gentoo Vim Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">neovim/python-client</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">neovim/pynvim</remote-id>
+		<remote-id type="pypi">pynvim</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pynvim/pynvim-0.4.1.ebuild b/dev-python/pynvim/pynvim-0.4.1.ebuild
index f1b7eb1ca6f3..6c577ac3185a 100644
--- a/dev-python/pynvim/pynvim-0.4.1.ebuild
+++ b/dev-python/pynvim/pynvim-0.4.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Python client for Neovim"
diff --git a/dev-python/pynvim/pynvim-0.4.2.ebuild b/dev-python/pynvim/pynvim-0.4.2.ebuild
new file mode 100644
index 000000000000..d52a0bdabdcd
--- /dev/null
+++ b/dev-python/pynvim/pynvim-0.4.2.ebuild
@@ -0,0 +1,27 @@
+# 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="Python client for Neovim"
+HOMEPAGE="https://github.com/neovim/pynvim"
+SRC_URI="https://github.com/neovim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+DEPEND="
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	virtual/python-greenlet[${PYTHON_USEDEP}]
+	test? ( app-editors/neovim )"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -r -i "s:[\"']pytest-runner[\"'](,|)::" setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pyopencl/Manifest b/dev-python/pyopencl/Manifest
index a64fc6ccd4b2..7d5b7f512d23 100644
--- a/dev-python/pyopencl/Manifest
+++ b/dev-python/pyopencl/Manifest
@@ -1,5 +1,7 @@
 DIST pyopencl-2020.2.2.tar.gz 352110 BLAKE2B a3bb5f74abbb5d9600651dc0659f2472f7bf91d67cf3474f7306a29ccd3a8249dc952fc1e5b81f0514990e49246d106325a6697559b260a490981541666cb3a7 SHA512 2c4f21d9c0a5d3d53f2a0e4aaa8f85f42fc6fbedc5282cfc107ff047936aa731a973605f5500b56b62d5b580a00e9f2be2aa9a259287291641ca4b4d60c51ca9
 DIST pyopencl-2020.2.tar.gz 351600 BLAKE2B 47a733d7a552f5d1f69a1a9710c3262d50c26651ed9f46146829babe28962e236e2c1b9ba3d3d14207f28bdc562323a94ab4c51dbf5fcf1a0b12282b3c6aff50 SHA512 233bbf2e99507d3a832222cc8149bf7ac17332a550e4867f843fcc2b31104d961a3f0d972b0a1878d4716b2da4548f1390560141cd09cb1ba13300c541b058b9
+DIST pyopencl-2020.3.1.tar.gz 357422 BLAKE2B de9cb6408e957e30f54797ce682ed17f3272dc82019bcd9a744a0696a7e344f47645a3549332da90e0bcc442f7a8ea9c6a12a375875a9728fa9814ca9d1a9b30 SHA512 459d6f060f4203e83276c47bf832f33fc4348dd59904ea55fe2a53684cb7c8eaad45875476d10dcb6653820f9cb1f7e013c6b854410b2040b2dfe847fc1f7658
 EBUILD pyopencl-2020.2.2.ebuild 1458 BLAKE2B 432af46ec53efafe01f85fd3526802deccefcdcdd0a77e9e15a0ae92b42c9915c93a255c693504b8f586d0f8246945ce5173a144b2dc2e7440ebdfa8ecc613a1 SHA512 3f6c952a342a9d77ecea70ba6518c6204d46bb23ce18a004d0f69042848a071df099d0b7840d3036cbc0683f80cc5b6e3b97621972291d6878e722d9516e8750
 EBUILD pyopencl-2020.2.ebuild 1457 BLAKE2B b899057e68131fe0bfb4a5848f520cf557da23aa07fec39aa9bab4113696232d8152ff2f1704ffc523a0eec90f0d01f56a9dda52cabb1996bc177cfdba988c29 SHA512 2c69164b3057ca058b73c07741a111fb3583adf8928abcef98cb876514c528df594a4affde55ffae66bb4c0a2fbbdd5df972abef99ecd0517f8141e9b81edd70
+EBUILD pyopencl-2020.3.1.ebuild 1458 BLAKE2B 432af46ec53efafe01f85fd3526802deccefcdcdd0a77e9e15a0ae92b42c9915c93a255c693504b8f586d0f8246945ce5173a144b2dc2e7440ebdfa8ecc613a1 SHA512 3f6c952a342a9d77ecea70ba6518c6204d46bb23ce18a004d0f69042848a071df099d0b7840d3036cbc0683f80cc5b6e3b97621972291d6878e722d9516e8750
 MISC metadata.xml 316 BLAKE2B 46de5d09541dbd7e1ae6cb3e46a87f0f7dde068ca48dfb4f8885b3f25a2c6ad258019a7585bc6dac42a01ce41292d5458aa7ba122fd81a1fe6f12307b0642966 SHA512 1ac69571c5ff5abb94dc68dc87d02d8675e12e120dedb0bece65a9cb81764f496a587e7345b43e8037f8d7ed6e269dfa276d8482ab42fdb4f3adda336570d703
diff --git a/dev-python/pyopencl/pyopencl-2020.3.1.ebuild b/dev-python/pyopencl/pyopencl-2020.3.1.ebuild
new file mode 100644
index 000000000000..e5fbb9b9f447
--- /dev/null
+++ b/dev-python/pyopencl/pyopencl-2020.3.1.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_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python wrapper for OpenCL"
+HOMEPAGE="https://mathema.tician.de/software/pyopencl
+	https://pypi.org/project/pyopencl/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples opengl"
+
+COMMON="dev-python/numpy[${PYTHON_USEDEP}]"
+RDEPEND="${COMMON}
+	>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/decorator-3.2.0[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	>=dev-python/pytools-2017.6[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=virtual/opencl-2"
+DEPEND="${COMMON}
+	dev-python/pybind11[${PYTHON_USEDEP}]"
+
+# The test suite fails if there are no OpenCL platforms available, and
+# even if there is one (which requires the presence of both an OpenCL
+# runtime *and* hardware supported by it - simply emerging any runtime
+# is not enough) the vast majority of tests end up skipped because by
+# default the portage user hasn't got sufficient privileges to talk
+# to the GPU.
+RESTRICT="test"
+
+python_configure_all() {
+	local myconf=()
+	if use opengl; then
+		myconf+=(--cl-enable-gl)
+	fi
+
+	"${EPYTHON}" configure.py \
+		"${myconf[@]}"
+}
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyopengl/Manifest b/dev-python/pyopengl/Manifest
index 0a5163e184e8..2c433d65888a 100644
--- a/dev-python/pyopengl/Manifest
+++ b/dev-python/pyopengl/Manifest
@@ -1,5 +1,5 @@
 DIST PyOpenGL-3.1.0.tar.gz 1172688 BLAKE2B 9865a10e8b5d2756192077b4b079658c680b9f47bdaccb33285fb1942bc678b29f6a69359a1486ec023b1a73d714a7e0209b2f57776fe8b5e4a5e2d0803dba4f SHA512 f748017ab3734c7672c3fdbedcea80df297a91a78b111533e260feb0868ebb02935666c041f77db03841ee8f90057d9c53c53b00b097aae4cf67a52c7fc9c2eb
 DIST PyOpenGL-3.1.5.tar.gz 1835295 BLAKE2B fd3b3e9970b3e704b09128402b401e23c584ba20de23082d019f5ab9e1e222efdfbd2e11ecff6ee748f41bad3a5ff089c57a5c354092e2f717b13e18108de2af SHA512 5d90fc68040b4886e46ff69a59be9e3a8e31e3e1295283756db86d50a1efe681986928e18eb55d20fd2660f863653301ea483425bbe24046f55085b44f4906eb
-EBUILD pyopengl-3.1.0-r1.ebuild 806 BLAKE2B eee91be873326814463cae23fa97158188fc033b051701ed7b07d8c51d817297d1551262bcb7c773bfa850949072fa3bf7389840c1ecfd312557115bc223b909 SHA512 919b0c46d864f8b7008161a75c673889b2c7683a0de5c2c9096ac104354e91c419526c6d82b451744f2b26827d6cb3e66c1a37a56280e5f484b9c8375d79258e
-EBUILD pyopengl-3.1.5.ebuild 1224 BLAKE2B 6f5c4df5e4316651712d5263f434dc61a1e2b79dc901a2b8d2b003862c055cb27bc49801e3f258e6b54500a0a19f9a9b7076e77e255b65a16b5078f3112c51cf SHA512 a564f63316f4bdc3af64b7eb939afdb7f0f50be2be1f9a2cdb14502e86a67d917cd4bb60cbbb44f855bfe4ccd9b3ecc285120e990591147a8bb388132ff882a5
+EBUILD pyopengl-3.1.0-r1.ebuild 807 BLAKE2B 54cc7381d010d544d8d2c362aa50d556d55fd1173acc8325a31222a961ea41763e23d4010815fd0c20bc632763930ef93ebdafec56e528f6f016746e1e90dd0d SHA512 bc5bd6dc970cbcc60b1d05f612f3cda7b6c6d9b2e716d2516451739dcd2266a73623b340ca747035f80f0f8cee856e2480a817bc8f4b0224ade2dcdce7c5c46d
+EBUILD pyopengl-3.1.5.ebuild 1225 BLAKE2B 1f8095095be9a7a267866de444fb1595a69069961b7819799fc644419cfc0f3bc57f376f9090cbf6a8fb36c229a75985e8d147b024517233a0b06b88b9c75011 SHA512 8657adcefa379cda193a08a0ebbe9c0fb424d99f623ade76915e5d3294f9b82e011aeff16bbd170b9f416fba5af9fa201b4769406756b058d4b6a3c74e958961
 MISC metadata.xml 364 BLAKE2B a831069125da49ab322af6f4d615d3091865919e26a1cd66da5a760a855ca81eb38450f8707c9346174871cb3055fb5085944a46c1fe22135a8f4b81c7ac2117 SHA512 7f81e0f6a601ff3ddd04a391380882edfa45f801bb4afb6fa04673395cee74968745016e9a285908aab6cd701f62b70164b9885493cdfe553d52f30d49509546
diff --git a/dev-python/pyopengl/pyopengl-3.1.0-r1.ebuild b/dev-python/pyopengl/pyopengl-3.1.0-r1.ebuild
index c66c6084afc2..8a46c64fd574 100644
--- a/dev-python/pyopengl/pyopengl-3.1.0-r1.ebuild
+++ b/dev-python/pyopengl/pyopengl-3.1.0-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 LICENSE="BSD"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="tk"
 
 RDEPEND="media-libs/freeglut
diff --git a/dev-python/pyopengl/pyopengl-3.1.5.ebuild b/dev-python/pyopengl/pyopengl-3.1.5.ebuild
index 39847d05e9c9..08a792820fed 100644
--- a/dev-python/pyopengl/pyopengl-3.1.5.ebuild
+++ b/dev-python/pyopengl/pyopengl-3.1.5.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 #	mirror://sourceforge/pyopengl/${MY_P}.tar.gz" # broken mirror for this release
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="tk"
 
 RDEPEND="
diff --git a/dev-python/pyopengl_accelerate/Manifest b/dev-python/pyopengl_accelerate/Manifest
index 3bd66f068c7d..48ab0e0893b8 100644
--- a/dev-python/pyopengl_accelerate/Manifest
+++ b/dev-python/pyopengl_accelerate/Manifest
@@ -1,3 +1,3 @@
 DIST pyopengl-3.1.5.gh.tar.gz 3287132 BLAKE2B a1d683715f4a57c0374cac827e7bd9c93ca303ac578f50a71edff983c6bf3c32858be454bf6ac00f757c52a0adc3b7df7f03181abf69304ed3621d168f2166d8 SHA512 66a6e07b4cee4d80d5b01cd6a506b54995e499611979f8a02fef76d95d6178fe9644fa4ad794812599be0aad293424be980f4a9d47480983503e09887250560d
 EBUILD pyopengl_accelerate-3.1.5.ebuild 815 BLAKE2B 6f3a1500bc67744976637b031e92d8e3a62a9616a6a96eefd978801ab1a0c3bdd6209ff229883674cdbf7a5b3f0f4f1cc07dc3719f3ed0c5a7199a3622c789b1 SHA512 ba0340df0601d2d0f881555a35b2a15001efbac4a29fbc6d613cc171063310f737b7c0626f96f3e839ce3a6ac10e2323744c76f61196b694e6224fba4a2f4956
-MISC metadata.xml 375 BLAKE2B 91123ef3cc783612271173e626b10dbe2a0e4095d0d4d18d6ce506ab1986f41c6db068734187223e1a4f412396e2d7f5d17f3138d2c75066e7d6d869e0d7f774 SHA512 9e5aa22c4fe794cbd2df7dad59135ebf36deeb609b294db54339daa5791765c06bb8c8e99bfc8d85b7104a05ab98370c93fcfe81ea2e0257e20001be0240d967
+MISC metadata.xml 432 BLAKE2B ca3be348498fb1dc7a52a2c21395ae803e95ecb27f713fb4ad9b231b3bba9254e9c0c30a8639d781f10da939062bb1d1bd7b682d215cc5de9e6d5c12a70f7432 SHA512 12cee0961e4ffe39dff77c96517fa5efaeea4f71e03e617171f9bd15164b590342300d66970112c206c2382e704aa364395b470dbe67e1ade8086751eb91d4fb
diff --git a/dev-python/pyopengl_accelerate/metadata.xml b/dev-python/pyopengl_accelerate/metadata.xml
index 48cc66f255ed..6611d6a95675 100644
--- a/dev-python/pyopengl_accelerate/metadata.xml
+++ b/dev-python/pyopengl_accelerate/metadata.xml
@@ -8,5 +8,6 @@
 	<upstream>
 		<remote-id type="pypi">PyOpenGL-accelerate</remote-id>
 		<remote-id type="sourceforge">pyopengl</remote-id>
+		<remote-id type="github">mcfletch/pyopengl</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pyopenssl/Manifest b/dev-python/pyopenssl/Manifest
index 76e45216edd5..5643e7bc861e 100644
--- a/dev-python/pyopenssl/Manifest
+++ b/dev-python/pyopenssl/Manifest
@@ -1,5 +1,6 @@
+AUX pyopenssl-20.0.0-libressl.patch 1021 BLAKE2B b2158cc4bcde97221d0c18204020f1cb5331a3c38826ebda16bdf8018b038a87bdf1ab4aa81cd2c690b868411663d4a6303eecdeb6743afb60e956512e1dee34 SHA512 aa2ea27211fc06bbca62ff78305d69b9fd9f0cf5d5318f956fd9b386f378b33cf99f7596f35c37343404940d9fe7f9734efcbebadff7a98e5f0f650a71bc84a1
 DIST pyOpenSSL-19.1.0.tar.gz 160510 BLAKE2B e6e39f860221a2696aa3fa32ac89ed48e34b18e4accc366a86264d943a15a1b00ba1a0d8349550d1775d25836aa5d214e1e3fe4ec0a9c0f6d5ab00cd9fede633 SHA512 4acd96f287d72eb11bd812697d28cd6eb6a96a4653248b65f967187830a6b17cc1254775a18a3405469f3d45abdae6f02d165f2f35f035f3174c2826fba82916
 DIST pyOpenSSL-20.0.0.tar.gz 173786 BLAKE2B 3fb1e90e20b3e083fc93f6dc8a54fb54e15ceb38c4d2e84e2d7d68bb56f9e3828cd264e3554f25465e858687e74a7f20b91216fb7a0b4b2c656ea86423cd3442 SHA512 26e8a64d53a35434ad4bf5ef50ed5c37d7b92b0db971a2103dcafea56a0b377d67333af630a31405a97cf2cffddde320907b4950ed336a8321391854bcd2c50a
 EBUILD pyopenssl-19.1.0-r1.ebuild 1395 BLAKE2B 29ec3a4e7ca4ac8c60f6227046e80c136e12db62d493619e852cdd657a332543806e48915ee0b9613258427230e9b696d07d2295bb0ed80c837ffc5cfba91aa0 SHA512 1620336ea740370145277b48c4836d5b8d9e2c4f5d476d29c4c321194ca04adc04d1972d4278309b8dac65dd6bb8da0a1b14cb6e3689e41c3be88f8fd5a50952
-EBUILD pyopenssl-20.0.0.ebuild 1402 BLAKE2B 2ca98de775ce7d213f38ebf58ae0ade0f1afab3132b034bbaedc351436e3ca3b895e948e7238b3b0b5dfc7e0694ee2c2444ea3639868409d23ba6b3b22b4ee75 SHA512 907ca7f0a92aad565cc76483cfecd6f689162ec5cef244eae3c3e29641d08d3291b2a3046bc4b22fa9da9ec5e89ccfb9436d31282ccf0056695ac1240255f23e
-MISC metadata.xml 481 BLAKE2B e25a44e19e9e7fb701742e1c4916a41a777efcaa046b8147510fc8d9d021cbaad9fb887d8df6769b91006acdc9418df6cec4ba20a78fdec88d26b7cc4ac5c2f0 SHA512 d568654867ca274e7c67a9b30a7f50e739309a22d78c3c1f06f4216a224b00e3a05be022920614befaf96a65ac55782966c9a1fd0ae88c806acc559af307ca38
+EBUILD pyopenssl-20.0.0-r1.ebuild 1449 BLAKE2B dec6086e443725609c7bf5a583c65a006a5cb14a711677e8bf96f29452d920766042a16459cdc23314f3b586d3f25ad8425e84ada6c4cb8864bc5899fb55de29 SHA512 fdbd12bdc40ab48f3fe7fb0397523ba0543efcc604e7c53c34705dbf7874940859c7a7215de8292dc3f219c1c0da54415536df2cd0168e96f48251267c61088a
+MISC metadata.xml 535 BLAKE2B bf6dde29d0d101534792aab82e884425a32a6d96385e21e46d760902684b32d0560c57eb8be37db82365f5332906540d145f88bcd76626f00a11e12428664ced SHA512 64f374479e80652f5803b3c6ef3fbeb94c3dc23c5805b11390979be02c312c631ad8ddca0056f439f41da7ebf245119c7da1110cad637efb0e4290be9fadd4f3
diff --git a/dev-python/pyopenssl/files/pyopenssl-20.0.0-libressl.patch b/dev-python/pyopenssl/files/pyopenssl-20.0.0-libressl.patch
new file mode 100644
index 000000000000..6e9c7847fcea
--- /dev/null
+++ b/dev-python/pyopenssl/files/pyopenssl-20.0.0-libressl.patch
@@ -0,0 +1,30 @@
+From ecbd275386e5608f0f90d3536506d7f50026ffe6 Mon Sep 17 00:00:00 2001
+From: "Nathaniel J. Smith" <njs@pobox.com>
+Date: Thu, 1 Aug 2019 21:23:51 -0700
+Subject: [PATCH] Support openssl <1.1.1
+
+Upstream-Status: Inappropriate
+[https://github.com/pyca/pyopenssl/pull/861/commits/ecbd275386e5608f0f90d3536506d7f50026ffe6
+was accepted in 19.1.0 but later removed since the upstream dropped
+support of OpenSSL <1.1.1]
+Signed-off-by: Stefan Strogin <steils@gentoo.org>
+---
+ src/OpenSSL/SSL.py | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/OpenSSL/SSL.py b/src/OpenSSL/SSL.py
+index 6f785fc4..55211511 100644
+--- a/src/OpenSSL/SSL.py
++++ b/src/OpenSSL/SSL.py
+@@ -140,7 +140,10 @@ class _buffer(object):
+ OP_NO_TLSv1 = _lib.SSL_OP_NO_TLSv1
+ OP_NO_TLSv1_1 = _lib.SSL_OP_NO_TLSv1_1
+ OP_NO_TLSv1_2 = _lib.SSL_OP_NO_TLSv1_2
+-OP_NO_TLSv1_3 = _lib.SSL_OP_NO_TLSv1_3
++try:
++    OP_NO_TLSv1_3 = _lib.SSL_OP_NO_TLSv1_3
++except AttributeError:
++    pass
+ 
+ MODE_RELEASE_BUFFERS = _lib.SSL_MODE_RELEASE_BUFFERS
+ 
diff --git a/dev-python/pyopenssl/metadata.xml b/dev-python/pyopenssl/metadata.xml
index 037166d772aa..d5c951e41acc 100644
--- a/dev-python/pyopenssl/metadata.xml
+++ b/dev-python/pyopenssl/metadata.xml
@@ -10,5 +10,6 @@
 		<remote-id type="launchpad">pyopenssl</remote-id>
 		<remote-id type="sourceforge">pyopenssl</remote-id>
 		<remote-id type="cpe">cpe:/a:pyopenssl:pyopenssl</remote-id>
+		<remote-id type="github">pyca/pyopenssl</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pyopenssl/pyopenssl-20.0.0.ebuild b/dev-python/pyopenssl/pyopenssl-20.0.0-r1.ebuild
index b09f1b1bdec6..0e4a096a48ac 100644
--- a/dev-python/pyopenssl/pyopenssl-20.0.0.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-20.0.0-r1.ebuild
@@ -37,6 +37,8 @@ DEPEND="${RDEPEND}
 		>=dev-python/pytest-3.0.1[${PYTHON_USEDEP}]
 	)"
 
+PATCHES=( "${FILESDIR}"/${P}-libressl.patch )
+
 distutils_enable_sphinx doc \
 	dev-python/sphinx_rtd_theme
 
diff --git a/dev-python/pyotp/Manifest b/dev-python/pyotp/Manifest
index bc2c21cbdb9f..837e6aa82393 100644
--- a/dev-python/pyotp/Manifest
+++ b/dev-python/pyotp/Manifest
@@ -1,3 +1,3 @@
 DIST pyotp-2.4.1.tar.gz 15232 BLAKE2B 0690364209bbbfc7bdaddc0204168a584696b98d974b203513ce8f6ffef9751ed1c9d19b7f875631805cf704ca494b2412eb731b0415fdedbae7f57ece630981 SHA512 4bd60ecef1ae22207732a539e5b46c3ca35fa6158da552e537aa522bfe2a2e0743f7426c437cd93cc9901ce5b834cbd9d9e4481eb95478871367f1d5373b67af
 EBUILD pyotp-2.4.1.ebuild 466 BLAKE2B 249e83ffa800f5381058fac73312e83ff6d13c4d20162d541ea1a13bf727fe9f8def78042b9b43d9f83546c011d84b1b83361437a56f58f626725ad008b16f32 SHA512 dcca2ffbb90c625044b3211ff2e33ae45d5cd2821b2f6c3e9ce0799e407227b1f79b8e37d8ba8d032429554f8988ebbaecd7b12fc039c68e5ed1c2b80197c850
-MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
+MISC metadata.xml 360 BLAKE2B fe2c3ad33d18c0f3198787f1186aff853e401d2da59ce6fd318917fc55f45c7d56e0d22a236bebf81b8bb24333157712dddac0f41f2508f421bf73e1218a5cda SHA512 db2d53c8ead7280b79bf0b39f9da54091b01ad08213f59c14f43879bbd05af176d677b26aa9b7924f2c744df9ecc3f9579b2141875bef9bbad1f3310bc56c4bc
diff --git a/dev-python/pyotp/metadata.xml b/dev-python/pyotp/metadata.xml
index 7f4f33c6dbc9..75e6248ea089 100644
--- a/dev-python/pyotp/metadata.xml
+++ b/dev-python/pyotp/metadata.xml
@@ -5,4 +5,8 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pyotp</remote-id>
+		<remote-id type="github">pyauth/pyotp</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pyparsing/Manifest b/dev-python/pyparsing/Manifest
index 129e83d5ebcf..fd3aeeabca94 100644
--- a/dev-python/pyparsing/Manifest
+++ b/dev-python/pyparsing/Manifest
@@ -1,3 +1,3 @@
 DIST pyparsing_2.4.7.tar.gz 648158 BLAKE2B 24525b4ee7876e245b9eb270f0e3e22fe2d8b398f9777ad3b3657b8a1227dcbd25983aa64a3f3018debdbffc1a042c732e6b3a09800e081c7acac7b97da15317 SHA512 c7a546729f86a2b5176e2482b566b9fd715b03e495aaef4d720b21307bb03f385dbc849247f8d266cb3d92be0a83c34ce4995b655ce85318355d5a0d42d6991e
 EBUILD pyparsing-2.4.7-r1.ebuild 1004 BLAKE2B f82c4df2d33ca243b5dfb480dc69fc5a9d10a40bac27bebb95dfba1c82bc57fc90c4901ccb04341d7c1b422d0dc0bcc3750d52faaf42d21654a7f97d21d0cd3b SHA512 c3fac5cef28796e188e8c5b3d2726892488a5b0290ecb2ad5e9408847081c7878ccb414528381e9401afc9a8f580e6945ac5cf9ffd08b8bb3c808a860f6f62fb
-MISC metadata.xml 762 BLAKE2B adad994029179676a767488775141e8d79d51803f1fa9546d85c33dfbaa2a656e82bbd1c684c401bdccad5f2be763878296f149c9032097f1db87c60865dbc7a SHA512 7afb6c24b323080e02f552a35c89e7b0117482ed9edf5ad28e845553d98db9ba0d02919419ec8029bfc431ed39c5b60bc270360e6c5567d34e883c819b2ca9c1
+MISC metadata.xml 796 BLAKE2B 181d16c9c3d8ff66e019dbcf57006dd363b4bc0899fccbde2eb07e1270d70b93ac645ff61ff0a5f03b2193bf1cf05f8943a03ed0ffdbc231e32ea93b848c39dd SHA512 31e722b12b24597d3a10451f749c40ce36d67779c53c2d6fca644a4000f9900a1e692c727dd8c89b5bb26b3ea4604587034ba11054f7e83a5eb383224f0976ff
diff --git a/dev-python/pyparsing/metadata.xml b/dev-python/pyparsing/metadata.xml
index 84f7a71eb750..b4b32c384d20 100644
--- a/dev-python/pyparsing/metadata.xml
+++ b/dev-python/pyparsing/metadata.xml
@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <longdescription lang="en">
-    The pyparsing module is an alternative approach to creating and
-    executing simple grammars, vs. the traditional lex/yacc approach, or the
-    use of regular expressions. The pyparsing module provides a library of
-    classes that client code uses to construct the grammar directly in
-    Python code.
-  </longdescription>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="sourceforge">pyparsing</remote-id>
-    <remote-id type="pypi">pyparsing</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+		The pyparsing module is an alternative approach to creating and
+		executing simple grammars, vs. the traditional lex/yacc approach, or the
+		use of regular expressions. The pyparsing module provides a library of
+		classes that client code uses to construct the grammar directly in
+		Python code.
+	</longdescription>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="sourceforge">pyparsing</remote-id>
+		<remote-id type="pypi">pyparsing</remote-id>
+		<remote-id type="github">pyparsing/pyparsing</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pyparted/Manifest b/dev-python/pyparted/Manifest
index 7954a9264ef7..bdab1180e141 100644
--- a/dev-python/pyparted/Manifest
+++ b/dev-python/pyparted/Manifest
@@ -2,4 +2,4 @@ DIST pyparted-3.11.6.tar.gz 105633 BLAKE2B 8c74fb3521f94cf726365e91954c56a60bc41
 DIST pyparted-3.11.7.tar.gz 105671 BLAKE2B ffe7869c7ac85f291314d0381e18ca6a732eca2cee3d31fe31a89b8b1c1c671f97a06a586f235ee67244388ab214a7e51c67951a5c1eb79fb1b448f6a004381c SHA512 147fdc45d47faaee574a7b0268a218eef49be929a147d20adf85cc0302d94e57e98e02072591ca035cad7efe164e7dd87bd1a31504f5cff8575f18d4469dc2b0
 EBUILD pyparted-3.11.6.ebuild 671 BLAKE2B 5be9c6d5cfb65c7a8a4702fe0eea20e39ebf768fb144d88e228f7646bfefe3c3b64ffd588e56f15e5cfbe24a92feb803db8cb691278ffd73e8b6a000ffb3e165 SHA512 280a9da40c537cdfc295dd0df09e9ed97f2f119eecd7555d706bd67d9b725722a32efe34970e5114c374819cb121785792f74cca92f28126c90fadffd956c222
 EBUILD pyparted-3.11.7.ebuild 677 BLAKE2B c0740e0ab83ce4e31227801d3c6d001e0e1daf6ed74371b663354c3f68525dbc22e69b851b28058bea1e23f2778ad29b2c640b03ed72ad064735ff98ceabbdb9 SHA512 de20c3651fce5cc98dee52ae18bc0252767e6f458d6f37fa6befd33b54f3ab5958a3f1926426d32861e0b474df260ef8b1eacc2973dd2569740ec1f2b61f5ed8
-MISC metadata.xml 330 BLAKE2B 341269de1f90522fd91a52f12820a4971b9b01cc46f85890f5b31061d8f22f2d813f58ecf284d133ee1acc5ae9d476da66393d7037a5fe6c1883ac28240cb335 SHA512 40ca8e24d87f897a1744add293761a71fe736a9dde6e04534ff2ed56990733fe60769cda1c862885bff6c0f2a98ee2e23adff527bdc81370220305eca9fe5342
+MISC metadata.xml 376 BLAKE2B 6f05ffd5c5420323e7cc8a583190efdc30e16e20d38f73765b1eea2a9572c265bc3612a3218eff6544da134850bd75863cf3c155791767efd45559ac1f1c049d SHA512 afdcbcc3d388fc555d0036416b9190e8c610a78d890b817a031f18c622c80b25cb30a73d98607fa402c548d944cd82fa9f9ed7c35899e2de20b2422f99325476
diff --git a/dev-python/pyparted/metadata.xml b/dev-python/pyparted/metadata.xml
index 00fd17201ac7..84d64a79ce3f 100644
--- a/dev-python/pyparted/metadata.xml
+++ b/dev-python/pyparted/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">dcantrell/pyparted</remote-id>
+		<remote-id type="pypi">pyparted</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pypax/Manifest b/dev-python/pypax/Manifest
index 8ba3b63d2ea8..e500585b4dce 100644
--- a/dev-python/pypax/Manifest
+++ b/dev-python/pypax/Manifest
@@ -1,4 +1,4 @@
 DIST elfix-0.9.5.tar.gz 401722 BLAKE2B 184f8944c62412675819ca86f13bcf23039ebcf069df528267f3e4272859e6cc442a1e05a7a121d88987c282d7e2f513d02f28ce41a8e3c0c226b456fa256aa6 SHA512 e15ab664357796f3a63ac54912eb43ae659947088a10ef16aafcbdd713cc3670fb0319cb2b95a2d29092866d322ef69df1d63847dfc0c4ab2cdd49e6eaa4635e
-EBUILD pypax-0.9.5.ebuild 1113 BLAKE2B 6c1a0d6cc4badfb802159eb1d3ec2afa97bdb18bd50f415565ee63671600e17a7ac69fd9188634e7b78621db2303a84123d5472121f09d26843840fddf95f570 SHA512 0d7399b822a6b7039dd6f50167c9e935365a2515f2e2167292cb6e6a3810872baed533b610f45a41567e83355918fb929e267c805340f7502e54ecfbd7678765
-EBUILD pypax-9999.ebuild 1121 BLAKE2B a9889738d827e4de55be27b76f91f3612de104e22284552ecb97cf824cc3962eb77d8d1e1ee03315a464ea37c18fc3a953d62600283cdfb982d2073b9a4dafa5 SHA512 47a0bf465daee50bbbaf2b80f6959f1da393b1b2a4f22c46d0a924721b02e128aa49cb3d236e7ef05ddfd545a5231f0d4b5a0a784b9c502feaa879963259f1e4
+EBUILD pypax-0.9.5.ebuild 1115 BLAKE2B 16fca02b16acb057405e4ea69a99942807d641dc69fe6740026700e26abdc9f42906a8d29360cd7ef02116cd258e4dad32fe57faef254b164afc66673e1ecc46 SHA512 8e4067f16c52547f5df040507956990cdde4080b7d42995567393d8dd8a775e947ac741731d6dd5d18c2d4444099d24ae64c5b26ae650701ae9896af5278f4a7
+EBUILD pypax-9999.ebuild 1123 BLAKE2B 5de2dd6289791bd31a3c0e90ffbdb13e32076ef90fabbf03b9dee14f3e1d40f47fd48804f6dff6680f359d594d4555e8427e1c9f8df87f26f493b4c9b6ec0282 SHA512 6c08e87b65476d2443c78f251d548493d47daa3bf3d227ceb4e4460c95fa266f576861567dbecee73e392e77ed9d53efded6138a9d96a57c8103d85a177626dd
 MISC metadata.xml 597 BLAKE2B e154315aac17c35f33adc8dd7e33a6427029a34629979d2a7cfa6f373a56a9dbb6add22bfb359ba4126a29b172557393b96cea123224551d88894e5c5f637bbf SHA512 d5820da1b741114d7ecaf7cb7f0b6f1c08d675e53992c8fbf87f562c3b949ff7336e093a3a502202e671be299310c14a2a38b8d54d3485e0d9064964eb1ed87b
diff --git a/dev-python/pypax/pypax-0.9.5.ebuild b/dev-python/pypax/pypax-0.9.5.ebuild
index b005f93fdc7c..bfa8924e39b3 100644
--- a/dev-python/pypax/pypax-0.9.5.ebuild
+++ b/dev-python/pypax/pypax-0.9.5.ebuild
@@ -19,7 +19,7 @@ fi
 
 DESCRIPTION="Python module to get or set either PT_PAX and/or XATTR_PAX flags"
 HOMEPAGE="https://dev.gentoo.org/~blueness/elfix/
-	https://www.gentoo.org/proj/en/hardened/pax-quickstart.xml"
+	https://wiki.gentoo.org/wiki/Project:Hardened/PaX_Quickstart"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/dev-python/pypax/pypax-9999.ebuild b/dev-python/pypax/pypax-9999.ebuild
index 16ff1966bb47..138c305d0539 100644
--- a/dev-python/pypax/pypax-9999.ebuild
+++ b/dev-python/pypax/pypax-9999.ebuild
@@ -19,7 +19,7 @@ fi
 
 DESCRIPTION="Python module to get or set either PT_PAX and/or XATTR_PAX flags"
 HOMEPAGE="https://dev.gentoo.org/~blueness/elfix/
-	https://www.gentoo.org/proj/en/hardened/pax-quickstart.xml"
+	https://wiki.gentoo.org/wiki/Project:Hardened/PaX_Quickstart"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/dev-python/pyperclip/Manifest b/dev-python/pyperclip/Manifest
index f1ceadb33b28..eae5221b994a 100644
--- a/dev-python/pyperclip/Manifest
+++ b/dev-python/pyperclip/Manifest
@@ -1,4 +1,4 @@
 AUX pyperclip-1.7.0-test-pyqt.patch 1098 BLAKE2B 4fe453df11842615f1c2f2206553b3b98642bef61cc596bf7951f3dca2f15988e5a41bf577a4543ff692ddb7ef22e184c76f53dc982a5c658f067677cc563098 SHA512 4135204bb98d4148524bc6699a39917d4b5d04f5a686e61d283414889a4b6891c3ec5c0a7492a7a0ca95eca12bcce4cfd80beb3c2420a7fc6f4512efa30e2706
 DIST pyperclip-1.7.0.tar.gz 15977 BLAKE2B da1473f71bcadcc6dcacdfb6d1a1447b055eb1aa7b31fad76bd3a51245ad9b1e512335f9799d7d416a53b8471ab66c28afa5f9d3f3ee2b39e85d9c239a7e2c79 SHA512 7f22227ea894a236703f61ab950e198fab969fac5713ca8eac6df213183a47a244add88a462b9ddf63ed5bec36af5bc2578949f01ed31e0b63316d1761a935bd
 EBUILD pyperclip-1.7.0.ebuild 1223 BLAKE2B 299fede05e15289a8cbe50859862e5a6cc1e10114e554cb184c554416107a91bbfe100797f7f4bb0558c9b0a0049c317741c2a387d49e39680db47eece5d0385 SHA512 d94bac216d464a6f886444d325eaf3e88d0369036c389938228f9db2893d2ebf381fb97d547306465e0c378be65f6b1c7258275cc2ecaed5e5a7f895531d379c
-MISC metadata.xml 357 BLAKE2B 05722f76dcf8c454fb3eb76c2b98cccfb7f2a3d67a72a7e5d79a5444dc89e042261a711d89ddfed8c3cd705bc266b1a17a5372bf59207090c8f856998c2a267f SHA512 1fb9193b49c08c22fed7e498d31551d5f8afcb0551bf63bb9ed605a6b39e5e059276739170b39765ae56ee4faa42fbda892fd54363955a35f3dd874968cceae3
+MISC metadata.xml 429 BLAKE2B c77e5ac40cfbc1893883c615eed7bc511ae3d146a2b2350516e06bcb08fd50872a53758c0be0750ac70950dabcdce986cea5c8d52019930ac74be9e25ea9c259 SHA512 38ecc541684be21065234c1ea7939ed99e4abeac6cce9b1fe1ee8a05ab487afdb15c57736dd2c4e111502751fd38fe98e862d1433c2cb58812f020476a8b344a
diff --git a/dev-python/pyperclip/metadata.xml b/dev-python/pyperclip/metadata.xml
index 631e40d11e7e..c6215a36971f 100644
--- a/dev-python/pyperclip/metadata.xml
+++ b/dev-python/pyperclip/metadata.xml
@@ -9,4 +9,7 @@
 		<name>Matthew Thode</name>
 	</maintainer>
 	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">pyperclip</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pyphen/Manifest b/dev-python/pyphen/Manifest
index f87981a37cd1..39604e526a98 100644
--- a/dev-python/pyphen/Manifest
+++ b/dev-python/pyphen/Manifest
@@ -2,4 +2,4 @@ DIST pyphen-0.10.0.tar.gz 1894118 BLAKE2B c33283d6eb3dd7affb52b91826fa0f8fab8ec8
 DIST pyphen-0.9.5.tar.gz 1901384 BLAKE2B 809f7e3c204ab7de87a387909fb0d9aebd3d48586a6b1da8a683a8b1f862e2d2489babfb30c9792acca44c0fe7bd5da39c1508245ec784dce30a4c7124e91152 SHA512 049a62b226e90e568c8f56e756f8fa6fbc74f3bc40d61af8eb05ff2d4404a7b29cef14d4f144d68ed2f2b11eb128491de64536240ba7b76a2d04010c76e10346
 EBUILD pyphen-0.10.0.ebuild 679 BLAKE2B 14da6d594bc52a56c99c0f74d5c8a34f0ee6f00b0d8351ded3a66276a10082c31f7fe0cd5986f1b4794bb8fc09eb17592d6e5f38afcab09588f8867e77801291 SHA512 0a5f227802b566139d6b4a8bceae99fdd0c5a94042fef5df33988bda192af8b857a7d8ab36cac1d0728b318fcea27988c81edbfa34a4d250b74781ccf9fc077c
 EBUILD pyphen-0.9.5.ebuild 675 BLAKE2B 66b6f629cbec9c907a437d5ffff78ddbf1a9979e612181f0a4cf7c548fb822dda019803141e883f67489dcb764d145e2055c5744244d8f3d9dc852f69b849230 SHA512 3829045d3e715e7929fd171eac870c6d476bd21962f5ffeb0346a161ac991d70074085b2eeb64f6a9b26632d44fd3f46e0d37cb9b5fbb49dd8adef5a5cf67d04
-MISC metadata.xml 384 BLAKE2B 420bdcd5d54a1d049e16700ef9a7f2457a88fe8e5f5883c1905f2309197390803f6a58afd4d2678f563441839f7c8067410f00994134217883efd240359b868b SHA512 b07060cd3359359498cf6bd51151eb0874f2c65d0174df993d1041408c394d12cbf188f0f929e41364e9116a9d98804a0536685bcb232561706dff5e626e47f4
+MISC metadata.xml 409 BLAKE2B 3ec65099621f94904aea69465bdc2163554677e4312d51f925df9d792deb790aa1511b0c9e8fa86a4416f083b1f8b0072a71b88480c46e46ebe30165f560a63f SHA512 4462817e8689c52a47fc71cf2f73204c8a0963bffed85fd803993236aa2d36924c92a232d0bee5b3153a6dbad85c5808c2cf42df5ab8b6bd585d5045650802a8
diff --git a/dev-python/pyphen/metadata.xml b/dev-python/pyphen/metadata.xml
index 750355dc215a..280fbeed7d1d 100644
--- a/dev-python/pyphen/metadata.xml
+++ b/dev-python/pyphen/metadata.xml
@@ -5,6 +5,7 @@
     <email>whissi@gentoo.org</email>
     <name>Thomas Deutschmann</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">Pyphen</remote-id>
     <remote-id type="github">Kozea/Pyphen</remote-id>
diff --git a/dev-python/pypiserver/Manifest b/dev-python/pypiserver/Manifest
index 0252e0158674..c8d36d60d9ab 100644
--- a/dev-python/pypiserver/Manifest
+++ b/dev-python/pypiserver/Manifest
@@ -1,3 +1,3 @@
 DIST pypiserver-1.4.2.tar.gz 511019 BLAKE2B fe9a41c35d601ee20f2cfe0773ce341b8c8fe387a2b825d1e6d669d5f358846b436158beb8a1222fa33cf1841cad5aceacc0f5063f899445ad15ca9eb5b8efd7 SHA512 8597a6a7e83cb3f5ead3418ee91167e1764c123b244c05397fa892c8ebe84b58569f27ce85cd9849d6a41d20342de21cf9cc46e00b233d9d94d0540470e1c49b
 EBUILD pypiserver-1.4.2.ebuild 1228 BLAKE2B dd05aef786b52d0aaba07688c8e059291914e24ef012aae511a75c866fd5a640297bc9b90746c8086e00762f083c4a52f186ae1d7557854b89855d133e347550 SHA512 5648e3a6ded9d919a919f6f57172bcf25f4e189d61490e28e1cd4a569fd6c2c90d37102dbf07204815ef9a5e3ba3a099e646197765769dfd2e92d56296308d64
-MISC metadata.xml 408 BLAKE2B 84e0589c8c4d813b4542e5d3080ad855611c320c9d5950a08c232c9fa344bca969fa4b23cf6d2b427731d2d30c2f678d33605207042779ea40123c6b249017ed SHA512 de1340d8f01941355ec01b2f92b4e89ad798dd9438e858050861dfb8c139994b5e8fe620b00fcc8133204ba8d265eac36f60ba3bca3a4e0da49332da13b75a9f
+MISC metadata.xml 398 BLAKE2B 17b98aeb54d265f5425ec585fc9b5371834070d6ffc152a4f36de651b617c9aa2a1f2124d8429ff9026ff2efd50d998e5fe7f57f1611dac809a7ab201efe82d2 SHA512 6be64d6a8021877f80aff2217d3467017b6a5561cba145a4eeb5b82b6f3239c6baea9b2994fb53ff861aaf4cd28328987609ef454c5707ef7c31d4d9f9323ce3
diff --git a/dev-python/pypiserver/metadata.xml b/dev-python/pypiserver/metadata.xml
index 0d519d2171f2..445bbcd9043e 100644
--- a/dev-python/pypiserver/metadata.xml
+++ b/dev-python/pypiserver/metadata.xml
@@ -7,7 +7,7 @@
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="pypi">pytest-services</remote-id>
-		<remote-id type="github">pytest-dev/pytest-services</remote-id>
+		<remote-id type="pypi">pypiserver</remote-id>
+		<remote-id type="github">pypiserver/pypiserver</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pypowervm/Manifest b/dev-python/pypowervm/Manifest
index 3f1d584fb8e1..b633af58a740 100644
--- a/dev-python/pypowervm/Manifest
+++ b/dev-python/pypowervm/Manifest
@@ -1,5 +1,3 @@
-DIST pypowervm-1.1.20.tar.gz 906153 BLAKE2B 868571636f3c21b5d179ba587f7693dcf8e55661324d3ba5578be34813a67a5b2881441c3aa3744a9fc1c6ea34626085d62c5829368c43b329edb98804d9fb9c SHA512 1ceaf00f830caef918c27b342f1bf59a41e88593eb36f6c5f01c7a0ef786a69b15d271c87d161f069e12c1224ebb4f6cdf349e31a551bd26fac5206860ba9019
 DIST pypowervm-1.1.24.tar.gz 906444 BLAKE2B c8ed0b066963adcc36b19d919683027fba563da8486aa1775c3f82f8ef3466ae7d909eea3eedd807585bc29fe212f65b061201f8dd5cd81d6055a89cf97b6932 SHA512 b2d254555c7501961bd45ac7a7bfea886ac12c8eab07b6bc34352e425f6e9c9cb6fa8331796164962f1f60afcaa9aa9e8a711cdf71dcb70cce7c4188c4217543
-EBUILD pypowervm-1.1.20.ebuild 1080 BLAKE2B 1ea490e8dc10ee20abb5ba222e45d4dd981603b4014940692cc220d4ea8b49eb07febae56a4ad63a047f01982aed4cd301fea5f3a5c9f15afd5743c1dea6fafe SHA512 272254fab3f8bc11564652e579338dcddc1ae2cf5b798a1ddde47b84127a9fe29708bee7dbdb481008341df67607b2c8b1d2560f880d2c71fcf40a5840709d51
-EBUILD pypowervm-1.1.24.ebuild 1045 BLAKE2B c3d9f099476e1807a0a56e6f59d73968f9511d0941979cb2f78b7e0cffd5a151bd9a3fe0d04a00aae99d1a80db897b91a374e38be3fbfcf1417680b22d8873be SHA512 a9d7af949ed2c8f22eb149e02b92b94415d5d75795c7c3f40954260250766c7cd6ff23d4dc9b40dbe52c923cbe0b335d7f45931bd735f1b74199a3061642019b
+EBUILD pypowervm-1.1.24.ebuild 1043 BLAKE2B 60026b7b31983c5a3b3bb8bdf689ddee59254a4bb9fadfe51845bda2f0cdedcf0ce3459b712c5730bbc1b240343179e87c4f04d241f9f348e356582683d9d958 SHA512 a35f824537384d5e4b362151c82c5f7694e3ac7236ca000bca63f1fd716c0021a842b31207cd103d7ba3a6b4790240ea8134d5c5fe7c0187da939d9b95754650
 MISC metadata.xml 407 BLAKE2B 087fc989e2ca985bce7fc668dcca8f7bd5b340d8f52a3f0e318c177378326cbb0069d87fcb20d38f97cb6bbb3fae8fa65f0e5e849ef2797e7d32740cd165a73c SHA512 2314896232d1f86af4b983dd61599091134d05b3461041bbc28d55faf05ce097788f230e2ed441b422dcc1b6ade15048372f8219aac7428483350163f92b997b
diff --git a/dev-python/pypowervm/pypowervm-1.1.20.ebuild b/dev-python/pypowervm/pypowervm-1.1.20.ebuild
deleted file mode 100644
index c903bc72a427..000000000000
--- a/dev-python/pypowervm/pypowervm-1.1.20.ebuild
+++ /dev/null
@@ -1,33 +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} )
-inherit distutils-r1
-
-DESCRIPTION="Python binding for the PowerVM REST API"
-HOMEPAGE="https://pypi.org/project/pypowervm/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="${DEPEND}
-	>=dev-python/lxml-3.4.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/pypowervm/pypowervm-1.1.24.ebuild b/dev-python/pypowervm/pypowervm-1.1.24.ebuild
index f68bb14f0618..703314215670 100644
--- a/dev-python/pypowervm/pypowervm-1.1.24.ebuild
+++ b/dev-python/pypowervm/pypowervm-1.1.24.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
 RDEPEND="
diff --git a/dev-python/pyproject2setuppy/Manifest b/dev-python/pyproject2setuppy/Manifest
index d7b86ac3cf87..967aeea456f4 100644
--- a/dev-python/pyproject2setuppy/Manifest
+++ b/dev-python/pyproject2setuppy/Manifest
@@ -2,4 +2,4 @@ DIST pyproject2setuppy-8.tar.gz 9501 BLAKE2B d0c168efa2742732710a7d967ce0783a942
 DIST pyproject2setuppy-9.tar.gz 9611 BLAKE2B 448e6ca468c2a5c1097e63316bf1a2da41dfc4a8dfa756553b56ebcbb66c43cce7dd57aeacce45491087b956a01b8ff2707fc5f60ada10a4f496c9c8f7c722c4 SHA512 bd337f392e3dfd686039714687bd8a57b7b946b486f5513bf603e322843a4d8f4c2fdca747e61090f00f3ed4a5284a2b182f064412a3c8e70f278a2be7551d93
 EBUILD pyproject2setuppy-8.ebuild 671 BLAKE2B cdf5334ea39ceb5493c7998264cf1eac9f259a78b739347b2727133344ba44c74d27fca18d2ac22f4ac76d3f057a6fae641734db4a034cb03b27dc048ec080a0 SHA512 33af5fa08bb93018d3eca50cb90db9a7ac866615e3435aca892417a0ec6c999914d2a8051dfe0c22ec216a776c162fbb48cbf49f668547afee395814ba63077d
 EBUILD pyproject2setuppy-9.ebuild 690 BLAKE2B 55710916fcf2a51630f8b1efd3e7472c74fb538c68591963416abad65016197859cf7cde9ce909d1ce5c8195c873b1cdee0c1f37434f7a0e678504b863cab85d SHA512 4ab71913a6b556a21ab6d16493cf86e231883fa56f3ee63fa9214abfea0329406a7bfe1725e5a328505d1176fc68d128de44b35f7b1129cf69b0e076704d9508
-MISC metadata.xml 350 BLAKE2B 6308462418044a7972e38f09900037e4557be4e76a371b358a2000784e2f44f2f9ed5ce56be11ffc198003c3acbfb29a268372a33618c3453d3e01b33a83dbe0 SHA512 ca89ff54a01f7de3850201545f1964d19d4b909a9d0867178d9f39b180aa159d4f6aa5cc3483aef9358eff116d577d0c0a1c15f74d51f2253cf96e991d40e43d
+MISC metadata.xml 430 BLAKE2B 934e5a791bb16f3717ace5fa869aab4998938109ee14ca1ae0c9c378d67366060b705ff4430f3d267d33c04cf23ffa0b4c1b2654b2a95d586fc22ab4fb43f8f9 SHA512 f52d07edc973dc7665be77367cfdc37d92f27adc730a327c57374b54b60f77802b79ca5f2ebfce2c687090763224e5939274dcf4fa2555834c580cb06c32419d
diff --git a/dev-python/pyproject2setuppy/metadata.xml b/dev-python/pyproject2setuppy/metadata.xml
index 5eeef57d0718..ea440fb3eaae 100644
--- a/dev-python/pyproject2setuppy/metadata.xml
+++ b/dev-python/pyproject2setuppy/metadata.xml
@@ -9,4 +9,7 @@
 		<email>python@gentoo.org</email>
 	</maintainer>
 	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">pyproject2setuppy</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pyqtgraph/Manifest b/dev-python/pyqtgraph/Manifest
index 8568310b33db..69f071bc09c2 100644
--- a/dev-python/pyqtgraph/Manifest
+++ b/dev-python/pyqtgraph/Manifest
@@ -1,4 +1,4 @@
 AUX pyqtgraph-0.11.0-qt5_only.patch 361 BLAKE2B 5c4f904df6b19bcf29c9e44a623400015b1ebe4cac8b797a50478e75c82ac964cb05ca4c67dfa73332528e4f232f612d2f9a9bf439dbaf63765fb1f6d650bd77 SHA512 34600cdbb1e361288393fecfd8740b147ef16dfcd0719f0eed62a93201eb5fd54b09aebb86201effe6a791a6b5be934ece07a07756284ae0b2bbde4aaee137dd
 DIST pyqtgraph-0.11.0_rc0.tar.gz 755973 BLAKE2B 845c57a16c71d449419cca452ac70468eb21f198b3aebe39204e8ac1408ebd4471a95b24cbd91cd4c745439c17a805738e50a29f8690de5d84f86c2597310aea SHA512 6eb5573b19c7fc0bc263bdc5d75a9a7a5d86d5ce525e406fcbd8f4215a8b2a0a9a7d4839d177fb10ff62a5feacdf088347828900daa9f60ae84e54824b98f470
 EBUILD pyqtgraph-0.11.0_rc0.ebuild 1075 BLAKE2B 03f8186ab7c17281ce435eab83956fa9704cf98463fbf40c8b4fd7ac12b23d9387446b824a869b53b5dc456de53f5c29aaaabaf9259974dd7bfb04b433ee218f SHA512 a8d81391d3237a5e4cf11693e43ff95fc484508253865e3866e14812dffabd682d72e320f68e36203c7e4c849bc7158a2286d6fe780ef32803503639049afbac
-MISC metadata.xml 725 BLAKE2B 0126a36d5645e5fa0ddcbc46924f78284cb03de5632f84a790415278a91ab650b2e3c7994467e106a0bc4e900f98b0f40ca70416ea2d515b15d4f74320600e70 SHA512 51fdf4a875bc629230c1040ae34cc6b37225dcd18c04a23d3bb6b5da30c79dd7d4c10ee46fd671941d86ee15d548e7a0303bcb48e7796b20036ebb928ebd9078
+MISC metadata.xml 750 BLAKE2B 2382ebf2081e2cc83e363f6716a5af4932dc7fc67b19c06af77fc9557e6e4052a882c79f734c4e96a3d1d49e1c9c7c10d3d1d1872cd1b54f86e943c0cbcdbb0c SHA512 1debda41c5945a1b1a55bb93a8220b17c2078216415195d75e5052571c340ac0e1a43d63f77c6818e69b57ca8cbd2d9a753a749c36dd6bcf803418c10e225301
diff --git a/dev-python/pyqtgraph/metadata.xml b/dev-python/pyqtgraph/metadata.xml
index 3f66bf396f36..24bf6bc8bf6d 100644
--- a/dev-python/pyqtgraph/metadata.xml
+++ b/dev-python/pyqtgraph/metadata.xml
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <longdescription>
-    PyQtGraph is a pure-python graphics and GUI library built on PyQt and numpy.
-    It is intended for use in mathematics / scientific / engineering applications.
-    Despite being written entirely in python, the library is very fast
-    due to its heavy leverage of numpy for number crunching
-    and Qt's GraphicsView framework for fast display. 
-  </longdescription>
-  <upstream>
-    <remote-id type="github">pyqtgraph/pyqtgraph</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription>
+		PyQtGraph is a pure-python graphics and GUI library built on PyQt and numpy.
+		It is intended for use in mathematics / scientific / engineering applications.
+		Despite being written entirely in python, the library is very fast
+		due to its heavy leverage of numpy for number crunching
+		and Qt's GraphicsView framework for fast display. 
+	</longdescription>
+	<upstream>
+		<remote-id type="github">pyqtgraph/pyqtgraph</remote-id>
+		<remote-id type="pypi">pyqtgraph</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pyre2/Manifest b/dev-python/pyre2/Manifest
index 5035c01c2b66..49fbeaa46839 100644
--- a/dev-python/pyre2/Manifest
+++ b/dev-python/pyre2/Manifest
@@ -1,3 +1,3 @@
 DIST pyre2-1.0.7.tar.gz 11684 BLAKE2B 748a409aa56dab0e088961bdd0b8659dfe0ed817ed1f6fe1dce15fd03e32b30472776c4e21a4f39e66aa5b3539650a657c36acf8b857332b255a139ef0f890a9 SHA512 c4579bf73af2f0a5ccbb6a28b87ce777ef08199947c1bdf740b426960f41b3530c97a7158fac7768b51c92b8a3797f8e66de61e0c942f239920bd5397d63e2c4
 EBUILD pyre2-1.0.7.ebuild 462 BLAKE2B ca80fbb9a73042cfac03b4c70ec2deba418ef54794a2c9d1654b36a28e25f627176b1e210aa3828881b4232279d479f227bb17e4876cc0604aaa7ebca2145e65 SHA512 fb3fa2a2ebd94237e6f2b84f4c32c4054af9accdc5466270f6acc2f7229006d7b302283994f4f86c68d408bba339fe390d77a26ae1bb58bd05f3ac90328edb1e
-MISC metadata.xml 354 BLAKE2B 02eb3aef38bba7e6decf621a35bf48bd60df852cbbec84441757c218da75cc46866dad50078f2f158966b5b45fafc301739dd7924cd5d96bc2dd9553d83b72eb SHA512 4c6f434e4ec394eb393248a08ba165e29fdcb74b681627d9caa908e376ae08463b673848a3d7497b5b06ac59924c203b9020a43a506f52f23f02660c18dd5b4b
+MISC metadata.xml 422 BLAKE2B 87db29f386752189bd0d496a3f63ebb0edbaa8123d1766b03e25b8c0821603cd32071c7bf6252470090d3ed945c769c9b7eb212dfd556a3e3329ab4cb3a56174 SHA512 de54bd783d91f3bbfb5584d7b0f1df83229c2dbd18eeaa9f481f2d5c047ef8d93db47929645925bcd995387d5696dcb9c3430234a20959884f51f4d883e68650
diff --git a/dev-python/pyre2/metadata.xml b/dev-python/pyre2/metadata.xml
index b218af704866..687c852f406d 100644
--- a/dev-python/pyre2/metadata.xml
+++ b/dev-python/pyre2/metadata.xml
@@ -9,4 +9,7 @@
 		<email>zmedico@gentoo.org</email>
 		<name>Zac Medico</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pyre2</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pyro/Manifest b/dev-python/pyro/Manifest
index a07082d54e4b..1a25545fd6b1 100644
--- a/dev-python/pyro/Manifest
+++ b/dev-python/pyro/Manifest
@@ -1,3 +1,3 @@
 DIST Pyro4-4.80.tar.gz 515103 BLAKE2B 5d2b69ba020117947a36c9c75f884434a3452167fa2e586e3a5b0e6deb1d0c8c54dd06a20b9568b53a0a6c42a847d880636e3abe37090246d5f34ca84e915b36 SHA512 8e41285674edbe5c8d5ac63e33406c5ff7b6366d5dd251a1755eff81611193278a473ed8b15f995bc0ba2775dc5d316eb6a3cafd63626b95820591ea3a0a92e3
 EBUILD pyro-4.80.ebuild 1368 BLAKE2B 6af0ed7ef59d58313089aea896d303c682143739ed787fb102364db389cb1c64e622a4a245d8e12b0d7c4308a48dc9735a9a34b3cbbb5b55fc9d81ec3ae7a8d4 SHA512 3929f706a24e30e5731f83b3070c860e80ebc648676c2050f3833c95f489d593f06e826a666db7be1741d1fefa6c8640cda4ad372ef7b198af6ed026a028f526
-MISC metadata.xml 395 BLAKE2B 00770102b68b0c2d63055d065b43a6f14463717b54aba5de8d89c2f8373c11a161445c9f1247887a466d7549c5760586c1b8882a3547e85ec45eca0cb241891d SHA512 e74a9c8c0cd3b95dac218e093b7bd13ce8052b5f7adad5287bf5f7cb4e159133ae3ee7bd1aae42e46c7391344eaa29be3d411216700659422be30f6615fcf139
+MISC metadata.xml 383 BLAKE2B 8fee38d6339804b0a0e29cf54c4b570d5e2b30fd2a3c271c681bacd70423a76f86e004efc16479b6f27d3a6e10f71491366e592faa76a0575eea89d24c50d52e SHA512 f444523d9fbbf37c2d4bff335c2ac8087582d9c76dfc1a4545141f186257e5a8d82bdc0675143f573375511031df2df3ce29399f0f4fab62efb64bb9c0bf167c
diff --git a/dev-python/pyro/metadata.xml b/dev-python/pyro/metadata.xml
index 56387a3a05c1..39d1bbcdab85 100644
--- a/dev-python/pyro/metadata.xml
+++ b/dev-python/pyro/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="pypi">Pyro</remote-id>
-    <remote-id type="github">irmen/Pyro4</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">irmen/Pyro4</remote-id>
+		<remote-id type="pypi">Pyro4</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pyscard/Manifest b/dev-python/pyscard/Manifest
index 143898449cc7..51d8f6648953 100644
--- a/dev-python/pyscard/Manifest
+++ b/dev-python/pyscard/Manifest
@@ -1,3 +1,3 @@
 DIST pyscard-1.9.9.tar.gz 145428 BLAKE2B c62d9c2f13d9f19df1b7399509efc9df2baf2da00a9dc0bd9a0b440dcef232beeb0f7da88b12e3fb8ecffeb28f268eaaa04c9d45dc3420a1071835afe7a36c95 SHA512 88c7314c10153f509eb9bf6318e62210c7182e51b531af752a402bf8d05cfa2658cc1a4e7b9385a474038ddfa5a1bfbf1f208fcd9abe02a60161ce7c757c67b2
-EBUILD pyscard-1.9.9.ebuild 763 BLAKE2B 002f2302972cb6e5b0b3d12fb23c5e79fc69343899687eab3908d64f7c9253ae32742da3bede1001874a0bacfe9c5634f2625a1cfdfb2bc68883b2020a9e61fb SHA512 37f506186c80b3b580ba50ad5864e842b0bc5ec630b7ccac2edfb5cbf8068e6e4e43c1aaf470dd5df55dd28cb857eb0edd4c6c696c7c919de9b9d760493e2f28
-MISC metadata.xml 317 BLAKE2B f87dee8af30517c70bf141fe7da6a953f61f894e7f97897f3c2a594fae16212a518e80eb2141e2ae18da562a91a85ca74209e0c77f4b9bc54e91fe9bd02f650c SHA512 f0ee67c282ef764df07b1f49ea3fa4714ecc6094046aa6fb986274968e58801eb3f7a32463bf4282dfb607202b2b4e5e1b50a0d54f79e85f64a6abb2d68e309e
+EBUILD pyscard-1.9.9.ebuild 762 BLAKE2B 411f0552544900fa1cb3422555594feb25e64a3d10836693a8a5f813e4b74f4297b090e1bde71a15a969d95426c6c1def54815b0eed598bfe70ea6a34bbaf3bf SHA512 5fc82d785e6a3c5b60fe4a58e91f324355c250dd9279f12aad5bc90d00aa0425ce002f8637f9cfac898f40e1e3ecc1950f3f8e25a6cc8ca53e7f3a6b513717f3
+MISC metadata.xml 425 BLAKE2B d08b4263a97d671761cc9d5ba2084ce7ecef3d10031371ec4bf5deb4d43d840dbc34787d69c353ff0b2acaade7e50c512c15fc41cc7ee6a14d295a7ccc9f3019 SHA512 75d4e0a2023ee036c4b48f3fba331c9b97dafcc53cc9d071196bf08a5bef4e51c254eec6a1d7258b5bf5b14b93860ff5f16262983cef7b7cfbec9e05f6a806dc
diff --git a/dev-python/pyscard/metadata.xml b/dev-python/pyscard/metadata.xml
index b3070c74f3f6..b59c2155dc3e 100644
--- a/dev-python/pyscard/metadata.xml
+++ b/dev-python/pyscard/metadata.xml
@@ -7,5 +7,7 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">pyscard</remote-id>
+		<remote-id type="pypi">pyscard</remote-id>
+		<remote-id type="github">LudovicRousseau/pyscard</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pyscard/pyscard-1.9.9.ebuild b/dev-python/pyscard/pyscard-1.9.9.ebuild
index ae9fc5fb5080..b2941346aa37 100644
--- a/dev-python/pyscard/pyscard-1.9.9.ebuild
+++ b/dev-python/pyscard/pyscard-1.9.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1 optfeature
 
diff --git a/dev-python/pyscreenshot/Manifest b/dev-python/pyscreenshot/Manifest
index fb0308b7e543..d2b4615bd624 100644
--- a/dev-python/pyscreenshot/Manifest
+++ b/dev-python/pyscreenshot/Manifest
@@ -1,3 +1,3 @@
 DIST pyscreenshot-2.2.tar.gz 29726 BLAKE2B d1e314be360d4716b35b4302de82010dfc9a97212b3f4472b42e40f9470fd0575fe8f0ceb976adfe13059c0566413414e03f78189d4afa193d88a0aaf4c5c26e SHA512 6689ccbcd5c6164aeb12d911ee93c8958f6c6b5aaba5ba7d4073ee855e6398180ed27fce6299480b18b3d7ffad12cd17694c3db1f1c7373d4b25be0073d49338
 EBUILD pyscreenshot-2.2.ebuild 1618 BLAKE2B af871f3177aec6da987058dcee2e8cc9447d0d40c881b8035fbafaf210450047240d4e71648a6b83846f7034b8559ec2f2dad939d65c5fdcec771c6b64d07d09 SHA512 d1faac137a5b51b73a79290822900e3d941a362bfc376976aed8239d0c4130e5da53be1421732bdc9f2972053938dae5d239da8598a3889d9d7576cdaa2f4308
-MISC metadata.xml 375 BLAKE2B 393138e315b4eae4dacb9339fbb5766e9dbaa84b7482babaddc08d524fb8b9939f6622ee9c6d09b66c61ac270fcc483fac39996a12ba87ccccf7cafd4c6d36db SHA512 9a44b6b9de4d1a61d6af9256519473541d5513cef349c15178c025dee3aaaa3f6772b1be56576411a985fcd9c70029c00743d8f577be8eaec4c5a44646c9cbf6
+MISC metadata.xml 450 BLAKE2B bd7e7fa6219b153954486f9457cc9ed56a055ee8caa2d04f0f6d587b7df88a8abe4b51165c1220ae1fbb7a3a2314f10851a6bdc35336305829e31a82d7004d4e SHA512 dd24b4495cf676ea8c90ad639d2177b27c725e21bbed0d6a64f0a4ecc5226c4a332c018306d3dd231409063cd179215c1e80c6efca1001ca9a36f58472fa82a3
diff --git a/dev-python/pyscreenshot/metadata.xml b/dev-python/pyscreenshot/metadata.xml
index d22e99d73577..b7811ee04d45 100644
--- a/dev-python/pyscreenshot/metadata.xml
+++ b/dev-python/pyscreenshot/metadata.xml
@@ -9,4 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pyscreenshot</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pyside2/Manifest b/dev-python/pyside2/Manifest
index f72cbdc3696c..8ca646ec5708 100644
--- a/dev-python/pyside2/Manifest
+++ b/dev-python/pyside2/Manifest
@@ -1,3 +1,3 @@
 DIST pyside-setup-opensource-src-5.15.1.tar.xz 3454052 BLAKE2B c7190dff493434064976a4604fb5858d2e20c1b98098ccd6e5c4c69d0b67ae9f4bf970e2ab42b634208ea96aab31b21f3dfb5f18fddd0bdaab655bba729e4449 SHA512 f14c7037367799005fff73d9fc8e7998db1895700911adf34dfabdeb4db486c7b28ba2afb3eaee37c58f4099b00e4a86917b8f7d85f274026bddfc090658b306
 EBUILD pyside2-5.15.1.ebuild 8504 BLAKE2B c9f3a8153238f63ee5dc106f2c43981895f006be0e90f8bd92a3bc83f77ad4e5313a88b2a9d7536f558eafc6f2f73518ba3984973bdee4069eb9f6a2a1712dbe SHA512 07bb75a3beca7b475ab86c1e4264a21d5e55b54eb6b173c8b24c0fe960fa4e63d458999f5b4bb48e549be473ae357a5361575c5abd0e26183507c2d287698f77
-MISC metadata.xml 2030 BLAKE2B 7bfe233c9f4af260b8ea28eb731aaddc9876c490b5044ddf7a1be370c2a672517ea4a8dabac5a2bb23848345fefbcb0c0171bf904bbf5275b6ea5a4a358f6ec1 SHA512 f5a3bab776c9a1ab6547b98926616baa1dd21c1c9b4d24a37f039e5256a95cb57550242ecd9ee520687231da42b530b5385dd8cee4aaef7d6705062c25ff359f
+MISC metadata.xml 2100 BLAKE2B 5edbc13cb5654c4ebe787ab45bb87bccf87eda50d608560cb63e639c2ee997be8320b8c7b0f48403d86508cbf1eeb960c666978de1a6918571d0929bef640b62 SHA512 64da8de5b7b294e877d20927bbf11430b9705c0fcaa2445cfabc3f0a0b1fc4e586299b065868f09c688573c754604373cafdf1d2ba8c3d4c30ba66032b83f9e4
diff --git a/dev-python/pyside2/metadata.xml b/dev-python/pyside2/metadata.xml
index 5d371988e7a7..1af2c2305081 100644
--- a/dev-python/pyside2/metadata.xml
+++ b/dev-python/pyside2/metadata.xml
@@ -37,4 +37,7 @@
 		<flag name="xml">Build QtXml module</flag>
 		<flag name="xmlpatterns">Build QtXmlPatterns module</flag>
 	</use>
+	<upstream>
+		<remote-id type="pypi">PySide2</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pysimdjson/Manifest b/dev-python/pysimdjson/Manifest
new file mode 100644
index 000000000000..d2fee3a1ba9b
--- /dev/null
+++ b/dev-python/pysimdjson/Manifest
@@ -0,0 +1,3 @@
+DIST pysimdjson-3.1.1.tar.gz 3286141 BLAKE2B f1fc63ffcaf524f23112438a8669caf4b4ffa0190bb20e2b851f61dfae386fe02bff1746dd4e68499bdaff3420d41401424fde1332222fe49211d32e09fdcab8 SHA512 9b1080d70f06e5a6d6467769a8146f642adee2c08391a87dd86eca9b0eb7666d9fed47a83d991843b07c2b96906dbf0ccacf2425bfc3ce4cb22731e03b12122e
+EBUILD pysimdjson-3.1.1.ebuild 504 BLAKE2B 9b4a0bfd2f3f21626bb9ecf0700a50fed30cb21bb29f5f90aa80828030866652e677cdf43c74c7c156c7ef0fd4d8077f04e6ebe10eb487d6b6a0e501eb78dbb3 SHA512 f3044ca6c1027be04a77cfcfaa21771a13bc2a51689eecda526bbe8e7b487a505ff1aaf611ca6e68fc7e5b0ecfb8d5c157660bc430918681809c557c14017066
+MISC metadata.xml 322 BLAKE2B 94765d38596d2ebe4a27143373174f461b1af57ab29af679c35dbf69f45be48034ffeb424eef6ebc27e4be9e02090b587e216e7bb7f4eb6404523bd9a500435a SHA512 c88bdc79d128f98678accce553f367a1b83f7888e698a05b537387576808d9c547f52b7f963990311082ad06714e883a3da26e6f5cb93ef2b229c56a859d2fef
diff --git a/dev-python/pysimdjson/metadata.xml b/dev-python/pysimdjson/metadata.xml
new file mode 100644
index 000000000000..bbbada85c7ef
--- /dev/null
+++ b/dev-python/pysimdjson/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pysimdjson</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pysimdjson/pysimdjson-3.1.1.ebuild b/dev-python/pysimdjson/pysimdjson-3.1.1.ebuild
new file mode 100644
index 000000000000..276dfb899f43
--- /dev/null
+++ b/dev-python/pysimdjson/pysimdjson-3.1.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 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="Python bindings for simdjson"
+HOMEPAGE="https://github.com/TkTech/pysimdjson"
+SRC_URI="https://github.com/TkTech/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/simdjson
+"
+BDEPEND="
+	dev-python/pybind11[${PYTHON_USEDEP}]
+"
+distutils_enable_tests pytest
diff --git a/dev-python/pysmi/Manifest b/dev-python/pysmi/Manifest
index a2cf6b5558bf..453699ad27e2 100644
--- a/dev-python/pysmi/Manifest
+++ b/dev-python/pysmi/Manifest
@@ -1,3 +1,3 @@
 DIST pysmi-0.3.4.tar.gz 93985 BLAKE2B 71b0ed936c196381f895b4f56e8e2e328ac274b08801a77b404b964201e00f8da2cbce2719414da358a4feb7992a3d04e732942f6e7006a0cceea4496f96b758 SHA512 720c8948a590130583d6ea388f0ade5d3bfe9e845821add7ffbf1b5495b5fe00b768ffb94f67b82465c6d86234f5306c6e1a5c2e49f4825bb9c31a0df629f7bd
 EBUILD pysmi-0.3.4.ebuild 427 BLAKE2B a2b5cfb10c3dbc3c081dc9ee62f066c5e409a4aa89d628a9715f8b2174b38ee6686b8a21b4d538539bc8bbd5989e2b25883e4aea33d193437e169186906a5a3d SHA512 9ee796a84f8f95d1eea9bcfc0b0d83ea54513bfae20d42aa79ebe5d0f09afdf249e9941a2a7a5da2010e23f7ca2b761f37b965689400247789c18f7bbca0d9f8
-MISC metadata.xml 358 BLAKE2B c89fc0ed9212d67a3ac2992ec231ee3a26c473e19e317ab3c0bb1002212838299a55ec6db99950d852c6760941e5c698f04db2213544ce9089303519a38e8c79 SHA512 f7a17e837c410ac604a0e1b4493c7219846a8c8cbcd5b4fb84ffc401b98c8eeacba4731dabad6f61bf1e4f172157c174d6a039725174e2f58b9dfbb89998635d
+MISC metadata.xml 414 BLAKE2B 6b43ab72d3bbd00cba2f58ee65d9f567f4a1012e2d691074f5b4fc436ca2a51e24bf4088027fe0b439a6e0391b0e05f3fc20902634b86d1b72a682fca7b7461f SHA512 6fbc62e3f60b75e2bd6ad20e5c66d790d03764154bcface954d9a38486e0914ccf19922c0f7bc75c37cbebc48480750e6024f15062f23fc2b253e287475befaa
diff --git a/dev-python/pysmi/metadata.xml b/dev-python/pysmi/metadata.xml
index 36420f308fae..6a5f21bdfe8d 100644
--- a/dev-python/pysmi/metadata.xml
+++ b/dev-python/pysmi/metadata.xml
@@ -1,12 +1,15 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>chainsaw@gentoo.org</email>
-    <name>Tony Vroon</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>chainsaw@gentoo.org</email>
+		<name>Tony Vroon</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pysmi</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pysnmp-mibs/Manifest b/dev-python/pysnmp-mibs/Manifest
index c5fac08f3ca2..0a303ccc73e7 100644
--- a/dev-python/pysnmp-mibs/Manifest
+++ b/dev-python/pysnmp-mibs/Manifest
@@ -1,3 +1,3 @@
 DIST pysnmp-mibs-0.1.6.tar.gz 2113334 BLAKE2B a685dac05f11284c28c6ec9ebfdb4e99145d4cb48b982cda771694ee3ecf522af07d174a8b97430728dffa243de7889f8a831575113d8a9b35a494d1d9277b2c SHA512 6956d437f7815e31af13ac54ade7526e07fefb63a4c4bec95fb5d5c8f198f0d7bc8bee2cd9d0072c46d089f579d6cd6227152646a763e3342c626cce367e89b2
-EBUILD pysnmp-mibs-0.1.6.ebuild 505 BLAKE2B f9234f1fc480fa95d62bf50fdc73ee6652c9df3c331b98b2c021fa9683164872cdb6bbaac53bb49f94e6ae4d252b8f454cc1f90fea73ef37845a8913c8e0893e SHA512 67fbe2d4bb59d2c433f7516d87ed68f020ccc85996967e7aa9bc6b0297eb11bb9507e67ebff1acaccadc0bc2326192e08f2bcdf0b83d5e848ff1239ebbc29280
-MISC metadata.xml 1515 BLAKE2B 58cb9f0f443bd9923b3ec824cb54d0e5635ad5ffb9da178d98a9b920f14cf75640295106a8fa9928447d4410708ed15fc0850b3a2986a2228d92e7cddd431739 SHA512 99adddec026ae863568b6239dba0aaafbdcbc5b020c0c337c1466900a134de902cea3a304c8d2c8aad12ade54750379a1fde88120e13f879e7f75ced2bfd1be4
+EBUILD pysnmp-mibs-0.1.6.ebuild 477 BLAKE2B 43f1bf0081361e3db46ce6bd859ae31a9dad0918480f16db56a9e70549ad8f2fe5437742f9f46896628905d5856f115dd0bb7e6d4d1978aa4c0008ac508cf972 SHA512 167c88470e84269727cbae9bcf407b67aa9e1457580601b6a67c757d030c90134f70a3b2fd4de7dfadcfd8d756f94673136f9739a5ba6cc2d2e26f7a2e368f1c
+MISC metadata.xml 1582 BLAKE2B 9e7ce993fdcf3a7debc835255d92d0ee1b2bf8397612c95b3855b1c4b58888832af8df81abf01aea2169fe60216bc64747cf093fe66708ff6660274488b69cb1 SHA512 a0225700601accc978584b302d42b9456af8c96fa4ee4f07b4e7b820dea3afab500cc48130315a390a6a3411f0b30e97dce0f23757c0c3806e014ec22f9cb44f
diff --git a/dev-python/pysnmp-mibs/metadata.xml b/dev-python/pysnmp-mibs/metadata.xml
index 37a31ce229ad..11950035509e 100644
--- a/dev-python/pysnmp-mibs/metadata.xml
+++ b/dev-python/pysnmp-mibs/metadata.xml
@@ -1,33 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>netmon@gentoo.org</email>
-    <name>Gentoo network monitoring and analysis project</name>
-  </maintainer>
-  <longdescription>
-This is a Python implementation of SNMP v.1/v.2c engine. Its general
-functionality is to assemble/disassemble SNMP messages from/into
-given SNMP Object IDs along with associated values. PySNMP also provides
-a few transport methods specific to TCP/IP networking.
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<longdescription>
+		This is a Python implementation of SNMP v.1/v.2c engine. Its general
+		functionality is to assemble/disassemble SNMP messages from/into
+		given SNMP Object IDs along with associated values. PySNMP also provides
+		a few transport methods specific to TCP/IP networking.
 
-PySNMP is written entirely in Python and is self-sufficient in terms
-that it does not rely on any third party tool (it is not a wrapper!).
-</longdescription>
-  <longdescription lang="ja">
-これは SNMP v.1/v.2 エンジンのPython言語での実装です。関連値に沿ったSNMPオブジェ
-クトIDから/へSNMPメッセージをアセンブル/ディスアセンブルするのが一般的な機能です
-。PySNMPは幾つかのTCP/IPネットワーキングを特定するトランスポート・メソッドも提供
-します。
+		PySNMP is written entirely in Python and is self-sufficient in terms
+		that it does not rely on any third party tool (it is not a wrapper!).
+	</longdescription>
+	<longdescription lang="ja">
+		これは SNMP v.1/v.2 エンジンのPython言語での実装です。関連値に沿ったSNMPオブジェ
+		クトIDから/へSNMPメッセージをアセンブル/ディスアセンブルするのが一般的な機能です
+		。PySNMPは幾つかのTCP/IPネットワーキングを特定するトランスポート・メソッドも提供
+		します。
 
-PySNMPは全体をPython言語で記述され、どのサードパーティ製ツールも信用しない立場で
-自給自足します。(これはラッパー・ツールではありません。)
-</longdescription>
-  <upstream>
-    <remote-id type="pypi">pysnmp-mibs</remote-id>
-  </upstream>
+		PySNMPは全体をPython言語で記述され、どのサードパーティ製ツールも信用しない立場で
+		自給自足します。(これはラッパー・ツールではありません。)
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">pysnmp-mibs</remote-id>
+		<remote-id type="github">etingof/pysnmp-mibs</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pysnmp-mibs/pysnmp-mibs-0.1.6.ebuild b/dev-python/pysnmp-mibs/pysnmp-mibs-0.1.6.ebuild
index 3628f8f012ec..e0649cd103ad 100644
--- a/dev-python/pysnmp-mibs/pysnmp-mibs-0.1.6.ebuild
+++ b/dev-python/pysnmp-mibs/pysnmp-mibs-0.1.6.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="SNMP framework in Python - MIBs"
-HOMEPAGE="http://snmplabs.com/pysnmp/ https://github.com/etingof/pysnmp-mibs"
+HOMEPAGE="https://github.com/etingof/pysnmp-mibs"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/pysnmp/Manifest b/dev-python/pysnmp/Manifest
index dc33f3636a48..858bf4f52a78 100644
--- a/dev-python/pysnmp/Manifest
+++ b/dev-python/pysnmp/Manifest
@@ -1,4 +1,4 @@
 DIST pysnmp-4.4.12.tar.gz 442270 BLAKE2B 0e4e1c44d7fe1def24d8bd12bf88012eb54d432888745becacdc9c072ab5a653eb947ee418f6b7b3f84bed39d6656dac25ea00a2accfa546d7310be17b04c8ee SHA512 f22a346443cb07beea594b67b09ce587f5602a439c68148b8a655a0d2c769893848bfcfdd47b5f0002f48c650bf3a39186edddf977fb3ad2cc0d124e66f2ce94
-EBUILD pysnmp-4.4.12-r1.ebuild 1155 BLAKE2B 54888f3b915bd55dcecde45652ad723e209e95c707aa25c8e7e951ce2f9c85ff3b71ce04500a8fa0327a4cb8532605e2a63497cd9a81acc9ed270436e9d69c6d SHA512 f319562478c7eadda5ae153121efbfb96a8561ac83c0aa6c5c084478c719d8084ba087337754d461a8b7b80c1d95ae9f69343241c5173b1deeb750b838752c32
-EBUILD pysnmp-999999.ebuild 1117 BLAKE2B 042a57daa3c4d781fc18e9a8249e589570f5358aea30f3964cf3c0ae2d301f018ad1f256b251e710c8146a7a3ae44ef25e8d6cc5c71d818119a878298dd4c584 SHA512 ef40f0f43e3519b033c22678bd87b0c3442648f4bf4ed96267a5f11d2180f2ac0dc2f9d9c5159319179bdd86bec83c071d8fb0a254bb7d58f1fb6f375af741d1
-MISC metadata.xml 1567 BLAKE2B bb80fc30033d338354e1b5539aa5afbb23df2ef574a55709f62ef399a67fa7d659fbbad4d3a10120d0a7cf2247e6637127c115deb3741421a73f3222b769d632 SHA512 3ec28aa833cf162493be384e095a4aa440dc9fb19941b5c503d81d1bff83428d5aa8af80dfa24c88055c573c09529c12e3fd4962dba3d171ea8d2e87a7bb7822
+EBUILD pysnmp-4.4.12-r1.ebuild 1127 BLAKE2B 7ff78e975c2b9db97c94de6875c161808b6713f2aba067ba68bfb3514bebcc4f7552828b13ef23d777d5c28c6d74faa06911ad502b288e05fe3ca107d8eca34e SHA512 dec21ba02231d889fa609e9334969808352fdab4bb1120a2f6ed43c5ecb4e94a336915fd95402ee60e41b8fc698828fd73e3d61fba36a7aa155c617e85fc2e6b
+EBUILD pysnmp-999999.ebuild 1089 BLAKE2B 25b925f119eb7eb685d6891c37a30bae1a273ee4ae5ae3b9c518d6d72b76656519f07d55c64164c4a289a4b91ff2634492bff46d928c2c0b05ab2a7173794a27 SHA512 f481875ff76163c4111f849b765c4b8a5b4dc991884867f5c0db45a2b6e34270ef7d0425d7945bfe078ef0798b6bfc18d45f5205e048e2b2fad1a20be98a51cf
+MISC metadata.xml 1623 BLAKE2B 60158881e97c5b16db0beb92ea3708fce622925f19f3cf55366c0cd33a7c1d307e78b610c8282ee5d7e761ad2da36574eb48d71b7ddc036fb61a7e81999632e5 SHA512 9767b366ec9dc7f7fba97b37017d98bf5cd34a4d300ca1c3b94804b1ffb625059de8488723e5747984a38cc10eb6146e0d395573a27c6ee870bdbfe4f3737871
diff --git a/dev-python/pysnmp/metadata.xml b/dev-python/pysnmp/metadata.xml
index ccc20b0ed3b5..4a0c1e1eca9c 100644
--- a/dev-python/pysnmp/metadata.xml
+++ b/dev-python/pysnmp/metadata.xml
@@ -1,34 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>netmon@gentoo.org</email>
-    <name>Gentoo network monitoring and analysis project</name>
-  </maintainer>
-  <longdescription>
-This is a Python implementation of SNMP v.1/v.2c engine. Its general
-functionality is to assemble/disassemble SNMP messages from/into
-given SNMP Object IDs along with associated values. PySNMP also provides
-a few transport methods specific to TCP/IP networking.
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<longdescription>
+		This is a Python implementation of SNMP v.1/v.2c engine. Its general
+		functionality is to assemble/disassemble SNMP messages from/into
+		given SNMP Object IDs along with associated values. PySNMP also provides
+		a few transport methods specific to TCP/IP networking.
 
-PySNMP is written entirely in Python and is self-sufficient in terms
-that it does not rely on any third party tool (it is not a wrapper!).
-  </longdescription>
-  <longdescription lang="ja">
-これは SNMP v.1/v.2 エンジンのPython言語での実装です。関連値に沿ったSNMPオブジェ
-クトIDから/へSNMPメッセージをアセンブル/ディスアセンブルするのが一般的な機能です
-。PySNMPは幾つかのTCP/IPネットワーキングを特定するトランスポート・メソッドも提供
-します。
+		PySNMP is written entirely in Python and is self-sufficient in terms
+		that it does not rely on any third party tool (it is not a wrapper!).
+	</longdescription>
+	<longdescription lang="ja">
+		これは SNMP v.1/v.2 エンジンのPython言語での実装です。関連値に沿ったSNMPオブジェ
+		クトIDから/へSNMPメッセージをアセンブル/ディスアセンブルするのが一般的な機能です
+		。PySNMPは幾つかのTCP/IPネットワーキングを特定するトランスポート・メソッドも提供
+		します。
 
-PySNMPは全体をPython言語で記述され、どのサードパーティ製ツールも信用しない立場で
-自給自足します。(これはラッパー・ツールではありません。)
-  </longdescription>
-  <upstream>
-    <remote-id type="pypi">pysnmp</remote-id>
-    <remote-id type="sourceforge">pysnmp</remote-id>
-  </upstream>
+		PySNMPは全体をPython言語で記述され、どのサードパーティ製ツールも信用しない立場で
+		自給自足します。(これはラッパー・ツールではありません。)
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">pysnmp</remote-id>
+		<remote-id type="sourceforge">pysnmp</remote-id>
+		<remote-id type="github">etingof/pysnmp</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pysnmp/pysnmp-4.4.12-r1.ebuild b/dev-python/pysnmp/pysnmp-4.4.12-r1.ebuild
index 4464b7b64c02..dc7bea073a0e 100644
--- a/dev-python/pysnmp/pysnmp-4.4.12-r1.ebuild
+++ b/dev-python/pysnmp/pysnmp-4.4.12-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="Python SNMP library"
-HOMEPAGE="http://snmplabs.com/pysnmp/ https://pypi.org/project/pysnmp/ https://github.com/etingof/pysnmp"
+HOMEPAGE="https://pypi.org/project/pysnmp/ https://github.com/etingof/pysnmp"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/pysnmp/pysnmp-999999.ebuild b/dev-python/pysnmp/pysnmp-999999.ebuild
index 0141700d6046..06732062fcd4 100644
--- a/dev-python/pysnmp/pysnmp-999999.ebuild
+++ b/dev-python/pysnmp/pysnmp-999999.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1 git-r3
 
 DESCRIPTION="Python SNMP library"
-HOMEPAGE="http://snmplabs.com/pysnmp/ https://pypi.org/project/pysnmp/	https://github.com/etingof/pysnmp"
+HOMEPAGE="https://pypi.org/project/pysnmp/	https://github.com/etingof/pysnmp"
 EGIT_REPO_URI="https://github.com/etingof/pysnmp"
 
 LICENSE="BSD"
diff --git a/dev-python/pyspectrum2/Manifest b/dev-python/pyspectrum2/Manifest
index 164448bba2e6..feabd4d95628 100644
--- a/dev-python/pyspectrum2/Manifest
+++ b/dev-python/pyspectrum2/Manifest
@@ -1,3 +1,3 @@
 DIST pyspectrum2-0.2.0.tar.gz 31500 BLAKE2B 230329f9b1f12c7f7cff234b95d9715609cd0922c6c833726dfe72e7da0ba646e8d059d2f42d70fb97c8cb755436307369336551d44bf7954f2281f49d03ea6f SHA512 40c9f7dda808fd5bca05026b7418022b660d53b6ef52d684885ed04a47185ce2d1e2988bff5b874977c736bf5cf75f10f9daf752475504327844d4f1948f2286
 EBUILD pyspectrum2-0.2.0.ebuild 619 BLAKE2B 6ee7fc16f15482973eae18b442613457abb59c0b2311b6df82e0adddfa334dd066620ac755ddb3e17e409247df287127aaf34d03d9bfaf93c451a6b7f1076e3d SHA512 eea6a0418699b3e6361065699c5ac8bba7547189ecdadcf834627d5689e23c19b860d72fa0196ccfa68c4edfec885707b3955f69e662bc12444eb0d3249df037
-MISC metadata.xml 560 BLAKE2B fb53cfbb2cf5cf7fcbaeb4c94ac495f838c948c5154c7a22d8e613dc99188ce2a6b4559d9569a5639572cf66ba9df7694112da5d7806dcf656cd5bc8647656c3 SHA512 c3b4e7856ca8d1a178eaff246e75915ca6b73eba78373d91f8c2a1adfe35230a74e0e999a9db723f63cee336b9698b6cd7253db7f63bda72e2ee440e96b74136
+MISC metadata.xml 609 BLAKE2B 609cfa772b81ac1c1714018286226855aedbb3c4cec8ac899aa9061123ce42591a8584b79876c9f09ae0a02f08a3003f14986133712e801591c6ef712874e772 SHA512 5df36f1bbc0362891209ece8109d6c8857b19b723528a5d10c15ba255d54df2e9161ab94e9231b55c1dca2d5e55e138bb2cfaa889fba47a257d435f7cf05be14
diff --git a/dev-python/pyspectrum2/metadata.xml b/dev-python/pyspectrum2/metadata.xml
index a7931bdfa4ff..76ee416dd5b0 100644
--- a/dev-python/pyspectrum2/metadata.xml
+++ b/dev-python/pyspectrum2/metadata.xml
@@ -12,5 +12,6 @@
 	<upstream>
 		<bugs-to>https://github.com/stv0g/pyspectrum2/issues</bugs-to>
 		<remote-id type="github">stv0g/pyspectrum2</remote-id>
+		<remote-id type="pypi">pyspectrum2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pyspelling/Manifest b/dev-python/pyspelling/Manifest
new file mode 100644
index 000000000000..9cea24378912
--- /dev/null
+++ b/dev-python/pyspelling/Manifest
@@ -0,0 +1,3 @@
+DIST pyspelling-2.7.0.tar.gz 149425 BLAKE2B f8e600a41ebd4ec290562307306e7fd5c67d384b9186de037b98d50d58016ded19c426caa892497ca44e309fb3db04292b890612afbe25a34f9f6b06985d3740 SHA512 2fcd225a66cb02fff10d5ca652e523a01bd0488a005dafa32ba1151fba9afe73809781501c957d6df00927baa9fb6779872973b32e2d3fe8a09306fdc4191995
+EBUILD pyspelling-2.7.0.ebuild 1339 BLAKE2B 02605cc438f1292b803cf477d9ece6ee8ac5acf66c3fa51b813f3edae8faf57033e13547a08704a9f8a1ecdffced770d40c180770031c1ed16396357ad2f4e07 SHA512 2bfc52570bac76a50854f4ff3a6aafbc9f82894a16c7a1096d8b3e25d07f6dc33806068f815b2c8d982f62b14a62762b56f781f56625dd4aa84401347b8f9325
+MISC metadata.xml 1868 BLAKE2B 06a6aada2ff7c6634c7baff2eb5ebbe5e6f884a44cd9828b6aac350bcdae480b6ff3fae5a3060721db386e80558167ebb50937afe209ff2cf2cb5296cdadf4f8 SHA512 89c47e531f6aa5a2e7525732a30d3b9e62be48598a6ea61ccd3588223e01ca4f54fd6cd9359ccc6d1fe9a269cd865fabf960d18cf084feb0c7368f5beb0fc446
diff --git a/dev-python/pyspelling/metadata.xml b/dev-python/pyspelling/metadata.xml
new file mode 100644
index 000000000000..6299093ac738
--- /dev/null
+++ b/dev-python/pyspelling/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>lssndrbarbieri@gmail.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">facelessuser/pyspelling</remote-id>
+		<remote-id type="pypi">pyspelling</remote-id>
+	</upstream>
+	<longdescription lang="en">
+PySpelling is a module to help with automating spell checking in a project with Aspell or 
+Hunspell. It is essentially a wrapper around the command line utility of these two spell 
+checking tools, and allows you to setup different spelling tasks for different file types. 
+You can apply specific and different filters and options to each task. PySpelling can also 
+be used in CI environments to fail the build if there are misspelled words.
+Aspell and Hunspell are very good spell checking tools. Aspell particularly comes with a couple of filters, but the filters are limited in types and aren't extremely flexible. PySpelling was created to work around Aspell's and Hunspell's filtering shortcomings by creating a wrapper around them that could be extended to handle more kinds of file formats and provide more advanced filtering. If you need to filter out specific HTML tags with specific IDs or class names, PySpelling can do it. If you want to scan Python files for docstrings, but also avoid specific content within the docstring, you can do that as well. If PySpelling doesn't have a filter you need, with access to so many available Python modules, you can easily write your own.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/pyspelling/pyspelling-2.7.0.ebuild b/dev-python/pyspelling/pyspelling-2.7.0.ebuild
new file mode 100644
index 000000000000..8aea32458614
--- /dev/null
+++ b/dev-python/pyspelling/pyspelling-2.7.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	~dev-python/mkdocs_pymdownx_material_extras-1.1.3
+	dev-python/mkdocs-git-revision-date-localized-plugin
+	dev-python/mkdocs-minify-plugin
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="Spell checker automation tool"
+HOMEPAGE="https://github.com/facelessuser/pyspelling"
+SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	|| ( app-text/aspell app-text/hunspell )
+
+	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/html5lib[${PYTHON_USEDEP}]
+	dev-python/markdown[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/soupsieve-1.8[${PYTHON_USEDEP}]
+	>=dev-python/wcmatch-6.0.3[${PYTHON_USEDEP}]
+"
+
+BDEPEND="test? ( dev-vcs/git )"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# mkdocs-git-revision-date-localized-plugin needs git repo
+	if use doc; then
+		git init || die
+		git config --global user.email "you@example.com" || die
+		git config --global user.name "Your Name" || die
+		git add . || die
+		git commit -m 'init' || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pysvg/Manifest b/dev-python/pysvg/Manifest
index 9b621e88a9f2..00f0d3d242dd 100644
--- a/dev-python/pysvg/Manifest
+++ b/dev-python/pysvg/Manifest
@@ -1,3 +1,3 @@
 DIST pysvg-py3-0.2.2.post3.tar.gz 23436 BLAKE2B a1f0ff710b73dd2e82811d322aa6365583febe8c9e7d690221690d285f94b3d0ae3f74e47b0e0ef236e389f0621ce5ad61ba00329a306c30a81cab0e77ee29db SHA512 3b0e30401ff9481df3fa5fde5b1e338bbabb86cdb846a11c08e8138563268311e20a4ce5317e5a31c337f2b8c5a3debb7abf8e0188e798e455378a363b31c95d
 EBUILD pysvg-0.2.2_p3.ebuild 459 BLAKE2B a36341c96433e175794794ec8d918a6c649e7d12fa750a3fbea4d9ba724bbe6aec8d819560d7e42c696870defc918d985f11c022b02aa863117d581a6302a0ac SHA512 907e90188cb70b4559834ff7f4b0e4fbfc62498fde817fb37ca9f6df959da9dce9871cf3674caba43782929ac9bb0376ee877e0687a634e16b0574f03a4cfe1a
-MISC metadata.xml 312 BLAKE2B 87228a915ae1a5d79c1f00625377b6f165b2cdfa0fbce37f4e9135a18b364946f004858d43c312b21d47f923ed73e531e42dc7e4a644abcd6ed6e98065819614 SHA512 2f03e25c857ae724d66582cd84fa4e293c787d3498374dff7d5ce1c23d6ecd475475a457ea638238be52769dff23d89e519108649d868b5ee28d14ed287378cf
+MISC metadata.xml 370 BLAKE2B 385352206d620ca5bdcdf6c2e4346ba1a4303178db44954c948e4d972511a60352553aef740457e1de6224a671d373176f3ed4964ba9e1d0e152b26a4a13788e SHA512 b43c80036aa918bf157288ea0bf6477a69196b3536780097a7eeae3503103c53940213d93d19f818bf98258e87cea9bba09988824cf18e2737f1b077278d0cf1
diff --git a/dev-python/pysvg/metadata.xml b/dev-python/pysvg/metadata.xml
index 82592044ff10..96ceec4afef8 100644
--- a/dev-python/pysvg/metadata.xml
+++ b/dev-python/pysvg/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pysvg-py3</remote-id>
+		<remote-id type="github">alorence/pysvg-py3</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pytest-aiohttp/Manifest b/dev-python/pytest-aiohttp/Manifest
index c57c3c6557e4..7685986d0324 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 549 BLAKE2B 2a3bf4a3a42a81dad29109ca2b866b557757d817edf64cfad137f0082424be89249a6fec8dda4392baf4c4387a8c4b943334020a2c760eb463eba8c23598a957 SHA512 7f15ed999311a849a0ad2eb4267e50b818366b6a9d1496eb1e7d96184ee4ce3d5e640f35c2e759b03bd6bf9a9b4ca69d65a919c94638c1cc4594da69d8a17c1d
+EBUILD pytest-aiohttp-0.3.0-r1.ebuild 548 BLAKE2B d5d2a2edf500ab7df8f6c08c597386b826b65f48006b147a8a7c084745a3e4e40112182df53a0bb637cba91f0fac18cbfa19c6943395ba90a3faf7a125a3ba70 SHA512 28b21c0e2fd7fb6b4252490c8c0b1c5e97d7ffad3dba03fee989af207ec45c67d67fa4e2f3b3811a3e57371616e42a1b039577ab372689ed001ec7b1b927940e
 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 62822f9e1891..6ae2db4d13cd 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 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/pytest-asyncio/Manifest b/dev-python/pytest-asyncio/Manifest
index 85de0e057c1d..550a6a6ebef2 100644
--- a/dev-python/pytest-asyncio/Manifest
+++ b/dev-python/pytest-asyncio/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-asyncio-0.14.0.tar.gz 14796 BLAKE2B 0a110dabde491293dc10452239971809ec6a4006a2036e848aac067df1af328d0d1d5c7afae8cfc1ecf5c919c0922050e2db182065500ec614a8094d3799c0cd SHA512 d1fadff152a0c94f80a8272a0dd293bd9d9300ad9e79c69556b5901c1a8ce00545f7715e503a383e3f4f35c8090d8f9ec33d16739b85378b59b1786a50441fca
-EBUILD pytest-asyncio-0.14.0.ebuild 815 BLAKE2B de2902e52da4046074ebb2fa6edad56f98bf4f0ebe2b90c3c3f76523046e4739937d77d20f9a20fd8b28455bb2804651157b592bade00f7ffcf0b7c21ff09168 SHA512 3a4dd4ec877af315e478229e065b423e8878aa8bcc5967d905f016fd444e520230051d8327bbc01a054e26aa04c766a76e8e3a234fd7faf41433a057b8fe6caa
-MISC metadata.xml 242 BLAKE2B 17fd7db1343fb7dba1842d5b62d83e56e2816962b0122ec6eee7f9e163f333d69ede2cbdf2a2ba8c77613367fca3d2cee779697fb25b5d8cf0439e1e845dbf1f SHA512 2ce768d5aae91f32da90c62900f556c647eb9806c810a817b6c45c5356e71f504b5a646bf75f553c3a9bfd3f94c4317df4948bae863ef7525b4a013b63618cd8
+EBUILD pytest-asyncio-0.14.0.ebuild 822 BLAKE2B 4f121100f7a9c06bc9c12a70d34f6d0cbbff41b699e420b7d0a4d718037a20e47842478d4ee0e12d1a9e674ef513603f193ec7420a232e8451ebbfb85640b3d0 SHA512 b9f0365b879cd5d2b78ffbdb1372fb19e99819debae1e2e1b8332323a5603124d6e729a870cdf020b15d3522abc15aaa775b7b6dffb8c8ad286a1455049cd3e5
+MISC metadata.xml 384 BLAKE2B 72efae7dd0c314cd8f6e9e5b53fe94abab14fd591954474562ad4d6f5d485eaef9f324900cf79f3b857fb58e0b033ac496661e020ca9c88d2db0f1f8242d25af SHA512 ba2890b3bfba36b90098a578018c2fff627dd2537ac1c5dd90632c93df5a24a295050ef142caa5217d9a51da802aff686d9ea0318a1af7fcbc01e83b456848da
diff --git a/dev-python/pytest-asyncio/metadata.xml b/dev-python/pytest-asyncio/metadata.xml
index e59516686a44..5e0db6fdb595 100644
--- a/dev-python/pytest-asyncio/metadata.xml
+++ b/dev-python/pytest-asyncio/metadata.xml
@@ -5,4 +5,8 @@
 		<email>python@gentoo.org</email>
 	</maintainer>
 	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">pytest-asyncio</remote-id>
+		<remote-id type="github">pytest-dev/pytest-asyncio</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pytest-asyncio/pytest-asyncio-0.14.0.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.14.0.ebuild
index edcb0634fbaa..3e38abcb5a60 100644
--- a/dev-python/pytest-asyncio/pytest-asyncio-0.14.0.ebuild
+++ b/dev-python/pytest-asyncio/pytest-asyncio-0.14.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pytest-dev/pytest-asyncio/archive/v${PV}.tar.gz -> $
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/pytest-5.4.0"
diff --git a/dev-python/pytest-cov/Manifest b/dev-python/pytest-cov/Manifest
index 5868ddfc668f..b8a8c32faa26 100644
--- a/dev-python/pytest-cov/Manifest
+++ b/dev-python/pytest-cov/Manifest
@@ -1,6 +1,8 @@
 AUX pytest-cov-2.8.1-disable-broken-tests.patch 763 BLAKE2B d36ec8acb8329cff8619f22cf485d2161d3ddda7740eea7f1516b5fee6e70bc597b1ca5ac79514be06eeccbd22a458381282622404152e7a41def6af3c3b15a4 SHA512 fc301e116072b7d77864f51a973b20274034569015c198fa8c05efa09d5863bbe9534d1ee1d2170a41485f914f4006cc6818332df76292aecb7e229cd61c7a63
 AUX pytest-cov-2.8.1-latest-setuptools.patch 1247 BLAKE2B 24ac573f41ea6beff690330b26900e99f7454bbc74bb868246055bbd5ed9385f7fff9e72c4222c855dcfcd06e1cab6ac322ec9c085c3b3fdbb12137f8f64455b SHA512 699c4e0e5e3f0b8b145946fa319d19be4ddd42ab7f565af875ca37df0aac222d2b0af50f13ee52f19cf01c9e799a8b7e60ccf114b59530731f820c91311b1b5a
 AUX pytest-cov-2.8.1-python38.patch 2522 BLAKE2B c09196ac945cd4b00acd75e45987be12ad1c8c251b679135fce1c2356d58396bc11b986f6d65ba0b946f5008eae70dcf18ceed68ba1ea50cb39bce303e710912 SHA512 3bd1fc80cfc76bdf643ed00bb59ecee1ceaf3c838f851cd65f844a5297ea33ab514ed441a5807ce6424ac461b10b629a8b6885851cb80336c5836c5f72ca6271
+DIST pytest-cov-2.10.1.tar.gz 56822 BLAKE2B 45eba205a2c6687882445d3554cedc04ad556854f5eac8eb0fab7fda84cdf2736b034dfdceb664293d1add153a5271403eb94585a863676ccfef9ab09727d165 SHA512 2dd575141754a417f34b414ba7e07291c273abdc63a6b7dc72d317c6ec10076b83c2ad78eeefdda7cee1fd6f56932d838602da4dd760a1c0d12095be94c22568
 DIST pytest-cov-2.8.1.tar.gz 47661 BLAKE2B 590fd50b69d01a71b20982d8cdbed0698ebe24c290d791bb44c96aa1aaaf77cf1f379d565eb775864c6945facf6d271115236cb44b95e4a4c9bb7cc6fd591acf SHA512 769a17c2095dbe990df148a0105c9e3dc88ac2265ac77ac31448dab6abf6d8cc0d54f5c6ff01fd708bd38700bfea93f57d3bb702bd9bb0a708257d094b2376ec
+EBUILD pytest-cov-2.10.1.ebuild 1396 BLAKE2B eb6d91beeebb87a89f7af47630e53b52e663568bc711c6117beddb534d73c65652e6799ccec1de6639de9cb5018d686db5ce105bf4a3c1cd048b356699e3cbae SHA512 26fe1a217e12c41ba5a830338b0a0d525e21767d199d1cf0f60efc8497094a42007aa435e02dffbafd849be2139d70bb31a9fcef0a1f0667394c447718a65702
 EBUILD pytest-cov-2.8.1.ebuild 1381 BLAKE2B d94212fb13d2e1ab3f1f79c2a6025d64f6f514ae9bc7703dfb3359b5f47a560bbfcf2821055578a28c16e41db98c05d4ca0b5e9def8eab5a499cd3904d617dbb SHA512 40ea68bfc2c03f70161d08e367abd29a86e173504511d1e53e53d31f5aa4718a59ae32db3d0d5337349bf14bcf3db2f79952f07bd36048394d724fea087763db
 MISC metadata.xml 476 BLAKE2B be2e8759e98061a26e63e9431f2d62f5d66dcad8d1e82c88c53bbcf129511a3e443cb0332ee27ad450740b719d164d4feb3f6e176e3541a58cecd34dea96d9a7 SHA512 380f75130a29a9b4408eba5d9dce8e6a2bae7ed25fe337ca1f7ec99e941f06063ea088a71b3c1c5fd3e0b617fec676dc52e4f76b8b270485aef7993969712e3e
diff --git a/dev-python/pytest-cov/pytest-cov-2.10.1.ebuild b/dev-python/pytest-cov/pytest-cov-2.10.1.ebuild
new file mode 100644
index 000000000000..3b5c7c30a5e5
--- /dev/null
+++ b/dev-python/pytest-cov/pytest-cov-2.10.1.ebuild
@@ -0,0 +1,51 @@
+# 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} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="py.test plugin for coverage reporting"
+HOMEPAGE="https://github.com/pytest-dev/pytest-cov https://pypi.org/project/pytest-cov/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/py-1.4.22[${PYTHON_USEDEP}]
+	>=dev-python/pytest-3.6[${PYTHON_USEDEP}]
+	>=dev-python/coverage-4.4[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		dev-python/fields[${PYTHON_USEDEP}]
+		>=dev-python/process-tests-2.0.2[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+#PATCHES=(
+#	# Bug 597708
+#	"${FILESDIR}/${PN}-2.8.1-disable-broken-tests.patch"
+#	"${FILESDIR}/${PN}-2.8.1-latest-setuptools.patch"
+#	# https://github.com/pytest-dev/pytest-cov/issues/365
+#	"${FILESDIR}/pytest-cov-2.8.1-python38.patch"
+#)
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx-py3doc-enhanced-theme
+
+python_test() {
+	distutils_install_for_testing
+	PYTHONPATH="${S}/tests:${BUILD_DIR}/lib:${PYTHONPATH}" \
+		PYTEST_PLUGINS=${PN/-/_} \
+		pytest -vv || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/pytest-datadir/Manifest b/dev-python/pytest-datadir/Manifest
index a0c3a8b4ccca..9ff7e9f59ebe 100644
--- a/dev-python/pytest-datadir/Manifest
+++ b/dev-python/pytest-datadir/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-datadir-1.3.1.tar.gz 15230 BLAKE2B 72c5daaeb93315be55ae052d39a22eee4e64a1aaafa344ae64b527eebd137dc4667cee2f60af887551f00814d7ea4e5788097d0f59f7769335545c5083aef356 SHA512 2ab035ea4e6c4eaaead746a5fd3988feed31a314f73e18270faf4ae606521aa045f3d6c5e1301adcb87f8fd5b1ba5f3f1784f212ad778707ba46ad638d594f8c
-EBUILD pytest-datadir-1.3.1.ebuild 696 BLAKE2B 90aa988d35f50bedd2399bdb6837da10e38657816478c407ab0c490e3322ccbeaea62e8c50c9088efec8b49bdd7d0abd0f60d23456b1cd8e5a7fa1dbdae2861f SHA512 af41386fb6fdaa0e8eab77c91661383eef91668a7b13ba4ac44c1c5f2ae77b04e5a05009aa1ad1af3be3962a3615a7f092363c970f6911ade97dec6c999a5191
-MISC metadata.xml 375 BLAKE2B 393138e315b4eae4dacb9339fbb5766e9dbaa84b7482babaddc08d524fb8b9939f6622ee9c6d09b66c61ac270fcc483fac39996a12ba87ccccf7cafd4c6d36db SHA512 9a44b6b9de4d1a61d6af9256519473541d5513cef349c15178c025dee3aaaa3f6772b1be56576411a985fcd9c70029c00743d8f577be8eaec4c5a44646c9cbf6
+EBUILD pytest-datadir-1.3.1.ebuild 608 BLAKE2B 93752c42ec68e91d6b931709cc90f9980244dc1d700372d01ef87d7f8b81f829ccafb532c33f00e87b8c219070a09769297e003edaad68a701c6ba863641cb12 SHA512 877a9ca6c2211675e9e854b64617d5424f7c66d06b52b7f20872ab3022f6bc0a02039eb31fa7fb335ef9a4fd039b1a779e232e348eda49786b88516e4374523b
+MISC metadata.xml 452 BLAKE2B 809273858b896b06ff326266bac2bd1f8bce11cfa5436d2baa48cf10f008452bf696583c05ead6078a511dd6c43bc1458dee928e5a83a834314c9943e60f8c54 SHA512 a902c94acedf489927581d41bd13430498b695c2b5750b51d8da45361943b036fc8cfdf4e40c151b2e4ebe257babdba4ba45c89b1037bcf6497252b29ec032c3
diff --git a/dev-python/pytest-datadir/metadata.xml b/dev-python/pytest-datadir/metadata.xml
index d22e99d73577..88b19f00ca55 100644
--- a/dev-python/pytest-datadir/metadata.xml
+++ b/dev-python/pytest-datadir/metadata.xml
@@ -9,4 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pytest-datadir</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pytest-datadir/pytest-datadir-1.3.1.ebuild b/dev-python/pytest-datadir/pytest-datadir-1.3.1.ebuild
index 5707f6fa5b3b..12ceeb6ae7c8 100644
--- a/dev-python/pytest-datadir/pytest-datadir-1.3.1.ebuild
+++ b/dev-python/pytest-datadir/pytest-datadir-1.3.1.ebuild
@@ -17,12 +17,7 @@ KEYWORDS="amd64 x86"
 
 RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
 
-distutils_enable_tests pytest
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
+distutils_enable_tests --install pytest
 
 python_install_all() {
 	distutils-r1_python_install
diff --git a/dev-python/pytest-describe/Manifest b/dev-python/pytest-describe/Manifest
index a1598bc9eac5..6740d68c081a 100644
--- a/dev-python/pytest-describe/Manifest
+++ b/dev-python/pytest-describe/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-describe-1.0.0.tar.gz 8917 BLAKE2B 8608a00151273ebb22da6a297580295abbd64c7d9e90bfba9611eac3be64247be20ee43bb64ead1a3f74e65719112a94535506f4402cb7084802360609ab0173 SHA512 1cefa2911e598063b3b9dce381750d204c925cb0dde890b79745c8b4f1cf6d0349f85dc9eaf895000a6f15f45a84fb920f27c01b0af1959125fbe3716cbebbbc
-EBUILD pytest-describe-1.0.0.ebuild 787 BLAKE2B 6217de7f5dedf56fb927b6c43d9953761b5e6e5988ec8f291763d5a8b47c2fc12014fc350b8124e8f3b774e8eed9d86472c7e184042ccfa2083770c2a9e62c0e SHA512 dc474d139113f0acaaa6f754fb5b05710698be271e3178a6a3bf4667642206fbb83af2eae21b9985132dfd6ad9a98a2e7bbe5cd82587c81fd8dc195ed48229b6
-MISC metadata.xml 379 BLAKE2B 5e73cfba60df9af4e4452172c35e7ba311b0f4adf05e4ea64ad936d33eaa540084593eeae26190607ac6d1e66878d54a79663bfd1a8e67a46fa99ab86f7c8a4e SHA512 3bd074c7380538441d32f94f960f99db2c7a6b3815d22d560d8a973e11eac75064ff687442a92afbfa1282e70ff10570546497e1f4e10996fe836e9858b97460
+EBUILD pytest-describe-1.0.0.ebuild 789 BLAKE2B 19e2c05f4d09f3d0e21093e29cb5dd31d9ede8715c62938929c28739e0857d256f823ef2d0a3537822e5c24eccde776d3ccde72f619190f72a9951c63445a9d0 SHA512 6121449062e7b31315817f75a31338b693aa4cc64477efa9872dcdb4c2339bc2a713d2e0cdab375bd593f1acbadca821bcf097473ab1609d22dce1b2103b0b53
+MISC metadata.xml 384 BLAKE2B 12af309672ad0b05d765b0bf3c38e3eecc209aec0e83576db1f57c28b704c7b51c2144f3d697a93235c3143488265588f510fc928c884fec3e65e25d1f55e8f0 SHA512 449f84105e3c97fe1c7ff21bf4169da8ab6e2e6a0ee52d1c3cd84ff96717ad1c61316660ec361caed23cebcbdbeda9c4a7bbec11d054ac36016c1c2937906a61
diff --git a/dev-python/pytest-describe/metadata.xml b/dev-python/pytest-describe/metadata.xml
index 91c491d48379..c9c0229c8f07 100644
--- a/dev-python/pytest-describe/metadata.xml
+++ b/dev-python/pytest-describe/metadata.xml
@@ -7,6 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pytest-describe</remote-id>
-		<remote-id type="github">ropez/pytest-describe</remote-id>
+		<remote-id type="github">pytest-dev/pytest-describe</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pytest-describe/pytest-describe-1.0.0.ebuild b/dev-python/pytest-describe/pytest-describe-1.0.0.ebuild
index 7ff8b6475100..9f3f8b080dee 100644
--- a/dev-python/pytest-describe/pytest-describe-1.0.0.ebuild
+++ b/dev-python/pytest-describe/pytest-describe-1.0.0.ebuild
@@ -8,8 +8,8 @@ PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="Describe-style plugin for pytest"
-HOMEPAGE="https://github.com/pytest-dev/pytest-describe
-	https://pypi.org/project/pytest-describe"
+HOMEPAGE="https://github.com/pytest-dev/pytest-describe/
+	https://pypi.org/project/pytest-describe/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pytest-faulthandler/Manifest b/dev-python/pytest-faulthandler/Manifest
index 3481667f5d97..ddbe19bab376 100644
--- a/dev-python/pytest-faulthandler/Manifest
+++ b/dev-python/pytest-faulthandler/Manifest
@@ -2,4 +2,4 @@ DIST pytest-faulthandler-1.6.0.tar.gz 6656 BLAKE2B 0fe66827e09c6b566ac6a9aa3fd4d
 DIST pytest-faulthandler-2.0.1.tar.gz 3629 BLAKE2B f66b6989673b179b3ad3f583b9e7b9615b08e1e062f06969f37bd8a9a57e58bd0207544b0c11aa4a9d03f4db40a125bbbe1924160b2bdcb2c0c589de07281570 SHA512 184b4228693db0f15fdcf250f09c3ee9ef4767e744af9000ec46876f0c68e17434a6d1e25c7d59f610b2baa659d7af5a784cbf0e5e29b105f48d50d00cb1a7ca
 EBUILD pytest-faulthandler-1.6.0.ebuild 749 BLAKE2B 0d9ae05e1d7a4f402a07bf2e088de23bdea5c42dc9c1a78c2c93ca8aee4467e47828ffabfef72a0f0e47c873a08d4c59faa554109c85c5fcd59db53034670124 SHA512 25e7f0d34e4ebdc88828dce669c8a00d06b18da4427ea5802a4f206c6bc1f5c08c1c72c5369cb28d6eb6887ec5e748a9d0228c6c5ab724b659edfd06f5674d1f
 EBUILD pytest-faulthandler-2.0.1.ebuild 508 BLAKE2B ca48afbf9fd9a646b51c9bfa4146d8297d67bf9b1eee3c5f671d1df5f561056cb0b18e9c042a751c4de43e25a76fcb30e782bdadbaae399e48df4441f7b0d62f SHA512 7ca9d022cdca8a6749d5068ccc5ba8e5671a32949fc4ab89e273f36336384db9c276550c6e049bb23619ef26567607bf4287680ebd8c7e5821d9e84212a6be8a
-MISC metadata.xml 375 BLAKE2B 393138e315b4eae4dacb9339fbb5766e9dbaa84b7482babaddc08d524fb8b9939f6622ee9c6d09b66c61ac270fcc483fac39996a12ba87ccccf7cafd4c6d36db SHA512 9a44b6b9de4d1a61d6af9256519473541d5513cef349c15178c025dee3aaaa3f6772b1be56576411a985fcd9c70029c00743d8f577be8eaec4c5a44646c9cbf6
+MISC metadata.xml 457 BLAKE2B b60877a1c09f68aa69b75c8386ce1b8a338f91bcf54e875cfd45fabbcb4b254d1702c58fee5d2144d424bf890e57a2c9814c517670dd6bb430f3ace6ffde3ca5 SHA512 dfdf0734d59cf307da8c45c92b13831b5375569bca715c7021af1e932aa37a1c21810827184f3e78c93e5bcfa7a2c10639ea96219f595a7e7f5b68243f52aed8
diff --git a/dev-python/pytest-faulthandler/metadata.xml b/dev-python/pytest-faulthandler/metadata.xml
index d22e99d73577..19f4441aca92 100644
--- a/dev-python/pytest-faulthandler/metadata.xml
+++ b/dev-python/pytest-faulthandler/metadata.xml
@@ -9,4 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pytest-faulthandler</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pytest-flakes/Manifest b/dev-python/pytest-flakes/Manifest
index 395700eefb9e..a670bf322b7d 100644
--- a/dev-python/pytest-flakes/Manifest
+++ b/dev-python/pytest-flakes/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-flakes-4.0.0.tar.gz 7138 BLAKE2B e3c43df60484c664672f8b9ea92f8d4e25ae33e0dffc9cee200867220a3c8840f7325be28a4bec44918a9b44c1d73d3b89517db8dfa9bb982ed92a34c3b09674 SHA512 e74fe78e713040e3e85f206e8d26f5b8d8ef27dd94c2afccf3cd0f1f982c5e6c30c5966f2cdb774c7a2a8052d1a5cb324626b1997a9e75f5a7bb7d4a5e99376a
-EBUILD pytest-flakes-4.0.0.ebuild 617 BLAKE2B 62c4b5a843b3106887c476f6d84cd1f12383ef01019cacac43ec882c69513f33eecc78811f244a73a87cfb17467c736cfd1cdff5cdfbd4b22bc91dadf78d17de SHA512 0ee691b88aec6666859e5790741d8fc8ce23f451f38c1e2e26b7f138ba072294ab85a0658879e5cccff2f9cfbc3bec8f44ff382e8a84dd0bb984b8a26f80b028
+EBUILD pytest-flakes-4.0.0.ebuild 618 BLAKE2B 589ad96191060d796a99cf770420d0189cd74e274d70dd3714865ddc8fc63040ea3834de238c7ea91c1176aaea190942fad42fe459c2dc6784ccaa1930af57c8 SHA512 1f84947ba69752210d139e05efa6bc213bd2dc4806741e0101447f7049536ffbabadd533b396b93cdf7507a6064156f1316cf6f65c29b45bf4f2d03a575cc061
 MISC metadata.xml 322 BLAKE2B 4f4573205a169edb1b0883546480cf852d1eb0a9b5f99c7326a55e4f6002345c06961d8394e7de26d13616ec78f8744cfbb122964b40ce5215920749f92bdcc5 SHA512 129a0bb37ba1cd528848d3c537a7a776b7526eded473f97e986307a9a185b4337d60f6f5f0ed1beac1d0f18fee6d9023753b9cb89d77e3b3a06576104701273a
diff --git a/dev-python/pytest-flakes/pytest-flakes-4.0.0.ebuild b/dev-python/pytest-flakes/pytest-flakes-4.0.0.ebuild
index 9acf63c308af..9fcf898521e1 100644
--- a/dev-python/pytest-flakes/pytest-flakes-4.0.0.ebuild
+++ b/dev-python/pytest-flakes/pytest-flakes-4.0.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{6,7} pypy3)
 inherit distutils-r1
 
 DESCRIPTION="Collection of small Python functions & classes"
-HOMEPAGE="https://pypi.org/project/python-utils/"
+HOMEPAGE="https://pypi.org/project/pytest-flakes/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/pytest-freezegun/Manifest b/dev-python/pytest-freezegun/Manifest
index b779d52cf0b1..4e72273f7ef2 100644
--- a/dev-python/pytest-freezegun/Manifest
+++ b/dev-python/pytest-freezegun/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-freezegun-0.4.2.gh.tar.gz 7058 BLAKE2B 1c89979d85dbdedf87a26de57d1cfe120ed52831e8d69c42b6117ac49c9eb7376bab018a23ca10b582fc583ca61a03930a86878c141b0c5bf4d807552484fe70 SHA512 2bea7746e4e6a7f2a979cbc5c6d7a2576e0e2631a4e1d5abb7f27f76d6c32b0520a277474c092c5e05ce257f2ba19091918f67e28b7a2da1d5829037c6b70c55
 EBUILD pytest-freezegun-0.4.2.ebuild 707 BLAKE2B 62ab8b33538c416f5f138bd6b09f82e54ca93f5b122ada8cbe9c64b7237c527ba87372a0eb96e3bdc694e729a83a67ef6c9628b7841a7de305a8f73cc9ea49e5 SHA512 89f0a20d9df3a8cf7a5d9019b99d2977e23e267e2027681c33ceb9189bafe2b51cf6779aadbab75824ca5295ac285993552e32894839222905b2c370fa1f2426
-MISC metadata.xml 242 BLAKE2B 17fd7db1343fb7dba1842d5b62d83e56e2816962b0122ec6eee7f9e163f333d69ede2cbdf2a2ba8c77613367fca3d2cee779697fb25b5d8cf0439e1e845dbf1f SHA512 2ce768d5aae91f32da90c62900f556c647eb9806c810a817b6c45c5356e71f504b5a646bf75f553c3a9bfd3f94c4317df4948bae863ef7525b4a013b63618cd8
+MISC metadata.xml 321 BLAKE2B 1a1663748ef01afd7d998aa072544238daf5b78eba0cb16cd1eaf30a0b55b1d232c898e5c85fccbfe15f7781c99579598bf0c2734ff4a4f5b74d1ad4aeb576ba SHA512 3b4f288d20ed2df822fa5ce5c164722def390c881c5eb9edd558d7d3683b1205c21ea784f70db440129f20e8e97ef5dcc0c8927f1a8deb54bbfb6cc578835228
diff --git a/dev-python/pytest-freezegun/metadata.xml b/dev-python/pytest-freezegun/metadata.xml
index e59516686a44..57ab8884a1dd 100644
--- a/dev-python/pytest-freezegun/metadata.xml
+++ b/dev-python/pytest-freezegun/metadata.xml
@@ -5,4 +5,7 @@
 		<email>python@gentoo.org</email>
 	</maintainer>
 	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">pytest-freezegun</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pytest-helpers-namespace/Manifest b/dev-python/pytest-helpers-namespace/Manifest
index 333317e6fe41..d14694cb14f0 100644
--- a/dev-python/pytest-helpers-namespace/Manifest
+++ b/dev-python/pytest-helpers-namespace/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-helpers-namespace-v2019.1.8.tar.gz 10274 BLAKE2B 1d232817e99909738f7f37466ba22fbeadf75f4fbfdd9b61790dd79418bedbce4ee219e5102ee2db1709ba991e323ce6edffc68c4e3a657c58cb628b505de098 SHA512 d5f4db3ece8b0e1719c4d1213a5e07a3c53257b089d3d74f90cf86f21a7951983a95286c7753f5e9486acc7e482d79c2a95d5a7b8eb22e19c7048db99fa3c421
 EBUILD pytest-helpers-namespace-2019.1.8-r1.ebuild 817 BLAKE2B 1aa6b134b98bbf0703b893a3cff4f5cf4540ece936744ce6330dced6abce4b02efb1a3d5b8b81c5c1eca0a6ac0100be1f05db197323d87e7eeb9b0861551e0c2 SHA512 15e1408d284fe03147d961dde17ebb5050c4ee1a6a9acfec02fbf5a1dbad20ac498af9ac936dec3ae7afd9fc4e7d8d19e53ab9a9fd44f2eefa4973fb7123e6e1
-MISC metadata.xml 328 BLAKE2B fab884918d24353a3281a69d6ce042faa916c0fa3b8e33d6acac90e85b487f31d97388d64ab59257b0e9cb1aaa8891c7934f87e4b5a2f36a5f0cb621e937f264 SHA512 7cbdc338820fd09b283ef5686c59a1a7138a3b1e0b315daa0d6e4e4e0cf1f87b1802128ab03939ce24fa1b97954de7fd34096f9d734bf20e1ee8e99276e95941
+MISC metadata.xml 415 BLAKE2B 6a073523c1bc77be20e0332514be3e351f5d83a22b5b03f4445ef136c37ffa07e779e32ae9f254306f2af2541ab47b2246ba7556a954b135b0fa70467688b09b SHA512 52e0c48feaa7d06214876c9efe87eaf0f27785aa095c013c5d6365e2a277eb56ef894a1bf5de754779d84ab38ab6deba2b5a68aa338b8d5735c6942beb214bc2
diff --git a/dev-python/pytest-helpers-namespace/metadata.xml b/dev-python/pytest-helpers-namespace/metadata.xml
index 366c2631e760..8e6e23408c47 100644
--- a/dev-python/pytest-helpers-namespace/metadata.xml
+++ b/dev-python/pytest-helpers-namespace/metadata.xml
@@ -8,4 +8,7 @@
 		<email>chutzpah@gentoo.org</email>
 		<name>Patrick McLean</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pytest-helpers-namespace</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pytest-lazy-fixture/Manifest b/dev-python/pytest-lazy-fixture/Manifest
index 22365ef2f3de..83d93d1d68bb 100644
--- a/dev-python/pytest-lazy-fixture/Manifest
+++ b/dev-python/pytest-lazy-fixture/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-lazy-fixture-0.6.3.tar.gz 7878 BLAKE2B f3a034678f590090a453b44b9fea938ced040c80922f139f3321ec20db856be219d039c7f4199ef67af79b5008d37425b5c08a0edaf71fdd7c8f248702acf488 SHA512 3281edc516f21f23104d7fc188b5c9aecf364f55109dab52865cbfef4a540727eb2bd42fb9806a7e8be728b249bc7a224ffdbab96473f043bef9a7aea1e4baa8
 EBUILD pytest-lazy-fixture-0.6.3.ebuild 505 BLAKE2B b60cf6b0ea74fd9b5a925c12ce87ea5bc356b91eb11727eba28cab516c0e5cd03d62ee316862eac98c404ad2a0f3341f26d2a1990ff5f13e47d21a3e1c05ce65 SHA512 4d9653458fdbf11cc195d87e6ebc1dae83db375204b44e93dcf3f3374d2075765c129577639e0688023921d5dc77498e87cff2da77ac91006cfbcf2137b75574
-MISC metadata.xml 387 BLAKE2B 6fd0bd59ab8f2f63eb2c2e157e043cbd22b26a4c9e883fa9f78a01b0b43488d1873b4ac0bd69d8c2d24f21fc938ce703942c1bd0a1766db4bc993c91d9a3eaa5 SHA512 207f63c3317663c51ca3e6abdbeba25a08a2b8956d8d80812574dd522630e4e1b5ead010c7cf933bb02e356d59bcd9ec8ee39d1eb7af823b43a194af2d953646
+MISC metadata.xml 457 BLAKE2B 483eebf92b80b8533bec0c5ec1f1b14290cddd5bfe15cded2cfe2031a14ce902e42e4017b87828daaf6758e76ad0cf1cc85bc95af34edb458f5d10a25d636b14 SHA512 486831bb72ca35c899f39c5da7ecf58e51fdd43df4e57f53ded11f128c2d618eeb2090d23d97704d3995bc8044373b1a0688aaa0aa478726289f5c7a5f320a55
diff --git a/dev-python/pytest-lazy-fixture/metadata.xml b/dev-python/pytest-lazy-fixture/metadata.xml
index 443a7275aaa5..e4c15cc0a50e 100644
--- a/dev-python/pytest-lazy-fixture/metadata.xml
+++ b/dev-python/pytest-lazy-fixture/metadata.xml
@@ -1,12 +1,15 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>andrewammerlaan@riseup.net</email>
-    <name>Andrew Ammerlaan</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pytest-lazy-fixture</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pytest-ordering/Manifest b/dev-python/pytest-ordering/Manifest
index 0321d827b92b..82a168b5d1db 100644
--- a/dev-python/pytest-ordering/Manifest
+++ b/dev-python/pytest-ordering/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-ordering-0.6.tar.gz 11046 BLAKE2B 468ae5f04029b96ed3058b7f429aec0aaf96092453b229c3de5eab174702af2c1a9fe83171c68d282c4a144b3dd736daf9ed87b9e139a7bd175114f504049ebc SHA512 fd3aec83914f64d1295e1a1bf3fdc580c6824a749a1da8cebae275fef940d6ed6e5dcafad321d94f504a153e13e298b6544dc3c2db716a6b25d3148c2365fe15
-EBUILD pytest-ordering-0.6.ebuild 843 BLAKE2B be40104425e6a044a08245c70bacdce8641ae137159219d1819ed1c07e6d36b0caa0978aaed886f863361bbbc414f03ae2e1b64db8307e7e89eaf2e84fd9fbf5 SHA512 820247e0e4bcd90f1b39f7c9da00fa1c2907d17181eeb889ccdc912659568f330129749b9860c16ff85f6c254e399933ca6073940b5ec50f9fed9a243aa7bb7d
-MISC metadata.xml 535 BLAKE2B 3949f8116cb403fcf2a38e77a127cefba7a3326588032533a221331f79af318039780757437373784ae1894a058c8cc86f41e9ade54a789af2603e8f7561c508 SHA512 5e60df7ff87953007e7d12c198266462faca5c477cc62c8e9d031d3843edb867f3cf0aa3433fbaae16ecfe045da0bc067c6b5da47446356b2d878ce0cc99c311
+EBUILD pytest-ordering-0.6.ebuild 845 BLAKE2B dcbccaffef0a1e8fdd70632af5d520653b2deefe482d3280239708293725366fdd821d009f2bc42b232754ff737658213743bc5183114f87ba59de056361136c SHA512 4bef0d88ddcf76f22b0c01d12332e0e3a77f99e9a520a27f1ef0ac4cd9c168b9ade85f99af626f52ad863db7b3a45b61fbcd8aa47e23a7dddad261e59acbfc29
+MISC metadata.xml 515 BLAKE2B 3cd3edaa8c256ff8a310a444a3e8ce7e5454d2a7c6919a26c3d81c412d5d5897103c2687038210009ee34168451cab2d699a30378bda377272ed9abb09ea39cb SHA512 80315251c22819d1a5c0223e9dc7eb842671c1e7a4e4840e5e0778cb1b4806bb420e39a42592c706f48a6d07ff0f135f081db69c9298df0ad4a22e35adfabdd8
diff --git a/dev-python/pytest-ordering/metadata.xml b/dev-python/pytest-ordering/metadata.xml
index 48b39a119114..1b77407bcd6f 100644
--- a/dev-python/pytest-ordering/metadata.xml
+++ b/dev-python/pytest-ordering/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
 	<maintainer type="person">
 		<email>andrewammerlaan@riseup.net</email>
@@ -11,7 +10,7 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">https://github.com/ftobia/pytest-ordering</remote-id>
+		<remote-id type="github">ftobia/pytest-ordering</remote-id>
 		<remote-id type="pypi">pytest-ordering</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pytest-ordering/pytest-ordering-0.6.ebuild b/dev-python/pytest-ordering/pytest-ordering-0.6.ebuild
index 1d9e0dcfd7fa..e494647a3ece 100644
--- a/dev-python/pytest-ordering/pytest-ordering-0.6.ebuild
+++ b/dev-python/pytest-ordering/pytest-ordering-0.6.ebuild
@@ -9,8 +9,8 @@ inherit distutils-r1
 
 DESCRIPTION="pytest plugin to run your tests in a specific order"
 HOMEPAGE="
-	https://github.com/ftobia/pytest-ordering
-	https://pypi.org/project/pytest-ordering
+	https://github.com/ftobia/pytest-ordering/
+	https://pypi.org/project/pytest-ordering/
 "
 SRC_URI="https://github.com/ftobia/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-python/pytest-qt/Manifest b/dev-python/pytest-qt/Manifest
index 6e28c3f91164..91064b3b7a9d 100644
--- a/dev-python/pytest-qt/Manifest
+++ b/dev-python/pytest-qt/Manifest
@@ -1,5 +1,5 @@
 AUX pytest-qt-3.3.0-fix-file-match-test.patch 646 BLAKE2B 60a34a0a5d3e7d4cedd6e0e0886eeee5eb4bf447544a0f712e8906edc5ea62f60555917b97c143a4804fe76e5244090907abf51bf69f98c2893552115af64fd2 SHA512 ab68967a2f30acc2aaed1c8eadeee84283b469b3465c5e79d9c37ee14236ea0e2fe827ba83efa92d5d33c369298e548cea72f80109949426aa38121ba7edb45f
 AUX pytest-qt-3.3.0-skip-show-window-test.patch 1318 BLAKE2B 7e1c628c13f02d6219d752e3bbd6c54d17b54d45fe84b608093a42796ed6208f12c62a6bfc7a685cf3f445f5c4f6ca9e496d9b55b088cfddc28313e02c07d45d SHA512 27f788b560e66e0de3b9f17144cdc2a31fb9a4a270efdb490dfe106109051669d55e10072c841ce8f0aa313bcfec397ff59c6c76842a6a4b58194a03c3ff07d3
 DIST pytest-qt-3.3.0.tar.gz 113439 BLAKE2B 1eb486d2d44825058577306ed3b9ade34e6cbad0d90038fe314114bb22c82ae069c9fe66c170591de6c97bad99f5f9e0021c8b3dc38c858b8293a22c448bed74 SHA512 8b3ce7b62621c55fb319966b162cb60663c5ef290f34e62e6a9329e67f530c2bde1329ae0b045b15c99ae14f5f6a5fef9ee930475fa700922c50ee725adf7983
-EBUILD pytest-qt-3.3.0.ebuild 1183 BLAKE2B e1cf6a9ad3a095aef058e85e9f7515ad3bc0b715888ad49ad3afd7c4fb33bc838cb88f3a6703b4d5469f73d02f80cde10ff38441f3d0c1aacf88b879bbb98ca7 SHA512 1038e6ece1290d1489a15c098d0c05f6be7f0ca27de8b374f8d3fd1a06bdc34786246c8b83621a0f5f4e997a98f72417087442c7af7a1b1e607b71d28ccc0476
-MISC metadata.xml 375 BLAKE2B 393138e315b4eae4dacb9339fbb5766e9dbaa84b7482babaddc08d524fb8b9939f6622ee9c6d09b66c61ac270fcc483fac39996a12ba87ccccf7cafd4c6d36db SHA512 9a44b6b9de4d1a61d6af9256519473541d5513cef349c15178c025dee3aaaa3f6772b1be56576411a985fcd9c70029c00743d8f577be8eaec4c5a44646c9cbf6
+EBUILD pytest-qt-3.3.0.ebuild 1188 BLAKE2B fff007f51b1236c86b22cdcb9a2d57135c3f54b2bb19174a2aa5dda7d6f51cafea81e21c42b6cea510d7f92f61e3f8cafdfa8c67ac5644165c546cf1af70e052 SHA512 7f3a4871bf2b4ea7cde2dc59148dec1205e728ae1c191b5f34e5d6c4acdd9aab1355e3b017d9279100552e85acaaf1052a6bfe4c52745c0138ecc6f0fdd78bea
+MISC metadata.xml 507 BLAKE2B ab074f723d086ec00320b7fe05de816f2a4986ebf2404e056845a40e6a9c28c7a7db1c042a690ca9df575ef450391291f1ebeb133c8dc3c5bcfe6de487d838c5 SHA512 f1aaafaa52baf8d67c9c7d4dec0ff921f8b5749c5cd32072ee55e8a0b2c05a6dbad8ae1847aa720f3d863bf7ad0b6d8d7610d9ffd2b841f0c0e2ccb276c22854
diff --git a/dev-python/pytest-qt/metadata.xml b/dev-python/pytest-qt/metadata.xml
index d22e99d73577..9360bd83723c 100644
--- a/dev-python/pytest-qt/metadata.xml
+++ b/dev-python/pytest-qt/metadata.xml
@@ -9,4 +9,8 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pytest-qt</remote-id>
+		<remote-id type="github">pytest-dev/pytest-qt</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pytest-qt/pytest-qt-3.3.0.ebuild b/dev-python/pytest-qt/pytest-qt-3.3.0.ebuild
index 31b4f1138986..c5abfdcb1a52 100644
--- a/dev-python/pytest-qt/pytest-qt-3.3.0.ebuild
+++ b/dev-python/pytest-qt/pytest-qt-3.3.0.ebuild
@@ -8,7 +8,9 @@ PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit distutils-r1 virtualx
 
 DESCRIPTION="pytest plugin for PyQt4 or PyQt5 applications"
-HOMEPAGE="https://pypi.org/project/pytest-qt https://github.com/pytest-dev/pytest-qt"
+HOMEPAGE="
+	https://pypi.org/project/pytest-qt/
+	https://github.com/pytest-dev/pytest-qt/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pytest-regressions/Manifest b/dev-python/pytest-regressions/Manifest
index 5755c3fa6874..c009aa24e8c3 100644
--- a/dev-python/pytest-regressions/Manifest
+++ b/dev-python/pytest-regressions/Manifest
@@ -1,5 +1,5 @@
 DIST pytest-regressions-2.0.1.tar.gz 77934 BLAKE2B 4bf9868afd3bae1ab1668a6cb75bbc661336b3bd7dca23b0b6e0ab810cb60645737e45008c74a09f90763869982db5d819f170f6b251d9419681ceee810c4657 SHA512 9c35f356ef2c2914674b022b4a357ec75a4a12c8090c44d959111f1eaa1f10f492f8103098b273292bff08a5957d7f2ae3f0b0bd051438d6467ce1491f234d97
 DIST pytest-regressions-2.0.2.tar.gz 78362 BLAKE2B 67c37c49230d5b84869b0743ef5e4c6b83cc7869ab12832cef9ac4a09c7199d141e064809e6532e325c3b4b22385468ecdde3ea0a021523930c849b78e4bd8f7 SHA512 8c9959a9d84fb6c055b90b38ad6aabdf8e9459931ca50c959f395280199aaa707844330d26b33467119e77f3d50a51d76dd648fdb351de9228c8d54dc047c92e
 EBUILD pytest-regressions-2.0.1.ebuild 907 BLAKE2B d6aaac9a0f09fa9cd6ddd9b0dfe0f87dc036cfd356d5c084bd46be86a06d15764963cbd5808ae713c43b87cca3830b154b871852a7ac99cf74a855c4316b2810 SHA512 c91210fedfe17a3a55070d0b0aa1b57b565e891305df76818f92a2516bb819ce8dd41e6e00c0d4f583ea761acccca16099345d010171bca19dc71a46b12b4ad7
-EBUILD pytest-regressions-2.0.2.ebuild 909 BLAKE2B 302fe195e6ba019198a0838b27ce2ee0261ab2a58d9058ca23fd52ce76f7acda4672710ac2c87a48e78a29881ed33352a67e32da058529f629aba683fdcabf0e SHA512 4760ee16f2d9343c83fcc413d104f237450cab4606f66a8e096064c37c415ae41dc9302fac65de9427221a14ee9d98e67e2ce1676e614295d97a0be63e552d20
-MISC metadata.xml 375 BLAKE2B 393138e315b4eae4dacb9339fbb5766e9dbaa84b7482babaddc08d524fb8b9939f6622ee9c6d09b66c61ac270fcc483fac39996a12ba87ccccf7cafd4c6d36db SHA512 9a44b6b9de4d1a61d6af9256519473541d5513cef349c15178c025dee3aaaa3f6772b1be56576411a985fcd9c70029c00743d8f577be8eaec4c5a44646c9cbf6
+EBUILD pytest-regressions-2.0.2.ebuild 817 BLAKE2B 9bfee7b2c0f6dc519398070d839647d90ae1344c71b9310bccd3445f1ad79298a39cd638eb0ead1505c9b827105d6f9e6e78416a88d60522e7387cb9103fd895 SHA512 c085736fabbb6aa79f53b5ce5e1a1671a0e5b60bfb48c6d7d95a3301b4eb01a8ce4005b9bd54de03870361febb56d3c91082dfedc1da81e0f0dd5459a8819208
+MISC metadata.xml 480 BLAKE2B e6c6ac7fcdf6df37deb29f3551fac8fef3a9282ceae658aea4d80fcc7950e34805b7b3f77b87a9231c4b251e58f4076ef150b9e49744058ef298cb2278f5f2b0 SHA512 2659af13e07c58c86cf62f78f7196a92553411cdb1876e234d2a166a973ad49ab0c0d57df5d32e291d0d49e44dc9ce82b7dc2ae3f5ae24553524906151794d3a
diff --git a/dev-python/pytest-regressions/metadata.xml b/dev-python/pytest-regressions/metadata.xml
index d22e99d73577..1a5123349a91 100644
--- a/dev-python/pytest-regressions/metadata.xml
+++ b/dev-python/pytest-regressions/metadata.xml
@@ -9,4 +9,8 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">pytest-regressions</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pytest-regressions/pytest-regressions-2.0.2.ebuild b/dev-python/pytest-regressions/pytest-regressions-2.0.2.ebuild
index c182743328e5..d8ea832714cd 100644
--- a/dev-python/pytest-regressions/pytest-regressions-2.0.2.ebuild
+++ b/dev-python/pytest-regressions/pytest-regressions-2.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="test? (
 	dev-python/matplotlib[${PYTHON_USEDEP}]
@@ -29,10 +29,5 @@ RDEPEND="
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 "
 
-distutils_enable_tests pytest
+distutils_enable_tests --install pytest
 distutils_enable_sphinx doc dev-python/sphinx_rtd_theme
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pytest-salt-factories/Manifest b/dev-python/pytest-salt-factories/Manifest
index 7c16cdcd0f66..61d69553e075 100644
--- a/dev-python/pytest-salt-factories/Manifest
+++ b/dev-python/pytest-salt-factories/Manifest
@@ -1,4 +1,4 @@
 AUX pytest-salt-factories-0.92.0-setup.patch 507 BLAKE2B 6bc3f42686618d3a450d7e6be327cb8ed91c42dc18965cc4ea7a70cd8695f47ac97a517dcf7e36336512ad76d817194f940472a1c0a87838519bf17a71a428d8 SHA512 c7cadb4239ee5bf9fae9594e6612bf36878a910184ca6d98f58241707163ffe2a830b567b06ba4d7c4f218a88d5b72c3dde4387d224cb250308a1fcfc0c4ee37
 DIST pytest-salt-factories-0.94.4.tar.gz 117281 BLAKE2B 9b42dbf4329fe2afd875de55e96604896c6f46d3c3736b644466dd5db6091cf5b9b1d2188c0e0a22b4b15a227dfacc7692ea6499aa7f58ce6adb9b802f00b1f7 SHA512 5c670aa7dd64441b1bd3a188335a35be00d7406bc8d76f9a1213cc3414061c3dfc51a9319008c29c83fb5abec1d7b677aec76ac4b9c00adcd878ef6da599041a
 EBUILD pytest-salt-factories-0.94.4.ebuild 893 BLAKE2B daf2379912f41bf2a67e28b2a6033e07e8423380c7c798ed295a64217abd9a31f9b1ecb6b8949ddce4c0322b26cc8ce6eaf93b66a786fcaf639a4225c413dde9 SHA512 50acbd3a8becb3dc6d092099a0e2efd1a0841a545695de9a31323f28601b7438333bdaf6ccccad99685c55b978175c0d522c0a6543e12a8ce725fdc0def5b18a
-MISC metadata.xml 249 BLAKE2B 9e4529cdac0a55f14c36fde3fa54e30645a61a73d58e83ce460edf84d729bb3cd4cdc3e52d588690945508bc7d253b1edfb7734ebee94a88b75fee249a043c84 SHA512 ecad16da7f98e9b1cb1882147e6d8b7d541e4839d92fc26f3db1bea69ed633637da9259947b2b78d204a11d0edd3daa84f173613b6dc19110b5406c6fddfa7f0
+MISC metadata.xml 333 BLAKE2B fd8789d4c8303669a8770b3b825c7dc3429f703c1d0e0622ae7b4d57e9fc5b73703aa79ec2819af6b60c1df4b6b58ec19e6971867c01486d48c6e7aaa3e3e7a7 SHA512 ffdf1308d023306664b012d94fcf678534595e7a4efed20dd214a0b1d3e39ca827bf61450ec20967a838606adb3a4f67055a12fde227d080c5f426d9321cc7fc
diff --git a/dev-python/pytest-salt-factories/metadata.xml b/dev-python/pytest-salt-factories/metadata.xml
index cee379b15409..b8b1eaa537d2 100644
--- a/dev-python/pytest-salt-factories/metadata.xml
+++ b/dev-python/pytest-salt-factories/metadata.xml
@@ -5,4 +5,7 @@
 		<email>chutzpah@gentoo.org</email>
 		<name>Patrick McLean</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pytest-salt-factories</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pytest-salt/Manifest b/dev-python/pytest-salt/Manifest
index 0e8f386c6f01..23d4e19c2943 100644
--- a/dev-python/pytest-salt/Manifest
+++ b/dev-python/pytest-salt/Manifest
@@ -2,4 +2,4 @@ DIST pytest-salt-2019.2.1.post1.tar.gz 63824 BLAKE2B 684e1dee6df8f7459bfa1747ea0
 DIST pytest-salt-2020.1.27.tar.gz 64141 BLAKE2B 2b9261af2de28f8dce1abcd71b586594075916c8a5dbb27a24f15b9d95a575624be118d1c742f02020d3b968ffa4654cf6cd0dabefffe6876b87a4d1d58c3d60 SHA512 b0632e21f1ea5c3b57eb681cd8b270721cafd270321b708fca65427fc89817ed9e9a4216a520f35988c6866b1ed76ed84838009da9052a11cf8782d4dcf118ba
 EBUILD pytest-salt-2019.2.1_p1.ebuild 578 BLAKE2B a1535a842ab15429175c931ed36342041b9061cd42730df43639928b0b0122fe209ed2b34b397f5f11e8b98f15233cf51ea6d13dd959b20fa839e25a3ff62af9 SHA512 a984989a933648f8183257b0d69438171691beeacef2158e8b876ad76ae3239308dd1061e5a4143e09714825e36eedc883dca3e179fde5599baa586af1749026
 EBUILD pytest-salt-2020.1.27.ebuild 891 BLAKE2B 12b8f649d918922ce5beab45f680017a23630bfbb3fec143b70ff91954f9108541aa1c01d69c3fac705c61548efba5ffcc09035abe848752962609f801a521c2 SHA512 85a2c12782cd99221e8467a0f07186ec06c762d9523853396baf87c44cfb4403888bebea8953f705cc06d70d5ed6990407cad6a0c1ee5e67e0dd719b539148c3
-MISC metadata.xml 249 BLAKE2B 9e4529cdac0a55f14c36fde3fa54e30645a61a73d58e83ce460edf84d729bb3cd4cdc3e52d588690945508bc7d253b1edfb7734ebee94a88b75fee249a043c84 SHA512 ecad16da7f98e9b1cb1882147e6d8b7d541e4839d92fc26f3db1bea69ed633637da9259947b2b78d204a11d0edd3daa84f173613b6dc19110b5406c6fddfa7f0
+MISC metadata.xml 323 BLAKE2B 2eede80f9d146aa2dc511191d1e1ef7a689786878c2ba77ee62dc181d49ed07475f657886e6f9d662140ff378ddeaf65f979a6e483b92ff97834e934b225b430 SHA512 ca8b7955dc3025e3ed15ef0556b02a80b033dc2003bbb3030b42112e04d1945436a3ff2224bd2149ec34210d50a66fcc0b1577dd1464fc8e1e4ed097286e02a1
diff --git a/dev-python/pytest-salt/metadata.xml b/dev-python/pytest-salt/metadata.xml
index cee379b15409..e83c48f42424 100644
--- a/dev-python/pytest-salt/metadata.xml
+++ b/dev-python/pytest-salt/metadata.xml
@@ -5,4 +5,7 @@
 		<email>chutzpah@gentoo.org</email>
 		<name>Patrick McLean</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pytest-salt</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pytest-services/Manifest b/dev-python/pytest-services/Manifest
index aacca21ef876..69268204079a 100644
--- a/dev-python/pytest-services/Manifest
+++ b/dev-python/pytest-services/Manifest
@@ -1,7 +1,5 @@
 AUX pytest-services-2.0.1-lockdir.patch 1085 BLAKE2B 09982cf4874d82a332b441e4538d1fb177735af3acb2ba2d7fed9c0a2ef006841ca0c4221fc51c0472a0a94c49bbcb72877c67b5c7630333f550e3fda1b5aa91 SHA512 7b5d4d5adb722936bd3593ed4e12fa2ca9bc3aa764565d9cbbea2d70424d9811d5838e97bbbe8fafa2f73acb8bdfa6c705e8c4aec12b5b6556b1e4c8db629ea9
 AUX pytest-services-2.0.1-no-mysql.patch 821 BLAKE2B 3a041e51c0e2c08ce8727eccdbfac36eacec2542d8d8cc7ab7544f46916b47a62e960437821f8fa85fe968b9e68808b94d9ac51fe06daf487008bfaf305ba81e SHA512 68788f6b6700793df2de4fbae85a41fad095f09ac9af717c786305fc1ca6b29438a65d096076b9469dc543a54ce8f72a40dc0f211eb9d517e658ce068e60ee23
-DIST pytest-services-2.2.0.tar.gz 20995 BLAKE2B a65455d89190d6b63854df7509124c8056c962640972f67210e3b3dbf2d669708e4edb124077cd32e7fe429e884372f4248396377b5d4879d9f7313c3ef7df46 SHA512 48430d6c107626a4e13a8eb16cf5cc3b2068e34869b8a4e3e615fd7a20f3644a028c911211f3de885ffd942cafd3946c313e76ddcf6199bedc9731f7b88c843a
 DIST pytest-services-2.2.1.tar.gz 21303 BLAKE2B 6f4b66b713ca4976eae61bf516bfecf13b8d6f56e03ae772ba9465e7c4c52b8d5ffa713b9441c73538a0b05665da7b7aa53d5f5da1626c6c208edf1c8239b1b1 SHA512 95d70431a7c3fa3b1602e6ad0e72975cecf5f0464e1bbc21d5b4eee6aefee52794c7b1d8dacf0681cc4cbb5ae7910075a7d0b3859647cc55298a2792489c4bfb
-EBUILD pytest-services-2.2.0.ebuild 1225 BLAKE2B 59f801749ef1eac718bfb30439b6d5a3e89f0d2de5ee65b77f09f5c5e669a745ada0a2e6c5ad3f79c86232e98a88b7eda26794abb1435076bff597138956c369 SHA512 6a50d00b789685fb3873893775dc73239cafebe204e31c16643dcfe72077b60a852b344f64c42cfc891ce2fb22a64a2cbe404cd6b8daf132c5a798f0b6762f56
-EBUILD pytest-services-2.2.1.ebuild 1197 BLAKE2B a061d25f9920f904a3ed4aeacc525d5800dce0796158584e71c60c7f4dc50a15f8c89f25d6cd3c9c7c5bd4176257b67c844e45008136488e24352b2e89eaf0e2 SHA512 d1d7b6cff22dd75f6e9659678c5daf93bf61c451deabf5e6f1b2f767de6d2003a79682bf2047cbb717d6df41085fd0c0380314a13478b233a3f15c9accbb1e68
+EBUILD pytest-services-2.2.1.ebuild 1192 BLAKE2B 0b01249eaa29b1ed37b363052bce603ee5b5236c872de1e7c90fcf896037ec57d633888445fef215f8767d286f67afb8926980cb37bcdbbf49bbf6ef9fdcb628 SHA512 1d58a79178d31dc5b3846038b5e0dad068aa4b366717c4ea2c9a55bbdae85f18bbbdd435b850ab162c25c5248d370a632bc556bf9a51e653f2b613b2c461dfdb
 MISC metadata.xml 408 BLAKE2B 84e0589c8c4d813b4542e5d3080ad855611c320c9d5950a08c232c9fa344bca969fa4b23cf6d2b427731d2d30c2f678d33605207042779ea40123c6b249017ed SHA512 de1340d8f01941355ec01b2f92b4e89ad798dd9438e858050861dfb8c139994b5e8fe620b00fcc8133204ba8d265eac36f60ba3bca3a4e0da49332da13b75a9f
diff --git a/dev-python/pytest-services/pytest-services-2.2.0.ebuild b/dev-python/pytest-services/pytest-services-2.2.0.ebuild
deleted file mode 100644
index 37d25adeb0fe..000000000000
--- a/dev-python/pytest-services/pytest-services-2.2.0.ebuild
+++ /dev/null
@@ -1,51 +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=( python3_{6..9} )
-inherit distutils-r1
-
-DESCRIPTION="Collection of fixtures and utility functions to run service processes for pytest"
-HOMEPAGE="https://github.com/pytest-dev/pytest-services"
-SRC_URI="https://github.com/pytest-dev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ~ppc64 x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/zc-lockfile[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( ${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pylibmc[${PYTHON_USEDEP}]
-		x11-base/xorg-server[xvfb]
-		net-misc/memcached
-		!dev-python/pytest-salt
-	)
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/pytest-services-2.0.1-no-mysql.patch"
-	"${FILESDIR}/pytest-services-2.0.1-lockdir.patch"
-)
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv tests || die "Tests failed under ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/pytest-services/pytest-services-2.2.1.ebuild b/dev-python/pytest-services/pytest-services-2.2.1.ebuild
index a10297b8270e..a3afe220468b 100644
--- a/dev-python/pytest-services/pytest-services-2.2.1.ebuild
+++ b/dev-python/pytest-services/pytest-services-2.2.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pytest-dev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ~ppc64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pytest-subtesthack/Manifest b/dev-python/pytest-subtesthack/Manifest
index ae710dcbb815..49e9e22bf4f8 100644
--- a/dev-python/pytest-subtesthack/Manifest
+++ b/dev-python/pytest-subtesthack/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-subtesthack-0.1.1.tar.gz 2410 BLAKE2B 3d41950ad46bb07da145db7f88eba7eb34a2bbb99273f47d2443cae5ab0e11737f1c2fe81bf473180178b2ad9e55b252c7717846f1b010cc58fb1bf61380d003 SHA512 0bf6425b535e65dc7f06f74493d10fbb6451e78a817174638661d7525f39f092f67db8da010228cbd54b400485e71e443118f91ebef660b9c00d2b354062a55f
 EBUILD pytest-subtesthack-0.1.1.ebuild 835 BLAKE2B 37bb1580e018cb7a5fb6db48f20e82394e7bf707cc751d1634221f6a9b3544f0e28daa69053c9c0869c9595518c76f9b349e48e577474335a2a50787f54c3bb1 SHA512 860c33db350dd1d31a2a8782841391f610eb4cdd00703076963524aeb09182453ae5ff56853521c549af84b06ca346047a0ac9a303fc992a4568053114830162
-MISC metadata.xml 321 BLAKE2B c9b07273af601a4874a8e2790c84350cbd5ca4218c4604de564b8a714a946106ef74ee744bafff29f160a4ab3bb6abd35c49a66cff74c83698a0a6f57b843bd7 SHA512 f1c6901c39e0eaaf79917b0699ae5d7dc9a94b15ed2db4ff08f0e3f2bfdaa567e3848474934bb4d8aafe56198536a4ff8f5a6b4379c2238ee20e4a718bfd9a58
+MISC metadata.xml 389 BLAKE2B c1a64baf73ac4190b139a5e39f1b01eb379aa6bde70466ea4a71d97bf92624decbdc0a41a78ae5f1e2e9d95a2ff59c98bbb80a91bb30e0f6be0a11797268747f SHA512 e8be63576ae72a296ac1d11ddebc32611bfddd1ce398d6a5f224dcd627e157fff96536d7bd32e2ed9b5cd872834ef4c85c9b84e10578526a4e6a8b51196eb99e
diff --git a/dev-python/pytest-subtesthack/metadata.xml b/dev-python/pytest-subtesthack/metadata.xml
index 6979d31debc3..83cea879f32e 100644
--- a/dev-python/pytest-subtesthack/metadata.xml
+++ b/dev-python/pytest-subtesthack/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pytest-subtesthack</remote-id>
+		<remote-id type="github">untitaker/pytest-subtesthack</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pytest-tempdir/Manifest b/dev-python/pytest-tempdir/Manifest
index 71abeba7789e..843613d773ed 100644
--- a/dev-python/pytest-tempdir/Manifest
+++ b/dev-python/pytest-tempdir/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-tempdir-2019.10.12.tar.gz 9859 BLAKE2B fe4d32d2de3d577952b90a811c38f1cfa0c16badf9115a1b70faf07f0123e29935c01bfc3c1b9c616a0eeb3e0da9f42a4415687a4862830e0edea505a99dfc04 SHA512 d6f8994423d9be90f4be20878f980ad4604475ccd4b65975cd3cad357c2d6a2a7bb8623e4ccd7441437ad72b7899d8b59ae19ca3a52c35a6c24456e44b7626de
 EBUILD pytest-tempdir-2019.10.12.ebuild 633 BLAKE2B 398d379f4f19dd7437703668897ddc1ce5b4d88dbc5b9213103b780398aba0f028803eff40c3afcdf05c38f93f12d49bdddf937b54dfea3dc1f5e027147bd934 SHA512 755ac2deca9da202cb7871584ab9043cc147ec73b973605442d6bb16b81fdb6caf68d40d02aae2bc45eb2bb425e379e327ee3fbe92486b0d3531c718998e9c18
-MISC metadata.xml 255 BLAKE2B 2bb3830b8cec850703f7912f4c22f5b0abeabeed0715222bc56141779d02160773cfd0f85417c553c1cd8f2738bfeb78c56dffb8e648e572019319657646d1ba SHA512 522158915afe67937f81ba572a918a2de8ca1f8591e097da56799c97870d7c44756c1acd8224d63bd3375c2b9ebc0e1ce50816899117948a48065a27804883bf
+MISC metadata.xml 326 BLAKE2B 9e3ebe5f21ea79c1bcf36480d71363aacbd79499aa6ad5c2189aa08f4383400eed646a05c5f820bb803405fe198b4981cb5cbabe737c89a5f92e723eeac13285 SHA512 a221e01e2f66ab996b06e4dfaf6c8ffca79849e635ecb5f443574190a33e934b8e28839d142571cf8eb1f360ef418ed529b60a60fe5d99c0ba208e37cc0bf784
diff --git a/dev-python/pytest-tempdir/metadata.xml b/dev-python/pytest-tempdir/metadata.xml
index 56cae167d372..ae2c6b32482d 100644
--- a/dev-python/pytest-tempdir/metadata.xml
+++ b/dev-python/pytest-tempdir/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>chutzpah@gentoo.org</email>
-    <name>Patrick McLean</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pytest-tempdir</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pytest-testmon/Manifest b/dev-python/pytest-testmon/Manifest
index 2197c7a06f26..723d1d67df89 100644
--- a/dev-python/pytest-testmon/Manifest
+++ b/dev-python/pytest-testmon/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-testmon-0.9.15.tar.gz 32468 BLAKE2B 72678f4a5ed9bbc1ee6a4ec611da105554856454dcd3a3f199084645977d7ce461697218c460f9ae3b5a56bd90843822e5e88c54fb43f55a12f2c31d4ea53658 SHA512 fb414c492188f59e34a5f940e9f378cc841dd9de311738a0238980318261f51b869c30e1218e3219dabf8c438f28bcb9b10f751c07240b533ead537f4b6d8d4e
 EBUILD pytest-testmon-0.9.15.ebuild 659 BLAKE2B ef50cf0fbc5543e2f71771fb17341be2bd599a266ad97dd26c17a8abab228ba51ec17489c225797a5ef70efeb44ca42cc54684ba429c12c93d75687664625240 SHA512 3bb55478643257b10abe3f643817ce1063279a27e1380ce031de273ab1b60abfedc9054a8995fdced0eba08a4cce3a493b7133aaed53cbb17ec9325660185cc7
-MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
+MISC metadata.xml 325 BLAKE2B e9c9201fc83275c985d83c4a534f9c4b04b27376bd5678dc9bb59a30b33f1462e5096b0dad4d9bfcc7ba9d8ef443479f332aa1dc691e17f146f8227d9cd9207c SHA512 e8f8919dd90a8848a92a80c8ad84441ed550650dcf53b4456a934953c15502beb788a609ece7b5d1c0fc5a006d19a5a7b2e534fe1877e1ea39450ca0c2e47da5
diff --git a/dev-python/pytest-testmon/metadata.xml b/dev-python/pytest-testmon/metadata.xml
index c36c37139fad..d04e61e25d72 100644
--- a/dev-python/pytest-testmon/metadata.xml
+++ b/dev-python/pytest-testmon/metadata.xml
@@ -5,4 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pytest-testmon</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pytest-virtualenv/Manifest b/dev-python/pytest-virtualenv/Manifest
index 6ba1df6e5463..7a9ed47016a5 100644
--- a/dev-python/pytest-virtualenv/Manifest
+++ b/dev-python/pytest-virtualenv/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-virtualenv-1.7.0.tar.gz 15767 BLAKE2B 5ee65aff72c50c8facef682827f58a8053d658aa072f3a69d50d13335dda2da37ffc29af009b52a50349647a4a38e149ba1b9847115fc4b4c4f54f063198b14f SHA512 0463ebf44ae18ee50a60e421a22aaaf0e34f827ec8f21c8f0dc79cbdc253748f9d1e5b33e4f418b52f0d8fd45990e162bb6410686ebe9fdc02650c286901d474
-EBUILD pytest-virtualenv-1.7.0-r1.ebuild 799 BLAKE2B a74702b46d21aefaeb533683928d213e4db3b414429a53c990eaa43f2a756e07a72ef469458011f1ff309be27eaececdd952d8ba6c6dea4aa0e8bd7b40d297f2 SHA512 a035c6b14147df6c0bbca610cde347351761acb55820fe3450e8d417f34f33820042c04816c307b211e83920ccf5ab1723e1a99e9de9512fbcad2bacfb1d4115
-MISC metadata.xml 679 BLAKE2B 1b48d29c49745469783c9bc7a8ce2e18648f94cc377eae50f2459e642a2c21373f7782ecc8cb3bcbf9bec448d2487f47528d45af6de18a741bc7d6cd0eb6b5aa SHA512 0d01c6c2a0b1644ff0755a5f8822075ef96055c54b721b651b3dfcbb3fdeff342469de1a5057c5b69eb281daed6d8763d8cce4dc7b8f5d1bcac449551dd92724
+EBUILD pytest-virtualenv-1.7.0-r1.ebuild 798 BLAKE2B 20c9ef58cbd03605f652f22fc4b14acdd0aabd6829e3abc79fd6955db5d215323f7d8e05b67b000fbaddf1c71d4c2f1dd9c2f29ffb2cbe68874d68ef8cc7898e SHA512 7cb351a800a287386f0c898a2b4c4661171bd7a53cc14a0298927e346cc16daf7ac6d933d80d504750eb5748274f581a52dfb867bda53f9572b533489b315376
+MISC metadata.xml 682 BLAKE2B 21410f4e9b372ce58ae64da89ea42c2a3bddf24d8d24a33a7773a7e842183ab9ee568fcfe5e3ee6bc087aaa1071d009accda7306f4c7af1ed204acd777f87022 SHA512 466194c684eaed9b00ddbda6f8f2f32b4ecb9629f9bcfa4e1e081aefbfc69efe40b5bdea980fa13d90a5c555e76e4016ce8231f60372951744d1d35fedf46e57
diff --git a/dev-python/pytest-virtualenv/metadata.xml b/dev-python/pytest-virtualenv/metadata.xml
index 77058433cb5b..f49150e8b567 100644
--- a/dev-python/pytest-virtualenv/metadata.xml
+++ b/dev-python/pytest-virtualenv/metadata.xml
@@ -11,7 +11,7 @@
 			<name>Edward Easton</name>
 		</maintainer>
 		<remote-id type="pypi">pytest-virtualenv</remote-id>
-		<remote-id type="github">manahl/pytest-plugins</remote-id>
+		<remote-id type="github">man-group/pytest-plugins</remote-id>
 	</upstream>
 	<longdescription>
 		Create a Python virtual environment in your test that cleans up on
diff --git a/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0-r1.ebuild b/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0-r1.ebuild
index 5ca89becd536..2172a7193d4b 100644
--- a/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0-r1.ebuild
+++ b/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 
 RDEPEND="
 	dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest
index 289f60f54446..89388cf92b1f 100644
--- a/dev-python/pytest-xdist/Manifest
+++ b/dev-python/pytest-xdist/Manifest
@@ -2,5 +2,5 @@ AUX pytest-xdist-1.34.0-pytest4.patch 1839 BLAKE2B 6f16b51b8b8415390d66b5763afe0
 DIST pytest-xdist-1.34.0.tar.gz 66151 BLAKE2B ac5274e32b3ef6b72113efd4300eb6946a977e0e202d3383abcdbc022126b7806edb326ddc16abb1219e22eb091e06a9c39fce3031aaf5943d4ad653a47af142 SHA512 69e9877ee0268d71d7c0ca202ccc46b3ba1a9271f0e6e4ac4b76602833f9b7012364eb6924ae994e76c1d48d63adf1702d4c5e6ed5b75c52ac7ebae958210e24
 DIST pytest-xdist-2.1.0.tar.gz 66332 BLAKE2B ac3c19a32bb9153537edfcf55bc656011661cf0d166da1aba969055a398616bb5782534a12ba354175be722c070fcfb2013d58405048814a3d11434a314e38b8 SHA512 85c69d8e649a19de5639738eae4cb213dc7323d96883ec82f39ab51a196346edd9fadbaf97f9763ac0dea104bc123d521264a39d2701878edfa76ce7e5bb347b
 EBUILD pytest-xdist-1.34.0-r1.ebuild 1036 BLAKE2B f576f44fdb55876e9cf7ccaec9ce5ffeede2095111a48f2455da590cc4c053ffac094b21baad142dc9ed54c654af423b29c4f7719dd32ff49da2d2f149e666d3 SHA512 3dc96e04f982a62f24f9ab9b2748dbd1a97c486ae3feee09b2e6fbd1ae4af6910455c456537453fa48d3cb85e03ac09acd7d26512a054e3aff83b5dc28591f62
-EBUILD pytest-xdist-2.1.0.ebuild 951 BLAKE2B 13e823eb0e3cf6f9127a83aae3930fddc017480118c00da6e8d55f11cb24f4ff4adf016689fe0e4e31190076f75a9aa923fa798c6a85d75a21c91522ae3037df SHA512 ba729fe545ee36876d42f9525c9274d1fdf46c4727e20ea76d09e88fb4d34ff673a546760523c9d23d4a3a585fa33e0b1d580be01c72dd02ae6be0aa7a0cbf13
-MISC metadata.xml 453 BLAKE2B 9480ffb520fafac8b32ec407fb065a89b67c085c7474032528e6a7489fdb26d288228cb75a502e407d92f0e53283bda58c2632e552d4daf65d37b78d33b3598b SHA512 13ec72148a023c16de4b51f02f8a34f5a29ba26bae56aebd8a89ca7a90f249126f92096d138d41d770eb1053618e58679211f468e3136f594514a936f414b265
+EBUILD pytest-xdist-2.1.0.ebuild 1147 BLAKE2B 5f8b2db3dda86e53857ae6155e4c13ec868f744b9113c012ee961cd651584f010125d3ae3539deb5b3bab106397211cea17de81f8c506e9d1fc7e2cc50a4f7b7 SHA512 c9ac3c5c1d0e4d728e0edaa5ae122248a0c6d7ef426573e50274385b0ccca14feb3dc4a1112e00f11a23bf8529a036430b8f239cfde386d0c9cc407dd19ba5a4
+MISC metadata.xml 402 BLAKE2B 9e24660b4146f94ecdf375e3bd89a9ab01157ab7c7e9b37fa183eaad12edfbb6574ecef4a98e6079b3dd81e6614b5eb23b0bfd69c9468abde7bbc073e8ef44b4 SHA512 7fbab209b81bba0684b9dad109dc7ba64f9c496e5ad69fcbc659f9361aa131f6779a5419a54112b4ff1c2a63a9deef5f36791551165b1b4b7219c7a00fe93060
diff --git a/dev-python/pytest-xdist/metadata.xml b/dev-python/pytest-xdist/metadata.xml
index a8cd82139cd3..b6f38e562238 100644
--- a/dev-python/pytest-xdist/metadata.xml
+++ b/dev-python/pytest-xdist/metadata.xml
@@ -7,8 +7,7 @@
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="pypi">pxml</remote-id>
-		<remote-id type="github">metagriffin/pxml</remote-id>
-		<remote-id type="bitbucket">pytest-dev/pytest-xdist</remote-id>
+		<remote-id type="pypi">pytest-xdist</remote-id>
+		<remote-id type="github">pytest-dev/pytest-xdist</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pytest-xdist/pytest-xdist-2.1.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-2.1.0.ebuild
index de9789a944b9..27e096bc9919 100644
--- a/dev-python/pytest-xdist/pytest-xdist-2.1.0.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-2.1.0.ebuild
@@ -32,6 +32,10 @@ BDEPEND="
 distutils_enable_tests pytest
 
 python_test() {
-	distutils_install_for_testing
-	pytest -vv testing || die "Tests failed under ${EPYTHON}"
+	distutils_install_for_testing --via-root
+	# Skip a broken test
+	# https://github.com/pytest-dev/pytest-xdist/issues/601
+	pytest -vv testing --deselect \
+		testing/acceptance_test.py::TestWarnings::test_warning_captured_deprecated_in_pytest_6 \
+		|| die "Tests failed under ${EPYTHON}"
 }
diff --git a/dev-python/pytest-xprocess/Manifest b/dev-python/pytest-xprocess/Manifest
index 79ea01cfc927..1aeeab81ad54 100644
--- a/dev-python/pytest-xprocess/Manifest
+++ b/dev-python/pytest-xprocess/Manifest
@@ -1,7 +1,5 @@
-DIST pytest-xprocess-0.15.0.tar.gz 13512 BLAKE2B 97ffef1e63f50ad2a1651f1791663f99e39c8fd8fc63427534efa5d60c9a4d856b7e036cd03faed73a1ba609716595ceeefe63604403a2bbd8a13407612a6402 SHA512 d2c7f6859b1696a8cb4445396376ce36bdcfdc8677fd97def716f240ae243c954f4110a3e500315a7f0c7f7ab7c337bf6749cbd1df3485db9fb95f42c2ffd181
 DIST pytest-xprocess-0.16.0.tar.gz 17218 BLAKE2B 60411ed5af2add7f7c7f6b6e2074f9703cdae8a450c65eda483635a1cf8f60a3dbd84218d9e99bb3783ae00ba50b3449335df92397dab0fc7281ea72d3f5696b SHA512 3cf5d05c6693ebddc91fb2ad62eacd5b8f231e78ee82908b20268367649d6d73f0c1fbbf93a31f97feabe8bddf02cb176b2ffb9f6de4387b46cd0b97ad3c3eea
 DIST pytest-xprocess-0.17.0.tar.gz 19186 BLAKE2B 071063267d88d8ddd56c3b8ab7b2e6bebae321ac741e63336721cd13045688cef56909737c73b5cec27805b4f7dd93cdd7f467071966b3d864d0a1f270e821d0 SHA512 c85bb7bd8373b5b5119083fca46b8f173efe3b6f6cde5db8365e567e717f47f6f9230d2cf5ecfddb014aedd628aee75023f4da3077fa3ffb26b3c7bfc61d57c9
-EBUILD pytest-xprocess-0.15.0.ebuild 630 BLAKE2B 43440cb9b303a3c2abdc4f29eea0f8a37a05dda6030d72a9632fdc4a6b3acbb7327be5121cfa051143a104edb9c141e991c3418162e6ae811e07c639c83a6466 SHA512 0694a9b4e2f5dc1863d9b826eb043bc27b5e9b5ca3bbbbe15f5f90640e66f16ba781b12778ee7d6501e9c5d53eb7cd07358ba987a753d1df5eaee183570f3e8b
-EBUILD pytest-xprocess-0.16.0.ebuild 638 BLAKE2B 57a2292c5fc28288bfbee85a36e17c803b2b5ad0923c559cbc64d7546d2855b9f1041fffbb80870682ce8c7ab40e86e7915a9e4a3bf834fa43ad8fedae30d6e8 SHA512 15a917078d76247016db8108becdc434c944965b9e63e6939eefe976fb5942793010933a7534a507eaf6340aff99b42c25c2beb289edf851719afa0d525a01b9
+EBUILD pytest-xprocess-0.16.0.ebuild 630 BLAKE2B 43440cb9b303a3c2abdc4f29eea0f8a37a05dda6030d72a9632fdc4a6b3acbb7327be5121cfa051143a104edb9c141e991c3418162e6ae811e07c639c83a6466 SHA512 0694a9b4e2f5dc1863d9b826eb043bc27b5e9b5ca3bbbbe15f5f90640e66f16ba781b12778ee7d6501e9c5d53eb7cd07358ba987a753d1df5eaee183570f3e8b
 EBUILD pytest-xprocess-0.17.0.ebuild 638 BLAKE2B 57a2292c5fc28288bfbee85a36e17c803b2b5ad0923c559cbc64d7546d2855b9f1041fffbb80870682ce8c7ab40e86e7915a9e4a3bf834fa43ad8fedae30d6e8 SHA512 15a917078d76247016db8108becdc434c944965b9e63e6939eefe976fb5942793010933a7534a507eaf6340aff99b42c25c2beb289edf851719afa0d525a01b9
 MISC metadata.xml 421 BLAKE2B 616045f871631311e9310ebda14f2bcd936b7a721196f9312b6270bbf8713789329b56ba058cb412d31e68e91957666ce9f44043527efbd0842dece87ebb5f5b SHA512 4d5b9f41b7aaebcb87c8718a98b1dbb3df0f199a5f6940bd12e3504ff5080a0ed112b315c89e2af1a5a3220829879afa0cdf931828359ff98732311200b76b9d
diff --git a/dev-python/pytest-xprocess/pytest-xprocess-0.15.0.ebuild b/dev-python/pytest-xprocess/pytest-xprocess-0.15.0.ebuild
deleted file mode 100644
index 63ce134ecb3e..000000000000
--- a/dev-python/pytest-xprocess/pytest-xprocess-0.15.0.ebuild
+++ /dev/null
@@ -1,23 +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="Manage external processes across test runs"
-HOMEPAGE="https://pypi.org/project/pytest-xprocess/ https://github.com/pytest-dev/pytest-xprocess"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-xprocess/pytest-xprocess-0.16.0.ebuild b/dev-python/pytest-xprocess/pytest-xprocess-0.16.0.ebuild
index d9f406cc465b..63ce134ecb3e 100644
--- a/dev-python/pytest-xprocess/pytest-xprocess-0.16.0.ebuild
+++ b/dev-python/pytest-xprocess/pytest-xprocess-0.16.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-xvfb/Manifest b/dev-python/pytest-xvfb/Manifest
index f7a1ad61152b..ab30b23ce5df 100644
--- a/dev-python/pytest-xvfb/Manifest
+++ b/dev-python/pytest-xvfb/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-xvfb-2.0.0.tar.gz 6855 BLAKE2B 338802ccbf5fc0c9ab3fccd7c172b31867cc86869dfc50dbb30daf396ecd9865e71c6486cc96c2485e2d5b6195dc2eff83a033864f88e1b2c64a3937b6b48c84 SHA512 42c2119b2c529a45b5de9f8ac2781306cfb9f00c1d0e0e9045ed40ccb7260cb6f400683802ab845ce2481dcadfcef007c8417a481e9c04f14ee1bdc68244d391
 EBUILD pytest-xvfb-2.0.0.ebuild 765 BLAKE2B 56d9422573ae2d082f6726f9d5ee5845b2d833cf7b21731df5c16e0fcd6693e231215b55260fa7997b78e135f6b19185e1ee2d7d34730f2389db405fa6d7bd98 SHA512 e00ff840b4009968b0a9c73466eba0e7e6df57e9facf02cb294eb852db00bb89c1397e0a1ec72d9f2bc1910160e13e044d1aee43aeda63d96d48eb00f605d978
-MISC metadata.xml 375 BLAKE2B 393138e315b4eae4dacb9339fbb5766e9dbaa84b7482babaddc08d524fb8b9939f6622ee9c6d09b66c61ac270fcc483fac39996a12ba87ccccf7cafd4c6d36db SHA512 9a44b6b9de4d1a61d6af9256519473541d5513cef349c15178c025dee3aaaa3f6772b1be56576411a985fcd9c70029c00743d8f577be8eaec4c5a44646c9cbf6
+MISC metadata.xml 449 BLAKE2B c81ca6de80742154c839172120e31332b62437e108f53f5147003053ca5f162fb682ee8dd9e5f1b18a038a414fff1cf1aee012b852b90e71c8da8543deb8eba3 SHA512 8c4f4047aaba0f17409d085c33851698af87167a2256b3592dbf19daa4ef405356ff2109cda21a03ad3203bea7cdd897c767619795f0b2acfcdd55b7f2d1dc2a
diff --git a/dev-python/pytest-xvfb/metadata.xml b/dev-python/pytest-xvfb/metadata.xml
index d22e99d73577..0181a5d4c842 100644
--- a/dev-python/pytest-xvfb/metadata.xml
+++ b/dev-python/pytest-xvfb/metadata.xml
@@ -9,4 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pytest-xvfb</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 7c26d087148c..6bc261b04598 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -2,10 +2,10 @@ AUX pytest-4.5.0-strip-setuptools_scm.patch 674 BLAKE2B 4eab3e26423d81614223a88a
 AUX pytest-4.6.10-timeout.patch 1297 BLAKE2B 3a5b4005b1aff72b17a366283e692bca19ebd952ef1d5e10f6c702962cb20a83fec48cce5fb0cc35a8da47df2370e85879bf01b9e95f4c271d2d3241f9ea9545 SHA512 f1d2270644e43dfc2ff31ed900456c5707ea19a83447ab80a4d3013e44db36f726676917156930385547f8a75bdbc8835d46d7e6f3301fd51f187c281a5425b0
 DIST pytest-4.6.11.tar.gz 952305 BLAKE2B af07adf5e8fc614b1fdb7b5673fb9c557ff0dd3f22e2f3bf853c643c5c8bd38f307018579299b700d90034a826db73a3e569857d6d6f7ac6646ace894b35a39b SHA512 6fddf4944bd9fab83024aa2d338d54aaf3d164bd5c7f634357376f3b0d2dab6a43d784e7fb567236c2d2f029151c5d9e2cb36c22e9b551c2c8823c52a2246e9c
 DIST pytest-5.4.3.tar.gz 1022353 BLAKE2B 70d4f23cbbfc4c4ce63c512ee0a01556973761a6d3ebb71a6d9ed4fb4a4a21531e1b151ed0e4c5e56e5dd3243a1a272441f17c4c2c4e3b0b19c24654b74e8e52 SHA512 0a07d4f4f791969c6f21961a0ba0f8c6670e5870c6cc1cebf93766587bb9cb3e10db8e57f0bd33dd22b275f3aad7aa674949f124ac80e0ccca64e35be4beee4e
-DIST pytest-6.1.1.tar.gz 1084076 BLAKE2B 61eb5efcffbd5a623c7021e37bbe908522fcfbf42ac56cb45fb7e10e0cd30e845bb8a6c563e86bbff47fba1f0db72f1451eb0bf86862b7e150e29be6a2e80967 SHA512 fc61028a01187f6161061a0c2fc392dd719586780a49eec037a72878de00bc33a81c1bc0e2be01be52b30c7eeea2c590d1a4ec08cb14a955bc624478118889b0
 DIST pytest-6.1.2.tar.gz 1084943 BLAKE2B cbdf29c54118b5daf699f11fb674d37d5972a163a7a53f42f6ddf9224e2d8d9e84b9a88106d5a77e70f470ccbffb15c2cf9a939be69bc0a2cab1fc4c76054562 SHA512 6335e994c5273881c8d1c334fe6bfa9cd0a3e5c251f3d6a9332f7f7c1427e6560ff48d8f235b307ea5eb53491072daf30c41f566bb67b304354fd88d286c61b1
+DIST pytest-6.2.0.tar.gz 1101619 BLAKE2B c59d5c23c70aaa7670eb0e96cd5d57c6cdf21f2cdfacc2fb9c01a6baf211f85e5f757d7087589db2dc9a6f0b387ec7b25da5816d4cffc86f6e2c3c08b9f07f59 SHA512 58315bb5f9a696f5196da08912a0f32fd367ea11987d37ff74b0d00d961bb706e0d3604bc7c25a762e4ee66bd46ef4389b50eca11b3109406c169aefff395d51
 EBUILD pytest-4.6.11-r1.ebuild 2473 BLAKE2B 4a5edd72d94553b553730a5caa2c17c25826a5be58bce6273d39d2a010a70c1fa1f8acb0751c3fe5185883a94da31ecd7e772f606c82d8d99b639804bd49d5d4 SHA512 da60063475df3b7e9e531b234e486bcafe7c1e926f58f7ebaa8e38cb02233629160aa20a9b665fddb83e50f52b0b46702b8a80e65195af4ff7b3e939927db9cb
 EBUILD pytest-5.4.3.ebuild 1940 BLAKE2B b17bc0f3efe70c149ee494d2528f8e16a839c4cb2965378ab6c8b37e3c1b295bab253edd8410f6f2a69cbeb288d6299898320d387330e2d7b5b31418e985a0d8 SHA512 d99fa3064053e3ac99fadce4b23749e16dc2d9e6658f3ab07b1e68c1885d9fd243f4ab4f5462e127b9afdbb957bb498c41126ce79164a31cb2accbbaa1f4b7e9
-EBUILD pytest-6.1.1.ebuild 1638 BLAKE2B c43166fa602717e4e88285aa5066bae519e881edd4aa4773d8dd9d1edccbf45b3778921b46a2e02fddf288cf3eacfa26581da70d49a3ea7e23643eda167da36f SHA512 252999b9f78a253bf152895550ed60a0c69b66a9de6309b8a98c4f5de42e04befbef39f65ee24f9d59def9a668363e4472f806eb3bbff5c2b5a3dad1c447c1ab
-EBUILD pytest-6.1.2.ebuild 1656 BLAKE2B f7c0cde785cb6eeaf085916a50b4448116e5b05733a771682de619253b827ea157d25e0936c576807281c196f9f1ea568b088089a7c7feadb74c7668399e087f SHA512 3baf9e0cf2a554ca9d352e7fef25a15b625483e1142755f0f5f64bf39e1eaa4d214128cbdd7f466deeb1aaa59b288a96b51d2e9b92711c50de58e7e910ffaaa7
+EBUILD pytest-6.1.2.ebuild 1662 BLAKE2B b75f29897f6dde0657c243ef4e039f364fc7ca3a942fd5796f4bd23e35ad48122224016217702037a6ccdbcb7e5b7d7c10023e3ec3dcd807828b33b6c6f3d5d9 SHA512 b0b03c1b9ac2970ba93669862088045ab117e3e9832f626ba08c8fb157379370771f2d5aad2153e55678742894efc54cdae9f4a51a1027b7efbae5c300cc443d
+EBUILD pytest-6.2.0.ebuild 1686 BLAKE2B 6256ff3f90b0dee2deabd17b4a3e8bc30066c0b0d31f6d11fadd8c77807cb27e04b1a465ddbd1967891c7558321920703d1cb9b9b03c4becd11790aa87740ecc SHA512 ef65bb620f290a9b61c92b6569b19f73d603d7e120ea1d61238f8c7da0568a59e170c240e3d910f10fee2c9d4ca51f8f597374bf09684ae10136015c003e3c6b
 MISC metadata.xml 333 BLAKE2B 2155c30735de72aace8fe3e88a16c011f3961b4b644d761be31c45094f243f1eeeac1803f5a74219198039dcf1f7474531b2ec814a3ed591c59fd6d9ad5a914a SHA512 c59e04710dd640b2e7bb0214e52b05ec50367d895d057886ae9bf9342312006e7b21f5625e1c4f5d7a9e12a7f7b64a968e5371f8c2c45a8ac8b1c8ca6d39b10b
diff --git a/dev-python/pytest/pytest-6.1.2.ebuild b/dev-python/pytest/pytest-6.1.2.ebuild
index c10d175798ea..b625656b302d 100644
--- a/dev-python/pytest/pytest-6.1.2.ebuild
+++ b/dev-python/pytest/pytest-6.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pytest/pytest-6.1.1.ebuild b/dev-python/pytest/pytest-6.2.0.ebuild
index 80ac5b35a8fe..8bbfc6be1bf1 100644
--- a/dev-python/pytest/pytest-6.1.1.ebuild
+++ b/dev-python/pytest/pytest-6.2.0.ebuild
@@ -14,12 +14,12 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
 		dev-python/importlib_metadata[${PYTHON_USEDEP}]
 	' python3_{6,7} pypy3)
@@ -33,7 +33,7 @@ RDEPEND="
 "
 # flake cause a number of tests to fail
 DEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-3.4[${PYTHON_USEDEP}]
 	test? (
 		${RDEPEND}
 		dev-python/argcomplete[${PYTHON_USEDEP}]
@@ -55,7 +55,7 @@ python_prepare_all() {
 }
 
 python_test() {
-	distutils_install_for_testing
+	distutils_install_for_testing --via-root
 
 	"${EPYTHON}" -m pytest -vv --lsof -rfsxX ||
 		die "Tests failed with ${EPYTHON}"
diff --git a/dev-python/python-augeas/Manifest b/dev-python/python-augeas/Manifest
index e61e958b935b..72840a9a5350 100644
--- a/dev-python/python-augeas/Manifest
+++ b/dev-python/python-augeas/Manifest
@@ -1,4 +1,4 @@
 AUX remove-tests.patch 417 BLAKE2B e3a0e4b3fdb42b395fa336461f84feea4dac252399ff266231121a48e659fbfad671d318e9a3212f77939f7e609b3df71363abf8f9f2450e087479869731720a SHA512 3b399e3e85cf12bc5ee2db3d53594b2eee5ba8809bfaa950738730194c2dab16c8b776100b009bdbb520020b0ae276c8b13291139dcb1d48e0887bec72c80679
 DIST python-augeas-1.1.0.tar.gz 93657 BLAKE2B 21d2713d8e11552cc7f0191d2b8f7805b223f5dc9478b89b39dcbd325ab354cef0bfc0314852dc2b071b3b061319b4e27904c0514eb6d6ffd4e39cf7ca33d1f9 SHA512 34e4e98219b9146ef843d94c2e854e951a9b7e81409e603e77e7defdbb8765c013a2c869a4f5db2244352ca35656e18667a0210dd24099cb3e4552a04b23aef8
-EBUILD python-augeas-1.1.0.ebuild 597 BLAKE2B 86cfcb6c43334384b822d56beac8fcd4aed16e67de136d4a1d38cc6193e2cc2808925f7b86f07ea96b22973e90633951c808e12be7e3941f33312ff67f4704e1 SHA512 18c5f8536d439c954cfd8635f497b10dbd09b96370173d2ee7ceecad15a7aea9d067d67b9a59feb72fc355dc101880a2bdfb39514ffe3649e16eff9923021e87
+EBUILD python-augeas-1.1.0.ebuild 601 BLAKE2B 4ad01cbdbbb0d5fcb31cbb5def61e8a2e4ca1de934b1bab73d9082b74b735fb4bdca52f6efd12b2c3ded7af303876bb0229e5fd6b271fb00d13d5c60e88264f0 SHA512 434774a92c0e9c25a88ac13326c015aaebae8a8113d377a14709f53f136bdd96ccbe7f2bda976d374cdd612fb60fe6b5d28ded38234de9e52c483fcfb18a4190
 MISC metadata.xml 422 BLAKE2B 32ea953c135e9cc5fd7fbee8f5371975f0ec23cdb87b257d87d8b969d7d725232db169a65ece36e1d9765906c8dad54f63cc47ee61d554ff18550b403be1f498 SHA512 613157be0df0ca791d4ceef9caca1d0e1724716125321b9672778e984b9b87070c05af2322a3d45969e6211a3671c4e0383ba699f5d5854ab491d5c6113fafde
diff --git a/dev-python/python-augeas/python-augeas-1.1.0.ebuild b/dev-python/python-augeas/python-augeas-1.1.0.ebuild
index e66ad08496e3..7a50ebec958c 100644
--- a/dev-python/python-augeas/python-augeas-1.1.0.ebuild
+++ b/dev-python/python-augeas/python-augeas-1.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-axolotl-curve25519/Manifest b/dev-python/python-axolotl-curve25519/Manifest
index 24f587bf1f4c..6beb1af9c41f 100644
--- a/dev-python/python-axolotl-curve25519/Manifest
+++ b/dev-python/python-axolotl-curve25519/Manifest
@@ -1,3 +1,3 @@
 DIST python-axolotl-curve25519-0.4.1-2.tar.gz 100957 BLAKE2B cda4fb7ad7c78df7465a952e2b5f3c6616849876bc1c8b72dde08042a655c2b86233329d311f6bee1bfc6d2b32926968aafc7e6204320209c2c1bd008f1aa361 SHA512 cbc7c6caa47a9a811640c247a1be727d7b1b68bcdb4c5336e02b4d1eaf9fd2c57b7438b0da466a379a1c0f3f146756b9b7eea3c9b7945ce88478d4bf0b8a1e0d
 EBUILD python-axolotl-curve25519-0.4.1_p2-r1.ebuild 542 BLAKE2B 118da6329dfd7f82e3789f4a553a12e6261bf8911edad41c36f03b97b92b1a151b704cdae715c886c318eb9bf5bb8a3b1704c55c90555dcc56d87064d0789983 SHA512 0861d00772873bf608ad1bce3ff5f72d3db7cb28cc579a0b405345c103437f2749e775778f45c50ca97c029cb555058d75d2934e0cca92ea8aaf58db48c4ed7e
-MISC metadata.xml 758 BLAKE2B 44d2f74b77f128d9a539067c204c0fe8463f252c9234dc57dd10258e75ddcd9667876056dca4f838164cc64bd89a54e2d4de100ba21df2b5b11f92087ab9d08e SHA512 a6488a0bdf2401098547a3a48529e91bc9dd0144d4b24142ae37470e703a1fb9d152686bf908522eb44b3935c644357d4fb8d33285a647d3fbf1da6056f054b9
+MISC metadata.xml 821 BLAKE2B b58ea7e5dfaf7da6d01671cc94267ee94c38ee5ca5bb88f7364a48bb32468c11c36ac2f8749e019a739450a12df8e5dc69f7459e05d7e8bb2ef9b207f46b9478 SHA512 6bbec8c72bb8f08be1923d7ab5da3748d3cc69e0e04abc6b051678725efea302b8629cc47ba9d3afc068daa27ba5cd3998b9743752cbe80380a1a4d5c8770e38
diff --git a/dev-python/python-axolotl-curve25519/metadata.xml b/dev-python/python-axolotl-curve25519/metadata.xml
index a516f93c104a..2ca1a23bb1eb 100644
--- a/dev-python/python-axolotl-curve25519/metadata.xml
+++ b/dev-python/python-axolotl-curve25519/metadata.xml
@@ -16,5 +16,6 @@
 	<upstream>
 		<bugs-to>https://github.com/tgalal/python-axolotl-curve25519/issues</bugs-to>
 		<remote-id type="github">tgalal/python-axolotl-curve25519</remote-id>
+		<remote-id type="pypi">python-axolotl-curve25519</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/python-axolotl/Manifest b/dev-python/python-axolotl/Manifest
index 84397545eb5d..5cc41c8967aa 100644
--- a/dev-python/python-axolotl/Manifest
+++ b/dev-python/python-axolotl/Manifest
@@ -1,3 +1,3 @@
 DIST python-axolotl-0.2.3.tar.gz 52139 BLAKE2B 8539f4ff6d9d7e57965cdbbd510f499cf344490091fe56b013d1ab60986092ac8a7a76248624993692077020043ea21c1d9448ecf9b76a698b43da4e014f37ab SHA512 1a10dc9df2f95d19b49909d4d136b5266aae19e24ac84f8b263ae7d4de18f77353c737616ac0648b600e05699a90d348f95c6c1659849986becefb4a0277fc80
 EBUILD python-axolotl-0.2.3-r1.ebuild 645 BLAKE2B 39e6eefde516865872dabaca43dad17df0fa7e85e73a9436697a82bff6e9ac7aef4f6f39deacab254cd120fd976e03b7d076bcf3ac23907d9786c21e9352725f SHA512 d3973fcb5949fc6bb9c02eeca610daf195415ad45d1f78cff480c6d8068a72046a46c903361f81fc8ca69703fc9c44115e239545ebe42636ca1b563728b6e8a1
-MISC metadata.xml 730 BLAKE2B 0c9161ec83f8400b375a9932747d552fce0e320176addf34523d72f0592302e961b4ee2564b405fe539d0f68d383811483757ec3861e673b3a9ea66c4da4b7d6 SHA512 efde207f98e3bb3d15a9f09f87822cde14df1fc4d19cf88cc45434d7ce32ce20e5277cd97b59474e7f6f7297cc1dd04d765ae258cd35c28b95ac86fc93e0ffbd
+MISC metadata.xml 782 BLAKE2B 0053ca1ef77a9b8a0adada68f3b8ac61774fea55d71b730f98ef7f1929fe5f00a5df8863d4c272d184bf9181189142d5757c67548855bec0ef0907397ce57fc1 SHA512 adabd12c0d63ccfff8925cf272a8142c2a87ba0ba74863df20a9c464f550134e9f7f87fca09a717013d3b3c27632a10e76bc854e81c179829bc1c880bf87c5e1
diff --git a/dev-python/python-axolotl/metadata.xml b/dev-python/python-axolotl/metadata.xml
index 1c0ab210519b..de730ccdbca8 100644
--- a/dev-python/python-axolotl/metadata.xml
+++ b/dev-python/python-axolotl/metadata.xml
@@ -17,5 +17,6 @@
 	<upstream>
 		<bugs-to>https://github.com/tgalal/python-axolotl/issues</bugs-to>
 		<remote-id type="github">tgalal/python-axolotl</remote-id>
+		<remote-id type="pypi">python-axolotl</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/python-blazarclient/Manifest b/dev-python/python-blazarclient/Manifest
index 5be6d49240de..6adb67bf2a62 100644
--- a/dev-python/python-blazarclient/Manifest
+++ b/dev-python/python-blazarclient/Manifest
@@ -1,3 +1,3 @@
 DIST python-blazarclient-3.1.1.tar.gz 36460 BLAKE2B b19595a3cf52da6d298e5006eada7a68c28f396c8143bbed2f22b45e910d136b54bf3d3fde95bd4fc02887bffd206d10629e923e7d81289af643e44b751c0926 SHA512 91cf8004f83494299e11d8c419f183c45726a1b9baec09ffdb719ff8db3cb91967c24a4ac684e227c87015bc00733b03fb132e34fe2fdc773164373e3fd10561
 EBUILD python-blazarclient-3.1.1.ebuild 1089 BLAKE2B 2f1d6f1377c5047371dc7e576a460736c4bf322795dbd0b6c8a899345dc7857f8699a092ee8432561d026d2dea22f10c8c30d6e9f63c9d411088327efb56b50b SHA512 13ce6e1287b35d2557964d19d0e531841716a3602e29b65ace58000c6c2a0c13c2c6ec832b97f147a741e5dd9aaa30c87920267dc2f8f408b6082f721ea33b1b
-MISC metadata.xml 357 BLAKE2B 05722f76dcf8c454fb3eb76c2b98cccfb7f2a3d67a72a7e5d79a5444dc89e042261a711d89ddfed8c3cd705bc266b1a17a5372bf59207090c8f856998c2a267f SHA512 1fb9193b49c08c22fed7e498d31551d5f8afcb0551bf63bb9ed605a6b39e5e059276739170b39765ae56ee4faa42fbda892fd54363955a35f3dd874968cceae3
+MISC metadata.xml 439 BLAKE2B d2a103b31aebdcf4046a8dd8ccdb7b44343f4107d2191e51bbabe121876e0d681ddd7add4162e0f2822b9a2b8fd08a7ec4235c73b72064106eb81768535b823d SHA512 1f66bdd4e2f96a53ee0b6f0593ddd6b2c0d5b05d118948e0aa2327e6cfe3c67c6a1f74dc3d1721856510ecf849d8dda1db6f5cee12c9351bc6f49cc93e8a9000
diff --git a/dev-python/python-blazarclient/metadata.xml b/dev-python/python-blazarclient/metadata.xml
index 631e40d11e7e..1d7688d79608 100644
--- a/dev-python/python-blazarclient/metadata.xml
+++ b/dev-python/python-blazarclient/metadata.xml
@@ -9,4 +9,7 @@
 		<name>Matthew Thode</name>
 	</maintainer>
 	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">python-blazarclient</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/python-debian/Manifest b/dev-python/python-debian/Manifest
index 83db6c017b19..0bd16d012178 100644
--- a/dev-python/python-debian/Manifest
+++ b/dev-python/python-debian/Manifest
@@ -1,4 +1,4 @@
 AUX 0.1.36-disable-apt-pkg.patch 6718 BLAKE2B bd4cff4d6beb2ac85c2bc9c3b223774e9579a5d4d13ea5ce0eed55d9049a13a47dae712ee7d6165d7ab562321741bf4cc7476512ca7cc38ee23772e4855f69e8 SHA512 7937c8f21fb1e352c707cc87f6de4f6d9393ccd551007dc892ff6e2824c22bd48a66fc3c7ef718992d545b5b15f146b460ec09ba41e16f4a5db3827f30068e5f
 DIST python-debian_0.1.37.tar.xz 308568 BLAKE2B 7747ed21d3d6e06d5342ace6de83b79a93c76e44e8fd6d5738575e154f6d55dacd5dbb27d0210fac6f0a9db95b6d95b1fb9106da64ffbe7f77ec9d1a3e829d49 SHA512 0c13d6ee008bdcdfc28ac35d031a8486994a79a90d6b817349f09936c798211333604fd967bfde720fbc6b089bbec8e52b8c0977c430517e6f8c23d370fdff7c
 EBUILD python-debian-0.1.37.ebuild 881 BLAKE2B 196004371b38b800636e761459638d652b449cd788c4253c6d270aa75bf8a4012661be3e36278df48d1d51a598018755dd023d561c85efd9e609ee551faf18cf SHA512 078a9b6b90ed8fa1400e289339ab303c967aba2670dff3cfca7d1810c84192a8220873f5cf708e81ed9cc39b22a17c0bc4c98baeed946c259b6616b30137d783
-MISC metadata.xml 371 BLAKE2B 5d95aa1431071bcc0cf40ab630f52db4e4fc5e6eaf38e7ecaa3e5fbf605086093918d8ed976d73c4333bf5060f07dc9cb48e2458e5db73d612881fefcfc1832b SHA512 53f76124947b2d33039974c9330518fc64e44a20aa4c65f674a3a3cc96c143f6bfe170b267981f081420e9a503796fdc20b02593fe94a0b41387e1ab1a6e464a
+MISC metadata.xml 447 BLAKE2B 3a50201209da0fe9153963a3c84fbfcd72eb2a9065c6ef2dc6d21436d12269d6188e7b5c3bf88688e91bdde0e8f33a1adf9d11e084cca4ef796435655ec32765 SHA512 54c833fe01cfe54156de60c39d5cab5f9324074ddb2efd0c8294cc55d3ef599c0c65e911855c93bbb4f42cdec489dc5b337b0a0a53113816110321ea291538e1
diff --git a/dev-python/python-debian/metadata.xml b/dev-python/python-debian/metadata.xml
index 76f69654b265..173ad6be66eb 100644
--- a/dev-python/python-debian/metadata.xml
+++ b/dev-python/python-debian/metadata.xml
@@ -10,4 +10,7 @@
 		<name>Python</name>
 	</maintainer>
 	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">python-debian</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/python-discid/Manifest b/dev-python/python-discid/Manifest
index 45608f797f32..50e5b25b9e27 100644
--- a/dev-python/python-discid/Manifest
+++ b/dev-python/python-discid/Manifest
@@ -1,3 +1,3 @@
 DIST python-discid-1.2.0.tar.gz 30756 BLAKE2B 616613de23b66adfc92227a9f36b710649f2a419ffd83443766ebcf1dbfaf528b7d933011bcbdcd19f5092726b81e40d905a62a64262a528dfad89e561210992 SHA512 239cb608508e94109aa9b8b582bc3de1fb9408b508d56698d7f17ec9ebb0d37c1fb76557d98b6d194c1532e3047efcde3adc5d6e9634bc87533d331423a7f19f
 EBUILD python-discid-1.2.0.ebuild 552 BLAKE2B f22b7465ac859a3236c12d32623c7c585ed695f658a80ebf53762d161f5a8458af5bc76248608e0ac7ee8875567a37ee6e6df96041ae6d4158cfa97d442ecaeb SHA512 d9f118b647445a7ecf2f7488334a64703750b305b9444c34e8de6a946f98ac6cec3495481175e1ff13df3aa07483ff8a88057cd004088012a7c45dab98588373
-MISC metadata.xml 336 BLAKE2B c6fb10b79d120db82b11418fa0c99466b7a34b26bfce044216ccbcc7e2fa7fd17716c3a5d1c64c14fba22452943700ffb691592bf9255a6a89b028a43ecce56a SHA512 1a863be4ff2f8741d43bf7cccc8e18e678abf401faac599a32ca363444376ecbebcba02706863d1b750d695561047f99a8777d34ed62ff5a05ed6bddf4e6f5f6
+MISC metadata.xml 370 BLAKE2B fb7b7810115818be8b49cc15bad4e3367befe9e757256622855c8fe3960420259458d65c0cf04b2c81bd3d0f6d46b465c35ecb0486ddc5dd14d27714bcf3b9b0 SHA512 aa8305f7acf09afd075d1e3729e537b4aadfecb0b8ea84c21fe428c09cd112fcb9ad99a389a2c6d5507836977a3e32573c4dbb07737a0d781cdfe2c0ab91b741
diff --git a/dev-python/python-discid/metadata.xml b/dev-python/python-discid/metadata.xml
index 3a7e5f5b29a1..6d4f57f90d9a 100644
--- a/dev-python/python-discid/metadata.xml
+++ b/dev-python/python-discid/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">JonnyJD/python-discid</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">JonnyJD/python-discid</remote-id>
+		<remote-id type="pypi">discid</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/python-docs/Manifest b/dev-python/python-docs/Manifest
index 75ab995b940c..4f7404743da7 100644
--- a/dev-python/python-docs/Manifest
+++ b/dev-python/python-docs/Manifest
@@ -1,13 +1,11 @@
 DIST python-2.7.18-docs-html.tar.bz2 4634932 BLAKE2B c48e2dede15d8186231acf65709641e0844c42e924262d6ee21a55e515aaf4d023bf394681bab780ab83998de9f409685e2d5870506810432145acc6422eff9d SHA512 db39390577ec86f13c9b6b57c01cba36fe9fd89092a773dc94f1a6a19d912759d097c4d80e765d3657b572abc731c1da9e7b4cd4c38065cd444606b906744abe
 DIST python-3.6.12-docs-html.tar.bz2 6013089 BLAKE2B dc1c9f702bdd8be619c3cd6fd0f8cab022b8d7542ace7a7b7f63b9642f693c63b036f03248cf7ea0108ab7e33655379ca906c8ef7c35d8242517ead721a83778 SHA512 da28da84f5e8f889f328fafb4d17beb6cfc52c5703bcf5080cfbaea552f414d6f0a682aaacb2f04fa32e9453a1bdaae8ff108c38a4486170bd0edf1efacafdf7
 DIST python-3.7.9-docs-html.tar.bz2 6285801 BLAKE2B bc76a90bed3f9126a63fc76bc7ec858b90dcf827eb0af19652ee987aa3feeef9de71be0e14b33f98ee5733b9eeecd3d6ec01837fcbab31d505e389ea99d6fd0a SHA512 243327bdcb85b696fccf20b3cb841b398a672f07e34f441323418651ead58ab3346eff39e78501130b5d97e5d87fb72c945a9c4b9082b26577f33bd095791d55
-DIST python-3.8.5-docs-html.tar.bz2 6562020 BLAKE2B 29a375c0b0be6bedc7d52c15e038b1d150940a0b6185490bdacbce5822c6e88c49124a293a85ea2c08642fcdb99625986ec26ca1d712184988e02729f35e17aa SHA512 db9cc21223bc3b3126140e30c7731152816c61fdb647787c64e138ec882838dbc69fce8a4012ba389bc8efebdb2e0efb5e1b0a6cd652a8b9ad20bb021b277de7
 DIST python-3.8.6-docs-html.tar.bz2 6578280 BLAKE2B efdc62b2d570cbe7e69be1cf118250ee89f1b09af7e7db306970e764dcc9e6f20bda9230fe934ecc0891a1d79370294bc42170713b9471d05f23a468f09015fc SHA512 be0d61a9556fbdd24ab124cfdf220b3bdb537cc02d5896f8f4c75cb73e3cfd5c2947c060d049b57bf5576b4b2d1c7f0f3987070d70ce883dea023e1feab1a630
 DIST python-3.9.0-docs-html.tar.bz2 6771373 BLAKE2B 301b8687043277a3d11dc497985769efdeaf33f8af2fc3d52b8a0b50322851402c1a1b273e782db6bd7ac51bbd94f7345c0995d0dd4f4d37bce10351620c6f6e SHA512 d04957f4895ab8f6bef8467d8b5282e0b3e5c453e2168c25123ee7aefd7a3d6d8b918e9f455bbf82913370a00181b8c00998ec2ae67c763aeda237c5b3a42097
 EBUILD python-docs-2.7.18.ebuild 626 BLAKE2B 56e37a00df4d8e75d59546d78e625f73f68c31b6f34659cf889ad3677306c85ed1a594200fa7d9421fee88727d52462bf8a4df982f66e214a1a038c1281748e3 SHA512 5dcca24641374fdfb531306b64b929ec01c8876025090cc304cc0838957bcf09725826328916534b75e3fb9700a58f30b38227fd24146be69005c6e69e9f2fa9
 EBUILD python-docs-3.6.12.ebuild 626 BLAKE2B 56e37a00df4d8e75d59546d78e625f73f68c31b6f34659cf889ad3677306c85ed1a594200fa7d9421fee88727d52462bf8a4df982f66e214a1a038c1281748e3 SHA512 5dcca24641374fdfb531306b64b929ec01c8876025090cc304cc0838957bcf09725826328916534b75e3fb9700a58f30b38227fd24146be69005c6e69e9f2fa9
 EBUILD python-docs-3.7.9.ebuild 626 BLAKE2B 56e37a00df4d8e75d59546d78e625f73f68c31b6f34659cf889ad3677306c85ed1a594200fa7d9421fee88727d52462bf8a4df982f66e214a1a038c1281748e3 SHA512 5dcca24641374fdfb531306b64b929ec01c8876025090cc304cc0838957bcf09725826328916534b75e3fb9700a58f30b38227fd24146be69005c6e69e9f2fa9
-EBUILD python-docs-3.8.5.ebuild 626 BLAKE2B 56e37a00df4d8e75d59546d78e625f73f68c31b6f34659cf889ad3677306c85ed1a594200fa7d9421fee88727d52462bf8a4df982f66e214a1a038c1281748e3 SHA512 5dcca24641374fdfb531306b64b929ec01c8876025090cc304cc0838957bcf09725826328916534b75e3fb9700a58f30b38227fd24146be69005c6e69e9f2fa9
-EBUILD python-docs-3.8.6.ebuild 635 BLAKE2B 65e9b1107639426d2bb5c56fa323ca49a7aa584378f2ecbfc521e38fe3629e039815843001ea0b8e484f51288543ee2b093013b22491091b0a98ca155c6633ca SHA512 d1e6f0e50158e757d64bda589ad07589761ada99de48f83236665eb958f83baf952abe3b44180ba4b5ca30497090ad4912a602b2f8e4ea49bf11b53de11181be
+EBUILD python-docs-3.8.6.ebuild 626 BLAKE2B 56e37a00df4d8e75d59546d78e625f73f68c31b6f34659cf889ad3677306c85ed1a594200fa7d9421fee88727d52462bf8a4df982f66e214a1a038c1281748e3 SHA512 5dcca24641374fdfb531306b64b929ec01c8876025090cc304cc0838957bcf09725826328916534b75e3fb9700a58f30b38227fd24146be69005c6e69e9f2fa9
 EBUILD python-docs-3.9.0.ebuild 635 BLAKE2B 65e9b1107639426d2bb5c56fa323ca49a7aa584378f2ecbfc521e38fe3629e039815843001ea0b8e484f51288543ee2b093013b22491091b0a98ca155c6633ca SHA512 d1e6f0e50158e757d64bda589ad07589761ada99de48f83236665eb958f83baf952abe3b44180ba4b5ca30497090ad4912a602b2f8e4ea49bf11b53de11181be
 MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/python-docs/python-docs-3.8.5.ebuild b/dev-python/python-docs/python-docs-3.8.5.ebuild
deleted file mode 100644
index 2804f868635a..000000000000
--- a/dev-python/python-docs/python-docs-3.8.5.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="HTML documentation for Python"
-HOMEPAGE="https://www.python.org/doc/"
-SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
-S="${WORKDIR}/python-${PV}-docs-html"
-
-LICENSE="PSF-2"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
-
-src_install() {
-	rm -r _sources || die
-	docinto html
-	dodoc -r .
-
-	newenvd - 60python-docs-${SLOT} <<-EOF
-		PYTHONDOCS_${SLOT//./_}="${EPREFIX}/usr/share/doc/${PF}/html/library"
-	EOF
-}
diff --git a/dev-python/python-docs/python-docs-3.8.6.ebuild b/dev-python/python-docs/python-docs-3.8.6.ebuild
index 16f1d2327d67..2804f868635a 100644
--- a/dev-python/python-docs/python-docs-3.8.6.ebuild
+++ b/dev-python/python-docs/python-docs-3.8.6.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 
 src_install() {
 	rm -r _sources || die
diff --git a/dev-python/python-dotenv/Manifest b/dev-python/python-dotenv/Manifest
index 041b4c9ded2e..ed76a33f5755 100644
--- a/dev-python/python-dotenv/Manifest
+++ b/dev-python/python-dotenv/Manifest
@@ -2,4 +2,4 @@ DIST python-dotenv-0.14.0.tar.gz 29029 BLAKE2B 33db159192faf9b74439b5e98e2b9a090
 DIST python-dotenv-0.15.0.tar.gz 30008 BLAKE2B 1a406145f0d0497aa037dc95b80fb04854b2889ba4014e4689a24b142d5d71c49d24ac60406f8b2dc873e661c19e36604ef58eb03c7bc9f890f6d4561be199a6 SHA512 f1f16d2688041259027b12920ac5f47c2d1d96cfc3ec8a362a05ddfb13fee2cf4926c20ad38eda521fcafb6eef8d7895d86dedadef1b1ea2ecd7e33734b07cbe
 EBUILD python-dotenv-0.14.0.ebuild 842 BLAKE2B fd90de3669b9ba35fff65bd181d1cadcb716a29a9eb3c4d03bd69af904da243de5013705653aa693b29806be05479f0cba385feff72559b273be9f148ba2733f SHA512 39817ab53ad40ba1ef9ffb0bc3bfd6de23b55e2560e039cbeaae05a9c2a0d670dd368f8830aa25f57bab899b176dc735206fa8a2c658fa40449cf9c6637cdd0a
 EBUILD python-dotenv-0.15.0.ebuild 844 BLAKE2B 04ffcf0f214faabdcf842d2294a757be9ae5db4f2b70ff05b73761750d25934da350cae01f5fb00b42049e9d8c9e2bab149a1b30ae17591873ec5e046789af14 SHA512 3ef07ae1fc7a2554a14d39db75f3906a9002ede7e41283e5c4599fd29e30b03f1017b7994c5a0f3a5b80703d12b5cef901a3e0d233c325a0e8fd5c87379b823a
-MISC metadata.xml 365 BLAKE2B be359f891f6469f9d650dd2d0ec29e0641b3313f8dd5132462a3385d557a6cc72aab5fbf59f416c98239973630f8fa9c6e7d926b6cde078bb6535de322c033b5 SHA512 7eb826c13ed20a90b7317fad1a4647a8b52baad287c0286c3b1005c7d0ffbc148d376c8e7c4e2cb55a9af66aba6169f9a680e0f4eb8e8ad3fb7e55fce01b4b8f
+MISC metadata.xml 441 BLAKE2B 5735fbcb504ce02de58403da4a85a52ff277b03924d0ae950ddc05228d39fc4b318f18a0e72f72a8c500c33bb53fababe7ae4304ae3d09ee7887b986754ff0b4 SHA512 fc197fdd0cb126045f91efd3d9564ce2ab9f092d0fa3ccdd4882dd19114b2947eb60358e069ab18ff890e263953156e7cc385161da13c6167c7b99a2507d4f88
diff --git a/dev-python/python-dotenv/metadata.xml b/dev-python/python-dotenv/metadata.xml
index 7f33f1c07d79..8acffd41cc4d 100644
--- a/dev-python/python-dotenv/metadata.xml
+++ b/dev-python/python-dotenv/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>sping@gentoo.org</email>
@@ -9,4 +9,7 @@
 		<email>python@gentoo.org</email>
 		<name>Gentoo Python Project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">python-dotenv</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/python-efl/Manifest b/dev-python/python-efl/Manifest
index 2d4b666c6f4f..e6b602a8ad5a 100644
--- a/dev-python/python-efl/Manifest
+++ b/dev-python/python-efl/Manifest
@@ -1,4 +1,4 @@
 AUX python-efl-1.25-clang-crosscompile.patch 579 BLAKE2B d308bf06950094a00fbbad24f4813b6dd511122071328f01ab2bd774ba1cd79cca7cddffc8dad4d65c8cc83430f99d59a55dfc2a5d4805a54f62ae0ece880a3f SHA512 3da1b63c7d40dc8027db5bcd6ab165789790e4db8c3ad876d55eda9363557cff8a46858a2ca8c23d1bb8e1e43bb7b057ff596aebe7adb2c40f3bb18b37e71225
 DIST python-efl-1.25.0.tar.xz 9543920 BLAKE2B fc2b951ade2fc2b7c32dd78a84800bc9f225499ee9d8431034b378c86e423181d918aba2c4d056974f3aa2df9cfb9c7b3dcf1c366362387048cde182c0b3128a SHA512 23ed29add25cd2639e9eb144f22c5e2809b8634389f7ab5c4b7ebc19302fde4ebb0fe8c41d7b10923e658676c4dfbb8670fda16675682fd376258beecbc3d9c3
 EBUILD python-efl-1.25.0.ebuild 1801 BLAKE2B 5e9f185f88a242900d949a1df90508b1cfedfe4d04677fcebef00c1707594a6241a6caa6ecbb86a4e9016fe6194c71cb05b7d026323bea2ddf20f097fdc2c6c8 SHA512 351abdb288be90038ef3e2e8fcabc13050a9b9d9d2771d4bd347eed96993941af52f78ac2d5a33252ac5b0505661d04daf6015a6d3a8be8ea1bc6a5048c3d821
-MISC metadata.xml 588 BLAKE2B 0d810c31fac4488f392b8d3b57eb830af3b5ce3c970a9087939e35bc33c58d652ad3a6dd1c42c6b2604334b5c098b81465a1dc92e051e9f5b8cf5a047a190ee8 SHA512 9390fbbc9345bd5e580a8a1208d8f2e727dd0d1d562679b5e7b7c3f7a4010ed6154e1c2f9d93502dee73d96cbe28ed771b921f67e4a4921c635ada8056449de6
+MISC metadata.xml 643 BLAKE2B 75acbf33cb36cfad418051c1ef0c4afc2906cbcad599ad13e82a38defbfdf50458582229ec3f04fd98bf834b23d20be8fd248b5a2e9853b9509e1e2065af021d SHA512 83cff66b4f08aebd492d61f953847098372c8b4a118fb8e20cb746b4fe0c6113baae569a462362dc7203c9d6fae04cead12ad6970547a951b75a8a10fd53f7d8
diff --git a/dev-python/python-efl/metadata.xml b/dev-python/python-efl/metadata.xml
index 126f2621e76f..3507c749f452 100644
--- a/dev-python/python-efl/metadata.xml
+++ b/dev-python/python-efl/metadata.xml
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>juippis@gentoo.org</email>
-    <name>Joonas Niilola</name>
-  </maintainer>
-  <longdescription>
-    EFL is a collection of libraries for handling many common tasks a 
-    developer man have such as data structures, communication, 
-    rendering, widgets and more.
+	<maintainer type="person">
+		<email>juippis@gentoo.org</email>
+		<name>Joonas Niilola</name>
+	</maintainer>
+	<longdescription>
+		EFL is a collection of libraries for handling many common tasks a 
+		developer man have such as data structures, communication, 
+		rendering, widgets and more.
 
-    PYTHON-EFL are the python bindings for the whole EFL stack (eo, 
-    evas, ecore, edje, emotion, ethumb and elementary)
-  </longdescription>
+		PYTHON-EFL are the python bindings for the whole EFL stack (eo, 
+		evas, ecore, edje, emotion, ethumb and elementary)
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">python-efl</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/python-etcd/Manifest b/dev-python/python-etcd/Manifest
index 8acc7b1227aa..e613acc15cd6 100644
--- a/dev-python/python-etcd/Manifest
+++ b/dev-python/python-etcd/Manifest
@@ -1,3 +1,3 @@
 DIST python-etcd-0.4.5.tar.gz 37270 BLAKE2B cdeae8ef7d668c7737f48a8f1513b5e0177b074d25d7f9d522051585699f11beadc26e9588209561f37a20ac0b4c9793f675bff07634ccdadf9720443e318582 SHA512 c59d7a67492a2e4e72b1ae3ea73ac85a073b9d4516d1ebc48601ba67ac9609fbc45574d97e8dfae3ed4f511f090343ff980160043676252125ce2e2edc7bd154
-EBUILD python-etcd-0.4.5-r1.ebuild 715 BLAKE2B ab83d1f26c2f72042f99f6576fb1e19c9cfaaee1dd2324a697e05a5d6d9652bc05a502ab1529475f5b8dd174ed372938c5eeb74feb2a45a05aae5a26a59c66f9 SHA512 fac67953365a438d0209c1f3f1de73304135aeeb13d483fffc7e5e056884f8b4b4381b37086d828d34d608fcc3055e35344b7b080bcd9d1411a9d9b8d4a48b4a
-MISC metadata.xml 524 BLAKE2B cbaa775dd5120eeb49daef5068eb6c4ca8d5ec8ea0beab023eea17398e00098e07e63c1b8584de23836dc9647e35ddc21e271173def87a8dbe97d9aaa46b0c5b SHA512 3e629397cf00d97d1fc0e8ebc7edee5410e7dd50e09bde887f05388b788db22835b80bc3492bde3c4169c623605e7d84b2df465b864bf8b65e5623e74bad4f5c
+EBUILD python-etcd-0.4.5-r1.ebuild 719 BLAKE2B c60bc2623aba8ec5e582ad1df2bb8dd4c6f441dc3948da19911d95412129f3a1a6910c02b7dbcd35b14b730f1eb3f026105cb146dab978275bc96b3e613f9970 SHA512 068a8ff289755860806c5f10a3e36b7c38b25fa2698ffd93232c73f023f5e8ca734ccfe69aa7973a03ddca2e424b959895f9ee495b8fcd36cbb273c972df50c5
+MISC metadata.xml 559 BLAKE2B 865a664fc8726c45183e9e6cb968e064932f6648b42ebe4802893520f472b2168adcda97e666b49a2b1dcccad9d94115bd0c05fa5108abae9c703765a8167097 SHA512 5c6df7d48f766dcb462b3f87839566fcbb0ae005f22f61988ce539ad0a48aa92b7b96560f2d2048fa8e7db27a7d26488bfad3b3acb00d5c33f853dffe621e40d
diff --git a/dev-python/python-etcd/metadata.xml b/dev-python/python-etcd/metadata.xml
index 0d35f613bc0a..6d2b025d35d4 100644
--- a/dev-python/python-etcd/metadata.xml
+++ b/dev-python/python-etcd/metadata.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <upstream>
-    <bugs-to>https://github.com/jplana/python-etcd/issues</bugs-to>
-    <changelog>https://raw.githubusercontent.com/jplana/python-etcd/master/NEWS.txt</changelog>
-    <doc>http://python-etcd.readthedocs.org/</doc>
-    <remote-id type="github">jplana/python-etcd</remote-id>
-  </upstream>
-  <maintainer type="person">
-    <email>zmedico@gentoo.org</email>
-  </maintainer>
+	<upstream>
+		<bugs-to>https://github.com/jplana/python-etcd/issues</bugs-to>
+		<changelog>https://raw.githubusercontent.com/jplana/python-etcd/master/NEWS.txt</changelog>
+		<doc>https://python-etcd.readthedocs.io/</doc>
+		<remote-id type="github">jplana/python-etcd</remote-id>
+		<remote-id type="pypi">python-etcd</remote-id>
+	</upstream>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/python-etcd/python-etcd-0.4.5-r1.ebuild b/dev-python/python-etcd/python-etcd-0.4.5-r1.ebuild
index 863643cc0098..bfe871b2572e 100644
--- a/dev-python/python-etcd/python-etcd-0.4.5-r1.ebuild
+++ b/dev-python/python-etcd/python-etcd-0.4.5-r1.ebuild
@@ -8,7 +8,9 @@ PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="A python client for etcd"
-HOMEPAGE="https://github.com/jplana/python-etcd https://pypi.org/project/python-etcd/"
+HOMEPAGE="
+	https://github.com/jplana/python-etcd/
+	https://pypi.org/project/python-etcd/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/python-ethtool/Manifest b/dev-python/python-ethtool/Manifest
index 2a58b2c3f81a..0853ec3fb4bf 100644
--- a/dev-python/python-ethtool/Manifest
+++ b/dev-python/python-ethtool/Manifest
@@ -1,4 +1,4 @@
 AUX test-skip-wg-dev.patch 1023 BLAKE2B 564aa0fc9250041b181aea79d14af9f10c2d298f34f15ddb33b25e00e138c3e8a21729cbd0fc4b3c724c89349bb700563c568f27fd0e3d47da2736c2e91d2664 SHA512 fea83748b18b646d4acfe6fdbf204c0aa5f7abedb122241e54dd29f01e0e7862c5166f1199e20606c991305bfd9aad9ee1022c05e9cab800f2c9e980e034d4c6
 DIST python-ethtool-0.14.tar.gz 41945 BLAKE2B d83e40e79481ee5f91f7e097dc4f6f0eb541f88ba83e13c13b3129ece2196ee999f9110310339ebbc2343b814a3b2c80405a3b4ce6931110509a54281b370cd8 SHA512 57a3f2d60dd8309192fc858614645d4e7533c90c03113ffc1eeeb810b86eb71b0a80b4eb209d3452c7624c5318a853de50d9d716d41334bf079e6e3e2490fd4b
 EBUILD python-ethtool-0.14.ebuild 714 BLAKE2B beb3b42d8978d9341810bbc8dd5d3aaa337b6ad53d663ad5572d4bbb3a0738d5d056079c2e386b378f6a051129139c42e03c4c63697d38b532d8c3de6278e636 SHA512 a4b2b2b654873b04edda9eef31e201baef5c5ca7cb7568d323afb592ab5d222e939cf8bea0b3809abc54ef36fa03edb61b167623738d33f889ed8509018a8345
-MISC metadata.xml 464 BLAKE2B e4a3eeee039ad5e3d1236e0067f72df7e73638bb550185f21de32977396c5457a3bb8d9358b65f3dad4696ffc1d818dcbd4ee6ca7f1a9692b3da0b7e56708b36 SHA512 26faaf69c1bcd592bfd2687b3e805ac9d5ecd155ad86a4d1d92875e96d24a2e21603d1a5a581fdb05bfb9883ddc9ce8bf86a5ca464d7521db65d271b5bc5485d
+MISC metadata.xml 602 BLAKE2B db97f3dfe8410f397f0df2d590f42a5b07891fab3e9c59c236a588610714eff395534b0d9686fd1f780afed6cf3b3eb562b638bfeaecef6bfe2830bc6134cd86 SHA512 029ea862021cf87dd539d6539a6693e1032858b0d93b6c23fed0615d6447f4e411ee6d24d2817923fe5195cf532249aba69c814987a433ae7091288f648f83ee
diff --git a/dev-python/python-ethtool/metadata.xml b/dev-python/python-ethtool/metadata.xml
index 112c4c091ce3..52da32872c98 100644
--- a/dev-python/python-ethtool/metadata.xml
+++ b/dev-python/python-ethtool/metadata.xml
@@ -10,4 +10,8 @@
 		changing of Ethernet card settings, such as speed, port, auto-negotiation, and
 		PCI locations.
 	</longdescription>
+	<upstream>
+		<remote-id type="pypi">ethtool</remote-id>
+		<remote-id type="github">fedora-python/python-ethtool</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/python-evdev/Manifest b/dev-python/python-evdev/Manifest
index 97f663429d23..2ca36142932a 100644
--- a/dev-python/python-evdev/Manifest
+++ b/dev-python/python-evdev/Manifest
@@ -1,3 +1,3 @@
 DIST python-evdev-1.3.0.tar.gz 85018 BLAKE2B ba5c391631ecf8cc0a46f21830209c59b1217940ff25e051e027bc8896d71965a394f222f4e3d629ba2a2f8056ccbdc0dfaf43a37684d7157c7456d61f2d8314 SHA512 392fb4fabed344e6db4e257d4cfc7043393efda15d940be80b013e4c4e350334148a7b04aa0a7239f824ad2c7e0bb057c5cff1c0f320d30b25b0c9aab65a6891
-EBUILD python-evdev-1.3.0.ebuild 780 BLAKE2B a2a317b2ed17d854f4b687700dde31be376ab3727656319aed944b4895f4657471fda77d4d8abd1f4ea4e40ca66080da74d2a145b1275d73951b5b6dd125a8de SHA512 551835aebbdb5b5ab80572d89f0b31317fd588ae3889524327da699791eb30485b2720e71877610c0fe1b15ec3ca86207509880dae2c15ead50a582ce4f868f5
-MISC metadata.xml 371 BLAKE2B 88be161b93c99718fbcb9c4dce6c7677c274e61959fdac8eaf7a300d815e630e6d602b5ae691a1fc7153ae9e1361497b87fecf8dbb5e58b079e1136026e005ea SHA512 f9e39269149db9965c94d9ae7bed4c1d74ca210fb33c8cf20ce8b025997727ce2d3ea223ea17b5033ed103452b6b0aa5cbefbc29d2d321ab711348c2dc4e7c7e
+EBUILD python-evdev-1.3.0.ebuild 779 BLAKE2B 8fa4b0fe40a914142ede84e7e01afcf7b41d076f40d2dd6b26f46b69889e9403b96ae773c0b946e7bc024c79b451cf27b48436c0939c7448293e36b96467e1e9 SHA512 75e0c5832c87e0047fa7915381bbd10fde834e7d4d4f74b88b0025a58cea459819ee7aecdbadd370b7c74bc342efc03fa4ba4523eb1c74a413789e6c44e7a807
+MISC metadata.xml 427 BLAKE2B 7c797c3e574c9f3fed201cbf35d42d6a259d4fbbd69dbba280e184a6c8b2ddd82f008be20d80cb74aead9b1389e53d82b38cdb438713e6ae8e7dcfb3e4a41bef SHA512 e73122f3c3a0b515d6929c78df917bb62a80722e409e2bed91969dd28b8e7e36ea7eab954739c2cbc575e627e42d526cf35b71a1977ae6e6308b029222235c2f
diff --git a/dev-python/python-evdev/metadata.xml b/dev-python/python-evdev/metadata.xml
index 52c3f63cafa2..3d9deba29f16 100644
--- a/dev-python/python-evdev/metadata.xml
+++ b/dev-python/python-evdev/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>gentoo@aisha.cc</email>
-    <name>Aisha Tammy</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>gentoo@aisha.cc</email>
+		<name>Aisha Tammy</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">evdev</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/python-evdev/python-evdev-1.3.0.ebuild b/dev-python/python-evdev/python-evdev-1.3.0.ebuild
index 602a70a3fec3..b35bc7c521d5 100644
--- a/dev-python/python-evdev/python-evdev-1.3.0.ebuild
+++ b/dev-python/python-evdev/python-evdev-1.3.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit distutils-r1
 
 DESCRIPTION="Python library for evdev bindings"
-HOMEPAGE="https://python-evdev.readthedocs.org/"
+HOMEPAGE="https://python-evdev.readthedocs.io/"
 SRC_URI="https://github.com/gvalkov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/python-gnupg/Manifest b/dev-python/python-gnupg/Manifest
index 00c8f07a6106..389bbd258879 100644
--- a/dev-python/python-gnupg/Manifest
+++ b/dev-python/python-gnupg/Manifest
@@ -1,3 +1,3 @@
 DIST python-gnupg-0.4.6.tar.gz 52527 BLAKE2B ac616bebac3c5d0ac35c2c1a9353b4ee700848be2469fabc4b6df9f328868638f61211adc786ec59a24f122106ae53cce68d0f16c33b64c2d3d27cb94bf17956 SHA512 33b98bdd1c7d211d31173bbea2358fdfd2dabdbd5e70d4b33035a0edbf666bdba7319ffc847c8617f2626d1bf5a91102f1103c0bfe651fcd709d51ee821be104
 EBUILD python-gnupg-0.4.6.ebuild 683 BLAKE2B 57550847fa349499565d18bae600c004dd1617d1f069143944c1d1cec4b205c83b1f5628f32fd2ad344c3a112179dcbecb14730c01994363e6a0ccfd924fece2 SHA512 4aec283e2eebd4b2d2da7062e541eaa03622279754892018648a328f52f3d924a1acf704bcb319b3ca7844cfd19c11e4e8307e171262947dc3f64d1f1894c822
-MISC metadata.xml 669 BLAKE2B 298cda90bcc252eb432cc072e54a5711f54a4cc10d5603a90954d4db72a7e580a1111d44f1eec01203e60350effe1eef91d696cb9c3b345675dd9e8c70c7ae22 SHA512 7edf035339ca4722070ed955fadb7b7a40c3c4041ee7dd7536e21a7bbe88cc319b1ef54a925fa6abd092cb7b2b90ec67d0885954e558840460f360c67c76a5ea
+MISC metadata.xml 719 BLAKE2B bbab1386e54f1fdc7b8ca36064f020f5e2e908b367503af9d41612b63b3d97fd615a5c79fd49fafde4f60d372d2545953d8fcac28c8ecf5832212a24c102cd8a SHA512 153a00e09ea9fdf656a0e332ffa41cf52ee1fc018055c8d01129400b0141a34a511db15ab2fdcb21166bab06702342dfaab1e271d35aaee142146681e3ca8e14
diff --git a/dev-python/python-gnupg/metadata.xml b/dev-python/python-gnupg/metadata.xml
index a845b0bb7d0c..7760f3346741 100644
--- a/dev-python/python-gnupg/metadata.xml
+++ b/dev-python/python-gnupg/metadata.xml
@@ -14,5 +14,6 @@
 	<upstream>
 		<bugs-to>https://bitbucket.org/vinay.sajip/python-gnupg/issues/new</bugs-to>
 		<remote-id type="bitbucket">vinay.sajip/python-gnupg</remote-id>
+		<remote-id type="pypi">python-gnupg</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/python-ironicclient/Manifest b/dev-python/python-ironicclient/Manifest
index 6fed71af40ad..434dbec34fa8 100644
--- a/dev-python/python-ironicclient/Manifest
+++ b/dev-python/python-ironicclient/Manifest
@@ -1,5 +1,5 @@
 DIST python-ironicclient-4.1.0.tar.gz 201589 BLAKE2B 654e5f328676cdf44446cf12725821e65036e963be6be47c7bf390c87dde28df5a2d7673e52397797587d135dd89eaf0382ac724e5ff75ed07af1930d7754b44 SHA512 d2e8536ae91493e724c6f93acd8c85069a888eb11c9084519010e4a6ad96d7d507991c99301e9c9620240291d9f947b67455551d68aac3f126ea6a578e217658
 DIST python-ironicclient-4.4.0.tar.gz 205165 BLAKE2B eac0eea383890d9d9d70594300df5d8771217e0ba226a38da38544e715487c12d3fcace07651b84e180ee0601ae6bb3c17b6ed47130bd009ed351f1e4d270d64 SHA512 8d9325e464804503a504bbcc3211f0e6f50d4a1cccf652960d1020e1cd0141f8ac67ebcbab37ba7af417679fef3f25d5aa48b9e8134fffbc971cff34446fec3c
 EBUILD python-ironicclient-4.1.0.ebuild 2458 BLAKE2B 148111fd8fc0ad6781f2e595d05addf590aa7fcbf80ee0983a2304bd2369c3f1f759c419152280ebe114a52205df23c72319562854bde6c1e7fe0156e9e8bec1 SHA512 205faaf2021bc77e78fb2e6e2c886c74d35e34067a3beb12026cdf3c4b80aa5c3b9816ab54936d52edaebfa6c9ee4e2f5b70871b39702b675c828ad332d35fc2
-EBUILD python-ironicclient-4.4.0.ebuild 1259 BLAKE2B a0957e04eeff93fa9c6edd167d4ff637c6d26eb57cf3e046b9a88bdc5f45579918afb367892a130df88d306161f2d94edab07fa27c9639545df84a18e6cb27e9 SHA512 341b974ab40c0a02149af3d30bec95707cf7369966e5559ecb214e1dbbe5041fb0ba219698984e932714abe1b4c664329570db0f4c3ac0cbf05d054babb061d5
+EBUILD python-ironicclient-4.4.0.ebuild 1257 BLAKE2B 9bec91ba14e553c6498dd07aa118567c970bf8036dda77de8f063a749457d10834b8a53483314e8efd836f52f637d5a6530564b31a91050d9e850465d8d52862 SHA512 5fc841eed7954e0fd072edd23712a47aabb5dfa39f24867a5ec7caeaeab0b7699af201f4e306f7637afa11f27580e61150228cc5fe07b33e950eee1543c07253
 MISC metadata.xml 336 BLAKE2B 6994a6390d135ffa40d25d245d370e770d58a88d19e5b17e09adf2d675054f9294860323e1a0025031937a89213ed157cfa760bb7c9e7bb337bf163f18956d94 SHA512 fbefb91dc86c550661a0289a04cbb1b3c3893637f57ac2c6d0b4d813b4938a7d599ebb87b3e2c628d52746638f0550da2209a0440a27f12f315ac88714822529
diff --git a/dev-python/python-ironicclient/python-ironicclient-4.4.0.ebuild b/dev-python/python-ironicclient/python-ironicclient-4.4.0.ebuild
index 8a1e68c5f2b9..bde053e0c425 100644
--- a/dev-python/python-ironicclient/python-ironicclient-4.4.0.ebuild
+++ b/dev-python/python-ironicclient/python-ironicclient-4.4.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-jsonrpc-server/Manifest b/dev-python/python-jsonrpc-server/Manifest
index 39d5fb2faa8b..26dda755ce70 100644
--- a/dev-python/python-jsonrpc-server/Manifest
+++ b/dev-python/python-jsonrpc-server/Manifest
@@ -5,4 +5,4 @@ DIST python-jsonrpc-server-0.3.4.tar.gz 26123 BLAKE2B 5d3c7b910cc91999f7f03a70a1
 DIST python-jsonrpc-server-0.4.0.tar.gz 26491 BLAKE2B 524dbd0692861bff538d9db06facda4bdad74c84d3c047a374db658adc31eeb799ba0c4b0219597b04c75cd6e2db3968ba0cf4084ba235509c2457c22b3e1497 SHA512 062e5b75253b95e64918a9da86ad7e29d8a29019670e451b9a28d44cde064339953004c343be0e7dd40968ec9fc2420b5722265f56c2db8057d0f1eaf088dacc
 EBUILD python-jsonrpc-server-0.3.4.ebuild 823 BLAKE2B c5bed3fbd7d925a276095e4791ae344a7feaacc4b5ae42a8a4fe5c11cb019754ba75056c174cb1c321fdaced435548c55d068f459ddda5c85731f7521aca8e8e SHA512 d4c1ad78e518e7ed585908deebcd1ae2238dfeb45495a712b84cf23590e95f1010c96258f98ba7b586966ec2f7428de6777a8b4a531f7aca7cc6b71ba6f779ee
 EBUILD python-jsonrpc-server-0.4.0-r1.ebuild 821 BLAKE2B e3f5797334c29a39ccfaac7efe5ecd26901ec677f4708a82b8f1d4cae55e9fbf3b18c480cbb218006479788c39c224aefc6995227984281214b07e09f24e84cb SHA512 86e60b631f68bdc81b4ec53d0a26441d8a2369d713703808ca37f234680610a02ea5cbb7c6d026e0cb95abd58dfe4e17a09bdc005d513c2b7b754c6b4aa2cda8
-MISC metadata.xml 412 BLAKE2B 1c1563b175b955ba98fa211a2277e49347a6e3bdf4aa4fc585a2eeab65b080e2b63ddaaac5958521f9e421ac3c0a8bb5872416e0186490b0185eea76d527dbab SHA512 d5cfa13aa12b5612ac426563ec40fe585231a3a599b91490d81745c5b77c9ea603335fedfac9d62e810694e25f2fa5ed71e47e13c85cb75db57c116db3164225
+MISC metadata.xml 459 BLAKE2B f052cd6b712a1d4dc7d0116ea6985599b124d57e46bc529f86aee675e31e5a7c4367326590a6075d470f765c1d6c0f69289f517136b4cac1b29a7328f82f9123 SHA512 20ecd3f908a796cfe24f6e0d544d3440c219dd6a8441e099e53195b2898219a3b3e8aaa915ec5f59f21b49eef363aece1f863e8cb7c479a2f1eca6a21a8fd6a6
diff --git a/dev-python/python-jsonrpc-server/metadata.xml b/dev-python/python-jsonrpc-server/metadata.xml
index dd0bd9c021f6..165531b18aa9 100644
--- a/dev-python/python-jsonrpc-server/metadata.xml
+++ b/dev-python/python-jsonrpc-server/metadata.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
-    <maintainer type="person">
-        <email>andrewammerlaan@riseup.net</email>
-        <name>Andrew Ammerlaan</name>
-    </maintainer>
-    <maintainer type="project">
-        <email>proxy-maint@gentoo.org</email>
-        <name>Proxy Maintainers</name>
-    </maintainer>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">python-jsonrpc-server</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/python-language-server/Manifest b/dev-python/python-language-server/Manifest
index 9dcfac2b35c9..0ea70908e73d 100644
--- a/dev-python/python-language-server/Manifest
+++ b/dev-python/python-language-server/Manifest
@@ -4,4 +4,4 @@ DIST python-language-server-0.36.1.tar.gz 74524 BLAKE2B 3337bf4c91204302b26b2496
 EBUILD python-language-server-0.34.1.ebuild 2331 BLAKE2B 459ed84a1fef756235cbe1e48f592318464e332abf5daf1c3fa57a8bbc0576e4e5a5765d340387101db5f01e444c06fa491da8c00d004a704ef79c31c4d6049c SHA512 e5aca74748fe5a16ca651e33f1d3ba1e250a34cc9f631c9f979d0dd36063106929a8ebeca9399a9bb9b900cbe3e8dfd54d7618d5a2ad96703034e0e74ea59ef2
 EBUILD python-language-server-0.35.1-r1.ebuild 2443 BLAKE2B 7ec56114275d77df6d65dda131a77a279c479c905b31d743463c7bf0d48feab6c32727ee877adcb051160853cc9dfa9b40afe8f598290585bf96ce6b35110b27 SHA512 36bfd243fa011f84b4f16934c56c9edb64082dbeea301322c82d572784835b907cba2369914945a913eac99c5a98b8bf778602c63be7f0da1b5d6ec8e969214b
 EBUILD python-language-server-0.36.1.ebuild 2445 BLAKE2B f089cfc85880f3cbdf6a8dd8fa81efa9d4bb452eccc60c9f86fd2e7784cb1fc40f324674a6e1136460f8b70de5bd74dbc8dad644b73250bd142131689f1e0a80 SHA512 717d73489e00c8d7e63470fc0914d4c65ad446cc7eb500f3f91aaee5cf194b0158c2ae31e0e615a18074fb55b3ab22a038af08db945b71980ea2495d9130431f
-MISC metadata.xml 412 BLAKE2B 1c1563b175b955ba98fa211a2277e49347a6e3bdf4aa4fc585a2eeab65b080e2b63ddaaac5958521f9e421ac3c0a8bb5872416e0186490b0185eea76d527dbab SHA512 d5cfa13aa12b5612ac426563ec40fe585231a3a599b91490d81745c5b77c9ea603335fedfac9d62e810694e25f2fa5ed71e47e13c85cb75db57c116db3164225
+MISC metadata.xml 460 BLAKE2B f8024f798dd5825225570df7851186a542dcff8530c85b10a95b8caaaea6f045a0a5093a71d588a1d04239387f0c079f1e8ce8c388fbedc5062569dda024a651 SHA512 f7a2a7720c9b600dc8150e7cb77e5db7514b3e991614b456af2ca0f7269d31caeba69137a5a4583cc892ea66cc62e4ea8de7fc0d8844144aed081d0cf53f72fc
diff --git a/dev-python/python-language-server/metadata.xml b/dev-python/python-language-server/metadata.xml
index dd0bd9c021f6..b9fcdf3f618a 100644
--- a/dev-python/python-language-server/metadata.xml
+++ b/dev-python/python-language-server/metadata.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
-    <maintainer type="person">
-        <email>andrewammerlaan@riseup.net</email>
-        <name>Andrew Ammerlaan</name>
-    </maintainer>
-    <maintainer type="project">
-        <email>proxy-maint@gentoo.org</email>
-        <name>Proxy Maintainers</name>
-    </maintainer>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">python-language-server</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/python-levenshtein/Manifest b/dev-python/python-levenshtein/Manifest
index e5be9b903045..d6797f5af3a8 100644
--- a/dev-python/python-levenshtein/Manifest
+++ b/dev-python/python-levenshtein/Manifest
@@ -1,3 +1,3 @@
 DIST python-Levenshtein-0.12.0.tar.gz 48617 BLAKE2B 67a720f2a76152b008bce86405b4f15f14f203e55c09931f83624c85199626582dcbc255ace914e103e7cd459c8570b0ea0c0d69abfd2c314aa488cb235583a4 SHA512 95df064490970618b003bccbef9071b1a2a3ee4645ac8e851f4205bd4e8123d21ee0ee733adfeec79085faa01ba39902e2a4a26bfb21b70678377579157df4a5
 EBUILD python-levenshtein-0.12.0.ebuild 637 BLAKE2B b91b7c517dda6a143cd9344c935148043518acad62f4b60f74900c0cc022f674de32968be119042eb97981ba683d53171b544245bc5957b83848ef806d3b25a9 SHA512 d48a001d680f11f7f08d79c1b538353c42aa81be5e6e322b4e02eb854c095c72ca41fa07d16b2797babd2a46f82524e1506c1b6979003c089ebad1576cafe76d
-MISC metadata.xml 400 BLAKE2B 6cb97d53cfebfe6960f5adb6b1b10fef856a0944456e89d1f6ade86d8cf8183aa4acc33cbd4829c35a46158b6955a1454ce7143b5cd5538375ad4ab08ebf3097 SHA512 bdda13940bb23190d6d7c43f69d77a231413dbdfd81de5e35568da70e4ab2bc9906cab76890e78da7b1789a376c44658e476ba7c0a4822e7a97b0f37ce36f0f4
+MISC metadata.xml 385 BLAKE2B c550a5bf9e27b3e514164ec28c311cfef21144c746e71dbb4ea8554d87cefa97c4a94ead564a557e15bda4f60cde32cfd3cb5140524a711bf57ac72e75103b82 SHA512 4314a89127d81a04635029b87baf8b9d71b931441d6e5ffd01b96fa9cf9fb5b2f1ed5c4ff2ab4f5befab2fb0ccec8890601e98ab2bcca93da548e07bb6ffbe57
diff --git a/dev-python/python-levenshtein/metadata.xml b/dev-python/python-levenshtein/metadata.xml
index fd06134a3ea0..47e2e2b02e9f 100644
--- a/dev-python/python-levenshtein/metadata.xml
+++ b/dev-python/python-levenshtein/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">python-Levenshtein</remote-id>
-    <remote-id type="github">miohtama/python-Levenshtein</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">python-Levenshtein</remote-id>
+		<remote-id type="github">ztane/python-Levenshtein</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/python-lhafile/Manifest b/dev-python/python-lhafile/Manifest
index dec3a31d3241..d21ea18b1f6e 100644
--- a/dev-python/python-lhafile/Manifest
+++ b/dev-python/python-lhafile/Manifest
@@ -1,3 +1,3 @@
 DIST python-lhafile-0.2.2.tar.gz 266494 BLAKE2B 03f4f8e58e261b74c32d65c9ea4507d088c5463424c4c279a320553689607e8f4ff13bab0c2e6fc4c252f923a50cae12ce8e4b8c14cb5d8eec2fd8129fa41a97 SHA512 304de9a000b76fae243f0a175040e16515524ccec051cffefd20dcf6995a37e3d4d2e13016794166a661b235700f540f8cc0be60979ed13ad6308056a95f1b2f
 EBUILD python-lhafile-0.2.2.ebuild 475 BLAKE2B cdb7a53884ebfd86e582627bcda94104c83bdb70eecf85e0fd5128871901c836dc23c78885e9a68c86d9db664f2359fa2b0c8a59bc95f74ca16a3e65399af5e2 SHA512 49b59a8ebc870fecfe9c8692b2a8b4593460d110fd34feca1992e60671c033689cd107e0e4e8c1982a44bce8c1ec5822f4fbe3f3a828e25b822ed901f4b4c178
-MISC metadata.xml 339 BLAKE2B b9bf4602de40066fe97bbb0941842bf7b665183861cfe90bcbb8dad6a5e98321ec2adb6c5f7a0da3a51150df75534e71593e27ec1cb9476d150404aeacf7cabe SHA512 9638c1d17829de6fbd03e82977f1a7960dfdc7693e907baa0d71e09e4ba866dd2dca84385ff486b54a7a37f038e1ca38a9a5bd6688d4b0fd88a62117005c6d50
+MISC metadata.xml 384 BLAKE2B 75a9c852faaf98efd379481d1ca0e4d9d819da1b1f276caffcd9d8ebf24fcd2e471c001f68a6f834a4c26a447a68df8f59fc5a2e500891ee763e60859dec5010 SHA512 d1f6874eefd9bc35327b7b0286a7e3637c451bad9a1fdc135cc5ee9d7cc90e1a994b32624eda59ef6632bad1950cfaa538af1a950324dea0a03f7d409a925143
diff --git a/dev-python/python-lhafile/metadata.xml b/dev-python/python-lhafile/metadata.xml
index 69ce0cdcd9cb..3c5764ce5fd0 100644
--- a/dev-python/python-lhafile/metadata.xml
+++ b/dev-python/python-lhafile/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">FrodeSolheim/python-lhafile</remote-id>
+		<remote-id type="pypi">lhafile</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/python-libevdev/Manifest b/dev-python/python-libevdev/Manifest
index 00d2091c6218..bf6a84656ea3 100644
--- a/dev-python/python-libevdev/Manifest
+++ b/dev-python/python-libevdev/Manifest
@@ -1,3 +1,3 @@
 DIST python-libevdev-0.8.tar.bz2 30375 BLAKE2B b59a705d49a54d5f98bca3bdf97038128df35294d4e62ffe058021c4da846e75a372660a4beef7e83dbf5b16a4d7d9195547f713bd290b14ca28ecd9291ac641 SHA512 c3c35e82b78f8968c930883a99def348a012a05ea122ac24e757441e81079f7c12bd50d96e8cec7b799a2d775d834859f924e8d1dc5841c718c050287fd1beb0
 EBUILD python-libevdev-0.8.ebuild 586 BLAKE2B 870fb3bce4a2cad92e567cb97156237bb6ab1fe4413df91cba9c1f83b390ca2402a492686f9e9f6dbce3d0ce9f744fdb06d805f6fdecf5853f7eddb57973fc2e SHA512 dcbc32c74d6cacdbf5594bbae0a884ff40231d70b8263b1f1cf616b858063b283b05b0f40615848a94682c6f03c182153126f9df89c9dbf8ffd2960c4a26704d
-MISC metadata.xml 240 BLAKE2B 7361e68ba9e9d62530d9e45896fa3473e5606d67f87f78f4be394145abb8ee5851fff417cbd973c913a05ce60530eca628c3864cfeef75bf7b5f69b3e8e87da8 SHA512 e23d56b08b47406b57f50a1028febb4c4e1809ce967715b2a46aed1124dfaf306a85a3b2398c4ce058df4305bfc8645b79e8ef3569e6cfe8ec467f63e967b5d1
+MISC metadata.xml 305 BLAKE2B dfcc352aa29bf0497e41b9ce993e525211a1d673fd3c7ce75712ba1441faae1841a57885fffa358674dd03cb67b0e2c423a90b047c3517524a76f97ca1e9ab0f SHA512 e4f77ae903c4df549c7f730b37110adcab750d694a9d66d4d1c8c02fe327da783836e65edfc91fb131901154cd69c19fa250c9a000103ab631897e358fab0ba5
diff --git a/dev-python/python-libevdev/metadata.xml b/dev-python/python-libevdev/metadata.xml
index 3e36bc06aa43..bda7c9f9cb50 100644
--- a/dev-python/python-libevdev/metadata.xml
+++ b/dev-python/python-libevdev/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>x11@gentoo.org</email>
-    <name>X11</name>
-  </maintainer>
+	<maintainer type="project">
+		<email>x11@gentoo.org</email>
+		<name>X11</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">libevdev</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/python-linux-procfs/Manifest b/dev-python/python-linux-procfs/Manifest
index ac59d718785e..a9e5d795a354 100644
--- a/dev-python/python-linux-procfs/Manifest
+++ b/dev-python/python-linux-procfs/Manifest
@@ -1,3 +1,3 @@
 DIST python-linux-procfs-0.6.1.tar.xz 18540 BLAKE2B efda66e0264db15b0c1904b9dca631683d089207abe57d165a25e71f68194c249a22394c997a13a71b0333aa27dbe7ac1b47488f715e22655d0f9217346d7ce7 SHA512 14f7510828d5a3eea1a8267041b604046392dbb8d7980b03b4d10bdefa88a89a5f69acdfea77255ba664c2ef33ce52273490214b3f76d2865e7b1dcc83e8e265
-EBUILD python-linux-procfs-0.6.1.ebuild 587 BLAKE2B e88e5723d96a669636c4663e17d889a9adfaf9dcd5f1e11523effbedc0ac76f445e6696976861bd3ebcd078c58e2e4b8ac0c33440e1460383eb11812dcf07ea3 SHA512 215defbefe665b4f94792afc164b11df0627df6bfacd4fbdb3308ec4fdd3bc560f76d4235adc75a9ecf804fcf301466da469e423effa0b813ab600773528cfe6
+EBUILD python-linux-procfs-0.6.1.ebuild 589 BLAKE2B 72c9d2ab6bb0a3d1b5a3091c5771eddea09b7d272f1855583288be9c8751e7bf89e45fb46d2051e7a7c584d350d2f8a1d9ee9823989ad237058b4affb0736e9c SHA512 89a4cd9d0fc3204c8710f93e4b52cbb6e6b1e91b0c4db6dfdfbf7b7e496b79f99c3031f9d869c20a47836b239139686da67ee81c2b8fab9788e6a42fdef5071f
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-python/python-linux-procfs/python-linux-procfs-0.6.1.ebuild b/dev-python/python-linux-procfs/python-linux-procfs-0.6.1.ebuild
index c0a906f2109d..0985efc9d669 100644
--- a/dev-python/python-linux-procfs/python-linux-procfs-0.6.1.ebuild
+++ b/dev-python/python-linux-procfs/python-linux-procfs-0.6.1.ebuild
@@ -8,7 +8,8 @@ PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Python classes to extract information from the Linux kernel /proc files"
-HOMEPAGE="https://www.kernel.org/pub/scm/libs/python/python-linux-procfs/
+HOMEPAGE="
+	https://git.kernel.org/pub/scm/libs/python/python-linux-procfs/
 	https://kernel.googlesource.com/pub/scm/libs/python/python-linux-procfs/python-linux-procfs/"
 SRC_URI="https://cdn.kernel.org/pub/software/libs/python/${PN}/${P}.tar.xz"
 
diff --git a/dev-python/python-mimeparse/Manifest b/dev-python/python-mimeparse/Manifest
index 31bc737174a8..fc7e7215ffc3 100644
--- a/dev-python/python-mimeparse/Manifest
+++ b/dev-python/python-mimeparse/Manifest
@@ -1,3 +1,3 @@
 DIST python-mimeparse-1.6.0.tar.gz 6541 BLAKE2B 15de86feddf892ee4599e0fe7c113a93f343d5b8afc09725263e2fcb3869f8f152612b9f30dbf68279aa95e2ce8f6ba9d4dc6e8e2b75366a972dcdb705220742 SHA512 cc2ec8059034fc224c59bffeb77e7fd0ba86b753373c8daf3a182fd56d647f0b96d7bacb6708be285dd7e246ebc19b813e2bfb8ac79a86f6d4e702c223f5187e
-EBUILD python-mimeparse-1.6.0-r3.ebuild 573 BLAKE2B 2f592bb593d0454f475c2ab0fa99ec173af6e3827ac7e8e8f845c3486828cf5f68b3339acdfdb13af5d5b38670d53dc215aac393fe2fb2bb0849e9fe6c548c8e SHA512 494848b00bc9afbae6b77591b7f4c93938c78db836db0775ef2924de68426e0d22bda1953943f51ee69a17d0be304909125fc7fea460e405583dbbe6958a3a37
+EBUILD python-mimeparse-1.6.0-r3.ebuild 584 BLAKE2B 3921d7a0777cde65885a391fdf8b9e11d1e4e3782398ace5a68a463bc9d9ea2da7763697a39678078d56e412068e92c418bf9e0f475546beed60920894828d7d SHA512 48a7e28733ddbe929554a78dc522e8e179331c2b5b658ac12e7604f0bdc52dd9e07b71b1858a95a07374bbe3bc9ce60af7a734a77b6e1cc3b8fc65ae55da776e
 MISC metadata.xml 419 BLAKE2B 83547a7d24cf4a47a5c32e83aec0fc78f286d0f92252e637a1542d5d9a1d011c6b68c4ef4fcfae376edfbd82a3970673f4f50abe8272560fd14640f7537bcaac SHA512 9a18a36d9e0b85be5f1bc2ec6f8279089e4e5f73b5d77c634b2bc2ca0b39b29886f7e0b4665d4570772f2a1ed68a8e393de80ad0fa5d97145f2bac6366f08b0b
diff --git a/dev-python/python-mimeparse/python-mimeparse-1.6.0-r3.ebuild b/dev-python/python-mimeparse/python-mimeparse-1.6.0-r3.ebuild
index db8e5fc6a1d8..08aed71f7cd3 100644
--- a/dev-python/python-mimeparse/python-mimeparse-1.6.0-r3.ebuild
+++ b/dev-python/python-mimeparse/python-mimeparse-1.6.0-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 python_test() {
diff --git a/dev-python/python-musicbrainz-ngs/Manifest b/dev-python/python-musicbrainz-ngs/Manifest
index d9bbc06bb6ef..79b2f68f132b 100644
--- a/dev-python/python-musicbrainz-ngs/Manifest
+++ b/dev-python/python-musicbrainz-ngs/Manifest
@@ -1,3 +1,3 @@
 DIST python-musicbrainzngs0.7.1.tar.gz 112302 BLAKE2B 1c0696c72b8ea78d182300c76c0040117e1448a7955fa9aed8e42d1ebf9aa1b43359cee1158920fa31d3fb7536796130b54d0d45f351ddb5449d8f022a55f552 SHA512 a674c38b5084d1ae554dd03d1b3e613b48f8f3f3ada67f8d608130cebd35f0640ca65f8b4d224c1e660975274b0b077ffae29739ac2dc5a7078ca87eb8ccadd9
 EBUILD python-musicbrainz-ngs-0.7.1.ebuild 915 BLAKE2B dc3d87f03584c8bc32af75bb7196bcf781acd4ba71ae8c517c2cfee705f02b133369c05be9ad9892594c4cccb2e05d9a091376e95a3f6deb8f91c097eb8c991b SHA512 fce4607a3fa0c1f9baf2424489463cd7f19b3afc2afe076e99daf3f4033b47e7d3999d13211bbd107196fed606b64c2996a0529ce846e50f7265ac92c3ee7334
-MISC metadata.xml 874 BLAKE2B 314e3fcb22de398dc9be9f545ac5aa72e8fbb8474883e88141717ee2d97f17d4c31f5a21060b7b695b318dcf6a532ff934003271796e8ee85bdb392d2983e65a SHA512 8770159a60216cba543a6ff9d558bf3990ba37ba1d04d6514bda3a6674d4cf32c24ca2ff9687df2f20e3e46fad7fc5bc3204aa85cb7d4f2a112bd32c48b0d779
+MISC metadata.xml 925 BLAKE2B 16281f4ea69aa24a9b41b7dcb42922c989d706beb155631858038b40d012c0723a9a1b464db6905f0fade63c49750a75a3e522c115919922b2d9c6596666e3c0 SHA512 c02c6eadf2e1980f0c971deeef6b8e45733feedf00ab1002c590a3090346776194037b58318e196fc1511c1a9dee1c8ce9ad28be0a6579a3364d386771695957
diff --git a/dev-python/python-musicbrainz-ngs/metadata.xml b/dev-python/python-musicbrainz-ngs/metadata.xml
index 7495e8fac2c2..fe216de26831 100644
--- a/dev-python/python-musicbrainz-ngs/metadata.xml
+++ b/dev-python/python-musicbrainz-ngs/metadata.xml
@@ -16,6 +16,7 @@
 	</longdescription>
 	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="github">alastair/python-musicbrainz-ngs</remote-id>
+		<remote-id type="github">alastair/python-musicbrainzngs</remote-id>
+		<remote-id type="pypi">musicbrainzngs</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/python-octaviaclient/Manifest b/dev-python/python-octaviaclient/Manifest
index c142aa91d176..28995a34ef98 100644
--- a/dev-python/python-octaviaclient/Manifest
+++ b/dev-python/python-octaviaclient/Manifest
@@ -1,3 +1,3 @@
 DIST python-octaviaclient-2.2.0.tar.gz 83099 BLAKE2B 1ee8333ef09b205bb66445cfcb28b6789c73dd4f5752510a88ace02f0a0b5b20a086fccb9e7fd2014ffad5472c03a86bfb0fe8da8f5fb4c223c46d2352529ad9 SHA512 f6707192dd9b281acb8f3124e9c1b6d02b037034677b7c3946e39b70c0f7600790a9d70fa8228c7aa120ba3187a8aa9ce48db0a0afa16a300befd37fd77f80f1
 EBUILD python-octaviaclient-2.2.0.ebuild 1097 BLAKE2B b26c5b87b861ced859ec128293e92843f56ebbd0b4aa6a5c1a40cd7e3a2bac9a421d0aff2c7a941643bdefa2813efae51d8b43249d6b8fb53b58fe34bdad4951 SHA512 c81fde852345c5c48a29f9b76693eb05b43c6a2baff6c497d5277812e258abdeee29a224316bed5187c01607cb50a36bfc9cf9e27e14d5a4f8aae2cf38a00818
-MISC metadata.xml 357 BLAKE2B 05722f76dcf8c454fb3eb76c2b98cccfb7f2a3d67a72a7e5d79a5444dc89e042261a711d89ddfed8c3cd705bc266b1a17a5372bf59207090c8f856998c2a267f SHA512 1fb9193b49c08c22fed7e498d31551d5f8afcb0551bf63bb9ed605a6b39e5e059276739170b39765ae56ee4faa42fbda892fd54363955a35f3dd874968cceae3
+MISC metadata.xml 440 BLAKE2B a5557c750bbec660f4ee65d62bf882353dcbd614e938bff01d09d90d0b6e48ed9bd85f498eeae1a1394c84756433f37f788424016de3623e16160e35cc50b668 SHA512 174b64f2b2f93adba0c07c07be3d871f2a1c01ca54844a9f3ef29b2eddd5c0000d9836eb2d9c57021c8bd3a55bb69ccaf626aac2621911826e11f58993fef12e
diff --git a/dev-python/python-octaviaclient/metadata.xml b/dev-python/python-octaviaclient/metadata.xml
index 631e40d11e7e..1b041d17f9e5 100644
--- a/dev-python/python-octaviaclient/metadata.xml
+++ b/dev-python/python-octaviaclient/metadata.xml
@@ -9,4 +9,7 @@
 		<name>Matthew Thode</name>
 	</maintainer>
 	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">python-octaviaclient</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/python-poppler-qt5/Manifest b/dev-python/python-poppler-qt5/Manifest
index 044c95789068..7b654597456b 100644
--- a/dev-python/python-poppler-qt5/Manifest
+++ b/dev-python/python-poppler-qt5/Manifest
@@ -1,3 +1,3 @@
 DIST python-poppler-qt5-0.75.0.tar.gz 23281 BLAKE2B 06b2b0899d2a3cfc84e623b98cc3379aa45ac9ca9267f25168cce04f2ed761fd897043376fda3386b2daff2b46850b24782cafd6aabb13a8e7d6f3920b55a02c SHA512 2f03036a2eaeb8e28875f19a813ff85a91c1e9a94301bdb736ecc50e7ececb4de2622728e6fecbf64e114435529f82b6afd23d772e2d3910ae03d5d2b5da3205
 EBUILD python-poppler-qt5-0.75.0.ebuild 555 BLAKE2B fb77a00c55ae8ba813ae43789a4cd277381274b6ecd8cec3851f59c8c35b7d57424520dacb72c8f3ac2a75803725ea8d35437dd9d0c8129b669f18f63218540d SHA512 f2937553bbace634cf7c02ffad905dae751425928ef18171c1305d51fde41af686f3682be0fd73d204c78d7d8549e9629c7ebf5748cec26c1194b07b9caa4353
-MISC metadata.xml 335 BLAKE2B 41edd46a0432461f40c7fedd8dfa8be8e98d3b68a4fd1be16cb5cd4cf5959774176ee262f6245e09f0a1728a54090d8510a8f1adeb480e43a25c6b21fd33b920 SHA512 72c4753af138508ffb54b174c656a0d5d9ec6b77661af81b0f27214e85570a7011efb5acb85350cf0423c24ca25a0b49264d6f2aa8ce26e07c3be477c854b1d0
+MISC metadata.xml 391 BLAKE2B 6c73b8dafe3e3b3574bc0825c16d16ee82e24f88ad987e93f8647caba0b8ca2b0bc23109734b7cebfc7e3419e404602802283ddc6922d27f556c787660668bac SHA512 9aa4c05abf4581e9decb8fa3764311a3c86de6cd9cced72ac44d6c49e9c6ca722f6adb85994341d951b3bfa6ab719325de40073d1c09a9580f51406db1730549
diff --git a/dev-python/python-poppler-qt5/metadata.xml b/dev-python/python-poppler-qt5/metadata.xml
index 37ebb55340a7..ae83af2b191a 100644
--- a/dev-python/python-poppler-qt5/metadata.xml
+++ b/dev-python/python-poppler-qt5/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">frescobaldi/python-poppler-qt5</remote-id>
+		<remote-id type="pypi">python-poppler-qt5</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/python-prctl/Manifest b/dev-python/python-prctl/Manifest
index 947b325a9403..bcfed8c925e9 100644
--- a/dev-python/python-prctl/Manifest
+++ b/dev-python/python-prctl/Manifest
@@ -1,3 +1,3 @@
 DIST python-prctl-1.7.tar.gz 25922 BLAKE2B 2d0ccc2174c62a74fcffec1115f3d157b6579c8f7dc138aacecc2d7ee479d71954b04cf1f7d881c1212d1f63c22aad800db07756e2803de2deac7eeb5d0d2742 SHA512 f2a18fc8e9ef469722c6618d5dd6b7b558d4060783e6fb3a8dc868d9ed3fa21ade371f94a4538a24dca92a71f623a96638c96882d9cf0d3d499a9f12dae8538a
 EBUILD python-prctl-1.7.ebuild 476 BLAKE2B a7b65185af8c15ec58441e435aadd79a2536e06219ba9686d7e122d0ebe8e9cec3f7cf6756d776d0de844b5a129b29bc7f4f90a293ffdcec6013e26c04e75124 SHA512 ed38f7787428f4229193610094aa13dbc146a3e3761044216a3d4f2a93d05746d3bb9b2f83458b3b493eaca73cb35781d3119cd34f7e66227632188250372082
-MISC metadata.xml 334 BLAKE2B 1fc3c650f15c0c5663110d323f0a4acf970fa31ef8711ea894b6440bd7b04d37d2465db26168833e45bc728f6732f15352f1125d30d85ff16b9d2275931e0818 SHA512 42e6bed26bbf277f03865d151148646a4077baf61256e67616f04f004b807bc5bcb5122bded7a20d05f1eb57a2850cf0f31e469f3482c0dd214fd408b6494cdb
+MISC metadata.xml 374 BLAKE2B c2b40fe3996511c19cfb91fe8b2342e5789523f3e176ad9e12ee193eaca7ff104d8af7351962070c3e30bf666dcc233e84a234a17bd5fd5c8f97f57355936346 SHA512 aa9b0cc5973e65b3c00405a71e3f53ec879c1cdc7e3c9c667cd2330eca97f76d189194fa74e3083f413e9b18e74440f586b7ef8bc95972a24d348f268fd36364
diff --git a/dev-python/python-prctl/metadata.xml b/dev-python/python-prctl/metadata.xml
index 76184b8b4383..a533d5208975 100644
--- a/dev-python/python-prctl/metadata.xml
+++ b/dev-python/python-prctl/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">seveas/python-prctl</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">seveas/python-prctl</remote-id>
+		<remote-id type="pypi">python-prctl</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/python-sense-hat/Manifest b/dev-python/python-sense-hat/Manifest
index 24411b61cf3f..beb3609e5d9f 100644
--- a/dev-python/python-sense-hat/Manifest
+++ b/dev-python/python-sense-hat/Manifest
@@ -1,3 +1,3 @@
 DIST python-sense-hat-2.2.0.tar.gz 20841 BLAKE2B 59e6b9111fb90493e6bda00ce4a4c143dcb84d8b6529efadaf2f337adb38a8fb4287cbd9a303070ea4f335f1e03c6f4789e6f8fbe64a7c70db20675bdae7c6a1 SHA512 71914f6f22206cff23992a6908698978741a46bf9b98648388bac4550f39e8de73db6bd389b79585eba6e82160649a8c8da4217d515bbdbcb50d47218415f3ac
-EBUILD python-sense-hat-2.2.0-r2.ebuild 599 BLAKE2B 8054c428b24df11acb537427208030d7c0c34372f8b6daba7f6ce33dcb6fe6fe6646146bd057c732bb9bb5bf2cf52634ca71f61f685c51d2cbff22e9319c432b SHA512 61b13f6e10fc0a1562877080ffe816f164e0bd580d9b4930963451cf5dc03eeb078adff9742451904db946102d1295f6c737ccc2ddd13579269ea003ca1e267c
-MISC metadata.xml 652 BLAKE2B 09d216bb62cf9bcedb9c75f1d6e7c3b684f8c0716cca30332d90c17713d09ecf0796b453ec5d0714dbfa821e37a42d63c752b97bd4afe1a11c2fc6430a54678a SHA512 b7cd7d7f6380f4ab4a4d0dca35c611e0b783c8c188fd511fbca1908857f497542e3c1e9df5fe390fd4c850194b0fad1388bffc4563e1462bb4eb2d3531a9f151
+EBUILD python-sense-hat-2.2.0-r2.ebuild 595 BLAKE2B 53296a009e64b724e75e54cbd74968c74ae57878c98f498a47119d64c15ef788d5eb4887e03e8541677484370fe2a52353e3b5437674cdc676c71999a3b59857 SHA512 7a124855117a0e6a17d561c92b5252dd824dacc681addfada6192c0f70e9a7fc4391e193fc6d5c9260a896e4e7cd8e5283ee77af48dd0f489afdbe2a7cb4ca4b
+MISC metadata.xml 695 BLAKE2B e29a17aed92da2683733bb3657930a83fc09500a647af5aa4e3b1ad0afd9ee28d9316dff38f717fbfdcbaa7f5604b270bf6547ce3d202af85e25aba8e4c0f69f SHA512 f8d3b56dc06c0224c9af4f16ec07fc6e8eaf0f53873afff5c1b035389d97b5b5689381b67cb03573429b66781c1a1d5ce653f8de3e4366cf408a2d6a07a39b84
diff --git a/dev-python/python-sense-hat/metadata.xml b/dev-python/python-sense-hat/metadata.xml
index 7c1f9d6b2a82..ae319bb54d44 100644
--- a/dev-python/python-sense-hat/metadata.xml
+++ b/dev-python/python-sense-hat/metadata.xml
@@ -11,7 +11,8 @@
 		to the International Space Station.
 	</longdescription>
 	<upstream>
-		<bugs-to>https://github.com/RPi-Distro/python-sense-hat/issues</bugs-to>
-		<remote-id type="github">RPi-Distro/python-sense-hat</remote-id>
+		<bugs-to>https://github.com/astro-pi/python-sense-hat/issues</bugs-to>
+		<remote-id type="github">astro-pi/python-sense-hat</remote-id>
+		<remote-id type="pypi">sense-hat</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/python-sense-hat/python-sense-hat-2.2.0-r2.ebuild b/dev-python/python-sense-hat/python-sense-hat-2.2.0-r2.ebuild
index eee4918e1a4a..c8187b4e9e73 100644
--- a/dev-python/python-sense-hat/python-sense-hat-2.2.0-r2.ebuild
+++ b/dev-python/python-sense-hat/python-sense-hat-2.2.0-r2.ebuild
@@ -9,8 +9,8 @@ PYTHON_COMPAT=( python3_{6..9} )
 inherit distutils-r1
 
 DESCRIPTION="Raspberry Pi Sense HAT python library"
-HOMEPAGE="https://github.com/RPi-Distro/python-sense-hat"
-SRC_URI="https://github.com/RPi-Distro/python-sense-hat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/astro-pi/python-sense-hat"
+SRC_URI="https://github.com/astro-pi/python-sense-hat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/python-slip/Manifest b/dev-python/python-slip/Manifest
index 3cd6c06346b0..bef196734e6d 100644
--- a/dev-python/python-slip/Manifest
+++ b/dev-python/python-slip/Manifest
@@ -1,4 +1,4 @@
 AUX python-slip-0.6.5-no-selinux.patch 2942 BLAKE2B 87cb1fee6aba70228b78ffc8b8a63b6b3bc0b11aad8f5e38369919e6c5a33780a9f255c2c81cc9220fe02b11b8d6daf24278bdbc495a831af03c92f1f2bd25f1 SHA512 64a742f93a38a2ff15d98e9d22c30a821ecd2044457ac958bf34cd7fd8e333b16a5fd56e80b169cc67c9ab35d13298d0caf418ad7a693372539701bda56f123e
 DIST python-slip-0.6.5.tar.bz2 25996 BLAKE2B f2c512274c35a451aa5a97f8c8b16d117edc34901cb2cc51d7d99314eec9c2e90c95019290ef9a35511b62a822471f40eac8c4228c0094bd72c71bd579bbe0c5 SHA512 84dfd4d74602e996797261aa4021fc1579a6aba554d2b3d497c0a7b8618366a9c0a6f12051b00c5653845dda923eedb58afdded37f2a1f31b5b0ce1a0532ccff
-EBUILD python-slip-0.6.5.ebuild 1217 BLAKE2B 77e82207dfd2a58ac812576fdfd03f5512230073f41f250135e794297119c61b3d0da90114915c86ff374dfaaacfe619f21eeeb141c85086de819491e920c80c SHA512 b2c29e577e12c3c5e1cf492b69cb8bebb6272a4726dc52c7dcd1a818cbb6085eaace0cef2479547447fdd844075a2587d8bd8d633394361efde9c57b2a05fa51
+EBUILD python-slip-0.6.5.ebuild 1221 BLAKE2B d6f3831afce4b7de2c0900c421223ae15269e84b321b0cfea4245cfcf819212568ac181fa2e259ae0b74187831c3e161ba7af1dcaad398652607b9a2a170f58a SHA512 8ecec9c4289bd17bf0f4800556b0a26e35064ea6b58f5564f9f4aa163dcc04dcd96fb926c78a2c2b620e5e039e869f7410da80960b079b21fcc158cb63b0b880
 MISC metadata.xml 277 BLAKE2B fdd3d0858258cd42bb21a1759e210802c20d42422a6b527e43f7c2488162ecc74b31a8098018999b986f23fefa9ce8752f59bce9dbd1becc6044e5a5b999c2cf SHA512 a7f1ef17d50370f30622f5a9f9a3d69623214ce9e1eb76fb9d59fcd8e016a2dfa18e6141ee130e7e1c6dab517d274ae8d252638a27320e356d4f7267d09587db
diff --git a/dev-python/python-slip/python-slip-0.6.5.ebuild b/dev-python/python-slip/python-slip-0.6.5.ebuild
index 2987795e5546..acd9f324e8cb 100644
--- a/dev-python/python-slip/python-slip-0.6.5.ebuild
+++ b/dev-python/python-slip/python-slip-0.6.5.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_REQ_USE="xml"
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/python-socks/Manifest b/dev-python/python-socks/Manifest
index 91a91a6a00fd..22834f995ed2 100644
--- a/dev-python/python-socks/Manifest
+++ b/dev-python/python-socks/Manifest
@@ -1,3 +1,3 @@
 DIST python-socks-1.1.0.gh.tar.gz 1358296 BLAKE2B c599095a7f687ba1bba6f0ddbbc8ef2e680cb6be4e5d2250fad88c3a3273fb2044712045b20c5a358ed9dcbaef07e5133b6d672698d8caf4b978c9e633a5df70 SHA512 e38594815e5f943f810862dfe5d07a802601e41e879f68b4fa70c8087be0387a91e99e1b0578f2819557832b5e53be9773043a9617c72017c41e9377c4f35ef1
 EBUILD python-socks-1.1.0.ebuild 834 BLAKE2B 2ef14ed1bb9e5eda0a579556d7eb27d51a75598bd305de1b77d009055f5ce7a3f94aef4a414fde28df07841770fb7dca8ecbcf7a4ee4ef2581d064754cf4c1f8 SHA512 cad56c6a4f47a885a8a9d78313cd9e48486bc982382306d721552cb25079735011ded23fb90c3aed5071fb1bb674e84b393228201b4a6d820f049b861d10a8fb
-MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
+MISC metadata.xml 355 BLAKE2B 81d034921790157b24dd06af411bcb7de195e68e78d20b4671f9b28055f65c3a7d85f55da725c7540a945a95eba719e7662182424d5ea5e542eb32b38f83ef64 SHA512 bde135dafa4157a8aa39dfcbdada405b5b2109b346c2f0bd654d3c85d58b02ccbae3fc54deed0ec9fef1cc1709bda9adbf826b7c5d1011243dfdb0b3cc6513a0
diff --git a/dev-python/python-socks/metadata.xml b/dev-python/python-socks/metadata.xml
index 266e3f19ca59..3880302d1883 100644
--- a/dev-python/python-socks/metadata.xml
+++ b/dev-python/python-socks/metadata.xml
@@ -4,4 +4,8 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">python-socks</remote-id>
+		<remote-id type="github">romis2012/python-socks</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/python-sshpubkeys/Manifest b/dev-python/python-sshpubkeys/Manifest
index 23132cbb771b..df72cab3f461 100644
--- a/dev-python/python-sshpubkeys/Manifest
+++ b/dev-python/python-sshpubkeys/Manifest
@@ -1,3 +1,3 @@
 DIST python-sshpubkeys-3.1.0.tar.gz 55289 BLAKE2B bf1836c173b542f0edc8dc0635a1f5bf109ef95936ffbabf6bbb79ac3bc34c10a769733d622c338b1f3a87d5be84b89ea9779f7fa293cad706f364d5e8867afc SHA512 4f07cb7bd2b1839a63bff842660499cee816e8675d8fde1e84ee567e354c82677a69e539b99505c6d1c5e0e7a5962a36175eb0cfcc763886a33952d2346c3405
 EBUILD python-sshpubkeys-3.1.0.ebuild 567 BLAKE2B b3dfe117fe342c64e7b6e4fa06e01cc7f87c6a9d3c6546ff19a70399292f6107bdaa9ff4f5340293fba2aa307c84bd9aa5c005129440633be93f53ca639fa651 SHA512 c2b0dc091bae51779057e54c646648d3e72e9e6387c3e95dfdef731dcb7b1fbe1011a0452113388f8e5005889e7f09a5b98995527f1a7c91d7bddc66c93f1b6d
-MISC metadata.xml 362 BLAKE2B 789c599311180046c3d8d7332e1c11989cde2dedc8abf68d6c72ef5924a8e9a15847426fc71a5c57905c022910e2db735879de2cf20c4b8f770a4ee51118a031 SHA512 78963cc8668296c4b984155d1cd7169a89da8b4950a1c3c95f2d1782c197d40e68e0e5e9c6b3b59b72bfad056986be367dcbfbcba489c915eb79a4f5770b56e0
+MISC metadata.xml 487 BLAKE2B 35d2684cb25f52fbb86138cb987cc5ad3cfb258ea121a729de1532ee37593af14011051159c5170cffe7472bf48c21cd1bf5a96564489becfb8ee03c40d20d04 SHA512 d2c9aed541d681d71df93b4c97073c3127f0cc90ad3989a259850a666ea64c8a71a1c0504248b933b88424194ce33e1dac769adb620a2096e592a7b6d3282fec
diff --git a/dev-python/python-sshpubkeys/metadata.xml b/dev-python/python-sshpubkeys/metadata.xml
index c27580a1ca79..c773e85856d7 100644
--- a/dev-python/python-sshpubkeys/metadata.xml
+++ b/dev-python/python-sshpubkeys/metadata.xml
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>chutzpah@gentoo.org</email>
-    <name>Patrick McLean</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">sshpubkeys</remote-id>
+		<remote-id type="github">ojarva/python-sshpubkeys</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/python-systemd/Manifest b/dev-python/python-systemd/Manifest
index 42aa88a342c9..69e85f204b19 100644
--- a/dev-python/python-systemd/Manifest
+++ b/dev-python/python-systemd/Manifest
@@ -1,3 +1,3 @@
 DIST python-systemd-234.tar.gz 53900 BLAKE2B 2658ee7083036ed8259e5f4ad0714ea15227ee836ad34c7fbbdb55dd9df48751b8d9998350d789b4f47e78fe7b4a7134e12d637e5a6ebeb29a0b31e5a4575d91 SHA512 164e34ba46827711e9c6ff9ed58b2706d9a22abfc7001de030ed7d463d8ddf783eb5fee93b207c29950a3c566018cc3f1a21a549421cf3e05c1287b433367eb2
-EBUILD python-systemd-234.ebuild 895 BLAKE2B 26377df845d1c17c02e299529bf711a461cbe179fbc8357a3a34a485771ca0c2c556dcc786804be33fccfb12718f7740af0479c865dc5d3e648ac8c786994054 SHA512 b1d49015ec00f63ec8412608cc35372942d67aad211eba4e573e6f96e127db755f11c35234f6428dba087e95ead1ef505c4a6f0b0f31ba294da70bcc475aaf58
-MISC metadata.xml 306 BLAKE2B 2e77cf6814775cb575c96548a69609034e4d9db62eba44684df463c98fe1b105ae5caffea7e1d05880ad2d8236405b2848fa24bd245e3a8627578d2cb128b055 SHA512 ca004982cde4fe1bcbd821109ec70f464a2014a2c0aa77f9976eedaec78ad68dc8d39e2e2f7023192bf807307e08259548f1ebb298ea7f3654c0b8658fba97f9
+EBUILD python-systemd-234.ebuild 895 BLAKE2B c4bab5df711a3e09d5ff82ea35a60a9545aa568936d309f38524aedb4fff3b2d6a0d2843df73110e5aa973ce83bad4513c6bba55df252ab8182d312cb855e919 SHA512 05b82aba13e573eea23a19a1f709d213a2288ee18edb738e1d053ab1487f941dd12aeed71a254f38e339d276e721992b8c896a8a2cb272d9872a465f73514192
+MISC metadata.xml 358 BLAKE2B 0e54b19bf129d3d082c78ae2b1339ae2afaa58452b47e36a3647d098b9e8137cb3fbfd1208147915e22b3c565ff95d6653f197107339d5d4b5ad575a2533dab8 SHA512 9090851418b66203aa7fdeab9f45a994abd8ba7034e9b6a7b24c5ca106f9bae952522b80e397da1399fbd1ed049222b7fdc770d60869b2f5089f3faf255ecb62
diff --git a/dev-python/python-systemd/metadata.xml b/dev-python/python-systemd/metadata.xml
index 8986208c5b02..5967660a0932 100644
--- a/dev-python/python-systemd/metadata.xml
+++ b/dev-python/python-systemd/metadata.xml
@@ -6,5 +6,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">systemd/python-systemd</remote-id>
+		<remote-id type="pypi">python-systemd</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/python-systemd/python-systemd-234.ebuild b/dev-python/python-systemd/python-systemd-234.ebuild
index dafd6dde7656..4a261c01de9f 100644
--- a/dev-python/python-systemd/python-systemd-234.ebuild
+++ b/dev-python/python-systemd/python-systemd-234.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{6..9} )
 DISTUTILS_USE_SETUPTOOLS="no"
 
 inherit distutils-r1
diff --git a/dev-python/python-termstyle/Manifest b/dev-python/python-termstyle/Manifest
index 1ff9f5c0dd10..acf22f4f8db0 100644
--- a/dev-python/python-termstyle/Manifest
+++ b/dev-python/python-termstyle/Manifest
@@ -1,4 +1,4 @@
 AUX tests-unicode.patch 212 BLAKE2B 0c4d38d0fbdf3871cc81741f0f4533fd989b9636f5d9f435230a154b33d9fabdc5c3ec135f8168a4be1d9f990767871cea8ad19b3f8c6af7e5ab7ca9f9c07500 SHA512 cdb60f341dd186febe72e09586a7b1d65087c0773b1192d9725188cfa4b9bae902026ec7bb723359863695e08992b2b5bae2a25d7aed0c2018dd22dadb8b850b
 DIST python-termstyle-0.1.10.tar.gz 5025 BLAKE2B af652f560f3c6657ca01080cdaece77af7a1ecdf0758cf777035427197142b04a7d39a249da6eee90dc06cc2d15ca484c8b1d086c8e32e761acb8adc0eeccf3f SHA512 a0ed484da8da10c7fe1b8422a26861fb115dc29c49ce79c113053f913d3371edf6222de1ccf40e6aa34c3cfa9da5805eb3928fb07bfae18a13683621d7547743
-EBUILD python-termstyle-0.1.10.ebuild 833 BLAKE2B f569e7125b9a77efe3888af95e17252059cad161af9189548c87dc958b5d2a0c8dfe0da8aca4144effc3ed7924b0c2a8af6ef6b38f67e48e9f769ef784762eba SHA512 f3513c67c7c3fce45b84c001681da27da50b251c437ee7a6c428bd16544bbd22a20a2f788d67a0b7b3655e1aac38698f7eeb394b58ab4011924e6c1779d922fc
-MISC metadata.xml 247 BLAKE2B 431d545f18d9c8ff5e50fdfdd55d89303f283a6bb008c5eac55d8762b8c9cb62dfcf40db999b66b1bf9ec286b9552033eabe7ca0376b415e5f6c7037a0eb8927 SHA512 6b6b38e681e7ca67b2f09aaef6db3340993b2f78c5be2f25234d46f8688ab3ab85289de8738f9199589817d3e2697de0788a45457cc6dfcef5e33ac5adbb558c
+EBUILD python-termstyle-0.1.10.ebuild 836 BLAKE2B ca4e2725d3395a91ade5cf7b219092eb5f8578fc57ecd57026a5cfd815253965eb92c4b7ab6ebde25fc804d0fb021ad0c84c42ce8f042ec76f423060d6e04593 SHA512 e6162004e01613c33e4fa54e829f2af9b5fc7062b01e64868f36162abbd8c01ed0a8f4b49095c52412d09881c22d27d572a1028dc3f2c1ac0202c2942e47a760
+MISC metadata.xml 304 BLAKE2B c24d14f929d11fed58ffb169c73d27f6e3da29d18e7f8f57909b483611ca2efc438791ca859a48f51d8a9fcdfae433e5ccc8fc13ae107b7087f5c1bfd982a416 SHA512 2f9d120ec9c512d1246e8feacbad1fccb9a82d906e1a2b2fe80a663eaa0554065da9816e8fe6b67a99afbc2b9248b870174927756b9c8f7968bb3ef93c34d91a
diff --git a/dev-python/python-termstyle/metadata.xml b/dev-python/python-termstyle/metadata.xml
index 47400ec692e8..7aceef00ef01 100644
--- a/dev-python/python-termstyle/metadata.xml
+++ b/dev-python/python-termstyle/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<!--maintainer-needed-->
 	<upstream>
-		<remote-id type="github">gfxmonk/termstyle</remote-id>
+		<remote-id type="github">timbertson/termstyle</remote-id>
+		<remote-id type="pypi">python-termstyle</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/python-termstyle/python-termstyle-0.1.10.ebuild b/dev-python/python-termstyle/python-termstyle-0.1.10.ebuild
index ff2ecebc98ea..1945a11446e8 100644
--- a/dev-python/python-termstyle/python-termstyle-0.1.10.ebuild
+++ b/dev-python/python-termstyle/python-termstyle-0.1.10.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1
 
 DESCRIPTION="console colouring for python"
 HOMEPAGE="http://gfxmonk.net/dist/0install/python-termstyle.xml"
-SRC_URI="https://github.com/gfxmonk/${PN#*-}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/timbertson/${PN#*-}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/termstyle-${PV}"
 
 LICENSE="BSD"
diff --git a/dev-python/python-utils/Manifest b/dev-python/python-utils/Manifest
index 97186d25bc5d..3847545ccdd3 100644
--- a/dev-python/python-utils/Manifest
+++ b/dev-python/python-utils/Manifest
@@ -1,4 +1,6 @@
 AUX python-utils-2.3.0-pytest-runner.patch 461 BLAKE2B 245e0a6a4c76a4286616e0ad1115a718b482de4945d0321eb9b008699df1ff518b0ad7e6e2f9c5ee743fcdb283bac3dba73423b889a8b62951e004433f343894 SHA512 6ec873a2492166ba7d592ceea96e3ccf5851ae88c7577fded1803ad2ef49bead549cbbcdaedc5a8565228c7cf885736ed402b85ee0890f61e91891debbd14c2e
 DIST python-utils-2.3.0.tar.gz 19384 BLAKE2B 1746deadc8dbaf49a6499fe9c79d25c2b5cfea68e2d1b7ab6f88aa72807eedcdb338058e24a7822c6360dea36f1a044145572443c57f43f4cfed765a76e48f0b SHA512 482ccf9c635a0cbe603b69488a364d9033f8b7fada279d901725b5bf91ac13b1cd4a6b7e8d5834a9355d97d8b0803397d5e13da2b7ba72f8d8e2f7f39fee027a
+DIST python-utils-2.4.0.tar.gz 22230 BLAKE2B 1c144f62a009a2470ec43341283048842cba61f1b677e8b1d197d3ef39dd1d890b364e63ed8da0b30ad5560d335ab0eb2dfc329ff6dfea86c0f64e909de730b9 SHA512 bfad0ef30383df634b89bb2206a00e45434eff9fee9ba0eeab99361bacfb56f3fb420019608b639713a7e8777870de75becb1d7b48aa09c582df27f9ebe8c512
 EBUILD python-utils-2.3.0.ebuild 798 BLAKE2B 66199da67e7e9668a4fc80a61a62a591d7a9f6993f9f1d7bf8080545c1305b4e167f00e66255b2e8ded5b8c3cc7aeffde4ae57eb53f0ec8b6b06b1a7be3c113e SHA512 ac12f533f8aa267f580ce1336ccd34ff732534e039b507d33ac87c189663bcb283917e720958420068f39401ba6616d4f34e412b45b9feb61556dffddd7717fb
-MISC metadata.xml 321 BLAKE2B 7baf4b7d0dbc6064c0588cae9708d10df7d571cf178f6156124938d4786a6560263e9862d23d53bfd17f6e098f58dc24188a9b02642765dbe4aa9d1628a78c66 SHA512 3073d2409eeb35e53d4f55a774ff737496ee360204832c17e178a2d8d0288416cf09fef68ae66bcf5f66a30f6644b364721b402e9bcedf7bb4f1663f302641cf
+EBUILD python-utils-2.4.0.ebuild 795 BLAKE2B 2338d0390102cecb1b9796fbfa8867adfaeb0ecd66b513209efe74942f2f0d25c32b53fb9a5e1a1e685938082475b91dbb2656bcec1ed4cb3daf59218c49cfdb SHA512 e85a9c8b666d69936df1fe49eeb573521152baaf4589c91b53fa07eb1138bbb5089816f26fd6565558dd4b0bfcb521a2972bd42337f3360c60e8d1deb73cb665
+MISC metadata.xml 344 BLAKE2B 6534277dda110fe095373e49ca9d06d96472c9f89167916c45a33f543b44730e441b7e8ea492afac8d4ec85c689f6aefaf895bee9c658b09e4bc2096d5c073e7 SHA512 4b88ade5445b338f9900f5b80048c8dc178c358acbb8305d820daee7d39809b6e1318c4182760ed0160447aaa36c74118e7a2b77659339cb31abb3e639fa7332
diff --git a/dev-python/python-utils/metadata.xml b/dev-python/python-utils/metadata.xml
index 70fe7370de4f..5625092ae80d 100644
--- a/dev-python/python-utils/metadata.xml
+++ b/dev-python/python-utils/metadata.xml
@@ -5,7 +5,7 @@
 		<email>chainsaw@gentoo.org</email>
 		<name>Tony Vroon</name>
 	</maintainer>
-
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">python-utils</remote-id>
 	</upstream>
diff --git a/dev-python/python-utils/python-utils-2.4.0.ebuild b/dev-python/python-utils/python-utils-2.4.0.ebuild
new file mode 100644
index 000000000000..880245a0fc3c
--- /dev/null
+++ b/dev-python/python-utils/python-utils-2.4.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} pypy3)
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of small Python functions & classes"
+HOMEPAGE="https://pypi.org/project/python-utils/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	find . -name '__pycache__' -prune -exec rm -rf {} \; || die "Cleaning __pycache__ failed"
+	find . -name '*.pyc' -exec rm -f {} \; || die "Cleaning *.pyc failed"
+	sed -i -e '/--cov/d' -e '/--pep8/d' -e '/--flakes/d' pytest.ini || die
+	sed -i -e 's/+ pytest-runner//' setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/python-vitrageclient/Manifest b/dev-python/python-vitrageclient/Manifest
index 67d70c9f3c30..4a333906867b 100644
--- a/dev-python/python-vitrageclient/Manifest
+++ b/dev-python/python-vitrageclient/Manifest
@@ -1,3 +1,3 @@
 DIST python-vitrageclient-4.1.1.tar.gz 48885 BLAKE2B 87bbd0174567c142a38901ddf5a4f785e4a9eac9a9e22c3af6f101ead69695e6f9324e52c86c0f526e4120c2f6e807ff8719b017c38de8aad3f59ed4ebf8c2c2 SHA512 2d6758045e4250ceda55e991286e9391ccb9ec154a8802f2aa3faf81d4021b2a8b3be13cefe38df965cae4b2b094592185362780b14e32dcf7cfdc7a13d005af
 EBUILD python-vitrageclient-4.1.1.ebuild 914 BLAKE2B e6c77f838473dcad4cc2c396286e06fe4e91dbb5039cef765000904c97375b1a9ac78acfc9fc3bdce96796a0563166fb3608efa09d9d37b3993c3daf6c161177 SHA512 01197b829d6e6acb67567a8304f360043e1054fde944b76b969233a4ad1f56eb765d91ec2bef2c619dc52720e05422ac1055fda212159b080989a3d20e199d5a
-MISC metadata.xml 357 BLAKE2B 05722f76dcf8c454fb3eb76c2b98cccfb7f2a3d67a72a7e5d79a5444dc89e042261a711d89ddfed8c3cd705bc266b1a17a5372bf59207090c8f856998c2a267f SHA512 1fb9193b49c08c22fed7e498d31551d5f8afcb0551bf63bb9ed605a6b39e5e059276739170b39765ae56ee4faa42fbda892fd54363955a35f3dd874968cceae3
+MISC metadata.xml 440 BLAKE2B a6f84fcb1b38e1ca0d0ccf4523eab041d1f6c6c28ebf5a3a46a82f3ad2c81c005d60cd8b38ffa3d99bd66f4b4020493fd13faa4b7f5d0f1a94df59fbbcf3d4c4 SHA512 82a15303339d021672c439f21f7aecb085648852223bcfaddb7e7e5c5416ecaed880e5d3592b51a627b3f0cd8d154e157ab356a2a3e03779da3f1a3ba0cee296
diff --git a/dev-python/python-vitrageclient/metadata.xml b/dev-python/python-vitrageclient/metadata.xml
index 631e40d11e7e..a0ee204bec6f 100644
--- a/dev-python/python-vitrageclient/metadata.xml
+++ b/dev-python/python-vitrageclient/metadata.xml
@@ -9,4 +9,7 @@
 		<name>Matthew Thode</name>
 	</maintainer>
 	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">python-vitrageclient</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/python-xlib/Manifest b/dev-python/python-xlib/Manifest
index 39e40507e7a6..5b8b85c54eee 100644
--- a/dev-python/python-xlib/Manifest
+++ b/dev-python/python-xlib/Manifest
@@ -2,4 +2,4 @@ DIST python-xlib-0.28.tar.bz2 203306 BLAKE2B f8916fd0c62c8b4546f1c381fc9f13b1e86
 DIST python-xlib-0.29.tar.bz2 209322 BLAKE2B 4d94d99c8094947ce1acb84f3adc28ab4b6e9d6aaf61317b625e50578ece3800f6462551f8656b194d5635e3e35a5d6fec86d4eb553d7b65684a7f74fdf0dc14 SHA512 6275deb2c1e2068d560c45803e651fef9910b5cb921e043ed8204878a1f885b92122b6af3d4ac33f220231c1933d3150524169d0078f64b74df29a8f617d953a
 EBUILD python-xlib-0.28.ebuild 864 BLAKE2B 58f7ff16cd873fe0d46ba832080f7c5716250ff99d1b2f95a078b3ef324bebbb6fadb750c74045c29f2e3e5221466c760c4865c0695defda6c8728b251350515 SHA512 9709939fe00f4efbde974b5ff009d9c262679338590cab04d584dd24aaf327536f71f24a9d970c4c974d961c5a8f4bdf4b9950b6a1dcfaf085c895672d31a75f
 EBUILD python-xlib-0.29.ebuild 834 BLAKE2B aab42e68cb82aab4bbc753bbd039ca78ded9dda7d9c24d823fb42e925a1753f98e7ad8f11e4dfb430921877dc17c9e58581c4d0106ec0e3330bd15910bc6d496 SHA512 b45f4e2b6d3f8fc92b63e921e8f35a0f76c2bd8c6e24117192738b574774e0418671a4038019cc8613f21a3e3dc2c95744fd307e8cdaede7022cab97b8565f6f
-MISC metadata.xml 384 BLAKE2B 625028de31c0d62262d9b7bfda98f2978ee17e9c52890086e6d68bfe23810f8729e03814666d3ffc2a8118813740a94bdef706a391ab908444f1475723a3c319 SHA512 43a2e7161edf8d2a527f35cbc8e590655df487f699e570dc542ab0b3f25b4c577599fa43a09efb4f8f3f67bd6a964acc8b446aa810ffbb2ea7f6dc9ab0f2ebd4
+MISC metadata.xml 433 BLAKE2B 7ed1d8e54df6935b05b4ef997ed50a0df4e5178b8bf2a48f8d67a4ac6a4323ee8646c4fa93ecc6fa70aefa14d0b5039ff99183c3710b7ce689e5b73b8a5affb5 SHA512 29095e67eed7821c4e447579662019fad67c456f6ef6cd5a00f51db7e6c4be297cd48ee7b4c2ada10e59a5d829dc33fe503e7d5daa924493d050ce4a256411db
diff --git a/dev-python/python-xlib/metadata.xml b/dev-python/python-xlib/metadata.xml
index 736c78504618..07efb5b5f76c 100644
--- a/dev-python/python-xlib/metadata.xml
+++ b/dev-python/python-xlib/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
@@ -8,5 +8,6 @@
 	<upstream>
 		<remote-id type="sourceforge">python-xlib</remote-id>
 		<remote-id type="github">python-xlib/python-xlib</remote-id>
+		<remote-id type="pypi">python-xlib</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/python-xmlsec/Manifest b/dev-python/python-xmlsec/Manifest
index c8870b4b0920..6e8aa723e237 100644
--- a/dev-python/python-xmlsec/Manifest
+++ b/dev-python/python-xmlsec/Manifest
@@ -1,3 +1,3 @@
 DIST python-xmlsec-1.3.9.tar.gz 75465 BLAKE2B 32aa8bcc2a17e1164fab6ebf37b47ad64bf8164a5d5cc5929571c32715e37d22143f996afc75c8a73a08e0a0a07d74ce1f8e405731260c1bcdb26c7ccb5faf25 SHA512 3c212c409430297a85316e0c4f7f704be112dfda323fd0300b7d70de812d90dd4681c6a5a3cc0314d1937ebc4f8e012fac7f787bccdfb2dc699d5d6f17316b38
 EBUILD python-xmlsec-1.3.9.ebuild 900 BLAKE2B 7263765a096b4bf2491e0d8df9f7bba8e1c2b9773dc2c767719139d4953bda8ef18aea3d510526508d84c62084b2d07a217d3b3737c1196d46d4a21432e43726 SHA512 f7ba453b5c456f07b6f502ebf5ff1ae5d9140bad2aad292115dcc4195e86e374f399e86cd6ae685b3f014293816914b5217600fce28cf973a7e9393b723779a2
-MISC metadata.xml 255 BLAKE2B 2bb3830b8cec850703f7912f4c22f5b0abeabeed0715222bc56141779d02160773cfd0f85417c553c1cd8f2738bfeb78c56dffb8e648e572019319657646d1ba SHA512 522158915afe67937f81ba572a918a2de8ca1f8591e097da56799c97870d7c44756c1acd8224d63bd3375c2b9ebc0e1ce50816899117948a48065a27804883bf
+MISC metadata.xml 318 BLAKE2B 1e735a969ef22076ee423f1b4a02cc1fd7207d3ecf99065b970dca3a5e335c261bad5ff081edec59e19f5600f516eb79e9759b8677ffd3204afb688ff43f4d17 SHA512 9eeb6edafad382e54d31fcdd02da868cfd0efcb95aefe7f89e7fa59d9b4031d06895219dc331badc2319dd3fa57764a640ffe9dabbc3b70f6d686901ed391a74
diff --git a/dev-python/python-xmlsec/metadata.xml b/dev-python/python-xmlsec/metadata.xml
index 56cae167d372..e5523976e0c6 100644
--- a/dev-python/python-xmlsec/metadata.xml
+++ b/dev-python/python-xmlsec/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>chutzpah@gentoo.org</email>
-    <name>Patrick McLean</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">xmlsec</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/python-xmp-toolkit/Manifest b/dev-python/python-xmp-toolkit/Manifest
index 66485237de0e..02b3191ffdb0 100644
--- a/dev-python/python-xmp-toolkit/Manifest
+++ b/dev-python/python-xmp-toolkit/Manifest
@@ -1,4 +1,5 @@
 AUX python-xmp-toolkit-2.0.1-test.patch 397 BLAKE2B 059d415194f4544de5e4f6bfcbc2bec466b14e72e46792ac762115dd8b33bcd87ebfcdc9412695bd5b75483ac6e82024c083725ed73713c1bad100c30f22448a SHA512 f70eb11fe5b46ec0fac9a4a5c56a7a5b9dc75427b53e8159ec873a74afde23ca4bf5940b185932fc566a10f8a47d2ff8e56fa514eac1b06c94135cfa7070747b
 DIST python-xmp-toolkit-2.0.1.tar.gz 3576384 BLAKE2B cbe73d08d101d0d44c368fd1f1c6f1c8308ece5ca26f164f78312d901fb5d0387a5d2a6519d527b3625d11e338df5c366bed8a7361ac822ac887ef8be3a74948 SHA512 46f83b03574b2d742f6c6efb5b94a549068557ad6338e74fc62368c265d05f0b66a4dd36b17cd51b39f7b6cfbfb1210d54cc44c69e9a9e3da3392ee5f11de3bd
+EBUILD python-xmp-toolkit-2.0.1-r1.ebuild 1084 BLAKE2B 1bcd913e4b4b1305a238fb27f532c2673a848067ba50005bef578c412b2fca1f48f9a7df986f5d5983c3a6681b84c6e717af2bd3d81b8d009d089c5525f518dd SHA512 80a4042f9f426f217ebe3de3175209325cdfd7f93728467c285ae3f59d40c5d7dcb64511a3d125352e25ee19d52ff0454803b73a2c0c2495d89b6ec349ee3552
 EBUILD python-xmp-toolkit-2.0.1.ebuild 1085 BLAKE2B 7127d2dd254433a846302392537b60cf8feeb19f3c71354c3f03f38a8447adc0063d68a00caccebb843681618ea80f7aabfcd6016f60e6847d2376f318fa7643 SHA512 85cf382a90321433bd60f4eff385de18cb77902a4bf4e015b2dcb92f9c78ffd3f449f0e697ce3c42b0875841a5fbfefbacd936da5b62220bc37c9b8921c3bd66
 MISC metadata.xml 416 BLAKE2B 5ef9300ed19a8ed256dd6c6958c2350526d5946893c3346cc17550d15754030315cdae84355872f64e09e890a4dd2da5742f8ded5945e3d4fec2f569cad075ac SHA512 64943f03cf1585d994471560ab50e7f2cfb7c7b2f234fa38b6dcbae004987741f4f2faaa728c2570fdc7b776140d68c0437960118ffb3067b03a67de90656935
diff --git a/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r1.ebuild b/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r1.ebuild
new file mode 100644
index 000000000000..b6bc67c87c0f
--- /dev/null
+++ b/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/python-xmp-toolkit/${PN}.git"
+else
+	SRC_URI="https://github.com/python-xmp-toolkit/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Library for working with XMP metadata"
+HOMEPAGE="https://github.com/python-xmp-toolkit/python-xmp-toolkit/ https://pypi.org/project/python-xmp-toolkit/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		media-libs/exempi )"
+RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]"
+
+PATCHES=( "${FILESDIR}"/${P}-test.patch )
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/.build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-zipstream/Manifest b/dev-python/python-zipstream/Manifest
index 17edad9d76e1..c3906db751ef 100644
--- a/dev-python/python-zipstream/Manifest
+++ b/dev-python/python-zipstream/Manifest
@@ -1,3 +1,3 @@
 DIST python-zipstream-1.1.4.tar.gz 21376 BLAKE2B 84b022f93dedfb46da911c3ed800c3a6eb3685bf9c6180b9aac5d4d085748216f53759f83a085fa57f245033281aa4be1578b4051e8a855bcd2300aed7820460 SHA512 722c1d7db91dc47064fc51f1182417f46923b8f42a56e854f1fa125eaccfc7f86d3deab71709226a798a1caf5a84a8a7fa7d3564065ab91afbad434ed787ce32
 EBUILD python-zipstream-1.1.4.ebuild 423 BLAKE2B 95ffdf2bc14277266a7bb9073d485cfe65b83e31295f943460ec89857778da414a4b44f4d11aa09f229c71378d1228fedfc20f55006e1fdda0a6a2977b0a368b SHA512 2aae0bd9a7f02d5a4f990561af0c926e35c0d56ebbbaf38c4768ac0669965fb5c25c4d9271bda26abf9efb3dea9361bd10b5ea3e612e51dfc63b518978e9afc7
-MISC metadata.xml 381 BLAKE2B 04230c4955e69e38535767e64a3bddd5e9732f248e79eb4ca0f12752a8a1e717786866512727f407cb1b7b07d9b954ddedb3c01d5704c99496f4e006cc986c23 SHA512 e08bcfff6419f5fb2ca82c62f3d3280dfebc5dee392b4c63b82ca0ab15c2767e3ac35779b73ec3512c8d822abe94956ca435454f8191a65d52ae8c49d13e6745
+MISC metadata.xml 428 BLAKE2B 2f55a4cc8d046b8a99402dfc12d03a232973beb41f2072dd2b61982b18d46881ff07368b51255f5eaa595cdd416f6fc56aac0e8a85e05b6e29555694af5c0101 SHA512 fff2ea4c04479882b9d1378d5fb85750a39bda4a66ebc04d0e735818f5490a2115516dfd4d8b2057f380c59c94cf6c51dfbf7a4c35a1840fa583628d3730a9c1
diff --git a/dev-python/python-zipstream/metadata.xml b/dev-python/python-zipstream/metadata.xml
index c126b28b8044..58db0beeb90d 100644
--- a/dev-python/python-zipstream/metadata.xml
+++ b/dev-python/python-zipstream/metadata.xml
@@ -6,6 +6,7 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">allanlei/python-zipstream</remote-id>
+		<remote-id type="pypi">zipstream</remote-id>
 		<bugs-to>https://github.com/allanlei/python-zipstream/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/python-zunclient/Manifest b/dev-python/python-zunclient/Manifest
index 7c6bcc3577dd..13f9856c2422 100644
--- a/dev-python/python-zunclient/Manifest
+++ b/dev-python/python-zunclient/Manifest
@@ -1,3 +1,3 @@
 DIST python-zunclient-4.1.1.tar.gz 114232 BLAKE2B 973ea1191b3d0ba13fc6ad368bd2a741ea3d14ddba32158421c1c72befee5bafbb01da4c2ce12e48e50991169efaf5eeaa4cd986ad34ed058e160c0308c868f5 SHA512 7569171ad620e8e84380639d0f99985b942857925a99fbf47f98196bd372a7b0333923d1ea501c3d7d76c06f6327d38b53f1f80f199c27f4bdf073eab4c1e53b
 EBUILD python-zunclient-4.1.1.ebuild 1089 BLAKE2B 0649c50ae086f6d2480e4a0fd81deaf0e8989c4438034f5596209501ee974c867e143385e5eb82b05c46812a7d67db9d51c082f374feae1217eba731e53ddc30 SHA512 48db3f1db67b2a6ebde0ed8c97f9d5f7c214abf0e53a1d0a5c3242373f25f18496ee483ed8cc6348ea751c6a76a9e4876b90196f135eab4a162e946913b31c32
-MISC metadata.xml 357 BLAKE2B 05722f76dcf8c454fb3eb76c2b98cccfb7f2a3d67a72a7e5d79a5444dc89e042261a711d89ddfed8c3cd705bc266b1a17a5372bf59207090c8f856998c2a267f SHA512 1fb9193b49c08c22fed7e498d31551d5f8afcb0551bf63bb9ed605a6b39e5e059276739170b39765ae56ee4faa42fbda892fd54363955a35f3dd874968cceae3
+MISC metadata.xml 436 BLAKE2B 6cb33d56f596c380a3cfb436a5a3160a1fe4f292f40c3d72f6be2cdae0a6518f225750def99e91fe3c2cb982a8b5d43d5d05776967067a5367342f9b604044a4 SHA512 f8a31004813ba3feb9cab46e25a1a6315f34651f21dc51e2aa7b4446ca9e612c5221ce0dc8837cce8b6a574627bbf19ac7d8bf419f551d52147b557a13c91a04
diff --git a/dev-python/python-zunclient/metadata.xml b/dev-python/python-zunclient/metadata.xml
index 631e40d11e7e..5e20b098d66a 100644
--- a/dev-python/python-zunclient/metadata.xml
+++ b/dev-python/python-zunclient/metadata.xml
@@ -9,4 +9,7 @@
 		<name>Matthew Thode</name>
 	</maintainer>
 	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">python-zunclient</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/python3-openid/Manifest b/dev-python/python3-openid/Manifest
index e8ebcc31372a..ef80ffcdff9b 100644
--- a/dev-python/python3-openid/Manifest
+++ b/dev-python/python3-openid/Manifest
@@ -1,3 +1,3 @@
 DIST python3-openid-3.2.0.tar.gz 305600 BLAKE2B d793eb61335d7240d5c25324b8377d19781df15012c8da6d5d0d7445c8a7fcb31711156b48d32efae8b6de27509e8f9112535ece7820779ca9b7f2e7be04fb0f SHA512 54412820fef21928e1bf30d16c9bc73d454e9ff41df028a12047c08abdb4c2c9e1d9053daebab8b0327cb0fe0f67e364c2506a47509fef6db5bff42f8399b799
 EBUILD python3-openid-3.2.0.ebuild 524 BLAKE2B 113f61f3ce7070512d8d58c875f5069ba5208a0e5d38e01baa1263e9a2984be48ed527f9bbdb21432485db4333c2d19fb14a890351d8236e3107f0416b750f74 SHA512 643adfdc9ea37406ccf0cbb878255fc9ca3bc781f1fad10d4ba8d393abf7dd81e1b6dea0bb48ad23c48c0d6399fc4e634c41a5e06da2c657d1b733baf8624831
-MISC metadata.xml 293 BLAKE2B 27e4faf925c2b05785ab8dcc62975601cd78facad53d650f72c808e57ff372c7c6ade224ce3b962153e96d2d56ff07f4cc0627cfbae32b92ab46c62d6adf622f SHA512 4090e1f1c00cd72343469553c0ea80c4cc380ccfb61ce04ae75329884d5f4a00fc2079c786c6060114e690d7537c4c3dc56d0052445bb3d2b59e71094255e707
+MISC metadata.xml 355 BLAKE2B 7beac6bb373e8c299f7828b07c72f085643dd343adcd01ec6de5c201f31a5886201ff9cdb82d323c0a347e1c872872c6a52def777a4e2d987a17f0a65e731808 SHA512 fd1abd1c7eb452539eebc1d6fa5d643e1781665636e687ab1b9d26f7f1fbe8f78f986ef0a55e0f8627282aa54d266e67fc3c122614357a9a46856d6fd42f6870
diff --git a/dev-python/python3-openid/metadata.xml b/dev-python/python3-openid/metadata.xml
index 4c9521c7cf13..47cdb63bc948 100644
--- a/dev-python/python3-openid/metadata.xml
+++ b/dev-python/python3-openid/metadata.xml
@@ -6,5 +6,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">python3-openid</remote-id>
+		<remote-id type="github">necaris/python3-openid</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/python3-saml/Manifest b/dev-python/python3-saml/Manifest
index 6428c7a813a0..4a865fb4dad9 100644
--- a/dev-python/python3-saml/Manifest
+++ b/dev-python/python3-saml/Manifest
@@ -1,3 +1,3 @@
 DIST python3-saml-1.9.0.tar.gz 497106 BLAKE2B c3b282be835dcd0590125563ed0380bbb5d486aeffd60fa0d6a1e7d22b25ffaa03a1bea555520b1465b27b352df0936d21b919ce73a3671d63f07a52b3efdb37 SHA512 a5171258b917c02f10a0c420a19fe6829a034df1dfd87135351b9c187314dca2f973012f49056f391444aba76306adfd48cd77a859274d5cbd2a8c23a00af78d
 EBUILD python3-saml-1.9.0.ebuild 737 BLAKE2B dfe2a322187209c39ded3053130418f2ee03830239c33aa82838e755caa1318881b8ba93071921284380761e672f38a54390a7652c8b6ba06f112a13189be5a7 SHA512 a62859afaaa19b10c09f045e47655deb57ab7ecd11fc0fc39770893bf0b78df9019cc41fea4d85e6afae92bb12544e58cb7b492c45dba82014ed3bae2c73d291
-MISC metadata.xml 255 BLAKE2B 2bb3830b8cec850703f7912f4c22f5b0abeabeed0715222bc56141779d02160773cfd0f85417c553c1cd8f2738bfeb78c56dffb8e648e572019319657646d1ba SHA512 522158915afe67937f81ba572a918a2de8ca1f8591e097da56799c97870d7c44756c1acd8224d63bd3375c2b9ebc0e1ce50816899117948a48065a27804883bf
+MISC metadata.xml 385 BLAKE2B 8bd80251991951e4ff55a46e535d444a8eee64ea13bfddcebd8e9558f02937d392d3c0dae6d345dbb889fa6def7f12e09bd4e3974db7ac9b38848a0ce9587360 SHA512 d64079de30451e3a9f0222bc62a921cf44ebaf1a3bed03eff79d30d55303c096b73814d5c9ef6854147aaaab0f0bdf873fcc79ab07dceacbd816161cf793e332
diff --git a/dev-python/python3-saml/metadata.xml b/dev-python/python3-saml/metadata.xml
index 56cae167d372..9a923ba5ee07 100644
--- a/dev-python/python3-saml/metadata.xml
+++ b/dev-python/python3-saml/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>chutzpah@gentoo.org</email>
-    <name>Patrick McLean</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">python3-saml</remote-id>
+		<remote-id type="github">onelogin/python3-saml</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pythonz-bd/Manifest b/dev-python/pythonz-bd/Manifest
index 1bafc71c4944..e0bc0e4ffc5f 100644
--- a/dev-python/pythonz-bd/Manifest
+++ b/dev-python/pythonz-bd/Manifest
@@ -1,3 +1,3 @@
 DIST pythonz-bd-1.11.4.tar.gz 86065 BLAKE2B 1b7710129a6c764693cf3092725e78a7f6321ecf1bd0323644f421ee4f1c3c1a1b6defb805fbb137e58001c9869d9fe9d124978d60127a6672bb54903fd2027b SHA512 de945a1a49094eb6f4f1d0a2dbab4d5e73b60eb4a5d5461c4368fd46e05bf97df7177f7bcecfe963600016f9641e4233ace15a2c231f658ed8eeb771ddb51ab7
 EBUILD pythonz-bd-1.11.4.ebuild 603 BLAKE2B f811a1b7cd52a7c351d404420c5d8e1c4bad005e42995d0f25598e23f40f9f5eb739846f15ac8df4ffd1d0f2f538515081bc5353baa8ec8b79ccb0fac9d1fbd3 SHA512 5e75815b65ad1ff1dc764122ea2fea571c8e7063dff1e2d589731b02adee33360a29927021ba1240c3813184ea17ff4bcc7dd9799406fd5c6660ab0ca287d8c5
-MISC metadata.xml 439 BLAKE2B e9935c2cf2df4194b736a7d1a8ebaf53780289ccc7ebe2d02c0128e0b298c78f920602f25cddf052af016dba1c9218acd98576fe87874c2fc73241ed5f3c036f SHA512 e3d98902122dd0d5f99e139d58ed62f1291a606eb399c0531936d69e72b855a51bc1475998b7910b5773621ff7fd366253ed7e911ffa40ad61fc18c945f006d9
+MISC metadata.xml 475 BLAKE2B d4e6fc695b20b03a6157d4d883e17e837673f99bd6da6b6438f891eee029afa74d8b09e5ca312f531f703205fc1b84c7bc40035a22c5c68143f3cd6086873c12 SHA512 7e84f2fd1da6c011bb10fb840490ec643737ab0ebb09c6acaac851aece27dec326aa5fa33f29d90d217d8c5deb242866207b5728c5f1000f51b6543b84a37ac4
diff --git a/dev-python/pythonz-bd/metadata.xml b/dev-python/pythonz-bd/metadata.xml
index 2d6e2eed10d6..579ffd20c837 100644
--- a/dev-python/pythonz-bd/metadata.xml
+++ b/dev-python/pythonz-bd/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">pythonz-bd</remote-id>
-    <maintainer status="unknown">
-      <email>saghul@gmail.com</email>
-      <name>saghul</name>
-    </maintainer>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pythonz-bd</remote-id>
+		<maintainer status="unknown">
+			<email>saghul@gmail.com</email>
+			<name>saghul</name>
+		</maintainer>
+		<remote-id type="github">berdario/pythonz</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pytools/Manifest b/dev-python/pytools/Manifest
index 8416b3b5c0f4..bac291261bbf 100644
--- a/dev-python/pytools/Manifest
+++ b/dev-python/pytools/Manifest
@@ -1,4 +1,8 @@
+DIST pytools-2020.4.3.tar.gz 62980 BLAKE2B 692d3aec649c89e473754ceeb13d141df6709f287ae45ae793d84de4321ba13a7fca766456a99f2134e81be4e3a084169f0e1f8f8b9595182efbaab89aefb616 SHA512 4f162114fee298812c0f63b0af1c4113fa1636b6dd4bb750b18decb60d7ad89adc2e460b9861c46ee1c8e11ca3ec437836ff173abe4436ba7784f18b1d6455a6
+DIST pytools-2020.4.4.tar.gz 61208 BLAKE2B e124ae0f2c6be9c760ac178f2043e2d63af7e1eaa79e343b52dc183724bac7e869185d14d43a79efb91cfc55f39c81747581c61badbcb8cbd3d02d6e9a9a79a0 SHA512 32dc47a5a6c39c806c0bc4ffc34a41a1bb51ada537dbba36cfefad7f4370793879b3cb143b37d6fd3542aad0d64ac663cca4c8f7a05db36a9522e9919a1ef3d1
 DIST pytools-2020.4.tar.gz 67157 BLAKE2B 57fd583a7d5cc1337e20fedb5bc1c53c4025a01e7d4e3a5b05a0770a86e2bcabdde31dd535321215cf1bf2c7f3ed0b54e2407583bea63b63ca5b829f590a00be SHA512 66dea0d67c99c152edd7cd44e1262b6d163f065f5a4b697a5997f7453145af8fb0539d8eafa606fa18128908ce933c724b51bd1a76a6f7ab02e27db24496dc4c
+EBUILD pytools-2020.4.3.ebuild 671 BLAKE2B d8e7e67f5e9ca2e79a22e2e933997d75095a6d4a87939ecfbcfa4674cad0dc2690e97198cdf97295c292c7dde9c712e8f7495762ed234ce6077d44aa7b370524 SHA512 012a0d25cd87188b9b19305b4e4a0b287994bbbdb96b23f9d25abe1e09cebbb19dee15117cef055bf382e84fa6358543454f3e5c5c84cd509b1b7078dada4312
+EBUILD pytools-2020.4.4.ebuild 632 BLAKE2B 59e70d4f78af5303e85f490b77b7a92cd0a65b50739f32fc3781f346db88d01bed2a44ed58a1e23d13a2103e23798d534f4f5d11ec2db81ba873b90de7d320e6 SHA512 ea42bf1c1e1564bd3cf0825eff5192c107e7bd13aa6388253389405064ea2f4d130dbcf5c1f600d86103bef0955d4e723097cf862f02ae239fb67b922dbf1539
 EBUILD pytools-2020.4.ebuild 670 BLAKE2B a4dea2ba67077ed0c59807debe1b73c59f7526c0201784813853b818a5a280be90526110dde5f4102aa080995e0214416f09f6bcc3c3641e218147bb6ded0e1a SHA512 9da434ab7b2fa6cc73c246a920e62d8a0af1769f3b988eaa74cdcdee3846f4110a4c54327dc38c86d3f42cd6712147b0c04f09427d5af0e10868038eb18834ed
 EBUILD pytools-9999.ebuild 659 BLAKE2B e95a3d9d028e49f5f6123a98342ac999ec1d6a3487ab7acfb2b09b4814d6b4a3af9d609ff17b9451bf93509926cb665c4568ccdf4a2dbeb93dab80ad82f976d1 SHA512 07ef3afa1568beae15a9210426a0d5b4687becf12249443e7f2d5e867b6a8632c17b01eca5dbb69ce1055eaecdda62256129783106b0bc45a88ec48e9670ed38
 MISC metadata.xml 370 BLAKE2B c7fc7fd9d90ddabb9b07a5a15677f36892a428e3d0394eaeba76b4828560d7ba0212cdebb6fc4a61e5768cbd8458dc069038e8e84c99fd7d92d1e014eeed04cc SHA512 8287dc77596e94cd8d3d34dcd6fbe979064efadda19124992b97d90cb14b561ed311e701769f29a1bfc9f3b0e612e3356b95bfa05106dc29dfaaca722cb79292
diff --git a/dev-python/pytools/pytools-2020.4.3.ebuild b/dev-python/pytools/pytools-2020.4.3.ebuild
new file mode 100644
index 000000000000..e822631055e5
--- /dev/null
+++ b/dev-python/pytools/pytools-2020.4.3.ebuild
@@ -0,0 +1,25 @@
+# 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='sqlite'
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of tools missing from the Python standard library"
+HOMEPAGE="https://mathema.tician.de/software/pytools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND=">=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/decorator-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.8.0[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pytools/pytools-2020.4.4.ebuild b/dev-python/pytools/pytools-2020.4.4.ebuild
new file mode 100644
index 000000000000..80c91e37779b
--- /dev/null
+++ b/dev-python/pytools/pytools-2020.4.4.ebuild
@@ -0,0 +1,26 @@
+# 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='sqlite'
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of tools missing from the Python standard library"
+HOMEPAGE="https://mathema.tician.de/software/pytools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/decorator-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.6.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pytz/Manifest b/dev-python/pytz/Manifest
index e3d27f0f3ba5..d60fc69a14be 100644
--- a/dev-python/pytz/Manifest
+++ b/dev-python/pytz/Manifest
@@ -1,7 +1,5 @@
 AUX 2018.4-zoneinfo.patch 549 BLAKE2B 5654ac8133627afaf9dc17dd9ae8e6a22ef9206efc6ca88495bfdec0078fc77a290ab7a62d6d1aa722ac01b9428bf37382d5f19d9da65593aed43354d05ceeec SHA512 eb365950d2eb62c8d984146228c7d96fca96b2ab4ea90b951a85b3f450550451e6c014da21e403476435e71c5ae989f169d21e07c56fab9713dacec0aee3184f
 AUX pytz-2018.4-zoneinfo-noinstall.patch 579 BLAKE2B 1d21d01160dbdf6c6848c2c0088cbc6ca326270b106098ce7157b363acf6f4da750a58498be95a8b5bf1ee342b679fdbbf16cf9d542d5f46088062db83f866f7 SHA512 309c2427f5a8ebb77bdf899ad3fb34029c46901cbaf2baf3ab697b83608dd1d3c6e7cf776b1b9b592918b91cbafd148ee3e4c0b4255f38ea3e41c0bca94f4c51
-DIST pytz-2020.1.tar.gz 311771 BLAKE2B 2d7dd9987fd912dd2a62b5c4ab1667a13f3704ff407796c00fd76b6f3ac4dfcffba9f58740f9456ddfade6c2ef6deacc754f57f5e434b97da36b36fca3024d0f SHA512 4f652ab400bac0bd83ed305be7540094e674029a0cbde7da280adfd911b8c0a44023799b7c61971a5a61a1d6e3992c5b621e5e95bbfe962f310d5f26d4fda3ce
 DIST pytz-2020.4.tar.gz 310941 BLAKE2B 8abe524ccb7ed676c64dbc129ade5d6562980ea28f8939a3a7a406acf16a8a936e79ff630bf37884610e8936dfe96311ecb752f3b79519a126e1f1ac48883842 SHA512 dcbe763bc6e48c52df855fe03a8109dc0656a0e851324c0468f4307e8aff60e577fe0c9f0b062319e90d2f639b96e98edf8346064705e244143386c863a0aa7c
-EBUILD pytz-2020.1-r1.ebuild 956 BLAKE2B aa4175ab3af316a62ce0a35ca83690aa048f2bae6afc38b4ee49d85f8b0b6d09ac4b3c55f56bd37df1aaf494c5d229228fe905b10ede85f1c1d11e5b038bd38e SHA512 657dd3ad35ba163bf5f8b32752f8fd18bbad0841231308b6dfed3818c6df1804530a2ce471b85b0ff14738cf41308e918f92636a102c14f44f3e65c394535e82
-EBUILD pytz-2020.4.ebuild 965 BLAKE2B 70ce0eae52f964fbcea509d17ab0ceddda8ca1dee4d922d842b770c63a5ed4d419b308f414cb1c0bb3df7313047040f0de4cf26cf06cd34391b73d5bbcc93c72 SHA512 cad0f81405277fdf7bb9b3c0fd1781494996081fa2cd4a81c75445c7d1b8b8a5421baf8dc403b72be0d790fb7a9b61eb70eafc4fc59ec4427d90d26102120ef9
+EBUILD pytz-2020.4.ebuild 956 BLAKE2B aa4175ab3af316a62ce0a35ca83690aa048f2bae6afc38b4ee49d85f8b0b6d09ac4b3c55f56bd37df1aaf494c5d229228fe905b10ede85f1c1d11e5b038bd38e SHA512 657dd3ad35ba163bf5f8b32752f8fd18bbad0841231308b6dfed3818c6df1804530a2ce471b85b0ff14738cf41308e918f92636a102c14f44f3e65c394535e82
 MISC metadata.xml 764 BLAKE2B d26c3334bd7cf99b7a8a7767def5d9ec82ee6e335e27aaf891a47c5037eeb2816457974ea99a1cc865359718a5d7fc30e41f68d8b7ecc82a7a7e87b5943c10ed SHA512 6160a54921cc7c8f7dd504121b359727ab14ef9277bdb96720a31c8e32d223d29080cf9eb76531a94da8a5c7752372938fa5760e4e6cc77118a4792c31813580
diff --git a/dev-python/pytz/pytz-2020.1-r1.ebuild b/dev-python/pytz/pytz-2020.1-r1.ebuild
deleted file mode 100644
index 12bc1b702b8d..000000000000
--- a/dev-python/pytz/pytz-2020.1-r1.ebuild
+++ /dev/null
@@ -1,34 +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 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="World timezone definitions for Python"
-HOMEPAGE="https://pythonhosted.org/pytz/ https://pypi.org/project/pytz/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-IUSE=""
-
-RDEPEND="
-	|| ( >=sys-libs/timezone-data-2017a sys-libs/glibc[vanilla] )"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-PATCHES=(
-	# Use timezone-data zoneinfo.
-	"${FILESDIR}"/2018.4-zoneinfo.patch
-	# ...and do not install a copy of it.
-	"${FILESDIR}"/${PN}-2018.4-zoneinfo-noinstall.patch
-)
-
-python_test() {
-	"${EPYTHON}" pytz/tests/test_tzinfo.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pytz/pytz-2020.4.ebuild b/dev-python/pytz/pytz-2020.4.ebuild
index 7580d791ce85..12bc1b702b8d 100644
--- a/dev-python/pytz/pytz-2020.4.ebuild
+++ b/dev-python/pytz/pytz-2020.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+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 ~x64-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/pyusb/Manifest b/dev-python/pyusb/Manifest
index 5823515e790f..c4b74c7fcc86 100644
--- a/dev-python/pyusb/Manifest
+++ b/dev-python/pyusb/Manifest
@@ -1,3 +1,5 @@
 DIST pyusb-1.0.2.tar.gz 68694 BLAKE2B 8910d9d6d7abd8b0dddf725ad9cc745ce5b06f69a4824a86ed9783918d0fc88d438674852288654964c4555d8278f22d3daab679149c64ea8a6fd3dd2f1cf284 SHA512 6a264b796e17612004196a7a526a7c6df99feac9062f8354540221016411a78a65d413731aea2fc1206ed5ea2b84787078898b9ca3754164f1dfe2a9878b75a5
+DIST pyusb-1.1.0.tar.gz 78752 BLAKE2B ee541afedca7d5dca345c6addee2702ccb7408bb9a2d8b23fe1eb47f067a93309599894e364c0bdcef3e5348bd13cc39f240257efd4664679017f61b87853217 SHA512 0769670e6ebd8b31f2494258eca5d6e470ad3cb17663cc14b8b3a8136ea24caa23f86d81c60c501b88a9bc94b0de6a45aac43c6c5f140e65fd03a589b4d18179
 EBUILD pyusb-1.0.2-r1.ebuild 816 BLAKE2B ebc26592a0d2dc6f4c633203c6c5187d7ba9969720a5ab46ef3fa5d5210aa640a0997b805f0b95c23034984c6b7f733a33adbb88e56c6161d8d69f94b630b749 SHA512 8b80c67d2000d1d36dcd6e4b1398ccc5018390b1d46d2059376e5c4785a90848cd09b08d73a549c48752865904094c3f0c37471bb1674f71ba3760d9961fba6f
+EBUILD pyusb-1.1.0.ebuild 685 BLAKE2B d9615265f004d4c3a2531c356167b6383253359d32458681e1c625da6095f1966a01bfbe77af9e09576b23f85e50f708aea0597063c1a81be3de206ece0c3d40 SHA512 0f0bef72330e27be40aad67dc9d8e266850b62a9ad36fcce54daa57077effa078bde14e9a92e79a70f0745680d333bd33d095e9435ed3fe7b2728449964b6a31
 MISC metadata.xml 359 BLAKE2B 44a04e5fad69cdf343bb324f0367a1b52ce7443d4ef4c6bcd1e7742ac0cb9c6eeb8afc5b250d126c2bf4472c9fca2cce7f9a12a7354372bba8351d0489972e09 SHA512 ac428041984c13af0492c228514fcfabb00d98645b97ff78347c4fee2813df292f52ec9c37dd00392eff6c306a18513bec6d4c883cede2ff31f18c2973bff494
diff --git a/dev-python/pyusb/pyusb-1.1.0.ebuild b/dev-python/pyusb/pyusb-1.1.0.ebuild
new file mode 100644
index 000000000000..f329f17c2418
--- /dev/null
+++ b/dev-python/pyusb/pyusb-1.1.0.ebuild
@@ -0,0 +1,28 @@
+# 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="USB support for Python"
+HOMEPAGE="https://pyusb.github.io/pyusb/ https://pypi.org/project/pyusb/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+
+### This version is compatible with both 0.X and 1.X versions of libusb
+DEPEND="virtual/libusb:="
+RDEPEND="${DEPEND}"
+
+DOCS=( README.rst docs/tutorial.rst )
+
+python_test() {
+	cd tests || die
+	"${PYTHON}" testall.py || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/pyvirtualdisplay/Manifest b/dev-python/pyvirtualdisplay/Manifest
index e6bb6d73d968..07dfd59fde6e 100644
--- a/dev-python/pyvirtualdisplay/Manifest
+++ b/dev-python/pyvirtualdisplay/Manifest
@@ -1,3 +1,3 @@
 DIST pyvirtualdisplay-1.3.2.tar.gz 38532 BLAKE2B 2c0cb3af426abc58dc895667c5fecb40ee9aa870dbb08a51ac32fbd5bd3620b97498b3dfc6e7026362604c82f67b60885370f0704a1349a65668628d9a21e80c SHA512 422e1530bb740fc77cc0b7abb73cb8e7326689c80c5f49b58be70b262e8a2c28274d3b83a0ec7753adfbf78b780047f61cf7b18fb14f935d483a5e3d04953210
-EBUILD pyvirtualdisplay-1.3.2.ebuild 1418 BLAKE2B c3b86fff450c9572c772739b3255552c8a49003f9cbf140195f31d129535559bafb258a03da941ad36130b518d7bcf15c561e58451bbef9f1545e828878e6489 SHA512 0dac615998131554c0977dedda45f6aaaaee88e060cd37c9db54d1cd37517eafc01852b644374941303259314de5fcabba37a3b60710f7b5eee3b98c6363026d
-MISC metadata.xml 375 BLAKE2B 393138e315b4eae4dacb9339fbb5766e9dbaa84b7482babaddc08d524fb8b9939f6622ee9c6d09b66c61ac270fcc483fac39996a12ba87ccccf7cafd4c6d36db SHA512 9a44b6b9de4d1a61d6af9256519473541d5513cef349c15178c025dee3aaaa3f6772b1be56576411a985fcd9c70029c00743d8f577be8eaec4c5a44646c9cbf6
+EBUILD pyvirtualdisplay-1.3.2.ebuild 1378 BLAKE2B 251f36c32e53a76604d98d8166e6a32e5a663994c6729cff60d0e759089d3cc52a87d459e41783c4fdcc68df2ed77d1979bf92b4c288c92ce52ed0d7a90cbaa4 SHA512 ed8dfae1439ccaf1c0b5936024f9f91ebafaa0efbf324f0d8070797a3c6c2dd2751b672cdb5b39acc56c79a4faf9de4ce6683513b1faa6de224719e2213840dd
+MISC metadata.xml 454 BLAKE2B 175cc198884a009e32e480e1d98a7fe9454be85ba6d5760d29e5f211eefadef768c419d04bff83ca7eb217b5ca2654526acd11437494da37df770c34159dc34d SHA512 40c644fd60022874585532c2e822aa7e12047c252415fc3a2b6092a3e359e23ea7a51a9ee371f89e2e5b505794dc3e935cd697ac2e85a66c68867eaaf5ecb3ec
diff --git a/dev-python/pyvirtualdisplay/metadata.xml b/dev-python/pyvirtualdisplay/metadata.xml
index d22e99d73577..a1cade085938 100644
--- a/dev-python/pyvirtualdisplay/metadata.xml
+++ b/dev-python/pyvirtualdisplay/metadata.xml
@@ -9,4 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">PyVirtualDisplay</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pyvirtualdisplay/pyvirtualdisplay-1.3.2.ebuild b/dev-python/pyvirtualdisplay/pyvirtualdisplay-1.3.2.ebuild
index 51c1c3aa0d2b..293aff4cf873 100644
--- a/dev-python/pyvirtualdisplay/pyvirtualdisplay-1.3.2.ebuild
+++ b/dev-python/pyvirtualdisplay/pyvirtualdisplay-1.3.2.ebuild
@@ -16,7 +16,6 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 
 BDEPEND="test? (
-	dev-python/backports[${PYTHON_USEDEP}]
 	dev-python/backports-tempfile[${PYTHON_USEDEP}]
 	dev-python/entrypoint2[${PYTHON_USEDEP}]
 	dev-python/path-py[${PYTHON_USEDEP}]
diff --git a/dev-python/pyx/Manifest b/dev-python/pyx/Manifest
index 3235cf4af520..e54ce3266035 100644
--- a/dev-python/pyx/Manifest
+++ b/dev-python/pyx/Manifest
@@ -2,4 +2,4 @@ AUX pyx-0.14.1-unicode-latex.patch 600 BLAKE2B d7e2b4804731372b8b149b8e50ed61632
 DIST W3C_SVG_11_TestSuite.tar.gz 14651624 BLAKE2B 680059d8b20775725cebb3aed4444acbc3222fde880ba93ee5186c99fc12afa8df2c790bdacbcd6e5ff4ab00e697d8317a9a6ae3039b8b2f02cf7774a18ca533 SHA512 e28e3996284c3f3e423e2b6957cddea71980bcb781d4180894e08f37a7ecce9c6021917329d6d433dcba792cbabb15c7cd503076e616ba5189193a5c554374ca
 DIST pyx-0.15.gh.tar.gz 875286 BLAKE2B 49d36e1c0df3ee47a895279d7f296194324cf1582bb7db0259bcd01c9b17c4d0903c25fef10c7a22635fac62dc6378ffbece200eac99f75bb3ce81d48a71a0d1 SHA512 a7debff01f8055455855f4cac5a08d00c22d20d7918bd7341d2af83844223ae8bb23bbbe92149403656e18ffb8861e8568dfdcb59cc01c55ec60e63b62a8825a
 EBUILD pyx-0.15.ebuild 2102 BLAKE2B 20c00fcb9f71c23c518efddb9134684cce8bfcd2c394a8f929efeab0fa562792fcff05242d40661079724fd0e2a8c80d36500a91ab423f37d4abfa693e44152e SHA512 cbe842e37a585bc6f26556f8550bf15e34d90ded242991a95eef397e47a686de840346373200c879a1c98ffcf49037951045798a497b72d746a08f1599e00311
-MISC metadata.xml 642 BLAKE2B be6324da06bbf69bd5c56fb28aad984a9b36fc50efa418558c81a63d5e4ec01793b7096664c2a6570e24caad368f50b520d30bd83e01e41d9aa52654d5f54c7b SHA512 c95b0de51a001623d93ef15159eaceb5c62fbe38bd7c21f261d12d131eb00c1764ab4f4f124c4bfdfce575d80a1318a996cb02629cfff0a5f9b853fd078627e9
+MISC metadata.xml 697 BLAKE2B 2d984a09f5eb4d0fe1b89afeacc36caa432f084463edb41765afc76b46408e30b79622d5bc7471c8d32a4e5da2eaf7811b90e01758d3cd33fb92ca74ba244c2b SHA512 e419d66836f1eb654be38beb748dd7f3390204e27e5ea0d832106e1ef0aeec93cdc065f962aadb4425f33bcbd42b3f34e6d739e9bbbf571347e6405843fe613a
diff --git a/dev-python/pyx/metadata.xml b/dev-python/pyx/metadata.xml
index f54711af01e2..2561edaa7250 100644
--- a/dev-python/pyx/metadata.xml
+++ b/dev-python/pyx/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
@@ -14,5 +14,6 @@ of these primitives.
 	<upstream>
 		<remote-id type="pypi">PyX</remote-id>
 		<remote-id type="sourceforge">pyx</remote-id>
+		<remote-id type="github">pyx-project/pyx</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pyyaml/Manifest b/dev-python/pyyaml/Manifest
index c2c26a3f1889..6561bc8230c7 100644
--- a/dev-python/pyyaml/Manifest
+++ b/dev-python/pyyaml/Manifest
@@ -1,4 +1,4 @@
 AUX pyyaml-5.1-cve-2017-18342.patch 1420 BLAKE2B bf053ed121355aea1e44f9bd29b22c9afbca7b99b68e59a6e213d2723531044049964dcb20dbc036ee27ae8bcc2c26e317cf080637e611fa0105a9d451496125 SHA512 8e7737761555d851b21ca61128d2ced4163d446acb87510b6962a20dc217923bcf835d70224c9e721486351e0aeb57f9f3c570b57086a0a00c3e8ac656a458c5
 DIST pyyaml-5.3.1.gh.tar.gz 168044 BLAKE2B 2acc62ecc7448925eb340c2555001c8a74bd883d720b992d6deaea890b4eac435e4ae02eb129db3a6778c0be21a231fa9d96ee8ae59a4a39bc49961e5fb0d6ab SHA512 27d97e8493c7660c7c0c471e20a8aa46c85431e4559a98bcbdafc2bd89a67fd04c6f2090e54ff6b206c868b33635ef8be68070a4c25d17a25c97fd5ad3549556
 EBUILD pyyaml-5.3.1-r1.ebuild 1151 BLAKE2B 77d987ec45ff5eae54d9db792b1e9bcf6efe596e9412c62c0c98d12d13430b0ae1760fc222324f34fa52511dc79c0c4533b0c86428779ff85cd90e11c0939940 SHA512 6e561ccba83422190bb4f0479af9bf71fa3644bd71bf1e62cbd6bbe0e3265c23c4df99a1561e38cf9ac0a735f179a4787dfe5ae0a24eb635789c9813e27d48ea
-MISC metadata.xml 439 BLAKE2B 2be21fbc47c75ba527e1b7969a9b472234a0cf38d39b6574eebf7c388b119c6951b7517d4a34c251b0d2a2bfd9ed73cd0157759a17c026da1806439e457aade4 SHA512 fe4be818db191edf5e1bc8abc09012e1065c46a940beb507c8fb48d996113e3601b2d1ce1cfcb70ed85c7d192ed0ba0416f7143f87fcdaa7912fd85e2e80af53
+MISC metadata.xml 520 BLAKE2B 8f0f43fa8b2f79c8970f287ab37db254adf15c48374e2edf0a707bd56e39748cb9930b011bba934eb6d5a5d56b7869430ccfd39d876b3889ea7ec48e6acc3ea8 SHA512 48a55e071474d74f27f50f2928b2f1fe3c12848ddb2c32de2339396db3355805938ae0b01487328210262f0a309996172301cdc6c80d925e33765e98240ffd7c
diff --git a/dev-python/pyyaml/metadata.xml b/dev-python/pyyaml/metadata.xml
index 79464ece48b1..de5a398de7ab 100644
--- a/dev-python/pyyaml/metadata.xml
+++ b/dev-python/pyyaml/metadata.xml
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <use>
-    <flag name="libyaml">enable support for C implementation using libyaml</flag>
-  </use>
-  <upstream>
-    <remote-id type="cpe">cpe:/a:pyyaml_project:pyyaml</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<use>
+		<flag name="libyaml">enable support for C implementation using libyaml</flag>
+	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:pyyaml_project:pyyaml</remote-id>
+		<remote-id type="pypi">PyYAML</remote-id>
+		<remote-id type="github">yaml/pyyaml</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pyzbar/Manifest b/dev-python/pyzbar/Manifest
index 6503b989ab4b..bc056525fa2d 100644
--- a/dev-python/pyzbar/Manifest
+++ b/dev-python/pyzbar/Manifest
@@ -1,3 +1,3 @@
 DIST pyzbar-0.1.8.tar.gz 41562 BLAKE2B 3aafe745025ba542c3943956f635ba2737f78683447402d3c166217d1c18ba6d9debb170e04aacd611b53401cabc62dd0533ec72cef82ddcd454a1d6c026c3c1 SHA512 e186c7a2f29ec107f66b87a2901e128291747ef7a2159675f3170aef2a3a4b1f4cb4319da830d577c986e20abb3f2935e005361cc98857b0e1b880fb4cf40233
 EBUILD pyzbar-0.1.8.ebuild 631 BLAKE2B eb9105e9f700595dc10a15f88f9499f9dd8a278d0ab6d5ddedb9c9761f1a58a728fe8675a783b5909feda33f3e14dd73da5983228024bfbdb3c2f86ca6225d8f SHA512 3803ac6e898d5b9c3b2f14d523a44435e3abe666a7989e6e3e897fe339c51949379554643662a1fc1fde4a327a308699ce76e963b445f15095f03a9a666bf379
-MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
+MISC metadata.xml 309 BLAKE2B d6040e4f03401a028b988ce6117fb578f307eb335588e376748a4ba3cb9bd93fe018dcac7314b645d5416d05d8accd45908d3593ff6e16dcbea83c187529fe81 SHA512 c6613abc07f4767839557d20d84d58800a83c516499e9fb59fc34905bac1c9cf3d62339c14ba1880d12b567483644b8214b0841f98ede74fad42aa7dfa6cbd58
diff --git a/dev-python/pyzbar/metadata.xml b/dev-python/pyzbar/metadata.xml
index 7f4f33c6dbc9..9084ce5b8437 100644
--- a/dev-python/pyzbar/metadata.xml
+++ b/dev-python/pyzbar/metadata.xml
@@ -5,4 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pyzbar</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pyzmq/Manifest b/dev-python/pyzmq/Manifest
index 1767662a3f81..ffc5c8b1685c 100644
--- a/dev-python/pyzmq/Manifest
+++ b/dev-python/pyzmq/Manifest
@@ -1,5 +1,5 @@
 DIST pyzmq-19.0.2.tar.gz 390927 BLAKE2B d70a2f615782cc5a53ed2ffab4d5549bc5d15cc1e0e63f640a357fe8575ca327a5976a3e8b11d97c236a31ca17025f37fe423d166b684b5c4aafc139a0941492 SHA512 7f077ed3858c226eb1e3f5e51dfb5d4b517ec94357b37cc66d17cfe2543786b86627ce7eb4c12785a2709a499af998d02642d972c119a637df3cec5201e909d1
 DIST pyzmq-20.0.0.gh.tar.gz 393041 BLAKE2B 1f22f556f5d0f2755c2e56411fdb9f583bbdfad6315e4e72fbaa1fb18d0ad5436ee0ee8d17497641421cea3f4e1b53b8ff85bf7ced96c8f1c80db0be901ca3d5 SHA512 30359e501e76d6ec14175622d6c970d9ec0f227b372d2b1c6e6650be812dd47017b797a016f5a2da83f72d00536e64d2f005a38003c9a1b4fbb7266f2640782d
 EBUILD pyzmq-19.0.2.ebuild 2974 BLAKE2B 743a62a209a69837f6aaefa654fda286816eb089590487cb01026963f6b45f08953d59f1424470f8eb2828a19fbdafe1156c370f23de3fb644e9b2a414a2290c SHA512 12db0544c34226dc3eadc36f1cfd5671de5abb10e3f74436b722b3681104ebefcacddd7e0d9a71aaf9b4af54b494f4e82fb8e951f95374136c9c3901b4210f53
-EBUILD pyzmq-20.0.0.ebuild 2677 BLAKE2B 24ad70caf8324e004ed638cee2854ac7585e109404d68f126611cb9c5f9c3a0122ac11f417f9dfabee36a999d5f5ec6b99901b664f8cd1ab83dc67aed6849876 SHA512 55003b8af4b16282c792ea153b561af7c41d8c82e0cc0d88bea14e5de7fe9c0d16f56d0fc194f65f0c157d6878894956124407d175107cca33875ee59a1447b3
-MISC metadata.xml 390 BLAKE2B bef63f0fd0f88f72fbbdbe6ecbc25572a97dedb5cf17e4a4f99b4698a4e437935970425fc7a32b46059ceb2cf2ea177b25c324a00261e22d881ff4c5d9fd408f SHA512 8b702f02b5ed0233f1b9cd7c7366e108436ad8331082af8606d864145c967f45d1317b7c4f260a0542430397dfc1a5fb18e69bef90f154bb65ff07a4f7132dc7
+EBUILD pyzmq-20.0.0.ebuild 2675 BLAKE2B 71594632ea337b07084917f7f479023d8f7b94139dcec3f370f769d8bbf1ad07c75c11acba217a4be7c57459af430e975ca95a6cb45ad3bda89b978fa1acedc0 SHA512 523ec8f399c4b1d70bf0ac5c93eb483483a31bd8902f4795c9efba9eb2942dddd7b5c2b6b6b015b90645fc438a3bf1a843fe39b54bf9b08b71db0617b6831711
+MISC metadata.xml 428 BLAKE2B 36d5533b4bcb9fe9aa69847e05599da6400c634c73f1f00321e0a4492b053fbc9e1fcf0f9a22782162b8bbafadb9a343b19da35e732e7898fb3784473564438a SHA512 af1c8716dbd0846be80b90587ffec0c51e0f56f277a659cce15f1114cc0d3889ebe9fd92fdbcdc62b04a9919f48037b44153f7cb5e66d4719ef649aec933ca12
diff --git a/dev-python/pyzmq/metadata.xml b/dev-python/pyzmq/metadata.xml
index 6c1c2af5565c..10e6ed7c7fa2 100644
--- a/dev-python/pyzmq/metadata.xml
+++ b/dev-python/pyzmq/metadata.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">pyzmq</remote-id>
-  </upstream>
-  <use>
-    <flag name="draft">Enable draft API support</flag>
-  </use>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pyzmq</remote-id>
+		<remote-id type="github">zeromq/pyzmq</remote-id>
+	</upstream>
+	<use>
+		<flag name="draft">Enable draft API support</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-python/pyzmq/pyzmq-20.0.0.ebuild b/dev-python/pyzmq/pyzmq-20.0.0.ebuild
index 6331efd8fcf1..459b6cefd499 100644
--- a/dev-python/pyzmq/pyzmq-20.0.0.ebuild
+++ b/dev-python/pyzmq/pyzmq-20.0.0.ebuild
@@ -10,7 +10,7 @@ inherit flag-o-matic distutils-r1 toolchain-funcs
 
 DESCRIPTION="Lightweight and super-fast messaging library built on top of the ZeroMQ library"
 HOMEPAGE="
-	https://www.zeromq.org/bindings:python
+	https://zeromq.org/languages/python/
 	https://pypi.org/project/pyzmq/
 	https://github.com/zeromq/pyzmq/"
 SRC_URI="
diff --git a/dev-python/qdarkstyle/Manifest b/dev-python/qdarkstyle/Manifest
index e07eb6270f19..de0e9e6d462c 100644
--- a/dev-python/qdarkstyle/Manifest
+++ b/dev-python/qdarkstyle/Manifest
@@ -1,3 +1,3 @@
 DIST qdarkstyle-2.8.1.tar.gz 7883937 BLAKE2B fd5a35467c6c47e9eb135d4a119b3f382bfe20b9b0ac2d407fef7113e5ce4d914f3d8e462d26a71b8f1494f42b71a4f8819b0eb2c6579d87ca9dd497d09d39d7 SHA512 10c3f834b1ea50f665c2ce3fde16533c7dfc62c2d055afcc7d2434c09d14fb9a6181b73ce12d3af72897b9d26b41db81cc76e7c7cb6112eef097cd86630b6532
 EBUILD qdarkstyle-2.8.1.ebuild 1443 BLAKE2B 5960107b1e5ecd4eb512b87b9689b845ac08248969d9440c2390bc45b935a1917cd65c680ab0eae34378f6b2b095a6c917d98555258f0ab85ae08d8084784a55 SHA512 520e874470b467fad548d8b3d338d0c5448ca292af79ecd84dbc4faafc7a8e9228beb15dd3faaeb02fcd995b5beba8e7b6d1a9527bb66855c2e21d9207423e02
-MISC metadata.xml 376 BLAKE2B 66f5bc55ef2f40919601f4ed1fddd0bac47a7e42cf87f4a5fe085a90420d6d3ff21fb156319cb6c241b1241f7dfb261612ba0aa20d54dfbeb9801cbad34aeee2 SHA512 9741d92e63a63121645ec2c8f08a37850524b299cfdad5b4e70def0a8a50f35dde5c9417f4d4c067edee641b2050a128c7a792ed6d59137809e1b1a77fb469c9
+MISC metadata.xml 448 BLAKE2B 0f7c5cbe3725c350d815b4e1e2e621a491c5c07b8a135c501d342313dae728a01e3c871edcb404099a3b85906392e33dcefeb4a217350fa5b8e6d2221e2daf71 SHA512 9795f59bc1899b5ecadcc121d54b5cc1a2576ab0a4bbf867fd6b4a131a1222eec7d0fd2745f7774a0acc9c39200ae69bdaf51412cbc4ef8aab0e91fe92b2dfd3
diff --git a/dev-python/qdarkstyle/metadata.xml b/dev-python/qdarkstyle/metadata.xml
index 20ab94177c12..80481fb1e9bc 100644
--- a/dev-python/qdarkstyle/metadata.xml
+++ b/dev-python/qdarkstyle/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
 	<maintainer type="person">
 		<email>andrewammerlaan@riseup.net</email>
@@ -10,4 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">QDarkStyle</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/qtawesome/Manifest b/dev-python/qtawesome/Manifest
index 37eb9d9ac302..c5fd2a971d5b 100644
--- a/dev-python/qtawesome/Manifest
+++ b/dev-python/qtawesome/Manifest
@@ -1,5 +1,3 @@
-DIST QtAwesome-0.7.2.tar.gz 847272 BLAKE2B 559b41a1ccb1563c0537703ec285bb24639ab9dfe72515dae9462271666dbe49b7d04b5d5dbc3f24bb6475803c987f7ac7bd6bbf828b79b07897f0b6e60edd70 SHA512 edc3a4794befd6f87ea144477d18d48e8ea7c1e349cee3fde04ac25c3f372126448adb7d820176927394ca89a8714154f354625e58746725c30eb0a95d7b0359
 DIST QtAwesome-1.0.1.tar.gz 878654 BLAKE2B e654db2210b15274e200bf9ef783b6c8706833129162cc615cbded10a3ee440fae23497dfa327cb6af31664370f90ee46f5d2986d7e5dd6d27b5430a1558c3ce SHA512 edc8f1b7f8dc8d06b7a108300eb72e47e9601be7e16cf774e7efea888e583168f5aa8afe015e83156cd40bda5007b52ef38f914f232fdd1b5eb2683256f1de74
-EBUILD qtawesome-0.7.2.ebuild 801 BLAKE2B d3e0679104c2e169fb8fca255cb6699dbdb0cb41d97966fc12a742c905bae4ac27d2bd7713f48813d4675a3798cde9d92596cda7f9f1812921ea42ff30c568ec SHA512 9cabf45a1d634fbdd3bb939a4899a456853b5a61651332056f6557d7e44e7a9c382dd75a9bc1f44d33d58716d3681e63b44604875e95c181a708fe6623ec587e
-EBUILD qtawesome-1.0.1.ebuild 777 BLAKE2B 74ea64bb1bb2f464971967a0e0c427d784b8776bcef6d5ecf832285c5ca38b0c383a93dc276ac07e41992bb9bf38486d2326d78e5fe686fb77e43caa2b8ae4ec SHA512 6425aef6474aba009485f8e20c111e15c0c2e9aba79da901e4900f7fc6cd292d0d8b79ee74c852a6f34685d3bda3f81d6af325d92d116b66924544b218d2472f
-MISC metadata.xml 907 BLAKE2B 0668d113e8863279de6bbd5a1c7af7cc101a826647574ec971704a31745767d22ab6683d3cdb82d5394490cab23a6d0d1b86d11a6ec93f711dfe596a34afa86a SHA512 d0148746d4d9b429e350593b7e9f5bc4c88030a99a84200e8b6351e3846749e1e667832671d671db5705c3d4c8af0b121aabe9a3bcbc25a2a0b03de192f02278
+EBUILD qtawesome-1.0.1.ebuild 775 BLAKE2B c1969cd7f0c0631996b48a6782585b14de2c3be58e4ac3ea33578a6af84216ade0540946afb1fc38301ba7478d0ae0ccf05b7d60f1f270c146efb08be300fcf8 SHA512 035b06dce1286c495ceefd5d08bb475f6e3777ee0ab329745bb6dbed0585449be2b4712ba1e6a8096904596be847a6774023dd74c2ddc0d4531e42bd9cfff84f
+MISC metadata.xml 932 BLAKE2B 348589aaf4ce3cc6a9df0f5dcb54a85a7493d0c0f7f2d88cde63345a92a149ac762a303f7d3b8f8820fd795276a1c94039c5c6da6aa38e57464fd19a12bb8663 SHA512 8fed0b82049cce4946b0e92e051ca928f34e9dbb8f0fcc81733d598d8b35e50b2abc17f6bc6cbd1c376fdb32544c6fbbc6eef7c695db5ca44498795fdab16549
diff --git a/dev-python/qtawesome/metadata.xml b/dev-python/qtawesome/metadata.xml
index fc1af255a064..e1f4c1c28cf0 100644
--- a/dev-python/qtawesome/metadata.xml
+++ b/dev-python/qtawesome/metadata.xml
@@ -21,6 +21,7 @@
     QtAwesome enables iconic fonts such as Font Awesome and Elusive Icons
     in PyQt and PySide applications.
   </longdescription>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">QtAwesome</remote-id>
     <remote-id type="github">spyder-ide/qtawesome</remote-id>
diff --git a/dev-python/qtawesome/qtawesome-0.7.2.ebuild b/dev-python/qtawesome/qtawesome-0.7.2.ebuild
deleted file mode 100644
index e4d7d551d6f1..000000000000
--- a/dev-python/qtawesome/qtawesome-0.7.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 virtualx
-
-MY_PN="QtAwesome"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Enables iconic fonts such as Font Awesome in PyQt"
-HOMEPAGE="https://github.com/spyder-ide/qtawesome/ https://pypi.org/project/QtAwesome/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="media-fonts/fontawesome
-	dev-python/QtPy[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-DEPEND="test? ( dev-python/pytest-qt[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs/source
-
-python_test() {
-	virtx pytest -vv
-}
diff --git a/dev-python/qtawesome/qtawesome-1.0.1.ebuild b/dev-python/qtawesome/qtawesome-1.0.1.ebuild
index 3efa4911a2ea..5ead22a48d25 100644
--- a/dev-python/qtawesome/qtawesome-1.0.1.ebuild
+++ b/dev-python/qtawesome/qtawesome-1.0.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	media-fonts/fontawesome
diff --git a/dev-python/qtsass/Manifest b/dev-python/qtsass/Manifest
index 577b6c8aa3c5..91690fc11963 100644
--- a/dev-python/qtsass/Manifest
+++ b/dev-python/qtsass/Manifest
@@ -1,3 +1,3 @@
 DIST qtsass-0.3.0.tar.gz 27880 BLAKE2B 07f71e794392ee23db901b1ae74e4c8a8888040b3e5b0681e05e2aa22ec2bdc958e588e2ee9ca9e5fdb4d341827b7c39a4ceb589ed4c669454cae78ee9747883 SHA512 fc3e082a01b35d1e7cada22cd5bea2aed37d4d3dd5a036d3d6d7621fb64ac61fdb3f2358f377f69e2cc5678798069af1d7cce04c4bcb9edf390d5162d308389c
 EBUILD qtsass-0.3.0.ebuild 651 BLAKE2B 2fb9991d6ac24aa9a9c11eb212b87473c72c7790ac24a8f62f008ea54453b1fe12fd81f3c07d7b1137c93ee0f1c3ee1c615f34cb2e180897dc55324f5a60539d SHA512 511d8a4c35755d2b109939e6b57ac8a8b04f6a239f9e80919a0b4e6068c3ec8c978a8b5e2ff2108429057cbc4efa696bb3bd5e4905e38c43371358814b30fe7d
-MISC metadata.xml 412 BLAKE2B 1c1563b175b955ba98fa211a2277e49347a6e3bdf4aa4fc585a2eeab65b080e2b63ddaaac5958521f9e421ac3c0a8bb5872416e0186490b0185eea76d527dbab SHA512 d5cfa13aa12b5612ac426563ec40fe585231a3a599b91490d81745c5b77c9ea603335fedfac9d62e810694e25f2fa5ed71e47e13c85cb75db57c116db3164225
+MISC metadata.xml 444 BLAKE2B 1415afd2bb97b293ef5a5c70eed089bc1a1d3d875b1bd21dcf8b9a18095dbaeaa4b5067522e6c506e4292585658f1561dfd35ad4f2c8c95a395497f45c896402 SHA512 855f3ad20cb365e14240a9ff7a267a9e7694d1b1d87611d58bcb0b5332f1751c0295708e54848b2f27159d81c65a316207027040243dc59108e5b3b74f8c833a
diff --git a/dev-python/qtsass/metadata.xml b/dev-python/qtsass/metadata.xml
index dd0bd9c021f6..a83bd6e4536b 100644
--- a/dev-python/qtsass/metadata.xml
+++ b/dev-python/qtsass/metadata.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
-    <maintainer type="person">
-        <email>andrewammerlaan@riseup.net</email>
-        <name>Andrew Ammerlaan</name>
-    </maintainer>
-    <maintainer type="project">
-        <email>proxy-maint@gentoo.org</email>
-        <name>Proxy Maintainers</name>
-    </maintainer>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">qtsass</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/raet/Manifest b/dev-python/raet/Manifest
index 26c337ac518e..3302bf7f8f79 100644
--- a/dev-python/raet/Manifest
+++ b/dev-python/raet/Manifest
@@ -1,4 +1,4 @@
 AUX raet-0.6.8-msgpack-1.0.patch 8061 BLAKE2B 90607848542b8ba5a219a872f6f4f4e12546ebf12e1d38cfc3c3259282eda97a641fcfa587646e83ffa5e98d5cc3b0e77c032ebf2358a5cd603e2ac58ad9a114 SHA512 524e2c787386a885796a3666dff792d7e2808585658227acbab51c90c7ebfdfb0435ea67bcdc23e9be6b43364452e23a085d4843e4c1ee1dd576e140007c4293
 DIST raet-0.6.8.tar.gz 807419 BLAKE2B 2370eb55b76a52cf89363f9891a411ea7fa2f27b84bd216c44010fd9afb5dcd9261570f916db00ff7bd922c485cd6123b3a6522154b6e05f7869d7e790177f7b SHA512 01279e7414ec3edc9f2bc0641cb9e0606ebf5700b5ce37a05fd5919f3274b3b43aad64110baf4c4b1fda3843cb1a87b6be4ab592a8f62e82b3a716a86ae61b20
 EBUILD raet-0.6.8-r1.ebuild 1031 BLAKE2B eb493dd5e8bf7969ceb72bd317ced5c0de7b440470420c827366b3e47ff88438df3e1e72a4c3b3035b912414578c41d31b00f49a6db81f8cf10dfe09a501e418 SHA512 4562a87f0fef26a9e2ec5af375348d6a2cb2c26e2f4795bd3868bef5eed040e99707859507d331a22cd69f04157c8e99030691adde90de13c64288e597156aea
-MISC metadata.xml 489 BLAKE2B f5c03c42cb002c7d6c81692f7f98312ad51a06e306a33b63cd048cbb25d0ef1429e5322bc5eb08de2d3d5a179a100f61c5e73d7f874a43e009eb0bcad8013e26 SHA512 0987a39737bc4556adf615ced4c1550f69fd952d32f5208b91763da8d23021fa88c5bfebe0f12fa382fad2a4066f68fe372c637389543a936dfc818f1de5f621
+MISC metadata.xml 474 BLAKE2B 8b186f4c18696c3df8e3d6b29f5d45d3c040156a473edb5066fa79f449642e4f1a3274974bbfc02733cf9ae3bc04b22c06cb8ef80b9962d14b4ee26dedc329d9 SHA512 33760bd0996fbe1d95e4f4ed658eb4a6c221b4c8911842db2e0f443d317c9c079ecb5a8e8f5cfea1c47531a944c6d79b4f4bd29775ddef6cb6c6008c4f359e15
diff --git a/dev-python/raet/metadata.xml b/dev-python/raet/metadata.xml
index c86e60dfed36..e4112b9cafa3 100644
--- a/dev-python/raet/metadata.xml
+++ b/dev-python/raet/metadata.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>chutzpah@gentoo.org</email>
-    <name>Patrick McLean</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">raet</remote-id>
-    <remote-id type="github">saltstack/raet</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">raet</remote-id>
+		<remote-id type="github">RaetProtocol/raet</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/random2/Manifest b/dev-python/random2/Manifest
index 9fafbb107691..b62733cc3876 100644
--- a/dev-python/random2/Manifest
+++ b/dev-python/random2/Manifest
@@ -1,4 +1,4 @@
 AUX random2-1.0.1-py39-tests.patch 1264 BLAKE2B 8a9010deebf3529bc968c6b05a84a2034994455874a1b011d0a711da5ca863ad1aef4e462e7d5f6183121bd0f01e2f2270e057cb2c54d907541e9a0e491f09c7 SHA512 20164add503f8a6cf8750cc2e95baec382f3faafac8ed50046b61e5b81a9a2da4033f8a9f196e3ce1516dfe21228c2d25e3957eed3c85bb1c8aeda284a864d1b
 DIST random2-1.0.1.zip 21088 BLAKE2B 69747711e355d3dea2b16562a6b9cdaa170732172e9eaac9a5cee4b8058f569e0c4527aec89e408e6472168fdecfc52b87703d23f153ec04f6ed2c049bcd162a SHA512 31de31c27bc6e07e99c24d30e97d9ddc3085fe557bcb0725881d4ab0b4c06e6208f64ba6267098c7b1be4f115ad45b399e841beecc90f71da2fb7d82982e75ff
 EBUILD random2-1.0.1-r1.ebuild 525 BLAKE2B f3e561b1bf90a53b44463682aaf4af1596078f3faef9f0dbe791a502a1b5f5d9fa8ae79fc89111aae0aa8e7a6ef74b0201c07d568d620aa4b6a4382de820dc48 SHA512 5b75bbd0af5b70487ca7a196f73794b867b4fc5186bde950244d7d965f33c32a5ec8cf1746c98f8838cb3bcbd5967f205a8a35be63b5ac26b84e299acfc95427
-MISC metadata.xml 217 BLAKE2B ee18cbf5c74b73e82c3d6528706b679f77eaf110c7bef909917ff95a879e1677926033175865b01cd88cf187643bf94dde28c48a6303164d6ddac16a1ee6b6ae SHA512 ede62db62d2516bfa0b6bd9fd3a8f3f54303d57b81f04cc79ac3da39c33b781e35e6cf50a47a2a030a8038d2ec4eb8cabfe00dd3881d838a01c4916828b91396
+MISC metadata.xml 287 BLAKE2B 89628562d307dfe24bb75abe40c0adfd8a846c986321ae534969d1870d2d5b04389124f3e6ede53042f951c72f3ce014a72df43493c08c43352685a1597a7a07 SHA512 efe34e816a1c71a5585ad9e4abc3cb66fa1da566448f5744afccd7ed2b838a0f624c782bfc907264070a698a462b4bb5cacf1470836832ea3f443a92cc49ef59
diff --git a/dev-python/random2/metadata.xml b/dev-python/random2/metadata.xml
index 13830225acf7..940f80c114b7 100644
--- a/dev-python/random2/metadata.xml
+++ b/dev-python/random2/metadata.xml
@@ -4,4 +4,7 @@
 	<maintainer type="person">
 		<email>grozin@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">random2</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/ratelimit/Manifest b/dev-python/ratelimit/Manifest
index 17ef9d522b91..2dd5a74f5625 100644
--- a/dev-python/ratelimit/Manifest
+++ b/dev-python/ratelimit/Manifest
@@ -1,3 +1,3 @@
 DIST ratelimit-1.4.1.tar.gz 10700 BLAKE2B d2fc1b0695c6bdc7653862ca790e9f5ec87b25513a93ec058384f334b47d5080570e3511eb6680b934b345ef5562771a078fc4ced3ceed263a7aafd26af3bfdd SHA512 ab8a2cc95b852f91c614ba5a5a677d2b4b99d5f810ec8a11e69d97af58cef1f67457e1cf686a286073c85b39c2ebbeca0a459382e410c9e8eda12cecdda57f02
 EBUILD ratelimit-1.4.1.ebuild 517 BLAKE2B 3876d99b545ea1c12a7dcfa21c5cbc33c81088b1a01364bb4a345316250439859ec1efdfb121baa1b650409b7ac191c7793c6f7894ca86e0ac046a7568534634 SHA512 8d87580f28489774d7de43409bb6fbf0d60fa2960ac3ea62048102222bd97c5ebe08b0a7f22c7ef430849283351f92a2307769080ccbd64189126f8fb67065a1
-MISC metadata.xml 716 BLAKE2B 9ebf5c00beb4571be310d9c5ef0708677f5c80c59ff6335b526618ae1d005d97e9415131be27043895d99ca0c27420261b1adb19160a0c647c1999af99c4261f SHA512 356610616edb0430a4d069a9f86f0db51952b2c522cc3a7a618629f115a3ac9018fc2e023d4199628a97bf1c52783f932ec2e90b4c1d2e4eb1693aa24757fcf2
+MISC metadata.xml 762 BLAKE2B 935e95614737d312b0f950b219153c68967994a9961a4b4a1302d63cd288b072cc041ccf6a4536a016535a15d4f357815b0b8120e8950e85753519411133bb10 SHA512 20b0d979472eea69f4704ca523677126a166fba06f7f0123afd4ad20d8a1ec07580a24678204e956b4fa3fd00dfe8247f1d495718030b240484c6bcb2ebb8242
diff --git a/dev-python/ratelimit/metadata.xml b/dev-python/ratelimit/metadata.xml
index 251874fa1888..655eaa2b6e00 100644
--- a/dev-python/ratelimit/metadata.xml
+++ b/dev-python/ratelimit/metadata.xml
@@ -15,6 +15,7 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">tomasbasham/ratelimit"</remote-id>
+		<remote-id type="github">tomasbasham/ratelimit</remote-id>
+		<remote-id type="pypi">ratelimit</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/re-assert/Manifest b/dev-python/re-assert/Manifest
index 8f81aa6986fc..095be5bcfde6 100644
--- a/dev-python/re-assert/Manifest
+++ b/dev-python/re-assert/Manifest
@@ -1,3 +1,3 @@
 DIST re-assert-1.1.0.gh.tar.gz 5010 BLAKE2B fc65f43b3525d02d877d51f0a1556b6b205dd1126fc205b775f5c0b6c34ee7c3e8d224fc3f46a80e8df4a366674be90221e891e19e12072c87ff82451ca8676c SHA512 fc14267cc68a12ff7350982f0bf54c77107809c9f0379ab3aa73fa1b7cf5ccabb130fcd35ab75bdf183e69c802a041deac707e1f0bab1c3815d4146b4e320c07
-EBUILD re-assert-1.1.0.ebuild 535 BLAKE2B fb970cc5cdd2707eb7e9020b8750bf73f8a144451a125651f58646f0c78abbaca7710734fad91f66b8498ada4b3d0df3dec601b111225f10b072d923ac037d38 SHA512 e7a2cf0e3b6fe5a9ef0bc19d5fc07250781f23632fd3b18b55489cfa33e508994ca65c6148e510571dd57b06b2b0430ed21e14daa634fd9a01715468422d9eaa
-MISC metadata.xml 242 BLAKE2B 17fd7db1343fb7dba1842d5b62d83e56e2816962b0122ec6eee7f9e163f333d69ede2cbdf2a2ba8c77613367fca3d2cee779697fb25b5d8cf0439e1e845dbf1f SHA512 2ce768d5aae91f32da90c62900f556c647eb9806c810a817b6c45c5356e71f504b5a646bf75f553c3a9bfd3f94c4317df4948bae863ef7525b4a013b63618cd8
+EBUILD re-assert-1.1.0.ebuild 548 BLAKE2B d16b92710889271da0e75b81903a384dd0186a7bc05f61ac5dbebcf3e97d2ba7561c7c605890df9008d05fd832195c2370ca9c82921873d68e7f9ace24441ab3 SHA512 dc430c98858c0deed19e3f36b1eb282500d185e820230294ca0bf1b5bf167c985836502473ae65fe16217bccede1de0623002ef67f6c3d1160f8d6454ec55641
+MISC metadata.xml 314 BLAKE2B 0f8dfa9c8b218264084ae736d762c3a052dd103bbd4072fc528683ba99b4ad3d5b6d340a6c981054ef96ac687f51df87796380f8583fe218d61d462463dc31f1 SHA512 4996c48e1786067d96c143b2e089107a0c822613c708a9450fbe7e34907ca626cbfb19437bede9a0cb59f976b2c3b8641026521864803382af78a8c6acb68ad0
diff --git a/dev-python/re-assert/metadata.xml b/dev-python/re-assert/metadata.xml
index e59516686a44..2ec36ed8486f 100644
--- a/dev-python/re-assert/metadata.xml
+++ b/dev-python/re-assert/metadata.xml
@@ -5,4 +5,7 @@
 		<email>python@gentoo.org</email>
 	</maintainer>
 	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">re-assert</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/re-assert/re-assert-1.1.0.ebuild b/dev-python/re-assert/re-assert-1.1.0.ebuild
index 65208146a66c..e4cc4c60682d 100644
--- a/dev-python/re-assert/re-assert-1.1.0.ebuild
+++ b/dev-python/re-assert/re-assert-1.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
 
 RDEPEND="dev-python/regex[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/readthedocs-sphinx-ext/Manifest b/dev-python/readthedocs-sphinx-ext/Manifest
index de457b1be9a9..7c2043f9b48b 100644
--- a/dev-python/readthedocs-sphinx-ext/Manifest
+++ b/dev-python/readthedocs-sphinx-ext/Manifest
@@ -1,3 +1,3 @@
 DIST readthedocs-sphinx-ext-2.1.1.tar.gz 10181 BLAKE2B 01ca34befd0f18bb747d7f843e0cc394e19db4fe471f2bb21617b6dbdf4c1ad9721047185561f9bfbd8f770e1fefd5b560e65d7c5e2675c1bc8d74e08252eeb1 SHA512 5594e375133477ecdc1d22a78c0d4dac73c5e8c1715f4309a9674497ef860b07e8872bb4ba471fbffacd8bd22bc49741b8df54ad9ca9bb474acd9cdee72c8969
-EBUILD readthedocs-sphinx-ext-2.1.1.ebuild 748 BLAKE2B 8a336377db58d48fc22e79b1a464a9b7a1d7691cdcee425b3416ab6f61e6f4d83610911ba9fe37bde7eb36cafa6744f3508f8dae570b6ee8d2c767dec843e888 SHA512 4fadfbe3763d7b2d0e65b57227f9149690c3603d52fb8a38a9c6cb92b473afbcdd18b075823dd420854dddd6a19c686ae21f3425936fe04c9199ce5144d2ba7e
-MISC metadata.xml 271 BLAKE2B 31405284f0b172a72344c5300348da7b62689758b67e08380f46cd0b4d58313324f234550c2d8ffad7cf2c70165edf59c24a8b32ff6aeb82b63f7c40fc4180f5 SHA512 6c24a69f1cf6d89afe9dcea1b07cc8fd3fb9debc3cbfd154dcafa42bb18c84005e83d9204b9a21d91bbb23e952b1069d2f72c753e644926ef9bafd3d86fb4e2a
+EBUILD readthedocs-sphinx-ext-2.1.1.ebuild 754 BLAKE2B c3636926e919a5c14a6a547159318773e128e19eacdc5a8edd9b7d055e396decc97f051bdb84ebaff2abad9ae566201b14e1b0394ff1054720963f574ac03aa2 SHA512 bd9ea766393696b52f21699b55b5d3bbd467d33ceaa000aa0e4a6ae592faf7820efd9b923554d7dd8326191b0d01eba6daae136a89dfd4382edec38bbeaa7a70
+MISC metadata.xml 349 BLAKE2B d74b06bcf26cb258eb33f7b445a1486eb04880987c3227e891fe3fdbd39c2108dbe4a89b37e76a57c3d204d0388081306cbefcaa5a904de2c718b33f3832f0dc SHA512 ad5563a21425a463bb85e37b2f0d4ce12703999d89ba943f8bc879526b83b58462c8dfb1c5224862216b0f959ee0e44fbf99e940eea6159674a27071a669c99e
diff --git a/dev-python/readthedocs-sphinx-ext/metadata.xml b/dev-python/readthedocs-sphinx-ext/metadata.xml
index ec3c387df89f..9fa0dfd7b6c4 100644
--- a/dev-python/readthedocs-sphinx-ext/metadata.xml
+++ b/dev-python/readthedocs-sphinx-ext/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <stabilize-allarches/>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">readthedocs-sphinx-ext</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.1.ebuild b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.1.ebuild
index 2b127f33de6d..dbea38d520c6 100644
--- a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.1.ebuild
+++ b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/jinja-2.9[${PYTHON_USEDEP}]
diff --git a/dev-python/reedsolomon/Manifest b/dev-python/reedsolomon/Manifest
index 8a7ab3af7a3b..d0da773db722 100644
--- a/dev-python/reedsolomon/Manifest
+++ b/dev-python/reedsolomon/Manifest
@@ -1,3 +1,3 @@
 DIST reedsolomon-1.5.4.tar.gz 283778 BLAKE2B 5354b8d320db1533469ae1fd706c0412a81bb408675041af5dbf42b42014e4b779b937fa8e3b3d0a5e67e62d9fd7ce9ac519022dd98dbc82a156ee0cda7914ce SHA512 c738f817c8f536ee86e5bcd3de73a4cf6a3e606ba196a359b6c09e7372dba31316ddb8b134d7c335100e4c2ff0158ff07caa35fee9bc20768bde23cd803e274a
-EBUILD reedsolomon-1.5.4.ebuild 670 BLAKE2B 82c981c08f59f999588baf804934f82190569dfaad641e705ea7e62f21bf8a171c9e3a176b48f31bebd0f0f94b338e2b356d17b950b4a7c39e8e7e749b8a154a SHA512 69c882d797293e2f0e701444474c01c94328624091a2397213b6a3f52258e40af43bed2b2ea2f7a7f22a4c4de91b8930a42250a1b8c9476a05cd70355b25ca69
-MISC metadata.xml 455 BLAKE2B 255105206c0c23c7db350779418c5851c3bb4c943efce7ba6fb7e15cc0f62fba378ad821f65c8b5d6d5abf54c58e640f59437cc1bd121df951beba2bf8b24dea SHA512 eb3c365cdd302a46b963fa74d3c4b3bea7e9b55fa3a06c5da975e652aa1a721f6bdd92cb236f3a5629a8b0f018007eeefec06a28762dbe5ffda53f525d050ef7
+EBUILD reedsolomon-1.5.4.ebuild 732 BLAKE2B f89a22a85bcad48d1cf297c3bcd2e2276908d64b0b52664e2368b662c29cd722d176f807811fe976a1707923a2cafb1c82d8ed5cb24b607554ea2c0fa59920e2 SHA512 d694ee3d0524b61d0810454a916e3321bea29cc2abf0cdbe03b6de9d376c5f5f583fc5a73abb8445bb554a9764794d08d1dc2d8a322181a6ee282540604e94a8
+MISC metadata.xml 501 BLAKE2B fb51af37fc1436893f06069bfe83fb21c641ee2d06305e84ef7d0ad63d0111b5afaf5e8048fa78a85e3f74e00dddf358f6be4d0f7a5d85f57f24eb936107198e SHA512 c265d0178999601864ebe8b70e79912661169eef09412bcb187ff9e2446ec9893fd618bd96d49458ccc598a1221bbe46a055ee48ef24363bb91b9b9eb1451729
diff --git a/dev-python/reedsolomon/metadata.xml b/dev-python/reedsolomon/metadata.xml
index f4f98f9eb8c3..3c10820d5616 100644
--- a/dev-python/reedsolomon/metadata.xml
+++ b/dev-python/reedsolomon/metadata.xml
@@ -11,5 +11,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">tomerfiliba/reedsolomon</remote-id>
+		<remote-id type="pypi">reedsolo</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/reedsolomon/reedsolomon-1.5.4.ebuild b/dev-python/reedsolomon/reedsolomon-1.5.4.ebuild
index e3c9f2928bd9..fb707b51b17c 100644
--- a/dev-python/reedsolomon/reedsolomon-1.5.4.ebuild
+++ b/dev-python/reedsolomon/reedsolomon-1.5.4.ebuild
@@ -12,10 +12,14 @@ SRC_URI="https://github.com/tomerfiliba/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+"
+
 python_test() {
 	${EPYTHON} tests/test_creedsolo.py || die "creedsolo test failed with ${EPYTHON}"
 	${EPYTHON} tests/test_reedsolo.py || die "reedsolo test failed with ${EPYTHON}"
diff --git a/dev-python/rencode/Manifest b/dev-python/rencode/Manifest
index e0ca47782e47..cfa1cb07c68c 100644
--- a/dev-python/rencode/Manifest
+++ b/dev-python/rencode/Manifest
@@ -1,3 +1,3 @@
 DIST rencode-1.0.6.tar.gz 25455 BLAKE2B def013a569a53e2b2d96b3430c13676810bc5879e565f091dbc44f1ae950b8ec7ca0fa5e35a974432fd71a1bcca5a3f1f18bb2a9f042480167ab50e4f0aba8c3 SHA512 f04de4d3a83aed916bdc4b7a8ca772655e9324d0531ee882cb7d2a1e92b397bdcec8497bf02939e0a806886ecc62ed2e7319dfee054dad1b69052157f0959e8f
 EBUILD rencode-1.0.6.ebuild 545 BLAKE2B e761a96b2eef5e0966d35b865214a2b365778ff4a550612568d1b6e2af46e6f78430ab206722a3e94d318b785b41e22e2210e6790e9dec24461728b7b25ad566 SHA512 2d265dca55e0aa5045d6795f19753a257e3e9563c35728f0756513b826b42112e7428c23e8a9c41d9ad57a87775d8ae375183f123be5fe58a42e6392bbf02eec
-MISC metadata.xml 666 BLAKE2B e4047d25b3bebfa106936f105ed4fb8ed1c07aaad32b42f5bb2645388028baf30b8fff228fd32737c2716c5273f6872c5290a6e132b850d4640fb1d44e257683 SHA512 026950a9462b1207463f2bf923c40bbe310c63ecf73676f935c9d392fcb7673b4150de82e7654ea0914c0fdbd6b1a110f00e57fc92b931a98a5e9ab032918971
+MISC metadata.xml 711 BLAKE2B 99d00b59865b5d2994f472e347afb5cf8a4bfc1333c9eea5ce76d45f6ae2ee246c376bf2a7b0dbafa7f8b9e14ffb4cd062ea1c3e6bf300061b6bb13c212aa09b SHA512 55138e8f053487e2d4fc904ac544f9fa2058ed3fb2ab3238d36612c6741f667a812460d613c474a287eb871cbc8ba76b521838ca1d030a088761e5c73dc65511
diff --git a/dev-python/rencode/metadata.xml b/dev-python/rencode/metadata.xml
index 3ca1128740cf..be3b0fc774d0 100644
--- a/dev-python/rencode/metadata.xml
+++ b/dev-python/rencode/metadata.xml
@@ -11,5 +11,6 @@ pure Python module written by Petru Paler, Connelly Barnes et al.
 </longdescription>
 	<upstream>
 		<remote-id type="github">aresch/rencode</remote-id>
+		<remote-id type="pypi">rencode</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index ef29f5fdf4f8..c234d3c011e8 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -1,5 +1,7 @@
 AUX reportlab-3.5.48-usr-lib-LLD.patch 1601 BLAKE2B 34ff1ce6b0cc2fa8ea3b2bec79ccab0eb7ccc28ed306b524b0fced1a37605c0c957090c39c5a0b71dd6d3c47c60cb7b714142a2f339170b7dcd965363ff2df66 SHA512 32fbd4410846ba4d0a3a8a5521f21f445f76ee75d0adde6ade210816901f1bcffc511efe3822c9b473d71b3541a716f9b2a3aa39181afb21de3aad9d13026476
 DIST pfbfer-20070710.zip 677333 BLAKE2B 100214476a361a5e5d1f3da0999591345f6e3a3f8c6bc3f6a3e9eca734190c6259758a43302c6e41254d33491fe535eb7d5dd07aa9727c912424bebc31fc18df SHA512 6fd4a5d955464b10d13a7b748703450c1fe120d5ed09e8cfa1b4dfa9c183c59fe001df29433af551796b0df62544b7ddc364f9bb1bdcc2cd300434340ffcc4f2
 DIST reportlab-3.5.48.tar.gz 2890211 BLAKE2B bf0cde9b9e80459caee37949dc90a777a56da5d2c8e6dde09bddbdac2f2c55031d92b3c7c6346b6f563904525020c0e4f666b5e2effdd761c81412df21ec60eb SHA512 ce31cb7e9e2226cb6d59d446f90c1df94f0f84077d298f7ba862f5c75995afa20fa077b1ee1ab9a145c9276cee0d75fe61237e001ad0e5b96dfb0027adff3db7
+DIST reportlab-3.5.56.tar.gz 2899527 BLAKE2B 83f14c472a8675449e2f50f806fc5136fceb2c2f307ebd2d34ecad98ce6a67f62971869e05b7d4fe7017b5e728d21d16037ef6f04c3639b0cec8069851e46b64 SHA512 49bafe1b1f0067df1d76a8e61b35ec7062dfffa608f6086241dfa589244bef5784180de7c3d86dc62334282a40a012f7579f5c3cec3c4b0387ba2c482a04c010
 EBUILD reportlab-3.5.48.ebuild 1430 BLAKE2B 2f1ce1e0689bcf583f179c753439b7e434c6ce79148b1c1eb095970320cae46a9c78a34cbd4dfd0d0effde18f6286c06a23f6be41810c514d37a1da72f9b633e SHA512 6ceb40f8f1bee537767df4f502bf131ff3aba52d50a4665a07a369f64dc7593dcadbc67ff8798fa7853dc22abe995dfc5fb3483c669ec5e357e3880c6debe5d2
+EBUILD reportlab-3.5.56.ebuild 1435 BLAKE2B 6741aac70d54b18f42ecbb21986b432e952dab18511367b2f3bf37862099b9032c0afa4af13065ed1a76b2c8328f5d5434178b481035a7254977dfe37874a932 SHA512 576b57a9432e84b28f9c25a9b5a883eac70c5804b43332bc436e70480bb4ea2d013c3dd2f8a9c07a49063b07e2c589275f73b5e87941322b5ffd1afdae26d796
 MISC metadata.xml 322 BLAKE2B 64b99a95cfa082f2ae8e3a778cf44d3598f4d3f43f03d58eae011aa4b361af042e1b650eba9eb17421c8c154e654a8340d4a85d60891aa89666861a973a49d15 SHA512 cea3f16d94fb50eb3e505756952d9ee14e170e5354e5a3a186c24dc3a253ce96d6d275505e71586ef360c71e080a9eaf5fb461d8aff4fc18ac6122912bbe1976
diff --git a/dev-python/reportlab/reportlab-3.5.56.ebuild b/dev-python/reportlab/reportlab-3.5.56.ebuild
new file mode 100644
index 000000000000..687a502c68a0
--- /dev/null
+++ b/dev-python/reportlab/reportlab-3.5.56.ebuild
@@ -0,0 +1,62 @@
+# 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="Tools for generating printable PDF documents from any data source"
+HOMEPAGE="
+	https://www.reportlab.com/
+	https://pypi.org/project/reportlab/"
+SRC_URI="
+	mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
+	https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	media-libs/freetype
+	media-libs/libart_lgpl
+	sys-libs/zlib:="
+RDEPEND="
+	${DEPEND}
+	dev-python/pillow[tiff,truetype,jpeg(+),${PYTHON_USEDEP}]"
+BDEPEND="
+	app-arch/unzip
+	test? ( ${RDEPEND} )"
+
+distutils_enable_sphinx docs/source
+
+PATCHES=(
+	# bug 738312, remove -L/usr/lib from link line
+	"${FILESDIR}"/${PN}-3.5.48-usr-lib-LLD.patch
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd ${P}/src/reportlab/fonts || die
+	unpack pfbfer-20070710.zip
+}
+
+python_prepare_all() {
+	# tests requiring Internet access
+	sed -i -e 's:test0:_&:' \
+		tests/test_platypus_general.py \
+		tests/test_platypus_images.py || die
+	sed -i -e 's:test9:_&:' tests/test_lib_utils.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	pushd tests >/dev/null || die
+	"${EPYTHON}" runAll.py || die "Testing failed with ${EPYTHON}"
+	popd >/dev/null || die
+}
diff --git a/dev-python/requests-credssp/Manifest b/dev-python/requests-credssp/Manifest
index b2a2d3b2f1f8..0dab2222e163 100644
--- a/dev-python/requests-credssp/Manifest
+++ b/dev-python/requests-credssp/Manifest
@@ -1,3 +1,5 @@
 DIST requests-credssp-1.1.1.tar.gz 23274 BLAKE2B ecd36a6e2ad3e8f7b72ce7aaf57a6cd36f4897bf412ecf03d9555eae11c4cbf56eb6e986aa4173626c6624d4ba05777564b17bbe2a87e2d4d42edb15dd3c0aa4 SHA512 729fedf768ca7ee253d395645f25d266c0f917b9319b97973b514ff00e71f4441a79b25b4a89bdb00952ec8544d4db0bc68184bd037fce6b587331c5827c2f71
+DIST requests-credssp-1.2.0.tar.gz 18384 BLAKE2B 5d92326066f8e6abf675b3ab56522aceefb2ecf99bb58d44de4f0c40b46582b567888c6b888d21da29ef1746d070526c6d35601b88b5ca207f3c7f2b6c596260 SHA512 425e18b673cdf1006d6ab3d4108acdb2a8cdf6132646663741339c771aecada2cc237d919351cd0d2ca6022a0bcddba92b3b44b15386d683c6c18db461b8c7fd
 EBUILD requests-credssp-1.1.1.ebuild 699 BLAKE2B 34a9b5614d81cd584b48c51b12055cd5c4896252597c798f5deed2f2141ae19a5e13c605e7645918cbf50be67f28a39375b3687b6639d616205e8e369aeb9839 SHA512 570da2f38351eb24994d564eedb38ca47387ed07d32ec223531cac85ccc165a4434efd3fb02c54e9c21d5b5158853f571fab88e78af19baa2e7d978a1f92023a
+EBUILD requests-credssp-1.2.0.ebuild 701 BLAKE2B 9f57ce6caa240d0035de860c3c7062081c4b9adff3282c9d2fa4ae94c3ae272b688af59d651960f73cba95459fe3ec6666c428c21003bc911822fcaeb020c8c2 SHA512 73a8337491ecd11f16c99f2650fb712e4025b7a15b0d31a96e61ffa544852f9581c2d3ac4bcad24c71d4039d8aad006eb977f2a4ed4957346e9c8ee280528300
 MISC metadata.xml 325 BLAKE2B 29ae1049a0331156fbe1f955fe60417f1d9c5a9b78d0248dd919077c9a6938843faa37f6a56fc50d60d5193f6f3593d2845ef5f371f4bea5d69bc03a9111977c SHA512 738d9d27265c68d240b23837c3c527f60067e1ca70630ed610845a3b2796905f236d90fb3b812958dfd202d3c91e958a9976dd3395a9ceda59ad06d6f1a67893
diff --git a/dev-python/requests-credssp/requests-credssp-1.2.0.ebuild b/dev-python/requests-credssp/requests-credssp-1.2.0.ebuild
new file mode 100644
index 000000000000..8fbb59461c3c
--- /dev/null
+++ b/dev-python/requests-credssp/requests-credssp-1.2.0.ebuild
@@ -0,0 +1,25 @@
+# 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="HTTPS CredSSP authentication with the requests library"
+HOMEPAGE="https://pypi.org/project/requests-credssp/"
+SRC_URI="mirror://pypi/r/requests-credssp/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/ntlm-auth[${PYTHON_USEDEP}]
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/requests-file/Manifest b/dev-python/requests-file/Manifest
index e55df62af0b0..4d8b2567980c 100644
--- a/dev-python/requests-file/Manifest
+++ b/dev-python/requests-file/Manifest
@@ -1,3 +1,3 @@
 DIST requests-file-1.4.3.tar.gz 5252 BLAKE2B 18b533a7619f46c1d01d0cabca2137592ff614c2a33ccbe227d4f3ea2e4854b7ecc7973d56b15c72d980d03df7cee38fe4216eae35f5803bbbdb7845f8e3e5ec SHA512 b92294a11c9cc13beb5df598b636d999e0fcd46d05b775bbb69667f066d24ccf55b5af2135aec8d69c0096ca64e13bab3c3da64bee00f0c12edd05f43430d80c
-EBUILD requests-file-1.4.3.ebuild 522 BLAKE2B 72fac7b363ee9de61e98b46048a221c06ff436336a7dc14fd0cf7ae8b8c4d982c01dc2b469793ab93d9fb813c917e11e42bda341927dcb356916d4acf8b33d5b SHA512 566068482ed65384721a8e4dfa1a71f8f5e89c874da074670e699e57f94ceb19d19cb0653355c06642ac349210d609b9a61ca6ba55dfd23e8039bf325f0bec8b
-MISC metadata.xml 253 BLAKE2B 7dac7f77dcc8de31f439cc6d7770a503f95be9c2f8ae57df9e725df941e2b31a90a43664a485a5fad9510b9ae060ba7aaaddba29324338dd9eb07d88a63c7dce SHA512 303268e1f46e337e32c64b544c0962ecbe8de1799c42736b3c3515b6f31954a655830c402317bd0534cac12059e17eeb5f360d010432dff795a136662a5c10f1
+EBUILD requests-file-1.4.3.ebuild 504 BLAKE2B a1ef6fdc88986bca7087daa78aa31956893ece1b6c715b61fa8f0be76f61fa876e90abca2b475b89ec6daaaabb7147eb74394b075cd17752bb2e3ba7b0b81880 SHA512 7c72d27cf3be88e94d2440e9fe75e683b0cc68da81296496e954424f3d7c689a3177a35b1ddd6a5823fd5fdd2e173198a0773767b5eb84148b731128846fe90d
+MISC metadata.xml 323 BLAKE2B 2c538f8e61493f84b981185d91a9271ea5cbc8efcad644144ea2a7d990840b76913819fbadcb08e5bc5ec5500f93fc0bb0073013949d932453131f7c4f1cc401 SHA512 f88f18e2c93d2143a43fb52aac49f5744e41f701ed378880db0a931f5b2b87a2dfddfd346a77e3cba25b7b6a0c91ec3d224ab2446234e92d972b4fcfe75759a9
diff --git a/dev-python/requests-file/metadata.xml b/dev-python/requests-file/metadata.xml
index f3de5f693ed8..fa0421a3d388 100644
--- a/dev-python/requests-file/metadata.xml
+++ b/dev-python/requests-file/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>patrick@gentoo.org</email>
-    <name>Patrick Lauer</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>patrick@gentoo.org</email>
+		<name>Patrick Lauer</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">requests-file</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/requests-file/requests-file-1.4.3.ebuild b/dev-python/requests-file/requests-file-1.4.3.ebuild
index 44ab0065f579..87270485b515 100644
--- a/dev-python/requests-file/requests-file-1.4.3.ebuild
+++ b/dev-python/requests-file/requests-file-1.4.3.ebuild
@@ -3,7 +3,10 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+PYTHON_COMPAT=( python3_{6..9} )
+
 inherit distutils-r1
 
 DESCRIPTION="File transport adapter for Requests"
@@ -15,9 +18,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
 RDEPEND="
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/requests-kerberos/Manifest b/dev-python/requests-kerberos/Manifest
index 1d509efaac5a..5ff73c719ddd 100644
--- a/dev-python/requests-kerberos/Manifest
+++ b/dev-python/requests-kerberos/Manifest
@@ -1,3 +1,3 @@
 DIST requests-kerberos-0.12.0.tar.gz 21579 BLAKE2B 297cbecb0fc3508f5f62440c5860dcd94eeb077e68757c0646e7e3bec65cd34e19212b9992dad491ce0adeb91234db533528936f740599e42ff439f78af103ba SHA512 b925b5f9f6753e87368dce451927df09568d0d6126d4ae8514bbd99a794d983e32298b92b6239be9f95595483e2682259cf165c6997d17d9cea64a81d4af1a06
 EBUILD requests-kerberos-0.12.0-r1.ebuild 784 BLAKE2B 9fd22d59c260eef8b84cd0ed1dee5f7a3f0f0f74c56334f5c11470d57d2c9e0a0dbd12c35d82dfbcdf22fd7c6361cf5c1f56002278f0ce542bb05b592162e1b6 SHA512 059b1cb47c00dfcd957e7f4e3f88e8f1e43690534c26ec603d0a443b786997d4b7ae212826d0ef3eae523624c8456a76e4146c35b5ec4322a730615c28d5679a
-MISC metadata.xml 320 BLAKE2B c58268e9df73385438694b43f3784a58d11f003adcebc306d70ddeea26789cfa22f709484a99902326074d16072563011c07f09eb071a9c141e4ee6ded7dbd56 SHA512 a33854d5f3c9a4d077d51a4254d18045a4fb0a50c223e809ea0a7415c869152e30122c3d7e005b25c7e07bd660678db5613449688c086582c172a77d19a9e540
+MISC metadata.xml 386 BLAKE2B 6eee29cfd3bc3387cf97222bd167b60be9c45f8d0dc417c428241660c8151f74d284423f7a7c324d652f99f677c86b34e48fe1a627cdae52af349f37e7a77aa8 SHA512 885e86f315747187bff26ee29b88892a93712250923b5ec94a7baa1e30cc4e28cced1d93e055eb4a0bea15362fe9047d133747812393cd83ee327b9092a95127
diff --git a/dev-python/requests-kerberos/metadata.xml b/dev-python/requests-kerberos/metadata.xml
index faa93f153410..713965237730 100644
--- a/dev-python/requests-kerberos/metadata.xml
+++ b/dev-python/requests-kerberos/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">requests-kerberos</remote-id>
+		<remote-id type="github">requests/requests-kerberos</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/requests-ntlm/Manifest b/dev-python/requests-ntlm/Manifest
index 701e227a911c..335a96731896 100644
--- a/dev-python/requests-ntlm/Manifest
+++ b/dev-python/requests-ntlm/Manifest
@@ -1,3 +1,3 @@
 DIST requests_ntlm-1.1.0.tar.gz 5183 BLAKE2B 190a75d3f82ae2216e05295f855aa072f98908ef8a0d4dda68d6e39239655ccf175c707af137290cd78cf622c0a3d1741a0afbb1363f8b170f408c34a2682fa6 SHA512 9a74ecd6e4ed5c5e4381d2ee3fb9ff233352b49baa5fae4e0ecc30aaad12fc7a5c1b9dd936f35d4a3815ae7f6ec5bb8581e84128d63ff0e961181408daddb807
 EBUILD requests-ntlm-1.1.0-r1.ebuild 567 BLAKE2B 7d80340d656f8432e1a60937ab05544607314b37b035baf87bfc6bb866956fe9e6276ebdbed1fe52dbca678ca94c4c24030921c3b7d6c957ccc3687cab56c32a SHA512 c44a26c1c43bed562dc250fc9fabfdad407e54865f778b10930c318cad616586f45cab5556e681ea58fef916745e585a25d4010b08da8f354f31f8cfa94a4177
-MISC metadata.xml 429 BLAKE2B e6f1e928cec0f1fdf663d132370e26df8fcd5169e8d36db83f5fdfdb63aba79ba479547237b982d33db81e65b0c2bff182cbb316c5e9208e0bd018e89931e6dc SHA512 ccb4016446f637c44fcba7446a7d3e3f0521164e76b6f7f5a52873fac8f14728100b67d853e7b96589c1f46f2ecbabcf67c33101a2c43e71f0d8fb2f8fe2f70c
+MISC metadata.xml 491 BLAKE2B b503610de8790903299c9424c570b85b7566d6a2301a8ab11029e5b891137a3dc6fb634fc3c4f6684ab382884157fbef7448ae8e57e5a29c5a458e64238ce244 SHA512 9608e9f1b72871d8c4146fca162c046231492a7872314add98509813ade7b2bfc23a3ed70073671ecb2b7096ca560d8e2fa2c1e2d6c261b29f26fdef43500c6c
diff --git a/dev-python/requests-ntlm/metadata.xml b/dev-python/requests-ntlm/metadata.xml
index 1183eb4b2ec4..c4a594c35d01 100644
--- a/dev-python/requests-ntlm/metadata.xml
+++ b/dev-python/requests-ntlm/metadata.xml
@@ -11,5 +11,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">requests_ntlm</remote-id>
+		<remote-id type="github">requests/requests-ntlm</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/requests-oauthlib/Manifest b/dev-python/requests-oauthlib/Manifest
index 0db798d75728..1d90bf54c23a 100644
--- a/dev-python/requests-oauthlib/Manifest
+++ b/dev-python/requests-oauthlib/Manifest
@@ -1,3 +1,3 @@
 DIST requests-oauthlib-1.3.0.tar.gz 45449 BLAKE2B b7d0df59eefe801e09329bde8604d09fe0f45eac146172c5ae5f1a77df59229a89c70d78a97fca0f7b546a015e66d6d9dd4ac3efdd4de0100f77f2427106e197 SHA512 0eebd209dad892567de7d37f1482b5c7523eced3a73a68054674b29447d090c885b2388fd6f2db26436f14098833051c8888ace8b137889a4012e010efb0e86b
 EBUILD requests-oauthlib-1.3.0.ebuild 872 BLAKE2B e747eecde2f676da5b90895c6c5fb60b7d520e2a0d15991fe0ece10f30a5757a57bd3d8bd878e9dec4d583c3168e9886a803183510b9f8165e98b4f523f7d815 SHA512 1c95e84889b25abca6107314e7d1e75d1388a0d533f829ce5db171aadef6323342d63b16f85806f58ad5b812d70691155a5c011c21b6ab3017dd68e798a9a0f7
-MISC metadata.xml 331 BLAKE2B 7b904925adb6f8e39c1d1000e87c287ce5dbfa7a6e70544ab599b5ca8d254e70976d444149ee2727b4186d97326e662bcdacabc674f7bcc0e0193b2807e4c053 SHA512 871f44e56ecb16ea43e5702c30a43d24f911ae1b83fb2a5ba3ca4ab45b3676ee7d4841fc343f336c0249b0165777659bd393160728cb20e3484eee4854919d1f
+MISC metadata.xml 386 BLAKE2B 2e2afd7ed7d90551f20f4917132d686b1c03f24cad9c55aa9f06587ec5988709c7e2cf602b5dc16f06ea345c5f1ca3cbbe7eab282e460658fd04a3aa99f4666b SHA512 ab2b57e2fc4308c5d6e27cd567a1a5cb45698b7795887c1cc3122617775c76ba6c7141cb3440a84c855fcd5cbcc567435c4ab1127483e01b1d5941b6c8ab2a09
diff --git a/dev-python/requests-oauthlib/metadata.xml b/dev-python/requests-oauthlib/metadata.xml
index 58c53b538b89..719241b63845 100644
--- a/dev-python/requests-oauthlib/metadata.xml
+++ b/dev-python/requests-oauthlib/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">requests/requests-oauthlib</remote-id>
+		<remote-id type="pypi">requests-oauthlib</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/requests-unixsocket/Manifest b/dev-python/requests-unixsocket/Manifest
index 0b00e3deaf03..9f0f43f987d0 100644
--- a/dev-python/requests-unixsocket/Manifest
+++ b/dev-python/requests-unixsocket/Manifest
@@ -1,3 +1,3 @@
 DIST requests-unixsocket-0.2.0.tar.gz 13303 BLAKE2B cda02b5d963b00fb06cf86819bcbf552ecc21e30064198da338f502f47547a1f93184fd06052047c6cb8a6181f0a2f7b7a7cc53183b18dc22165a41dc14144b5 SHA512 a670f136ff1d8fb427cd017d92d388fd48a8a853d50aaa6eed685f3b453e28c6dbf5a710d7394face3eec42f8bdd84f798c7c4c82dab7b53d7a8c229ade52405
 EBUILD requests-unixsocket-0.2.0.ebuild 718 BLAKE2B a334af3bd1591500f017080336a5ef34a3ca15259ca99903616afe8b6faa2ea47ccd706b12d6ee257d2587660e9e4453fa22875ea167b11de99b8282605fbb8a SHA512 4359eb328c440cafa1387d2e05ac50e13e6574f65b8e855cc7d547377482bb3fe410e6a5541bb8781ec0a613612b19573517b3f68217740c6eb849e1d697d348
-MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
+MISC metadata.xml 300 BLAKE2B 6eaff6b26ce22e4afdd1965c4e6dbcac3f1182283398738d1fcd7d8b3147323e95bc57a746dcf30826f54145f526a9471b49d2ab9a749806f8b2382bd278464e SHA512 3dec04e021da92dc5c63f4b0a892755840313408a61f47de8ff1b8f7b412b4a6bc93af75a916279c75e931eafbe187674a1f5f063331ec120c747612c03be176
diff --git a/dev-python/requests-unixsocket/metadata.xml b/dev-python/requests-unixsocket/metadata.xml
index 266e3f19ca59..f39c21389d70 100644
--- a/dev-python/requests-unixsocket/metadata.xml
+++ b/dev-python/requests-unixsocket/metadata.xml
@@ -4,4 +4,7 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">requests-unixsocket</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/responses/Manifest b/dev-python/responses/Manifest
index cf08bf689087..681fa0103965 100644
--- a/dev-python/responses/Manifest
+++ b/dev-python/responses/Manifest
@@ -1,5 +1,5 @@
 DIST responses-0.12.0.tar.gz 26527 BLAKE2B 71769b683f9c672d52844803e76ff66def61a2a56f788d93cfbad5a7e0f967b003244ee32f83430a97f7726c732b4e8b25baf65ec35535da1a6d609e4cfefe7c SHA512 484076f7942ff12977f06bcc850f1afcc9ae70ca2b7986a647c972893562d28cf3cd7226c87d8f5588fa4500be34dd5be0c7d1df6b8ddcd134455540d3dbe6d9
 DIST responses-0.12.1.tar.gz 27123 BLAKE2B 2c77e3ac48e7430e2c91321a946c09746953b3aa2a93aff1ad277f849bc57fe8033d405cd0c391111ba31e523ecb2dfa5bc475519fb1224dff5247925eb54616 SHA512 cc840920895c5ab02b546d6441636197e93c4dc7346a801a14d663a30a761d78a0be73e820cdd5963e52d882958d9ea7873df6fcd6c032d99a230109b5c0ddb8
-EBUILD responses-0.12.0.ebuild 778 BLAKE2B 33a602f5f10fac28fae259f14227a43ae1c1dac7be28463ad276fe8e1bac782d3c3fd38e31ca2763a46c637b53cd6d2107bb8af1f68ff39f374bfab96f755a50 SHA512 8221824a89c9a4e1155707bd12f40d65e8f15324d40e53017e69c2591c556c5f92d219b9f826c9c35cc7b95b2025228ef1a0bcf8a5bd8216d0fd3d51b0615e96
-EBUILD responses-0.12.1.ebuild 786 BLAKE2B 79fb9a4d693a47925f63640be8861b1f20bdcbbe2305840f9219ca0faaca859883f6ed0bd4c7f7bdc00c3704259ab2d0052f57785b011d11cc4abf05edec28be SHA512 344e838eeb031a174b77f00a4c1e9e7372329196bf48d96744decf12643489e76ec1355b0640a43cc20247bf944ec3670e836afda15c4b9da5d4c7fddf88bced
+EBUILD responses-0.12.0.ebuild 783 BLAKE2B b22904f2f10b1551fff7e5cc5f4cf70167ea506037f72d0d13fc1e734bb220db1691eed0a0112518c9d14887dc3c89884c2f14563988d6c2cdf17a3e20a2c20a SHA512 a9493af45b12ebf9f43d3ebc9be820e920fb7cef0016cb21dcff49029e49ac320702ce05e33629ebbdf005229185876bc5a137c60743f90fe10442f117e6a6b6
+EBUILD responses-0.12.1.ebuild 792 BLAKE2B cd525118b50d09fc7a59c7677f3d467da4303de138bf93647b688b8f3a15c43052cea4410b2cbd40a1f09a1283c9890ba7a0e3858faa21f842edab7e25fd09b9 SHA512 d3637f207d8132ed1cd1f8748033f98d48955df03496cd507ff87c7eaa804adb8d0bee6abd9d246f24f90ab208a6136b93bb8afdacaff7ecd2bc90304428f570
 MISC metadata.xml 462 BLAKE2B c0afeab502da79631572ffa360f5b5cb19d41be177e9dc028041642cc756e08df0df9685c49825a40f3f343a29defe87f1f1e4805568d1037eab73895606221e SHA512 1b33da0d6d1ea49e0f108362c903f3521704ce8eaf1f328441eeb6950c19900eae5abf08204a0402cf7387077f32da97e5a84b2b6bb7c347a39a38e18032de33
diff --git a/dev-python/responses/responses-0.12.0.ebuild b/dev-python/responses/responses-0.12.0.ebuild
index 883183f2e7b9..b63b1bef1d4c 100644
--- a/dev-python/responses/responses-0.12.0.ebuild
+++ b/dev-python/responses/responses-0.12.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/responses/responses-0.12.1.ebuild b/dev-python/responses/responses-0.12.1.ebuild
index 438c4f69769a..398a6aa8505d 100644
--- a/dev-python/responses/responses-0.12.1.ebuild
+++ b/dev-python/responses/responses-0.12.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/resumable-urlretrieve/Manifest b/dev-python/resumable-urlretrieve/Manifest
index 8b83921bf612..77cdc50801db 100644
--- a/dev-python/resumable-urlretrieve/Manifest
+++ b/dev-python/resumable-urlretrieve/Manifest
@@ -1,3 +1,3 @@
 DIST resumable-urlretrieve-0.1.5.tar.gz 320035 BLAKE2B 1cffa81020c120b289145d52a7d3dfae1d4868545242cae583350c9d9e3acc7f923af7e1d8b9349a781b2d2eba4f28a8d27220bdc1cc64ab07d079039be9ba87 SHA512 d9af75ac3301aefa0773731539075ff3ecd0614ba48ac7de4a84817b676dfcdcc68e67cf02329d4adc62629b173cd2b8efc525c0f48fa686b267a75c29143aec
 EBUILD resumable-urlretrieve-0.1.5.ebuild 564 BLAKE2B f3594b2c09324cf54bef9c63f312aa30a3ec658a5fcc0171ba854ad5fdd6d2aa13b77cc52f1cedca101b7338b59a7010d17626dc7efb8a5734ae83b7fe4ef992 SHA512 ef0750b9f6c338883218750bb40d4f7124ab07c1d7598f46e38eb2301dafcfc984b7508e5fc5c654857dde85bc276f7d89911c48d46687b05db4ca741e12794f
-MISC metadata.xml 464 BLAKE2B 84bc493686b2688bdbdd4591acac96f0ea9b0f16d8e91fa7d6ec7ea225cb537842626106f598c44030f085d7a1502ce290289b7f7eaf5964f079be390fcaf311 SHA512 e8af70f36f05efac61eb6c378f93e5cd05fe7a80abd8f09c0f05ba4cbbfb0f9bb59859b96eed3b6137cde85c83d16c180681dfd4f079042b4e92dc6d426e60bf
+MISC metadata.xml 514 BLAKE2B f65e2e5fee0bde37b2f5b26f70c668bdb9973e4a01c311fd65c9648c20a725b4a11fa2b449485facb4056c84486d0e1d47d627657845e22575110403fdbe9521 SHA512 c6ea9659c151427a422c8b2f6c71aad6493f14553b8ebd31fda0fe61fe59772f57d33067f4f019ca2a4ecdfdbf79adcfef7c37604cecdca987f7aaf9631f1d9a
diff --git a/dev-python/resumable-urlretrieve/metadata.xml b/dev-python/resumable-urlretrieve/metadata.xml
index d1c3ada71a43..e5d02138b7ff 100644
--- a/dev-python/resumable-urlretrieve/metadata.xml
+++ b/dev-python/resumable-urlretrieve/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">resumable-urlretrieve</remote-id>
-    <maintainer status="unknown">
-      <email>berdario+pypi@gmail.com</email>
-      <name>Dario Bertini</name>
-    </maintainer>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">resumable-urlretrieve</remote-id>
+		<maintainer status="unknown">
+			<email>berdario+pypi@gmail.com</email>
+			<name>Dario Bertini</name>
+		</maintainer>
+		<remote-id type="github">berdario/resumable-urlretrieve</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/retry-decorator/Manifest b/dev-python/retry-decorator/Manifest
index 3aa84a90f6d0..6c71a2f7540b 100644
--- a/dev-python/retry-decorator/Manifest
+++ b/dev-python/retry-decorator/Manifest
@@ -1,3 +1,3 @@
 DIST retry-decorator-1.1.1.tar.gz 4466 BLAKE2B a64836bba5620974e393a952544c82074b667a5fac80d6944069bf88e9162d03cc48cfe511f09476571c46561331576a2b06b2aefd087f905f968aa8257a596c SHA512 2241b24a02424905a2f3b7660c7ee4f6cd034c67c5019cce54d38ae250a9ac9e011fe323b25254bed051a0d3560d48ecdf4e2a1ee84cf2d7c5b1c12dea2921be
 EBUILD retry-decorator-1.1.1.ebuild 461 BLAKE2B 571e0d58e52fc4c70de8767b9563c22448ae8638b26115b136b2f875501956aac8634bf82fa86fbaa95d38f2b5e2e35b130aef2f191d8431b03da08167169767 SHA512 e280501a6d9e67cce959fed5b87a2e1bf227e6760900f00c6e9c715ee55bf71b1f2ede7f8b36dd2dcc0da1e0d6eae9d9cb23acaec11907cdb0a93eadcbf71549
-MISC metadata.xml 362 BLAKE2B ac70448e6e6c1e38df6333a21190fdec09bd0af6706d473fbc15326fadd69a4a20f14f53c3bcfc6e77a9817b89b91e4b086ab2bc58a7739579aa362a79d4c927 SHA512 40746b6e7bb4ba806d047cf38a6fda25f3f0dba12f011d3b6177bc99d0678d04e5db838a2846eff3edbf1e8d5519b9227b4f90a1e3f662dac8bc031becbb020a
+MISC metadata.xml 404 BLAKE2B 1eaa65e01a0b62a084085fc066b33a6356d5c62043faf8937a6929d047e6ea08d6afabefd9093b28c7ec05b447746d8a58865afb1ca36e703bda72d10375c0d0 SHA512 0596346f0c4eed5f17cb2e346aab4c3f3a7e2d038e863eeed640aad7ade590c7649dee4cf0196c45521be0d3737d0d31c707cb2d61c83c5c9521a064aa1118ae
diff --git a/dev-python/retry-decorator/metadata.xml b/dev-python/retry-decorator/metadata.xml
index 3ebcb7e2d26a..6ab5a77f0e10 100644
--- a/dev-python/retry-decorator/metadata.xml
+++ b/dev-python/retry-decorator/metadata.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="github">pnpnpn/retry-decorator</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">pnpnpn/retry-decorator</remote-id>
+		<remote-id type="pypi">retry-decorator</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/rfc3339-validator/Manifest b/dev-python/rfc3339-validator/Manifest
index cf052681ed91..85cae4dbd839 100644
--- a/dev-python/rfc3339-validator/Manifest
+++ b/dev-python/rfc3339-validator/Manifest
@@ -1,4 +1,4 @@
 AUX rfc3339-validator-0.1.2-remove-pytest-runner.patch 551 BLAKE2B 4ad2e2d740b38c0628d321bf77f0884a0c72448b65296daea25217725e526de27ffd5927a9ac52cde0bd9cab4ee46b6cdd0608657a4edff4d5de5b04fe0a5813 SHA512 2ebb2eaca9311944283eb09feca1796540298b16d99480931deffea6a441093f33c48437a2d4a6e44aa3293b2e984db1a00028e9b96805d284223090e5321f89
 DIST rfc3339-validator-0.1.2.tar.gz 7429 BLAKE2B 9c08ae6ebe12af043ebad82a716e359f323f318d44e1f23a41759773e1927f90d6dde95566ca3c9463db6ffc9f2c3a31925ee4668f7fbe1defc78e09949ac391 SHA512 42164f8258025b056a6c5584c1c5e76f4c4fddead1a18199cd5b115a5a576d8863676d741e5e9a12bd4b41cbf55e722632a57dc3f76688ff0ad886615286c567
-EBUILD rfc3339-validator-0.1.2.ebuild 731 BLAKE2B 2734336a498eb036e56664dbd6062bac83ea1fea7a295809e9f70f037ced43b42f06c93ec26cea922732320950dadaadb01dc54a3a88faf511ef94536ef3f641 SHA512 51ecc4a843bb41a961a82838cd4e2f67f929057808644b52de58ea3f1b395b1b4b194256db77c642e5ac0b8f6b8ec035c8f7114563a0b940ed9012e4533f01b7
+EBUILD rfc3339-validator-0.1.2.ebuild 737 BLAKE2B bf2320a1bd1dbff60b0c10c370f87132090b76cf847b665db94e511221e34bc28d6e5ad03dcfb3b3ccd3bd7525f7d66007bf3d8ea46da94aa41de60e500bc403 SHA512 f31bb5e18401bf270dc47f151dc00837e97d03e3c0c1294d408c49c27ecab2b8830341e8d9d16e584d919ade817947a463e8cdd39f927855dc54b8aa733071d3
 MISC metadata.xml 374 BLAKE2B 4b440428addb3f4f1ee8556ca6fcf8ba55eb64571381eef4bac2b7744d13d8538942d0fefeb1513d558124e9e6806de73f81e39a84afa30d3de3634319b2b518 SHA512 579adade6871bd44f7cf9759c2c46ebaffdad553c78eca373bcce4b143fab229f7ccebe11c25884e6721736a506f03bdf2e67057f58cf8b18dc8af6d4de008c5
diff --git a/dev-python/rfc3339-validator/rfc3339-validator-0.1.2.ebuild b/dev-python/rfc3339-validator/rfc3339-validator-0.1.2.ebuild
index bdaa367e8500..274d6435e51f 100644
--- a/dev-python/rfc3339-validator/rfc3339-validator-0.1.2.ebuild
+++ b/dev-python/rfc3339-validator/rfc3339-validator-0.1.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/naimetti/rfc3339-validator/archive/v0.1.2.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 ~s390 sparc x86"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]
 	dev-python/strict-rfc3339[${PYTHON_USEDEP}]"
diff --git a/dev-python/rfc3986-validator/Manifest b/dev-python/rfc3986-validator/Manifest
index 37628f4b6f40..80b58229dae7 100644
--- a/dev-python/rfc3986-validator/Manifest
+++ b/dev-python/rfc3986-validator/Manifest
@@ -1,3 +1,3 @@
 DIST rfc3986_validator-0.1.1.tar.gz 6760 BLAKE2B e54b54c296310043f67a1187a110c6a34423f79a73dc64898d6d11d03eaca213b38da4722640595994bdd459bc1bc12c326d2e1f731e1846cdd723e232408e8b SHA512 b679e3c1b38d9ecc633d7d9a7179711d5adc50d38a51f28972f668e098058b92ec9f69e947fab7eaa3863377f35c3f13e5fd1ae35da2175a01170f2940360c2f
-EBUILD rfc3986-validator-0.1.1.ebuild 913 BLAKE2B e5c865e5c1827a4e055cee2ec0e2a9ca8970d1261f33eade628d4bf5a4ee6378a5f1b5cfcd3f8f589812eb2a2ddd3a92e429ee7d013c74bf6f41cf439f69c76c SHA512 834becfe9920ed2783801d1b31d3fca6fe71d1a34e028cbc680d0f4b8a090eeb44eecc7ce99a7bc929925cff37ca75bc8292e4f2576b471e84cf004d015cae62
+EBUILD rfc3986-validator-0.1.1.ebuild 919 BLAKE2B 8ae391ed333d3e1e9d1ac5a012284938e80123ba4463e0b92e5074a6a3203958fc26c2b2d50e7c857f6a8fe593c84404e3f628757128936c5351d3cc903d4d99 SHA512 377f26d0c587479ad9c25185a0a7a8c6f1fb9e94a0361bc37ed405099fd2f6adc007718090f156cb873155bc370474cae183159af760744eab258a4e5e539015
 MISC metadata.xml 374 BLAKE2B 154fe16f9c96a002adf4615eb298678ce77c21773cfca30ea239fc344e68ec2f98f104f79f078949b89606a3c2e1987f626bf3408d87d7ce4262980297945ccc SHA512 f5748ec0ac65035732c227f2eff35bd7e12abc04cfc6456ea9aab1d2f5dc51bfd6041a47f460df454c513735ebffa7571f1fa83cf7c5ab7db2f03f32a4524e87
diff --git a/dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild b/dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild
index c49fb089fec6..7e9370a47288 100644
--- a/dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild
+++ b/dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 
 RDEPEND="dev-python/rfc3987[${PYTHON_USEDEP}]"
 BDEPEND="test? ( dev-python/hypothesis[${PYTHON_USEDEP}] )"
diff --git a/dev-python/rjsmin/Manifest b/dev-python/rjsmin/Manifest
index b83be1b42fa4..38cf388d864f 100644
--- a/dev-python/rjsmin/Manifest
+++ b/dev-python/rjsmin/Manifest
@@ -1,3 +1,3 @@
 DIST rjsmin-1.1.0.tar.gz 412426 BLAKE2B ac4aed389359b27c6506890da8ec7874536835befff6868b556542489deaadb5557caf688fd959cd2dff1b25d312a8b738ea5f73e00fbb1f705ddeeaea021dd2 SHA512 e89641666f4235e5125e33a8da727a204bd0f263c101833849d8368edb7522a184b0f6d87da39690b7e8c1dad0ae8a40508b019e971393a3ad99440ad8ccc3fc
 EBUILD rjsmin-1.1.0.ebuild 372 BLAKE2B f84bc524e762d04645da2c7e934d933b9f9a52f1a50c7b9fd7d3fb92740555d5595507dee5aa2a2519297c77478114afddd11d804d14a901af056c7ad4d5ec7f SHA512 0d8302917d5cb88ed80653ac898e41d9fc3807ac120a7133efeba8c9545c6bdf5e42d07b2075c26187d824960e594782d6858b890dce946c5e7d582536e77241
-MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
+MISC metadata.xml 317 BLAKE2B ff8d9a96f07f3b23efb71d3fdf1f0b1b1df057d4b60b01b6e5e203301fe7261b052dec16ed1fb32ff45d426c0f69ae9923f16a398d4e7e21097ebdcb779819f8 SHA512 ea07498ae49d84656f97805fee18c6cf81e920b1d9c1ba46c7478c1c01274b7a4d3a521cba39cb8d3d0a1cf4286265301e610f2943b055875b18fe19e2ecaa76
diff --git a/dev-python/rjsmin/metadata.xml b/dev-python/rjsmin/metadata.xml
index c36c37139fad..18193f228976 100644
--- a/dev-python/rjsmin/metadata.xml
+++ b/dev-python/rjsmin/metadata.xml
@@ -5,4 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">rjsmin</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/roman/Manifest b/dev-python/roman/Manifest
index 76c72c804333..03ea2b713745 100644
--- a/dev-python/roman/Manifest
+++ b/dev-python/roman/Manifest
@@ -1,3 +1,5 @@
 DIST roman-3.2.tar.gz 7156 BLAKE2B ba7233366ab9bea9f0de4ab02ddbff4a3fbcc35792165d59f291dc837f4a8a7e681f1be89bcbb9746beb88fd7ae57b4ab57934e8d72a73bbdf223840e37cc18e SHA512 142904551745c8b7874d52c8d04f483b0c18b18ba8bc3d3a51fcf509e09b3a3f8a28d0b88bdd8282957bf3d698b1bab86de7fb4808cde9b0e5cfb910deca35ab
+DIST roman-3.3.tar.gz 7577 BLAKE2B 651d30154e01c9bc61326581c5600efb5f717b2c21cb6345d51ba5aa44d79bff00e66492d3962ed4c9682103a9c00af8205ae9d90b30b9a3f13dc2d18e6f1592 SHA512 8d2952640519052ce629a3881cb871448fc7921eb5f45525305c43ef9fb2672062d0ca96ab16d7aaa95f5eebcad028fdcf519f224f3631734fbb6a4a314f3a49
 EBUILD roman-3.2.ebuild 498 BLAKE2B 538b57b6ed51699d2ccec790cf2e89500949a906f461ae3469b53fdf83cfb7b5bffae4779869fbd463b857104d253c7029d5a02f828598ce1794ffb0ac659715 SHA512 588f87efa7e7ccd4083e10b09ccdcdf40011e46853847ed04896f460d1e10c2d26fe2969adb2c3d28d86e22979b28ac9f99c7c91aeb0f2854be4580c11dcefb6
+EBUILD roman-3.3.ebuild 550 BLAKE2B d1d30c20dabd98d25571387820fbdd2729aac21df9518884588db8755e3d319a08647d14a15eeebfd052ddee46022a57c7b02e021ac3759a20e6e4484ebfbbd6 SHA512 ddf86363b269f8b26a92b93856158bd5f188e3315ce777f6d1d4f2e1d928f6d2a4fc588c5683e15b6b04fafecaad60dbddbccb5bf35983f302ae860890df4061
 MISC metadata.xml 318 BLAKE2B 3a028680f19314e15a2eab93b8bfe5338ef3b351e82f28ba7eb1d0988ffc0f9eeb9174f30c18c0f7e10b865958a5992043525baf6e25732ce85d819c65c9fbb3 SHA512 a2e3ce30465809bbac2a6684207eb0290787a1e2eafebb457a6754e474340f75208dd269f7d89f2fdf25a3529340310acc9c220feaa1be40fe688a177b2741f0
diff --git a/dev-python/roman/roman-3.3.ebuild b/dev-python/roman/roman-3.3.ebuild
new file mode 100644
index 000000000000..b55fde6ad975
--- /dev/null
+++ b/dev-python/roman/roman-3.3.ebuild
@@ -0,0 +1,24 @@
+# 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
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+DESCRIPTION="An Integer to Roman numerals converter"
+HOMEPAGE="https://pypi.org/project/roman/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests setup.py
+
+python_prepare_all() {
+	mv "${S}/src/tests.py" . || die "moving test file failed"
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/rope/Manifest b/dev-python/rope/Manifest
index 69eca8c0fbec..9b427099a41c 100644
--- a/dev-python/rope/Manifest
+++ b/dev-python/rope/Manifest
@@ -2,4 +2,4 @@ DIST rope-0.17.0.tar.gz 248629 BLAKE2B 7c9276b5f400dfa9661f81d365eac150a12462082
 DIST rope-0.18.0.tar.gz 249828 BLAKE2B 2aac0541936c671f9b70528da28b2c016f14c7a3e5f368aecb6a3f2a39d2b447d70943bf00b7a49702f5d341504da7398ca5b1240d625275f749de1e530fb178 SHA512 9f706da345866447ff7e4027e6f9f0719d4b823253155881efcdd3a9e9a6f42fa9e194cd9547df4a6f752ae0cec739045e52bb7edd5cfa04ad4079fe06808298
 EBUILD rope-0.17.0.ebuild 931 BLAKE2B cffb66f101f15abc1f1315eb5bf130419132f44cca4df6ecbe78ddbcefec40954dcea342da7b91ab19ad62e09fc8c33d9259a91bca937dd041180f14880aebd4 SHA512 7b61c1ecc06b11d48f8df05f3e3c1860be26c3182811ff8e2e51b5deb3e3645a602af33330a8b1f7cf11d878cd1860772960eb015ba19674dbea993daed06a0f
 EBUILD rope-0.18.0.ebuild 1007 BLAKE2B c71f52a7c6dc364c239c1833d7dc985c0e29bf75763149ddd9c944efd5adf25a0a7ecf8015a2d694584fdfd6073e847713cfa6c6e9642cd1753d34dba43ed53d SHA512 756a1ee101dc1cc4c870ecf3fe92c89320c9e362972fe0a964c02ce9aa1f17873842f0c6a0b497f87f0d1598b23c18e7c1ae0d2e2a9a1dd56d24ba16b6bf8160
-MISC metadata.xml 426 BLAKE2B a90ca25878154783f5448189564061f85cc6dd9f92855046a0965b864c496d5b0c608c128330b7cfcb395b615666aaaf6298b1f0f729832e4be07aa0d6f14f01 SHA512 aba585c9733078704e38b5474b1e3dc29a5cd1f8e07501d00f025136ccf4c65656c967831ac2901f8f0a90b9c3240e5cb4b6ee3fd34846bde17cbd1932853697
+MISC metadata.xml 451 BLAKE2B 37ad17660eb9247a5de5ff2974c8ec1a312c87f6bbf79375f0a4bb272277f3fb9af63de230c608f7353209868eb4e4882778fecf7ea3d51ba465d14768470ccb SHA512 756ea4e98b36abd8730139115b84d6779c910fe1e671a40b6bc00ef1a484bfcf54baa40f16f03e7375bd044307ebad51dbfce3fe3d90ed9e87d1568a4ef5a198
diff --git a/dev-python/rope/metadata.xml b/dev-python/rope/metadata.xml
index eb0b3339535f..bd13eda74b7d 100644
--- a/dev-python/rope/metadata.xml
+++ b/dev-python/rope/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">rope</remote-id>
     <remote-id type="sourceforge">rope</remote-id>
diff --git a/dev-python/ropemode/Manifest b/dev-python/ropemode/Manifest
index 84ba7bda1974..f06ed20da1d7 100644
--- a/dev-python/ropemode/Manifest
+++ b/dev-python/ropemode/Manifest
@@ -1,3 +1,3 @@
 DIST ropemode-0.5.tar.gz 15328 BLAKE2B 051c92a6105c0226c2a2daafbb55485327fcb8777467fc4ff86e1491f9fbbe39cec90100c212ebc64d08d6b1803638597eea0852222f29187b6fe92542a80b3c SHA512 50740982a731045734150171e0c3ae26ccf64bef4699fc7062204c68750b760a373d5b2b0e00b8ba8057d3955059ca1dce2a41cc1878775698184d78f921b76c
 EBUILD ropemode-0.5.ebuild 810 BLAKE2B 17a68cc74c05233118cbf7651e775f27f517b2234b60d54ecca270417700fe664a9f8cb1f5d8f9a52c0ebe3f8200e58c187f73299e76de9a4268d894ba837d71 SHA512 a6e079c5439bb5668d750c2a5cf673163d7b41b20f31a140299a522e2d7124ade4d8200c3fbf9c1b6f2b44bc7cd7796e4abf962bf57ad8129bced293d326dcd3
-MISC metadata.xml 311 BLAKE2B 7a391c7a136d22050f6502a996210bcddad6b45c6f7f6fa4ba2106ecebc46f9898bed02e707714dad4e2ba75e4c6a88b6e8c192e24602d7c4bc781a68036c538 SHA512 8c8dc80268b8e455abdd3d991500daf13ddf3c1ade4881b8023768b0c6fc0e7be8eb32a8f74a368c9664bcc24153a049362960ef74ab39e82def51248a120ca0
+MISC metadata.xml 371 BLAKE2B 74b3b1353d032431c5e82332cb821f124c2b55ddfbeb605deb8c04a14a32063c354125748c6576b808c21468446620beaa1011dd2e6130e7a68568909d92e68d SHA512 49cea17b2dda7be620a34c956349a316e71ddfca6f93b5c9130a47326787ac67f22cd4421cc1a84882756bb1de07d34b42443bbd2f8759348605cfb241a657bd
diff --git a/dev-python/ropemode/metadata.xml b/dev-python/ropemode/metadata.xml
index 5aa7fe424b21..f4c065ef69bb 100644
--- a/dev-python/ropemode/metadata.xml
+++ b/dev-python/ropemode/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">ropemode</remote-id>
+		<remote-id type="github">python-rope/ropemode</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/rply/Manifest b/dev-python/rply/Manifest
index c0e1bb41be3f..0b75bf4039a6 100644
--- a/dev-python/rply/Manifest
+++ b/dev-python/rply/Manifest
@@ -1,3 +1,3 @@
 DIST rply-0.7.7.tar.gz 26366 BLAKE2B 09e6b93e9581745209b2d1fede6e0e4f08c2a34cc2495ea73aebb27b012353bbdb749ef127128cd5d9df201607f73625e248945038a927d788e324fb632341b4 SHA512 c01166b7df067a6a55d1b43caa7b5a349045e838899daf82e2ba70a2c2525fd68e95f11e5319a1fe36936e696352a37bdc13f132f739cd52759a9a9c91e317ba
 EBUILD rply-0.7.7-r1.ebuild 569 BLAKE2B 502be8cf23ea2474a75ccdb3ad86fc9226b26417813ecedbab46bbd5ac9e3f666eed956a2d1636e3a4abba9772e33a916b94a2c1e057204a3a240c2d56c0c341 SHA512 2afc224db6282b58586a68a68b9fa1b34c62bc92dae9266173da5c0603b948b692a717efb6f1dcf856ffdfebf796de0659affc97fcb3d7d5e79bd13b147539e3
-MISC metadata.xml 324 BLAKE2B d6027998ac0d5aee72ca31a60c53bdf7bbc628b16eacb329041fadb5ac5c9015f152e3e9f59495505eb73a2f8fe76ccff182026b6d5c80999274268056e63e14 SHA512 9378b0e52729cd011ed824e800aa1af7ed6b9f799de0802950dbf02eeb8dd27e356ea067a46aaa91b05d96f7ec5fc17a43c0d980b7b585fecb8220b0ddc20ba8
+MISC metadata.xml 356 BLAKE2B d47709ed8a660507a33ead01d41c7d93124b429f642f81659f55d6da019fbe32c7b0d48690319ecb0099635c950c8938f08fa4b3d8e1261b39bc9cea5f20556d SHA512 3bb601a253d74589a2cff142af8f37801027bb8515cca97b4f5839f32b56c314a2dfc7db5b7225ad79f2090f7fd1db84616f86f9ee7685a21700a506074237be
diff --git a/dev-python/rply/metadata.xml b/dev-python/rply/metadata.xml
index a1678ef4e2d1..2abc747e45c3 100644
--- a/dev-python/rply/metadata.xml
+++ b/dev-python/rply/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">alex/rply</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">alex/rply</remote-id>
+		<remote-id type="pypi">rply</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/rpyc/Manifest b/dev-python/rpyc/Manifest
index bcab3df10ef8..d567b80a1a1b 100644
--- a/dev-python/rpyc/Manifest
+++ b/dev-python/rpyc/Manifest
@@ -1,3 +1,5 @@
 DIST rpyc-4.1.4.tar.gz 1251969 BLAKE2B 8d77d6c80fb69d96847878830c8fd0b8333223b8a2f13389de250bea6c8d9fc79477ee9ddd738776c1f1fdb4ed6d9d349a2d5cbdf3dd4486fe9b11113df0fedd SHA512 50b146fa07c213ad51cc3ba5e29264e5c16a6061fb109b94b9183582399495697c73c38e6e4958989a90080a88155bb140bf8e1ca43e0c6fb1f72eda2795d71f
+DIST rpyc-4.1.5.tar.gz 1252268 BLAKE2B 3669b10e7b9dc28feec33cb8472e74087fb31801564fcd9d9230f88a44dca8c7100a6134ad5c0e4974b8252e6c2f8d33877550facfe5f6c21d8a388e38c9e9f7 SHA512 27f67c7e7bf6f1e94815b3124f300da5f1317e7b454280953d85eca8c7146afc33937ac66a1bb8ac2344b73532ae232b190a647ef90aa723b8b5173b96877454
 EBUILD rpyc-4.1.4.ebuild 525 BLAKE2B 3f7c2ad7f390bccc52cc9311523565e56989b00be475f2577c3c499b1f8c7b67caf8dbc1bf8318b25a6c4e3bb7b23fb6fee8a81d3ab3c088994ad114f69a977a SHA512 9bc70196fd12ac1483397fb901ab04c5e9a1b4607ab8f5393314759ddd1196e3ea967e4410e869c9888b81c25607acf604893da0e207aef0c8e36c9888149895
+EBUILD rpyc-4.1.5.ebuild 526 BLAKE2B c901e812d13e6f6682b867aff0f847de111e9deea828a5c0faa84cef92ad9ff47651131e2fa72dd8e17e3db238fb5588e627d4bedf3d5eb943886ef15638b736 SHA512 8abb54bc947ffced70c416cc5dabc7d5a60fc092d7a5550a89ce9a8a4987f02bc338a3a6dab0b0dd14a0df0596bd6bbbe3c6dd0676be217f347392a8d9c088e5
 MISC metadata.xml 519 BLAKE2B bff6efbebeaa170cc6f51bb81a8401dab34bd7e9ff6c0f4419099904601bfa1170ca7c191ad0da665176662ce8fe4ebdef911b8abe04280d74924865d4e64264 SHA512 797220200ee9ec3d52d30f89e719394f548b8b030390aa8834cb7b1022ad1b1e7b0b8b2dd3a4b9aa4e0b95494330c21276597287132ba3254a333a0ae51f2670
diff --git a/dev-python/rpyc/rpyc-4.1.5.ebuild b/dev-python/rpyc/rpyc-4.1.5.ebuild
new file mode 100644
index 000000000000..98438a3833b6
--- /dev/null
+++ b/dev-python/rpyc/rpyc-4.1.5.ebuild
@@ -0,0 +1,18 @@
+# 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="Remote Python Call (RPyC), a transparent and symmetric RPC library"
+HOMEPAGE="https://rpyc.readthedocs.io/en/latest/"
+SRC_URI="https://github.com/tomerfiliba/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/plumbum[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/rq/Manifest b/dev-python/rq/Manifest
index d60a632ffacb..accb92f0695d 100644
--- a/dev-python/rq/Manifest
+++ b/dev-python/rq/Manifest
@@ -1,6 +1,8 @@
 AUX rq-1.5.0-no-install-tests.patch 449 BLAKE2B 3a69c2fcf868c21565b2660fafb519fd175cb375643f85d91754a651fc012d12db32c8875b8f8236407672aaa787aef1e4484a4e33b9582c65aad00c525a7180 SHA512 373b94f956aded0d54ecaa04250533f564f3a8e81d693353c4ce63dfd754f013e741084faaed976ae9b0aca4c0f2a21cf70f2118820f157282966a8446f7c1e8
 DIST rq-1.5.2.tar.gz 570138 BLAKE2B de1f9b9b1d790d0ea3efcd93e916f79b2f28521571652ba048adc725bd53b657cab5a7b2bc65b320a1c2766f77dba399ae62e90fa0a2514fc59565b8949c0327 SHA512 2e2cfe97d427057281415cfb1593ad504485b0398b72f55a93cfa48c7bae8f800ed1b1ad2aa447fe3f6baabd7bb112af29181577d31b270aee58cf4558d15a5b
 DIST rq-1.6.1.tar.gz 572668 BLAKE2B 4a1990492ed0c5e999fa918cdf49c03cf664e809b74f75c0aa941a72d9f3f45481e66c0d04780b88efa8e8ac2a8a94b11a0ad620d4c5f99e8abb3582db28e3d3 SHA512 8fc5f0cb87fb43fd6a0981dfb24a21d858e2d9fb2003c955d6d83b33a10b3cbaa713c11e422a91b4e020073d931fd3942530f3368fc8688dcff1a71fbe83fb15
+DIST rq-1.7.0.tar.gz 579373 BLAKE2B 835868a294478af07b9fa97fef14b0f2013abe125263efa15c4988eeaf564ee61ab2e8d68842c730a0f8b02a19a4d66f328828fb939a05b9d3b36996688192e0 SHA512 4027a8e1474cc350cf539ecf5734c2f851ef4e61bf0e106e44f359736f4f1ec4e690af97a119d12b1b7614b38ec4da286acff98b718ef604b5c367b3cc2af741
 EBUILD rq-1.5.2.ebuild 1702 BLAKE2B b3df7ac90250491a542e52a742de35898c6643da33f3fcbd4ccb22e0a926206fa9243a19d2a47266a8fb925adf3d71b373261fb7d0c787da4a6e2512cf61001a SHA512 40be428b824ad10628be73624b70079c7bced8c759670e4e701a8ce8e2c048e08dbcb65be55bdce33f7376af50b93ce97dfbfe1bbf8cea563bf9dfd13a62ed60
 EBUILD rq-1.6.1.ebuild 1681 BLAKE2B 8b9dd9da0c13a06976a334221a39d5ec81d18ac6f730912829a5c06ba7b06d10e2714db1105e29a1b8148f009e8515d18c8b82b0979c498b7a2d13d3ba88d562 SHA512 9e5ff8a18088cb154d773b55ad65570efeb1f860e9ed32c482f22ada6ba180ac2a08cb6b34b1fb7af6cfc6fd11a0ddeb5025518563cf7fb556879514956f3af2
+EBUILD rq-1.7.0.ebuild 1681 BLAKE2B 8b9dd9da0c13a06976a334221a39d5ec81d18ac6f730912829a5c06ba7b06d10e2714db1105e29a1b8148f009e8515d18c8b82b0979c498b7a2d13d3ba88d562 SHA512 9e5ff8a18088cb154d773b55ad65570efeb1f860e9ed32c482f22ada6ba180ac2a08cb6b34b1fb7af6cfc6fd11a0ddeb5025518563cf7fb556879514956f3af2
 MISC metadata.xml 561 BLAKE2B b0f95e81961b91a9ee8b6911f12a4ae0738dfb424b18f934a8a113dc509a31f87c69cbb22b8e049b82f847f34509b222baca3985b3873567cf7089238d6568ba SHA512 bf1c6bc1794ae0e20f6622c9bacc501bb6b0d9ddb4f1caa2de64e20b31f050a6329ecaa7baf26159f24f04a2b75798693fbb3071554d0fbbb9f8577ce8d91797
diff --git a/dev-python/rq/rq-1.7.0.ebuild b/dev-python/rq/rq-1.7.0.ebuild
new file mode 100644
index 000000000000..031701f5d585
--- /dev/null
+++ b/dev-python/rq/rq-1.7.0.ebuild
@@ -0,0 +1,63 @@
+# 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} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="simple, lightweight library for creating and processing background jobs"
+HOMEPAGE="https://python-rq.org https://github.com/rq/rq"
+SRC_URI="https://github.com/rq/rq/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-db/redis
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/sentry-sdk[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="
+	>=dev-python/click-5.0[${PYTHON_USEDEP}]
+	>=dev-python/redis-py-3.5.0[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+distutils_enable_tests pytest
+
+src_test() {
+	local redis_pid="${T}"/redis.pid
+	local redis_port=6379
+	local redis_test_config="daemonize yes
+		pidfile ${redis_pid}
+		port ${redis_port}
+		bind 127.0.0.1
+	"
+
+	# Spawn Redis itself for testing purposes
+	# NOTE: On sam@'s machine, spawning Redis can hang in the sandbox.
+	# I'm not restricting tests yet because this doesn't happen for anyone else AFAICT.
+	elog "Spawning Redis"
+	elog "NOTE: Port ${redis_port} must be free"
+	/usr/sbin/redis-server - <<< "${redis_test_config}" || die
+
+	# Run the actual tests
+	distutils-r1_src_test
+
+	# Clean up afterwards
+	kill "$(<"${redis_pid}")" || die
+}
+
+python_test() {
+	# Tests needing rqworker:
+	# TestWorkerSubprocess::test_run_access_self, test_run_empty_queue, test_run_scheduled_access_self
+	distutils_install_for_testing
+	PATH="${BUILD_DIR}/test/scripts:${PATH}" pytest -vv || die "Testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/rst-linker/Manifest b/dev-python/rst-linker/Manifest
index afd204411b64..70bc8b47598e 100644
--- a/dev-python/rst-linker/Manifest
+++ b/dev-python/rst-linker/Manifest
@@ -1,5 +1,3 @@
-DIST rst.linker-2.0.0.tar.gz 12861 BLAKE2B f52ddab3c8119f0bac64e294e4a5a3cc50916f19f49ca1ca4983d8b5d2bb5401c6accb5873df38609386e12fcd1cb02b867f3633edd4d10606a98936e96e62eb SHA512 ea9fa95de66c95dc384c888446512be66b180d0d76e99fe7a6b8f8348436d4be959d3d567fa521d9fc925b537467a4fdf05f9e9d17f7a6df4aafd6dfd323e4fc
 DIST rst.linker-2.1.1.tar.gz 13492 BLAKE2B 0f53f3110c4a54e7eb36787ed08f81d0ce551174251203b7184ccbcc0153ee450e8e8927e8989b572b929219b1002019f49167482d59956ad96a54360317f998 SHA512 c49e6b3de41636184f75941d8fa258c2dad3d13a7d82b6221a10f583ada228a96f56abefce7840f93cbae8512332b69430601961cc396f3917b912e369b2b1b9
-EBUILD rst-linker-2.0.0.ebuild 1304 BLAKE2B 3fdfa210eed10fdfb45cb2ec50ce12c82e89ce683d397294f85bbf08c9a56becfb3b4cf4d8c86a31786d0108400466302bca1d7b2d902128916a4db669b475ec SHA512 bc9cf9c4d2483feba77e728ddbac88f1ecea073679de347f49c1ff2ec9aee9289d5638a437613aacfe2e65847ac9094f45614efc72a952703f86eee0699b7b82
-EBUILD rst-linker-2.1.1.ebuild 1243 BLAKE2B 4bf113816aae62bfd481401d144e1bdad99162a167b6f363f75161d3708e15e77c6f83c52d04d7cd82705df853d7b70418c43cf898e2bd134a1b0540a8d31d97 SHA512 25657d1431b54af2cc3b99cc207ef5608d823c96060cd25849383aa6b0622c7955923f1c7e38b30a75d993fc05f68f9891d22f60d5752931ae8c25d299edbd91
+EBUILD rst-linker-2.1.1.ebuild 1269 BLAKE2B 635c1ed1f1f102a6f5470b81fa7fd236b203f7435b536b6905563730e256a6c2ac06e6b41af71e56b6a80f5d13f74d76fce2266fd130abb4ff3e526d2b6b5d91 SHA512 de14fe7826db6fa0690575187eb3a2feef197e384163918ff36ced650140ee4e99084e7f07497b9ab067e1827e3f13bb7b99247c6d80821a96585170e96a1701
 MISC metadata.xml 464 BLAKE2B 553b3e9fd8b0a5df09e6ff044ecc6724c155bff6ea5ce21ceb1cbf919e1dee65122f8902921235a40b20baf656a54861741633dfa853405785d8ceecdf0c37b3 SHA512 cb0e45d357d9134fda6c859885350414a04ba45d8a5bbf4424f3f4311f0e662aefce70238434392d8be98b0d7ecb6c470f6725935143e88e09463ff3f0519f02
diff --git a/dev-python/rst-linker/rst-linker-2.0.0.ebuild b/dev-python/rst-linker/rst-linker-2.0.0.ebuild
deleted file mode 100644
index 0b9231d4e01d..000000000000
--- a/dev-python/rst-linker/rst-linker-2.0.0.ebuild
+++ /dev/null
@@ -1,45 +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,7,8,9} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Sphinx plugin to add links and timestamps to the changelog"
-HOMEPAGE="https://github.com/jaraco/rst.linker"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3 python3_{6,7})
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/path-py[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.4[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-distutils_enable_sphinx docs ">=dev-python/jaraco-packaging-3.2"
-
-python_test() {
-	# Ignore the module from ${S}, use the one from ${BUILD_DIR}
-	# Otherwise, ImportMismatchError may occur
-	# https://github.com/gentoo/gentoo/pull/1622#issuecomment-224482396
-	# Override pytest options to skip flake8
-	pytest -vv --ignore=rst --override-ini="addopts=--doctest-modules" \
-		|| die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/rst-linker/rst-linker-2.1.1.ebuild b/dev-python/rst-linker/rst-linker-2.1.1.ebuild
index f893fc98c94b..98c8e7078cc3 100644
--- a/dev-python/rst-linker/rst-linker-2.1.1.ebuild
+++ b/dev-python/rst-linker/rst-linker-2.1.1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 
 RDEPEND="
 	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3 python3_{6,7})
@@ -23,6 +23,7 @@ RDEPEND="
 "
 BDEPEND="
 	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
 	test? (
 		dev-python/path-py[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/rtimulib/Manifest b/dev-python/rtimulib/Manifest
index 61a71bfcf29c..02dded7cea8c 100644
--- a/dev-python/rtimulib/Manifest
+++ b/dev-python/rtimulib/Manifest
@@ -1,3 +1,3 @@
 DIST RTIMULib-7.2.1.tar.gz 915114 BLAKE2B 5d8a54d4b1083105c1bb3b854e8474cb81cfd5eff843422e2f66f363ae04dd9e87d4cffc8f26c2a68c4f535d77ca229bc7bb7840c59ba3c6d2d45d5ee7f31987 SHA512 2a9d40f5c4db7c875fe82bd79408d97f9b00a3cd0d1be9b19baa3808b4cd260200b8ce5f5d9a6298df760aaca10555eb317d4a2431cd1c07a1b7953448852b23
 EBUILD rtimulib-7.2.1-r1.ebuild 537 BLAKE2B dc368737037e9f995790878e217597ebe837d175164eaadca60d635165cc97ad266d97340314760450dc274061e53c5e7dc1e42ed9b95c4970fb39f07cbdb580 SHA512 2f57bb84ebab8374685727a61ade7947e6f47b6e6a10c3ab34daa12336d50aac9bd28d209d6967c62c4f8c503c5ef5835a1adb0f8c593fe3ecadf31f191e8976
-MISC metadata.xml 729 BLAKE2B ae7173f56cfccb78e8fdd6e193e1e49c67ceff9b0c09d2acef7b39a72c0301a9606769519001d5f5d54c931333644af9933f23af16b7dc274db4e17aa2ef706d SHA512 c4463d749d453f4ca85bac17309b9948912dc5fd67824e71cfba6ba1b1a6519e39c8bcd8d1c8a86fca6348b18d60d8431497a906caf187f16564e657cb57833c
+MISC metadata.xml 775 BLAKE2B 8f82b35affece88dbea988495808f140a2cb19c6f24eb30a32466e06546cb11d75739ad6d7d637d9259bc95e7fc9a8e683c8d3df87a7716c4edef63719ca06d3 SHA512 856c089ca1be059492614889984ec1bf07b1bdb2832f2be73c2faa6e52d7cf3e9922ae63ac7e523977d9d69b615b49051bbdfd769bc87982d181bcd9b0e8a1b2
diff --git a/dev-python/rtimulib/metadata.xml b/dev-python/rtimulib/metadata.xml
index b25408628426..c14f3cf91a22 100644
--- a/dev-python/rtimulib/metadata.xml
+++ b/dev-python/rtimulib/metadata.xml
@@ -14,5 +14,6 @@
 	<upstream>
 		<bugs-to>https://github.com/RPi-Distro/RTIMULib/issues</bugs-to>
 		<remote-id type="github">RPi-Distro/RTIMULib</remote-id>
+		<remote-id type="pypi">RTIMULib</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/sabyenc/Manifest b/dev-python/sabyenc/Manifest
index b70a47b4c4d9..4d02bd3ef7b1 100644
--- a/dev-python/sabyenc/Manifest
+++ b/dev-python/sabyenc/Manifest
@@ -1,3 +1,3 @@
 DIST sabyenc-4.0.2.tar.gz 19579235 BLAKE2B 26af61a979f94b954a6fb7fa425ca07a8d757fb16c9d434e9a1e0019d84d156b527e9309cc65113fef64dd3f2afb92b46619dc9506327273f2ba7822337e9ccf SHA512 88e8b47b1438ca55b51dbf8a407c33ec335f0604abf8a3dcbc45853b6dadadf9932d97cf3f0adabd71a9405e2deaeff2777483d9ea692c9d3cbab99dfbfbc901
 EBUILD sabyenc-4.0.2.ebuild 603 BLAKE2B 82bb432ba57b055ce6c9b76e83e818c33d455088340724c7bddefb51fa82a5107ed3e4c8253a2a72613d4a0e950e5c286a7e05dc0db03aa00da1cad2c1010d90 SHA512 0213e1105785791a1858830d0d799d1c26c468c95079b2d5f3592a9d8ec479b5998d1fb8f99c62df30f5ca20d8c5160dfc63ba6f24e0591c82d82c2192ddecb2
-MISC metadata.xml 251 BLAKE2B fb85d245662fa1577cfe1d77526bd34fb2a674dd447192f2defe78b751423e3d14ae73efd3ac0e1e5e6fdb6259622a782e724ec77021faf526509f199dd20d61 SHA512 46942a98ef7e36470d1169a5bc8839d25603e33c143cd36327a8a85fc14cb6bfb32247eb7608d92cc58a06cc8eef5bd64d6ec2d21e69a88632e4b936598aa772
+MISC metadata.xml 321 BLAKE2B c51c541a4a9c9a0ae6598c26e7c059d6d9050de0d8c7ba68c9a35d8cb069b13d7b2e48646551d860f77972d4ac0c6dd79b00d1345b25bda8ea55de0dd3120b97 SHA512 df9b13eac881f526ac945f03e7125ffde964e9b250b1188b2cf04a58eba33a25387635542e7fdd8f6843c3e1b3c6a1eaf764a5da8850d2480320a3b16a81538c
diff --git a/dev-python/sabyenc/metadata.xml b/dev-python/sabyenc/metadata.xml
index a32d600f949d..f2342a2b8ac5 100644
--- a/dev-python/sabyenc/metadata.xml
+++ b/dev-python/sabyenc/metadata.xml
@@ -5,4 +5,7 @@
 		<email>whissi@gentoo.org</email>
 		<name>Thomas Deutschmann</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">sabyenc</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/scikit-build/Manifest b/dev-python/scikit-build/Manifest
index 6d74a0db520b..e6fd19b15229 100644
--- a/dev-python/scikit-build/Manifest
+++ b/dev-python/scikit-build/Manifest
@@ -1,4 +1,4 @@
 AUX scikit-build-0.10.0-docs.patch 773 BLAKE2B 27303cb8ff439dbf9e44454ed58cffc2cbba53fd639b830e03707fce7aca0749018caac72891c3efa0b66b3830001634ca9e2cd34c769f625d2f735f5c1d4dcd SHA512 d6920e22ec20feec99768d09b3a01244eb6bf079b4d68c0eda1a17d04c640c7b5df6685c883812e7c9bf5455d6c5a8248a503f466db23da82d45b5ba53188252
 DIST scikit-build-0.11.1.tar.gz 132025 BLAKE2B 0f818d8da896695ee0d6b046249e74cbd4ea643bec0515d6ac6ff4276d92430a1dbf81abb3b7c10890538c373225a45cc21b0906de891f1a5390226be914dacd SHA512 030c6cc727d39cbafd2865722de9c45ba2f13461461cf75019b9caf6afd0a776b4f598fa2ce102b5adbc770140ab1de2c33e2bbd3ef03c958ae8849e5fc26cb4
 EBUILD scikit-build-0.11.1.ebuild 1462 BLAKE2B d5368d1273502cb098bbc815663546072d347e6eca3f66bf890d4c5a0503942ea314a1882133c693d849ae54c75cb610b30d17856da333c6ff0b6c6016cdd90c SHA512 952fd1e2f80d83c81f733f2d95f7452a3e5b77cc81ac95badac4c21a0a5983234ed0e1ecb1370a0af5e52456236d38e765e4e0af6bb381fe6265e6ca60c42b37
-MISC metadata.xml 333 BLAKE2B e446041c433ac52a0762f0f3624504f95a636bb297a41b098171b3b2d275f8d0214c60fbb0b86e6b892a4953de3bb9bee2f12504671dafd698529b724e4229aa SHA512 635413348c10790f6edb48236dedd4e5e90497b2654aeb3ce344666561d5de3107fb079652976ac54b579ede917aa965cd024ff3c113a5dc885d78fe9cfdaea5
+MISC metadata.xml 407 BLAKE2B 91cafd558c8797a07a57e8581fe68b3353d6f70a00dbfda9ce1615fc5302f9cce23a806fc31f4359f670546a39a97ddd7958d0fd77ab6d18841f3888bdbda0c2 SHA512 2a06667260d774bf4e49553c709110b14e798cbe4641352c745c5af6e400bf027d1064997b5347e4ffadc27310dfe0bd02a58a891defd6d7cd96f1b2ed3909e0
diff --git a/dev-python/scikit-build/metadata.xml b/dev-python/scikit-build/metadata.xml
index 887a2a30e0ad..c4d4aee28f07 100644
--- a/dev-python/scikit-build/metadata.xml
+++ b/dev-python/scikit-build/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sci@gentoo.org</email>
@@ -9,4 +8,7 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">scikit-build</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/scripttest/Manifest b/dev-python/scripttest/Manifest
index 7941f0052771..e518a64662ab 100644
--- a/dev-python/scripttest/Manifest
+++ b/dev-python/scripttest/Manifest
@@ -1,3 +1,3 @@
 DIST scripttest-1.3.0.tar.gz 14885 BLAKE2B 1984bb175b49248bd369d2d2ed6f70051113285b6870bce67e0c2203d29b4c5b2735fa96dfef7ee11aa38db74e9beb026bbc946c8549b2810f6b90e896bcae0e SHA512 038bfb1726bff85b6e3675be51db829d3519b47665266f6ae1d3c5c6f4f06e7b16742262ca1ba240544e9bd39ae96c1be0bd5e8583736f72bb04241a1bb8acf6
-EBUILD scripttest-1.3.0-r1.ebuild 559 BLAKE2B c944bc1e38e345d27e57ba915b62ef64a53e48d313b12e6db9278f45d7528e6b76933d97f8783a11fcb50eb8b7b33aa23baebc4d09cd92938bf2753134390307 SHA512 1b6d1250052490f132a11efcc75a87b72aaa7d56adbbec32eefc0f6ad449953961fef29525a5cf2d37d9104f964fc4e60f3c94944e15cdd9e859657cb0cb68e8
-MISC metadata.xml 313 BLAKE2B 70bc88a2b745b46e0da17a41ef420dd6b0ae2fcb3f444ed6be3d6bcdea63a4b0019790e0dba51b46c3a5d82c93f667f25b116793623604edad4d01841af723f5 SHA512 ae1c2257d3367ea3bdba8e040c0efd98674fe833f7a025c1b554e8cae6e1a41de6867e63c3d792593fa2f4baab158b046d2efaa08d6c8376f8ec749cdc7d4ff9
+EBUILD scripttest-1.3.0-r1.ebuild 559 BLAKE2B 5075ac83f3177c89dfd78dda0d3c9f4cb93cf557ea8f703b753113d3bb18faf5b9fa866063e1b4127248ece24e3193cbdef87e8055ff8d086617695cd835f046 SHA512 9ad20289b7ad7091b916125af906acc884f8e88715a4aa6958ade3d878ff8f4d9c13dd9c045e72e51248ba6c6ac63281f62950854a45d92834dd21ce3aca6064
+MISC metadata.xml 368 BLAKE2B a456fc4f5ab5fff862ad4a9a0df4839f98e410d705d6cb13cbff433122f9d9ee574ce3b62b5e1f893041971c5e26c3a4e5c71a67e4b51091fed6d4622e8b5009 SHA512 e0145c39362c5e51095647bb3d085be3b4c9177d55e8c0c6245dd6d144cac9eaec571667300a406271bcf503c991f8e242c4ed6eb278ef1b28b7bdf08e823114
diff --git a/dev-python/scripttest/metadata.xml b/dev-python/scripttest/metadata.xml
index f8b627581028..01164eae1e4a 100644
--- a/dev-python/scripttest/metadata.xml
+++ b/dev-python/scripttest/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Python</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="pypi">ScriptTest</remote-id>
+		<remote-id type="pypi">scripttest</remote-id>
+		<remote-id type="github">pypa/scripttest</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/scripttest/scripttest-1.3.0-r1.ebuild b/dev-python/scripttest/scripttest-1.3.0-r1.ebuild
index 6f5a87847e1d..ad68f3fadbce 100644
--- a/dev-python/scripttest/scripttest-1.3.0-r1.ebuild
+++ b/dev-python/scripttest/scripttest-1.3.0-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="A very small text templating language"
-HOMEPAGE="https://pypi.org/project/ScriptTest/
+HOMEPAGE="https://pypi.org/project/scripttest/
 	https://github.com/pypa/scripttest"
 # pypi tarball lacks tests
 SRC_URI="https://github.com/pypa/scripttest/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-python/scrypt/Manifest b/dev-python/scrypt/Manifest
index 935f3dde55eb..7c09bab395c2 100644
--- a/dev-python/scrypt/Manifest
+++ b/dev-python/scrypt/Manifest
@@ -1,3 +1,3 @@
 DIST scrypt-0.8.16.tar.gz 54205 BLAKE2B ce4f86f8bacb4f12408604822a32c9f63f96a155469cca1d2aa50cf67fc9e9576432f13ef49694a9d7ce21696aedcef27419fc0d3aad67a87d16c3bf8c0f94c4 SHA512 9498637d1354a84021f2c069a919ff157ff189d1385453397a9c43e522de77af9d628a90d649d50e9243abfc0b96efe4e38b615322d83133137bad94d448ef06
 EBUILD scrypt-0.8.16.ebuild 605 BLAKE2B c77704b86eb0828c4b5be143cf9834de6730f6c6baa01fc9f3be6bcc0ed3dcecce1e3f85d2f0239f02eda2ee58a7178c743cef7ab7c33e1c403e39d866f58363 SHA512 f0480aedbc849893d6c247346c66ef1bf78c85cd22f3a1d93a07dd18eb43704bfa64de5f59dbbf61143879118acc23e222be7a01f4dd7e6b091a4f38926ebf54
-MISC metadata.xml 479 BLAKE2B 699d8337f530cbac981bd6be4556e75e85874bed107100eebd605d3dbe01172b85a66712c7d20bbfb4310d5bf6d32df97bfe47132334ab2239190818b2fd3fec SHA512 43f00f2f4910b07e5f9db676cba1527b27f5ae4bcd49d59d118fe1e9656f185bb08535c1cc04f95bce6b59613c5b022440d746033efbbc3c26e3ade81fadb56c
+MISC metadata.xml 476 BLAKE2B 3b898ca601f0aeb1e05247bfadb54156de56a5c425d1bda5c25cd0b3f05c51fbf1e14137022a954b74f0d141f494707db2e437beb0c742bb1bc4428a48e2a555 SHA512 821250cfea1c6d91a6165173d268a7aa8a61f19678c02d5df665ca568793681a1387b68e0d661c9f7b3b384c386a0b2b20a9b86ac8d1eedf1a06f06d9d2db65b
diff --git a/dev-python/scrypt/metadata.xml b/dev-python/scrypt/metadata.xml
index 2d629947efa3..b7bde18ccf3e 100644
--- a/dev-python/scrypt/metadata.xml
+++ b/dev-python/scrypt/metadata.xml
@@ -11,6 +11,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">scrypt</remote-id>
-		<remote-id type="bitbucket">mhallin/py-scrypt</remote-id>
+		<remote-id type="github">holgern/py-scrypt</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/selenium/Manifest b/dev-python/selenium/Manifest
index 0bb45687d2f7..912bf9f5775f 100644
--- a/dev-python/selenium/Manifest
+++ b/dev-python/selenium/Manifest
@@ -1,4 +1,4 @@
 DIST selenium-3.141.0.gh.tar.gz 155705874 BLAKE2B f75eec80e6caa86744092020abaeef56defcfac8278dd3fd605c29d6860c1c046956c7599164ba1b4682f20dfa997f5a942d83f7ad707b052ad3ca98c0800527 SHA512 add14d426c5b929901cd71104460c7ceaacf46374b46898254dc2e2602f4a9a370199da603e3f35375c0f297d6fc2fda00c9ce2ede9d5b893b072e0487883df2
 DIST selenium-3.141.0.tar.gz 854669 BLAKE2B 621f4ab03bf85718b50099fdf10cdfadaf326bc7d9c9f1676a2a20e3ad23bede7884d8017b98bc6ebc314c6a4221c7668628d2d1888f36350c95eed1d82acee7 SHA512 3d2afbe9e96f88e9c055a89786b5090af387d3feba4598577b70fd3e0b20c2c09c4b25af920c654f52ec7e34f23181e6d278ac05f1a1f960d2d371ce7a6b82d8
-EBUILD selenium-3.141.0-r1.ebuild 1182 BLAKE2B eac45d5dee732f9408e62b938983d2bf8138a2d45d4792c9584c6ad88945e2c231786026349af762769c77b77cb95dc9966bf9e1adf86d3b4055a552b2b8e620 SHA512 0bcd305e58138076d805d71d6822b24c16cd08d5b51d76efd0e4fe71afff139ea00cf1b10e9004ccc9861971baa5873bfd8f8da8fc3d368e11a78fda47664bcd
+EBUILD selenium-3.141.0-r1.ebuild 1181 BLAKE2B 3600e0686d66155ae6e9936611cec7fbdeeb11845afe33909042066b0922c4f58fd038f5399022f4d641125ee437b3fdde21cb8d7668922fcbb9fc82d534914d SHA512 ed6ee2234ca18c408d1d25572517ad95e9523ccf49c51486268a6b2de3ff1f420174bd3e4ccdd5f9f8c9e0d1f0053320ee70d42ef76f83ef32cfbdbced7268bc
 MISC metadata.xml 407 BLAKE2B bfe4e5bb0922077a763a2227f8fcbd4465cf2dcc5c4e2acbc4c91bf0f90d8750c63691880338508b506fdd333ab9f858011a754089586606eead6c39c14c71ee SHA512 1fc7ba2ae78e2ef6f7dfc35d1c42120eb32a6ee9a8f15c698bdae133c7a242cc051df8321fc20f4f2a76abc7bc303b8439fd480e60d4264250a02a85c5c3768b
diff --git a/dev-python/selenium/selenium-3.141.0-r1.ebuild b/dev-python/selenium/selenium-3.141.0-r1.ebuild
index f81431a72a96..859e489d684e 100644
--- a/dev-python/selenium/selenium-3.141.0-r1.ebuild
+++ b/dev-python/selenium/selenium-3.141.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 			-> ${P}.gh.tar.gz
 	)"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 LICENSE="Apache-2.0"
 SLOT="0"
 
diff --git a/dev-python/semver/Manifest b/dev-python/semver/Manifest
index 08063cab996f..30a1cb04bd43 100644
--- a/dev-python/semver/Manifest
+++ b/dev-python/semver/Manifest
@@ -1,3 +1,3 @@
 DIST semver-2.13.0.tar.gz 43674 BLAKE2B 35d0ca0b61836d0e6deb97f067a0c1cbba310dde6eb83d78f02f85c3f7485114ad549559d572d4494aa7c4444c7d6feabcb36394561a238489d56bfd04ed8590 SHA512 ca0d408d8bb7305e90802ea04d935cd7b76b8f166a9ec97ed3427dbc2cf60eeca0b2d27ad0cb2f15f32f5b2589d6717a63717c463183374c5335bf79e1eec222
 EBUILD semver-2.13.0.ebuild 649 BLAKE2B 93be145b66d6915f752bdaf7b1da0641f7378fd9f2aa243ea2d1f3b97e7c687f59d1cb0a8affe39875f79a61e732b453702fa9630de277d8a84c8fb80851007a SHA512 21df606b3bdfafed7c1152b511d35852328f31f3f6c8d3568b2aae306bd6f7c41f7528fe689a8c15c7d9df77e2523ade2dd280eaef11ae9d3f49e76b6b336d43
-MISC metadata.xml 378 BLAKE2B c5a9b5c47963a1816ac261fb13f94438d4c3e55a7c7d1ef69ffac63ecd141e63b7b87d90dde26550d521615ea81f40e045ae0e61c9af111d10fbf89abb93284d SHA512 7622874a382b49f80d9565b77ea4c279e560e207c8b149b4b5f386f969c74e92f68b1687de306dc453231c36be3f6a1b9d526d175b555e17d00f467d86dbe41d
+MISC metadata.xml 387 BLAKE2B 93c31eb7f9fbdf45e6666658b243ceafb76094bfa748b90d19c93c9e2513c462b1a406e40f7c1aaa828cd2358edcea7ff7c0a63c33949b4cf35c0295aac718bf SHA512 842e7528ea24deeb18e87f030827ab91ab49e82f3623c111ae53dd2d530210c1123afc25dfbd771d48ba3369229045df577e2b953ffe058c6290072e2929cebf
diff --git a/dev-python/semver/metadata.xml b/dev-python/semver/metadata.xml
index f6192cec3f7d..8c7126bf22a4 100644
--- a/dev-python/semver/metadata.xml
+++ b/dev-python/semver/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Georgy Yakovlev</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">k-bx/python-semver</remote-id>
 		<remote-id type="pypi">semver</remote-id>
+		<remote-id type="github">python-semver/python-semver</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index c934f9073aeb..35b9ddb1df54 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -1,5 +1,7 @@
 DIST sentry-sdk-0.19.1.tar.gz 186747 BLAKE2B ae26751ac2e640b86b3c7426829e699cfdbd1c35e70edf0f1f835e35da82f658990a5f61adc4e7b93b032f6c9824d0df90bb2146f125c1fb846c3436228d5516 SHA512 dd4234a36920893e55026ba5ab8b1476cbc91b035a4b4c78f9dcf29cc8e232dc49c6f7312b8fb3d64cf469552d08ef5cadb65d3a7fb58ba73b87e43375c27c8d
 DIST sentry-sdk-0.19.4.tar.gz 205992 BLAKE2B fdf7d1a29a04be01bc3b7dd7ef7ee0ad33bb03241d9c62e152aa829b2faddb52e7307705ec4f7d89db912ac625de477999167ea66372bcf9304caef31fb65aa4 SHA512 bc8d23b6767a1809ecb4d43becbe266f1e068cfb953cbad280313e54fd3d679308eace42fd880f356bac2f216894e45ee1b51eb2fc74f73f9e433bae406a2a37
+DIST sentry-sdk-0.19.5.tar.gz 206164 BLAKE2B 9d7ce2a64fcb511c659188dc18bc4af18052c0f12ff5d31848f341ef20cbc6c9cf1102d17e6e8d8b741eb8000f94978f840f3ec66b43367820e0ccce97b1fd1b SHA512 082ace137656e8cc8317e70cf4fe9823ccf8cc3ed7b54af059990cede72179924a36896a31a806de4adbbf3bd66e54d5385eb630c047b929583e32c39ed69d61
 EBUILD sentry-sdk-0.19.1.ebuild 2701 BLAKE2B 469f864a807a8fd4975628bf724266d5d2bd5e07f386d2c254b9a8a4fcda7fe2308c632e5e8bfd9af3f33b1fd746a133159dccde6d591cca9d4ea26cf70f90da SHA512 92ab95a66013aefd8c395364993bf06ef124df46d33cc8eca499d1b3feb313d312c7cdabd07a532bd7df15ba83acbbf4f9576597dfcd30b499bd5ea327a36fa3
 EBUILD sentry-sdk-0.19.4.ebuild 2788 BLAKE2B 47fa86739fd821f8b2357d6caf8e539412b46b846eb59aaa3cd5c14156634e87c07ccae637184f28cdbec1c01682488900d6e7e8167fae39e10ecacb282465fd SHA512 627bbca3e49f5a5cf0f86ce35a81320253e03b0ffd35dc43f53eef463ff001b8e88ff9b07431d1475647199f97b78b8899cbc8ff394d5d95d506e757801c442d
+EBUILD sentry-sdk-0.19.5.ebuild 2788 BLAKE2B 47fa86739fd821f8b2357d6caf8e539412b46b846eb59aaa3cd5c14156634e87c07ccae637184f28cdbec1c01682488900d6e7e8167fae39e10ecacb282465fd SHA512 627bbca3e49f5a5cf0f86ce35a81320253e03b0ffd35dc43f53eef463ff001b8e88ff9b07431d1475647199f97b78b8899cbc8ff394d5d95d506e757801c442d
 MISC metadata.xml 446 BLAKE2B d115ce1b9a1d92cfeb93cd220c96247f1d6ae9514b0d598a0abc9fc6b17e45851a33e6f61b364f682f6530e4ac2611fd0a65b2fb5b21d394e78030f6ef34d1fa SHA512 f7167d56812496468a0766bf6e7d29b99e5efcef8cd61723ed7b09188b515b50fa13275d665f7ff8400b5b451e05ddcec403cc4c75e55509b21b849cafde0a3e
diff --git a/dev-python/sentry-sdk/sentry-sdk-0.19.5.ebuild b/dev-python/sentry-sdk/sentry-sdk-0.19.5.ebuild
new file mode 100644
index 000000000000..8b4b5633c4f0
--- /dev/null
+++ b/dev-python/sentry-sdk/sentry-sdk-0.19.5.ebuild
@@ -0,0 +1,87 @@
+# 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="Python client for Sentry"
+HOMEPAGE="https://getsentry.com https://pypi.org/project/sentry-sdk/"
+SRC_URI="https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/sentry-python-${PV}"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/asttokens[${PYTHON_USEDEP}]
+		dev-python/django[${PYTHON_USEDEP}]
+		<dev-python/dnspython-2[${PYTHON_USEDEP}]
+		dev-python/executing[${PYTHON_USEDEP}]
+		dev-python/eventlet[${PYTHON_USEDEP}]
+		dev-python/fakeredis[${PYTHON_USEDEP}]
+		dev-python/flask-login[${PYTHON_USEDEP}]
+		dev-python/gevent[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pyrsistent[${PYTHON_USEDEP}]
+		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+		dev-python/pytest-django[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/werkzeug[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/aiocontextvars[${PYTHON_USEDEP}]
+			dev-python/contextvars[${PYTHON_USEDEP}]
+		' python3_6)
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# tests require Internet access
+		--deselect tests/integrations/stdlib/test_httplib.py
+		--deselect tests/integrations/requests/test_requests.py
+		# wtf is it supposed to do?!
+		--deselect tests/integrations/gcp/test_gcp.py
+		# fails on py3.6, hangs on py3.7+
+		--deselect
+		'tests/test_transport.py::test_transport_works[eventlet'
+		# TODO
+		--deselect
+		'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
+		--deselect
+		tests/test_client.py::test_databag_depth_stripping
+		--deselect
+		tests/test_client.py::test_databag_string_stripping
+		--deselect
+		tests/test_client.py::test_databag_breadth_stripping
+		# test_filename: apparently unhappy about pytest being called pytest
+		--deselect 'tests/utils/test_general.py::test_filename'
+		# test_circular_references: apparently fragile
+		--deselect
+		'tests/integrations/threading/test_threading.py::test_circular_references'
+	)
+	[[ ${EPYTHON} == python3.6 ]] && deselect+=(
+		# broken with contextvars on py3.6
+		--deselect
+		'tests/utils/test_contextvars.py::test_leaks[greenlet]'
+		--deselect
+		'tests/test_transport.py::test_transport_works[greenlet'
+	)
+
+	# Prevent tests/integrations/modules/test_modules.py:test_basic failure
+	# Needs to detect sentry-sdk in the installed modules
+	distutils_install_for_testing
+
+	pytest -vv "${deselect[@]}" || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/serverfiles/Manifest b/dev-python/serverfiles/Manifest
index a12dab05cc44..852beeb681df 100644
--- a/dev-python/serverfiles/Manifest
+++ b/dev-python/serverfiles/Manifest
@@ -1,3 +1,3 @@
 DIST serverfiles-0.2.1.tar.gz 10506 BLAKE2B b653248261f05b20fa65a566e29065e97679383e44d3e8c05d10d1601376de2c39e1690a7ec1b1b3c680f407086294ea0769e030702fd01bff8833cc32889b8e SHA512 80512dfd8381f12aa143a88fb656bc7dca99fbc3c07a0b6cd9c7be8477de984a5121ffdb2f4cfe0f2150b83100b68ee478cfa7f26ea2f29e4a6fb7fe4eb0c18e
 EBUILD serverfiles-0.2.1.ebuild 615 BLAKE2B 5577abe72b800e0db7fa3b1d45c51e7c9d1e47492e0171e53edcdb12f77f85ebe01b4536ff423b064cf9bbf1c72d228ec19e1fe4789d21752519b994f2584540 SHA512 fb6ec966d371489cb11391358c7c546b8eaef3eedd13cfe3601de9de5d0295f223e3b2cc17dd30ffc28fcf6787060216cb80e227e9027faaf08617de3e01e158
-MISC metadata.xml 214 BLAKE2B ee4a28a5b07deecdb0f59f382551a5f75712aac4c44a3f1b6086bdc520a5dc1cfaf67982ddeada2044128fcd551b40aba54d463d91142a3c35236cb09e119416 SHA512 e38be8dc636f8d2db14dbf8a5d673224ed83adc030db673cc59ef4c2db90884de5f4e61c3247524d12015486769ee984d1c188acb7488826e659fb36de1b46e6
+MISC metadata.xml 291 BLAKE2B 03ef9fa7f784a593023fe5c26be1d02dbb23083973b646855cd2f3620f3f11daa1318e51dcca9d54e49e3ad5233d989c456a6e023ab8db55b72f7cc4fb11e29e SHA512 da4cf4f229560941bf3dcb2098859aa91ce05c54f407d2315a463fe4ae2bb882557452d02844b5dc452ad0de9e7c81c0cb3f20bae7cfe920eb6dcf57545740bc
diff --git a/dev-python/serverfiles/metadata.xml b/dev-python/serverfiles/metadata.xml
index 007aaf442ea7..9358a3cc04bb 100644
--- a/dev-python/serverfiles/metadata.xml
+++ b/dev-python/serverfiles/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>amynka@gentoo.org</email>
-</maintainer>
+	<maintainer type="person">
+		<email>amynka@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">serverfiles</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/service_identity/Manifest b/dev-python/service_identity/Manifest
index df359806076d..aff6e8a9cf1b 100644
--- a/dev-python/service_identity/Manifest
+++ b/dev-python/service_identity/Manifest
@@ -1,3 +1,3 @@
 DIST service_identity-18.1.0.gh.tar.gz 34252 BLAKE2B 18823e6b8ca9444591f063b4835362522e3ae374cd669f2da299389fa2977f42e0a1d715b35d90e9518bdd8ac8c76e0adf4e121e85e2352de78e621d5f1e6259 SHA512 6b6da48c543bfbe0d9da9f0d03dbd735ce97e64a76cbf9eae2b615ced7b91c5fcca1f25353e53858c48da9c4e0c0be4e33fa4559adb50899a79689cbb372f49b
 EBUILD service_identity-18.1.0-r1.ebuild 826 BLAKE2B cb0365b813a4b17b99c85c8bd6a5cf84eb686841de0909c0c379ac79d61f998be8764270d52c9d1e92009de2a7646181259e6acd4a5c89bc3fcb383df71451ba SHA512 882d4451469a509f2fb58b563dc32edb36e98246918db2feeb8c4fbf86f119a54d4ec8ce4a83181bc4a3fa84a56949f1d104de5e7a73c1ca6e007b5457553ca8
-MISC metadata.xml 417 BLAKE2B 756a633325c85cd35b7f10932f339fb309cad72766c32d8af26e6cd05004c163cf1349ccc61f8657d1d19728bc375f937ddf951243d775cb91dc3ec01881093c SHA512 26f165fd38aa65dd4c4d7c705b3db4e7e8bb1ddb8f7d326d1f4403c2bcb7820a9ff12d000675444fcd945201ad0176b34a695222f04ef6c0c803ff36da771870
+MISC metadata.xml 404 BLAKE2B d45422863a9c34f5c0430c100a54dbe9f10ae3b7457851881c6b3910c96a7da95070f0140ce6c6a2bcb3da0fcf5c19b57e182744d0cf1699a9e92cf5809c418e SHA512 899b8ed9ac3c78c2aaa16afef8c795b3e561744e8bab31519a54795c9ea412ebe828f73cd0e27d32cd4f401b70464252c80d78540cc8ad2884c81b662a29a4da
diff --git a/dev-python/service_identity/metadata.xml b/dev-python/service_identity/metadata.xml
index 6bd4e3786bdb..23098200b7d0 100644
--- a/dev-python/service_identity/metadata.xml
+++ b/dev-python/service_identity/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="pypi">service_identity</remote-id>
-    <remote-id type="github">pyca/service_identity</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">service_identity</remote-id>
+		<remote-id type="github">pyca/service-identity</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/setproctitle/Manifest b/dev-python/setproctitle/Manifest
index ae31f288ed3c..749296821d56 100644
--- a/dev-python/setproctitle/Manifest
+++ b/dev-python/setproctitle/Manifest
@@ -1,6 +1,8 @@
 AUX setproctitle-1.2-pypy3.patch 1614 BLAKE2B e3aa1709da8c46f4ac6f6b66e587c860e29b3fb0571c7a0d209bf16a1815711e13d48ac6562f6ed7189d3c3f4cd670d4346a8e5ac077cc6f2d0f3ade93d48e97 SHA512 6991a4b224d4f467e70a54bd83fc474e5df00a050627f195720ce2d95d230582cd0b2c49b792a83334f2439de1df757c4a51070c495c275e133698132e7d79c9
 DIST setproctitle-1.1.10.tar.gz 24042 BLAKE2B acd4ef33ab2a200b5d102fe5ceb78df03deeee47eb5a3c7b50f0a44e095953e5a4e2230278b6b4a5010472e4a5a18b81accbff0461e3a642be478b880d98114e SHA512 c976c5b86f59bc6d0f840f495b8256813169d3d7b9edae70207a24d62e1240bfec954fdc4f67b429ae124e3dc74efd7193404785643a52b2d57b55028bb3c533
+DIST setproctitle-1.2.1.tar.gz 23628 BLAKE2B a50f078a08d2828b03b3cde261af419f88e08045fc18230be017c642c2d4e1b4fb6809e1e2230160d46ba24ba893beb1f95f125b93e7d1b9aacd4ed333bfea7e SHA512 c11f756a61501c4126e6bba5d931a3fb26294d2a55255c717f0e3c3b72184841452195ddf04fb6e8b686d26caa36cb5e13fbd66c66c151c54981a9edc620da1e
 DIST setproctitle-1.2.tar.gz 23454 BLAKE2B 4a69566e48a2985ae8add0341feba26f062d8345dd773570e0500795e43b349777d4bf557bd8b88d9cec37850c129009823a1f87ed6261a9709e84c8a6f56868 SHA512 7dc84ac0fc028ca71e786622aa6b649961feb816e0f03a3d52ab7b1a5d7edc0c932695687f1f5487d27104535a3db0c48d12fd69859478a604dbf60c615f4e01
-EBUILD setproctitle-1.1.10-r1.ebuild 980 BLAKE2B d6300fb90ba30c03d37afca61ccbc6fc04238ed1f279ebaffa8bdf9b3859fb7c469b1274dee5940261ee5db7bbc7ed772e103fa8b2ebf895617b568663e5b0e0 SHA512 af60bb769003e352e01b8c94bd8417f7c8c745059e24a322bdf5f32b8e3644f6f2d8246120cb60812f6a5588561b44c4753e15d4dd77ade2ecc781251a9a0aab
+EBUILD setproctitle-1.1.10-r1.ebuild 979 BLAKE2B fe9fc378ac8bcaf931cc40d0f1bd9ac352c2439c4e2a6656363ba86b94ceb6799b5f6e23c62e3640d891381a99f29e1b1206669e8c6b619273e2645edb87026f SHA512 509a6fd30de205d52e29218831575bf6c1090f4d1fa82ad695fa10c3adc0c9b0186f196de178260aaa8be7f640b3ee28b65fb5ffd1f5fadce6a28874139a0bcf
+EBUILD setproctitle-1.2.1.ebuild 596 BLAKE2B 0d7382913c17d2dada55b71b18cc25b08a74649e41db97097707e01cf5551ecb1a957ed19d5aec3355cd78559d44b023b7a930b408901be3c304c45e4f018f78 SHA512 9b3d558301f496398cf6352580094029c4871369e53d36d07ae6519d4f651b5298c61aecf8dcee727ca8a0517093a07619be45710bf1845114ea274205fe7409
 EBUILD setproctitle-1.2.ebuild 641 BLAKE2B ce87b613f7fe566026005c06a2e511f39cb2d134e199944f4e8cca4cc25b757a2855fc5ac7e4efa72c6222f8ebeb1cfa1181abbf8e9caf25a5c8fde46f084b11 SHA512 51a8b22faeb1a1dc571752d7ed72aee0377670d52041ad5cf6baa8213050d3c174e1bf4b7f0bdd618512c64ed44bf1a00b6e057669d0bd243a9bc517a53b1621
 MISC metadata.xml 380 BLAKE2B 136b22ffc942b2b6a6bcbd45ed3cebb105bf91a16014fa1fbc181a3a9055d132e03df3ffa63df79682f1e7369ee264f87ff32e8602a6478d170f4b20a230e9fe SHA512 eaca32091baa4a9fcd8ffbac6d250c135c0237552a7229aafc3cbb8bdf43450c114f26676964f80f73c2146b0b47934d77bdfdaf8411c069958bd898f69e8004
diff --git a/dev-python/setproctitle/setproctitle-1.1.10-r1.ebuild b/dev-python/setproctitle/setproctitle-1.1.10-r1.ebuild
index 8d60577c7cb8..a42dd983f9b7 100644
--- a/dev-python/setproctitle/setproctitle-1.1.10-r1.ebuild
+++ b/dev-python/setproctitle/setproctitle-1.1.10-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 python_configure_all() {
 	2to3 -w --no-diffs tests || die
diff --git a/dev-python/setproctitle/setproctitle-1.2.1.ebuild b/dev-python/setproctitle/setproctitle-1.2.1.ebuild
new file mode 100644
index 000000000000..fb436d52f2b2
--- /dev/null
+++ b/dev-python/setproctitle/setproctitle-1.2.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="Allow customization of the process title"
+HOMEPAGE="https://github.com/dvarrazzo/py-setproctitle"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+distutils_enable_tests pytest
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index ecea09590f4b..d0fac8d8ab60 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,5 +1,7 @@
 DIST setuptools-46.4.0.zip 865912 BLAKE2B 452d36132f5648c79c7e1616a93ff6a39ab2f64b2864ee397b4f57e7f72c47d418ff274f5decd35b0591b09800ad2a7cbd71c283550bd0e60a4d85744a57d4ec SHA512 31e58fd1d682089a45d23aa07c3c2c4c952ca016fa4c3416b2cba979d8b57369f80baef98ce857912e506e87d6cb456497a1ce1c75a0cdf1ee25d4e753b58726
 DIST setuptools-50.3.0.zip 2169216 BLAKE2B 029ea0159de270af0078a4661c696b93681b33dcc475640c7626f5a40bf1bb4759e5915948696c03b76dca10bdc4e790e2e9ef9628f41abca9a6aa48adcb72f6 SHA512 f67a2b7d639e03bf8b3815133e128902a559baf689afdd5893844ddc7c83505d727a6bb30ced1f78c4d2719dd405d2f4c527576bfa14dd9cb50c8ec4a479683e
+DIST setuptools-51.0.0.zip 2059134 BLAKE2B 449e87e413490181136ffa80a109e68b086fd0b1b56b2391e8cc612fb4c9cd4bb89acf05b464a5fa86c3984d3f22bc103dc9a21a2948598b7a17f770c4037008 SHA512 ec8c8a43ef176b5a4029f42c900690c1b9cb304efeb2cf8d36f3f2cb4343af4c1b1770f83ffb0e80ef237f58e6eeb233a97d6b3b8c6c6a2557bc4f14ccff9e90
 EBUILD setuptools-46.4.0-r3.ebuild 2568 BLAKE2B 177c7c477880b56f4129ad7688448faf9344ec6e03fee0258bd256662f7861a82347089cf58cef8c08b9f4e513284d2ac42927456bc780d877ed5cfe61380bc4 SHA512 6f7cf119b89d73d1aff16a386f6d17b1af293fe2c079c4a8d57a42541e3b5b7cd0c11b5f1af1cdbeaa011ce8c249b1cde20632410de0b25bf86913d730b8e305
 EBUILD setuptools-50.3.0.ebuild 2292 BLAKE2B 8a1430f669e576149863d579de27a2c5ba7bdcb16e85d3d8853f6ec25834a28993666a53d9e77f5a1a46311d5cdcff382718968c3026cd62c708a472a3ced290 SHA512 f8e4145e7a84a7d067c2c971567a7178d07549a5f68d9ff9e3eaf6567fb5e658d0cf6a66dd3bcfb4a54dfcaf31e1ca39865c5b1ec2509ea8ab1d9438919ce786
+EBUILD setuptools-51.0.0.ebuild 2133 BLAKE2B b95b2f4e35e0e7beb2fac672e8ab6b1fb3d3e0775cbcc9bfe4dbf0c4e9af386e129351bc0a0cc471a0780f8e0d1a5d78e9c79c623e1d8fd8905fd21dce3278e0 SHA512 24b0679bffcdb137dd92bbfae21052711567b10bf00a145c910481695df5030942cb65726b4f996c9c15040cf4361327576319ae8793fba4922a4e5756de1bec
 MISC metadata.xml 468 BLAKE2B 5f9a9240795261f894d54130ba489bb18fd24f8f95f993b55d23136fb2b518f47b64494d71ab0f697ca64f4eacc8cb58487e8889a8de22e8e3448caba5498065 SHA512 e284933f2a5d11cf7bb483776b8de2afe96ccad15a0e0bf7c9feab05c65f4247c9b19bb60c04d699ba917a637ca470e6ba41a38795899e54179602b587efe300
diff --git a/dev-python/setuptools/setuptools-51.0.0.ebuild b/dev-python/setuptools/setuptools-51.0.0.ebuild
new file mode 100644
index 000000000000..ae5553372be1
--- /dev/null
+++ b/dev-python/setuptools/setuptools-51.0.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+# Set to 'manual' to avoid triggering install QA check
+DISTUTILS_USE_SETUPTOOLS=manual
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	app-arch/unzip
+	test? (
+		dev-python/jaraco-envs[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.7.0[${PYTHON_USEDEP}]
+		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+		>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( {CHANGES,README}.rst )
+
+python_prepare_all() {
+	# disable tests requiring a network connection
+	rm setuptools/tests/test_packageindex.py || die
+
+	# don't run integration tests
+	rm setuptools/tests/test_integration.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing --via-root
+	local deselect=(
+		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
+	)
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" pytest -vv setuptools ${deselect[@]/#/--deselect } ||
+		die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}
diff --git a/dev-python/setuptools_scm/Manifest b/dev-python/setuptools_scm/Manifest
index 9f48d3f75d2e..bf1651e94ebb 100644
--- a/dev-python/setuptools_scm/Manifest
+++ b/dev-python/setuptools_scm/Manifest
@@ -1,3 +1,7 @@
 DIST setuptools_scm-4.1.2.tar.gz 48784 BLAKE2B 258fab119d3c37c17bd173e4ac34d338a222cee5f55f6b4756f2cb7feeb09e366f8578eead56caeeebc02d1b048199c0b560609e5aecacb23870398ae86f0cf7 SHA512 3d9d1e0479f00f6159b57f9e5b24e34df035d2009ec50d3779c77b1246aabc6d816f2a2d3e6651791316009e39dfcc8a1b84b779077c39501b9de5740abe6af6
+DIST setuptools_scm-5.0.0.tar.gz 51575 BLAKE2B 60f1faefe48eda74836ad4927fa851b014a7ead7da1dcd04d102052944fb4f48e18680b9e334d2c3578fa610b3ef7efc76bb0cfc9feb0fe51868290a7abcf180 SHA512 4e8dcb1528e48e76804e3c5eec97f2052b509b672d2671545e1dcd6a1c9604bfd1ad32fc7aecc5f4c48841dda0e36b083632463b2f14b263e857482ab4df19f6
+DIST setuptools_scm-5.0.1.tar.gz 51679 BLAKE2B 33f43b437b675291ded4408dd5e68ffbf4615938f963516c0047ead023b2f2a50b28a0d91c7c72a8bdff678d9b8b292aeec36bf418b43f8d039f13560b1fbeb6 SHA512 055403539a26caeb119f3d6623e7b32ef52ccc11a39757fdd9b265ba191265346be5a062a5926a381ba47bbd1a666ffa632653ee6055050689cc38fe0f90cd0f
 EBUILD setuptools_scm-4.1.2-r1.ebuild 1206 BLAKE2B 112aa09cef7c03016916a0a7c8ef0a35902cfb0a63a99110191f7cd6762ea3850b0ac8e6fc3a5c26fdafaf3ceafdb95432e66347e05f2bfb8069427cf4879908 SHA512 f6e375f41b78491933984e0b5f7a8af2df33663078b1db64ad0ed420c0e6a4fcac9bf3bdd3233e7865f6c8458cf98e11c300689dcec7e88627ca7220244086c9
-MISC metadata.xml 462 BLAKE2B 257bda789df46f229831124349133582141ed8046ffe22a2ed2537562e583ca694f9a23ac8fb70a8a7efec1414530a5b16db73568dbec22cddbf791797a1c781 SHA512 1118b7d883678dd5cf0c80bbfe28a926172646369032aa54b634dc518d617754482ab35962a3647aaf88310c7abeb17842d4d98b431a7bea0d0780112d06993a
+EBUILD setuptools_scm-5.0.0.ebuild 1219 BLAKE2B 741d1928c4feb93936be3db44a4208fd8f8c1dee9632435b7d43ca5a36e193640180f165923444c48aae757f5908ff2557f6787d62735dbeef06efb1be7e9619 SHA512 5aa45094c435020bc053137b9014afeebe4242dce92aeef639f62c50b62df266e9b3e284c491721f60b8a4c2d538cd4fa9dfdfcc8ad797d493c03c5ceee732e9
+EBUILD setuptools_scm-5.0.1.ebuild 1219 BLAKE2B 741d1928c4feb93936be3db44a4208fd8f8c1dee9632435b7d43ca5a36e193640180f165923444c48aae757f5908ff2557f6787d62735dbeef06efb1be7e9619 SHA512 5aa45094c435020bc053137b9014afeebe4242dce92aeef639f62c50b62df266e9b3e284c491721f60b8a4c2d538cd4fa9dfdfcc8ad797d493c03c5ceee732e9
+MISC metadata.xml 400 BLAKE2B c588c18ca5fef828f93a70bb799701725aeadea660b06cf1b61fc96c65e6dd25784901a36778d6f972e1aa9d6075a238fdfcdf8ec8a44b86f0e2852608c52186 SHA512 75b27d43cc0fc4dc74179f9b64c562ec80113354a59e6a8a440535e62d5119d20614c7c0e905c42966da839e149b4c7b79e894643a069dbaa45102b6ace5f07d
diff --git a/dev-python/setuptools_scm/metadata.xml b/dev-python/setuptools_scm/metadata.xml
index 4e6fc4d6b409..551e4c063578 100644
--- a/dev-python/setuptools_scm/metadata.xml
+++ b/dev-python/setuptools_scm/metadata.xml
@@ -7,8 +7,7 @@
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="pypi">setuptools_scm</remote-id>
-		<remote-id type="bitbucket">pypa/setuptools_scm</remote-id>
+		<remote-id type="pypi">setuptools-scm</remote-id>
 		<remote-id type="github">pypa/setuptools_scm</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/setuptools_scm/setuptools_scm-5.0.0.ebuild b/dev-python/setuptools_scm/setuptools_scm-5.0.0.ebuild
new file mode 100644
index 000000000000..4235e649c0d6
--- /dev/null
+++ b/dev-python/setuptools_scm/setuptools_scm-5.0.0.ebuild
@@ -0,0 +1,43 @@
+# 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,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Manage versions by scm tags via setuptools"
+HOMEPAGE="
+	https://github.com/pypa/setuptools_scm/
+	https://pypi.org/project/setuptools-scm/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	!!<dev-python/setuptools_scm-2
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/toml[${PYTHON_USEDEP}]
+		dev-vcs/git
+		!sparc? ( dev-vcs/mercurial ) )"
+
+python_prepare_all() {
+	# network access
+	sed -i -e 's:test_pip_download:_&:' testing/test_regressions.py || die
+	# all fetch specific setuptools versions
+	rm testing/test_setuptools_support.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing
+	pytest -v -v -x || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/setuptools_scm/setuptools_scm-5.0.1.ebuild b/dev-python/setuptools_scm/setuptools_scm-5.0.1.ebuild
new file mode 100644
index 000000000000..4235e649c0d6
--- /dev/null
+++ b/dev-python/setuptools_scm/setuptools_scm-5.0.1.ebuild
@@ -0,0 +1,43 @@
+# 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,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Manage versions by scm tags via setuptools"
+HOMEPAGE="
+	https://github.com/pypa/setuptools_scm/
+	https://pypi.org/project/setuptools-scm/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	!!<dev-python/setuptools_scm-2
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/toml[${PYTHON_USEDEP}]
+		dev-vcs/git
+		!sparc? ( dev-vcs/mercurial ) )"
+
+python_prepare_all() {
+	# network access
+	sed -i -e 's:test_pip_download:_&:' testing/test_regressions.py || die
+	# all fetch specific setuptools versions
+	rm testing/test_setuptools_support.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing
+	pytest -v -v -x || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/setuptools_scm_git_archive/Manifest b/dev-python/setuptools_scm_git_archive/Manifest
index d0ff67e692f4..b2e1d37db621 100644
--- a/dev-python/setuptools_scm_git_archive/Manifest
+++ b/dev-python/setuptools_scm_git_archive/Manifest
@@ -1,3 +1,3 @@
 DIST setuptools_scm_git_archive-1.1.tar.gz 2584 BLAKE2B 7c7569a92300be966b5447b1ab6c30a982c837efdb7a125173f6014420d78cf28e0d8cb0f04c4349ce364219e1567bcbc2e13bd85cb7627d3bdbae9c7974385b SHA512 73783d60d33782fb18012e64685db6333a2dda1be41ce75e0cd74a81585d8ebb7c85f23371056a42974c93b2d4a0633338945cf2a2219b0ee2a21f063dad8809
 EBUILD setuptools_scm_git_archive-1.1.ebuild 753 BLAKE2B 42795c1ddb7ce705d70c27816f84fc0a46ede4fb8fc9f933c809011dc7e26a11471c5ea1d00fd4a4e6ef791263f199b87cf85c29fb3ef4b6f047857d11a44288 SHA512 4a2b29662ec33942e82904966eca17c837b48c1d740eea868d4b84ef11c38cfda67a7623e849db16bb5cf7f43aa2b279aa4f0b6b2d6b819c786e65245e3d5688
-MISC metadata.xml 267 BLAKE2B 2d8b57fd5de0132fa382ac268575d15aea1f698eefa99b03a35c07ea1eb798dea4d25a1fba9deda173404f29cc99c8d519aed5ff5fb60d0779768fa53411542a SHA512 8c8abb99f1567921f504df5c39fd2f54a0cdc5ca1b5c348fa5b0a9c6a3822b474bd489821195ead44237f3ac873b0ac0b05597632a546a41e0bbbb97e71a2357
+MISC metadata.xml 356 BLAKE2B 0ce1e000073c414d155684756b9da47f0ee379fea660e66156b58e84b5cde966603a96aaea4d37296e123cad924b436a25c53ede080ffa3a97d96c634be98780 SHA512 71a6ca661189964f06253961c6cdbde67cb1dbaba685eb3efdf187f47c4edf9be8cb0400045acedb3474acc8f6021ea27b7e38b9da2652dc9fda76e45ce9a04e
diff --git a/dev-python/setuptools_scm_git_archive/metadata.xml b/dev-python/setuptools_scm_git_archive/metadata.xml
index 1f54352252db..0c29c96341f3 100644
--- a/dev-python/setuptools_scm_git_archive/metadata.xml
+++ b/dev-python/setuptools_scm_git_archive/metadata.xml
@@ -6,4 +6,7 @@
 		<name>Pacho Ramos</name>
 	</maintainer>
 	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">setuptools-scm-git-archive</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/sexpdata/Manifest b/dev-python/sexpdata/Manifest
index 2f41f2df5ff0..f13d984ac0e8 100644
--- a/dev-python/sexpdata/Manifest
+++ b/dev-python/sexpdata/Manifest
@@ -1,3 +1,3 @@
 DIST sexpdata-0.0.3.tar.gz 13105 BLAKE2B 36c4082a63f6748759d71fc38a056ecb7467eafebf0a1a0b006fbef1302488f23a859462c9526dc365f7c88b8b6c331dc6e4892e1d96358abb44ca60a909d283 SHA512 03d4d1557bcc950124e408d6870894c8ee9e72a2ee83c881adf48f8e53bdf3744b4f3e3e133a74a195d236424b434cc690583a68d8395324ca4e84947e548501
-EBUILD sexpdata-0.0.3-r1.ebuild 562 BLAKE2B f3533721a5b9cd8cb49a1a28484f868ec50d1ce0195fafb4a4ae76fd9b09d3630ea0382522032d3b051202042625d51481cb45cdd0afcacc25f28e63b583c14c SHA512 75e8d99f2adf9a5fb63b9ce9a481065a1a0120e2925689ac27c5c32d811b3a967ad20d1853f786cfef50614a16c9e965877d0ffda14c16e14d748185f7b4a4c6
-MISC metadata.xml 329 BLAKE2B fbb2f8210e6dd71fac93c2b9c2a99f21a59141fd805276c3de543f969b7bacbf65c4bd239136bdc280fb5eb298aee160193c28a65e2cadacabadd90c8dde7b9d SHA512 98e7efd62fd98efa6fe6fc373d438b8f5132b68787f2b958319d3c7b07b589adb94136762ff950a49adb27d21a780b8cfca54afb1ff30a7c486381d9a7b87e6d
+EBUILD sexpdata-0.0.3-r1.ebuild 570 BLAKE2B 69dbbe1e6ff821af712878a298a148370ca848a6920169fc696b6f9d72f28afdaee46f0932ec3888f7d6914a31db3c4ff676465fdbd5e641c32ae06a2b6eaf01 SHA512 e56c2b9dadb3fb71e67a575ccd87b17a8eb98baf9add8c04575c6f76b658d3dd56eda0b901d8b3a4227fd8b3ed99cc81dbe38441320f781d5172a51342ec4106
+MISC metadata.xml 379 BLAKE2B d951ac42c3992b2e8ca77b0bf08f138fad54afdf0f530868cbdfc32433a80b5b138d6a66833a397d6103d2edf0688958678b1b977946024ca75d95e8f7c02110 SHA512 d744cd48ed7fcfeef233d0731df0603a081c232c8a388b50402e494513929cbb6352a563525addc418d11c9eac73c2bb09e8d7f53112ce1618251e4447405a81
diff --git a/dev-python/sexpdata/metadata.xml b/dev-python/sexpdata/metadata.xml
index 3dabd781b02c..624f3f3c1cdb 100644
--- a/dev-python/sexpdata/metadata.xml
+++ b/dev-python/sexpdata/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo Layman team</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">tkf/sexpdata</remote-id>
+		<remote-id type="github">jd-boyd/sexpdata</remote-id>
+		<remote-id type="pypi">sexpdata</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/sexpdata/sexpdata-0.0.3-r1.ebuild b/dev-python/sexpdata/sexpdata-0.0.3-r1.ebuild
index a6df09476ee4..ccbc8d50d080 100644
--- a/dev-python/sexpdata/sexpdata-0.0.3-r1.ebuild
+++ b/dev-python/sexpdata/sexpdata-0.0.3-r1.ebuild
@@ -9,8 +9,8 @@ DISTUTILS_USE_SETUPTOOLS=no
 inherit distutils-r1
 
 DESCRIPTION="a simple S-expression parser/serializer"
-HOMEPAGE="https://github.com/tkf/sexpdata"
-SRC_URI="https://github.com/tkf/sexpdata/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/jd-boyd/sexpdata"
+SRC_URI="https://github.com/jd-boyd/sexpdata/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/dev-python/sgmllib3k/Manifest b/dev-python/sgmllib3k/Manifest
index e2d82deb0a39..61a94723b5aa 100644
--- a/dev-python/sgmllib3k/Manifest
+++ b/dev-python/sgmllib3k/Manifest
@@ -1,3 +1,3 @@
 DIST sgmllib3k-1.0.0.tar.gz 5750 BLAKE2B 188ac3c55245ff431e1ad7981f706f1a8fce3e9f3aaf844252c02da1189e5b9c7d29b76d803cbbcfc157fbb1ec7f36245186693472b95ed1634a2989185308ae SHA512 f9238afb831356f66b1c3e55975e0ea88007ffe1469b8b4e325e704d1915eb0ab120f5f9e98f36eeb4bf6204a1938d8a4d5a424f0cc054b141ac94adc8ef8ca9
 EBUILD sgmllib3k-1.0.0.ebuild 436 BLAKE2B 67e54bc52333d6036a3f9e4d6954f1925e8ca9322c2a1cd94e8064ffb5c0ef7a907a8d23ae20eb56dc4ec738856668b3ecb0288ae7fc5af9b9f216078dc59856 SHA512 e6614fbe2750b4bb26c4280125d62162987270f4dfd8b58b81d83c6cca645176c8c1e1e5d967fcf21c51ceea061ee8666e842c571502f5d3e9858ea3c34cd4c3
-MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
+MISC metadata.xml 290 BLAKE2B 4445241192300419cb2486ad41b1d0f84b946880eb462962ccbccd40249a677865dec8faee2cde394112eafbb8adab1906ae1c051b4ddb2eba2949026f449b61 SHA512 d71c4f36afff7d4ca0a6d80bb68268ae72f5f600e60c9844589207f4ab3c8f1cd86e353d2b7782237460cef225648f9cc0af2f438837c0fefd88e4d2d6b40ba6
diff --git a/dev-python/sgmllib3k/metadata.xml b/dev-python/sgmllib3k/metadata.xml
index 266e3f19ca59..494249786841 100644
--- a/dev-python/sgmllib3k/metadata.xml
+++ b/dev-python/sgmllib3k/metadata.xml
@@ -4,4 +4,7 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">sgmllib3k</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/shiboken2/Manifest b/dev-python/shiboken2/Manifest
index d0605e7664f3..043f3f2fabe8 100644
--- a/dev-python/shiboken2/Manifest
+++ b/dev-python/shiboken2/Manifest
@@ -1,3 +1,3 @@
 DIST pyside-setup-opensource-src-5.15.1.tar.xz 3454052 BLAKE2B c7190dff493434064976a4604fb5858d2e20c1b98098ccd6e5c4c69d0b67ae9f4bf970e2ab42b634208ea96aab31b21f3dfb5f18fddd0bdaab655bba729e4449 SHA512 f14c7037367799005fff73d9fc8e7998db1895700911adf34dfabdeb4db486c7b28ba2afb3eaee37c58f4099b00e4a86917b8f7d85f274026bddfc090658b306
 EBUILD shiboken2-5.15.1.ebuild 6585 BLAKE2B 9f180c3778fc96540bcfaef881fc8bd6ee8530f8eefcac546c3ce23534feba99bb13f40b170d4816ecea2256f4a0ba499f12018b06ffbd4c87c15656f4b025a4 SHA512 9671522a3dedc59a242c5c27d6710874d59557873d6fa4504e9472b62e66bf03578f383c8f0133aec0a05c5b704b6ec841bd90e88084c434395728bd501deb3b
-MISC metadata.xml 503 BLAKE2B 37ba81030aa2393583ae7eece0a0f9a542d7bc7d4f2b8e8a434e366d7fc8a24045b6fa0bc667355cd36fcc9866333c30efaf5da026b567f02357dc69e411a202 SHA512 ab55f2d1d33be0746ff7a2056a6dcd774089d356f8162338f8f9071a03c5e6a2cd09d665aae2232b32c53ef9b50b86e7726210376ed38d981397c522620639bb
+MISC metadata.xml 575 BLAKE2B 706ac0dfd0d543c69a81168707011c5778867c7fe3b3efbf8dfadb8c94304b29124df25a54eef273a862df171e721e5f642ab069d29a3278399b284365546b40 SHA512 4113c586b64a0c11806bd5dc86bd5f47e9b896df5c8a257ad02c83341e7d583f54c730fb73d22a428225c3849ae93f68f498d804c86eaed757825a088b0b3c64
diff --git a/dev-python/shiboken2/metadata.xml b/dev-python/shiboken2/metadata.xml
index 766f70c1559b..391fe0f6d4f0 100644
--- a/dev-python/shiboken2/metadata.xml
+++ b/dev-python/shiboken2/metadata.xml
@@ -10,4 +10,7 @@
 		<flag name="numpy">Implicitly convert passed NumPy arrays to Qt lists</flag>
 		<flag name="vulkan">Generate "QSurface::VulkanSurface" bindings</flag>
 	</use>
+	<upstream>
+		<remote-id type="pypi">shiboken2</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/simplebayes/Manifest b/dev-python/simplebayes/Manifest
index e406d1eae950..92353dec90c3 100644
--- a/dev-python/simplebayes/Manifest
+++ b/dev-python/simplebayes/Manifest
@@ -1,3 +1,3 @@
 DIST simplebayes-1.5.7.tar.gz 19260 BLAKE2B 373820a19c1a3188f0dfb57cbe6ac8e27fc6a96e9d1686d698a1f109122afd5240715678d965d843482de3c12b8b806157acef17008d4c6fac0103b343dd44d7 SHA512 417af72db13418e5a9df2fdb642fc63ed3eb4fbbf88cc7252a9e3603d31e35ccb68ae5838d8bb7d77554c1820a9db8aa944c639af4eb6418babb9d360ef3ddbc
 EBUILD simplebayes-1.5.7.ebuild 700 BLAKE2B 8d37c0c7b139165f4f42e58fe204fa3bf9ce3a035a13e794a07ba5b17d7ce569bad0990f6bbf75866c1a88adb53099638593412a380269a97fe0ea0f9852fb74 SHA512 443c354ac51bd2620e3feec2bd8a6a3b981ace110e379dafbeb0591a71cabffaa3b90c2f19b4c16c84dc07f36b7b9e62ae50fc08c64f21775311e7d0e1c8f9b6
-MISC metadata.xml 613 BLAKE2B d2456e6bcf0c65893658fe5f64edd2a407b394ef468f4afc9c7f7386042dca32602acc7ed9822dfa7445f6853d3ecba4579b397630d73a9dbe62389495386bad SHA512 ca6a18f6ef26a213a83f4dbd6fba4542c868365fc713f386a0ab92e4cb60a9faf0fa96f82bdabf81ec301745a63d35e821203ae67dc0e1b6ef3b18cadf50a97b
+MISC metadata.xml 662 BLAKE2B 2bcf3d9bee30b2cab1146844b57345a35432288de430253a9d56a631e6d8d57c101ccd8b9d4a70e5af68643823ef410fb29a9461b1c3573cbe841bccf595f530 SHA512 43dce6ba6ef084891d6ac7ce8c24dcd44d73f8879f6269ccbbd3683b276ebe93d18088944107e809798eb10bda7f8231c1a98fba292de6ca29fbc1b52b97b2a4
diff --git a/dev-python/simplebayes/metadata.xml b/dev-python/simplebayes/metadata.xml
index 3b9be0dd1edc..50f86acff519 100644
--- a/dev-python/simplebayes/metadata.xml
+++ b/dev-python/simplebayes/metadata.xml
@@ -13,5 +13,6 @@ This work is heavily inspired by the python "redisbayes" module found here:
 	</longdescription>
 	<upstream>
 		<remote-id type="github">hickeroar/simplebayes</remote-id>
+		<remote-id type="pypi">simplebayes</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/simplejson/Manifest b/dev-python/simplejson/Manifest
index ab33c1a12d15..73127d32af0d 100644
--- a/dev-python/simplejson/Manifest
+++ b/dev-python/simplejson/Manifest
@@ -1,3 +1,3 @@
 DIST simplejson-3.17.2.tar.gz 83210 BLAKE2B 1b9f97a43bfe84f1ad506713d81483ebcd4006d1174558b7a27373f99d014e23ed72a9ec2b2006e64760c61e1e500a4f1ea4547104e7f4c71ba51003df0a5052 SHA512 003b2fbcb3f8e0849bdbd958c78f8b470081d97527bef82306db77940c6734a1cbf3b5dcb0984d2f9c9d14aa525e7865a08e70a10971f8841e138f7ad6476e4a
 EBUILD simplejson-3.17.2-r1.ebuild 771 BLAKE2B af18fa2acd655a6884887d9d5b8d1c5775f82d64f524271ef0e9110d7cd7a071bd82761e003e4271e35e7a8fcf18869a767bad29606a9efed191eb5c8e9b2d81 SHA512 7da64c4664959c59c4e908b20ff44978ad49e31f6b99a3c2c387ad4b955db9c9017eefb26879fcb64cc7a8bf92c9feceb5363fe1f3dc451f5e8df9ba35af63f6
-MISC metadata.xml 323 BLAKE2B c21be649394bb8a261a6169a710fd3862f1dd539505381a15f99611f323ea1e5fe4e6e54f1ed73d28bdddc2459812f13e40658ed99c09d0ba0f93f724b4bcfc9 SHA512 7db760ee80a6281bcc370303bafc40aea566465bf3264381336222c6f6002f573bfac205f2e42cca557c7b31855f082e1ed29ec9ab3b1125e455cf84bdaf54ec
+MISC metadata.xml 374 BLAKE2B 9bc3d7ea8f41525aa5306e4d8db6373ea172453d9b62f8712c7ce6e4982cd2d09b2b7581f42f6728442085eb0ec120333dad9a1ae6fb8f2752a5d690f640a5df SHA512 f1091ba57b32514620ff6265354681c7ee168a12c384c66d1302b3c4a2fca897d08802156b69136a0ed9bbc026a14ffdbf705419c43da66d0b659592b05b68ae
diff --git a/dev-python/simplejson/metadata.xml b/dev-python/simplejson/metadata.xml
index a074e88efd6a..b31bccf3c8b2 100644
--- a/dev-python/simplejson/metadata.xml
+++ b/dev-python/simplejson/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">simplejson</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">simplejson</remote-id>
+		<remote-id type="github">simplejson/simplejson</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/simplekml/Manifest b/dev-python/simplekml/Manifest
index 987889cc63d8..b39e24bc2ce0 100644
--- a/dev-python/simplekml/Manifest
+++ b/dev-python/simplekml/Manifest
@@ -1,3 +1,3 @@
-DIST simplekml-1.3.1.tar.gz 37070 BLAKE2B 33d4c9bb7d77f80dd65901dc1f1f0d1f1586b6a800ac63a011b398d8bc13591b50e21d3e0ba36ff6f3b728ccf355fb021225a63846f4784b2b52d59526045154 SHA512 a72d378b44ccbe5f597f100784f3e802255c9a47216132f6ad13e594a2fb70058224428df5b7450ad7e498b9cfbfd846191d30dae225169957ea35659dd0968a
-EBUILD simplekml-1.3.1.ebuild 579 BLAKE2B eb3c75c572d0d20c9c15888d069b40215c2e930468f4db187e41d0dcf1d8b6af2b5ed472f2f52e248bbe5eba89ad31cd05bdc96acd75c1ad9e1800bb7309d827 SHA512 bb164f1b40ab6138b640462f27f8e747423641e754a1ff5fd83da44d7e06af220259e1e3289ad3d60f770470eadc2bc872bc3523569da78b4e1d364baa6233e0
+DIST simplekml-1.3.5.tar.gz 39069 BLAKE2B 3aceacc028618e553cd7c9a9d7d4b9a9223c8942816c193a68e6e6b8ead41b68d6a55a89ae4811ff0eb5d5f167605e8e58686384b5981735569d6db34a1259b9 SHA512 5f9c57b953fa27f533905536c4abfc580098e912d937cdce543ae55fb8da22f31ed84a35a0a0526cfb208c050fb407445ee81ad8cbe4ec823c8d896179446182
+EBUILD simplekml-1.3.5.ebuild 577 BLAKE2B c7ebae764f8161bca17b757037d50daab551bf9a9c570a70d5ac06acb23fcb3d9b49ff82e2d6d3b827717a2b42e7b13dabcd4796eaf3d95f1f1591fc0fab4fca SHA512 4cb45ba27b766b0c9b9a7961b88de260c36f5b5382e58670b5ce0b93de4dca6cdcf0827c0b399c360c9cec02815d6a5611e8cea7d79de772417d58673266bfc5
 MISC metadata.xml 514 BLAKE2B 2c938b0ef59d68d0225ededc4f03ace484e51b7006db859e1cfdf9c122947bb25e1524a2ac17a7a0be0fd9a9bb6e88c13413bd65e96a571be3aae500c18d65db SHA512 a7cc7f1d59a2a9804ebbf423b8c237530913c5d63114ae890df8710826f3c2654bac1bb0dc5c4d82585d9bb8b704e192c6d3214b8a3bac5479b548780eea8743
diff --git a/dev-python/simplekml/simplekml-1.3.1.ebuild b/dev-python/simplekml/simplekml-1.3.5.ebuild
index e4c0b7a057bf..3904633ea3f9 100644
--- a/dev-python/simplekml/simplekml-1.3.1.ebuild
+++ b/dev-python/simplekml/simplekml-1.3.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 python3_7 )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit distutils-r1
 
 DESCRIPTION="enables you to generate KML with as little effort as possible"
diff --git a/dev-python/simplesoapy/Manifest b/dev-python/simplesoapy/Manifest
index b3821eb5518b..2b7144fc5acc 100644
--- a/dev-python/simplesoapy/Manifest
+++ b/dev-python/simplesoapy/Manifest
@@ -1,4 +1,4 @@
 DIST simplesoapy-1.5.1.tar.gz 6129 BLAKE2B 766369677208a1cd58939e917fa16a30c87340fb6b76c5667913431625b89a8e97684ad4ba0af14fb4043ba42b2cec7f2b84eb968f128c3c3fc0e178c610cda5 SHA512 5ef0a4fcd84e1da9207154d4b8c4679e8aa2c9885ca76eacb17c4fbd39f489be459f52bfd42ee9b369790c33a02ecc5d776735cf1665f3ee034c1e315fdbb818
-EBUILD simplesoapy-1.5.1-r1.ebuild 714 BLAKE2B fb06b21e6673246797ff46866cbbab512af1f29dc76665051c82fac70d5a8bb8c36f2fa56aed6aa5070550865eaf32abf0a236c72acf1e5f35f42e297fbddb20 SHA512 1e6a28ddd3405d2e3e3f2e988fb553c62a988c6d07c0220b190d88c9a5ebe534eecd58a0368892c50d134c5dc1679d505e3890ff812b8d01d6ebe2c9d6fc0e66
-EBUILD simplesoapy-9999.ebuild 714 BLAKE2B fb06b21e6673246797ff46866cbbab512af1f29dc76665051c82fac70d5a8bb8c36f2fa56aed6aa5070550865eaf32abf0a236c72acf1e5f35f42e297fbddb20 SHA512 1e6a28ddd3405d2e3e3f2e988fb553c62a988c6d07c0220b190d88c9a5ebe534eecd58a0368892c50d134c5dc1679d505e3890ff812b8d01d6ebe2c9d6fc0e66
-MISC metadata.xml 429 BLAKE2B 84cf04d41eca07be79f494f3739abed09056869566c2e6892bc674301454f7098be15519268b929368d21beb62a0c604eaf8e125ca4ed0ea5c39d47d1d456957 SHA512 7fd663c2a81603dd9db3c4ff88f45973f696c0505005330035216da43c8bf15145d2e3898d36583457d3b99816ac88a77826dbba9dbe52b1658d6c7e1868940e
+EBUILD simplesoapy-1.5.1-r1.ebuild 718 BLAKE2B 29891cb6b8c3be8d6bfe281e1a989ba2032d00880924d1f3c172949d48884b924d2f35cceb7e958f68a170fb6f3084708c4394012d8471f4fafa647bbd163560 SHA512 27a88f57531fe8be35a350e33a1f7141d2ca1a549292d1931709896bbe2098d635fb6f9e51b8600bfc6248b5513aede66a214e25b37892ad261331ec7fad7327
+EBUILD simplesoapy-9999.ebuild 718 BLAKE2B 29891cb6b8c3be8d6bfe281e1a989ba2032d00880924d1f3c172949d48884b924d2f35cceb7e958f68a170fb6f3084708c4394012d8471f4fafa647bbd163560 SHA512 27a88f57531fe8be35a350e33a1f7141d2ca1a549292d1931709896bbe2098d635fb6f9e51b8600bfc6248b5513aede66a214e25b37892ad261331ec7fad7327
+MISC metadata.xml 478 BLAKE2B 0cecc26ce8c198fa695000689da1037f0ee4dd88779062516d9ad02ab77c95a3912f917f45b3a8162ee6518acc8f240a7e985a7767a5982d75b5d1063a4a2a0e SHA512 74fda923aa89882cbf136a0ebfb62d7ccba60c5b47eef0fa4bb340b50cc1bc2571975cb6fd6b0378891bb0bea9d54e56393887bebd19090802cc07f845156531
diff --git a/dev-python/simplesoapy/metadata.xml b/dev-python/simplesoapy/metadata.xml
index 8058136f8538..9ddefc709839 100644
--- a/dev-python/simplesoapy/metadata.xml
+++ b/dev-python/simplesoapy/metadata.xml
@@ -11,5 +11,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">xmikos/simplesoapy</remote-id>
+		<remote-id type="pypi">SimpleSoapy</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/simplesoapy/simplesoapy-1.5.1-r1.ebuild b/dev-python/simplesoapy/simplesoapy-1.5.1-r1.ebuild
index 896a0e61cc46..e94a8a785c17 100644
--- a/dev-python/simplesoapy/simplesoapy-1.5.1-r1.ebuild
+++ b/dev-python/simplesoapy/simplesoapy-1.5.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit distutils-r1
 
 DESCRIPTION="Simple pythonic wrapper for SoapySDR library"
diff --git a/dev-python/simplesoapy/simplesoapy-9999.ebuild b/dev-python/simplesoapy/simplesoapy-9999.ebuild
index 896a0e61cc46..e94a8a785c17 100644
--- a/dev-python/simplesoapy/simplesoapy-9999.ebuild
+++ b/dev-python/simplesoapy/simplesoapy-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit distutils-r1
 
 DESCRIPTION="Simple pythonic wrapper for SoapySDR library"
diff --git a/dev-python/simplespectral/Manifest b/dev-python/simplespectral/Manifest
index 93d4dea20031..f586789890cc 100644
--- a/dev-python/simplespectral/Manifest
+++ b/dev-python/simplespectral/Manifest
@@ -1,4 +1,4 @@
 DIST simplespectral-1.0.0.tar.gz 5750 BLAKE2B 04ee4c90f9cda35ade1d250162ab1bcc278ae82a4d7f9a22d1aee6a1eceac7819ce6aa19f52e024469c51e08c00dc5f19253ff2b85d9b668dafdcd7a18c78d6f SHA512 16da3cb19cd7c567b64709a26ed5def7eb3047b08e2cb48db6962036a6c3e34c122dadf71821b6a22df55ebcf3c2ff95e3af3898efc8b4a6d5902e48de8e050c
-EBUILD simplespectral-1.0.0.ebuild 779 BLAKE2B 922e4c7b166cb663bc33e3cecab49d142cdd00f2bd91f8b0232bc3bcd38d63e303e7333d667ca17bdfda4161e2a7303e6429d14f78e790ffe822f1bc630404f6 SHA512 5597d89e534b1fd60737681a04327bc6eda601c582d83f4ae538f0b0a9e498ff4cb8a23385146956c922ce38b465393ad0fa41f9347cc280783ee8bd1c8afb4e
-EBUILD simplespectral-9999.ebuild 779 BLAKE2B 922e4c7b166cb663bc33e3cecab49d142cdd00f2bd91f8b0232bc3bcd38d63e303e7333d667ca17bdfda4161e2a7303e6429d14f78e790ffe822f1bc630404f6 SHA512 5597d89e534b1fd60737681a04327bc6eda601c582d83f4ae538f0b0a9e498ff4cb8a23385146956c922ce38b465393ad0fa41f9347cc280783ee8bd1c8afb4e
-MISC metadata.xml 622 BLAKE2B 369893e74ab5a9cc8b9223c086170819226725f3aea2a6e4e8801797b8d1dc9efdd90f7f994e6eee100fe3e6272cecb8f61e6dec2894fafe19d97bf7c1e7844d SHA512 04cd7e54bdb062d95ea7598cce5a4df5b697039b2d1bb575e606713131a795088dc8825096abbed89d692a12a099e023f897888c2c064890ef90889ac0cb6274
+EBUILD simplespectral-1.0.0.ebuild 783 BLAKE2B 319df5fea25575687b82dd40d823df8b5eb07719a05dec9aea467a3f15a4d6cd4d3a1933c14cf3272c1ae30238bb376e33aefefb6638c87fcc461f42c872fb73 SHA512 d3aa21bbf4dcf5194ac3efefe5686f4947de38daa1a293e859f3f1695f0e37378226d60c2282f47d77b5757a3017af2187e2ab5dfa2b14d933b8545906fffcb8
+EBUILD simplespectral-9999.ebuild 783 BLAKE2B 319df5fea25575687b82dd40d823df8b5eb07719a05dec9aea467a3f15a4d6cd4d3a1933c14cf3272c1ae30238bb376e33aefefb6638c87fcc461f42c872fb73 SHA512 d3aa21bbf4dcf5194ac3efefe5686f4947de38daa1a293e859f3f1695f0e37378226d60c2282f47d77b5757a3017af2187e2ab5dfa2b14d933b8545906fffcb8
+MISC metadata.xml 674 BLAKE2B 47d56d60f75a2b3a62ea2e587058b1d2efcc720b80845c043809c6840d462351867e828af1e2b57743df16ed97ea3f09e9a75074d358b5dfa83a524ff65c1ed2 SHA512 571b6a2f40cca481a47e1ef4e2f19f694fcc0a50955a3076d36b35d0817be86a5afad51dc38c2423ea432be630d4bff37cfcdc712a1b75802cf0867f68fd59f1
diff --git a/dev-python/simplespectral/metadata.xml b/dev-python/simplespectral/metadata.xml
index 3d1f57eeceec..af55c3f1a4ba 100644
--- a/dev-python/simplespectral/metadata.xml
+++ b/dev-python/simplespectral/metadata.xml
@@ -15,5 +15,6 @@
 	</use>
 	<upstream>
 		<remote-id type="github">xmikos/simplespectral</remote-id>
+		<remote-id type="pypi">SimpleSpectral</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/simplespectral/simplespectral-1.0.0.ebuild b/dev-python/simplespectral/simplespectral-1.0.0.ebuild
index 69a8968c912f..6f20821f2c98 100644
--- a/dev-python/simplespectral/simplespectral-1.0.0.ebuild
+++ b/dev-python/simplespectral/simplespectral-1.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit distutils-r1
 
 DESCRIPTION="Heavily simplified scipy.signal.spectral module"
diff --git a/dev-python/simplespectral/simplespectral-9999.ebuild b/dev-python/simplespectral/simplespectral-9999.ebuild
index 69a8968c912f..6f20821f2c98 100644
--- a/dev-python/simplespectral/simplespectral-9999.ebuild
+++ b/dev-python/simplespectral/simplespectral-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit distutils-r1
 
 DESCRIPTION="Heavily simplified scipy.signal.spectral module"
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index ab9fb904068a..d74f66ae1d3d 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,6 +1,4 @@
 AUX sip-4.18-darwin.patch 1187 BLAKE2B a3cd0418de90e7377bc2ae1206f4620c6be379a3bd38f22c19256b06f5ba0c90ff07f34dcc8d2f44a25244e11544176a5e1b91049d220bd56cc7b3876a26ba76 SHA512 1afe049fd21f0e8e5118dec4d4b74851cd5e2c75a66a93e1a79a42267954b1edfcff9644696c7d98342499fb27fde727a554b5739cbd791d17a0e319c1dddb7e
-DIST sip-4.19.22.tar.gz 1050805 BLAKE2B 7382fdf74c5bb8b55bcedae74acdcb7b81ef06a64d129a9e6f11a5eb293900e37df513f1c4290f2299f49a5bd97e2a6b3c6bc32ddbf2eaf848bd5e5c5dc25edc SHA512 4d366e589945e589f69a3caf979076ef37e319ac0efdd8ec3cee4869da89e112832462215ca2e235036bacfade7efc4d530aa93e7492c283dc1b2503e08feea5
 DIST sip-4.19.24.tar.gz 1055461 BLAKE2B 6990b127a83fa57bc084eb9a1097f73c384b4fcf3d181479557fe2ffc66cde254bfbb5aef26f5ddd84dca346f54184952e7a111adf3b665f68571853e63b6575 SHA512 c9acf8c66da6ff24ffaeed254c11deabbc587cea0eb50164f2016199af30b85980f96a2d754ae5e7fe080f9076673b1abc82e2a6a41ff2ac442fb2b326fca1c0
-EBUILD sip-4.19.22-r1.ebuild 2285 BLAKE2B 2b15308bce64f79811922bcde1a6832ea45a77c19a5def285c8b7daca845391a35970f39a57e9a571219d096c2780b27ddd5b3ae297d83015c87f414f6daed68 SHA512 95c13cfa036323147ca7e84d1943b1c4d30304078465d5a77199d2098d84e6347844cb05044d0816f59a7b76efc4a6d9d0e07c9fc0285c0f1b85ad9a1931e9b6
 EBUILD sip-4.19.24.ebuild 2282 BLAKE2B e0cdedf495bf84e5066e3f8a2a892ecb7042fa5d3a94e0277c145975106ed937510cb44bbebf75e9173290f1742e4d2146e9872554cbdbea003a084765f82ba1 SHA512 bc2d2cf4908013fc175d7f89baced618498dddfa58c5b95615fd8509a52a9fbb98866ec873c7042d640231d32ed3e1681721fb22e00489b32cdd057a1317d584
 MISC metadata.xml 642 BLAKE2B 774d24a62fcf22158044669fd9981456a0b7512cc838cf15425239e9163c946adc5b01169d773167e98e4cc09a3c965b9a87b374048e3533b2140d35202e24ce SHA512 f6f3d30b416dfa71a5f3c245695ce958fc43a701a71f80968f06a0d21ec2c6387dcf505d8b3db1049b74ec8fb560e4a25547dad11365b23d78ed4e6f5769042b
diff --git a/dev-python/sip/sip-4.19.22-r1.ebuild b/dev-python/sip/sip-4.19.22-r1.ebuild
deleted file mode 100644
index 0990210585d5..000000000000
--- a/dev-python/sip/sip-4.19.22-r1.ebuild
+++ /dev/null
@@ -1,94 +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} )
-inherit python-r1 toolchain-funcs
-
-DESCRIPTION="Python extension module generator for C and C++ libraries"
-HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro"
-
-MY_PN=sip
-MY_P=${MY_PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-else
-	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
-fi
-
-# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
-SLOT="0/12"
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
-IUSE="doc"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${PN}-4.18-darwin.patch )
-
-src_prepare() {
-	# Sub-slot sanity check
-	local sub_slot=${SLOT#*/}
-	local sip_api_major_nr=$(sed -nre 's:^#define SIP_API_MAJOR_NR\s+([0-9]+):\1:p' siplib/sip.h || die)
-	if [[ ${sub_slot} != ${sip_api_major_nr} ]]; then
-		eerror
-		eerror "Ebuild sub-slot (${sub_slot}) does not match SIP_API_MAJOR_NR (${sip_api_major_nr})"
-		eerror "Please update SLOT variable as follows:"
-		eerror "    SLOT=\"${SLOT%%/*}/${sip_api_major_nr}\""
-		eerror
-		die "sub-slot sanity check failed"
-	fi
-
-	default
-}
-
-src_configure() {
-	configuration() {
-		local incdir=$(python_get_includedir)
-		local myconf=(
-			"${PYTHON}"
-			"${S}"/configure.py
-			--sysroot="${ESYSROOT}/usr"
-			--bindir="${EPREFIX}/usr/bin"
-			--destdir="$(python_get_sitedir)"
-			--incdir="${incdir#${SYSROOT}}"
-			AR="$(tc-getAR) cqs"
-			CC="$(tc-getCC)"
-			CFLAGS="${CFLAGS}"
-			CFLAGS_RELEASE=
-			CXX="$(tc-getCXX)"
-			CXXFLAGS="${CXXFLAGS}"
-			CXXFLAGS_RELEASE=
-			LINK="$(tc-getCXX)"
-			LINK_SHLIB="$(tc-getCXX)"
-			LFLAGS="${LDFLAGS}"
-			LFLAGS_RELEASE=
-			RANLIB=
-			STRIP=
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-	}
-	python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		emake DESTDIR="${D}" install
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	einstalldocs
-	use doc && dodoc -r doc/html
-}
diff --git a/dev-python/slimit/Manifest b/dev-python/slimit/Manifest
index ebacee6fdf5b..38e70af513bc 100644
--- a/dev-python/slimit/Manifest
+++ b/dev-python/slimit/Manifest
@@ -1,4 +1,4 @@
 AUX slimit-0.8.1-fix-python3.patch 18813 BLAKE2B d4cdfcce63635ad35ebd7c1c4a42ee9b1d4fba2dea4aac3a97274c98e012b615dbd121413243e1279c00ad731527bf311aa5fe4dc25fa174b5142abb4f990c32 SHA512 fad15e30fea0000f797db6e113ca83d847e412c5906e42d15bf1d8afab857d617403f92b733ebad761cd6182e16e5a8f21081829d2410f9842bd8fa8f093b8e8
 DIST slimit-0.8.1.tar.gz 90096 BLAKE2B 9bf7a00fa7aa48a47950b2db66868c03e3923ed7b878ac4d93bd92becc1909cb79a15365db8185f6d8872028e0d01343394e4c768149155bc6aaeb4acf69954f SHA512 ce33dd15c755b8327a73121322b525738b5f8d83c08b0b6329fa6e090575c68883b4bfa29df04544e5f566f3a81a60e480b5e760e2b0e67644a7db5e25604cc0
 EBUILD slimit-0.8.1-r1.ebuild 973 BLAKE2B 3ca06472df3cdce0b924c948cca30eec7a3db810b21ef91f44da75127669186437eb630a7e5a066b455118e9294b221122035e87bc3dbbe1b0d2963b861eddfb SHA512 98f4875cce0c3bf225dd7d5aebe4bc3acf6d3741c3ce10767d17ce9f309a7761cb1e2de1d29127da5394c19f2f6a8c76defee789e36be8480bdacd2423cd6740
-MISC metadata.xml 381 BLAKE2B e72dd60346098d4cb6e0886a32c5bea0139c33eb086282ad337b3125154f4b7badec99e22b539430c38ab224a50e0da28863c85eb91f5f03243328b327f75999 SHA512 54ac346d7d9d2f0d267ad22b777d8e504fdd9f2b5e9aeb1d7465d0047c820208e323e24a57cdc0f5361c3ef35feece064b67d3d42c6934562362cda319110986
+MISC metadata.xml 450 BLAKE2B 477b890023f3da5e50de40166a164423db80c9d8dcb22baa1257c3b898206e6cd2afc74388ad80456cb49b94769a08779305ad0ff6af983bbd4b62a866a7366d SHA512 0c15d836769644f4492c90ff13c6306d2d4f950aaa0badffe014262ec4492c7995dfb836464b5dcf570f368180d1d2bf8e6babc5930e128b2602bd033b7fae09
diff --git a/dev-python/slimit/metadata.xml b/dev-python/slimit/metadata.xml
index 8fcb09c9e9a0..1e181f90851d 100644
--- a/dev-python/slimit/metadata.xml
+++ b/dev-python/slimit/metadata.xml
@@ -9,4 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Gentoo Proxy Maintainers Project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">slimit</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/snakeoil/Manifest b/dev-python/snakeoil/Manifest
index 3ce6813003ff..8d30d8788d21 100644
--- a/dev-python/snakeoil/Manifest
+++ b/dev-python/snakeoil/Manifest
@@ -1,5 +1,7 @@
 AUX snakeoil-0.8.8-py39.patch 1243 BLAKE2B 30c096614e4a4023781a1ba0b5694e5c61521116f35d026b8138b48f03e29dd5d413433248fbb2922faed32e0de30bd0329032d666c73e8a0fbb073131d843b1 SHA512 2ccb78c26c8a4df1a757422122617087ea34873de48e94d43c980d86963a2ed3f2b7e71dcc03686a313eefb07bfdc4010763eec8aef38ce8cb5786495aed1522
 DIST snakeoil-0.8.8.tar.gz 296519 BLAKE2B 5a5f6326d01874b46a5cb85f5370217f4f3dfd5743679280f1f59737567cd5d79deb945be847fd3cd47ff0ed67cc836d2a3e53c4aefbe8080da767f380295538 SHA512 ea1ff6ea45c9f5fc3bc539cc65031050093cc1fbdda869b7160b286dcf3233577ca297ab55ee3d7ee4253c5485f9e956e14ee2a97bfb88680811d1b8af6cd62d
+DIST snakeoil-0.8.9.tar.gz 271205 BLAKE2B dcaf4d26b430a2e99481182aa912a884a0cf5943f65028f4da098ec1b0ab177a97aeb0743d90cade589eba598598eccd275b15379d281ad0dc0bf62badd24c55 SHA512 d80f4c5be5d97598a119bd29413df1960487e4af2532b33b03c17337d15d24b34c4e5617f0d5d40db973f009697de25ae8c5bf5e60c19409835b3e77b4ffb461
 EBUILD snakeoil-0.8.8.ebuild 894 BLAKE2B 4c30ab784f3495a7e618ac0c0994fd24e336429144ca246459b441ed1d9b30b98dbf91f21f39fb7a85f3641f2c5c7ba160b3f57a121f3088ad03a311a3f38fbb SHA512 3b95671e781cb058e6459c13e3692bd79db88ad6e41fe50a9a16344412ce29cbf41a49142af1ede56edfa90a0376fa3b0f65ed478c1c320b422629009b69d6c8
-EBUILD snakeoil-9999.ebuild 848 BLAKE2B 2b3a44745fa6788b913fbc79c3719dff1e16f34f7e6957f9b5f36e31250fea527a40ff805e50f30afdf8e62b07a8757e8608de3fb9c43ff37d156f62d6a9e719 SHA512 c9e9898a6b3b1dc8f156a56dc90cd3930de84812dd22fa1ab76814065b9ea349522cec5387059ca3feadd0e468db15e39f44a1dc5d9a68685971ce17aba41ece
+EBUILD snakeoil-0.8.9.ebuild 859 BLAKE2B 7b2a6e786a6dd9ff06c86ae36bfbb975ee3c2223dfe61c5fee4083d87470b651b93b80b0bb0ccd8b97a142394f59f8ac1addb78ab0d5b7e07b2f238607089a55 SHA512 ec7c85a1fbc16431e568de14c2b8ce50c0edb33af10a58dc4b0159f458646c4649e1a1134c749ab8af4cd2bc5a38462ce0a99777cb12e7526f099dbe14cebee8
+EBUILD snakeoil-9999.ebuild 859 BLAKE2B fe7edfc38fe2a93a85d88057c72396482efb7d074c2ffca8191dfd9168511221bcf73798ee271dbaf202783856745980b6d7ec0f046c02324861f529cd67dac5 SHA512 adb46897c51505c370ac5c81d0ed0ee7a645dbc5b60c9241a2ed449299073dbdb69661138216fa78402da46b5436f49b38fd836a389a526cdbf4032dde9a4e01
 MISC metadata.xml 386 BLAKE2B f9bc5cb5f590209e7211fffa5ac87e106e636f871dec0b31a90c4aaed63cb9fd4bf4fe510a4f36676eb47028465a58d5088307aec6c2c5b000d370aca5437b68 SHA512 47ee140ad8c665e0541a71721eec7739913a93944a0be471287c0df7403d63757500b27d3ffb909590846991c69727ea95d960dc98e7887bea3b178bc4dd6047
diff --git a/dev-python/snakeoil/snakeoil-0.8.9.ebuild b/dev-python/snakeoil/snakeoil-0.8.9.ebuild
new file mode 100644
index 000000000000..c9ce0b8837a5
--- /dev/null
+++ b/dev-python/snakeoil/snakeoil-0.8.9.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="threads(+)"
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="misc common functionality and useful optimizations"
+HOMEPAGE="https://github.com/pkgcore/snakeoil"
+
+LICENSE="BSD BSD-2 MIT"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+[[ ${PV} == 9999 ]] && DEPEND+=" dev-python/cython[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/snakeoil/snakeoil-9999.ebuild b/dev-python/snakeoil/snakeoil-9999.ebuild
index 68c9d1509604..0c98e3d18348 100644
--- a/dev-python/snakeoil/snakeoil-9999.ebuild
+++ b/dev-python/snakeoil/snakeoil-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/dev-python/snaketrace/Manifest b/dev-python/snaketrace/Manifest
index aa80a82827e7..ed6226d76939 100644
--- a/dev-python/snaketrace/Manifest
+++ b/dev-python/snaketrace/Manifest
@@ -1,3 +1,3 @@
 DIST snaketrace-0.1.1.tar.gz 4119 BLAKE2B 926861e84905e8331ab05a39a5f1f501af1902ff8cda31411b6f3509dd66bc1cd24392398d7cf599665206ae9ba214e640970897b644113cabdf2ccc29f9c9f8 SHA512 85f2a697308714d8bf3309fb27dff6ecbec3358215f31e06d97dc746b05a24cbdd7df2cd42cfe8d2f10e069ee69c2956197995ffb6ff58c1cd46aa323e0211c4
 EBUILD snaketrace-0.1.1.ebuild 460 BLAKE2B 5373133f6fa2a5e4d43c1ca60d608abd702929a83e168d36ec77a8a80f126dc1fba7f66e322969e6c0bf3d8f3ad82ecb94fd436ab1259d75a63df797bb710ca4 SHA512 64a9d7dc5efaff1340b01a423c98418b0d81e5c03797d462bfd792564d3c4b6280c6f912ae186dd0dff4765b1aaaadf2c96efb6535a4f2bf965592f6f65b896c
-MISC metadata.xml 255 BLAKE2B 2bb3830b8cec850703f7912f4c22f5b0abeabeed0715222bc56141779d02160773cfd0f85417c553c1cd8f2738bfeb78c56dffb8e648e572019319657646d1ba SHA512 522158915afe67937f81ba572a918a2de8ca1f8591e097da56799c97870d7c44756c1acd8224d63bd3375c2b9ebc0e1ce50816899117948a48065a27804883bf
+MISC metadata.xml 379 BLAKE2B fd83d750b9cd2b0641baa21207a4fee0aa656d9c897c6f1933df4a32a11f93ed7c58a4026ab6cd6b1fcfa4fa0fe0342092181b3f2703d55e01197c5687680005 SHA512 2f6587ca5dac4f9e181649b8c742365e679b6a71aa2380ed38a52e89ad6c56d3eee7e8859e105abd60b98014e040df57b1f0a90404b860d3536df2e2ab656ff0
diff --git a/dev-python/snaketrace/metadata.xml b/dev-python/snaketrace/metadata.xml
index 56cae167d372..a90ecb834b8d 100644
--- a/dev-python/snaketrace/metadata.xml
+++ b/dev-python/snaketrace/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>chutzpah@gentoo.org</email>
-    <name>Patrick McLean</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">snaketrace</remote-id>
+		<remote-id type="github">dcoles/snaketrace</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/snapshottest/Manifest b/dev-python/snapshottest/Manifest
index 5210f72fd2a5..8c2b4c44bdfa 100644
--- a/dev-python/snapshottest/Manifest
+++ b/dev-python/snapshottest/Manifest
@@ -1,4 +1,4 @@
 AUX snapshottest-0.5.1-remove-fastdiff.patch 1978 BLAKE2B 49bbd2118bd8defc3134b1863614a6da7f45f8702c9b65db35329a74b270a511ef6c87952eafefa5e64080c136e21fe7abbfb1e304ff1744983bfa6fcbcc27ee SHA512 804223af644f67a7ad22996572bdb35c88d3c87bfd67ef821b4ebcfb581281f305f9d96edfda9d8a20d5cd1d07397899dc10b629f7d02b91c2b8804e02fd1ac0
 DIST snapshottest-0.5.1.tar.gz 19312 BLAKE2B a8acfb09de9e58c7a929f71d10f3cc68d7eec31a9fa1ea0fe74ae8a574ceec315f7eab2f9e7cd326c34d981b5ede4c398b5f1352bd59c23be219eeb9a2c0e861 SHA512 1541c327c4238c816b55cf797f6104ad54ff62a2332517b3bf9a455bbee0abd49f6983a54dc7510d1e1c659d88e5f7d6c6aa396c0ece19e19957ea8cff42c673
 EBUILD snapshottest-0.5.1.ebuild 1260 BLAKE2B d5215900b590b2788232c1663c7d03816448dd1367ec98e008e6fb78a0d54e2f914fce7c2e017008ada7f1e8ee87a34ed0999ed6fff2dac32d5d733dbf099445 SHA512 6f76e8b640a17e80cbddda288ead21546a80b01e7b529492f652fda15c7e8c143f422ad91eecaa091ed51808e055d8860284a51e02376b4ab066fc4aa45ecb0e
-MISC metadata.xml 407 BLAKE2B cf0e92bcd492b79892ebc97b7639c016b4d1853a87bed8fcd1e367a9f6cbadce01015895d22011425aba76a4895b245bee0e5536fc959224a6bed08daef74a88 SHA512 155696e449933084fbe56dd900e15d17e12d52d6af29eb4fcb6c05ddfe8c6fa716974fa27085c34ae2e1af0d1739dba2616eb12092c606b2645f2008e51d64a3
+MISC metadata.xml 379 BLAKE2B dd820515dd1513206bf39c277ffdf7ff17e14b75fbb933475e642eafa75d2bbcb77c04cbb80a3db8cfde704b67ffb04d426de3609e9cd0f8db9b6907e4c74335 SHA512 35cda720f330a8807f7a8dbe518e7de5df037386689ecbe6cd9ea816cf78d350053a7744c3fa266d824d32205125ab75dca0a5dd187e33c9b9b48afaf35ce8c9
diff --git a/dev-python/snapshottest/metadata.xml b/dev-python/snapshottest/metadata.xml
index 592df77578dc..e779ee6dec6e 100644
--- a/dev-python/snapshottest/metadata.xml
+++ b/dev-python/snapshottest/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">sphinxcontrib-httpdomain</remote-id>
-    <remote-id type="bitbucket">birkenfeld/sphinx-contrib</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">snapshottest</remote-id>
+		<remote-id type="github">syrusakbary/snapshottest</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/snowballstemmer/Manifest b/dev-python/snowballstemmer/Manifest
index 3926d2549707..02d8d6bf3b3e 100644
--- a/dev-python/snowballstemmer/Manifest
+++ b/dev-python/snowballstemmer/Manifest
@@ -1,3 +1,3 @@
 DIST snowballstemmer-2.0.0.tar.gz 79284 BLAKE2B 2d9b5de8493ca8833b3b52b143e1f56b40a87cbde3f182793edc3ecfa8b3577c9ab506c19aa93870b3e03b5d86a62fb515b2df0bc616d4d88b4b9894ecde174e SHA512 d673205cacc7f6e81eaee23e6c50064af77c3c4464dbdf5dc1c3f5682dec2688fe6e7069b7ed2e59259312ba926d3be84bd846a132b6138e30b4ff2b9a9353e8
 EBUILD snowballstemmer-2.0.0.ebuild 553 BLAKE2B 6b1fc6d982becc9f5e47c6405bda14d4106a227c344517c2be19a27b8b2551aa7b57f8f7c7d91402e50615da6f32d35ad19249f48fc9c4bb9b41791f1ff49002 SHA512 82f56fec48a2bdd46c336d280181183960ec1dc2531d95f09c94ec92490100d769a39e440449d700afe9dc86d4b2fd148a2fff35b4433f4f517377abf6e3fc21
-MISC metadata.xml 416 BLAKE2B 0030a77ed97805fd6a4ede1f713188010f6941ecaee137d1d9e37c2e8c8c687c1971b3f5c38769815c950efebf6c5284d92ee930855c535743d03e010b42ec1e SHA512 6a0bb6e150616b856977ae455af4c954fa871f1b0d675c73c079ba22867db2870210c91a63d4d83d3ffe672d49a90666dc988e5cd778a0486864aa41a497635c
+MISC metadata.xml 403 BLAKE2B 2a098a90b645d8725836da0c99c4143aff56f3fde6b094f2a99968f585684801fc060e88606d7d9ad1e08f52230e8c03eedd996708aa52ad3c07c7da28a1f447 SHA512 5c2c1b79cfc92f8eb602c54f1772791f772f969ce9125e2920a0eb6f150d3de29bde1935111f820f74562389bca047f0306d60fdeec040eb586d527f62ea558c
diff --git a/dev-python/snowballstemmer/metadata.xml b/dev-python/snowballstemmer/metadata.xml
index 707c683d63fc..7ee19263a64f 100644
--- a/dev-python/snowballstemmer/metadata.xml
+++ b/dev-python/snowballstemmer/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="pypi">snowballstemmer</remote-id>
-    <remote-id type="github">shibukawa/snowball_py</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">snowballstemmer</remote-id>
+		<remote-id type="github">snowballstem/snowball</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/sortedcontainers/Manifest b/dev-python/sortedcontainers/Manifest
index c7ad9ca3d475..7f29bd66aea1 100644
--- a/dev-python/sortedcontainers/Manifest
+++ b/dev-python/sortedcontainers/Manifest
@@ -2,4 +2,4 @@ DIST python-sortedcontainers-2.2.2.gh.tar.gz 9228894 BLAKE2B 358a2028a00748c8904
 DIST python-sortedcontainers-2.3.0.gh.tar.gz 9228968 BLAKE2B cdff8230d4e4ac42a89ed3192666ebf22cd48a4475f1dc173cffb0339c7f27e9cdfde1fb631daadf04adf2c00bed8a924e1202712d0ebcbd591f5542de863461 SHA512 0488e2f9f07ea7e4737ade69441f02614b63cfccb32a71af4e5953001bfa840d2e113a36a0a0a6d4c1e7fdd920ac3937b0baaea522d742547a4d81a99b8d1a6c
 EBUILD sortedcontainers-2.2.2-r1.ebuild 826 BLAKE2B 4dd5bcbff2ecb66f1bab0821a47226c2e76626c1a5d2a97f8f0e6e6e19ec1b49963538a037af7f0ffcf45c8be951f999194b141e966b9fc397f632802678aa23 SHA512 1dcab88cc861d1375526d43a8b919676d1c2cb2bfea5e0dacc379ca95b00885b60c63fc5a1610a3c79f635175006bd2b6289756240596f2c95e6f7beab847b38
 EBUILD sortedcontainers-2.3.0.ebuild 845 BLAKE2B 0be5717261e3bd7924a136cdd8eef5af3dc4e8beda8f8fc2f68b09442a546d91ec2fc3d87fccea57c980e439c685854ecd1aeb6f3a03a88164a9bd0de24de3c7 SHA512 d632d8365304db06f123c6123c2b2b342d5379c7d4a68679857883ca6f66ecec2fb40a2ec893d8e47961072761e86399a95b96ed5443bb2a7d6687e2c9211c77
-MISC metadata.xml 428 BLAKE2B a57e7ccaa33683eb26b7c30516ef267c10ff1b5057c8a5b2327228c1ba5e231cbdb137dffff389906947cfb7eed56f1a10a630634be2fbc91e20de4b84fe5c0b SHA512 71c37340680fda3bca57ae6c9930cb0e87c4f38c469964baf41e844302aaa25186509d556efdaf67c4750da50b2fdca8ed9dac2d9f287c6f83ccec4fa7f7aaa2
+MISC metadata.xml 417 BLAKE2B 8f56ae7ddac9a7fab6b99e9f03cf53829a7a7543be90ce3b508af2d2cc912ddc4a41f80fe9e8d395f8e0f92cf08ec4d99023cc70a3cf089e9519ee958659243b SHA512 0b286e9c409d08a4448b377f46e0d8abed4c23910a09a770cdf9c2b2797318831570b79c082fc3b9e9e15bed338b5f283e6004e63771f2e52da2be6749554c99
diff --git a/dev-python/sortedcontainers/metadata.xml b/dev-python/sortedcontainers/metadata.xml
index 0aba6fc70323..9757920884fc 100644
--- a/dev-python/sortedcontainers/metadata.xml
+++ b/dev-python/sortedcontainers/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="pypi">sortedcontainers</remote-id>
-    <remote-id type="github">grantjenks/sorted_containers</remote-id>    
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">sortedcontainers</remote-id>
+		<remote-id type="github">grantjenks/python-sortedcontainers</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/soupsieve/Manifest b/dev-python/soupsieve/Manifest
index a0859b934ed6..36fcfee32b99 100644
--- a/dev-python/soupsieve/Manifest
+++ b/dev-python/soupsieve/Manifest
@@ -1,3 +1,5 @@
 DIST soupsieve-2.0.1.tar.gz 96436 BLAKE2B 00fe9390569886181d484c5eb3f2a14352c16c3807d4e2eca8b5fe0ff0fdc1ec77fcf6b32885d76f3a085c149848bdeafa1fd2cabdd4fe4742fc175c34aa72c4 SHA512 f4ef4deee81bb31952e1d3216250712f09b425e7a2253e15bd1b38cb74b680e421e7d086a8770737898f6b57867f07f2dd07b8a98108d05e338bce92b274b85f
+DIST soupsieve-2.1.0.tar.gz 98150 BLAKE2B 37f6ef00f42d164ef57be88135e8a942166f53a39ed5643d6ae0468916a66be04c79e4e70da6ad38f8adf6fac41cb8bccb7edcfabd7e1a07083ab8a043d5203a SHA512 19cd4ee596d189a001bbaf9f047e6c9eff569e2149ef5424bfe55c9b4325d856c957de87d55510335f748aab322dbb847b06b48931fbdeadbcc3790259c69eb1
 EBUILD soupsieve-2.0.1.ebuild 764 BLAKE2B c8bc583db94865d7b82dcbb6d5718aeb6fbf81b92e98c9be7c97790519a63921343bd3bf5a618e75ea76e308a4b639c2be0c140bfa4134b0771541390571bf26 SHA512 969cfb44ad0cd67e7323a7aa28ae253ac556dda701827baa266c286a300efb656bf35dd49a94d2bb0c13599f9e2b2785fc986a2f9d52b1d5233280873e2bbd31
+EBUILD soupsieve-2.1.0.ebuild 770 BLAKE2B dc81e4cf3879084aabae692c79d34b44978156d96c163751e4b83bdeb1cd7fdfd5d8b1d54cc931d031f79191bb0c8153dcc91ab9afb453c9e87f59ffe008f063 SHA512 a9aad9fb2b9eb54198ca5388134e9a3846544d37b65ce9bc75d206a0284756a51200c5904c9ccf874ba47740428a04d19730e641546fefe974bc7a193aacf979
 MISC metadata.xml 398 BLAKE2B 0aea8c93259062872f7899179236d9ee52a85d4055e3a5eee8e3643127611686b989c0985ed571d491734e80e45598dd1ad9e4fc25f56ba5e657b28a8a9eaf37 SHA512 36a527cf2a4572c0149f7cd344c3247309b89ef461d65347dfe30129ade1742bc54ffcc6d1483971a2adbe5e4de3a15ef73f6e8ba631f4dabba8d32a3bb2c288
diff --git a/dev-python/soupsieve/soupsieve-2.1.0.ebuild b/dev-python/soupsieve/soupsieve-2.1.0.ebuild
new file mode 100644
index 000000000000..19bfd18e7a7d
--- /dev/null
+++ b/dev-python/soupsieve/soupsieve-2.1.0.ebuild
@@ -0,0 +1,29 @@
+# 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="A modern CSS selector implementation for BeautifulSoup"
+HOMEPAGE="https://github.com/facelessuser/soupsieve/
+	https://pypi.org/project/soupsieve/"
+SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="test"
+RESTRICT+=" !test? ( test )"
+
+BDEPEND="${RDEPEND}
+	test? (
+		dev-python/beautifulsoup[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/sphinx-aiohttp-theme/Manifest b/dev-python/sphinx-aiohttp-theme/Manifest
index 154c6a917665..fd1f80b31574 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 604 BLAKE2B 5db577eb4e1c11b6754a3d6bf5b661a8bb9a735ad1aa866f3fbc9ba0b4f094c7fd7d342d8238ec053200aecf2ad402f9f7abc000eb4cfe21f018f92028129f42 SHA512 b6d58d8ecd7b89524325589aa1325c89f111f5757a3a9b95fd1d31a2658e1345e52fd678c7609d57cfed6170c0dd6b303a3862362c1fb255e64891046356d422
+EBUILD sphinx-aiohttp-theme-0.1.6.ebuild 603 BLAKE2B 6c0eefb4f6f1901ba447c5fa805a5ebc591ff384ba1c7082483342f2f5b1257b6a49c7efe27e9cf096c78902708cfaceec28e7e1b2f4834eaf5d3b9e688cb9de SHA512 88d1d0d5f6cc9a24bd33b393c8025b245f0b71e25ac68993caf80bbce7c7810c6d61ed0373e37642fe0427438ddd407f12af4b85dd5720189582add66216d933
 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 893d967c5804..1fba1a3971ad 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-multiversion/Manifest b/dev-python/sphinx-multiversion/Manifest
index ce341ce95f28..8ccc9fc74816 100644
--- a/dev-python/sphinx-multiversion/Manifest
+++ b/dev-python/sphinx-multiversion/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-multiversion-0.2.4.tar.gz 20468 BLAKE2B 9bdc59691b63c280d08c77108318b778c8bf948c502538e94e77072589c4e6565bcb7e863a8d765f55be012b21a1a0242d37077248312a7ee18dc788a7dbc633 SHA512 68441793631f59df3330ecc84c0d1aa279f0492021108121f2bdab92d5a3eb61522664f14c4ebe8709126e0088ff8eb323aeeebb5d1e7a2dcbd358eeac772d08
 EBUILD sphinx-multiversion-0.2.4.ebuild 578 BLAKE2B 61470cbdf3a1457303318b303134f87ddf59408dba82e025d6925a3b99d1e5f049c340e924a20b6a06adc023725f1f067b1a979794837c156ec700d4a713e1b4 SHA512 94ed82bcb93b4ae92babd84f521efcbc15c9706a57cdc6aa4c437bceb40a06261371b0742620ac2bf0555c5e06ded5b9ba0c1f2bd9dbabafd1d6a62980e48ad8
-MISC metadata.xml 375 BLAKE2B 393138e315b4eae4dacb9339fbb5766e9dbaa84b7482babaddc08d524fb8b9939f6622ee9c6d09b66c61ac270fcc483fac39996a12ba87ccccf7cafd4c6d36db SHA512 9a44b6b9de4d1a61d6af9256519473541d5513cef349c15178c025dee3aaaa3f6772b1be56576411a985fcd9c70029c00743d8f577be8eaec4c5a44646c9cbf6
+MISC metadata.xml 457 BLAKE2B b72273b15ab11152a936bcd89763670e7d1f34032136a615c99379819f4cd3385efe806512438d498861473bd55a8c082a86fd51e4153ba9f91a26d2cbb9e825 SHA512 5d9f4385ab787b8e71b1206d74f05d5c116c5f27cf192a1d21e0abd2522dd945069a16e05bb2ae058cd4c9f98037f5cb634685b4c0f7152b142afff82a2ee21f
diff --git a/dev-python/sphinx-multiversion/metadata.xml b/dev-python/sphinx-multiversion/metadata.xml
index d22e99d73577..624e6919569a 100644
--- a/dev-python/sphinx-multiversion/metadata.xml
+++ b/dev-python/sphinx-multiversion/metadata.xml
@@ -9,4 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">sphinx-multiversion</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/sphinx-panels/Manifest b/dev-python/sphinx-panels/Manifest
index 973b0d74ef09..7dc42c3899ff 100644
--- a/dev-python/sphinx-panels/Manifest
+++ b/dev-python/sphinx-panels/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-panels-0.4.1.tar.gz 393088 BLAKE2B 3ba183710d211ddc623791dfa1994e08a65a2a3b4c3cda44bba7c13da255dd32c571a3637961bb901dadddfd7d06e7304eb7c489bcdcce8a05452efa151830f3 SHA512 a86377197682fe456d4d1d94571dfcb41bd09b086b79b3fd06a2d170aa97392130315f95534c04160e202cf8674bcd4005893dd306b2a1210647708863d22517
 EBUILD sphinx-panels-0.4.1.ebuild 618 BLAKE2B 366dfa4ee843ff592ba57ced6a4e848f94bea80e833f08ad40527e45f5f417aae0eaafaabc2146ace34df5619164aca8b6509818c25b4921bb33c225b7596b34 SHA512 d4d7c2465ef5a29e8581348f0d1dd480f71d9e14510e014fd1bb0c19987ea631610d662b6f8531d60f293e10dbc17975b4a79195662a32fabf5e303b003327de
-MISC metadata.xml 375 BLAKE2B 393138e315b4eae4dacb9339fbb5766e9dbaa84b7482babaddc08d524fb8b9939f6622ee9c6d09b66c61ac270fcc483fac39996a12ba87ccccf7cafd4c6d36db SHA512 9a44b6b9de4d1a61d6af9256519473541d5513cef349c15178c025dee3aaaa3f6772b1be56576411a985fcd9c70029c00743d8f577be8eaec4c5a44646c9cbf6
+MISC metadata.xml 451 BLAKE2B 2e03c98023cd1a19637ebfdd7a2a887bc2b4e1f3d3ffd6dc6e9941a346d10e9073bb981b41459f63ff2375855aafbdc02691d13327a312830bef55f27992a38e SHA512 1a11694eb40871b6ae5fc4107b907788fe02ab47c489096e5c55531bb88103fe66ed54deca57c41ed694f4e595f13a1cb67c8b9328bdf8c209d8c334c859f242
diff --git a/dev-python/sphinx-panels/metadata.xml b/dev-python/sphinx-panels/metadata.xml
index d22e99d73577..4072be559b5f 100644
--- a/dev-python/sphinx-panels/metadata.xml
+++ b/dev-python/sphinx-panels/metadata.xml
@@ -9,4 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">sphinx-panels</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/sphinx-prompt/Manifest b/dev-python/sphinx-prompt/Manifest
index 161c964203ba..160aa074a0a6 100644
--- a/dev-python/sphinx-prompt/Manifest
+++ b/dev-python/sphinx-prompt/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-prompt-1.3.0.tar.gz 7511 BLAKE2B 3e327b93fdfba48684983b0524fddc2c70f5ca997364e58cddb4e1d1078f51fc73e0102b969c49fa6cb27154624cd0220ea244eb13a0f64444a4e252bfe3f9ca SHA512 21dad50833ee1e00493c208b844caa41420fc2874c48fcb9ce20168a4872f8dc0a654eeea6ca6159d5ff6bbac3de15c2633c2f5abd826ac352c3f0ced37f6146
-EBUILD sphinx-prompt-1.3.0.ebuild 538 BLAKE2B 5e43840718a4b4ef4acee5fd68e8930b62e21096b14cc52de62496baf9bfce9a958fc2b730d1dca9a58b8d988e5dc338dae15c289f33ea3f44ce0ef317de12e2 SHA512 51b5b02e9b59bcc5b3a9125659888114898c4bb468b9cc3438f0a13cb1480668852530a1d405bcc821e560583733930b57bec1b9c7d07bc4be53f0f6efde94f4
+EBUILD sphinx-prompt-1.3.0.ebuild 545 BLAKE2B c788068c565316b492df425173c3696da9339a0c468f9994f5179469a8aa30a1be7da4751669398393d9d7d1b9cb104954487a1b3240fdc75a4800a57e6507db SHA512 5aa0eea291c7eb09805579a1bcef1ae3b87f3939966767cc909c7a048971408185fa6b3bc5de7cc846f6d4e3df6a0d669fe1948c24edf23b16f379f03127baa6
 MISC metadata.xml 415 BLAKE2B 00d16da1c9b70e7dcb3da0bd1e6056944c9c011d99dde0f1e1a5a804ee79b8c9fc5e186f7f9d684401a7c360ec4ef2d367216717c18ea0464da944c0edf54fd9 SHA512 9002d60f91e3621e24a472a8c5bd512ab0b8364a82556b2be8b50d2c332aff3b8ea6f633aacf7d7d09101f2b354621291ffc35ef28103106c08df9558a74dceb
diff --git a/dev-python/sphinx-prompt/sphinx-prompt-1.3.0.ebuild b/dev-python/sphinx-prompt/sphinx-prompt-1.3.0.ebuild
index bb8ae58962b9..a2d48c1c62b0 100644
--- a/dev-python/sphinx-prompt/sphinx-prompt-1.3.0.ebuild
+++ b/dev-python/sphinx-prompt/sphinx-prompt-1.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/sbrunner/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
 
 RDEPEND="
 	dev-python/sphinx[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinx-py3doc-enhanced-theme/Manifest b/dev-python/sphinx-py3doc-enhanced-theme/Manifest
index f12bffe8efdd..3e3299e9680a 100644
--- a/dev-python/sphinx-py3doc-enhanced-theme/Manifest
+++ b/dev-python/sphinx-py3doc-enhanced-theme/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-py3doc-enhanced-theme-2.3.2.tar.gz 41894 BLAKE2B 9a38169b7e2c3331267f5c0a102d01cb0185689334adc98abe91626b27217add0abacde3422fe528588322ccc96f6976b80ce0e510cecfa80837d9b595cb2457 SHA512 efeeaf1bbb7f5557f5e1500dd0a49aa001b714f329f594e95676d8833eede7eb5e0fa978257caeab9630360b05f48132ffb00137262c7a5b663cae6a009ed42d
 EBUILD sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild 525 BLAKE2B 54c31d8064714ce34ae603aabbf68af10f4ad824912aa2640775aa42c69edcd16faa436bb5c8e36f7cd711783a0829ff4062ffa64acd5ab36402952b274d8da2 SHA512 b1a5beccb82946c8e3e3197a8c8e72ddff8c465e14940c82342860d721d422cb202bfb4f579d45ad5bbb30fbd499f10b09142367d53869dc57be603b5eb6bbc1
-MISC metadata.xml 539 BLAKE2B ff83809c3ed8818080adfb13e16a4f97964a1c4a3f455fadd22a374ddaf01dd5a55d13110aee9b44e14c784eecdf4bbfdfe44992990a3f41ab2558c188c4d741 SHA512 7880c83b91cf5d2760157ab1dba1f869084670ff0fe51a477545801dbaa1bd70861ea90860953e9eb3ee9b526acfe33eae931915b7ad990213db05c4d829ad54
+MISC metadata.xml 539 BLAKE2B 7cd1573b15db32f7b02595889c0884dc2cdadd63786bb5693d33511009e90b2051192fda5ae13bcd21a6418ac030654948aaf90fcdadeac1f4f71f07d193514e SHA512 dc7fb701e2bf4b343606b3354e6eb58da85fcbca459aebc6c30fd22bee0a733b025ba1b9d648f16a55e0daee2f2f23fb3509faa09ca36404a6f887d834559e6a
diff --git a/dev-python/sphinx-py3doc-enhanced-theme/metadata.xml b/dev-python/sphinx-py3doc-enhanced-theme/metadata.xml
index 9fd064be82e7..a7f20abd9f52 100644
--- a/dev-python/sphinx-py3doc-enhanced-theme/metadata.xml
+++ b/dev-python/sphinx-py3doc-enhanced-theme/metadata.xml
@@ -11,7 +11,7 @@
 			<email>contact@ionelmc.ro</email>
 			<name>Ionel Cristian Mărieș</name>
 		</maintainer>
-		<remote-id type="pypi">sphinx-py3doc-enhanced-theme</remote-id>
 		<remote-id type="github">ionelmc/sphinx-py3doc-enhanced-theme</remote-id>
+		<remote-id type="pypi">sphinx_py3doc_enhanced_theme</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/sphinx-testing/Manifest b/dev-python/sphinx-testing/Manifest
index e3f39bf2450a..e1fa052c3af9 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 830 BLAKE2B 8e2a6f73773456d0be04378f93f7cd801b991cf359a11436fd015616e65cc135ba1e597a4eeede23a20c0b872ec7dab8f380e44fd960afdd461647255febbc4b SHA512 a3a17fed4aa3882e245b98bf17a4a9080aabbb81bf2445af861afba717f9240983b01e316d4b4979df3255c26e380b518e41b436c0570cb371fc61ae53246213
-MISC metadata.xml 340 BLAKE2B 9a1df283aab1420d7818f4661b57f6d60cd734016c3711c633b9a6a11c401c8603503530fa5e1f50940bd28c1fed83196c1c543d16b5217b996f6afef23175a8 SHA512 f5299851dc6aa3c3ad1109123ac6c4eb5b5c7e1177fa1f068da5cef0920bbece63a8f1c424c5b95addf661e5a7d15a05a427676f6c272a54741495c77e316b78
+EBUILD sphinx-testing-1.0.1-r1.ebuild 829 BLAKE2B fb0f6376b5c57747fa5983581264a7b207abe772070c168aa9bea5b88d23a6aa434fb34c2967826786b35bdd39063a439cea34e800711341706aa29790257aca SHA512 2d1dc63d98db2e499659ff09878b1aff64ba8ff34d4102a2b1d77b932da45180a1b1db4b988424ca26682c3046e70260f646671a46b847b0fedd0df285b11a88
+MISC metadata.xml 382 BLAKE2B bc907f0063c080ab70373e0d2e67fa2ff2f16e2c93982da1769a92bc4f67a9288e9c4f683bba89aa9cab479dd793e4ef294a726b6532fc8031f5d397e2b8c1ef SHA512 8e617b870299fbfc28e7cb6e67ea8e772e97a4886d6de808614c72b423bf557ce46005b64e37a705333edd8064f873575ae6687719a1270b1fb78f0d654e087c
diff --git a/dev-python/sphinx-testing/metadata.xml b/dev-python/sphinx-testing/metadata.xml
index 605d625f69e7..c837a2647c6d 100644
--- a/dev-python/sphinx-testing/metadata.xml
+++ b/dev-python/sphinx-testing/metadata.xml
@@ -1,11 +1,12 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">sphinx-doc/sphinx-testing</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">sphinx-doc/sphinx-testing</remote-id>
+		<remote-id type="pypi">sphinx-testing</remote-id>
+	</upstream>
 </pkgmetadata>
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 619785089fc0..39efbc90610f 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/sphinx/Manifest b/dev-python/sphinx/Manifest
index 3b49f469d417..7b9401aa1631 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -1,7 +1,8 @@
+AUX sphinx-3.2.1-doc-link.patch 604 BLAKE2B f23f8f9a0a48b170e2b6daaeded1e65aebe830da463d4e30f2405b511cb72dde12767d0113b2d1efdce821c16837d700c71c60de38d20950ca5d6579f19a80ff SHA512 3088ba8768b4ba9e6a187e4c52fcc226efd5125fd01526b4a724504f4c445d69d6964fe79c1325ff7f58edcefc7f3489393ab085ea0458d94c44b186aa16e2f1
 DIST Sphinx-2.4.4.tar.gz 5966973 BLAKE2B 727a75eb4ec33beadf80b22cdd8dda02a53f4da4aea10ee18ecae658a69a9bb797f83b0d11b41b8405bf18b2472ea7fd501bea85382c20c5f2a9d5b14a032428 SHA512 cd35b7ebdf4eb41fb3a58706333ca4328fbf9b37999ad1bcc751f9769f0a294464e4def019a403fcd2204ca963ef641c35c957a4145eb50af07573d21df8c74d
 DIST Sphinx-3.2.1.tar.gz 5970067 BLAKE2B 6158d31390c9b07aa3abcdc4eb7ed827cf2160192a2c53ad845f07d5027cc4bd65264ea1114e78e06f9652a8788a8d0e992a8988382787a05bf507a73618cd96 SHA512 3f0f49036a44938abd470c2f825a0eeeeb818daf3dfbb3bc5c746b64305b5fe66c1c34d9703eb9420b2b347247c122825ddae1b6c28c88c249206151f39e3bdb
 DIST Sphinx-3.3.1.tar.gz 5979919 BLAKE2B 4eb9d8c9dccfd83690252ad6be05a3e69006e1e801bb0b37b77fb6ccf998f3a2fd99a90eba890cfb2baa5545ac0c2734fcd72d602fc2d1091e6754337f241b34 SHA512 bb1fb0780b741c0162ca014cb996dcdaac06985d14b6cc645a835679d7cf2680912784a815a027caf3fe902f721f9707bc9e9daaaf2c2d43051d31fe00584f78
 EBUILD sphinx-2.4.4.ebuild 3644 BLAKE2B 28df6a37d7fab6255e893501fbc4a45f427f1928f9e77420806f8eb2bcc2b23f05d2d5eb2b9a04258913555f1401c94c968811b270f4c3a0085340bd7e334ff5 SHA512 f6332488785a0c6795348b76db72a80e3bfc839a3ded793e12ae185941ebbba062f91c10f7dc8aca111bb951f62dc8f86fdd946a80e7253dbd14735dd5d6648c
-EBUILD sphinx-3.2.1.ebuild 4773 BLAKE2B bacbc635f142bc61e76c00929168ced40cccaf6b15820df46a6ff2e70d2074e187a5b3e01be15d94a27eaa7dd23ea5bd9527f53a463498e44a0e8de1e46f1c09 SHA512 f5b8f731a48271b1500697161af150f5027078e1f1dd1024295b6705118ed1c6c4f7d578982ea86f3f5861cc58b906cdd3b95ae41890fc1971c683d415394388
-EBUILD sphinx-3.3.1.ebuild 4782 BLAKE2B d9a7915fa8a5dedb1189c4f8584035f99534fd5a61c934ba930b6f845c55b021425751756741ffc643eaa954bdb19598b3c87034c67db398271a66ac3e8046ff SHA512 5395467362b25affdaf8a6c99fc1b46f8d8071e6f24c114d5ac460ffd149549498ec64e0745d3f7bb89fe72041ebe029f98289d0920eafc7bab831bec3707d0c
-MISC metadata.xml 510 BLAKE2B 878684f285906bb31649cb244f7af0e62ce854d20d260c269c0f1764f142adff08ce690fd778e3932181fa62947a2fa5521ee76c17871d15f73783dbd7730388 SHA512 496e3380982af69d59b05c94b773ff6e9449023e6b9bd314876e952fc54dd23db4a09ad24dfddfd752656445c71631503ae898ad778ad1702385057b047ebaab
+EBUILD sphinx-3.2.1.ebuild 4828 BLAKE2B 7b7b7103673f03d554c61924c50bd1bed09dfb78cc7b3d23eaa6e3c0b2380b18ee7b806063e920d34da3c3ff5b9d03379622830f67f409c98c29e52eccf9bcde SHA512 d18730f233d138a351e6e99da00d9ce289dd7decf98a5ce365055dc9d200b0c0360df25a6a7873b65c9b9efa22790688c0351eb30ec35f4ff4270889766b8c82
+EBUILD sphinx-3.3.1.ebuild 4837 BLAKE2B 28c764dcd0dc3e2c730280a379bfaa0ebc10a2e3ded11e42a4fa9923784f60015cdb33cdc89e815c4e221cb832719995928376c9af879bd35460db53be3183fe SHA512 9c52b6e44aeac8f8917eaff0609d54bd32e5b588bba03c341868196bb93f9e0dea80c97f041b31161b5aaf01de901a62c1a3062ee795483ada5a010b725613e2
+MISC metadata.xml 567 BLAKE2B e99637c5c116e3b8b17bd92341271350eaab38d3e0c5918ba2921db1fa0abb4615a1903b9916f94f3951f8b22e2939d71c5fde97b6ae467bc80570bdfee3b13e SHA512 7f9edc2ab5d01da2d23630f1cca2a25cb727b8336b600b48934b205727876361c2cc5432772940d855a00766d190b3319dc397927b9218345dac226886e9cec4
diff --git a/dev-python/sphinx/files/sphinx-3.2.1-doc-link.patch b/dev-python/sphinx/files/sphinx-3.2.1-doc-link.patch
new file mode 100644
index 000000000000..0c1b2ad7d98c
--- /dev/null
+++ b/dev-python/sphinx/files/sphinx-3.2.1-doc-link.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/728810
+--- ./doc/internals/release-process.rst
++++ ./doc/internals/release-process.rst
+@@ -97,8 +97,8 @@
+ * ``set PYTHONWARNINGS=`` and do ``make html`` (Windows)
+ 
+ But you can also explicitly enable the pending ones using e.g.
+-``PYTHONWARNINGS=default`` (see the :ref:`Python docs on configuring warnings
+-<python:describing-warning-filters>`) for more details.
++``PYTHONWARNINGS=default`` (see the `Python docs on configuring warnings
++<https://docs.python.org/3/library/warnings.html#describing-warning-filters>`_) for more details.
+ 
+ Release procedures
+ ------------------
diff --git a/dev-python/sphinx/metadata.xml b/dev-python/sphinx/metadata.xml
index 87aa42aee055..9d3a35739700 100644
--- a/dev-python/sphinx/metadata.xml
+++ b/dev-python/sphinx/metadata.xml
@@ -9,5 +9,6 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">Sphinx</remote-id>
+		<remote-id type="github">sphinx-doc/sphinx</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/sphinx/sphinx-3.2.1.ebuild b/dev-python/sphinx/sphinx-3.2.1.ebuild
index c46ed0085541..4e64e33c3b6d 100644
--- a/dev-python/sphinx/sphinx-3.2.1.ebuild
+++ b/dev-python/sphinx/sphinx-3.2.1.ebuild
@@ -62,6 +62,10 @@ BDEPEND="
 
 S="${WORKDIR}/${P^}"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-3.2.1-doc-link.patch"
+)
+
 python_prepare_all() {
 	# remove tests that fail due to network-sandbox
 	rm tests/test_build_linkcheck.py || die "Failed to remove web tests"
diff --git a/dev-python/sphinx/sphinx-3.3.1.ebuild b/dev-python/sphinx/sphinx-3.3.1.ebuild
index f29129962d65..1d28fd613269 100644
--- a/dev-python/sphinx/sphinx-3.3.1.ebuild
+++ b/dev-python/sphinx/sphinx-3.3.1.ebuild
@@ -62,6 +62,10 @@ BDEPEND="
 
 S="${WORKDIR}/${P^}"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-3.2.1-doc-link.patch"
+)
+
 python_prepare_all() {
 	# remove tests that fail due to network-sandbox
 	rm tests/test_build_linkcheck.py || die "Failed to remove web tests"
diff --git a/dev-python/sphinx_rtd_theme/Manifest b/dev-python/sphinx_rtd_theme/Manifest
index 0381babed25a..77d4efbc339b 100644
--- a/dev-python/sphinx_rtd_theme/Manifest
+++ b/dev-python/sphinx_rtd_theme/Manifest
@@ -1,5 +1,5 @@
 DIST sphinx_rtd_theme-0.2.4.tar.gz 1392456 BLAKE2B daf2365d74823465a73ea37352f0a8e85f196ac9c89006e79610a2981b1a266e523865c3b6f7866fa9e77a856c5a6fe001a2eb114dcb252920b19231eade9709 SHA512 865b09febc1c289d47a8be3f3d7caa9d2a4715b350e2e2d058855831321a6f870e8339b2ef22eafc2b9fe72ad48f96b8d2fda4bc032c5f8dcdf23f314869cfbb
 DIST sphinx_rtd_theme-0.4.3.tar.gz 5391190 BLAKE2B 6e08e079378c023f160fc3b858544bec6a295b256564d91c49b9ed8b5d2ee87bb2f21a30239f99fd2463840d194fde820c84ccd8e0b908f96fb7e5ca0fd9e6da SHA512 44b9309ddd041181542747c70b6e180c07aaf8cd7ee9e4c7eb9e3948685b8bd578e815c022bd991cc7f4bc7d02bb3c7a6d213e5d0c2e8214aa85d50b73e53853
 EBUILD sphinx_rtd_theme-0.2.4.ebuild 530 BLAKE2B 24792fa3bc71996a62c4a6ffff9f13e821b3840c4f69837424be49ec310b6c9aba88603cb117646499bc53c545ea222c42549ffc2a6e685ab56d551757f1147a SHA512 db6eca3195cf032522a5efa413f2009133af06f9290aa6d04d6a5e624253eb761b40af9e2206cb20c5f131c48a9efe083a8d4efac9f9c425afa995bbaa575ebd
-EBUILD sphinx_rtd_theme-0.4.3-r1.ebuild 638 BLAKE2B 9145c3379182469bc44c44b96fcd1e72a5e4fa29c46742b67e661d6f74818776f1fc14f4d04173411eb018696e89e9ba966def1665062cf72034a751f1b82511 SHA512 f208083aae0b2a89e34359c8498a88bac0ca119f5d2273e13b84db0fad0472a8afb8d0f890718abb0561e7b633ec24e881229d0853872b02fd8926694b76bd2e
-MISC metadata.xml 418 BLAKE2B fe6864764dcebdf3a58e27839031a1559f626bf9e978b8a3d0b4821e8b97fcb705e9d4efd113c009e810a2a8dfe0ff541904a28ce090ab4e1f275302771a244b SHA512 b52facf796826029a795da70e00eed180c79c8b5bb4ea9ba7f95e5afa930debded9b2003c3dbf5a622deed093cab47a657142e567f2e1b639afac53e23e4ab04
+EBUILD sphinx_rtd_theme-0.4.3-r1.ebuild 655 BLAKE2B f3cfe4dfe13480d05508c7149ab952001bf9954e9ad304fc4b26abb76b84ff74f863f5196ba0303e7d009a2a44511f0faf345a5d0f5819409efe4a74f47c8837 SHA512 c326f2783c67d53204ebaea80ce96addc21359a1f14029706ae4573ab5d87659b300cce097014277a0e900279c187f402d880a14e94d27dc7d03a3a9c4e1667c
+MISC metadata.xml 411 BLAKE2B 940c85be81b5a0cd6896bda1f43a803c46ecc619a9c5c9de62b69063faef6326a2897f294bb9435ab717fb3db723a0d243961db706a9f6cc95f8457ac7fe001b SHA512 a094111815931f7efcaea5c2f05aa421921cd919c1698ddecf9744107e9cea8b1e7005d515fe50e13159c5dea2afe1513ac97ec562ff781504c2e3d9774288df
diff --git a/dev-python/sphinx_rtd_theme/metadata.xml b/dev-python/sphinx_rtd_theme/metadata.xml
index 7b5643429d91..d499deefef3c 100644
--- a/dev-python/sphinx_rtd_theme/metadata.xml
+++ b/dev-python/sphinx_rtd_theme/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="pypi">sphinx_rtd_theme</remote-id>
-    <remote-id type="github">snide/sphinx_rtd_theme</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">sphinx-rtd-theme</remote-id>
+		<remote-id type="github">readthedocs/sphinx_rtd_theme</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.4.3-r1.ebuild b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.4.3-r1.ebuild
index 13ba208b1fab..8213037d85bd 100644
--- a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.4.3-r1.ebuild
+++ b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.4.3-r1.ebuild
@@ -14,7 +14,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 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE=""
 
 PDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinxcontrib-applehelp/Manifest b/dev-python/sphinxcontrib-applehelp/Manifest
index 2190564adf37..2efabc81de90 100644
--- a/dev-python/sphinxcontrib-applehelp/Manifest
+++ b/dev-python/sphinxcontrib-applehelp/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-applehelp-1.0.2.tar.gz 24548 BLAKE2B 9532cb990ed97c6773388a66895a066958187e9100d226e2274c26ba07fc5832e42ba407864b69b002da926a79e71ac2d6315125906156214df3920b585d9f71 SHA512 1325ac83ff15dd28d6f2791caf64e6c08d1dd2f0946dc8891f5c4d8fd062a1e8650c9c39a7459195ef41f3b425f5b8d6c5e277ea85621a36dd870ca5162508da
 EBUILD sphinxcontrib-applehelp-1.0.2.ebuild 850 BLAKE2B 85d595e0923d276f51c6bb578789bcccc3a972364cbaac2230e1dc5a7f3913771c023825113b544414f9c8b29fe18d81f93eeae528199d4eb8bc165d0f6b53a2 SHA512 d48c226b227057fe4c0af9378c83ecc7c75d86d00dc0e929900ee0db72a679d6835f67daf3b8b491e321d869060a47deac62fa6ffbca2a4dc36447232f9c81f8
-MISC metadata.xml 326 BLAKE2B ad14acf80a55c014b396340b6f42885185c7059c9b2159662d0291c9fbc4b03b9000b612d53fd2d95eb861b410d35ca301cf00bde26ea3344219923ba1fbf3b1 SHA512 55187b429105dff1f05c80cf935da48c02fcf8b00dccd572a562d75fdba50b73183d2781d67c498c2fee181707eb32e09e7e5dc12a88e7bdfa7212f916c45543
+MISC metadata.xml 400 BLAKE2B 5c06d0d11daf8209bf0b905a34986e4d1083cbc8b1181c8acaba8c4e2786950f59ea4bd7d2bf3f4337b6437f0ed0dbaa1c16af4b5821226c9c7d3990a638fc0c SHA512 cd0be59af961b0720f9cfd1e8b331b700110b0424b67099fda72853ca85e5bbe07ad5e10775c665b4b04f28d724b7cc83c9501e522d36859a2de99baecdb91a2
diff --git a/dev-python/sphinxcontrib-applehelp/metadata.xml b/dev-python/sphinxcontrib-applehelp/metadata.xml
index 5f2f3cd24f8e..2a6675d40762 100644
--- a/dev-python/sphinxcontrib-applehelp/metadata.xml
+++ b/dev-python/sphinxcontrib-applehelp/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">sphinxcontrib-applehelp</remote-id>
+		<remote-id type="github">sphinx-doc/sphinxcontrib-applehelp</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/sphinxcontrib-asyncio/Manifest b/dev-python/sphinxcontrib-asyncio/Manifest
index 0295da5c6b29..cb72af6f56a6 100644
--- a/dev-python/sphinxcontrib-asyncio/Manifest
+++ b/dev-python/sphinxcontrib-asyncio/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-asyncio-0.2.0.tar.gz 10689 BLAKE2B 9e03989a1ed22d7d467bdb7626e2e908407a0de15a943a432ff9707340f0cefe7caf1684380c25764637798b585b32287c4bcfc0f2014a78b7019547405e7ded SHA512 2ca25717c03385ae9bf879b8efeab8d508292d07f96d941032720d755d3db2e7bbc3c9a33c6103af9d83849ed8878bea1048d349bd0873288ee2addfee9756b7
-EBUILD sphinxcontrib-asyncio-0.2.0-r2.ebuild 1052 BLAKE2B f1953b0cfc45577d539056609477b817b7f2f235339dd59605b3f63b3d6f7daac0965f77a59dc9a3f8ae09dda90603a5e2da0d5adce35702a447010250d92df3 SHA512 5e399db6b1db8c2d8f717169a5c1a3e143f1b85f854ee911ae9cd34236fb63574f0a6df10ef479389328a409aeff4121b53b9150c1235620c9ed50f54e80c722
+EBUILD sphinxcontrib-asyncio-0.2.0-r2.ebuild 1051 BLAKE2B 5e46cc51f603170719312de005cf7acc5417ffbb2c28f7d394d558386062cba3087156f1736f70e2482486d076db900f0b4ff74a4349158662112c8f77a1bb3d SHA512 d63b497178ec3d8d0e2dc3ec32649302a7d0c83aa2a01e3853ee4288d0de03f387d0bf5a906f6d53d4cc15fab8fd7c15d33e58b82c8eb47284c30e836ec7f7c2
 MISC metadata.xml 372 BLAKE2B fc779af5274229957de772908e2a2fb9bc0cd75673af9ab88e4b6869164c75b7cca2fff4895beab62bbce984e93255b6578a6360621c5d0eefadcf49ae3f787f SHA512 63aeaf1b521f6c789128dc03be198ddcbfb6dc7e63fa6b24eef1cd23e9557d5de5f7c990514b95dd2b74634f47f3f5db89f233dfbbfb711527e51806bcd5a367
diff --git a/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild b/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild
index bedbad8a4532..8b2e06a3ece0 100644
--- a/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild
+++ b/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 DEPEND="
diff --git a/dev-python/sphinxcontrib-blockdiag/Manifest b/dev-python/sphinxcontrib-blockdiag/Manifest
index d7e0170a0ffe..ca428259ae22 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 1208 BLAKE2B 7c572e4cc5db27631e884508119d44ef910b5cab964f10293216664050098e56df0329cd833cb62693bb64a771f01541a4231ecc88a1de06aa84803a5eaf647a SHA512 c3a66db3276f0c2f2a29fcc2af8c891d7a9b6c6157e63c88d912d53f06f3b7d87956b1213704fded78759890962456a33ea96ac1bcb00ef89d6dd7069bad4fc9
-MISC metadata.xml 416 BLAKE2B 4383283e64d8db0b5576f1defc62412b5c4f4003e5ac75a2755e79d3e2a53f6d7aff82741d6225d2c96f0e2d87df650d47110a31cc91362dee641a86c54b18da SHA512 10fc4ff78fce4beadf8f8b64cfcaf4b71f84c3f74d80bd7299055ef7c2a759bf8d8eaef841e464d72d3272d999fe20ebfbcd382f2025932eef474387e92be6e0
+MISC metadata.xml 477 BLAKE2B 81fd6ecb1babff7205258eea29e7937a0007ad0ab1d275a0baf4c2b2b0d2bd40143e47ed8dcbed54381283368019443fe67d7c4d210bcaa3713a72269f18aca1 SHA512 48c35224a7fc9e72de6fb738686be0e81d76469a756efadd80455bcaea3feba0aa71dd9be4ecca43c6843cf9160ca42a6eacd2a15081c4c8a637d4384677db92
diff --git a/dev-python/sphinxcontrib-blockdiag/metadata.xml b/dev-python/sphinxcontrib-blockdiag/metadata.xml
index df1f7a5b0aba..3d8642cf24d5 100644
--- a/dev-python/sphinxcontrib-blockdiag/metadata.xml
+++ b/dev-python/sphinxcontrib-blockdiag/metadata.xml
@@ -10,5 +10,6 @@
 			<name>Takeshi KOMIYA</name>
 		</maintainer>
 		<remote-id type="github">blockdiag/sphinxcontrib-blockdiag</remote-id>
+		<remote-id type="pypi">sphinxcontrib-blockdiag</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/sphinxcontrib-devhelp/Manifest b/dev-python/sphinxcontrib-devhelp/Manifest
index cb339ea77b8c..f9c673e8af81 100644
--- a/dev-python/sphinxcontrib-devhelp/Manifest
+++ b/dev-python/sphinxcontrib-devhelp/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-devhelp-1.0.2.tar.gz 17398 BLAKE2B fcf04148bc4a77963517d9011c20a6b77eee499f1a5dcd4a9631b4f415f80a9f7091b254f74ba2fbc9b7106dfb741dc839e14813e088d5a0802793ed457e95df SHA512 83b46eaf26df3932ea2136cfda1c0fca4fc08ce8bca564845b3efe5bb00d6c8c93991f4edd4913d4ec796e2d85bd2c7265adf28e98f42e8094daeb5ac11a0eb1
 EBUILD sphinxcontrib-devhelp-1.0.2.ebuild 850 BLAKE2B 991b0361295e983330b533ca2348a7941be2a94b369cf6c585633f725c983ea4ad2203aef56b8cba8b8a6802ff3f23eb25f708a632f863c613ffae6634088788 SHA512 2e217a41aea32cff7151c8e8842b0cded13f46c2bf7d49fa44b21f458c3bbc1b8ec9395369c12f2f1f0f356f4c4b17146ee29fd351b076e7f855903782488393
-MISC metadata.xml 324 BLAKE2B 986204c86559fccc9a83332d2a443367be0d3f6d58ee2f50d5119688db2c3bf979aa14ad41979bfe0cabab649594e6d69e83c592a4d883e6d14b4840d3dcdf4d SHA512 d4f768df06e1c208502e7f87ec3ff4481f07ff84fd77721a5afc8a7c3bb7804a17a6a5798bc056e384d2ce433954790403c0d5d5cbba459ce835659bf8072a53
+MISC metadata.xml 396 BLAKE2B 5242eadb2888d9329d6adc6afb99cda4d388835c066160e6dacda16bca425555c8dd1b4ccd548667d7ddcc28b595b931842e4cd757225e4d86631d9dc86112f9 SHA512 16429051b15bd1ee3ad8f012ea983fffbe4c4540f84735853ea919ca1bb46ab1aefdbcb8c7e502d5f330898ab2163662faf4733c4aa35309b2d42e33f0e93edc
diff --git a/dev-python/sphinxcontrib-devhelp/metadata.xml b/dev-python/sphinxcontrib-devhelp/metadata.xml
index 56e1912641fe..17b7460ec211 100644
--- a/dev-python/sphinxcontrib-devhelp/metadata.xml
+++ b/dev-python/sphinxcontrib-devhelp/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">sphinxcontrib-devhelp</remote-id>
+		<remote-id type="github">sphinx-doc/sphinxcontrib-devhelp</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/sphinxcontrib-htmlhelp/Manifest b/dev-python/sphinxcontrib-htmlhelp/Manifest
index 58cf35275758..9bea840b8262 100644
--- a/dev-python/sphinxcontrib-htmlhelp/Manifest
+++ b/dev-python/sphinxcontrib-htmlhelp/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-htmlhelp-1.0.3.tar.gz 24248 BLAKE2B eeb7edd0bce99621ce6fa3a2bb9ba90a619af18403c8b4b0148a7d20fd3847f418f35bb1bb413531c0799b5b98be7b45aca51aa5c8120d9c997abb86ab0b0f01 SHA512 f37542c5789340bb26c41b84512e08998e4ef45ff2eb0fdb0e10f585cff27a145d5821b8eb3766d009e2b5a38c3d7efb127ab898982e1b6fd1d4ff7e26907db4
 EBUILD sphinxcontrib-htmlhelp-1.0.3.ebuild 891 BLAKE2B 751898d9c7bcfaac9fd3d8d01f31aa6650119e7aea2bd1337fa4dc54518946ef3fa225ab9dde5ba5fe32dcec09298a044dd1bcbac4fc17af67b4039fd82123fe SHA512 f95a886922eba85e6b44f6a168ae792ae5da963785477fcb930a5dd8476acb8deb01fef600d2c2d7bee423480d6012dbe641580368db1facbd48f7eb8d546e50
-MISC metadata.xml 325 BLAKE2B 86b320327210716251580bcde7ca53cece58e22f07973de023d09bb7a6b68cc4e4c4cace4c9b8ba73f15482332e3b94e38650468fe790e8f6c123c77b9f2ad48 SHA512 700c19351b017fed0536e0e57728b410052b2c34bf06912aedc754e4f931614f3f4b31a10bb67381134c9bd5f61f9af23f204641e8e531ec0ff9a6c1cf9eb41f
+MISC metadata.xml 398 BLAKE2B 84cee02bfaa0420c3bee0d1324270b84678a306904ecf3b30237d4ad7ceefffd97528109552e00d3aa1b2ad4eb6d9cd0e10341fb122c7a1830031870c1919dd8 SHA512 63c17014837ebf2e8bfce709fdfcd9de27c0071aa527a790c6e1e66c1246ae6e4635e8c30b7b486c9bdc727d7e044bfc30d848058bfb4eafe3eb8c32478a5b69
diff --git a/dev-python/sphinxcontrib-htmlhelp/metadata.xml b/dev-python/sphinxcontrib-htmlhelp/metadata.xml
index 0cca313393e1..f362420c0513 100644
--- a/dev-python/sphinxcontrib-htmlhelp/metadata.xml
+++ b/dev-python/sphinxcontrib-htmlhelp/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">sphinxcontrib-htmlhelp</remote-id>
+		<remote-id type="github">sphinx-doc/sphinxcontrib-htmlhelp</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/sphinxcontrib-httpdomain/Manifest b/dev-python/sphinxcontrib-httpdomain/Manifest
index ecc056feafce..f371c9d6525a 100644
--- a/dev-python/sphinxcontrib-httpdomain/Manifest
+++ b/dev-python/sphinxcontrib-httpdomain/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-httpdomain-1.7.0.tar.gz 37493 BLAKE2B e34682029ed2f59cb8c70b2a5270a2f89c4cb08179fdf3a53c65f1ad23eebba71bff5385b5d3fd971a6e3341457b253e4187632a8bf856ca208843938bbde056 SHA512 8c6e40dfaa29a552164078fbc96de578b2aac269cb0ce5e228293a85f87c4db4ef8c902868caccaca709df938d4e3917cc77b3da9bd889b9c6f8c6fa242dcc0d
 EBUILD sphinxcontrib-httpdomain-1.7.0.ebuild 901 BLAKE2B 8de5e85c5dee313a228ef327406862958789a08a4867303fe31150731b238d797b931a4994dacaff586affec3036ea40e44921faeddec086cceb86ddbad2592a SHA512 959e75e12aba40c8d78ac6aa360cf1d69799ce69312a31914df80af827d8332c6c1e78f3144329f670ac63b9c9d7011faaee016caff9eda94ff2573dca4d8ced
-MISC metadata.xml 432 BLAKE2B 009d252a01afcea39e9f202b22d9f20ce8bf3babf8cdbb840f7b5733e1944503944e7ec1acd3b9d7672bc14addcd062215209b9e1756d92c32ac6772d5596ece SHA512 fe2aa32bdff424a9a8fc5ef8aa136bf5db9161eefcc2ed4e67f099216c0524572de4229b7322fb47cff11974ec14b07f3f017d596d4450bd39c0891cc3e38984
+MISC metadata.xml 416 BLAKE2B a412fd46598d56b545efab6a3896adb3bce081afd9606491c3938a4adf7fa0afb814f5ee78187a699d929f5fac30304e6fc7760faac60f6a2544bf78b44e3821 SHA512 9e83e7e02ed3b0c17694e1efbc446fafd29435c639e09c9975427fcfcf39588624f19a7af2d2c26b8a1308254163456c9da9e98e728b40825864d40c5cfefb00
diff --git a/dev-python/sphinxcontrib-httpdomain/metadata.xml b/dev-python/sphinxcontrib-httpdomain/metadata.xml
index d83bf47b2cee..5a53e8bed968 100644
--- a/dev-python/sphinxcontrib-httpdomain/metadata.xml
+++ b/dev-python/sphinxcontrib-httpdomain/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="pypi">sphinxcontrib-httpdomain</remote-id>
-    <remote-id type="bitbucket">birkenfeld/sphinx-contrib</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">sphinxcontrib-httpdomain</remote-id>
+		<remote-id type="github">sphinx-contrib/httpdomain</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/sphinxcontrib-httpexample/Manifest b/dev-python/sphinxcontrib-httpexample/Manifest
index 6113da6f0521..e60ab1bcdb0d 100644
--- a/dev-python/sphinxcontrib-httpexample/Manifest
+++ b/dev-python/sphinxcontrib-httpexample/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-httpexample-0.10.3.tar.gz 30489 BLAKE2B 1100f28398d0d23559fb7ebea8263be5da6f2db09e9d5f48513d80d2cd580d2ff436df84b532eba8fb0c30eb3787a86f57f75750aeb0857b52af09885ba9a124 SHA512 de776f20e566a5b2ec4fcbad82d2ac39988ccf651a14d38d353dfd9cda7c15289acbb41db56df9189e42c2637bfd70fd4915d19d4ee718ddd4de476ddc34151f
 EBUILD sphinxcontrib-httpexample-0.10.3.ebuild 1115 BLAKE2B e0ab292866364fec136fbc8e71a85d51e338a0f603bab1f57b6d95a59036884f7aab1041b05f7636d62bfa91fdfaeafd08b668c820a80eb0afe96f4bb1e86bc3 SHA512 0af0f77ca785c6a4bb9ea0cabc913c31abb1a89a076e72acf55eca2dadeefb0227369b62cdb3ac8afb11b42dad4f4709d867b235a14be6a42e225d5bbf38414d
-MISC metadata.xml 488 BLAKE2B e6597d8c074fbd398a11ba571a37a5b38d8c9de175622a706ff04d6a1d7933c9196b3ce4ae1c8c2a843f44333de7b22ec8bdaa429f46a2134bd8e019a76dc6ca SHA512 3bdb4e01cbf129f1cccb57c52cb7f2f15dd9977b77a625bf91c6a4fbd7807c101c45dfc5d516e1a91b66284871265748e54cb19bb18fb68e44661272af008862
+MISC metadata.xml 558 BLAKE2B 25a799d590b3d33831b946ff993c3dd8e6592dc67511179cef8f972cd06180d3ebe957a804ad476c7502e0304aa922a1d3532d397c387b2f76b4d4eb74cb6feb SHA512 a47c281c7e4fe5da43e0b197e330f628e2ee1bb85c05d8e1921f7c41d3b4bbcead1870d9168dca3d9f7b4c56806de6aded564463adf9366349670ec4ef072557
diff --git a/dev-python/sphinxcontrib-httpexample/metadata.xml b/dev-python/sphinxcontrib-httpexample/metadata.xml
index 39ac3a9a9590..d1cf45af9cef 100644
--- a/dev-python/sphinxcontrib-httpexample/metadata.xml
+++ b/dev-python/sphinxcontrib-httpexample/metadata.xml
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>chutzpah@gentoo.org</email>
-    <name>Patrick McLean</name>
-  </maintainer>
-  <maintainer type="person">
-    <email>williamh@gentoo.org</email>
-    <name>William Hubbs</name>
-  </maintainer>
-  <maintainer type="person">
-    <email>vpayno+gentoo@gmail.com</email>
-    <name>Victor Payno</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>vpayno+gentoo@gmail.com</email>
+		<name>Victor Payno</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">sphinxcontrib-httpexample</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/sphinxcontrib-issuetracker/Manifest b/dev-python/sphinxcontrib-issuetracker/Manifest
index 1bb87e2805ba..8f01fc7fea60 100644
--- a/dev-python/sphinxcontrib-issuetracker/Manifest
+++ b/dev-python/sphinxcontrib-issuetracker/Manifest
@@ -1,4 +1,3 @@
 DIST sphinxcontrib-issuetracker-0.11.tar.gz 30351 BLAKE2B 304526543f5d24cc4b2cc76ea8d242d8942fa54737e3d1f0924e816d24aa4838e054b8af468837447d601cacaae987cd285fc706292b979d29dc84f1dbb77ddd SHA512 fb4a977bea22451a3d90b16821fc2a38ed53b17913666ca250e9aab8bb1726bbdb52fb2b6dbb2ae512a0ca6cc3d33dcddeba758c02c77b099180443d67e147c9
-EBUILD sphinxcontrib-issuetracker-0.11-r1.ebuild 1379 BLAKE2B 395a2ab8c1ad84da7f0332f3c593533d49067710f80ad80deeb43ede5d72187eb338aea8dbf960423487f6f3a19b86aac4a93ac2fd71c572bea7576860468d67 SHA512 49e8a09069cbec8906d669cc022b6943e96406dbdfbb167fd57051c87ea011d017954e51da91720d60ecbe947f436ed54ce16eafd6dafbfce560bff7d4efefef
-EBUILD sphinxcontrib-issuetracker-0.11-r2.ebuild 1374 BLAKE2B e47523d115c14016cc363519f3641203d5dac71a9981235b2bebf7bfd28b01b2d00f90d547e23d46cf0d117f41b647507f3818d2017fea7deb5d569dfb3793cc SHA512 100156dc35d3829a290c9e1b70ba91f5ba699915d7eef7f6358584ac2dbf6f90b5322439b590b2d672e5e4211552cf6eac1b4a682f63dde3ed5b5d856b4d861b
-MISC metadata.xml 254 BLAKE2B 5631905be15b8e2a50e4ad6c9d74ac6ca52a48dc470757d354f3a1a7b7cfa57f8bd9a2598c002a74088b84f8724aea98914e15430f83a24dcf0019e99c4bf37c SHA512 802bb4521ef941c7965f90668559d1a935ac922903521c0e65ee933360be2854415073ec46e874dc34092e35e0520a701186fb809940e2e2766c09cb8003ae3e
+EBUILD sphinxcontrib-issuetracker-0.11-r2.ebuild 1373 BLAKE2B f5b67511efbe0b45aea22d69eacdc70f59bcd143b12e04a19505dc8f68413f28abe53b8acf122b090f4aacc0a2f615b06a1980d7e5510d62cacf890dbb36f59d SHA512 45241eacd44efe42248a667518082588e732afa2249fcb8553fc55c0007a43be2d78dcb6dd5ead49da0aee30dfef1cbe2fda29f878e7a9ed52e2a33968be19d4
+MISC metadata.xml 278 BLAKE2B 6132906fa86a0a4f3ad9cba6e6758f88e74c26ffa1d652e8ada8ec8f01f2ad2077d7e4ed5e4cf83c8eeceafc4bd93883789d64871794b091ece2caef18053dd0 SHA512 1eab867621bc382951fe841d4bdf330357164af99185f33347cddf831dbd398265d1098a87557f9c272a6a0adea3a2dcecca6800f3bd938e80a12070d76ad64a
diff --git a/dev-python/sphinxcontrib-issuetracker/metadata.xml b/dev-python/sphinxcontrib-issuetracker/metadata.xml
index a5d53d3b52ad..aa1d6f0a539d 100644
--- a/dev-python/sphinxcontrib-issuetracker/metadata.xml
+++ b/dev-python/sphinxcontrib-issuetracker/metadata.xml
@@ -2,6 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!--maintainer-needed-->
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">sphinxcontrib-issuetracker</remote-id>
 	</upstream>
diff --git a/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r1.ebuild b/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r1.ebuild
deleted file mode 100644
index 5645fb0d7df8..000000000000
--- a/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Extension to sphinx to create links to issue trackers"
-HOMEPAGE="http://sphinxcontrib-issuetracker.readthedocs.org/"
-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 ~s390 sparc x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/requests-0.13[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-1.1[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	# test requires network access (bug #425694)
-	rm tests/test_builtin_trackers.py || die
-
-	# Tests from tests/test_stylesheet.py require dev-python/PyQt4[X,webkit]
-	# and virtualx.eclass.
-	rm tests/test_stylesheet.py || die
-
-	# Avoid redundant objects.inv from downloading, sed more lightwieght
-	if use doc; then
-		sed -e "s:^intersphinx_mapping:#intersphinx_mapping:" \
-			-e "s:^                       'sphinx':#:" \
-			-i doc/conf.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C doc html
-		HTML_DOCS=( doc/_build/html/. )
-	fi
-}
-
-python_test() {
-	py.test || die
-}
diff --git a/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r2.ebuild b/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r2.ebuild
index a9f2c5d53aec..733de788fc63 100644
--- a/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r2.ebuild
+++ b/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r2.ebuild
@@ -8,12 +8,12 @@ PYTHON_COMPAT=( python3_{7,8,9} )
 inherit distutils-r1
 
 DESCRIPTION="Extension to sphinx to create links to issue trackers"
-HOMEPAGE="http://sphinxcontrib-issuetracker.readthedocs.org/"
+HOMEPAGE="https://pypi.org/project/sphinxcontrib-issuetracker/"
 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 ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 # ImportError: cannot import name 'SphinxStandaloneReader'
 RESTRICT="test"
diff --git a/dev-python/sphinxcontrib-jsmath/Manifest b/dev-python/sphinxcontrib-jsmath/Manifest
index 3a88c4ff8ea8..861904869e34 100644
--- a/dev-python/sphinxcontrib-jsmath/Manifest
+++ b/dev-python/sphinxcontrib-jsmath/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-jsmath-1.0.1.tar.gz 5787 BLAKE2B 055ff298e11678d7d30975e4bef509ece0128be30ca0c5fd2be1323c2eb4fe92f861826ea5ddfcbd2d3e3a80535b374d2b1a13446c2604f3e448d5a8982b9881 SHA512 c1e6488f5c0ca4567c27ec7c597c9db321ac32ce354c4ad62fea534b2ae1c0acb183a921f46216bbc3891f14acfaac05ddf324b8fdaf99828df07bc91aa7e5c7
 EBUILD sphinxcontrib-jsmath-1.0.1-r1.ebuild 867 BLAKE2B cc68803d3bf9bdbe3ad6550319e1d9b4f0e925ecb0404bc50c771fa699fdbcf0e74aa5fd3ea89a60dbe74f9a409ebf06604b886e62ec5a0bccccbcc645793479 SHA512 535bb0f1f4f3d66b797884651a5301f860412f7dc7f7872cdbec354b3ba85ea8b387bfd61fc86686d50808c59d927aa065c5b530c9942dc2fe0465741f21f95c
-MISC metadata.xml 323 BLAKE2B bae56c440e079dcb99602f6e513fb9bf5c2415292f4c058e9da93fca5c14e0048789b1f9c1000b4d83cc37bc08d2fb3008898c2417a819c1128d1efe19e46414 SHA512 03745eb2d0defdb73cfd778eb7ab217cd839f9f94ce7cc1ef70c75c326cc0ba94bbc745624f8adca19e9049a332ca57c0951b0249f8a21b95ef6015ed6f545d0
+MISC metadata.xml 394 BLAKE2B 058f215c90b50f36bc6985d786f824147fddd41327bd602fd95c9564a656a1fd6d93098ceae32bdf150e0b6295bf583066729d9e27bd5f2ecefdaa47a9b51861 SHA512 ed096f53fd968c8bc24dd0838ef327ffa15f542fcf4709d6c15f4f82394d09e8603197e2de88dce96c5dfcee8125cedbfabba9976e4468783265d9a25ccc1477
diff --git a/dev-python/sphinxcontrib-jsmath/metadata.xml b/dev-python/sphinxcontrib-jsmath/metadata.xml
index a04c6af16897..053654d336bd 100644
--- a/dev-python/sphinxcontrib-jsmath/metadata.xml
+++ b/dev-python/sphinxcontrib-jsmath/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">sphinxcontrib-jsmath</remote-id>
+		<remote-id type="github">sphinx-doc/sphinxcontrib-jsmath</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/sphinxcontrib-newsfeed/Manifest b/dev-python/sphinxcontrib-newsfeed/Manifest
index 7bca6893d5fa..c961bd1bd04d 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 860 BLAKE2B babaa0869b1823de052362ab19cc8aacae49ab36055784af7ed1296d2365064c37dbc161762bb57f0aa0f5a1dedc9f38b3c7d082b833a4fe1068915f758aab81 SHA512 e1e149065ab1ab4135f2e9b13f30be43e72e8de3f45342ead79004a7ced9c59e84c78bc392d8a37cd35a8b34b6be89877a70aa648a1e7e3d861530c5444ce1f2
+EBUILD sphinxcontrib-newsfeed-0.1.4.ebuild 859 BLAKE2B 128d1d22249042730d3c9bac56bcc61ca94eb4e253f7de1f60c5591e81baa0da696b8484d74a0a04d2d320ef4f026904331d34cccfcd00d080b7a6dc1c27bbff SHA512 8ef8c62087a6aa20ee947195c63a687f6afcb35064da40e6a1d118f9b78b2f5dd76b4ab2e084f4c5540c0bda239448ebfebffe209c53ffecd6a9fe749beef10d
 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 e89c3dd2ec38..f590afa8dbf8 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/sphinxcontrib-qthelp/Manifest b/dev-python/sphinxcontrib-qthelp/Manifest
index b52bab6e86d4..7ed074e62698 100644
--- a/dev-python/sphinxcontrib-qthelp/Manifest
+++ b/dev-python/sphinxcontrib-qthelp/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-qthelp-1.0.3.tar.gz 21658 BLAKE2B 7a82e8941d49836cf3e64aabe05ba65b34596f7ba0287b4dc7ed2c5940f6944d1853790d1d52637b03d934effbba8fc5094089e2924322cf1b373432c60bce6a SHA512 29f77e4b3f1a4868c2a34dbd853415e5d813f482cd23b982aeed42d53acba09b896d77ba930c34cce8af043bb7d64a19acff610430e942038d95a410b6e0b5fa
 EBUILD sphinxcontrib-qthelp-1.0.3.ebuild 848 BLAKE2B 58750a57257c98eafd6cba28d331db35305df40513a38458653f2a1b055346fe3ade7c4d79d01d10b17d637324377f08903c2a5ad527172fdc4c27e849718db5 SHA512 f5338fbdb17d2dff2da541040c5b57fcbd476241b486ba4ac7bb529354a369c6ecd53a5475b77f11cdc7216eb2c83c72abf31e547203f5aa9d61cebdf3e855e9
-MISC metadata.xml 323 BLAKE2B 958abf4a10551f32a30bf4a103bf38f001d827dad8f8b7c0d737cd8d6cd5a1a7bd4bb0de765ef457875bfedc913a9303fbb94d4f8f796dd6114b1c15a3849b3a SHA512 5b1be7c4599df98adaf5c3b08b078cd15c207957c5e8e7025181be66f09cfe3331b0e1c53404c10041612c34e3cb0af388f1b1c34e3e508b609721c617dc89d6
+MISC metadata.xml 394 BLAKE2B 07ab4ac78a9ee115f9287d86cb944a58297d3ee3fc9d71f2ba63b977b98e73fe41f05b05220d9ed0d127e1c63cb7d04a184159416d48bad0d92392a18ee7a5f8 SHA512 d37a5363341ebd6a0b8f190fc1ee99bd48e2f1fa37b9a6cd9a00178b504dde84cf09656f622867bf6c158ef342f97011d69759be4ee27738ee5ea042e62cdfa8
diff --git a/dev-python/sphinxcontrib-qthelp/metadata.xml b/dev-python/sphinxcontrib-qthelp/metadata.xml
index a830ee0b076f..b1a9486a7b7b 100644
--- a/dev-python/sphinxcontrib-qthelp/metadata.xml
+++ b/dev-python/sphinxcontrib-qthelp/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">sphinxcontrib-qthelp</remote-id>
+		<remote-id type="github">sphinx-doc/sphinxcontrib-qthelp</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/sphinxcontrib-serializinghtml/Manifest b/dev-python/sphinxcontrib-serializinghtml/Manifest
index a8def6eef330..7c3d080c8255 100644
--- a/dev-python/sphinxcontrib-serializinghtml/Manifest
+++ b/dev-python/sphinxcontrib-serializinghtml/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-serializinghtml-1.1.4.tar.gz 18647 BLAKE2B aa5dcbacf28a0433cbe86d9da3f6dc5859ec6148f74714654f5095ed1f21042e0d4ab1cbfb1bc816c1de40136ac51cb6f78c913cebf5465a4a11c25b22b36a14 SHA512 d132f75f1e0491167cd6d0f5b3697ac0fc1b16e63fd3dcd480b961e332b521932e405679a695522a4aeb56f57949eb9b1ed7635e9807dd059ae44a6384bdc6d0
 EBUILD sphinxcontrib-serializinghtml-1.1.4.ebuild 910 BLAKE2B 6a42cba836ae872f3d1954b51e8f5b41004f57d3dcfadbf4069ae7c39ea6eeef0c92d1ec4201cda948242c39b376ab26882e4b10c327bbe64a1c3f308a845d4d SHA512 7afc71c6bb8856e4e450d538cdfb0ddce8b1663098ff4a0e49a2727d515f8b03ada0ae45e8bbc68341facb2c777f3e3b8baef60089d97c7ec488678f3fd4e44d
-MISC metadata.xml 356 BLAKE2B 6d800ff5be26c447eac58bee688f218526b5bc6dcbe53deb3e5d4c7f0dc9ee394f50d9c2aa9b057c1246bba9704584725b1230abd13f99b676457558148ad478 SHA512 fc2bd51cb07ffcc9d3970af8bbba54e66e0e23192477d7cea8ccf8e2515feb625d0418343b2e1f67ad28b07c3853ae74a3c3db8d1f5c2833fad2e272ca8c82ff
+MISC metadata.xml 436 BLAKE2B 1ff1b18113f36620c2fbab9af2fcb1ba8e827f5a3aa3ddd0eca46d40afbef8c6835f0b0df1e49e9783974aa536d1450f5bdfe8c5e1764e17339f5ebdb8dbd74c SHA512 ce1452b75f6f585ff90a1da0b6455693b18f462ec97bb4afe1ddefa2a1a684fcf87928a35911ce0fb99f2f4f039ab580bb4f17efc375930d57d788a00084936b
diff --git a/dev-python/sphinxcontrib-serializinghtml/metadata.xml b/dev-python/sphinxcontrib-serializinghtml/metadata.xml
index 147a7c886eae..4d65a01ad697 100644
--- a/dev-python/sphinxcontrib-serializinghtml/metadata.xml
+++ b/dev-python/sphinxcontrib-serializinghtml/metadata.xml
@@ -8,5 +8,6 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">sphinxcontrib-serializinghtml</remote-id>
+		<remote-id type="github">sphinx-doc/sphinxcontrib-serializinghtml</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/spur/Manifest b/dev-python/spur/Manifest
index af8c5606fca7..dd04a0a03951 100644
--- a/dev-python/spur/Manifest
+++ b/dev-python/spur/Manifest
@@ -1,3 +1,3 @@
 DIST spur.py-0.3.22.gh.tar.gz 17760 BLAKE2B 676484e73fa38ebcd3bcc2ace21853590b652d0ec2dc31f7635a55a8bbb213e559fbdd7b70e545091e7e28e6000862ef45eba748e13c546b765756b41c352028 SHA512 36518a080d3fff97fdab5af8e7e3045c58ad6b1acad9fb79e11da688d484565ee4d50868f3c3ee10299e135f2c01bd35348256df7bb1b4f6200aa175cafc7f0a
 EBUILD spur-0.3.22.ebuild 1175 BLAKE2B d2e7d602a67fc0d1e9efbf8608cc52a637dedec643ec8e5cca1c34f1407037f10b6f9f9ffab4cd4e3faa205c03054d44fa34337fbe113094355b048fe18c6700 SHA512 1e7e2656be35f31865faa8bdc17168714153784db6d97771811b610104f057a3a5bd51c13e990ab91f768e22dee9ac1556bb698efeafb9ed98d0ebfb0ce43742
-MISC metadata.xml 242 BLAKE2B 17fd7db1343fb7dba1842d5b62d83e56e2816962b0122ec6eee7f9e163f333d69ede2cbdf2a2ba8c77613367fca3d2cee779697fb25b5d8cf0439e1e845dbf1f SHA512 2ce768d5aae91f32da90c62900f556c647eb9806c810a817b6c45c5356e71f504b5a646bf75f553c3a9bfd3f94c4317df4948bae863ef7525b4a013b63618cd8
+MISC metadata.xml 309 BLAKE2B 691c5684a629e9e2165e4969f044c7b2697d40e03d34834d176cd35a97c454ced155c4d24d35d1661bf2825850edf7f2f2880b1fe543baa39e35cb273ebf27aa SHA512 c27fc80d7273b71a103ca016560c6e7f219a1898707444dfb8015fcc922f4c83f1791e0c9b59f54a72dc2546203d88256fcb39f5c8ae958279bb1213a7165c83
diff --git a/dev-python/spur/metadata.xml b/dev-python/spur/metadata.xml
index e59516686a44..51b1ef540169 100644
--- a/dev-python/spur/metadata.xml
+++ b/dev-python/spur/metadata.xml
@@ -5,4 +5,7 @@
 		<email>python@gentoo.org</email>
 	</maintainer>
 	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">spur</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/spyder-line-profiler/Manifest b/dev-python/spyder-line-profiler/Manifest
index 2c51316b6f80..5f66f8f781cb 100644
--- a/dev-python/spyder-line-profiler/Manifest
+++ b/dev-python/spyder-line-profiler/Manifest
@@ -1,3 +1,3 @@
 DIST spyder-line-profiler-0.2.1.tar.gz 71109 BLAKE2B f16a5ac743b91a441b23b497a5aa8d1ede2f458a2de3e92d91c2f3af32621b07efa0fbf6646929a28c085117006044c8bf34f911c57bc221c12b1a71b949440e SHA512 2e6cdd8fe5387c8c229fdc503937cab3a30b72d2eb2a23a14de49584d317a1ed89eb76ebffbf03aed7a8aa5a183677c316814d50c73e79c6175da6a46e5937fb
 EBUILD spyder-line-profiler-0.2.1.ebuild 761 BLAKE2B 09f9c98f25290f1502d7deb585b845f65da7d3ecde21459ba23bd850be63032f6ea16ce102ee326bb1900efb1a1193163fca0d7ed61641e613a723c0871234e2 SHA512 1f14b9e93aea7cc1d59557bd047081fcb6cc8a0a6e10c3106b65d73221efaf6c6ab9ebcbb8b7dfab2c98097bbc850f19e90c77d0bb5c52b1e427cca0de159179
-MISC metadata.xml 375 BLAKE2B d5aff616cc3473bac743c6d809eba454c54e2fc1514a115be5ae1ca11be7de212fe72f2ffeb520db05a11837d8ff93daa1128cdef7867244b9f829d8e52e6214 SHA512 c00656e8233157fbe266e364bc10a6b351063221b27a73d43add57a50d00beb2e540b491ea671fcc4b7acafd97c4a5e56c73a9937aab64ee2d79d553fd0658ee
+MISC metadata.xml 458 BLAKE2B b7a3249e9cfe8ef12acbba3a833d6546930b31fade0ff8a175e87fa4f11c2f7c2cce9707a2a9e55e888c0819651827d2116d1082e0081a8aba0709e10de90d67 SHA512 83305aecd163aca55ccca7788d40fae38e3220bc99c824c4072c5fc1b7e2bce7e9ec984c4dbb745cfdde9d37238c27ba2971c74f95e8a49053c021dd84a79b99
diff --git a/dev-python/spyder-line-profiler/metadata.xml b/dev-python/spyder-line-profiler/metadata.xml
index 8fc11184ab00..51c57d3fb52c 100644
--- a/dev-python/spyder-line-profiler/metadata.xml
+++ b/dev-python/spyder-line-profiler/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
@@ -9,4 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">spyder-line-profiler</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/spyder-memory-profiler/Manifest b/dev-python/spyder-memory-profiler/Manifest
index ba9fca7a1b35..18e748ca8326 100644
--- a/dev-python/spyder-memory-profiler/Manifest
+++ b/dev-python/spyder-memory-profiler/Manifest
@@ -1,3 +1,3 @@
 DIST spyder-memory-profiler-0.2.1.tar.gz 16802 BLAKE2B a42bddaa1a470b1e23c203033daca9870d873a5160a9600f4e2932d30e15885fa63c90e334d0e92e7ad6d2ef380f022c94753d5fb24b451259f11f44803c390d SHA512 14eb5ea0e5a87cbdce6dc4bbcdd7e3a4f3dec566955431173ade068e1b110f5282fefc960d94351bdf76be125f099414c6e3b776ac4288065139e222c43a30d9
 EBUILD spyder-memory-profiler-0.2.1.ebuild 769 BLAKE2B e86fe75db0e08a151aa1e00058a8c81b13c67cfcd55eb64861e784b15b39b95b5479df9f9e44e48155f2a2f7d6dbc34373f687fd9da444611e6b88d2bbf2b7df SHA512 47f54d78a83bc0ce969a1a4237fab8945d1d5bd724cb5ae496c6b03f2f22eba20a876c33dc4af3608ba199e46d4a921e038aaaa0d9c903f308789fa77828bfc3
-MISC metadata.xml 375 BLAKE2B d5aff616cc3473bac743c6d809eba454c54e2fc1514a115be5ae1ca11be7de212fe72f2ffeb520db05a11837d8ff93daa1128cdef7867244b9f829d8e52e6214 SHA512 c00656e8233157fbe266e364bc10a6b351063221b27a73d43add57a50d00beb2e540b491ea671fcc4b7acafd97c4a5e56c73a9937aab64ee2d79d553fd0658ee
+MISC metadata.xml 460 BLAKE2B 4b8c789517136daa9eaf1d68f68d176ede3b51c6d731f2aed379eec0a2e7fab22a151eaeedeecde69021ed44c06784a5629beb53e12dc3c714519e24dc595ca4 SHA512 8d8edc1b46a3d6c72a0cdba477a419f846803ee29ecf5f61d9629b702b430cf3c54dba4164dc3ab005ff188cb9083a83d6f3987f022f84f03041f47f0b17de77
diff --git a/dev-python/spyder-memory-profiler/metadata.xml b/dev-python/spyder-memory-profiler/metadata.xml
index 8fc11184ab00..8d57702fe441 100644
--- a/dev-python/spyder-memory-profiler/metadata.xml
+++ b/dev-python/spyder-memory-profiler/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
@@ -9,4 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">spyder-memory-profiler</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/spyder-notebook/Manifest b/dev-python/spyder-notebook/Manifest
index ba64c151ed23..c5fad72a1819 100644
--- a/dev-python/spyder-notebook/Manifest
+++ b/dev-python/spyder-notebook/Manifest
@@ -1,3 +1,3 @@
 DIST spyder-notebook-0.3.1.tar.gz 3862401 BLAKE2B cfafc631fc0fe44fadecc1f2509435c0a7b6ce5320c19bbe75be92e4c50275a06e79aa77e8b0cf832fbb1fdb229236c3741208f3081e879528751373d8875126 SHA512 253583b0a080f6359b58583f8c459ae858bafe4b15d24e86c7f144801431bd03254ced3984ac98e1e3349f48ebe5081252d298e59dd88609b7bb22f9e0b6765d
 EBUILD spyder-notebook-0.3.1.ebuild 1186 BLAKE2B 313470e0a945e49fa7f145a5417c2bc72cd8d9cb07dd60c375d090844de00ddb009bad6f3fb825a2e0ba9144bfbf4049afc733faa193d2ef5c73df4d5df1c90a SHA512 73deaf0ac5a7e77619e7bccafc6a7a87645a3041c955c6c56a21d8d0235aca7f9293b268a176f1a969cd13969e3e6f068309e12958ca14b9431c0c7261f8319d
-MISC metadata.xml 375 BLAKE2B d5aff616cc3473bac743c6d809eba454c54e2fc1514a115be5ae1ca11be7de212fe72f2ffeb520db05a11837d8ff93daa1128cdef7867244b9f829d8e52e6214 SHA512 c00656e8233157fbe266e364bc10a6b351063221b27a73d43add57a50d00beb2e540b491ea671fcc4b7acafd97c4a5e56c73a9937aab64ee2d79d553fd0658ee
+MISC metadata.xml 453 BLAKE2B 85e86a15f42d0ef745aa417ae51f95725c8dc9b609ab55549a39dd0dc1ab5e8c48637e792b0d848c7a00b9cd2115987ce08b1871c2ffcaeceb44508c85ff0a71 SHA512 1017abac649d9a726fea8d22317c0c1dda117ca605bed467907ac4e0600888a9b9debc1ce2b5cd09542a734de3e4313e01c71b8b8b9bc498a95b04bc76a740a0
diff --git a/dev-python/spyder-notebook/metadata.xml b/dev-python/spyder-notebook/metadata.xml
index 8fc11184ab00..21d0219b1ff0 100644
--- a/dev-python/spyder-notebook/metadata.xml
+++ b/dev-python/spyder-notebook/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
@@ -9,4 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">spyder-notebook</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/spyder-terminal/Manifest b/dev-python/spyder-terminal/Manifest
index 29e71df8102b..c07f900952fa 100644
--- a/dev-python/spyder-terminal/Manifest
+++ b/dev-python/spyder-terminal/Manifest
@@ -1,3 +1,3 @@
 DIST spyder-terminal-0.5.0.tar.gz 10070777 BLAKE2B 2b556597b62e822a94102c393818c9b479292f1e9b61fb70a48f9627bc5ccd493eeb5624406cbb205970a2b1613bb47310d92a969cf190dee296e34daafb7c2e SHA512 8a73a46adbd628a80a8a7c8f9f50c8ed4a00c64adbb6f0934a32840397f9a5840f516380728abe1e31b659415e82bd38d1a5418bae43229b61e4e6340fc8c19b
 EBUILD spyder-terminal-0.5.0.ebuild 599 BLAKE2B 460124563b849eb3f079663c0d7562325f2845011f960e34b17f21e6e852a2b66e478cc3b6cd0c935860cb77fcf5e7ce08783633851084234d3635f24d4589dc SHA512 b36bf553d304a4e8ddfc685baec76968c29478ffeb51fdd3f26fdf6259157a99eff67f8884c94b7b7d7e88ab0a147d9a81e51f992c41554cf5385fc843da6be6
-MISC metadata.xml 375 BLAKE2B d5aff616cc3473bac743c6d809eba454c54e2fc1514a115be5ae1ca11be7de212fe72f2ffeb520db05a11837d8ff93daa1128cdef7867244b9f829d8e52e6214 SHA512 c00656e8233157fbe266e364bc10a6b351063221b27a73d43add57a50d00beb2e540b491ea671fcc4b7acafd97c4a5e56c73a9937aab64ee2d79d553fd0658ee
+MISC metadata.xml 453 BLAKE2B 37c06884098780e2ee05bf9f84776cd3e71f8abe03c951102bbb782281fc88b0618e26546f4ba066e7c654d6d75a3157bc28fba8d00ba0063f5885307835413d SHA512 f5ac37e29ccb15dc741faadc36f0e4485defb4fdc2e79ea48d1bb754e7a1681b1f4b2e8e55ef098961359200c9f686091c5d352e195079dc6ca864177293bd51
diff --git a/dev-python/spyder-terminal/metadata.xml b/dev-python/spyder-terminal/metadata.xml
index 8fc11184ab00..07953662c9cf 100644
--- a/dev-python/spyder-terminal/metadata.xml
+++ b/dev-python/spyder-terminal/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
@@ -9,4 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">spyder-terminal</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/spyder-unittest/Manifest b/dev-python/spyder-unittest/Manifest
index eb77830ec8b1..1f624f695145 100644
--- a/dev-python/spyder-unittest/Manifest
+++ b/dev-python/spyder-unittest/Manifest
@@ -1,3 +1,3 @@
 DIST spyder-unittest-0.4.1.tar.gz 79158 BLAKE2B 10b7a8fde9dffdb436c44f22d305ceab84970dabd19aaeb7b5685be21f0e7bfc701a5fbbf9e393a71c9feb36dd6a2be68680e276c8d0841b2133a7171c504e3f SHA512 17e08b09accd938bf533c409f9a8011e9780f9cc4533af0ec754b6a01061490f198213cb77af9050e1e67e2b4b9c25251bbab27dce23d3f6e09f502cfbef95fc
 EBUILD spyder-unittest-0.4.1.ebuild 1085 BLAKE2B 47c1234f68356d866e4bbeff0ec49bf59d0084cc0350f2ca2ecb508b18d25f64a228efb0be41d670eff0987c2bc338a1eb6b99835394d81ee091fc812b2b1caa SHA512 7d802ac4dbf44408a6e27792ae7a5532bdc869ee27e9ab177790a1a0af4fc9d750c87a6d4ab5a9db52910c8f3b0f270fb6e58f46338cce7fdb0794121724fe0c
-MISC metadata.xml 375 BLAKE2B d5aff616cc3473bac743c6d809eba454c54e2fc1514a115be5ae1ca11be7de212fe72f2ffeb520db05a11837d8ff93daa1128cdef7867244b9f829d8e52e6214 SHA512 c00656e8233157fbe266e364bc10a6b351063221b27a73d43add57a50d00beb2e540b491ea671fcc4b7acafd97c4a5e56c73a9937aab64ee2d79d553fd0658ee
+MISC metadata.xml 453 BLAKE2B 8a1d0ddd42d8b61a4c63659327f2239f788aec9fa80ed7ee8cb33c43019ce0dd9a4c688b6389aecc07528104df374900a417add5d75b84fea39a59617d4fd9e3 SHA512 4cc16c845c341876b8ca84e6fa636e14782424167dff8e8d49822d9aba1012d25abd32a35f3732c56fb85455cfc7fa75292cf6999b67b2b147e07c0751cbf3e8
diff --git a/dev-python/spyder-unittest/metadata.xml b/dev-python/spyder-unittest/metadata.xml
index 8fc11184ab00..52de5cb4741c 100644
--- a/dev-python/spyder-unittest/metadata.xml
+++ b/dev-python/spyder-unittest/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
@@ -9,4 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">spyder-unittest</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index d6497d03f0f1..642124c66935 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -1,5 +1,4 @@
 AUX spyder-4.1.2-build.patch 1503 BLAKE2B 06d768f741703df74bf9183c6a80e4507a6e0afaf6eeae3cbf8f5f00dbf5f07a02d7f0f7639f5e91f412b1d08c7de58347b2a336b262ab2dd2bf0982978a1ee4 SHA512 ee372db7b1dfa4c77feaee6b9def35c4238df00cc8cd7de1ba5a309672ce1b60b2e84f9e9eae552d08f26dd73cd3cd1789e65344bd8e13e87764413340d7a480
-AUX spyder-4.1.2-py3-only.patch 2100 BLAKE2B 95223b087b2d85b5069822d96cc185f1e4005ff75d8a894a4684dc0a2ca11e2807ea912b0732dabc7ea5069fd3547ad30932cb92f5ce899c2313c6c784723046 SHA512 ec8361268d511888ac19326ff558198f39415237d528910ffb6ececba49a2d5bfacdf81f3f6deb299ac9375908ab371fa115211e77366409c87aa3e64b971466
 AUX spyder-4.1.5-doc-theme-renamed.patch 375 BLAKE2B f4c902b331e9e6f034018d781d483380e85b3277f5e8f3f64f15ebcd4673ee1a805838a10c5606aa853c1c0779c10a439bb556dd57a7427bf96aa2fce0c7b9a9 SHA512 7671f0639c8947a0cbd4ac24c0a9731cb31a7c8f2ca49ac7a9d2dc8f4b7b08aa033448c285ba71f844fc8588167bf91b44c3cadaf3fd83883160c2eddc5b7e7b
 DIST spyder-4.2.0.tar.gz 11840358 BLAKE2B 26e4cd9865196fb39fa5b49a17f172b3000fe27c5ab6fb1b31ed56d41f118e4016b6ed97ce8cb1b39c65031fc11413f8e426876d3dc8d5af25f12428d0e0c481 SHA512 c1460e2fe9a37c0e6107657de71205682018d87737b3eac16ec92c32d979bf727a6c8955bd2700872b6e91159d1a1efc57cdea52ffc44604fe34b78094de6e7f
 DIST spyder-docs-7fbdabcbc37fe696e4ad5604cdbf4023dfbe8b6c.tar.gz 58822544 BLAKE2B 9ddd662eb0e3b2845a15bc38a0ab994fcf43824a560cf635a29e16b5eb66407706a412ea50a2f8e5c0212675df3422ece649bd1e50e3ecd1c34ee5727f8a2df9 SHA512 ab30f287733681da0b1d15656a44cd320401330309efbff8f0a89f59a15d5c57532a2eab3e8353d8c3856eac0a393385a852663d6698d0a0d309def21d13933d
diff --git a/dev-python/spyder/files/spyder-4.1.2-py3-only.patch b/dev-python/spyder/files/spyder-4.1.2-py3-only.patch
deleted file mode 100644
index afdc92a1e122..000000000000
--- a/dev-python/spyder/files/spyder-4.1.2-py3-only.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 2d5d58b..4adc952 100644
---- a/setup.py
-+++ b/setup.py
-@@ -31,13 +31,6 @@ import shutil
- from distutils.core import setup
- from distutils.command.install_data import install_data
- 
--
--#==============================================================================
--# Check for Python 3
--#==============================================================================
--PY3 = sys.version_info[0] == 3
--
--
- #==============================================================================
- # Minimal Python version sanity check
- # Taken from the notebook setup.py -- Modified BSD License
-@@ -87,13 +80,8 @@ def get_subpackages(name):
- def get_data_files():
-     """Return data_files in a platform dependent manner"""
-     if sys.platform.startswith('linux'):
--        if PY3:
--            data_files = [('share/applications', ['scripts/spyder3.desktop']),
--                          ('share/icons', ['img_src/spyder3.png']),
--                          ('share/metainfo', ['scripts/spyder3.appdata.xml'])]
--        else:
--            data_files = [('share/applications', ['scripts/spyder.desktop']),
--                          ('share/icons', ['img_src/spyder.png'])]
-+        data_files = [('share/applications', ['scripts/spyder.desktop']),
-+                      ('share/icons', ['img_src/spyder.png'])]
-     elif os.name == 'nt':
-         data_files = [('scripts', ['img_src/spyder.ico',
-                                    'img_src/spyder_reset.ico'])]
-@@ -131,9 +119,7 @@ CMDCLASS = {'install_data': MyInstallData}
- # See spyder-ide/spyder#1158.
- SCRIPTS = ['%s_win_post_install.py' % NAME]
- 
--if PY3 and sys.platform.startswith('linux'):
--    SCRIPTS.append('spyder3')
--else:
-+if sys.platform.startswith('linux'):
-     SCRIPTS.append('spyder')
- 
- if os.name == 'nt':
-@@ -269,8 +255,7 @@ if 'setuptools' in sys.modules:
- 
-     setup_args['entry_points'] = {
-         'gui_scripts': [
--            '{} = spyder.app.start:main'.format(
--                'spyder3' if PY3 else 'spyder')
-+            '{} = spyder.app.start:main'.format('spyder')
-         ]
-     }
- 
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index a86d47ed4aa4..1504491af6a5 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -1,6 +1,6 @@
 AUX sqlalchemy-1.3.20-pypy3.patch 7321 BLAKE2B 706ff7da1f25a667784f462effb85593e8ad9a3fe893000866e487ec32328a571f4440ce4dcce61e2b5f1ded5c8145f5cd12a141c40f4bb64e87135aa18a8274 SHA512 40944c59cc6cb17f512d0df1e2cf50626dfa6a53e2e8b182c0ccb4007c2338d8058459a9158e9e72ee6aa89394275cf818f0c7572b249175d3acd52f5a1c2827
 DIST SQLAlchemy-1.3.17.tar.gz 5979141 BLAKE2B f0fa46493461f532ebca9420fc9f49a2c04af888aa99653946a5bb563d40b8bb714a03301300ebb80cca76a99f8226ddfcde4216e8fc2593d3a161b5072276ab SHA512 6f6d54b9018ece6c289f28a3a41ffb1b2216206edee08c49f387e9f30740969dfe0f8272654ce4efca159a2a6619e76c41b2ad2b10c391cdd64681ac17d0bc79
 DIST SQLAlchemy-1.3.20.tar.gz 6264898 BLAKE2B 4c386eff56c2f9ec7ef467e3bc0032629582a970707dc11e3744fe3903d9cb18457f5e0be4dc9c20727b5733f158e031bf8b40f586dadb8f4ab8d0cae3cf7398 SHA512 29c52ada1a66f906ed2563df2ab093eceb7c09de45749c96031f30a1512d20b1d698e00640c777169ef3db99ab012151770a3daea45a51df934269b554ff4b28
-EBUILD sqlalchemy-1.3.17.ebuild 1439 BLAKE2B 019fe439aa340d52082616c83fde43e34367855f126f6f5200eeb28d2b537f9dedb92db1d8a78bd424323ef8a6f3ec270562407bcf49641bb1d869929f7d058f SHA512 0d3ade8b1a4bd5328c4efa5401cae609a98d5efaee913fb38aca6a46b77481cab6344c97bdb7141523e35c14c773f9ef7e277908340d5845263ef44c3cca89f6
+EBUILD sqlalchemy-1.3.17.ebuild 1438 BLAKE2B 41cd72c3c3da041fb78c9ffc1a7a4f563f91b38f2afffeb2a588d0d75bf4c717b3b403f73f9ebe2c8ec0a1855ad186c97a821381065233795c2542756c44e97c SHA512 07af350845a8bfd22f12d509f4281e893298e73fd54ae39d67ac350d5c60d254f4e059351ae6e6dedfa8729dc2fb67d521c24453e8181444586ee0c9704ebd98
 EBUILD sqlalchemy-1.3.20.ebuild 1892 BLAKE2B f8d26899591138928942c4974a67ef9bcd49b32237bf1b05205ee1ff777f6cf692430375889fe59168cf8cb8bc97e380b390bce63ee3abc74edcd41f20e41e79 SHA512 d454181ebeca4e6fde6973e84d50c79a21f87290d68540b698bd53ba0daecf5ab71670fa3d1fd0aabab3212f295ad1b7ffd397f1ce057d775557ccb35b04546c
 MISC metadata.xml 443 BLAKE2B 44c09d8332158ed09ece04188ca9b41a68b7e8a0a2b6d8d44cef44d7be396a08cab3432c05b3bcdbe706a470662d313548e80e202c8ea0e02aec6035daacb3ef SHA512 c262e5b27bbb02b6e64a1fa8a240cf14fe572dc0d41901dfc65ca979f7f89b3e0885b71a6f5c39b33e1534e13366873144693eed44bf43712d3c924a504dc6c8
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.3.17.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.3.17.ebuild
index 626ce4bdced0..9df49e2c18b2 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.3.17.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.3.17.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 REQUIRED_USE="test? ( sqlite )"
diff --git a/dev-python/sshtunnel/Manifest b/dev-python/sshtunnel/Manifest
index 81439a8969c9..94ab6026445c 100644
--- a/dev-python/sshtunnel/Manifest
+++ b/dev-python/sshtunnel/Manifest
@@ -1,5 +1,7 @@
 DIST sshtunnel-0.1.4.tar.gz 48330 BLAKE2B 5fdc5dd602274a16025f250fcc3a36453a17c921f51367cac0cb0ef36be6251f687b53b1df6072d1e32456a5c0fa5ec6d2fd8e5d4874977a641a6c9ba81ac57c SHA512 c228fe79cf5172c950777a40b27ababd42a31b7aad8a8472d55a2b3babf5aa4c5308799bb271f33f0e943c309eb9adedee321045a03324cb5e30a385178751ca
 DIST sshtunnel-0.1.5.tar.gz 49345 BLAKE2B dde497296ebf84cd34a485ac82de3ca138671b4b8ad2d2307a5e40dc0bb9c6a6daa8c8f3888db942133a9a0fb5321c240c5f2db7c93baf824c9cefaf361ef7c9 SHA512 ae804865a83bae8443cff1a73b168ffb8aac0c5c4fa6c7a5e142f4f95b4eef34bc7674588fa8797fa35b2685016828bcb137f4102e84ea15089671cf64503d17
+DIST sshtunnel-0.3.1.tar.gz 51392 BLAKE2B 9cf5c0e1f12489e482abf73e74d1a59bdc619b5248265add15744357ef49bf502e013b9d4494efff27e45817e0728f2cee3629f5cf21ba9849f564e84ac9c4a9 SHA512 5c24243cae959cf38f2cdcad4351950ca3abd1c6d289829b6603cd8e93b8d61480c4c7b3607bb38615854825c0bf08890c2362f79104c8bae7f9bf8e0931aa85
 EBUILD sshtunnel-0.1.4-r2.ebuild 517 BLAKE2B 3d24f8164a062e965819996c9468a17a7952850d9bafc47413a785ffa6e24e1564df8df41b71c135080293cd1bee46fc9f2e30caac06030644a495f6798eaccf SHA512 0a5c5fe99ef5f29534ec7bab70403db6aa26811dd6caabe8894b954d6b3b732294004a6e70703e160a3300f13795158acf479d53580584153205f2613f06e05a
-EBUILD sshtunnel-0.1.5.ebuild 559 BLAKE2B 133acbaba8fcc00863909fd91acc12d5bbed9ebd896b4d865d005a678428ed513619aeceb968f0c9f4f72b9446f479c38dd69ca9f0ad1dfeb029600d69449ab6 SHA512 1d6397eaba1c1e4d856ff3546d8968986c7a1e96d8a8aff015fc31263e8e53754f0a6f5ad7e0de06621f480ae9187cfeee99b15e1d1cca0f1b6c057ebfb11b27
-MISC metadata.xml 277 BLAKE2B f1f50c34f6cd6f4e01a299e2fd72bd63dcb98f1aa4c61bf2325e26b4eac35add9f8de3303ad4cb80418729c098f5341f812148f5fb708605f756adaaec0a2f38 SHA512 1eb2a8563fe03e2174183b9f546541550d2a1689f5e710ce75a6840fed412c5244391584d30986a08624ac9a7ff13170231bb4811cd08faba475f1bbf50cf768
+EBUILD sshtunnel-0.1.5.ebuild 575 BLAKE2B 88504cce4eb31efd83ac11dfaad4b9f9d65674cc3ff64f4bc55fe9f65066344475cc10875e23e3f4a6440f0bf23eaec213e2564df8d465bddc2baeccbdd5be0d SHA512 088e9d360e1a63bc193ed88075585e4573d3a3fa29e8bc189a4bdbfa35f457039a3cc6946d4b03fcdeffed99eaa02bbfc681e8e06ebbea2dd8239a120a4046b0
+EBUILD sshtunnel-0.3.1.ebuild 482 BLAKE2B 554d6e677c4758cebfd7cb7997fcad3349084bd3ab7c99165d95269df16f426d4b8f3fdb86d8575e00b727fb2d232dfe619a3f7a6f4234b03bac04a7c3e78776 SHA512 6ccf2379f98311a068ae6ecf79687d03a829c1bb079165f345e09bd4f2f1112a927e92ad30d9736d39a700e947d087bccd44f221c0e219cd436953a6519c63b4
+MISC metadata.xml 349 BLAKE2B 422416914a00373444093cebf9339589395c3b1ae1ccd8ebe3534dc21552f07e14c0738dab0145198dd9adbd955e3926e4a461be7cc91f2dd24a1cb77e2e2eee SHA512 1d105dc7cf4b6ef94f9ad7d1833cbd1e94fdb8bf390203b2fa7655f8b5a351701fd1c4357944c64d07335d6f5f120b6551a399868d8c3ff613463e5eb20c516b
diff --git a/dev-python/sshtunnel/metadata.xml b/dev-python/sshtunnel/metadata.xml
index 85354d2bff69..ad45e659878f 100644
--- a/dev-python/sshtunnel/metadata.xml
+++ b/dev-python/sshtunnel/metadata.xml
@@ -6,4 +6,7 @@
 		<name>Aaron W. Swenson</name>
 	</maintainer>
 	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">sshtunnel</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/sshtunnel/sshtunnel-0.1.5.ebuild b/dev-python/sshtunnel/sshtunnel-0.1.5.ebuild
index b20a6d1ad096..91a4abe26bd4 100644
--- a/dev-python/sshtunnel/sshtunnel-0.1.5.ebuild
+++ b/dev-python/sshtunnel/sshtunnel-0.1.5.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Pure Python SSH tunnels"
 HOMEPAGE="https://pypi.python.org/pypi/sshtunnel"
 SRC_URI="mirror://pypi/s/sshtunnel/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm x86"
 LICENSE="MIT"
 SLOT="0"
 
@@ -23,4 +23,6 @@ DEPEND="${RDEPEND}
 	test? ( dev-python/tox[${PYTHON_USEDEP}] )
 "
 
+RESTRICT="test"
+
 distutils_enable_tests setup.py
diff --git a/dev-python/sshtunnel/sshtunnel-0.3.1.ebuild b/dev-python/sshtunnel/sshtunnel-0.3.1.ebuild
new file mode 100644
index 000000000000..2f97b87074f3
--- /dev/null
+++ b/dev-python/sshtunnel/sshtunnel-0.3.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Pure Python SSH tunnels"
+HOMEPAGE="https://pypi.org/project/sshtunnel/"
+SRC_URI="mirror://pypi/s/sshtunnel/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~x86"
+LICENSE="MIT"
+SLOT="0"
+
+IUSE=""
+
+RDEPEND="dev-python/paramiko[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+RESTRICT="test"
diff --git a/dev-python/stapler/Manifest b/dev-python/stapler/Manifest
index 79b8b19a6135..0d1c895458f3 100644
--- a/dev-python/stapler/Manifest
+++ b/dev-python/stapler/Manifest
@@ -1,3 +1,3 @@
 DIST stapler-1.0.0_p20200531.tar.gz 42840 BLAKE2B bfa909e25dfd65101321e153f5129d28bbb360845d6a3622c53ec3921610b9987a8e5c85c4428ee1cd196c0ee42b5a2eefdca7c4a75be223867fad4d830b148a SHA512 7c5f76240f1dff67eae3eb25d29087c7bbff3aace65030d10836f60769798d653b30acb6cc89355ba1eb590dbfc3236cb4ae95c02db6e779ad474781a17bdbc8
 EBUILD stapler-1.0.0_p20200531.ebuild 606 BLAKE2B 323c450ad813d07ef1e6b67867c580a854b5a98aaa819e4fa047b9c279d953056f28b8cbd9988917616c42751db655f854ac4f62c9f15bc7606c7d80968026ea SHA512 e6891026fd112aec7abb55c201ca4dc332296b590385ca97723f920128ff29046babadd72f08cc668eee946bdbc429ebf44eab13002e96e779b907450d44172e
-MISC metadata.xml 328 BLAKE2B 85e8c0f4dd5314d0b9b6dcfe96a62f233c937b30273d23f9a7d5976b19f5ead7ef3bedc07238f6908a0c85c48c22b888fd1653add6ef531dae5870b12d4da67d SHA512 c61db6a371b40fdcaa42ad1f5fffeb13ca0dbd5c0a0ae3e6675d9fca013559ea37580b757532ec733fff62ee05cee1cb64b7874e0b1095a910a0869d93b2bd57
+MISC metadata.xml 373 BLAKE2B a86fe12fa7be536472c580392f7e047d5d64c9ec8596f9a5dac87884808765c49e4047e27d76862cf94247dcace9c9233429d8896d74d9685fca22f6efe27aa0 SHA512 771f24c10c052850d7ef3c8f890febe683878266afd425389b8e3f81623bd5660b1a4f17a063f51edbdb61d31d80d9f6c28365af9cb01e9530454847af2a0241
diff --git a/dev-python/stapler/metadata.xml b/dev-python/stapler/metadata.xml
index 49cb5cf0b5a9..a9cb07912d62 100644
--- a/dev-python/stapler/metadata.xml
+++ b/dev-python/stapler/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">hellerbarde/stapler</remote-id>
+		<remote-id type="pypi">stapler</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/stevedore/Manifest b/dev-python/stevedore/Manifest
index b921bc2369fd..22bec9778f26 100644
--- a/dev-python/stevedore/Manifest
+++ b/dev-python/stevedore/Manifest
@@ -1,3 +1,5 @@
 DIST stevedore-3.2.2.tar.gz 512174 BLAKE2B 60061f04cee8b4ab1c95ab7c02083abd15a623970168df379c82860bb2ea9b27171f5862851eb194c88001b02878eacab4428a76cbfbe528e7246b3e492abfe1 SHA512 1c3f81157b16af800c1caa971f063c50638a70eced582dbcffafaf7d9bbd4e402f75003fcd73b3cb85940bbe9027bac24e37754ffcacffb06d133e938e07ebcf
+DIST stevedore-3.3.0.tar.gz 513293 BLAKE2B c1eee40a451fd6cad033a618a15cb62e65dc4ead8d2dd9eced4278cd11b1daf0f6fefdba2f2fa8dc1a63b6c525b1a3cbb87c8db12945e7412ed76318ee42592b SHA512 4fdd13c08517aef69700566fc04fb26a29b5a72f73a476d656d134b0d99229a8cf0012d9f1ae4565ffab6fa30e745a013d96da8eff00f8316ae1b5010e4cfbb3
 EBUILD stevedore-3.2.2.ebuild 1119 BLAKE2B a542b4e9dba2e54def5cb10ad288ab2c77ba602c52d455ee7ad1435660423df4b81c0d8ef3663a07a6ee0e99fa9509566f61ddbb4046888d67a676046c3cca3f SHA512 9d2cf7d8898db0692176b1b7e6813ee3d9831510156931acca77901ad5743579cdc52c3c4e97c7d3c662b33e4a3f1076ba4f4655d06ed16370ea6c3a46864833
+EBUILD stevedore-3.3.0.ebuild 1091 BLAKE2B 856270458128189581884685eb74cdbc6f0c7aaa29d112f8faa81bf089ccbd3f2e52de3fa721dade6ef865a947a59a810ef9c88db67497bf9931455605c44480 SHA512 5314cefbe430e37afb01bc38e174c813b54dc99bfe6e04562048604e4b1661c43c3443a54ccb77d3d11256154fc57aaca525b3a139db45075944a374bc6b7c48
 MISC metadata.xml 521 BLAKE2B 6ac47530dc97a775a197bee97ee62ef419c402a134cb6785ba953a9efdd94bf0c4a79f01dbb7142774e9be25087334efbed7ad1f00b68544cdff9de8807078e5 SHA512 549144ae7c90fffb566c473e7301e3a461b47911cf7d2b1c03b5d0a39b1508f3462365e0ab27f5638d08c677556c8d2348a33b5fa018c68a5c64b2965a545fd2
diff --git a/dev-python/stevedore/stevedore-3.3.0.ebuild b/dev-python/stevedore/stevedore-3.3.0.ebuild
new file mode 100644
index 000000000000..794147a53879
--- /dev/null
+++ b/dev-python/stevedore/stevedore-3.3.0.ebuild
@@ -0,0 +1,42 @@
+# 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="Manage dynamic plugins for Python applications"
+HOMEPAGE="https://github.com/openstack/stevedore https://pypi.org/project/stevedore/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-1.7.0[${PYTHON_USEDEP}]
+	' python3_{6,7})
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	test? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+distutils_enable_sphinx 'doc/source' \
+	'>=dev-python/openstackdocstheme-1.18.1' \
+	'>=dev-python/reno-2.5.0' \
+	'>=dev-python/sphinx-2.0.0'
+
+python_prepare_all() {
+	# Delete spurious data in requirements.txt
+	sed -e '/^pbr/d' -i requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/subunit/Manifest b/dev-python/subunit/Manifest
index acb8c4d8f6dd..d9fed030f95e 100644
--- a/dev-python/subunit/Manifest
+++ b/dev-python/subunit/Manifest
@@ -1,3 +1,4 @@
+AUX subunit-1.4.0-werror.patch 1307 BLAKE2B e714e82827c0c30b514ea9f43dfcff1702bd93b9e4f1e5c44029a84deb3de8c84a351baec097b545dc00ac7f0d56f85b917a53c23d501a8b93c35632d43c14d1 SHA512 444b4d2755b395f904dd341992cd2d7df60924b4111e552b6a61b6c6113397b3b6e4dd12b2bab7d408a306b3037e361217c7cda5473d94ca746ceab4e1136cbd
 DIST subunit-1.4.0.tar.gz 488022 BLAKE2B 4c3a714d02eeed9420074c4e032778a69b716a5cad0079193533e9bc8c0f4576d70b165eb413203ce8a916ac28466e9f5a113d4a7746019d7d09409df9860bae SHA512 5d2e3cb96c09067ef4595c86648f13330c810b19e39c0b35bc9546c57bee957ddcf5cad7b8e3f92bda9b54dcdbf175863e2f6ba94020f880230459be7afdbbcf
-EBUILD subunit-1.4.0.ebuild 2393 BLAKE2B 63ab420a93aca76d9d7c92a6f3fd50ced3267a6bbe076688e904220a6e9102de3138944faa63cdad2bbbf441233659e1076003d0c55812e8a9c9ea276849f106 SHA512 990b8897a6bd8b3af9f101bbd23677bf18e265e2089e793d2c188a5632abfea4e59f5dc10341800b7e01fd1701829f4aabe19c7282bddfebb60253704f41cbd4
-MISC metadata.xml 422 BLAKE2B 7835651c50d6d889887dc834dcc5a387cfea9c61867570b6c98790a1c7ea49c01a75868f6bec4f31ffc46a38dba51eb2c4ff0b6da8f8acfe6059e11e3db7f727 SHA512 dcac9ba5ff93016141b433c16b9d1a526ec2babd39721d75a6edd235eb6388500ea8228b6c8c88eacbb12c732c36883c0b698f7039aca7909890fe16cb895cb8
+EBUILD subunit-1.4.0.ebuild 2471 BLAKE2B f9e767d024616ca8d504871903e1fabdb78e92cc126eeb9c0cacdf373fcb1ddcbfc147addab091960634cd28214ba8822bcad6aea176a717f06165106f0ea7fc SHA512 39b9330002f0d79a68519f6e4178b5085f12034659c8384d3b27b1d1ee081be72360098c6da60aa83845075dea805afef10a9080d6fd3aee98c9845cfcf10328
+MISC metadata.xml 474 BLAKE2B c6e5e74bfae996deae0adce7fbdd4262c55c67389b62e549cccca2d42a464bed2dd9d711585ca391cd30ef1f76da30beafa5a8d54ad8f79b539106265757c039 SHA512 d2041aecf3846526bdad951d31ca5d9014efb7cc711f5cb974cbaee3f87e9c705ff8ac6bf02433685d19a57ad7930ee1a25267fffe8db54341e0ca8812fc7008
diff --git a/dev-python/subunit/files/subunit-1.4.0-werror.patch b/dev-python/subunit/files/subunit-1.4.0-werror.patch
new file mode 100644
index 000000000000..e64f74a655ef
--- /dev/null
+++ b/dev-python/subunit/files/subunit-1.4.0-werror.patch
@@ -0,0 +1,34 @@
+# https://bugs.gentoo.org/744313
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -4,11 +4,11 @@
+ m4_define([SUBUNIT_VERSION],
+ m4_defn([SUBUNIT_MAJOR_VERSION]).m4_defn([SUBUNIT_MINOR_VERSION]).m4_defn([SUBUNIT_MICRO_VERSION]))
+ AC_PREREQ([2.59])
+ AC_INIT([subunit], [SUBUNIT_VERSION], [subunit-dev@lists.launchpad.net])
+ AC_CONFIG_SRCDIR([c/lib/child.c])
+-AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
++AM_INIT_AUTOMAKE([-Wall foreign subdir-objects])
+ AC_CONFIG_MACRO_DIR([m4])
+ [SUBUNIT_MAJOR_VERSION]=SUBUNIT_MAJOR_VERSION
+ [SUBUNIT_MINOR_VERSION]=SUBUNIT_MINOR_VERSION
+ [SUBUNIT_MICRO_VERSION]=SUBUNIT_MICRO_VERSION
+ [SUBUNIT_VERSION]=SUBUNIT_VERSION
+@@ -26,14 +26,14 @@
+ AC_PROG_LIBTOOL
+ AM_PATH_PYTHON
+ 
+ AS_IF([test "$GCC" = "yes"],
+       [
+-  SUBUNIT_CFLAGS="-Wall -Werror -Wextra -Wstrict-prototypes "
++  SUBUNIT_CFLAGS="-Wall -Wextra -Wstrict-prototypes "
+   SUBUNIT_CFLAGS="$SUBUNIT_CFLAGS -Wmissing-prototypes -Wwrite-strings "
+   SUBUNIT_CFLAGS="$SUBUNIT_CFLAGS -Wno-variadic-macros "
+-  SUBUNIT_CXXFLAGS="-Wall -Werror -Wextra -Wwrite-strings -Wno-variadic-macros"
++  SUBUNIT_CXXFLAGS="-Wall -Wextra -Wwrite-strings -Wno-variadic-macros"
+       ])
+ 
+ AM_CFLAGS="$SUBUNIT_CFLAGS -I\$(top_srcdir)/c/include"
+ AM_CXXFLAGS="$SUBUNIT_CXXFLAGS -I\$(top_srcdir)/c/include"
+ AC_SUBST(AM_CFLAGS)
diff --git a/dev-python/subunit/metadata.xml b/dev-python/subunit/metadata.xml
index e42cdff158cf..7bea5be9594d 100644
--- a/dev-python/subunit/metadata.xml
+++ b/dev-python/subunit/metadata.xml
@@ -11,5 +11,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">subunit</remote-id>
+		<remote-id type="pypi">python-subunit</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/subunit/subunit-1.4.0.ebuild b/dev-python/subunit/subunit-1.4.0.ebuild
index 0719cf5c65f3..9962579f395e 100644
--- a/dev-python/subunit/subunit-1.4.0.ebuild
+++ b/dev-python/subunit/subunit-1.4.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
-inherit distutils-r1 multilib-minimal
+inherit distutils-r1 multilib-minimal autotools
 
 DESCRIPTION="A streaming protocol for test results"
 HOMEPAGE="https://launchpad.net/subunit https://pypi.org/project/python-subunit/"
@@ -34,6 +34,10 @@ DEPEND="
 		dev-python/testscenarios[${PYTHON_USEDEP}]
 	)"
 
+PATCHES=(
+	"${FILESDIR}/subunit-1.4.0-werror.patch"
+)
+
 src_prepare() {
 	sed -i -e 's/os.chdir(os.path.dirname(__file__))//' setup.py || die
 
@@ -45,6 +49,7 @@ src_prepare() {
 		python/subunit/tests/test_subunit_tags.py || die
 
 	distutils-r1_src_prepare
+	eautoreconf
 	multilib_copy_sources
 }
 
diff --git a/dev-python/subvertpy/Manifest b/dev-python/subvertpy/Manifest
index 4ba69b1ddbee..822e785dadb0 100644
--- a/dev-python/subvertpy/Manifest
+++ b/dev-python/subvertpy/Manifest
@@ -1,3 +1,3 @@
 DIST subvertpy-0.10.1.tar.gz 116661 BLAKE2B 81fdc21352f168c1a8d31398be21ad83ed72adc824dbbca7764fb1836cba4a7d7f03e4a96636ab29f4804682658ce834eea3fd433b5f161e61a702dfc6790e22 SHA512 083174ca6516541c48474673e6d601ff3098f19d204f311101f4de81bcd70d73bdb1e73dffe43fc584f35d286020cab1381dc1c44b514442735a139d2a9cd356
-EBUILD subvertpy-0.10.1.ebuild 690 BLAKE2B 2ac7ed4b2037f94d1707b8c88ecda5e9e85fac03f7969438a39413f474cd9575c07761ca42b392c4b7242ece993fd482e7992c831e42ae2423defcf9cc09ab8f SHA512 16dfb991e677b52482df45379eda103e660ff5fbcb552119eb90c219631f48db4db4d0cd449965b9f40edbae3d29d653802bcce8f7a5a926b88958e1214a750a
-MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
+EBUILD subvertpy-0.10.1.ebuild 694 BLAKE2B 821d95b702daadee91a3a6a53e8b9609c417bddf88dc3df650efcc6d8a68849387a132e2a9bbc54f5ec61f4d3e761c5b6a927a8fdf2afd55d1ac316117c6abef SHA512 e540ca52fbc8a4ecd1c939012e957674cc4fe1e968d523ab15cec54ba81069aee7dd27e3b61234a08916621a815aab34511ffd3e5fc5c8d91717f1c61a6df105
+MISC metadata.xml 312 BLAKE2B 21307c71cb581a128740d40d87dcf39f634d8279827a07c1081f1c967b0388665dcdad19023569f60ccb05836962ba29b7901d1563278489ab8efb1a34c0f7f8 SHA512 af22d85952aef12b031553cbbe95e09eb771934b355f9c16a31fea77efb1bc77b3f5b183fe9fd6d6cb913e3f08421031aa185dff7df5c1fb5112c77d6b3dcb51
diff --git a/dev-python/subvertpy/metadata.xml b/dev-python/subvertpy/metadata.xml
index 7f4f33c6dbc9..fce1bcc9def2 100644
--- a/dev-python/subvertpy/metadata.xml
+++ b/dev-python/subvertpy/metadata.xml
@@ -5,4 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">subvertpy</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/subvertpy/subvertpy-0.10.1.ebuild b/dev-python/subvertpy/subvertpy-0.10.1.ebuild
index f5e3b86695a8..ee01baf4ded1 100644
--- a/dev-python/subvertpy/subvertpy-0.10.1.ebuild
+++ b/dev-python/subvertpy/subvertpy-0.10.1.ebuild
@@ -9,7 +9,9 @@ PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Alternative Python bindings for Subversion"
-HOMEPAGE="https://jelmer.uk/code/subvertpy/ https://pypi.org/project/subvertpy"
+HOMEPAGE="
+	https://jelmer.uk/code/subvertpy/
+	https://pypi.org/project/subvertpy/"
 SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( LGPL-2.1 LGPL-3 )"
diff --git a/dev-python/svgwrite/Manifest b/dev-python/svgwrite/Manifest
index dfe60196995c..7ad3106db861 100644
--- a/dev-python/svgwrite/Manifest
+++ b/dev-python/svgwrite/Manifest
@@ -1,3 +1,3 @@
 DIST svgwrite-1.4.tar.gz 251138 BLAKE2B b105fa60ed75628c59b3ad4d0ea32dddf83f618e213ce6974b5db0e93d519e563eb5a9ff5e37012f71c7ce79579ca927acfb8709d2f8e8ad316b04bae8abafcb SHA512 b722fc51c6b3755064942bb6c7ea199ba5902ee37e426962ed24e0b67659e72e8da36cd2516193e2348a939ab2ccd2c5114349ac72d7b9ea52a7b7d68ad1ce74
 EBUILD svgwrite-1.4.ebuild 571 BLAKE2B 65961e96d7f5a69231ff90e45d6406f127f5b3283fb897941fbcd5f8d504e997dbf813993a52157e9c76144987f54a5b5aec5f90eefc40c19e799aa98ae8be30 SHA512 98b0aed58c6a7fc981b422ec0a2f796e612512975a0229f353e2639625e4df5f69d36a3bc79157d08b65ec77805690d85b10b6391ff92218ea878be64077b22d
-MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
+MISC metadata.xml 311 BLAKE2B 1a82ac1e90fb76a6a251daf9be2608d70700e85af85bfc00ec3932057af468d6a40c25163fc4b45c59e94ca225375dd5d24733ab2046cdf775f9d59eca2d42c9 SHA512 31e3661085c3155ce8f9ca6641429fa9dff06d5a640dc90c99c953e1b0cd7bd1093e3e7c9af9757d492af64240860454491c452f829805e5d02130e967b488ad
diff --git a/dev-python/svgwrite/metadata.xml b/dev-python/svgwrite/metadata.xml
index 7f4f33c6dbc9..833a9c5c9c84 100644
--- a/dev-python/svgwrite/metadata.xml
+++ b/dev-python/svgwrite/metadata.xml
@@ -5,4 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">svgwrite</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/swagger-spec-validator/Manifest b/dev-python/swagger-spec-validator/Manifest
index 8acd11323068..3841b2956cd7 100644
--- a/dev-python/swagger-spec-validator/Manifest
+++ b/dev-python/swagger-spec-validator/Manifest
@@ -1,3 +1,3 @@
 DIST swagger-spec-validator-2.5.0.tar.gz 20803 BLAKE2B c7e0dac221aff9bef1e91560a8e6311827c7bb821aa0fa76c92c230f18e7b9e53ba1e971b5c309a017c32a4b3e57d06a32ef137e37b15cc7ca5b38cc633ec754 SHA512 31d5df7e29418ede25eb6efa78b26d67bbfd8fe0a5b25dafcc11a4afad89d496138930f06987570a3f57d6712dd8b893050f0ae38b9b3bb142cd65c192bd8930
 EBUILD swagger-spec-validator-2.5.0.ebuild 706 BLAKE2B 31a8381a8d87f721cbc3a0c8b538ea17524d0eb26735153754bf7ae65ea1848cb3f22bc0acb44ab402f354b851284646de5db18f69283f01a91533e79e7a1a51 SHA512 8c9c01629dfacc8f6c3487894db2b6a826c5705245b45804c5fdb557f21116370a92595f3efe1c62650ceb2cdbe3673d2e8fd02cb39bbeb6de627713f5021757
-MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
+MISC metadata.xml 333 BLAKE2B ea0f480b1da972e004dc52bf11be19e79b6a8897d80fc663d1bc2ae1d4fbb570a2102fe74c7d551efdc8a5e01cd47ce3278aeeea6e7f4faa17f0744aecfeeb17 SHA512 e2215c329a1e077e63bbfc60b33d9be1ae7e6fb3eac5f29ae1d72c9c99a653552bfde2f8d5c39915fef9ca2e1473ceeb5c7f96d670a9ab04df6884bf1560b701
diff --git a/dev-python/swagger-spec-validator/metadata.xml b/dev-python/swagger-spec-validator/metadata.xml
index c36c37139fad..39003aa1d43a 100644
--- a/dev-python/swagger-spec-validator/metadata.xml
+++ b/dev-python/swagger-spec-validator/metadata.xml
@@ -5,4 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">swagger-spec-validator</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/sybil/Manifest b/dev-python/sybil/Manifest
index a7b74a3e9869..8462e04056c0 100644
--- a/dev-python/sybil/Manifest
+++ b/dev-python/sybil/Manifest
@@ -1,5 +1,7 @@
 DIST sybil-1.4.0.tar.gz 30062 BLAKE2B 86a01b4c8c10512f3e2b067f4d1007e60ba46f23f22ad80ff7a30a4503db06fd91d841b33bc54f0f7acbd2539e595f8b0201f9a8e8ccb7577f8e9f422562e02d SHA512 f385b4e67cc5a4b32c7563d98f36dab6e5320966563eb341395e9327c16f92a63863558bfa795b6531819fa6038234492d4d19c1d9286e6306039e8d4abec0b8
 DIST sybil-2.0.0.tar.gz 29217 BLAKE2B 90c60ef39a21f3d8a16d4bd29b158e8fa9f687b0f40c520105bb02c8f4ee131b4a131a5612a7edcd55936d415ab76994013a2098670bdd502988616fd81b8f16 SHA512 e260d55da9d502a38f527f4b460dd76bfe22029a73eb02006e16d61f3b2b445a82b154d6067cb1d2a2dc9785dae5af1c187534a37d890201cb04902c6e8fdf63
+DIST sybil-2.0.1.tar.gz 29316 BLAKE2B cf03bc1595efab535d1248b9d267dcd01547f02539977c12b8753e70d13ea0744a6ab76dc1e44fd1c46d192577aa4c1a9b5d5d52678928acfd63937358fa3e33 SHA512 4f3be7686c1acf6812623a756fa79b41e3fbe5d4c3b4c7cf5dfe39fbe56806b4ef3acd24e25968ab9119b2c65ad5c30eabe32f1a93fb62ba8d3893ef123e69f0
 EBUILD sybil-1.4.0.ebuild 545 BLAKE2B 99371afa7bccd3c5805f12f9cd3d7498aec39eb1d2aba71f20b5e3b491dfe87e5f5f463f0f91b996cfc201ea403a84d59eae66b057dc6bc9fd730fb3a9c5576d SHA512 1c0e2fe206f4dab382dd83e96d076201ab780b3a927b000e3d817e17f5f76e86a29676eee400d7a0eecf47efe263f76ad1765d64855591ac7f714c0d8263aae6
 EBUILD sybil-2.0.0.ebuild 412 BLAKE2B 5dff4ce186671c906fe921aef28819ec063991b234eea449c78da39d47c560526fbe8be61e91f99f9c84e42826d6fee194e1b7b15c9835d53df8bfe18dc3c9a5 SHA512 417f595cc8d682eb0cd4a095a8157ee54c6ce0bbb987f03d00764567378033bea93f9f9150421d9407ee66a11a28ae0fe18d14aa3174bd2f55e0f1fec3426c97
+EBUILD sybil-2.0.1.ebuild 412 BLAKE2B 5dff4ce186671c906fe921aef28819ec063991b234eea449c78da39d47c560526fbe8be61e91f99f9c84e42826d6fee194e1b7b15c9835d53df8bfe18dc3c9a5 SHA512 417f595cc8d682eb0cd4a095a8157ee54c6ce0bbb987f03d00764567378033bea93f9f9150421d9407ee66a11a28ae0fe18d14aa3174bd2f55e0f1fec3426c97
 MISC metadata.xml 397 BLAKE2B 6a49550b305c35a6fbb679f8b33a359e96067c3980fccb5bb4f46837f125f84d7c590cdff0b7e9edd08d27ae406ec2e12a00db9e5c266d83f764c213579b3b9e SHA512 85ed69ab5207b47db4b65e7a199639a5368cfc9ea03365ed62bf00c7447e5aaadee89b9827a1bbc93d035732b757a132e6e2992163ada0c2050be0983f3bc883
diff --git a/dev-python/sybil/sybil-2.0.1.ebuild b/dev-python/sybil/sybil-2.0.1.ebuild
new file mode 100644
index 000000000000..a315bc46b63b
--- /dev/null
+++ b/dev-python/sybil/sybil-2.0.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 2019-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="Automated testing for the examples in your documentation"
+HOMEPAGE="https://github.com/cjw296/sybil"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/symengine/Manifest b/dev-python/symengine/Manifest
index 4878061ddc4c..0f2fc65be58e 100644
--- a/dev-python/symengine/Manifest
+++ b/dev-python/symengine/Manifest
@@ -1,3 +1,3 @@
 DIST symengine.py-0.6.1.tar.gz 112123 BLAKE2B 3b55ddd834c7401a5a211e5e20bafbea68b172738c6388e72b1e6a6e62719e19f28356fb6156caa6cfbad59d051de45c0e103a89d675e3453136cc85e638f327 SHA512 09f452757e3c99dc9d896a322a07d58f57af6d57a9eaa615b9f4f3d834cfc91f6a79de955a36ad94bc30c962365272ef0afe401570583af49c015295ccd7c4ed
 EBUILD symengine-0.6.1-r1.ebuild 1174 BLAKE2B 5cd488162dda470b81f5f2600dc751969fb63ab1da2ecff9b71e91f2e854a255bbe0cad04173e3a50f75c2a2576c0e4154229821095b28ad0d8ea952c955ab14 SHA512 063be7cac53f6aa39516dfac4f028962f27d487942c0e9e1c135f8e275ab2365a57eef4a3f04dcfd110216f345c59ea2551a2f59d453a984c0e1dbfc9b3813b3
-MISC metadata.xml 366 BLAKE2B bbf2f9c38d569a0575af808f60add4a61f2065fbc28d9bdd44fbc85a7e24fe63a4cd3d7f3abbc4b68cca8007d9cb742cce1249a6d0f8c9eef8f9446f29dd2121 SHA512 a7ee1b2afe1c934cd83e57e0a1b09d53e73b5a060f342f020ae4785c08808da9762a58f08c04020bb4c61f9d5d925dc7f212afc16d7412ee52a0188b3adfeafd
+MISC metadata.xml 403 BLAKE2B e8b8f7b50836a7774a3f6326785fdafe1ca7e52086b163deaf97a76be9440858b56a88aaed86f05db71794e2b5999731205da73250f49e093935bd69346afb3a SHA512 5fa64eb4fc76db979dc3bfec18c47db689dd326ec682a0141aa001843b267cbe479c43acd9a0ef9d5725baab11b16873d9c2b85fd50e8527af2022e81da2f8e0
diff --git a/dev-python/symengine/metadata.xml b/dev-python/symengine/metadata.xml
index 202e3195339e..7a85ec6adad9 100644
--- a/dev-python/symengine/metadata.xml
+++ b/dev-python/symengine/metadata.xml
@@ -1,11 +1,12 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>sci-mathematics@gentoo.org</email>
-    <name>Gentoo Mathematics Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">symengine/symengine.py</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>sci-mathematics@gentoo.org</email>
+		<name>Gentoo Mathematics Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">symengine/symengine.py</remote-id>
+		<remote-id type="pypi">symengine</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/sympy/Manifest b/dev-python/sympy/Manifest
index 17c6f5ff7f00..fad242e301e6 100644
--- a/dev-python/sympy/Manifest
+++ b/dev-python/sympy/Manifest
@@ -1,5 +1,7 @@
 DIST sympy-1.6.2.tar.gz 6811705 BLAKE2B 4cd894d28bedc986acc8ef67aa60f82e0899c2ed028658a8f340d7538b890e0ed380b3614a464eb58d71873b29b0795508b4556bb8115bf0c108336ef1e4cca3 SHA512 e16a1d85aba438e4248bac48a163ea1827e2cee57c28f7670ed19cc69d4c08d6796d62f79d245e269d75765b8f7ff4f4ca2841f98534e136ceeb5d3f7a5d252a
-DIST sympy-1.7rc1.tar.gz 6969788 BLAKE2B d7429aa6fde9943926cc14d77fe71e94b50e2329e56854d6e59ab6d2a09f659458d6baf18f36ed0b33e5add5fb0e38064730e4603e86f8edb8106683ff8063ab SHA512 7ffa8254ceeb0cd68c03503aa7ac662f2f8fe07aec0d3e6dc0afdca4e14b674e6b9db2feea79f272b9fae398d7c9edf49ac235526b5949262ca6ea8e412b9029
+DIST sympy-1.7.1.tar.gz 6974183 BLAKE2B 4bd8c9d60c46b05a7fc6c622667858fe17d25798756dbe967ce19abc8047263fe540f332e39418e877852c0565270377bd01fea7e65aa35ed4e03079bc130805 SHA512 eb9387bb9c632203af650279f896427556725b7496c00d8dfe97b7476beedbbee5714659f7fb44b4fa986c9567cdcaefcc19401d63e1ca0e9a6c7317855440ea
+DIST sympy-1.7.tar.gz 6969594 BLAKE2B c4ebd395e50f589dba2d01bf50a1a9cd7fb34e95e2b8632a64df5fe1a6625889c4e161b8a22aa815857cc3eb0d502f03ec8d9de694f369aaca7e573a2fab03ee SHA512 f7bdaff7432436dc888e56d4b56d023c8da5cfb54dfa6955cf7999acceedfd5175f910fb9b3c5776145f3dc3036f78e66813cdba4201be854dfa2c5c9f4e9f4d
 EBUILD sympy-1.6.2.ebuild 1780 BLAKE2B 404531e83f627b752b63d45ac3c818ea89e14a87fb29da361b194f4049702bb5d769acbc7328c71f16996effe2acdb02dfb21196a30537b95ce56b3200f89097 SHA512 6b74c0a2deddd0f1e37a03e1476ab6a7e23e293aea223dbe7c24590260fec01853ee24e2e539f618f2dd48274df4ec3265a4f9f147c46cea34837a83e29adadb
-EBUILD sympy-1.7_rc1.ebuild 1815 BLAKE2B d641ffbf5d73b8598b69469e461a27f82f363eb49fac2edfa5884c261310ce76bfd4ed7b29855224762daa53ab411815ade4956e0fbdecfe3a039eb1d245af52 SHA512 6d26e5dd15f23f63f7088bfb2c663c4cb8a802a9a5fa6fcfdf8a7817a01a956368bbedd64b54c6fe34ce26dc19d41d1607becd6f9c98fc15720338fe47dc1c40
+EBUILD sympy-1.7.1.ebuild 1812 BLAKE2B b8cace9a744fed3be5f8eb414f61468bd5a8271043c373db95b10318f503315c3c5f188fca60cad495612330977d34c812abe59b7fe88415a51f37948cbd3f6e SHA512 96788670d5ce9dbbf44bad6c6238aa62e88a044fc2625ab4042cbed25891894d12d1e48fa871649046a0bda6a858bdf82e6162917197143bec7e63ee8f1f3bc6
+EBUILD sympy-1.7.ebuild 1807 BLAKE2B 89063c9f31803b814ef1470aff98e39095bf1e10e35fd6986d0d5b575a2c08424267a94f69c4f61c29d1f3a82f858176fbac92c99396e33f823ae46769304c2d SHA512 18856cb7c3288064d426cabf3e20ad9c646f934de1a530a52bf5c4244181dfa2b2680789bdf579106c9b210843a96446c89e1e171e7110b2fcb4a148bb5f908d
 MISC metadata.xml 1607 BLAKE2B cb7e15ad95ed4b47eff7399fe726815cf66ef40bf0af31f31d423aa808bc4f3386756e2a8e98fdf584113d6923edb47a91f39effb08013b5865608e2ca29f3b4 SHA512 198aa6343d446bb348a827b48097055ad709bb6bba22cf9bc3eca9d28fd71d450acad47bfa14fce403dd5d4bbff584bd78407f3859ea4aef918e4768af685c7e
diff --git a/dev-python/sympy/sympy-1.7.1.ebuild b/dev-python/sympy/sympy-1.7.1.ebuild
new file mode 100644
index 000000000000..af43ce9279ec
--- /dev/null
+++ b/dev-python/sympy/sympy-1.7.1.ebuild
@@ -0,0 +1,66 @@
+# 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_{7..9} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Computer Algebra System in pure Python"
+HOMEPAGE="https://www.sympy.org/"
+SRC_URI="https://github.com/sympy/sympy/archive/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="examples imaging ipython latex mathml opengl pdf png pyglet symengine test texmacs theano"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+RDEPEND="dev-python/mpmath[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	imaging? ( dev-python/pillow[${PYTHON_USEDEP}] )
+	ipython? ( dev-python/ipython[${PYTHON_USEDEP}] )
+	latex? (
+		virtual/latex-base
+		dev-texlive/texlive-fontsextra
+		png? ( app-text/dvipng )
+		pdf? ( app-text/ghostscript-gpl )
+	)
+	mathml? ( dev-libs/libxml2:2[${PYTHON_USEDEP}] )
+	opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
+	pyglet? ( dev-python/pyglet[${PYTHON_USEDEP}] )
+	symengine? ( dev-python/symengine[${PYTHON_USEDEP}] )
+	texmacs? ( app-office/texmacs )
+	theano? ( dev-python/theano[${PYTHON_USEDEP}] )
+"
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	"${EPYTHON}" setup.py test || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( AUTHORS README.md )
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+
+	if use texmacs; then
+		exeinto /usr/libexec/TeXmacs/bin/
+		doexe data/TeXmacs/bin/tm_sympy
+		insinto /usr/share/TeXmacs/plugins/sympy/
+		doins -r data/TeXmacs/progs
+	fi
+}
diff --git a/dev-python/sympy/sympy-1.7_rc1.ebuild b/dev-python/sympy/sympy-1.7.ebuild
index a6d4c8f25b0e..fd39817141d0 100644
--- a/dev-python/sympy/sympy-1.7_rc1.ebuild
+++ b/dev-python/sympy/sympy-1.7.ebuild
@@ -4,18 +4,18 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1 virtualx
 
 DESCRIPTION="Computer Algebra System in pure Python"
 HOMEPAGE="https://sympy.org"
-SRC_URI="https://github.com/sympy/sympy/archive/${P/_/}.tar.gz"
-S="${WORKDIR}/${PN}-${P/_/}"
+SRC_URI="https://github.com/sympy/sympy/archive/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="BSD"
 SLOT="0"
-#KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="examples imaging ipython latex mathml opengl pdf png pyglet symengine test texmacs theano"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/tabulate/Manifest b/dev-python/tabulate/Manifest
index fee82feb381f..4254c4195ae9 100644
--- a/dev-python/tabulate/Manifest
+++ b/dev-python/tabulate/Manifest
@@ -1,4 +1,4 @@
 AUX tabulate-0.8.6-avoid-pandas-dep.patch 2513 BLAKE2B afbaef53282fa6b775bd3a1a1edeca04cf11f37a86e51ac94641b9037384ca54d808adba9196d057a9007559cd6b7b9ad442e94a8ca1f7f54ac6ef609e72c47d SHA512 7fab4bd5a493c6f6831e88f8e26497b09614f6b04b651c96d5c44639ed03531c14dcee9412970cd2f24e056dc4046a3d3ea708083a14d14ab952921ae7fb7534
 DIST tabulate-0.8.7.tar.gz 40800 BLAKE2B 4e15ef79d152ed6a01fcc88496aed81462e2ac5c5aea1a9977eca955d3c6d743019f8c56a48ef268217cdd7c2780505c4837020ff8cb1bda442304d82e560a5c SHA512 77eb619d3115bbd574ff72b82d55e09f1e2bfe29da0b937b72930b3e65423135722bdc54bed818adf2e25cb49a58f8f85d0ca3b3ed0fcfcfda34a25e54781d0c
 EBUILD tabulate-0.8.7.ebuild 897 BLAKE2B 0b1cb786af5d36b5bb38e0c7e9f62de8443d09c5f631fb9bc27092ccb7d72b824bbff3a72ca8f5eced2b7dca96650cd79d16752753e6655a3e3eca009629c5e8 SHA512 4cef430fb5b07e44bffbe165248efeaf2681d5954cff51632995f1d63eea55ee19261ec9b9ce563fc80211cf1603cf93748cd4220d3e85485d66cd2cee8a7048
-MISC metadata.xml 346 BLAKE2B e13b78a2ccbf8c7ab6c25c7d5074b5ee6edb2f9901047f8ba6658fff33fbbe11deeeaf7915925d7b49c98b082ef395dbc9eba28ac2e06d97ce3aa2a49d9dee2e SHA512 63130f8d0d3e57aa615bcc159df00c6594676eb89fa212a94444836f19682ef466c9df4d75d267f68b4de6c524ff79cab5d65235a515230c09366cb34209946c
+MISC metadata.xml 398 BLAKE2B 3d07c5c3361c606537260a267c25d62b8564c3491a65aa425b418a9a58eb137d23ae7a0902e61b4fda33a5d693e9e1ae7f45d6c1d3eee24b46ad88b817c93868 SHA512 4ddb470a137b30099d06b9577f4dc2d5188185b3ec74393e0b8d3e7a388a20134e91bcc0ff0ddb782c6fbc07b95d72ad43fa5ffabc4a0587d0b94b0faae1dfcf
diff --git a/dev-python/tabulate/metadata.xml b/dev-python/tabulate/metadata.xml
index 76f47821e8e1..ef7c61c96043 100644
--- a/dev-python/tabulate/metadata.xml
+++ b/dev-python/tabulate/metadata.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="pypi">tabulate</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">tabulate</remote-id>
+		<remote-id type="github">astanin/python-tabulate</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/termcolor/Manifest b/dev-python/termcolor/Manifest
index 01d83c3104df..773b479dabd1 100644
--- a/dev-python/termcolor/Manifest
+++ b/dev-python/termcolor/Manifest
@@ -1,3 +1,3 @@
 DIST termcolor-1.1.0.tar.gz 3912 BLAKE2B 8d661a708eff02894b6e390befddaef1c9d14f78f0c7d10ac332fa149f7892109f77bd279c9a488a3aa4070569c92f0ce847e3911d419ff549a10555b34534fb SHA512 4bd06bf4405a9ef6c005cd4d159ef602f7fc7fccb3e57586da1187c402f4d0b9051ef930cae423065c51ff4be8a22ceae556a61a6b3c8c519d623c066c340b53
-EBUILD termcolor-1.1.0-r2.ebuild 509 BLAKE2B 3db78941eca246283dd46b0f29d15689ac81292a678a56c1a9cbdd3eef9ed9c8630e46134bfd53ba63674fa65a534c1bcbeee98342a40a5b8e7d28952adb7742 SHA512 3bf02798961849b74edb57ffe44f09979f51c8823c26b08ce77436685615e32aae0c44a62c66938583f855bc9432f2baafb4e802e5ae636f7909e3c9ac5fee03
-MISC metadata.xml 443 BLAKE2B d66fa2b33b0f2a854f6293896d9f94905112f9b10cb7bf5f7c5e5d5b2e5523a86523ce83078f1f386f5781ce6cd5ab183e6f8241d72c88dd389760a1b126cde5 SHA512 029e70f455d0ccd6aabe54c2b96cb3c0857fac49d23ea28e0885ca30fff829d2de2f93345de7e1fd14b46eb065b278d8b3f7047156b52feedd7a07df2d162864
+EBUILD termcolor-1.1.0-r2.ebuild 514 BLAKE2B 9e9a8aec59cc9f2502dbf1fd235441ab17523c43ecd5ca2ab795ed1b4d72c1c57ca41a67ef4a0449da0ed6808b4c40aaf1e14f17fe0896501068019f14882b5e SHA512 35ec4910e4315bc8e19daf43b0100902543e3294131f758ef3f4c542794f3134a8fb19b72e7c25beb012fa1a80329fd186e30f7063446995b0cceb757606428f
+MISC metadata.xml 468 BLAKE2B 661dac009a69d3e67a38195747df19e59eeeffe99cf88e0f225526a89b75ecce42708106d21e5902b9e091f7cf3e1a0462c4ba4b521e120cae56effa81d95d20 SHA512 b08572c63375e0f15530faa189263c72d6f9f954d33a36a97df6a427cfa05fe74a650be3f34cb4af4409f9b6748adae5db3268116bd47d25b2752391e2612a0a
diff --git a/dev-python/termcolor/metadata.xml b/dev-python/termcolor/metadata.xml
index 16b626921bf6..637e4445e0db 100644
--- a/dev-python/termcolor/metadata.xml
+++ b/dev-python/termcolor/metadata.xml
@@ -9,6 +9,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">termcolor</remote-id>
   </upstream>
diff --git a/dev-python/termcolor/termcolor-1.1.0-r2.ebuild b/dev-python/termcolor/termcolor-1.1.0-r2.ebuild
index 4c24fabb7620..ad3ed45bfa28 100644
--- a/dev-python/termcolor/termcolor-1.1.0-r2.ebuild
+++ b/dev-python/termcolor/termcolor-1.1.0-r2.ebuild
@@ -14,7 +14,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 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 
 # no tests...
 RESTRICT="test"
diff --git a/dev-python/terminaltables/Manifest b/dev-python/terminaltables/Manifest
index 4594dc0f4886..4920edf993fa 100644
--- a/dev-python/terminaltables/Manifest
+++ b/dev-python/terminaltables/Manifest
@@ -1,5 +1,5 @@
 AUX terminaltables-3.1.0-stdout.patch 789 BLAKE2B 2c9f166d4e303cc55bf2d6b9b0e1f9d947cd10a1a173abc5657b9dedfd637da05e374fdc9e997f9e758be9caa90f3a984032eade15e816de594d65268bb013ad SHA512 f6eb3ea11a7027886457dd720b0736fc11611d233b7971456141476a6b1d83fb0be33e14c5789a626da1ca0f0f2ca75983f496bc68660aa66d7f285a3c2be684
 DIST terminaltables-3.1.0.tar.gz 278484 BLAKE2B 733bcfcdc51c5e78e85e8f7fc9db00fa96c1ad48f76a9ec48ed546dc0acd62af90f437de346fe05d4cb09151b33ddea2f62beb21b418d7f76d8a719423a5f694 SHA512 dc49458652fff8bc6094d316d84c9b8e9fca1a26e3230c0b668bc03ec8528793f4ef024e8032d4a56fbfabfdfd4a1142870f550f0b373ba6a42dd2e3ead3f501
-EBUILD terminaltables-3.1.0.ebuild 682 BLAKE2B 18d202e683e4f17730d4c9ac742475c06dac8371cb9c478fb9a5819ad55a11438d03ac4f51cb0178f9f0271e75b78fa50c27454a20445e8f23918a2d9fe59c45 SHA512 8baa778f73775f2d9fbd4cb068d3df76032611934e11966e27e3587e4f7c553fd21f0cbdbba6d0a60311482a3818664e568e8f97ce1480853f1690a5dbde21d5
-EBUILD terminaltables-9999.ebuild 625 BLAKE2B e3c70b88f7209b54be4654fea6ccc21ac574128956a53d42e196bd0c022fb4f668413ffa118fa76c2fd2b0bd3bb1f8c7d142a219395ecef05b90e49b0002b7e3 SHA512 1cb532c3800e6ac07f592509f2c33f0fd7f14b53798c3b4692b4d1753d679dd8f1f840b647c98a24c96fe990fe17723f38daa5e2b9e1b7fdc1814653551ec10a
-MISC metadata.xml 413 BLAKE2B 7aef163d29b857e19732c69ff0a5745d511ba8619a9f44f6ab0ecaf5b046a439b109789855cc1ee13ac99b1b3dbff6ba5432ad4bb8d9644cb4aba43aa9a8abe8 SHA512 44b71c2921a4db4517cd9c2d64021f39988a0767dab2020b2c4b6354da7eeb79d783bcbe197109cffd0fed3bc01ca6a1a1d5a4d8793176792e4ef749e59fe975
+EBUILD terminaltables-3.1.0.ebuild 681 BLAKE2B 683ff60b230ac6552fbe14740e84dd2d0a87c1cf38c41966cab540229a2cfd11fd8eab46aed9291afcee07f00cff3205c6f7da9d3f4837a399b0378089718a8b SHA512 a4a47e8efd5013dfa9f093263207fb58aa64d40ac5e61371621fae874376d30d7576ff95101f2bc158d85d9135a54344add26cd672d9175317277339ccc55f78
+EBUILD terminaltables-9999.ebuild 626 BLAKE2B 3e7d0ee8922dfececcd251a0ae1804cb3264dbf4e2c73d81a28ea22f4f2a9f655ab85b2c372c138ef527e40d2f2e6a2d6515354239531b1bf72a2337e8a67136 SHA512 990e2b866e9cdcce3ad20d9c28aa51a78bccac04116852675ad3ce5ebf14a0852020d5e44a7a7da0addea1382645ea32fc8076f3aedfcb67223c83b58ce6f0f8
+MISC metadata.xml 489 BLAKE2B 546f58767ee4dc9c0645bf046a7b64d5ae3927788d724b066335454301dd5d700238622641fcd5b8283400c768f353c7e7ec2fa0e7f7292b1398c90c7a43b3ca SHA512 bfa8efd23e30ac8c5c1d9d246e6e6f41ba86f5e527886750f17926a0150079d2f6c9552d8a34c022c932c41530be5753279246941710953e86185c3e8336179e
diff --git a/dev-python/terminaltables/metadata.xml b/dev-python/terminaltables/metadata.xml
index 9ffbd4773b9f..8a1353aba591 100644
--- a/dev-python/terminaltables/metadata.xml
+++ b/dev-python/terminaltables/metadata.xml
@@ -8,7 +8,9 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">Robpol86/terminaltables</remote-id>
+		<remote-id type="pypi">terminaltables</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/terminaltables/terminaltables-3.1.0.ebuild b/dev-python/terminaltables/terminaltables-3.1.0.ebuild
index 86d74c67298e..1692c538ddfe 100644
--- a/dev-python/terminaltables/terminaltables-3.1.0.ebuild
+++ b/dev-python/terminaltables/terminaltables-3.1.0.ebuild
@@ -7,14 +7,14 @@ PYTHON_COMPAT=( python3_{6..9} )
 inherit distutils-r1
 
 DESCRIPTION="Generate simple tables in terminals from a nested list of strings"
-HOMEPAGE="https://robpol86.github.io/terminaltables"
+HOMEPAGE="https://robpol86.github.io/terminaltables/"
 SRC_URI="
 	https://github.com/Robpol86/terminaltables/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/terminaltables/terminaltables-9999.ebuild b/dev-python/terminaltables/terminaltables-9999.ebuild
index 7bacaa3fb7cd..7bea72ca0659 100644
--- a/dev-python/terminaltables/terminaltables-9999.ebuild
+++ b/dev-python/terminaltables/terminaltables-9999.ebuild
@@ -8,7 +8,7 @@ EGIT_REPO_URI="https://github.com/Robpol86/${PN}.git"
 inherit distutils-r1 git-r3
 
 DESCRIPTION="Generate simple tables in terminals from a nested list of strings"
-HOMEPAGE="https://robpol86.github.io/terminaltables"
+HOMEPAGE="https://robpol86.github.io/terminaltables/"
 SRC_URI=""
 
 LICENSE="MIT"
diff --git a/dev-python/test_server/Manifest b/dev-python/test_server/Manifest
index e52218739fe7..a49cc6910b53 100644
--- a/dev-python/test_server/Manifest
+++ b/dev-python/test_server/Manifest
@@ -1,3 +1,3 @@
 DIST test_server-0.0.31.tar.gz 18578 BLAKE2B a08c23a7db43f1c99a0cd270852d9ea841e0c0e9888d1d4a95b8879b436f8c016d1d10222127fc8024fe3560340fd65dc629677106a18c7bc01a565c85a6702e SHA512 f245165f6326e63fae6e51ae247cedade41a391c505d9899c00b886df192326aac32f2a479d322de079f77b252cf199746a7ea3e06089cab105646d194d4d775
 EBUILD test_server-0.0.31.ebuild 843 BLAKE2B 14c0b86bb944be6c928c38803be047a7ba7dcf7de2187628990aa4af2026422ca1afa856b57e19a74fe3bb4978ebdf0b67421f0fda62ca7ce2edb651a5d98de3 SHA512 0f2b36177225b3979245d1836a674092b9d2fdebeda1462aa9e7ec748b813a78a3a2d1ff937826f5e3bafd4cdcacb48fa9a442e9ad82a0bdbb711feca2b379d0
-MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
+MISC metadata.xml 350 BLAKE2B eac07dbe885b393b46453fb6f57f1c9fa1858b1acb170fec98c0a1b31e2e41c2a44fe80dc5675a45e2df8834143471f76b2069a4a86edf1f2cf2b7118e66e99c SHA512 8e280ee3ecef5ff286935d365c9a9df8bdbd6be49e63cbfc71cc299f9f2ab3326511de6884ca61d60c81e746a5994d9e99e97c40be4d82e07c74323a0fdd2868
diff --git a/dev-python/test_server/metadata.xml b/dev-python/test_server/metadata.xml
index 266e3f19ca59..9b8d050bac1c 100644
--- a/dev-python/test_server/metadata.xml
+++ b/dev-python/test_server/metadata.xml
@@ -4,4 +4,8 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">test-server</remote-id>
+		<remote-id type="github">lorien/test_server</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/testfixtures/Manifest b/dev-python/testfixtures/Manifest
index 9f3a79ace80f..7885fa4d12f4 100644
--- a/dev-python/testfixtures/Manifest
+++ b/dev-python/testfixtures/Manifest
@@ -1,3 +1,5 @@
 DIST testfixtures-6.15.0.tar.gz 116119 BLAKE2B cc0e351bd6778393cf061b741d7d593f56bc1b6a3d53d2e34baa006f7edd718c86f1b16c094e42cf116805a5c6652ac6827f71c1ebbb160d48c071317603c151 SHA512 34b9f1b9a5e76c5e20acf9abae2961694817de3822361cd5afc4a405ccdbcf26c617a01fbd8d2d977c2a0bc696232c2363df4a9fb7ba9187e0743cf2a6fe98e1
+DIST testfixtures-6.16.0.tar.gz 120986 BLAKE2B bb17c44091370edca55f1e273f70e454c2e74a152a228f97efba08d605e3a024c64bfc163b3aa50805f038556c76fb754825b16fdf4451760403682c06251c80 SHA512 0c519fa2d2619ad71f6b487456ea1480365aa421c14a9beaeee916e7841bd266be2c95d48c61b64e91554b37d2621358a45b124be6a6d25b3e381f966653c9b8
 EBUILD testfixtures-6.15.0.ebuild 1056 BLAKE2B 4d3587c3d3ad6acb348ed76c4831442aa0fa5930c7bbe6b5a24393a3df6b264af41b16bf93532044832eb2d884a424166cd238ceda70c9486f95f3fe60ab943d SHA512 2e4f58775521fec11cfab422c1dcd50dfca685c989f3d642bddc688f3e473ee43ae1278ddda696c50f368c97f1e450c4fdccb6d5797daab18f33305543df23d0
+EBUILD testfixtures-6.16.0.ebuild 1089 BLAKE2B 1aece1ca23c043598dc4eecf7b4775dcb53475f8083a7e01ff8965fbdbaff546d1e4d81ba046a18d489a35dba48e68431df443f39f47dc7ac85b283600f297b8 SHA512 452daaf02fd5a94a0d6a2d3410aba86836f80e5f4babb518c4b59a2174b713b595f35e1f8666bc6ebebde32378fdd3deaac8cf642adddf310abf947e610c7529
 MISC metadata.xml 415 BLAKE2B d3e133602f86d013faf5998b2e52256dca88ed9593b9ea26bed0277b70823eda4dd27deca7488a7f66fac2f77e3312cddf833a4b865cf400c7e78a4d267a4c5b SHA512 78fd16b4fd4e8ea3f244b3d8fcce8451a38713d0374df3d2661453f2ad06af587b4613c9119b11bf4cfe3d226fd04620bfa74f58f2660e44ba7e84b93c99c20e
diff --git a/dev-python/testfixtures/testfixtures-6.16.0.ebuild b/dev-python/testfixtures/testfixtures-6.16.0.ebuild
new file mode 100644
index 000000000000..d8efd8340de3
--- /dev/null
+++ b/dev-python/testfixtures/testfixtures-6.16.0.ebuild
@@ -0,0 +1,42 @@
+# 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="A collection of helpers and mock objects for unit tests and doc tests"
+HOMEPAGE="https://pypi.org/project/testfixtures/ https://github.com/Simplistix/testfixtures"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/django[${PYTHON_USEDEP}]
+		dev-python/pytest-django[${PYTHON_USEDEP}]
+		dev-python/sybil[${PYTHON_USEDEP}]
+		>=dev-python/twisted-18[${PYTHON_USEDEP}]
+		dev-python/zope-component[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# kill weird way of declaring build deps
+	sed -e '/build=/d' -i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	PYTHONPATH="." \
+	DJANGO_SETTINGS_MODULE=testfixtures.tests.test_django.settings \
+	pytest -vv || die "Tests failed with "${EPYTHON}
+}
diff --git a/dev-python/testpath/Manifest b/dev-python/testpath/Manifest
index 72c180d9f08e..31694c383a35 100644
--- a/dev-python/testpath/Manifest
+++ b/dev-python/testpath/Manifest
@@ -1,3 +1,3 @@
 DIST testpath-0.4.4.tar.gz 92101 BLAKE2B e607fbccf66570ebe29779701bac11048751e9ee8381cd7841ba5dc55e02ee2edc32e8fd8a4a869fdd786f0c4bacdb5e7efc644e0111c24a786631257a08c9cb SHA512 4435c99325d535c713e88b59ce16704e10947232e4eccfe0e792ff9288b65e677417881ce8bbb69577aebb4b9ef793621d8e54898ecb158d07fc22e8445950e2
 EBUILD testpath-0.4.4-r1.ebuild 724 BLAKE2B c0d16baa0a54d9e205945e8c6539e6e1cb9efb12016dbefafe82f2e6f9f3f91df4680d19cf100abb9dd1c1499ec47986178e8a4c99112e703b0b8d38b3cf02a0 SHA512 464406bbac57c4ae5f4ae17a41b1526322f2e6f1e7b5d00142576235f5dfacff349cf2928358149bd53ed560310e81ca49712f4050aeaad3883c206b940b7ce4
-MISC metadata.xml 745 BLAKE2B 917478463f8d0023a23ab009f9d387dcd45324c6d3c583a0cd0003954612e4fc25982135e8b741e99f8f6a13415e5b1c35a1f0471a3142fc16cd23233dd07de9 SHA512 8580dbe33bc24a3d1faa9c662088e3e4eb27f619f3858f0567c22a26147b55d240f998c0376a08a6d6b34d0bbf58902d39a84f310bbce84ee3877cec847d482d
+MISC metadata.xml 764 BLAKE2B 66ca0cbf31a2ae4f9e59e232c029f530b9b6fb5d6d53c9a3a4fd69293a987f3a46c6530e20a9c4cca4056a91b546062b9aa2135d537de276255ae6188633257d SHA512 7787d485d68e575b8a0e01dd20bffaa317c8168a1dfb38cab9c6bdbe80778131e9ac1bb8dee91bcf6ee91de5ec466027f7b1fdcd65d5fbd81dc8433804e3f3d1
diff --git a/dev-python/testpath/metadata.xml b/dev-python/testpath/metadata.xml
index 05a85a5849f4..259d00861e4f 100644
--- a/dev-python/testpath/metadata.xml
+++ b/dev-python/testpath/metadata.xml
@@ -1,22 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <longdescription>
-    Testpath is a collection of utilities for Python code working with
-    files and commands. It contains functions to check things on the
-    filesystem, and tools for mocking system commands and recording
-    calls to those.
-  </longdescription>
-  <upstream>
-    <remote-id type="github">jupyter/testpath</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<longdescription>
+		Testpath is a collection of utilities for Python code working with
+		files and commands. It contains functions to check things on the
+		filesystem, and tools for mocking system commands and recording
+		calls to those.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">jupyter/testpath</remote-id>
+		<remote-id type="pypi">testpath</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/testscenarios/Manifest b/dev-python/testscenarios/Manifest
index 6bc8ed2c57ad..68b94be7656d 100644
--- a/dev-python/testscenarios/Manifest
+++ b/dev-python/testscenarios/Manifest
@@ -1,3 +1,3 @@
 DIST testscenarios-0.5.0.tar.gz 20951 BLAKE2B 154915281456aad3353e144ffec8404514622fdeb8d2129ba530d3d5a02814599c2fead9dc25ab4904bad68b2892a435f9cbbcde92503d71477624bbec154f53 SHA512 f08b868babf504482369c5cb945d3e95bca1cc00f92d5013f6898c488051be0c26dc49aaabcef362aea45450a8d041d9826fb6b5c848beec013fb102d6935521
-EBUILD testscenarios-0.5.0-r1.ebuild 872 BLAKE2B 81350b1d4f65b636bca8a90e36b359d1ca43ab35c70ae943ae7db4dd6da7f91ad4c745dbe01c3c984b8d12592dc02181dabfc5bd10e4b1a9395fd54fecd9b52d SHA512 23b566a14bf5353efdaef703477be27d77b5f7fc7748ee654392e295936cd4dd98150a636f3352833ca0388a2a07f7070180aa1d5f34729aa00a59e5662b7114
+EBUILD testscenarios-0.5.0-r1.ebuild 883 BLAKE2B fee6ea768d51760040ff23717b5540c1e94530b258e15cbc63038f72838197d3ad7f99a0c6ca8f7ef231cf12edb1bcefd3f197d2bd870257c3cdce0ec8ad989c SHA512 535cd5603a9c1f322a073e8a2542f8022d89ec26e9562fb556d88038594fafa6547117d334958e2ac32b8a0d877ba1db5bf902189bebe2e7baa869c1d2a695be
 MISC metadata.xml 979 BLAKE2B ab0d7bfbefdae5ba546ff15669d1caec70e59bf398e6e2ae329821bb141aced038cc946fc309b79a0348051352f7d758e24c081348d6a7e587fc326df14dda09 SHA512 f043d2244673a34d80a88f07c79ac199ad6b2509c3af7a7e934c94330bf745e2dbfbf78fb7f38508cdb1968a87e30cea3e346aad63eb93f94ca762461b3d20e4
diff --git a/dev-python/testscenarios/testscenarios-0.5.0-r1.ebuild b/dev-python/testscenarios/testscenarios-0.5.0-r1.ebuild
index d8cb4ec3455b..1f9874d77b65 100644
--- a/dev-python/testscenarios/testscenarios-0.5.0-r1.ebuild
+++ b/dev-python/testscenarios/testscenarios-0.5.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/testtools/Manifest b/dev-python/testtools/Manifest
index 8c1bc1d11de9..7e3d17ef3cc0 100644
--- a/dev-python/testtools/Manifest
+++ b/dev-python/testtools/Manifest
@@ -1,4 +1,4 @@
 AUX testtools-2.4.0-py39.patch 4816 BLAKE2B dc5198c0c8baab37ae645d97cb93c860e737142b691d00f96e35574dd0e77f8a163d4031a4b96aa9f28664af1a3a58552565bf5d887cef00c72e13ba9c3b3ea9 SHA512 a554d49e74f43269a847d767611f86fda655fe9ca27cf182c91975702b6928b4161e12d78283113b88b4d50b9fce240cd4fbf236e884e8b92698bdd512c42598
 DIST testtools-2.4.0.tar.gz 233032 BLAKE2B 8b0559039bfc5e18dfe8d70cc10f6e43ad2e1fbebf7d20d9c6c876c5672a6149064f558150d8eb09f569b82983ffe67e06143b14a1d8869efcc585839d6216ae SHA512 af26e163a4caeb207a554b19f86c7892ab5ebe904c144d85273464e880cd18a991c70a77ff817aefb15768fa38f382e9ed853cdefb212dc697b24072e17535c0
-EBUILD testtools-2.4.0-r1.ebuild 1238 BLAKE2B 530a67fe023f4c492eb090ac9f2241f57689a4bd1e69e0b9f30abd02858feeb190c876236397aa75631d79b8ca3d8171561b7d78c9a17e6375ff5cd5828d7e7d SHA512 8aef3f46cef4a3a085064f2adf13a104623797c1efc79a76dda5131cc4ba04fb4b34cb5f6b8b4182001a12406ee256ab79c4994a78bae3928f370dfefb48e6a8
+EBUILD testtools-2.4.0-r1.ebuild 1249 BLAKE2B d7b7a0feb35695b235f6f12fea54c76a7e9574e0719144a0f8297a4b5b5b7cff9f2d01736282d1826fcb4c48f15b39dd4413481243c3ab1357b4fabcb33797e0 SHA512 4823cdaf0478587a68f367801b15ff9d6e82697b5fb27674a7c8f43adacb0ec993ed4a523127b38ec2f4194c3b6c040be3915d6d2320ad8d74e8b127c76cb56a
 MISC metadata.xml 579 BLAKE2B 60320e15f2101c115cbd946efe6a2c8cfc12645a005bb9727f5c4fb7d28d91081f2b96b6120ad9a36a7bb6af61d7110afb97b7985306dea3d57427af834a8112 SHA512 c3c8805d1a8d7cc406104548d1d89ce8074ef989a623b5190da1cc1bbe9ecb8e6f181a6c05e5c74b87bc3a3fc27c6713642070f34d4961e385a470820ceda0f0
diff --git a/dev-python/testtools/testtools-2.4.0-r1.ebuild b/dev-python/testtools/testtools-2.4.0-r1.ebuild
index 3907a8e97079..ba14ced54848 100644
--- a/dev-python/testtools/testtools-2.4.0-r1.ebuild
+++ b/dev-python/testtools/testtools-2.4.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	>=dev-python/extras-1.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/text-unidecode/Manifest b/dev-python/text-unidecode/Manifest
index 8f9872f237d8..691cc31dfc2d 100644
--- a/dev-python/text-unidecode/Manifest
+++ b/dev-python/text-unidecode/Manifest
@@ -1,3 +1,3 @@
 DIST text-unidecode-1.3.tar.gz 76885 BLAKE2B b783963b4fce6588d45d48a498de566c08df83ae62c72caf599648df195eb94b7c02090503590ab8c747af0d210847ddfbf0772289e170361914db20c049828e SHA512 aeaf0e79bd0545ca7a4fe700d5a7dac1d5900841fcfe8a5a568c84ba7d3bee5f75eaac0531f4a01d689a550ac5bc7e1acaeb8132293f220db8387fae2eb6a150
 EBUILD text-unidecode-1.3.ebuild 476 BLAKE2B 380c06db4be67c72b78dc001a9a1e253b26c27d94a38ff8643fbcc4da1ac84cd7dd1eaa77d837a879c966a6b226ea309690da5a58f014dfd0d55f60d5565021d SHA512 e35b33cca6aa77a7aaf723a5b3499fb9c4aac5d880f987f610ae745de4376af0abe6f493ce15b4b71354f1270a4994dd37299db0851be50e6b171ebf6438f2d8
-MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
+MISC metadata.xml 355 BLAKE2B c879c366e644e724fb78b1169a362c2f67cf5c7ac428ee6cfbbf255b6556f153d35eadc3bb6e4554b9dfbb985e85cfa008be359f87d3be5f09b351afc6bdfcc3 SHA512 113a00dfe9647c778d48ca9bcf410a1c5c36becb3cadbe8e3036879def47c219673ca04fb526915d89ee7596dd43739c0b0e9406ac390a75adfe559476582c21
diff --git a/dev-python/text-unidecode/metadata.xml b/dev-python/text-unidecode/metadata.xml
index 266e3f19ca59..883d10d40985 100644
--- a/dev-python/text-unidecode/metadata.xml
+++ b/dev-python/text-unidecode/metadata.xml
@@ -4,4 +4,8 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">text-unidecode</remote-id>
+		<remote-id type="github">kmike/text-unidecode</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/texttable/Manifest b/dev-python/texttable/Manifest
index 97880db27e3f..f9bb7a6c5254 100644
--- a/dev-python/texttable/Manifest
+++ b/dev-python/texttable/Manifest
@@ -1,3 +1,3 @@
 DIST texttable-1.6.3.tar.gz 11574 BLAKE2B aebb306acb89f62963e9473ab6e22291a1ec93993a0106ddd2943f656737cb0960a10e680a69b6577ebb8ac0af3c6ecdfd8c58647a6ce37d9a6531e41f61f480 SHA512 89a26ef7d9947ec4edfc5791c91f2ac327c79bbc5aa0e0f89c0a63dbd80bc420027af073da935254faa143b9e8bef85a7bb352791b45b0cd60c7bcf569869f2d
 EBUILD texttable-1.6.3.ebuild 686 BLAKE2B 3a140fcf755becf1a2194be69f28f8980b17f9e52dacc5f16fd9076899a9942bbf023ce272b39b8f8e0cdab265ff3c1c5003c001b7f8b92c511d6f81feb6da26 SHA512 726b91401b3697c8a94129be1513353328ea5076a39e830377df39702085f0eb0446a14727ba74abafd3e83806e9a4f9fbfed0d790021b1011c1ef79a0d6e04d
-MISC metadata.xml 330 BLAKE2B ee4c551d00203affdb9666d0d3f58541249543f6aa6a586fda4b028f3b9c5255e61abdc6ef9faf62d1c6dda4f60afed5c8af2090bf6c54d229681c567ff6299a SHA512 900e4bcdc1580e4dee2ab5298c2b1115e0942d95c410d76dbf6cb062f759fecb3d633d9e7f223e92d997ce88d98c2a3d719cdf7cdcc7625a78cc5b3294c3ddec
+MISC metadata.xml 378 BLAKE2B 278fb97915edd484d5a59296e51689c296b9c6534c2a1b69427bc8c12f83934b33e6f2f3db22cd3c9716e45168aaf24fb4e286c58b1b0ffbda6918baa29ad7aa SHA512 54b6636d443856ffed61de7b258432f7e2988dc750a5f9bca1d8800e8b78dc72feb87e917a5c0e10ce7f38fc0f1c20fc882c0d672a5ecf1ba1097b577ad64706
diff --git a/dev-python/texttable/metadata.xml b/dev-python/texttable/metadata.xml
index 0c8b76627cee..3f7038e7e9ee 100644
--- a/dev-python/texttable/metadata.xml
+++ b/dev-python/texttable/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>juippis@gentoo.org</email>
-    <name>Joonas Niilola</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">texttable</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>juippis@gentoo.org</email>
+		<name>Joonas Niilola</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">texttable</remote-id>
+		<remote-id type="github">foutaise/texttable</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/threadpoolctl/Manifest b/dev-python/threadpoolctl/Manifest
index 4b5f65ea382f..b31b7549c0d0 100644
--- a/dev-python/threadpoolctl/Manifest
+++ b/dev-python/threadpoolctl/Manifest
@@ -1,3 +1,3 @@
 DIST threadpoolctl-2.1.0.tar.gz 25255 BLAKE2B 3afa8e8c44567d3833dee89e761b2f384129c386c5c5b9d8084c1b301f007be7f461f1ef99738e06551f793feefa5c312dce1d608e7012215fd759866a52e2d4 SHA512 09b745b0d164bf3fc4f293bd92f1fd2e02180ec538bf3da1cdb986e31d9336ba3e1301aede72f53700d00298bae7b91b4ec8fa3212accb4cde6c3f5f88ff5c62
 EBUILD threadpoolctl-2.1.0.ebuild 624 BLAKE2B b20bd5be36f4699bcd4064182981ebdd9e50481dfcfd894424b0ccb85dc5d9814b04b0c1b969ecaa0073573cd3446c54b459d5ecda7876673ccb0d4bcb2e8698 SHA512 07f918ec9401b26b6edd769891c995728762c8bf21bf6dca704b7d6b5bda6a4b37628a0dbdc7d84880775499656ede6423ddb3d4711e9314e3f657d88eb9dd00
-MISC metadata.xml 363 BLAKE2B 62e2ff44db5d8b0c5a4fe21c5243ab6fe271bb0d21b40b50e40b58b07de8a6b2a38d7eb728a4e9fad95faea15d7ebd0def9418a5e993f1557e7030f2f8d6b194 SHA512 b90ec23472954157ca06a1142d3b1648b2bc2b46791a2a9a422213508f65fd0ae38225be07606d52097a024564d01963a2ec224781a666b0b8af2ca310b4d5ea
+MISC metadata.xml 428 BLAKE2B 5021cc6c0dd7953c65d3b4f156fc8ad9b8fe51480f5a77678c0ccf8983fd4dc815e11fc91e12d2c70454cbf92237033945beba1489d23a263952efe8880ccfa6 SHA512 4de57c2178b26934e745c96f0daeac26a7323a07641104f5d1bcb7095281bdf5e390c721ad1d68513caa00e41e4c8e0d506c3ee3c4488b25f22ccb21c2d74897
diff --git a/dev-python/threadpoolctl/metadata.xml b/dev-python/threadpoolctl/metadata.xml
index ff70d6e6ba19..1e538b750d43 100644
--- a/dev-python/threadpoolctl/metadata.xml
+++ b/dev-python/threadpoolctl/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-  </maintainer>
-  <maintainer type="person">
-    <email>chutzpah@gentoo.org</email>
-    <name>Patrick McLean</name>
-  </maintainer>
-  <stabilize-allarches/>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">threadpoolctl</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/thunarx-python/Manifest b/dev-python/thunarx-python/Manifest
index 5ea6930f703d..18e7da58aa4f 100644
--- a/dev-python/thunarx-python/Manifest
+++ b/dev-python/thunarx-python/Manifest
@@ -1,4 +1,5 @@
+AUX thunarx-python-0.5.1-fno-common.patch 3161 BLAKE2B 5af487237d518c08a068b592000c4dfffb9e63f4004ed691343d446058adf070bd1d7710c6eb740dfa6602726bfe53f59309a4ac5991c74b46206f6d076c1977 SHA512 501faf134750e07584b0464c1881934fc881cae888bafa4e53afd56f34f1d10a34cf1d90bb39955bc98bd9b0d804cd0a5f636b68f34c8e935860b1019d8cb059
 AUX thunarx-python-0.5.1-py38.patch 951 BLAKE2B c83f78b4ddbd08b7325d87b16133ee455b43a8e7c666661b15a582ec96eaa6a81c0a0b1ee19b4428b06e60ac1ce04414c3ed5f754c037cf17223081aa2ddf49b SHA512 44cc2aeb13e8d98ce2e9cdd0a28906da3d9826080b12b33ee7cf78e80f57371a0af801df8ba9967b5d831bb442c5836f02427b7ee58045c2f326dbcf3808508b
 DIST thunarx-python-0.5.1.tar.bz2 334426 BLAKE2B 59f8e625b10ceeaefffa4b6dde150c32023365e76854c6e77ae2f222b509856353c8d62de26ba4e7b967cfcce1219205923938389fd1714a420bc9e1ac2b12b2 SHA512 0c1d8f20b74a3eb87b3c2c181c6438bc059dff75afdc26cfea19dffb7efe1f14e6a880689f73afcbbcb5922312741df72018e3b9980c4a45426e7a7d4651177f
-EBUILD thunarx-python-0.5.1-r1.ebuild 804 BLAKE2B 5445bf968f9bb1f152f464cfa835ea882418e41151c9338343bf976e813127290f384fa3b1f0558b09e587b522395fc4ba3ccc8ea55d52ae59e78d8d7210c408 SHA512 8c0381b21508045a2665d962ba875fa9c4a133afd0d3ed26ff84861951081c272d0181f1884c6268677f0d11881fc2c6d54f0713f7e62b8d3c12e7fbf0263bc3
+EBUILD thunarx-python-0.5.1-r1.ebuild 843 BLAKE2B d80e670bdcae81ba6385c974556100e53c389f247e1c7e163de95e75559ffd76beb16ea73d45ce186c48920323d21fea442a9c1c0ef03c5c00560483d9766a22 SHA512 6d7fb1027fb3655b669b2e8a8b937e6bb0b765ec68030fcdb461f77fcd878e0dfcb2638f1f3cc9d00152dd06dfbbaeee798b82259686bba9979270974f37d6bd
 MISC metadata.xml 249 BLAKE2B cfb34e0ab5b7155d26bee3e5cc55d570e05151273d6793455b82980b3e3411983eaee6a6ea94f896b18df24efdc964f180bb00b3852a98a2cc5571f1d22f6d84 SHA512 ec9e5427d44f20c2c0166fe103e6e8b8384a300685f7c9774f9177a1533d7057f332af1ba1046462f75bb3f2812e075d01b5eaeb625340c911d2bc6d2f9acf7c
diff --git a/dev-python/thunarx-python/files/thunarx-python-0.5.1-fno-common.patch b/dev-python/thunarx-python/files/thunarx-python-0.5.1-fno-common.patch
new file mode 100644
index 000000000000..21f55c0e6f8e
--- /dev/null
+++ b/dev-python/thunarx-python/files/thunarx-python-0.5.1-fno-common.patch
@@ -0,0 +1,85 @@
+Taken from: https://git.xfce.org/bindings/thunarx-python/commit/?id=3037ebe25d5c6ed58699e56b61f657cea3e5a5a6
+Author: Mukundan Ragavan <nonamedotc@gmail.com>
+
+--- a/src/thunarx-python-object.c
++++ b/src/thunarx-python-object.c
+@@ -24,6 +24,7 @@
+ 
+ #include <thunarx/thunarx.h>
+ 
++#define NO_IMPORT_PYGOBJECT
+ #include <pygobject.h>
+ 
+ #include <string.h>
+--- a/src/thunarx-python.c
++++ b/src/thunarx-python.c
+@@ -30,6 +30,18 @@
+ #include "thunarx-python.h"
+ #include "thunarx-python-object.h"
+ 
++PyTypeObject *_PyGtkWidget_Type;
++PyTypeObject *_PyThunarxFileInfo_Type;
++PyTypeObject *_PyThunarxMenuItem_Type;
++PyTypeObject *_PyThunarxMenu_Type;
++PyTypeObject *_PyThunarxMenuProvider_Type;
++PyTypeObject *_PyThunarxPreferencesProvider_Type;
++PyTypeObject *_PyThunarxPropertyPage_Type;
++PyTypeObject *_PyThunarxPropertyPageProvider_Type;
++PyTypeObject *_PyThunarxProviderPlugin_Type;
++PyTypeObject *_PyThunarxRenamer_Type;
++PyTypeObject *_PyThunarxRenamerProvider_Type;
++
+ static const GDebugKey thunarx_python_debug_keys[] = {
+   {"all", THUNARX_PYTHON_DEBUG_ALL},
+ };
+--- a/src/thunarx-python.h
++++ b/src/thunarx-python.h
+@@ -43,37 +43,37 @@ extern ThunarxPythonDebug thunarx_python_debug;
+ #define debug_enter_args(x, y) { if (thunarx_python_debug & THUNARX_PYTHON_DEBUG_ALL) \
+                                      g_printf("%s: entered " x "\n", __FUNCTION__, y); }
+ 
+-PyTypeObject *_PyGtkWidget_Type;
++extern PyTypeObject *_PyGtkWidget_Type;
+ #define PyGtkWidget_Type (*_PyGtkWidget_Type)
+ 
+-PyTypeObject *_PyThunarxFileInfo_Type;
++extern PyTypeObject *_PyThunarxFileInfo_Type;
+ #define PyThunarxFileInfo_Type (*_PyThunarxFileInfo_Type)
+ 
+-PyTypeObject *_PyThunarxMenuItem_Type;
++extern PyTypeObject *_PyThunarxMenuItem_Type;
+ #define PyThunarxMenuItem_Type (*_PyThunarxMenuItem_Type)
+ 
+-PyTypeObject *_PyThunarxMenu_Type;
++extern PyTypeObject *_PyThunarxMenu_Type;
+ #define PyThunarxMenu_Type (*_PyThunarxMenu_Type)
+ 
+-PyTypeObject *_PyThunarxMenuProvider_Type;
++extern PyTypeObject *_PyThunarxMenuProvider_Type;
+ #define PyThunarxMenuProvider_Type (*_PyThunarxMenuProvider_Type)
+ 
+-PyTypeObject *_PyThunarxPreferencesProvider_Type;
++extern PyTypeObject *_PyThunarxPreferencesProvider_Type;
+ #define PyThunarxPreferencesProvider_Type (*_PyThunarxPreferencesProvider_Type)
+ 
+-PyTypeObject *_PyThunarxPropertyPage_Type;
++extern PyTypeObject *_PyThunarxPropertyPage_Type;
+ #define PyThunarxPropertyPage_Type (*_PyThunarxPropertyPage_Type)
+ 
+-PyTypeObject *_PyThunarxPropertyPageProvider_Type;
++extern PyTypeObject *_PyThunarxPropertyPageProvider_Type;
+ #define PyThunarxPropertyPageProvider_Type (*_PyThunarxPropertyPageProvider_Type)
+ 
+-PyTypeObject *_PyThunarxProviderPlugin_Type;
++extern PyTypeObject *_PyThunarxProviderPlugin_Type;
+ #define PyThunarxProviderPlugin_Type (*_PyThunarxProviderPlugin_Type)
+ 
+-PyTypeObject *_PyThunarxRenamer_Type;
++extern PyTypeObject *_PyThunarxRenamer_Type;
+ #define PyThunarxRenamer_Type (*_PyThunarxRenamer_Type)
+ 
+-PyTypeObject *_PyThunarxRenamerProvider_Type;
++extern PyTypeObject *_PyThunarxRenamerProvider_Type;
+ #define PyThunarxRenamerProvider_Type (*_PyThunarxRenamerProvider_Type)
+ 
+ #endif /* THUNARX_PYTHON_H */
diff --git a/dev-python/thunarx-python/thunarx-python-0.5.1-r1.ebuild b/dev-python/thunarx-python/thunarx-python-0.5.1-r1.ebuild
index d2bb115a4a8c..08d8b303c2db 100644
--- a/dev-python/thunarx-python/thunarx-python-0.5.1-r1.ebuild
+++ b/dev-python/thunarx-python/thunarx-python-0.5.1-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 PYTHON_COMPAT=( python3_{6..9} )
 
 inherit python-single-r1
@@ -13,21 +13,22 @@ SRC_URI="https://archive.xfce.org/src/bindings/${PN}/${PV%.*}/${P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 RDEPEND="${PYTHON_DEPS}
-	>=x11-libs/gtk+-3.20:3
 	>=dev-libs/glib-2.30:2
+	>=x11-libs/gtk+-3.20:3
+	>=xfce-base/thunar-1.7.0
 	$(python_gen_cond_dep '
 		>=dev-python/pygobject-3.20:3[${PYTHON_MULTI_USEDEP}]
-	')
-	>=xfce-base/thunar-1.7.0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	')"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 PATCHES=(
 	"${FILESDIR}"/${P}-py38.patch
+	"${FILESDIR}"/${P}-fno-common.patch
 )
 
 src_install() {
diff --git a/dev-python/tinycss2/Manifest b/dev-python/tinycss2/Manifest
index ca5b8cca8d8f..1eae63ab039c 100644
--- a/dev-python/tinycss2/Manifest
+++ b/dev-python/tinycss2/Manifest
@@ -3,4 +3,4 @@ DIST tinycss2-1.0.2.tar.gz 57728 BLAKE2B 966af74a499b9eb696beb3aca2c832d4e07641e
 DIST tinycss2-1.1.0.gh.tar.gz 28205 BLAKE2B 46ba3f705522067e5b7aa5fdbc89f8980598e7e81b39114052b428e8c21b1a90fb3a9082bd51bbc0c6719adf6f0be285683b125886afe1a957013164f3b89428 SHA512 e1ed2679c09a0814d6deca069c68521e6ceef80f4a9cc16ab359dc5ee7ef97d0c7335680702548b023b1a48c5aeb838e29bf1b55f64698913dd16ae33a478a2b
 EBUILD tinycss2-1.0.2.ebuild 622 BLAKE2B dea3b9e649876958124ccf217eeb53971f8853be2ca217b58a037547e8a64543b9ac314d355bb0db941dda496544606889a9a9e12f0a131e72c32c580d0f11c8 SHA512 04d966612d83091c49fa59d9136ba70223114fbe9d144d16dcc3ef42bbf406128d63a1e2926c31a2127a4d57f54370dadca6f69567a072ef23e387f697998ab7
 EBUILD tinycss2-1.1.0.ebuild 1016 BLAKE2B d0b6332588a7a32c428b408bcadb736b0a6d1a2285d1b5154d01da5fd08923569e4185c6acdbaf9dcd3279fb66325d112f06b566b77619cffc9a428497728e32 SHA512 099aba9df5a4f1c53b6c26ed5348d482d8dbe5280ab745fbae97eb7daa265c0fc80aaeec63abb3389483e3fd8d4c91e81e9e5a22f0363d5776d1b1242cf82626
-MISC metadata.xml 497 BLAKE2B 99c42dc1977fae24cf0af136eab84efc6cd86bdfce5d92f96afbe941daf9a62656232c9da866ead72f82e35a709c4850d58a793a4261d511bf2c84fac32b5eed SHA512 8004da866ba4038adacebe1eb03c7304ee7937e643babc75ecdaff33d22a13ddd9583344e239f3be50ea3eaf0026ac626813f8aa10d1b192196f524eb5cf5027
+MISC metadata.xml 522 BLAKE2B 7954745f23764d7736ce267e95b61c55efdad096d4f6cc7f552438edde811bcf2efce828e3710f5dcc580ba225a980cfc951a3bc52788fb518c3e22ae82140f9 SHA512 45dd447790194120cdf6715e569a39834a7839bafb6c9272da5d10243bfdec5cea26b97dd6be139d62a8f03ab035da1b0e2022c8114b6f0a1b9d18c56d0f7b8d
diff --git a/dev-python/tinycss2/metadata.xml b/dev-python/tinycss2/metadata.xml
index 68107d658316..fb95757f369d 100644
--- a/dev-python/tinycss2/metadata.xml
+++ b/dev-python/tinycss2/metadata.xml
@@ -9,6 +9,7 @@
     <email>titanofold@gentoo.org</email>
     <name>Aaron W. Swenson</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">tinycss2</remote-id>
     <remote-id type="github">Kozea/tinycss2</remote-id>
diff --git a/dev-python/tld/Manifest b/dev-python/tld/Manifest
index f14ad6d2c7d6..9edcc356e815 100644
--- a/dev-python/tld/Manifest
+++ b/dev-python/tld/Manifest
@@ -1,3 +1,5 @@
 DIST tld-0.12.2.tar.gz 1347015 BLAKE2B d284581917a9ddee026d316961f2cdc6efc8a3c8dee8112c7266d55a9493f1aca831db0635db02b737bb3e02b3910a8822e121a5317ab02f5078075839e02c91 SHA512 b997bd3cdf22f65862c9b3e7d446014325d9538dd06eeed86f4b9b6c6ba440829b5d611cc19fed9bf8bf039ef01c4258c71b5c765bbecdfc345dd00e73c7fca1
+DIST tld-0.12.3.tar.gz 1498596 BLAKE2B 7a1d33c3527bc1dfeb18bfcc5af4d153f9cc39b52e858f4ac5907d0edece67da6bb6f900d028937bafb468b31534ed284a54effae6d97397dd33e27261af3730 SHA512 fe33bb18bceea6e1eb4ba3ca46dc54c81a8d3a1f4187078488676b951e6734a885a44525f6f5c4dc8c2fea1b0f4ffd8060244fbf33f9b1bd9dfafbec12876711
 EBUILD tld-0.12.2.ebuild 492 BLAKE2B 9009d45cad616dbf0366bd6167110427247f21ec33c2bf761ff2c718c2ddc6162063ddea6b287270445cc7aeda8190933a8b1ef4a78f702052e549368850a69e SHA512 c101a9cce181a51628a533fa98dbd9307aee29ef6ed66e23dc37cd3b8d54dabf3820c62a850acdae67af03500348d2f3b452e28f17fccd7b4eb7bc14e6969c0b
-MISC metadata.xml 419 BLAKE2B 48f0e2b96669406551c66e56225022f649ede7feb5e435e73b229f2fba514fd90cc1c542b34c0f31ce5f3bf7197c16188d83cd63542b7017caf114b2a1f0feaa SHA512 fd4fa0a5a30087e046f21cd68d7f5772b20a12f24ebc16641c45e28c1e033a4cf8ac99419f4a70f8d6e7997e6c612681c34e9e576632691ec443360effc75d40
+EBUILD tld-0.12.3.ebuild 463 BLAKE2B 645008d1225f5b097ecccaa24e5bb83d4c204b992cbeade7578d0c6b6091fe704776df90a9f00bfa8666cc277b71bf3f675b33d4a1d2927858341c80798fdd6d SHA512 86029c7df54f6331cf6831eb12a4e2a55bc6ffda380bdcbc0e1bd887a539065df38712780759fbcfe6cf822031ca808f366d9320734f56d5e696dc07e0b35c86
+MISC metadata.xml 478 BLAKE2B e00ab9c47661bb6c6e2d0ffa74bb43154ae546a5b92d3c5ce0396a5935b44e3a3b3d4ab201d305d106e98c8c26a2fee31032878bb2109f8e45f2509a09280992 SHA512 97d25f0e6286a1434f0a27ec986d842ba0693559a646073493d6cebfa8a573bcd6ebe870cac8603556ff65d7061703af8aa963701a1c9513a737402819bab030
diff --git a/dev-python/tld/metadata.xml b/dev-python/tld/metadata.xml
index 35285bdc8623..d9bdfc0eb4b3 100644
--- a/dev-python/tld/metadata.xml
+++ b/dev-python/tld/metadata.xml
@@ -11,5 +11,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">tld</remote-id>
+		<remote-id type="github">barseghyanartur/tld</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/tld/tld-0.12.3.ebuild b/dev-python/tld/tld-0.12.3.ebuild
new file mode 100644
index 000000000000..34f2ce86810c
--- /dev/null
+++ b/dev-python/tld/tld-0.12.3.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Extract the top level domain (TLD) from the URL given"
+HOMEPAGE="https://github.com/barseghyanartur/tld"
+SRC_URI="https://github.com/barseghyanartur/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/dev-python/tldextract/Manifest b/dev-python/tldextract/Manifest
index 6fd384324b3e..863b231e4283 100644
--- a/dev-python/tldextract/Manifest
+++ b/dev-python/tldextract/Manifest
@@ -1,3 +1,3 @@
 DIST tldextract-2.2.1.tar.gz 54538 BLAKE2B 0abfb1982d0b9e9cd767bc64db289da8bf2f58b599eaea7e703adf36934dae0d052170fa9a8205b8ac0b441d8f1ac75648ccc108515586b0bcacf2ecb43fef52 SHA512 db4f14e514c0e68f85f28226343d7ec91ceea2843ee01c9a2950f0972f365bf343640e07cfb118aff52bab975719be71d179fc6b3bd4da7eb62a47b62747cc0b
-EBUILD tldextract-2.2.1.ebuild 642 BLAKE2B beae6ccbe289e32c6fe8ecf52ef7d37c4228f1256254140d0284b8c6a546d1dd97d218fdd66d9a1e1586d4eb1ac90ca8c07698cbb22d4f2f74ac6c1a2b5e3bbf SHA512 6ece98cd41135fef99b48585c58ede32591937eb1788a970352f6e2d2d373466f9ba5e4906bc25c951ad42e7c630b6d39edfa8f1a1bd505fd9f94d7754de28e9
-MISC metadata.xml 253 BLAKE2B 7dac7f77dcc8de31f439cc6d7770a503f95be9c2f8ae57df9e725df941e2b31a90a43664a485a5fad9510b9ae060ba7aaaddba29324338dd9eb07d88a63c7dce SHA512 303268e1f46e337e32c64b544c0962ecbe8de1799c42736b3c3515b6f31954a655830c402317bd0534cac12059e17eeb5f360d010432dff795a136662a5c10f1
+EBUILD tldextract-2.2.1.ebuild 624 BLAKE2B 9feb2ca725e50ebdfc41aabc06d7d4b27cec0eefc3a0634e1dd7121a118d0934b390c12ab3b11aae095f1675dd2d5f7c815aaa91a2f8f72aba8a91a8dd206a0a SHA512 e51652f7b3d0bd7c3386fe9550416d50c7282179638db4abac9d0422036841cb89d8e81c7eec993f04fd94ee94ab6c3f246bc70bea3f8bfa6a18a28492f9e316
+MISC metadata.xml 320 BLAKE2B d07a2bfb884d852c37aec5335a9465d44ba14b84787b82f0e51a99297413326ca37e63bb68c8f8f5b6fb855fa8acdf23bb3aaa0ecae38f61242b63ace0e4d8ab SHA512 7a6b5b4ab88e8870cfb86db995b43be99096792b08d4fd341d6febe911f28d790ad1dac049b0d09334b900325dbe85116810ae8a658b2d615320f2d3c7a858c8
diff --git a/dev-python/tldextract/metadata.xml b/dev-python/tldextract/metadata.xml
index f3de5f693ed8..8c884e55b789 100644
--- a/dev-python/tldextract/metadata.xml
+++ b/dev-python/tldextract/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>patrick@gentoo.org</email>
-    <name>Patrick Lauer</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>patrick@gentoo.org</email>
+		<name>Patrick Lauer</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">tldextract</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/tldextract/tldextract-2.2.1.ebuild b/dev-python/tldextract/tldextract-2.2.1.ebuild
index e47d3e81ce18..24f681f3e558 100644
--- a/dev-python/tldextract/tldextract-2.2.1.ebuild
+++ b/dev-python/tldextract/tldextract-2.2.1.ebuild
@@ -3,7 +3,10 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+PYTHON_COMPAT=( python3_{6..9} )
+
 inherit distutils-r1
 
 DESCRIPTION="Accurately separate the TLD from the registered domain and subdomains of a URL."
@@ -15,9 +18,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
 RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/idna[${PYTHON_USEDEP}]
diff --git a/dev-python/toml/Manifest b/dev-python/toml/Manifest
index 3b2b15a7320b..bf4229260a6a 100644
--- a/dev-python/toml/Manifest
+++ b/dev-python/toml/Manifest
@@ -4,4 +4,4 @@ DIST toml-0.10.2-1.tar.gz 23325 BLAKE2B dedab7d08dadca963e62d64e9108e254dd73b787
 DIST toml-test-280497fa5f12e43d7233aed0d74e07ca61ef176b.tar.gz 19593 BLAKE2B e9deba7c5d1eea7bd87fcf5e5c74bda4c2b9e9686e597e3ad51516f60eb8d192fb01d052ac57729c6f0851e2715cc6409a904affd637c9b099cabc1b12ad5d52 SHA512 7bd69b8c14f09bf431094b52d988eb233922527719ba5047ff769d2e709c2039fb6fb1c8144e630ad2a58835d19e0e4cc51433a427596d37f8eccb6d73d7e5c0
 EBUILD toml-0.10.1-r1.ebuild 1056 BLAKE2B 4d18ac31dd79412cc0cf7bb68bd3c0dd086452bc0c80b20efedc7a2f8456d5c834a82ab0fe1718caecb7f876e6ebc43ebdd5d51408b42fb442a3c219e029f2e7 SHA512 ba7fb9b2f169b73c3074f97f0920221a2cb01b255a6b085863a449524036d2052103dae995ce160a13f0d015bbc517062c1bfe832c4cfb201fedde46c2c56a48
 EBUILD toml-0.10.2.ebuild 1011 BLAKE2B d4f650c986a6115b4312aba7a3f3335ca3040309e551f30120615fee0730df9267b2b226832fe09ecd4556694b32d9042de1ad0839ac3b10be19b1f41170727a SHA512 31109b68c6f0855132c8f8a1df6e41e872e7a91e5512eb89853da5154c3db2517f120d544c0319c654d982d1b1504902ffc4508b118e7ee07df59beb1f3696d8
-MISC metadata.xml 349 BLAKE2B 2616a9e0b3c28e61eed2c14cb21f10bedfa7440b2e82a132cb2b26356c2f79f0a4a73d42b59dd6a8e1eb03af8700e637e851664eff281d84bace343a4b0f9ca9 SHA512 2840c365fe21c27f1bfe512a2a85312116477427f4cb1325fbbe4db2c0f653fa8af7c8ca5c6160e5c248a5e055146d6e1d1bfbe563de6724810c319de2138f30
+MISC metadata.xml 380 BLAKE2B ec4806e600de8ff5dc0ce341d90563166feae233c7911cf6c396ffe3b1e80b30fa1ac0b1a8c7b99a3e690cabadd8ae098882f53ca415377e54f08d37028e0b4a SHA512 09865620b098af31212c38a6aec4e5efd3e1725ed3963dcf7382aa815f0b607c4c4c4887d43ac678feda5165c9a3eef879c877b7853d133635023f7fc8f0b3bf
diff --git a/dev-python/toml/metadata.xml b/dev-python/toml/metadata.xml
index 85b206a00020..94a222e44902 100644
--- a/dev-python/toml/metadata.xml
+++ b/dev-python/toml/metadata.xml
@@ -1,12 +1,13 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="github">uiri/toml</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">uiri/toml</remote-id>
+		<remote-id type="pypi">toml</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/towncrier/Manifest b/dev-python/towncrier/Manifest
index c145d7a2a02b..c8723d723316 100644
--- a/dev-python/towncrier/Manifest
+++ b/dev-python/towncrier/Manifest
@@ -1,3 +1,3 @@
 DIST towncrier-19.2.0.tar.gz 18089 BLAKE2B d1e17e707b90089b19d9eedebd898b71fcc9a582cbae0166650a6bd52a8ac6bb3921a458a6d2c10e5930b92230ddf5efc5a428646c464edb6eb4bfc06949e217 SHA512 60999446c4ae404fb54ea6282a862621d49f62a2488d31eecf8fed9dd7afa6e01f4feac6e3dd26b882ee75f747424d63d05521e33b5f6b8df7059ce32dbe5c4f
-EBUILD towncrier-19.2.0.ebuild 916 BLAKE2B eb1ba99a589b9937a055442c210724baabe6bd90bb2f334a08e25bee97c5d4b85601e382eeb6f5daeb1ee07b7a53a0cb934fdc8e734e8eee66191eb7efdc8871 SHA512 4ea04e215e46e2742586bbbb24335cec4f721f5dd4eab0c3e2f8e2837a15b230dd20d948293e43de13cfa1efbbb903aa0ba9ddf00615f48415e6df8fc40484c0
-MISC metadata.xml 312 BLAKE2B fb9710abb0c693626d09df383f38a85e69b165f13f76aac9ba46da772e04d2679f4898dab39ed4d383854a4338713c24a389b7ac37b797eb78388e696c8191cf SHA512 4f75330d767fd48bd21128ea81256aa5c5031e0898eb07889a5ebf4c2275e7af174e715500a0724428bf8ef5d8051d29d2a489fdcf557b19a88d294b4c85e5b2
+EBUILD towncrier-19.2.0.ebuild 948 BLAKE2B 770685fef506d9fa20503d8c4105aea1ede949ee81286811a5f1bfe72df35aa85eaa33c20ae1bf2de2c07a3b0aabbad70c8c113b8056a650c55981283accaa75 SHA512 05968e5575bd15f76f73b105e1ca13aefe73f9e7a9ca0825b3d0f3803a6412d7ee405a3b930009c0382170d8447d3b8d64123bfc8aaab156deb5c57dcab63bb3
+MISC metadata.xml 369 BLAKE2B 8ee1cb62419fb6c4cb90090f486c6418d6f78588354f6cc5f60785c3ad4679c7198bdf99cf3a7c9bd2ca937f61ee9391fa10cd7d0ab50196650a4e7c5635134d SHA512 f5ad66e0cf77bfe75e50712974f2660f349136790f4dbd3f68d6968bcf025c885972101d0157ec6df39e03d8e8ba4f18188f0b2ff60160a48072b4e9944a0623
diff --git a/dev-python/towncrier/metadata.xml b/dev-python/towncrier/metadata.xml
index 580f32722c5c..a30875e52367 100644
--- a/dev-python/towncrier/metadata.xml
+++ b/dev-python/towncrier/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">towncrier</remote-id>
+		<remote-id type="github">twisted/towncrier</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/towncrier/towncrier-19.2.0.ebuild b/dev-python/towncrier/towncrier-19.2.0.ebuild
index 7057ea9ac92b..14f7bc852f31 100644
--- a/dev-python/towncrier/towncrier-19.2.0.ebuild
+++ b/dev-python/towncrier/towncrier-19.2.0.ebuild
@@ -4,16 +4,16 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit distutils-r1
 
 DESCRIPTION="Building newsfiles for your project"
-HOMEPAGE="https://github.com/hawkowl/towncrier"
-SRC_URI="https://github.com/hawkowl/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/twisted/towncrier"
+SRC_URI="https://github.com/twisted/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 
 RDEPEND="
@@ -32,7 +32,7 @@ BDEPEND="
 RESTRICT="!test? ( test )"
 
 python_test() {
-	distutils_install_for_testing
+	distutils_install_for_testing --via-root
 
 	trial towncrier || die "tests failed with ${EPYTHON}"
 }
diff --git a/dev-python/tqdm/Manifest b/dev-python/tqdm/Manifest
index ebc7c9dc3c01..4ccc951a441e 100644
--- a/dev-python/tqdm/Manifest
+++ b/dev-python/tqdm/Manifest
@@ -1,8 +1,10 @@
 DIST tqdm-4.51.0.tar.gz 152976 BLAKE2B f9cef9de6a77c21e40394edd006fbd8fa913af4d3a9a8ac68bd9fde81b1eebc404f6fab90d9aadc57ce2ccfbc3a2f8d8879b151f6283dc34edc25d70f69ae6e1 SHA512 04bb2a173b9b79b76844fedbc14572fa955232d1dcb6ac55b7265c4cc7a4f712f2c2965ac3bcb9e10ea1bd041593230b047365816bf508d457d873a2d4830d3f
 DIST tqdm-4.53.0.tar.gz 179940 BLAKE2B 022fd8eae70a38306d201981bd6c2e469791abc86e3e10bf2bcbe4936e4e6791dc24b3e064c6adb830fd908a1544389fdba8f7017bee17632925c1bcc3d42349 SHA512 ffb06058a71e31497ced0b6b5ce8671a7e958968e0a08e1b68dc9f3a9acac415c1708f6669d369ab484bbc07a8fc06716ed32fde70f22c0dbd8242417f95a713
 DIST tqdm-4.54.0.tar.gz 178664 BLAKE2B 68d0f054b2c95079e13ad9df3e9467f48925311151e5eed94795d3fab232301da99c2704daafd80f748037a467d25416913f0921d6b7c44d725c5ed6861fe347 SHA512 dbb2a61df848ebd84ab805134b7e7297e1cf7626abaa830a08159ce7b1852eba40a6a7f2cc7c8445294a184bbfbd69bf08430371f3e2d71f6a622a271ba49e95
+DIST tqdm-4.54.1.tar.gz 178633 BLAKE2B 10a9314405f1565a130baaef3b4d23fb8606b954fb6e70ec1fffd21a531957432254d3081085f8cb2e55ab103ac17ad23683a5a945917e278fcc61760ee69b90 SHA512 ba9dde2bd2f39d10bfdb0f624f1e60db12fef79732aee1fa21049e37ab60ffafbe097ab124bb3fbd34d9f4efa10e317ab7d594551ae612c0f6c37c2ce9395997
 EBUILD tqdm-4.51.0.ebuild 1027 BLAKE2B c47a37c8079b09dc693ced0c8d0ee726854f0c25e54963df1e02702b5f60c60daed45bc8ac64a77acba7a7dcec27e6708ad8eb2e45d78b95eedd177f3b6eb7e7 SHA512 e2668a9b0b4a671af3845cb11dcd3b282cd079321caca6ea5c56b5d13f9f85f4e5904e3372325f17d0e15693e7bd992266daa5248552d9dc1aa0c19264527a25
 EBUILD tqdm-4.53.0.ebuild 1127 BLAKE2B 20af0f808d46e5489d9b29a6250314a2b3ea888cd40d522ab24b5673be98677ea7ec0c1a616f5d17056e32dea05ca3391962987bbcb52ca0a374d6c535965f7a SHA512 58e6a57ee3fe4c46c9bf45abba9ad16eea8ed68e3356fa43d84783dabca35eb9b76105acff61b2543fddb9e2a79c43fff182ec812706fbb33ab528a40ac21db5
 EBUILD tqdm-4.54.0.ebuild 1138 BLAKE2B f7ac9812c91b2490729892e257dfbc0a573b0915486cadaa1e0fb28b924797c91ad69c3741ff342be24a5f1ce903c54b16fe5cb6a206520bfd3ffa4574d4ca80 SHA512 6015b3906b0a3a300b3dda84d09221309b2e931d9afbc4dc28334117ca2e0e0b4d2d9aaea639d480c39c00fb7627e12bde919399a89282ac5d092ecdcbf7de98
+EBUILD tqdm-4.54.1.ebuild 1138 BLAKE2B f7ac9812c91b2490729892e257dfbc0a573b0915486cadaa1e0fb28b924797c91ad69c3741ff342be24a5f1ce903c54b16fe5cb6a206520bfd3ffa4574d4ca80 SHA512 6015b3906b0a3a300b3dda84d09221309b2e931d9afbc4dc28334117ca2e0e0b4d2d9aaea639d480c39c00fb7627e12bde919399a89282ac5d092ecdcbf7de98
 EBUILD tqdm-9999.ebuild 1326 BLAKE2B 984897423b7a16d82725c544ff1efa1984545d9438ce8e857eb9f0170cbbc18337c18d7d4af30dbe9a462948bef89c6bea81c74ee2590e4f3955d308649f5086 SHA512 a16afed262e1155ad2eff7ea87b4974d4632bb62ec42761902f9648509093857fd28e7878816f9f8bef2245643453feacc0a0d50454baaf5ea8e7e42538928ef
 MISC metadata.xml 827 BLAKE2B 58d9989c380867ec71e25ccd9bb5818de73112978d422a30bae0230ae1b87af04e3e999d6dc5480303b0caea284ec1387497371d5698e63c65bd07b5ecd8c07e SHA512 a1a68e4bad52c71f46664563338b2ea5273d603a914bee55ce427f23ac6bd29a452a0a6dc8375ce9f4bd77f2b9386972cfb6719aced4964d9b9793cd0aa2e270
diff --git a/dev-python/tqdm/tqdm-4.54.1.ebuild b/dev-python/tqdm/tqdm-4.54.1.ebuild
new file mode 100644
index 000000000000..bfed1d06c33e
--- /dev/null
+++ b/dev-python/tqdm/tqdm-4.54.1.ebuild
@@ -0,0 +1,50 @@
+# 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
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/tqdm/tqdm"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+fi
+
+DESCRIPTION="Add a progress meter to your loops in a second"
+HOMEPAGE="https://github.com/tqdm/tqdm"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="examples"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# Skip unpredictable performance tests
+	pytest -vv --ignore 'tests/tests_perf.py' ||
+		die "Tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	doman "${BUILD_DIR}"/lib/tqdm/tqdm.1
+	rm "${BUILD_DIR}"/lib/tqdm/tqdm.1 || die
+	distutils-r1_python_install
+}
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/transitions/Manifest b/dev-python/transitions/Manifest
index a7045fe780f8..1d6447da1f6d 100644
--- a/dev-python/transitions/Manifest
+++ b/dev-python/transitions/Manifest
@@ -1,3 +1,3 @@
 DIST transitions-0.8.2.tar.gz 1084797 BLAKE2B 9ff6284e7c42365c5a169388057acffd53dd31c3ca6d9dee240b253ca34118a67d3f070fd8b6a86cb6a01a2e15023e0bad02ccc07813ee0855a54008ac3d7597 SHA512 d10e513806801d0c874be3eb59e92ad61584b5f7992ba26db8828848df1225fb806621abc118a8d43f2efaa353d988b5becbe4296bc054754e551c86495a540f
 EBUILD transitions-0.8.2-r1.ebuild 913 BLAKE2B 97c2df5a1661bf0ff2571fd539f87903d9bc542a7fee8f108d5f5eb90ade23a4f9172a3dc6bbfd5ab30832ca5e9c4b959ef54a16479369af09c2044540453b02 SHA512 7ee29369baa5a7d1c12162e62ce505e3192089d3f4f6f6812b167c08fca23c4becd76261470af8b2ac501def0a09d79a5c563bb1e0778c521a41d435b5fbc0de
-MISC metadata.xml 712 BLAKE2B b4c911e4b006f4ef5b486b62d2b8aa3542df841dae6c120cf2099ef1e843b0142f45b62e5621bf13f555398b0483f30730e86258412971f6bdde289720146cf2 SHA512 49894aa07b32aa7ba5c1181af8059c6bbebce9912b4f311169e51b57c85f4fc2fae294994a9375194a0732365afb2fef79b703842a5f438970e4602ff6e274ee
+MISC metadata.xml 761 BLAKE2B 8711cc2839e74b99f5bf61be04a1ea9096a0cfb67f66826dae6db22ec4efa44577dfd6c80d457d811c0af8a3e5b9768f5121fb26c7c5e680de075227a7493c6f SHA512 124dac18d42e7aa25c9e32bb40eae7d9b00b18f07fce5c951092024f6a6c2d047b0740447bc40df7c061677f9d6a5ddde1266d7d8ae69abd4aa0f9ec0c851e81
diff --git a/dev-python/transitions/metadata.xml b/dev-python/transitions/metadata.xml
index cb357577f372..bf02683f0971 100644
--- a/dev-python/transitions/metadata.xml
+++ b/dev-python/transitions/metadata.xml
@@ -15,5 +15,6 @@
 	<upstream>
 		<bugs-to>https://github.com/pytransitions/transitions/issues</bugs-to>
 		<remote-id type="github">pytransitions/transitions</remote-id>
+		<remote-id type="pypi">transitions</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/translate-toolkit/Manifest b/dev-python/translate-toolkit/Manifest
index 8dfa9ae7b1be..793a56cf41f5 100644
--- a/dev-python/translate-toolkit/Manifest
+++ b/dev-python/translate-toolkit/Manifest
@@ -2,4 +2,4 @@ DIST translate-toolkit-2.5.1.tar.gz 5984081 BLAKE2B 55e158d0d354f181a4e23d963830
 DIST translate-toolkit-3.2.0.tar.gz 6029254 BLAKE2B fe4c30e09fcba6755a928775f931f1027bb5678606e74aa435fd5803642ab39b8b55d763bb96dba6b1a957d6656cfca4ec6400b735afd8df7f2c1273ac173c89 SHA512 1045762a5c63cc2bc8459b61a85ef56e4f1d1f705d74646b8235169f22d8d5aa4ab5e3599af52a860d9e434df0fad3e98836b0c021bb0a9697b36a59edbfb6ec
 EBUILD translate-toolkit-2.5.1.ebuild 1936 BLAKE2B 7d9d2c054f8d71841d0ea8cb88851ab59fd0ad2458603f8c26d2876e5021153ba98a3ffd7db1fdb743df708ef986bf2794807085289e6b1705f059f0e8c53ac1 SHA512 f40cf5b7384ce50b908eeba85915b9e70c9834b36dc5bf2d7a96d917df55807154e4c092def35d33616425e8bb138a053073f38231b6153c4d38ee2cf8d0bfa4
 EBUILD translate-toolkit-3.2.0.ebuild 3292 BLAKE2B ac6a59e7650125c2cdb03631e7be4b616d1bdecfa3ebd6c8db5cfce39e51311352a0c964bcb194781d578a0dd4f06178964f4d8b81a3c4d17a87c27dee7580c3 SHA512 76e628ee8e79f582188c0c4f151d13e0954e82ba1b4a4626f0e36ca2b0ce68eec87c58de81ffb2e133c21d2c2cd8b8f24ca68bb847b8f60a7d9d6f4d7a978039
-MISC metadata.xml 690 BLAKE2B 1ffde4252d52bcf090db209df7bb31c305ab9355b7002bd150e3d6aaba00c4048ffc7d4e7de5d2058dd270e9f1bff18b2b769348b2cb07710b6f53b830e97e31 SHA512 1608bfcd5ebac12d63d9abb187cd124d83134d9ccd3e8cd8d09a63e478853161e97a9895921a0f22e422c5a8c67dd5eb99fbe32eb57d36b25ca3cab76c29305e
+MISC metadata.xml 745 BLAKE2B fada3477df5ccc4e5f6036d8d60f948dd4c015ba9ea4e0c844526a43bddf469378e3601a6f5652f8e4f7fe88e65beb82e3dbd1f171c1e7fe83794e91ac7a52ac SHA512 314825d2d8187ebce4e0fb63bed639dfdcb8455883eff29e75cfce963e200371bd38de86190e7051d0950c60befa2115cdcb8630313774946036b693b3c51106
diff --git a/dev-python/translate-toolkit/metadata.xml b/dev-python/translate-toolkit/metadata.xml
index d6edf768cd05..7f98f59237bc 100644
--- a/dev-python/translate-toolkit/metadata.xml
+++ b/dev-python/translate-toolkit/metadata.xml
@@ -15,5 +15,6 @@
 	</use>
 	<upstream>
 		<remote-id type="github">translate</remote-id>
+		<remote-id type="pypi">translate-toolkit</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/tree-sitter/Manifest b/dev-python/tree-sitter/Manifest
new file mode 100644
index 000000000000..6cdf6e56baeb
--- /dev/null
+++ b/dev-python/tree-sitter/Manifest
@@ -0,0 +1,3 @@
+DIST tree_sitter-0.2.0.tar.gz 110387 BLAKE2B 62bd0cac84626738c051a16a6e1d8bf18985850e9c0174794d060e09f289edcf5e6183da28ab3805713b7d55d63c2210cc0e53d022689b46a3770243acf08937 SHA512 1b5c1dd8855de00357b5e8fc9dc3cb826c1cd10bec499b2db26f50fe2249a9848e1641765ee9717c8eae88b8d091f0de79cdfabafdecbe8e666a05f63fefe4ba
+EBUILD tree-sitter-0.2.0.ebuild 499 BLAKE2B c9184ce810e0f927d2a762d77b401ca39693438696240d7640af0f402d560bc3d6886c759c5337413b9dc9184616e4a5fed725c6c452a233830b2e50de7ff637 SHA512 3e01f7c295474818819ee0eaf8dcab3241d61c15d67e0f9a1a25ac5f07cef65a34aab97bb83a4ed2080498f3b7e51d79f9a5eddf6022daf3810f0a3e26f89e4e
+MISC metadata.xml 392 BLAKE2B 5359a33b220d2104d9a0e09ff6ee637c93dbbd3601d1004c194af9cf04ad46f9639f9f91b60576812847c2eb6b8c6988ba5fb3fac73ab30d81a0533b532c4490 SHA512 6047bcd144cd23f16232e5140c817e00af555f4c7b470b3492015e28042536015d64c2e19534a9c62fd4e869cdaca0fdcfcc30abbda034bf423f7ec72e909756
diff --git a/dev-python/couchdb-python/metadata.xml b/dev-python/tree-sitter/metadata.xml
index 20b3c9795df2..b625d4c3ee51 100644
--- a/dev-python/couchdb-python/metadata.xml
+++ b/dev-python/tree-sitter/metadata.xml
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>djc@gentoo.org</email>
-    <name>Dirkjan Ochtman</name>
-  </maintainer>
   <maintainer type="project">
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
   <upstream>
-    <remote-id type="pypi">CouchDB</remote-id>
-    <remote-id type="github">djc/couchdb-python</remote-id>
+    <remote-id type="pypi">tree-sitter</remote-id>
+    <remote-id type="github">tree-sitter/py-tree-sitter</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/tree-sitter/tree-sitter-0.2.0.ebuild b/dev-python/tree-sitter/tree-sitter-0.2.0.ebuild
new file mode 100644
index 000000000000..1f82863da71b
--- /dev/null
+++ b/dev-python/tree-sitter/tree-sitter-0.2.0.ebuild
@@ -0,0 +1,20 @@
+# 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
+
+MY_PN=${PN/-/_}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python bindings to the Tree-sitter parsing library"
+HOMEPAGE="https://github.com/tree-sitter/py-tree-sitter"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/trustme/Manifest b/dev-python/trustme/Manifest
index 5df5f57f357e..8b90df44eb96 100644
--- a/dev-python/trustme/Manifest
+++ b/dev-python/trustme/Manifest
@@ -1,3 +1,3 @@
 DIST trustme-0.6.0.tar.gz 24062 BLAKE2B 77f72ab225653e5cd4fdf57b22c4a227e7f186370cfca795df57b5f3c1acdd72b920c0a4ed8364bf2ab4b367a8cda71550d9ff801d6e864eac9ecdef91d947dc SHA512 9fda58320f2055d2c23369d2df213994cafd9af7b7eb3933162bbe09a81abd7a9cd2b2e7cae43b25d40d20311213d8a1c13155b61498b848a2850d22fa1e1418
 EBUILD trustme-0.6.0-r1.ebuild 765 BLAKE2B 91aba74fea2a55d103546b9d279288117559329e2129f4e7710c97f40009f5de17e2371248d77807a20499c6c2fb80aab4734ced641e07cc213ab5fe4d5858d8 SHA512 a4eff14f11bdf5e4dfe76d63c170c20ade185a4129aa4a534fe12ac306fa2ad1c0a749048b1c03b2c2e51026f3cdee35ea20071fa0c553d79d787f35ceca2158
-MISC metadata.xml 373 BLAKE2B 4b67794d0226bac81e37e7dec42b160464da3d0ebe118eb4f91a81d4394ca63387d2088331af6dba5a79db94bd04b9093d2f6ed5ba5eb3d68d56eae0709331c1 SHA512 dd29b9ab2300c0ad8282708bbbcc43dbef6fcb2bd7f8849f3f6f7f61f4f17bd07afe02649596f25c707bf573c18642d051f0162f9451debdf7470b935c8ff3e3
+MISC metadata.xml 443 BLAKE2B 8f591132e3a9478741063502a0da9709ba07974432fd9b008c59aee122f234b11b44c29b78b7f69600d7b385701c4c909b98472a7eb3d1a6cf5908acb436727f SHA512 38a7f228253d556064d94478e0e10ccf526368cff06f7201b82911f404e5e6d83a54b2658f6f241b8a8d1d600899dda9588023cb38fda828d94c6983add0f7f2
diff --git a/dev-python/trustme/metadata.xml b/dev-python/trustme/metadata.xml
index 986c7fe8b64c..9914e7c63b22 100644
--- a/dev-python/trustme/metadata.xml
+++ b/dev-python/trustme/metadata.xml
@@ -10,4 +10,7 @@
 		<name>Python</name>
 	</maintainer>
 	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">trustme</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/tvdb_api/Manifest b/dev-python/tvdb_api/Manifest
index e4283b95e933..516493a0ac5e 100644
--- a/dev-python/tvdb_api/Manifest
+++ b/dev-python/tvdb_api/Manifest
@@ -1,3 +1,3 @@
 DIST tvdb_api-2.0.tar.gz 32751 BLAKE2B 6228ea0d8e9e679b7a70d6357917537cf8a6e362010ff6d1a212d51919689c656f8dc5cf67c694ddf7b4e2fd5b2fc0674393036c5ac38d8254878559921fe39c SHA512 74b1e036c2c71bff9f3d04bbf670da4069f68152545b09882aeddb5d1ebc873956ed00e8e28f2bd77a72ff97ae5fda23f1cfedd91f87187c31917ee31df17f3b
 EBUILD tvdb_api-2.0-r1.ebuild 475 BLAKE2B 3434303db768f18a03a9d412451f4ed432e1b11b6262583d331b5017ee14d3f39c31e377b6353b2b8e39e38da53ef791c7f42cf5f459e287d2dd27411ed22274 SHA512 b4b31e076e6d236cf84d8201536d20c87e12aea8f0fe2a20980a9ba3c3332cf059ab642691a9240939d5dfb68f778b085e7f52a2b7f0dce802034ea29230be41
-MISC metadata.xml 333 BLAKE2B 37ef6dce06fb7536eb18133f5dbe87b03a4cfcc54669dc7795dbfa9009920c020dc0fbca7d3ff82460e2e05bf3896fcaef8784078a4ab56899e9b7caff9dcb7d SHA512 5cdb8638da8db277b9228fd2ac53bb0fa4dd181da86b9aa3d9180e55c2d13ae494ab78af1168271158ce10469204028197bffac2e9b11afb48e0c71a15d583f4
+MISC metadata.xml 369 BLAKE2B d6cd298ce14e9a1324fb56608d01ab090d90e86a9190ab42c06767f9b26cfef2e85be45ef614a8265ce28e82854820be3a9c0843c18f33d370d9d0f7e584e3ec SHA512 1785932fccd60c8f86f13b05d58f542ef108ebec4f1f2598b57d98396e4fc07e24d3d15805df5d28bcefac63dad03b07454af5480d4c032ba237e64ef9234a64
diff --git a/dev-python/tvdb_api/metadata.xml b/dev-python/tvdb_api/metadata.xml
index 373aacb19057..198c22849457 100644
--- a/dev-python/tvdb_api/metadata.xml
+++ b/dev-python/tvdb_api/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>thev00d00@gentoo.org</email>
-    <name>Ian Whyman</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">dbr/tvdb_api</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>thev00d00@gentoo.org</email>
+		<name>Ian Whyman</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">dbr/tvdb_api</remote-id>
+		<remote-id type="pypi">tvdb-api</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest
index 44bbc8b70a12..1e466c32a26c 100644
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -11,5 +11,5 @@ DIST Twisted-19.10.0.tar.bz2 3118485 BLAKE2B a0d532b67177aa017e463bf823d7842d4f6
 DIST Twisted-20.3.0.tar.bz2 3127793 BLAKE2B 2e85fc3ec26d89e563c9e79a5d2adea81ff1745d18f0f92b8d45ae3729fbddf09998664257880372c7a4caeb5977c5cad7c863596b8c27ad7890275cead9f763 SHA512 1b850e5fc21a3630ead4c2cc3622c16e78bb3be38ab11d021779b7ce3d3c30acc4e19d79c7791a5fce6c5c6e09c2baa349901dffe952de67dd98eec419846365
 DIST twisted-regen-cache.gz 911 BLAKE2B ffd3fcda6c67ffe6fd3ef581c8d507548396b66ed0708e9a5c790095e579c0d5f0f71596acf05712989da2ddef2b8d437eca973bc4d80ef8a9fa852915f38305 SHA512 95a9b931c73017d16d1b5e6b41345dddffe62b6af1a8e93b5e40d06d3d15be17b0dd0181c767ffeeb791534d463764ef9e066fa6c2ee2ac4b53c86d1da8fce03
 EBUILD twisted-19.10.0.ebuild 5779 BLAKE2B ff2e99dab9506621df1f30a47435a3bba2e689e26722fb1b6fd110e063422f5e5cb9250de71e7acb528caf22eb3ec9022cd790e096acf93fbebe37b27fa22fe4 SHA512 cf4a6b161e4958e0de605d271cfa3b84defe1cd2703e692b79cefc5c98b19fea2d1463837d7554655165795e161d59aab26751997df3efb08cf4e975b847fd89
-EBUILD twisted-20.3.0.ebuild 5602 BLAKE2B 4df15170dd2ee5d93582b65c7e7a550a093adc7ddcf0289aa0249809726419ab3429cd96e8e5b5d99a5d14575f7526f04b2cd4cf5ab1a2171537462a0719768d SHA512 14c3feccef79b0b21ba520376effa36dafee9239b61e0cb067d7f6e00bca6a0d79a112b12f854854112e2c931e669e346cdb3bd2a03bd6755b84cfa5acffc6aa
+EBUILD twisted-20.3.0.ebuild 5613 BLAKE2B 6e304e7da39dbc7a026081d38a0ee3ea94eafa323a83b12f01fb5218a4f9734957920f720ded4f846cd2c2666745935e5b2e69c3707fb157387675663e603498 SHA512 bfa57c9bcbe77156dd8fa07ab1b84f0b98bf0a4be7bea0a8e11045b5bc69bb6387f6deb900a915154a8f19059eae277f5340804da1b0fd7d9abbf44393ae4e86
 MISC metadata.xml 1351 BLAKE2B b3a4ccdc922dd4aa902b24b2545f3cc5517b2842c92f1195e8eaa2a8b62558c1ea86059cc23b9ad6a8e6093216a11a01f46360b5ba259e5eadcb351ad3bc0094 SHA512 403d692122913d079c5a93cb5b226f33316776360663a171cd757584d219d0789b24809c9e65840aaeb63eae4cb7cc79258757837abb1e3dd92536369fff6604
diff --git a/dev-python/twisted/twisted-20.3.0.ebuild b/dev-python/twisted/twisted-20.3.0.ebuild
index 7cfc88b3bb76..4f823da65ca5 100644
--- a/dev-python/twisted/twisted-20.3.0.ebuild
+++ b/dev-python/twisted/twisted-20.3.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://twistedmatrix.com/Releases/${TWISTED_PN}"
 SRC_URI="${SRC_URI}/${TWISTED_RELEASE}/${TWISTED_P}.tar.bz2
 	https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz"
 
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/typing-extensions/Manifest b/dev-python/typing-extensions/Manifest
index ca05658eebb5..c75472875374 100644
--- a/dev-python/typing-extensions/Manifest
+++ b/dev-python/typing-extensions/Manifest
@@ -1,3 +1,3 @@
 DIST typing_extensions-3.7.4.3.tar.gz 38979 BLAKE2B c1b0cc4d5d66f43628f6b488aefdcdd9878aa75cd426fce68aea6039006c1f0126f1a492a817e5a18d2c611aa399c5415d8b5e047b58868ee7b8b2cccfe13825 SHA512 fa1f96b73b13308ddb2676684862916aac8741be4523387c6a0f682a52d307190aac3e4149317842e686d14483d8a37a9e1de2514a2d1ca86f9ae9c8b0e18eb1
-EBUILD typing-extensions-3.7.4.3.ebuild 729 BLAKE2B 434c8ca9d7715b43f71d3b47cfc404c9f08e1e7708d36952ed0ad6f225a3d7abb59df23406149946df6011ea2aaf25672b7a871377dd24e846384731d0e6c134 SHA512 a6fa995b6a29a160c885c98c5936ac8b7527214cef3fde10b9ea2ec483174895b5d6625b40d8e415f29d565cf9d39eb806fe775e93fd3d89f81ec9585d6bf1d9
-MISC metadata.xml 333 BLAKE2B 7c8ba2188c6cbc930151cad7d365c6b26677aa23348454bf307f4549f296857681c2d871af330b7c889f38524dd63e3abf782ef5bbd7f5f606adcb60741c3461 SHA512 b411ac2336820d0fc123dd6f1575d92d001f6c472537fb1a4899b489bb2f223955e86c5a5a89f98490374ffac231cfc678472c14faeff56c33705850f3d23e0f
+EBUILD typing-extensions-3.7.4.3.ebuild 733 BLAKE2B 74cf74cf7680dba831959bfabbda7b185034e37bc0a2084acff7bbfc0e574f9b82ac2486a0b602a047ee6d513970e9bb1581bf7a67d8605e176c19d7e1d41388 SHA512 997169899a35fee5fa5182abe41e8e575af47fc1e1c02219047541c48500ba22145efcfe3d5b18aedf9fdcd5b5885b04613ef4d27278f22f70f8f679607958ba
+MISC metadata.xml 397 BLAKE2B 2eeee3841e9ca728cf2ffddb95f17521d7f57f8f8b85d3dfb30200fd666a69d39e31190a15ca0cfd039d253e81497514cdf99d4a44e9cd2b47f5a3d3c5e85291 SHA512 6850714adb8b2e46bfb6cfa4beb97f097547c60c9362a355534a35723f9a667f4c1be645287bfa27e6ceebe4dfc7607ca2ec7e12ff1d539e9598c911fde54825
diff --git a/dev-python/typing-extensions/metadata.xml b/dev-python/typing-extensions/metadata.xml
index 3dd5571701ad..cbf9134ba14f 100644
--- a/dev-python/typing-extensions/metadata.xml
+++ b/dev-python/typing-extensions/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
@@ -7,6 +7,7 @@
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="pypi">typing</remote-id>
+		<remote-id type="pypi">typing-extensions</remote-id>
+		<remote-id type="github">python/typing</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/typing-extensions/typing-extensions-3.7.4.3.ebuild b/dev-python/typing-extensions/typing-extensions-3.7.4.3.ebuild
index 805b1ac01ada..09b22cbdc03d 100644
--- a/dev-python/typing-extensions/typing-extensions-3.7.4.3.ebuild
+++ b/dev-python/typing-extensions/typing-extensions-3.7.4.3.ebuild
@@ -11,7 +11,9 @@ MY_PN=${PN/-/_}
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="Type Hint extensions from Python 3.8 backported"
-HOMEPAGE="https://pypi.org/project/typing_extensions/ https://github.com/python/typing"
+HOMEPAGE="
+	https://pypi.org/project/typing-extensions/
+	https://github.com/python/typing/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 S=${WORKDIR}/${MY_P}
 
diff --git a/dev-python/typing/Manifest b/dev-python/typing/Manifest
deleted file mode 100644
index 53ff9ec9dcdd..000000000000
--- a/dev-python/typing/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST typing-3.7.4.3.tar.gz 78592 BLAKE2B a47991466db75729620e180d230917cb32158475804b294d2ca956544c575323765bb9d2fd87e723fb8a6c79db4c0c83387fc45fe31f8c55a802bcebe793b997 SHA512 01d3d33bf3264a8929242d58ffa3b6a897a9ce23cb84858871146ed516a6ef2fc222d3001bb5197276da1a374ae243f0ceab0325ae8675ef0ffb76df5065ae1e
-EBUILD typing-3.7.4.3.ebuild 948 BLAKE2B a13e23138ae1d295e05c1884d716e0cf644bba9bde947d3d4d3b0f3f56deea4333e298d80082dfeb330876243ddadc21375cfa37a37318dfc4c47f4d7f03a8f3 SHA512 753a04fc7e192d544d0d686ec4b77fa1456d94a9af0e14e9fe280e2232d8e5c33671a69c82299fb008f68563c172b7db4081401718d0e76dd4935ad0ff8b46be
-MISC metadata.xml 333 BLAKE2B 7c8ba2188c6cbc930151cad7d365c6b26677aa23348454bf307f4549f296857681c2d871af330b7c889f38524dd63e3abf782ef5bbd7f5f606adcb60741c3461 SHA512 b411ac2336820d0fc123dd6f1575d92d001f6c472537fb1a4899b489bb2f223955e86c5a5a89f98490374ffac231cfc678472c14faeff56c33705850f3d23e0f
diff --git a/dev-python/typing/typing-3.7.4.3.ebuild b/dev-python/typing/typing-3.7.4.3.ebuild
deleted file mode 100644
index bd25896de668..000000000000
--- a/dev-python/typing/typing-3.7.4.3.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=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Type Hints for Python"
-HOMEPAGE="https://docs.python.org/3/library/typing.html https://pypi.org/project/typing/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# broken on PyPy, unclear if CPython behavior is not a bug
-	# https://github.com/python/typing/issues/671
-	sed -i -e 's:test_new_no_args:_&:' python2/test_typing.py || die
-}
-
-python_test() {
-	if python_is_python3; then
-		cd "${S}"/src || die
-	else
-		cd "${S}"/python2 || die
-	fi
-
-	"${EPYTHON}" test_typing.py -v || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/ubelt/Manifest b/dev-python/ubelt/Manifest
index 4df3805d7128..ab8e4f760c2b 100644
--- a/dev-python/ubelt/Manifest
+++ b/dev-python/ubelt/Manifest
@@ -1,3 +1,3 @@
 DIST ubelt-0.9.1.tar.gz 174866 BLAKE2B d9825cc266945e76560be0afaeaf28ce2c7ca99a9313f519c9e83fc987599a4d8c2d262af4f13040f522b91e3c73170f8af7fc7dbe9e40128b707d9a571f4b1a SHA512 92edac331602ef292842d48cd03c3ae12aaaec7e5860fd47c83dbe0449dee584e95ce5dd157a0b84b557dc4f4b6a0ee66ccabb669c5923e9b9083daaa2eb92df
 EBUILD ubelt-0.9.1.ebuild 686 BLAKE2B a7bba2030b8e839c62017914dc759a31531fc9392ba22deae8fc41b73bc1e9fadf3f5a1e41afbd58be41d32f4cc1e0133102eae4b64510127c6568b2037f6a2d SHA512 9173c9b13410ab36052274bdff0791f5968f1164652e32c193cc1cd3aa7b272bdc29ce013cd6942092e4b563a5b5db3e2e8192854fe39fb2a5be6d3e64a2e170
-MISC metadata.xml 254 BLAKE2B 975bbf0379cab76237f5c98a5722b00f260e44a5c216bb096be1d9c4dff854c39b5ade4b1b0e82130b40b7a77172d5cb8a57e62cd7c0d2046a06cdd2483f4c6a SHA512 4ddb51fe1406eb74843b84f306330d4fba63c96c52fd5c9c806418a93dc8d4f2be6310f39a841fa6abf856e277a8f48e32bc5f6cd4d73ee9d608367bf2e8f96e
+MISC metadata.xml 321 BLAKE2B 9fadac1ff4e3774c664efafe500d280bb5573ab07b9a3c8a03cc7ea27327d18c4e570fe2f65694ac53240f5a0952df896d54fa3ad86594f201837e88a19d22cb SHA512 bfd89aad2ec12d1a6b364344b3b11d4d78eee4b97d3a0505cf0271ac884b20a5561985752045819046979fa74760c482766adf86de034f2cc553d2a53f6ebc71
diff --git a/dev-python/ubelt/metadata.xml b/dev-python/ubelt/metadata.xml
index ca93985fb0db..692a51ccf094 100644
--- a/dev-python/ubelt/metadata.xml
+++ b/dev-python/ubelt/metadata.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">ubelt</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/uranium/Manifest b/dev-python/uranium/Manifest
index a787354daede..b1650aeab6c2 100644
--- a/dev-python/uranium/Manifest
+++ b/dev-python/uranium/Manifest
@@ -1,6 +1,5 @@
-AUX uranium-4.6.1-fix-install-paths.patch 1584 BLAKE2B 45a4461a2dddf00772098c0ab374fc511dcea1fc2eed94c563e1088be61c8ca6658fb6dbbf6bf2b628bd021d937fdef98a9b9b07bc861a9c3f84954fd38ecb5a SHA512 fba41223d1e14a25232b0efa0b83ccdae9e86bc18f49c5a495c2e3058bacc4a3647a567c346bd0184b22f25319c8e63e1f92fa13b4cf50385dea57d03013494f
-DIST uranium-4.6.1.tar.gz 1013314 BLAKE2B 2a89eb1c4ffab35879eea9a681ea20e9cc5f78736d9c8bda5bf33baf5ef6d3f6418fd1f4b779738d644afd2d553d500c4892559ae402eeab0c38a4d95b295cf5 SHA512 ba7ed12d507fb1bd08fc0e77285933802a31b63d09f2dd0c7329e5644f82e6372fa11a1bbc28f3f1928ae0acfb3cb0afdeedf8e90e619c484fd5f623f8af722a
 DIST uranium-4.7.0.tar.gz 1021541 BLAKE2B 2a2e354def88764801f275751aaf7643c9f4ca6329c2c302d87b3d617d0e93921d0aef20b0c25c9b0a082a836f7d0cca962dfedaa0298fcf943b1a0b683e0e28 SHA512 e049fff57823107785b418a368d6c6c399775c35ffad90831c77643dee060be2ab13ad8871b11f8d59d2a090a1d26786f4cf39a5a731b616a1b08a8ae5dea996
-EBUILD uranium-4.6.1.ebuild 1769 BLAKE2B 44c8e4e64e382ed1751effa24abc4c19a9fe28600217ac6f6f5306fd988622cf06efb533359d6606ce72f423981704f9d0f84d07fd28153ba7270dda751d576a SHA512 783e52f8bfc0523cac56e7c6901a655f9b253f6aa46a3ca329ed54e3d3f92cef2ffa1202b856e3399422aa6639cd54352331bf577c5f3be55fd5e4712ec761c5
+DIST uranium-4.8.0.tar.gz 1027286 BLAKE2B 5e068255918ca3a6125c308a64d47fab30260aa475505edad2abda664d2c2db7d821d4219ff682d4de90e16de2e36d257410a44f2752c733994739ca160e55b0 SHA512 a2cb923d703e626760c885ceb657566abfa5662f63729fef0b5cdf408da2ed3c23fefcd173b8af529ee79c2384505b2558379b82ba2cfd7a2d2291fe723ddbbd
 EBUILD uranium-4.7.0.ebuild 2290 BLAKE2B 974ca324a2fa95ae197feb34862e5d642032b2f8138c9108ad64ffe2e9bdaf98cb90dd410a2d832b6f085568467531a38367c48652514dcd04ae56d2c8d359dc SHA512 362f7e0d5d338395c51df831d338ef8e84035cd79e8531b1b2791ddacb92cb5a84c47a129a1c2bac190cf9dc0f107cbfe362c2b5ac8ba2993495254eaf953631
-MISC metadata.xml 975 BLAKE2B 42ea7df7c2ee42408ada0328335319d95edc41c92d8ae74d77fb178629e48c7ab7886e4ea07f058b9be9b67f04d29b795eb353e47de60370b7949158cb7798ca SHA512 6074599c0b62f2f527041621550ec183bfa26400eee212c3e9cd0ab9742917ddf762ef668a6bba4628cee8063a0f40104f21d25e260de1d164b61389c9544824
+EBUILD uranium-4.8.0.ebuild 2290 BLAKE2B 974ca324a2fa95ae197feb34862e5d642032b2f8138c9108ad64ffe2e9bdaf98cb90dd410a2d832b6f085568467531a38367c48652514dcd04ae56d2c8d359dc SHA512 362f7e0d5d338395c51df831d338ef8e84035cd79e8531b1b2791ddacb92cb5a84c47a129a1c2bac190cf9dc0f107cbfe362c2b5ac8ba2993495254eaf953631
+MISC metadata.xml 1020 BLAKE2B c54c1871de9b323fc7f2ed4a37ac0bf062b798cf46bbce74f21ddec38b7e8843f82eb2b04b581cce01ce2ad0fa89a21df6972b0d2d02e5de3cb022648f5af921 SHA512 71f91b3eec0985d7d5293c8ff55bacca51a52b8e25472a1a0ca08ffb44362958c85cd0c8b7c8d37ce03c1877d8d009ae323e5661a0de91ebc1d2f4a020d9c98f
diff --git a/dev-python/uranium/files/uranium-4.6.1-fix-install-paths.patch b/dev-python/uranium/files/uranium-4.6.1-fix-install-paths.patch
deleted file mode 100644
index 5777065e9da8..000000000000
--- a/dev-python/uranium/files/uranium-4.6.1-fix-install-paths.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- Uranium-4.5.0-orig/CMakeLists.txt   2020-03-01 16:26:44.736355687 +0200
-+++ Uranium-4.5.0/CMakeLists.txt        2020-02-24 17:02:05.000000000 +0200
-@@ -12,6 +12,16 @@
- 
- find_package(PythonInterp 3.5.0 REQUIRED)
- 
-+if(NOT PYTHON_SITE_PACKAGES_DIR)
-+   if(APPLE OR WIN32)
-+       set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
-+           CACHE STRING "Directory to install Python bindings to")
-+   else()
-+       set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}/dist-packages CACHE
-+           STRING "Directory to install Python bindings to")
-+   endif()
-+endif()
-+
- # # Checks using pylint
- # Note that we use exit 0 here to not mark the build as a failure on check failure
- # In addition, the specified pylint configuration uses the spellchecker plugin. This required python-enchant to be installed.
-@@ -48,10 +58,10 @@
- if(EXISTS /etc/debian_version)
-     install(DIRECTORY UM DESTINATION lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}/dist-packages)
- else()
--    install(DIRECTORY UM DESTINATION lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages)
-+    install(DIRECTORY UM DESTINATION ${PYTHON_SITE_PACKAGES_DIR})
- endif()
- install(FILES ${CMAKE_SOURCE_DIR}/cmake/UraniumTranslationTools.cmake
--        DESTINATION ${CMAKE_INSTALL_DATADIR}/cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}/Modules/ )
-+        DESTINATION ${CMAKE_INSTALL_DATADIR}/cmake/Modules/ )
- install(DIRECTORY resources DESTINATION ${CMAKE_INSTALL_DATADIR}/uranium)
- 
- # Detect plugins to install
diff --git a/dev-python/uranium/metadata.xml b/dev-python/uranium/metadata.xml
index a1111722f75c..0f2925ceea27 100644
--- a/dev-python/uranium/metadata.xml
+++ b/dev-python/uranium/metadata.xml
@@ -30,5 +30,6 @@
 	</slots>
 	<upstream>
 		<remote-id type="github">Ultimaker/Uranium</remote-id>
+		<remote-id type="pypi">uranium</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/uranium/uranium-4.6.1.ebuild b/dev-python/uranium/uranium-4.6.1.ebuild
deleted file mode 100644
index b5a2f4ad5871..000000000000
--- a/dev-python/uranium/uranium-4.6.1.ebuild
+++ /dev/null
@@ -1,76 +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 cmake python-single-r1
-
-MY_PN="Uranium"
-
-DESCRIPTION="A Python framework for building 3D printing related applications"
-HOMEPAGE="https://github.com/Ultimaker/Uranium"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="${PYTHON_DEPS}
-	sys-devel/gettext
-	doc? ( app-doc/doxygen )
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/pytest[${PYTHON_MULTI_USEDEP}]
-			dev-python/mypy[${PYTHON_MULTI_USEDEP}]
-		')
-	)"
-
-DEPEND="${PYTHON_DEPS}
-	~dev-libs/libarcus-${PV}:=[python,${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/PyQt5[${PYTHON_MULTI_USEDEP},declarative,network,svg]
-		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/scipy-1.1[${PYTHON_MULTI_USEDEP}]
-		sci-libs/shapely[${PYTHON_MULTI_USEDEP}]
-	')"
-
-RDEPEND="${DEPEND}
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtquickcontrols2:5"
-
-DOCS=( README.md )
-
-PATCHES=( "${FILESDIR}/${PN}-4.6.1-fix-install-paths.patch" )
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)"
-	)
-	cmake_src_configure
-
-	if ! use debug; then
-		sed -i 's/logging.DEBUG/logging.ERROR/' plugins/ConsoleLogger/ConsoleLogger.py || die
-		sed -i 's/logging.DEBUG/logging.ERROR/' plugins/FileLogger/FileLogger.py || die
-	fi
-}
-
-src_compile() {
-	cmake_src_compile
-	if use doc; then
-		cmake_src_compile doc
-		HTML_DOCS=( html )
-	fi
-}
-
-src_install() {
-	cmake_src_install
-	python_optimize
-	python_optimize "${D}/usr/$(get_libdir)"
-}
diff --git a/dev-python/uranium/uranium-4.8.0.ebuild b/dev-python/uranium/uranium-4.8.0.ebuild
new file mode 100644
index 000000000000..1f9643331be0
--- /dev/null
+++ b/dev-python/uranium/uranium-4.8.0.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=(python3_{6..8})
+
+inherit cmake distutils-r1
+
+MY_PN="Uranium"
+
+DESCRIPTION="A Python framework for building 3D printing related applications"
+HOMEPAGE="https://github.com/Ultimaker/Uranium"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="debug doc test"
+
+BDEPEND="${PYTHON_DEPS}
+	sys-devel/gettext
+	doc? ( app-doc/doxygen[dot] )
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/mypy[${PYTHON_USEDEP}]
+		')
+	)"
+
+DEPEND="${PYTHON_DEPS}
+	~dev-libs/libarcus-${PV}:=[python,${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/PyQt5[${PYTHON_USEDEP},declarative,network,svg]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		>=dev-python/scipy-1.1[${PYTHON_USEDEP}]
+		sci-libs/shapely[${PYTHON_USEDEP}]
+	')"
+
+RDEPEND="${DEPEND}
+	dev-qt/qtquickcontrols:5
+	dev-qt/qtquickcontrols2:5"
+
+DOCS=( README.md )
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	python_fix_shebang .
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCURA_BINARY_DATA_DIRECTORY:STRING="/usr/share/cura/"
+		-DGETTEXT_MSGINIT_EXECUTABLE="msginit"
+	)
+
+	if ! use debug; then
+		sed -i -e 's logging.DEBUG logging.ERROR g' \
+		 plugins/ConsoleLogger/ConsoleLogger.py \
+		 plugins/FileLogger/FileLogger.py || die
+	fi
+
+	sed -i \
+		-e "s/find_package(PythonInterp 3 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED COMPONENTS Interpreter/g" \
+		CMakeLists.txt cmake/UraniumPluginInstall.cmake
+
+	sed -i \
+		-e "s/find_package(Python3 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" \
+		-e 's/set(Python3_EXECUTABLE ${PYTHON_EXECUTABLE})//g' \
+		cmake/UraniumPluginInstall.cmake
+
+	sed -i \
+		-e "s lib\${LIB_SUFFIX}/python\${PYTHON_VERSION_MAJOR}.\${PYTHON_VERSION_MINOR}/site-packages $(python_get_sitedir) g" \
+		-e 's cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} cmake g' \
+		CMakeLists.txt
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	use doc && cmake_src_compile doc
+}
+
+src_install() {
+	cmake_src_install
+
+	python_optimize "${ED}"/usr
+}
diff --git a/dev-python/urdf_parser_py/Manifest b/dev-python/urdf_parser_py/Manifest
index b894a10da1c9..a98e4e154188 100644
--- a/dev-python/urdf_parser_py/Manifest
+++ b/dev-python/urdf_parser_py/Manifest
@@ -1,3 +1,3 @@
 DIST urdf_parser_py-0.4.3.tar.gz 21317 BLAKE2B 8ac3806ae2342dcef10adf952c0027c11d1241e4448b64a915acdcbb5145486c3d83bda344f2d2bd82fecae27f95ce223896e6762139f6ee7c5f687338ad631e SHA512 235f9648bbdcc57ae28e4029844dfbb4d7875b82849b24a76ee9f75391f5b93e7ead73b3f1f0216c17087017055364277e51bc03a09fa7901edee2fc7acd65aa
 EBUILD urdf_parser_py-0.4.3.ebuild 778 BLAKE2B feca51969303ea9e05274e8bd4699d2b85c848b6cbc91001b626ee5c0315bc1d74c7f53388dfd8295c68308531cdbdcc0ea2826f3041399a781594b99193d076 SHA512 ce17f6559c2690cab0932365a6dbe11615514fe5b840bc906d6e6a9bd5345b9a666144b1b1362a175ca6235df8f3bb661514acbd8886cbcf9b683149a7df8224
-MISC metadata.xml 332 BLAKE2B e32fdf158e352a3e43c6465c4ad378e44b9e01112f06e245d717d9ab6404be91a7529dbfd7b85d68fcf0168b296d7a6e55465f9a7a291112195968e3d3863361 SHA512 6efdc6c159b3764bf93d401fe111e3b102ea30b80c6a653d87f2be031f49f0e34919d4257e1a052be2ed4b88f5451c7bc11332a0ca7dfb284df31e31f5d821f3
+MISC metadata.xml 384 BLAKE2B e164c3a1a67f55b68f9f0e21cb7e7f6ab867fc49746597d670a90c14c01ea9b98beaa409ea95bfb0c6324761c8f6875c8230bebdeda25182184bde855c76f71a SHA512 c9d39d1e2e8f33914cea1563e69118fe1604cf13f9d762cc05fddc9b03c6c1c12d5a6472ba0ae87e9769630e1c1beb29e5aea68e2cf0f32a30076a94b2924326
diff --git a/dev-python/urdf_parser_py/metadata.xml b/dev-python/urdf_parser_py/metadata.xml
index 9bbf130c48d2..e79c08cb164e 100644
--- a/dev-python/urdf_parser_py/metadata.xml
+++ b/dev-python/urdf_parser_py/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/urdf_parser_py</remote-id>
+		<remote-id type="pypi">urdf-parser-py</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/urlgrabber/Manifest b/dev-python/urlgrabber/Manifest
index bc1590aa3879..002d8184191e 100644
--- a/dev-python/urlgrabber/Manifest
+++ b/dev-python/urlgrabber/Manifest
@@ -1,3 +1,3 @@
 DIST urlgrabber-4.0.0.tar.gz 86308 BLAKE2B 15195336d8e19331134b3bc1de29a669b80ab62c14e613fbcbbc1b8be8cb4ee1da3df317591989c6a3e3a403f8ad9071ca866006f23fbadc6283e88d5f050290 SHA512 01579281b1548c71737166daa6dfb7eaafceaf4afd9703f8e5e3193c33613750cb4291e3c7939065e995a173925965a16e656c43324f3b599f9c83d9e479e8c1
 EBUILD urlgrabber-4.0.0.ebuild 535 BLAKE2B 633a59ef8fee2c4c829978758c7d03ec5b5c559566a43aa1cb8fff68b675d8211df2b923dd42e3822ddd24b6ca9126ebb6d5a737ccfbc329010ca7a153c78375 SHA512 cad88565c543d06f3437006f50bfbd0067cdc3b2bd17c55da218fdd0a5d9eb7fa4100eecdfbefd01a9bcb5ea757b43a0c637dc55379e5284b9c12062f7daa190
-MISC metadata.xml 1510 BLAKE2B ea1a51d8b138d90a3349f373ac2430b7d943c80b7797527b07dcff99aca17887a4898fe08aed1bf1ee1f070716debb6bd0e4d25225cb46fbb0a8964bd1e6db10 SHA512 200f3e524f8762fc45876d9b2d1e1975e64bc17384a0f3a53b1459f7e4ac2d59f3dc7f80e6441e467af861fede9e6c1ae1d1b385fce3f586d99ee57291534f3d
+MISC metadata.xml 1524 BLAKE2B e00b20c0ec1de78a0b66bbe9293ec25bc3b22813f08c1d6db42e34c83d3fb26bbc977bde9baca5b7011dfa0c4fe94ca82766db569e3181341661fd9b79792e38 SHA512 387b2b964b98573902e78eb92ac214ce8ea8e98809ff63e17f0888163909a4202fbec1f9cf4d7aedfde1b0918fa521dd5db9768804553c1f25403a8261af9316
diff --git a/dev-python/urlgrabber/metadata.xml b/dev-python/urlgrabber/metadata.xml
index 61b9e764b90f..96c924d2a326 100644
--- a/dev-python/urlgrabber/metadata.xml
+++ b/dev-python/urlgrabber/metadata.xml
@@ -1,37 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <longdescription>
-    A high-level cross-protocol url-grabber.
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription>
+		A high-level cross-protocol url-grabber.
 
-    Using urlgrabber, data can be fetched in three basic ways:
+		Using urlgrabber, data can be fetched in three basic ways:
 
-    urlgrab(url) copy the file to the local filesystem
-    urlopen(url) open the remote file and return a file object (like urllib2.urlopen)
-    urlread(url) return the contents of the file as a string
+		urlgrab(url) copy the file to the local filesystem
+		urlopen(url) open the remote file and return a file object (like urllib2.urlopen)
+		urlread(url) return the contents of the file as a string
 
 
-    When using these functions (or methods), urlgrabber supports the following
-    features:
+		When using these functions (or methods), urlgrabber supports the following
+		features:
 
-    * identical behavior for http://, ftp://, and file:// urls
-    * http keepalive - faster downloads of many files by using only a single
-      connection
-    * byte ranges - fetch only a portion of the file
-    * reget - for a urlgrab, resume a partial download
-    * progress meters - the ability to report download progress automatically,
-      even when using urlopen!
-    * throttling - restrict bandwidth usage
-    * retries - automatically retry a download if it fails. The number of retries
-      and failure types are configurable.
-    * authenticated server access for http and ftp
-    * proxy support - support for authenticated http and ftp proxies
-    * mirror groups - treat a list of mirrors as a single source, automatically
-      switching mirrors if there is a failure.
-  </longdescription>
-  <stabilize-allarches/>
+		* identical behavior for http://, ftp://, and file:// urls
+		* http keepalive - faster downloads of many files by using only a single
+		connection
+		* byte ranges - fetch only a portion of the file
+		* reget - for a urlgrab, resume a partial download
+		* progress meters - the ability to report download progress automatically,
+		even when using urlopen!
+		* throttling - restrict bandwidth usage
+		* retries - automatically retry a download if it fails. The number of retries
+		and failure types are configurable.
+		* authenticated server access for http and ftp
+		* proxy support - support for authenticated http and ftp proxies
+		* mirror groups - treat a list of mirrors as a single source, automatically
+		switching mirrors if there is a failure.
+	</longdescription>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">urlgrabber</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index ce87121dd9a8..ba86a233ac6d 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -7,5 +7,6 @@ EBUILD urllib3-1.24.2-r1.ebuild 1703 BLAKE2B e1804f51aa6a97428113bf331bae402b83a
 EBUILD urllib3-1.25.11.ebuild 1881 BLAKE2B f2a921171089005271e27668bd1c48f67443dbe116319da9f43fec2b235045b5ed5ebd5f4349aa0c48e0f45f9b11b7ffde5a1ecfcb8d1c675b2ca95cd578c8cf SHA512 11762392c093a018d44cdfe6b31ae885614e326e61f81461cc22da982d1b98713fbf9597c20dad9ca8b04fb7568c8aa1e1abdabeb542abe9ebe13c8f565a2440
 EBUILD urllib3-1.26.0.ebuild 1890 BLAKE2B a25bbbeb8323df1d49b70a64693cae36153a7d7b8a1c146fe3f61db1fc402ec2ee119ca98da4c7d564c2956b3b1bd9c8efa55a86c84d5351397e64e0c737059c SHA512 40d5958b457670f4e37daa87276ff82a83feeb3cd611fc0b847960c3a339ca3d1860dfeac9fc00628eb2e63e09827a7b022e85f1685419d7e46184689a5465d0
 EBUILD urllib3-1.26.1.ebuild 1890 BLAKE2B a25bbbeb8323df1d49b70a64693cae36153a7d7b8a1c146fe3f61db1fc402ec2ee119ca98da4c7d564c2956b3b1bd9c8efa55a86c84d5351397e64e0c737059c SHA512 40d5958b457670f4e37daa87276ff82a83feeb3cd611fc0b847960c3a339ca3d1860dfeac9fc00628eb2e63e09827a7b022e85f1685419d7e46184689a5465d0
+EBUILD urllib3-1.26.2-r1.ebuild 1825 BLAKE2B a3bc60046df89ddfc65f3beefa400a03c8b4d01bf9c8b95defea674e5637469323e8310b2cd893973bc13ed3d97cf42076a2a6f07e8e15a9cc53f618ee46d885 SHA512 1393694dd64fd19f4b823cbad68027e65a96402c425ae2c818a74f1b4b466af48f0450a73711f30e6c90aba2e4eb2e5394341ecd7f95aea99e9c903a7ff86d6a
 EBUILD urllib3-1.26.2.ebuild 1828 BLAKE2B 3a27af42833ea21292351a0d1fb903f5a5da4d270028a2ea5034932e416b4b6c1eee05b3f73515c5b8635d7154f4829c23fb1e45a1379e0005470db96e593cb8 SHA512 89b717a8434b6833994381b095ece61ae7cd89cfa70c68441ae3119cc1c277f6718903f19c6ae36fb8ed3bce40dd308a81e28edff90ba78ba46385bea079d1f5
-MISC metadata.xml 548 BLAKE2B 47edce866bd0c727c4b945630c97f2944c34f8e81c43bdbe57e28c4859dd3e681c64eb2d3b75101ad41c85587890ddbc819a2fd04188331dd5fad23a1d9d0ba9 SHA512 014f625e8de5ea3f00628fe360db47dde9dc82efd0b11218b4118a20b7638bd4e6ac14253888073740c0dca4a19a196567cc2af1864d52f3e1c959389c77c9d2
+MISC metadata.xml 530 BLAKE2B 148b6a1936566b905f38f00ec231a832e827bbdd4f6c2ceabe521779b08c1dbf60bdfa182234e8e67b6708efadd09d29e93c151f7c3d1d4fcd5ece3e3d9c0839 SHA512 9ab9fa9ecb34855be0f6e7914f70eadca67854fde865765b1257feec6c841bccd8276ad81f8d9bbfb544ca753c3d27681d6cc841cee008efca5ba72f5a236f3e
diff --git a/dev-python/urllib3/metadata.xml b/dev-python/urllib3/metadata.xml
index c5e3b54263ca..7e9d137e62a8 100644
--- a/dev-python/urllib3/metadata.xml
+++ b/dev-python/urllib3/metadata.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <use>
-    <flag name="brotli">Enable support for brotli compression</flag>
-  </use>
-  <upstream>
-    <remote-id type="pypi">urllib3</remote-id>
-    <remote-id type="github">shazow/urllib3</remote-id>
-    <remote-id type="cpe">cpe:/a:urllib3:urllib3</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<use>
+		<flag name="brotli">Enable support for brotli compression</flag>
+	</use>
+	<upstream>
+		<remote-id type="pypi">urllib3</remote-id>
+		<remote-id type="cpe">cpe:/a:urllib3:urllib3</remote-id>
+		<remote-id type="github">urllib3/urllib3</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/urllib3/urllib3-1.26.2-r1.ebuild b/dev-python/urllib3/urllib3-1.26.2-r1.ebuild
new file mode 100644
index 000000000000..2345ae630e33
--- /dev/null
+++ b/dev-python/urllib3/urllib3-1.26.2-r1.ebuild
@@ -0,0 +1,65 @@
+# 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 )
+PYTHON_REQ_USE="ssl(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
+HOMEPAGE="https://github.com/urllib3/urllib3"
+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 ~x64-macos"
+IUSE="brotli test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
+	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
+	brotli? ( dev-python/brotlicffi[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep "
+			${RDEPEND}
+			dev-python/brotlicffi[\${PYTHON_USEDEP}]
+			dev-python/mock[\${PYTHON_USEDEP}]
+			dev-python/pytest[\${PYTHON_USEDEP}]
+			dev-python/pytest-freezegun[\${PYTHON_USEDEP}]
+			>=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}]
+			>=www-servers/tornado-4.2.1[\${PYTHON_USEDEP}]
+		" python3_{6,7,8,9})
+	)
+"
+
+python_prepare_all() {
+	# https://github.com/urllib3/urllib3/issues/1756
+	sed -e 's:10.255.255.1:240.0.0.0:' \
+		-i test/__init__.py || die
+	# tests failing if 'localhost.' cannot be resolved
+	sed -e 's:test_dotted_fqdn:_&:' \
+		-i test/with_dummyserver/test_https.py || die
+	sed -e 's:test_request_host_header_ignores_fqdn_dot:_&:' \
+		-i test/with_dummyserver/test_socketlevel.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x CI=1
+	# FIXME: get tornado ported
+	case ${EPYTHON} in
+		python3*)
+			pytest -vv || die "Tests fail with ${EPYTHON}"
+			;;
+	esac
+}
diff --git a/dev-python/urwid/Manifest b/dev-python/urwid/Manifest
index 0406265ed58c..0f9c29e9377f 100644
--- a/dev-python/urwid/Manifest
+++ b/dev-python/urwid/Manifest
@@ -1,4 +1,4 @@
 AUX urwid-2.1.1-ignore-resetting-to-invalid-locale.patch 998 BLAKE2B c76965b4bb61df264d01ec898d327f99e761909f49b7fcb5fcf222eaf74fa50fd89d16477d48d1fe939ed98d1c3c55969cf0b6e50204e26f6b0adf395edfe042 SHA512 d2aa4e8edc96583b7a1c68788e9301d200004100a00fa03157e0c6cf0f295b1320c1f1d249c9b67d30766cad65ee36ea1b5796fa9312f8cda52b509e4730af67
 DIST urwid-2.1.1.tar.gz 633082 BLAKE2B 93393cc9f8e755cf2e25119f26487e062ab145ff4c966c69ad0b153cc2a286aac4f70be9b7e82c57f644fb850f70c88c0c9562cf1c07dcdd427e0afe409a01b0 SHA512 08fc51205f0adeea0ecce876ca17d921961b665894aef440fd826ef0f8b9230cd8d22c5db85fcf4e227f8e70841e3439860e5035ff874b8d0c1834111c3a97db
 EBUILD urwid-2.1.1.ebuild 1098 BLAKE2B c9404ba23aff3958ab956b6c7d9c4e828e64047cf415644ecea93493c31a2e28372370f84babe945a58cdbd76d05bacd869717a44c7d4bd6167d12de94e8d6a2 SHA512 0ce958d3db1411dffce23ba5c0ee06157d2119b4d1700754307fc6f7e758d0d0d32e85bb5ff918c5233c7c72fd8af1689f71373a59b9406fcb59f9071a62e510
-MISC metadata.xml 1152 BLAKE2B 4b992c5bc6907498186b29eba5804d17341a20715dfd9ea568e0b066d5f6b8775a79a703be450a436badf46d052a790a62cb8ce7100cdb54f24faa68eae6ecda SHA512 4bb4df4cc9398e2b77815b908cfc3821a96370e083a7b4452d601009186bc2c29418987f6e9a25d64332a15b860addb66ee4594e30ea51f34a1eae2d8be0a680
+MISC metadata.xml 1193 BLAKE2B ceeec121b1ee851353b2718b89c2bf61a6fc895831e62ba77816f9dfe8910d0a257d9dbad54b6b240ea4c3d542c31937280c118bf9c73c67abfc627ec8e5648f SHA512 80e6a007e5666acb4ecb8dde5959953c4019d9abe0e2b90c2fc29b7bbd355df1eb6c53d0e16ee2f75a2079fe8c6b859f0057fbf86311b6cd5a6f0bc5d6a1c378
diff --git a/dev-python/urwid/metadata.xml b/dev-python/urwid/metadata.xml
index cc6ab1eb0d40..7838b9b6a380 100644
--- a/dev-python/urwid/metadata.xml
+++ b/dev-python/urwid/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <longdescription>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription>
 Urwid is a curses-based user interface library.  It includes many features
 useful for text console application developers including:
 
@@ -21,8 +21,9 @@ useful for text console application developers including:
 - Buttons, check boxes and radio boxes
 - Customizable layout for all widgets
 - Easy interface for creating HTML screen shots
-</longdescription>
-  <upstream>
-    <remote-id type="pypi">urwid</remote-id>
-  </upstream>
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">urwid</remote-id>
+		<remote-id type="github">urwid/urwid</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/urwidtrees/Manifest b/dev-python/urwidtrees/Manifest
index 5615101a0f3c..1af3e24a03a5 100644
--- a/dev-python/urwidtrees/Manifest
+++ b/dev-python/urwidtrees/Manifest
@@ -1,3 +1,3 @@
 DIST urwidtrees-1.0.3.tar.gz 292930 BLAKE2B 91487debf4878fb58cf2505366a4762a4c755b53eaac86e3ac912d2972c66442828e152749f34e73ade10fd1b912054e4047900e0b54b960629909c1b03e2270 SHA512 f7d69d359ba24345a694659fd9432335679f4b505a5c0e33baf9fc0c068935148c393aff8e11cd5f2c12aa26884aa37ba86e9b3a763472e382d73dd57fd32cd6
-EBUILD urwidtrees-1.0.3.ebuild 668 BLAKE2B 7ee94ddb554d4ad1cd8c0cfa6ae62617e3ff2fc3e29dd5d5eceb4a49b91fb5bbaf0f51831fb4e91d1325897e8ba56752cc370c8ff9a9762282770de6d82b7285 SHA512 a0f37453a70174eb503902b4a57cae5fbbef3796ae185d05d98d888ed918445131de63f23d88a12233672a861148745a0c1cc57ad61e48afcc85bc770f2df8be
+EBUILD urwidtrees-1.0.3.ebuild 667 BLAKE2B f162930a39c78590017ffdcf809639e393eaf9eac6b8f4025f4ec8e770710f18f381af711e109e538adc01305affa7fbfd735ac506576e540e02a2da575752db SHA512 046f12224093f9f9997357663c19147117ac39a9a1a316d5420b5b4848f1bba3ac5e0db412921dad9ca2233af8134969ae336eb6f06d4ba626fcf0c6f484ca92
 MISC metadata.xml 668 BLAKE2B ca8e96fbb2a3ccc7514e4800780a1e0e153edc50a72e7834bc22b3ec539272ea5b9e39060f55698985c8785e92cb148294888976de60628e2094578db92853e1 SHA512 0e2b5276ab8bd5d16f94c28a39cebaacacc297da93fbd25f0d9afeb150af820930e0ca63e6adff20ec53fef4274062e8c607b5aaf1ef07df6d34cfce0b6c9f35
diff --git a/dev-python/urwidtrees/urwidtrees-1.0.3.ebuild b/dev-python/urwidtrees/urwidtrees-1.0.3.ebuild
index c435a32a3b0e..2a642fd13a29 100644
--- a/dev-python/urwidtrees/urwidtrees-1.0.3.ebuild
+++ b/dev-python/urwidtrees/urwidtrees-1.0.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pazz/urwidtrees/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND=">=dev-python/urwid-1.1.0[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/utidylib/Manifest b/dev-python/utidylib/Manifest
index 5dc9bd0aa10f..0a20f3d1b6c4 100644
--- a/dev-python/utidylib/Manifest
+++ b/dev-python/utidylib/Manifest
@@ -1,3 +1,3 @@
 DIST uTidylib-0.6.tar.gz 15771 BLAKE2B 9d4fe57d985ea6e52680bd528862d3236137221227a23fe05b886d01d240e21d7159dbf7d6da3af8020009ca45c60c2297e374bb7aa05cb6b5a8eaf444710c58 SHA512 a85506ef8824f66ee326ad651020dc3b4e00190e20dcd3814984fa27ff319f492fe5bac781b7c43c8694cbfc63409e3abda18981969c9be2c3cd023fe7a4f2f8
 EBUILD utidylib-0.6-r1.ebuild 945 BLAKE2B 91010116ade26a22e77e1988bf1a5b4f4d3376f086e076b9e2a24f405a840712d3f3da02ec68ffe6dcdc96cee2f15d03a211ec68c65a0bf353914a1747c2d496 SHA512 a4179dc23312b4268ca35cfe45c5de74e864ec81033faf4dd0cd486b1571ede7a8d6e23c7c0ec04b4db3b357004bfb5bdd24946abfd7dd03211767edd3d72a94
-MISC metadata.xml 372 BLAKE2B 58932a89c0765511f1231a3ea43ac6509792a03b345655f7d15ec306a33a0264d49b32352c57e8d3cc73294c8cfcbd679289011312bdbed55459f6751dabffa0 SHA512 d6602ff98aa2ae6a69cad590ab014cbe5b3f1fc1b28c64e91025140fbecaa78c49d6e45bc8b8b5432b0cfe4c91402db3d3954db92905ddc42c13540a9c1e2ab5
+MISC metadata.xml 365 BLAKE2B e85ac3e7839fe863c3eb5cb648892afc63567c05a598e8c43345cf45774faf16c849ea3d82ff89af078640f7e54c0a40c04631c537564920b4f69bd17fb39516 SHA512 b90faf30a65ec1dd177f16a969cc11372d0af82948aa2c4833be23109453b4019be87995fe80d7323cf0e62bd6ef4157b22b85a643222463daeaad91881662e8
diff --git a/dev-python/utidylib/metadata.xml b/dev-python/utidylib/metadata.xml
index a9a29c978e98..b3d893285cd1 100644
--- a/dev-python/utidylib/metadata.xml
+++ b/dev-python/utidylib/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
@@ -7,6 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">nijel/utidylib</remote-id>
-		<remote-id type="sourceforge">utidylib</remote-id>
+		<remote-id type="pypi">uTidylib</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/uvloop/Manifest b/dev-python/uvloop/Manifest
index 8008c8becf74..280e098a95e5 100644
--- a/dev-python/uvloop/Manifest
+++ b/dev-python/uvloop/Manifest
@@ -1,4 +1,4 @@
 AUX uvloop-0.14.0-asyncio-test-hang.patch 1175 BLAKE2B e97cef3438a603249e8b1977b2a7f3d3b636d3f38c59c4075c01fc0660b6afd01a64528655bd9bc9c0845fbd88c86f8b0ad5571052a02e511587fe73d87547fe SHA512 e8219cc1c644c220d7626790be5fc701ac27486689b7bc57b70dae818c51be8b3d1e524684cbaf6aaa2de199159b1af9534a913e7d8f1c209b87e3a2208dfb43
 DIST uvloop-0.14.0.tar.gz 2009041 BLAKE2B 4d984f5023e0974ee68795e6cf29585cee32345e8a682611a72dbc36efefdfeeecb3c22aecb581ff7e5ae826345e1de3b0e6c7a6e8319829b0b3cbe5a180ed11 SHA512 8a9a64c91fd34c65a1c40d8d76ad7dbd7e959d45188ef81cdc06995312f52106b2c648a504d51b64b470e54dfc4854dcf9a05cafa3d4a42f1bc1e31766114d61
 EBUILD uvloop-0.14.0.ebuild 1278 BLAKE2B 2ea3cfe8707c8b47eb05cd5567d31168d82f26ffabe7094c7a99369cce63eed2f249973ee480e7b95fedc01d4fd615ddce6b6983e75ca4c64e4771a61101c930 SHA512 e0bae7cf397a3e9730d54b0f8d266f9eab4bb7b0ddcf8c581291e33c7a80a4009c530c204f4bc49d05af3224a9e404b93308c687b5789953283b13a005d68f92
-MISC metadata.xml 544 BLAKE2B e4154e8b5cafb357fd48ff454db34f4f7e8e2c9811222ae19285660f2a237e30bb9558692be2b82572d3108f1252ac483f488274fb88337e4b9ab2d731046a66 SHA512 2c081d40c5477bd63d98ccccc8ce7f73933a01d7ee7f39b332a9a0cc3018cb9765dd81510fa9d27845760bf384ee40d5f699aa1a9df934d595624b1f5bff7518
+MISC metadata.xml 526 BLAKE2B 1c5d5ffd994ab70aae22d5a6312708a168f89790a5999d81ccf4eab552e910fd063ace9f1e51d1b477ed96604a23265f586781feb7b692d1f49a0c502d59dd3a SHA512 e38163d8b0b033c5825d4f977cb58bc727195a7e577eb229a70c4b089943ad99f4c8121e0d4e209db51fe2977ffad2f88b8bfae3baedd853eabefabb15578b85
diff --git a/dev-python/uvloop/metadata.xml b/dev-python/uvloop/metadata.xml
index 046b9f3e8b97..c06cbe222fc1 100644
--- a/dev-python/uvloop/metadata.xml
+++ b/dev-python/uvloop/metadata.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-  </maintainer>
-  <longdescription>
-    uvloop is a fast, drop-in replacement of the built-in asyncio
-    event loop. uvloop is implemented in Cython and uses libuv under
-    the hood.
-  </longdescription>
-  <upstream>
-    <remote-id type="pypi">uvloop</remote-id>
-    <remote-id type="github">MagicStack/uvloop</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		uvloop is a fast, drop-in replacement of the built-in asyncio
+		event loop. uvloop is implemented in Cython and uses libuv under
+		the hood.
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">uvloop</remote-id>
+		<remote-id type="github">magicstack/uvloop</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/vcstools/Manifest b/dev-python/vcstools/Manifest
index 587d0cd07f12..90d2fa061a02 100644
--- a/dev-python/vcstools/Manifest
+++ b/dev-python/vcstools/Manifest
@@ -1,4 +1,4 @@
 AUX yaml.patch 1063 BLAKE2B 33d954db0dfb7caf5db07bdc287ff8f7fdb74edad7f92ea5ae3ec1076fd02077e3c87f2d12907a6eb9e419b506bafab7ca84dd0c2ca282aa08d24eccd3054ff8 SHA512 c2fa16dd567792cf7b31e1bc3a22d647ac40f4e3302c74e61202b8cc1bdb099031029ed8090ad27d54aed7d93052cc099a6bdc2e8849194ade2db44bea44eb5d
 DIST vcstools-0.1.42.tar.gz 65979 BLAKE2B 2deb29116e891bc93410e4a8f58938009140d01baaa834cccfdba2be3243d98bb11507fd134284bc1dbeca1434ea0eeaf2ed332dcb579bbacf1bc92815f8623d SHA512 1b54270c878684862eb607c2e445fe24d8edfdd8ea2cc75e899044d9e8e89a882fd2dd6fb7825553f83003ae7af08850c18fdeaabaa107a6bfdb2759b32e8fa6
 EBUILD vcstools-0.1.42.ebuild 1470 BLAKE2B 1958a16eb9228ca690d54142aaf2c34e28eb223e8b722909d1d15aeb4d34ce0f4c5b727b0f6cc84d14f8586a4f646756831784d904ee4a7e15a766044230a09e SHA512 dd1d4a08cdacf579248ea877e83b3acdd175b094bcd18807022467e0f22975b89390de6e87625ddb94425ea7965e0ccaa2df1831acbf10ad4be1b6f942582933
-MISC metadata.xml 331 BLAKE2B 11f0b79892ca57b4abcbd3e0538168569338972295dc250516dabf12f650416d013be219d17401ae24129ba40bea056e4831940982ae6b0368046e1efbb76974 SHA512 dbc3f8205ab4e4788a33377fd00d438a9bcc4558ff02989f20befb19de690428d377ca8e0450a47bfdc8654f74123e0e4b02a9a26ffe4f27e1a737266f5cf918
+MISC metadata.xml 377 BLAKE2B 8726677cc61b66d31a97e24d77ce807d02acf7641763749e80f335a9377727af0af53ae5f864d3e8e0fb936378bbef06c179c7d11b36432a208694f45c988575 SHA512 66524b4e99201174e022a8cb170e4d3203dc4349ff70811068d90e65c87ff40f9c064824fe59934086f911deb35dfbe709342d3b79b520ad383206e63e4add8e
diff --git a/dev-python/vcstools/metadata.xml b/dev-python/vcstools/metadata.xml
index b60fa728c8da..37147c6c9043 100644
--- a/dev-python/vcstools/metadata.xml
+++ b/dev-python/vcstools/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">vcstools/vcstools</remote-id>
+		<remote-id type="pypi">vcstools</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/verboselogs/Manifest b/dev-python/verboselogs/Manifest
index 1d22f388cf57..f66235d1ad54 100644
--- a/dev-python/verboselogs/Manifest
+++ b/dev-python/verboselogs/Manifest
@@ -1,4 +1,4 @@
 AUX verboselogs-1.7-skip-sandbox-violation-test.patch 756 BLAKE2B 3766d28085f4eeb9167fe37f1f1b78dc9c2d1b5e8c401a402b7231bc33e9eaa31dd1a6ae8b0e4052712a173cbb8339361c18b5c4b0d794fcc902650ce6fa19ca SHA512 19f4bd82b49f2b97c7d99154b80e0d63c70211040d73e6cf7ad5d4523f3b15c6cd3df865a8584fd0ee0a255c2463b0057da15ea66f1b28682eeb568120e5d172
 DIST verboselogs-1.7.tar.gz 10338 BLAKE2B a0058a4697d642cc984e68983d499745b644380fd82a45d2aa424cb92b053da2ba5ae225f960427663c49ab78c47ed65c755b43d61c9c978dd881b52ce371ff3 SHA512 13e96ac21e1cb5c68428b348bab63fc4d4ad34eaffe8e1554c05380f9115d2a3ccc6fa2e0a5ca8941e73bfb06537a3e46f29880e7ba3f47da0284279a9740211
-EBUILD verboselogs-1.7.ebuild 715 BLAKE2B e6f51dc5b7339f721bec56e615520c0d635ae661db4db1c2ad7af65731148ea87bfba1d78f7bd1377017244ee6a4a3bf53bf4b6bc3cdcfdfbf324f1afb3b0744 SHA512 dc96e68718878401f17897ed24871726654b6426e29371320bf6d07944978780c404d1ac9fa6214b067058b6bd42c879614ecca561ff393cf521e6ee5a073e50
-MISC metadata.xml 324 BLAKE2B 6c8d909bd018e46f81fef3a30b87b7dcec5d48a31e919c6c60b000982d31486cb6fd8639afe42351579099454757922d7b05be5e196a3902b6ee199ff5817955 SHA512 4e0057695d4ab3557dc29f6ae0031d780cceabbcf6c0b07cdf80f11052e64cd90994c93a4d09213f875d54a1bce1cee88287ab223bc4d7c0cf4a70095614c039
+EBUILD verboselogs-1.7.ebuild 717 BLAKE2B c21bb650c0348633cbe6738e86fcd3a7ed81eec0ed590058604acc629acef8c06f163cb0c9af99275c455ebcbf61135c432b973aa5feb141d5f626a20035d809 SHA512 0a9bf6f8494307445459a997d8902248ffe7ca78559f6aa41bcbb79dea30945c3ffb62d492f1f119ead5a68e88aa1e4a8ce644f5fa1b25407fc1e807c8a000d7
+MISC metadata.xml 378 BLAKE2B e3c3ee66bfbde20d93f9f8c6885ffe98010f82ea325d906082a422b83d73fed435fc3174a73d618f9e4f65be38a28e96d25fac1d74b05a0d70c33f50fe7ae14f SHA512 cef77e9ea133f7f121cac0bc9bd73cd512d9df544dc43f6fbdd0740fede415257c6a4e91a62746c8fbe5817ec4796c0e8b5c9a47349ff84151a747c54eaa3d05
diff --git a/dev-python/verboselogs/metadata.xml b/dev-python/verboselogs/metadata.xml
index 6f9b8643810a..cbd7a3e94639 100644
--- a/dev-python/verboselogs/metadata.xml
+++ b/dev-python/verboselogs/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">verboselogs</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">verboselogs</remote-id>
+		<remote-id type="github">xolox/python-verboselogs</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/verboselogs/verboselogs-1.7.ebuild b/dev-python/verboselogs/verboselogs-1.7.ebuild
index b4e84ccc0639..f6d9c34aafbd 100644
--- a/dev-python/verboselogs/verboselogs-1.7.ebuild
+++ b/dev-python/verboselogs/verboselogs-1.7.ebuild
@@ -8,8 +8,8 @@ PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
 inherit distutils-r1
 
 DESCRIPTION="Verbose logging for Python's logging module"
-HOMEPAGE="https://pypi.org/project/verboselogs
-	https://github.com/xolox/python-verboselogs"
+HOMEPAGE="https://pypi.org/project/verboselogs/
+	https://github.com/xolox/python-verboselogs/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 6e4e57c35f77..e49d667d3b44 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -6,5 +6,5 @@ DIST virtualenv-20.1.0.tar.gz 8284462 BLAKE2B 4356c9c49f7bd2dbb6cf8998be5cd39708
 DIST virtualenv-20.2.1.tar.gz 8286055 BLAKE2B da77c51b352e979f05515107df49101a70f97da01862ae92aff0e185065edf1d6d517ee68057f1f2efe5ee999dd9dec24c0f2967b1f10130b446e83e478ccbd1 SHA512 e7877a9766bc47f47a07219258201ad8457ca587a04d61119a0516da43016dda4b5cfeaf725dd0b06f1f896ac8af0f3d7a2ceed3d3f35ac7a4b6ecc607c84118
 EBUILD virtualenv-16.7.10-r1.ebuild 1959 BLAKE2B 90c31ff96e46d24169602a0f034bf02f0d5fcc4132b1ef12a06226580ed2737398c889a0f752cd14c99f310a72642664aacc27024a65840a8541e580ef601deb SHA512 ab7f3e64008dc6320e2d0a280087b7ae26f934eaa7d571e2f8e01c4e21db7356476fd002918b6217bb52827f22bcd6f8e527e53c1011824d8d32be99c452bec8
 EBUILD virtualenv-20.1.0.ebuild 2561 BLAKE2B ec380a7e74f591487018c4c6a52aa2913fa3569dd8773f0a825c474465ec8f8eb043cc6cd11627d16235a53021980798fd504d37e40df557594e433c27489843 SHA512 f238950a65644f6898d49085f99a7eefb57d7a9ecaf9fdb0ccbf727e5c3076f157fc0bfbf2574850e5a3eb8ec1aed50390e648eb199aa3d8dacb34ddc5e5c51a
-EBUILD virtualenv-20.2.1.ebuild 2581 BLAKE2B 603603c7bb8c6d4e2061a85780a0d637948ca3158e76894582f269e0f5ad4872b35d83faa76c524e08148aa7a66dc335a5fe2d10f6e37b79a62a55122eff80d0 SHA512 8daa292af1b911411a1389a9ba7c47c36c183def2331b635af53b185c9188b6325c9818e08952d8ebe9cad4accdd7b157d09aa40efa997d5fc03309b1b7f78e7
+EBUILD virtualenv-20.2.1.ebuild 2587 BLAKE2B c795e89a5941719e89c36fb53f81caefd75d817433f3350361bafbf97e8b2137beea69cfb11b7ba52e79d4b2f8ad6f1817b55e310a9fcae3af6c94d56bb8bbf5 SHA512 4a697225235e885fc515f89c4265c02787e6a03f84b8df873e83565a947054c2daa92e78a10b444b38c8facafe1d36afdefcca279f0d6e35ba047d9b090b59a0
 MISC metadata.xml 405 BLAKE2B 65152299182652973b0a6387a690d6e04066d9ac05167d6f0ef7d27036813a793503d16e65514093869ed596227123f493dfdba021a094b0021b6c5b98cc0cf7 SHA512 13db4a863e2a82bae1d177967fc45821a59fddc9afc5c9bbbc0abf64fd2c57cb1f7053443d4721c3c91b6562c1b3844560fccc5853f14bce387aabc620167eb6
diff --git a/dev-python/virtualenv/virtualenv-20.2.1.ebuild b/dev-python/virtualenv/virtualenv-20.2.1.ebuild
index c264e57be904..8efb70db5007 100644
--- a/dev-python/virtualenv/virtualenv-20.2.1.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.2.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
 SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/vncdotool/Manifest b/dev-python/vncdotool/Manifest
index 6e26c8d2c81f..19d037c49d45 100644
--- a/dev-python/vncdotool/Manifest
+++ b/dev-python/vncdotool/Manifest
@@ -2,4 +2,4 @@ DIST vncdotool-0.13.0.tar.gz 72780 BLAKE2B 6a27565c5410148f569bd5a8e212327d734f9
 DIST vncdotool-1.0.0.tar.gz 62580 BLAKE2B d09b26e81496055f17e96fa5b60ea006ddd210fa8b0044785c107582af18a61fb5beec83f577222b32cc8f446694235cd3ab468cfa917ec3ef4b00b6fbc1a8bc SHA512 45fba9ba3549ad575923bcfb3ab62c53b3c2d85882c87ca2b656795314b9c32aa989a1fdae280f904cb4d79f509622810ffd4d1e2977beac917f0289d6ff24a4
 EBUILD vncdotool-0.13.0.ebuild 1063 BLAKE2B c01fd13ab2e61f03301f3b967f85a5d7520a8003e3cfcbb55543f940a28c31ddb2b60e4a40f9049b042b5849b5cb7d7f90df3e50e9f5d9f9ed4bf70c39956e84 SHA512 d1486e69c12a7e720e2c41089fc3b107d3c85b719df9ba80635848d6b739bb0ebe896745b5712cc01fa8dd5e7a9b7cb14f83654c327dad38f1d7267da7b96408
 EBUILD vncdotool-1.0.0.ebuild 1063 BLAKE2B c01fd13ab2e61f03301f3b967f85a5d7520a8003e3cfcbb55543f940a28c31ddb2b60e4a40f9049b042b5849b5cb7d7f90df3e50e9f5d9f9ed4bf70c39956e84 SHA512 d1486e69c12a7e720e2c41089fc3b107d3c85b719df9ba80635848d6b739bb0ebe896745b5712cc01fa8dd5e7a9b7cb14f83654c327dad38f1d7267da7b96408
-MISC metadata.xml 399 BLAKE2B 72383b60768afc4f954301326f2ef872f84ec51840e0e33bc8dc03ab2c78a6cc9823ef65e9ff0b13adcd1010ced23ebe9d08960f124d3011a8c564182c6371ab SHA512 1acaa4d603df87bdf12ca4ad006d064570490e7af5083dd6434439e3c8182ed14560d50281509a5714cfd6fcf382d4663771ac00e8bee7f0f96240fc88222e70
+MISC metadata.xml 471 BLAKE2B 783af68032a1e8249b608a515f00f95441eb14959ad95fbec52c35641d00a7665a483b6c6026e6b254b5e527379cca9eb82c348dabc5b3461f7ca9ac973e97ce SHA512 f29948818245b44ad679ffbdfe11622e37f183648448ab3b23b6d11ace1e5c045984f6019e3dd1267662d9be691fcde78e4e2839638d0bc7757165450c0df57f
diff --git a/dev-python/vncdotool/metadata.xml b/dev-python/vncdotool/metadata.xml
index c12ae293d46d..6bdb075d75c3 100644
--- a/dev-python/vncdotool/metadata.xml
+++ b/dev-python/vncdotool/metadata.xml
@@ -10,4 +10,7 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">vncdotool</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/vobject/Manifest b/dev-python/vobject/Manifest
index a50bae2a720b..166e35aa8375 100644
--- a/dev-python/vobject/Manifest
+++ b/dev-python/vobject/Manifest
@@ -1,3 +1,3 @@
 DIST vobject-0.9.6.1.tar.gz 58556 BLAKE2B 74f9a7dc8058bb792492b1ac44a0310f58c603e677aedda35be0d8e94743e6e1e001a4ae888625f314f706891b7a31db77efa4c268482bbaf44ca37fff236cd6 SHA512 0b299fd4ca105a063f4ac7b03b157c54a3867d6fb798f9072897939b0ba275ba0887bb001c5ed38002a8eb1c10aee710af880413c072140b855af4b62d5aff72
 EBUILD vobject-0.9.6.1-r2.ebuild 787 BLAKE2B 0ce03372918e4c8a3b50d05ee786538a9b1c46f2f73c3500d2e31696e3e86183df83518c0cd6d3d5ee9b7e7764fb60d65bf2e6d9f20b1be1cc148b9b931266e4 SHA512 c6fd0263c8d28f9bb97dfd4dabc8bd557c1a5ae597f01b6c975f6e484466db26a43f89aec8d456c99b6c924d53f3c09d2e6c062ebcb440d37ef1095fee3f87e6
-MISC metadata.xml 346 BLAKE2B 3d1f3f0efd8481b912aba7675d50f338b831d06108734b4622bf2aab5e0df5feff99856544ad12b5d2ac80393d16dc687a06359392c96e4c652ae062469a5095 SHA512 51588af560593c3553f3fa1fd97c1a058d71e819df55261ff7dd24e07a23f5f0290902debd56d509af4b8696d92fd4853f2deafb11b4d9a357fae754e7b62d8b
+MISC metadata.xml 391 BLAKE2B 04b9d75028ac6adaa3d30af50db74121c1abb0a91cb5c87fe05692df93d56001462711cf30025a1fea89d71270a5957cdeb14f87314c8187bb79a5c88966df1f SHA512 206c8605cb4ee10c08b892ba63584af727e17fb0430b2d09dced0c202fe63d3ecb60554ba76cbbd7e2e85ba27f594314bf427d25619f83855466ee23bf7d4ac0
diff --git a/dev-python/vobject/metadata.xml b/dev-python/vobject/metadata.xml
index fd720400b6b7..60cfc36e5cf7 100644
--- a/dev-python/vobject/metadata.xml
+++ b/dev-python/vobject/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
@@ -8,5 +8,6 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">eventable/vobject</remote-id>
+		<remote-id type="pypi">vobject</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/voluptuous/Manifest b/dev-python/voluptuous/Manifest
index 507298a6fe9f..ebc3f6a54e77 100644
--- a/dev-python/voluptuous/Manifest
+++ b/dev-python/voluptuous/Manifest
@@ -1,4 +1,6 @@
 AUX voluptuous-0.11.5-fix-doctest.patch 193 BLAKE2B 7880210f220cc65a4ac3692da728fe607e2accea6722232dd0bbef2fcc29187e661afb326741caa0d47f9dc96b6b5bb1cfcd064019dae66636054e1b2704f01f SHA512 d261e24685e551de96cdd68e1e0090aa639198f2647ad5d68f7d0d45b834ede99c52e5439ed0b41f3271aaf934519105c8e0820ead288b1748b18b0ee734e977
 DIST voluptuous-0.12.0.tar.gz 46958 BLAKE2B ec41ea9d5775bdc443153b913bcef7e73f14e29d47c6997e5597958b59c2b1143c83b65ca08d2a06aba3725f76f9168be4f46f68d91d87ceb4e4e3b6643e6800 SHA512 7c72d965f2a2eeb2ad099a19b41e2249b9921e51985ff975ed62fe5a6d5b3f2d5c2a7d6fc2cbe3c80abbea17cfc46c39f1953db5daecc0faafb348c838f80417
+DIST voluptuous-0.12.1.tar.gz 47476 BLAKE2B aa991ab2131e478eb06909c8b7ca86158980b47431d7fae82f41ab2c09b2d23c21d6da937394732cb479436fc247268947c3b31701c6260132cd6f9c7f7e288f SHA512 14ead6bd99c9238318e7ed39fa543cb3363cbb0716a251061e6f533b8fae3fd5e754bd6b2756b6d76745da0e02236e04bfe0ae4e25dd87d291bb2a716660eebc
 EBUILD voluptuous-0.12.0.ebuild 535 BLAKE2B 7a44f9d16a2b5ea9e8210e6819b642d40fb736fa1a5049d6afa8a13d58faee85fcd4db70bfa5b3640aa2c973f069ca7a1ad9ae9db6f8458d4b9a6fe14fab4b51 SHA512 464e35ec91ad0d87ea802153c291c07d6a61bc8a64af059bbb512c1adbcbc36efa96a82dbb88d1e0afccf55ebde3209b5344616e53417478715acdf8d8e1d1ef
+EBUILD voluptuous-0.12.1.ebuild 541 BLAKE2B 3991e82383c6aaa9df0e8f49a1a5aa8cf1022a1201d99e8bd33039955d3f292a37e971d13391efd85c023f5ad6ed20529078707494b3816fcb519442a34bcb9f SHA512 a926c4c872edc46771b37f74b0bd793299f8f7bbb311b7262fc11419bf33c9224408673e77825c4428dde61a40524b6446e0d8a673da1c18feeb3252ffc3179c
 MISC metadata.xml 715 BLAKE2B eabd841d6e3b41642a3572c0f46f0c22cfd61f7afc75e53992dd3e32a3f94e0ce5014e6fcc2bb40d01ad53c7afca5806cb644ce432a40105d574f81bc0830ccb SHA512 4e17933aa52bd1ae97997122285712acf1bb1cf6b40e7ecc454a55b9fa729a34bb8bd0173f949ecfd9adf80f19e6e2d8b4c173b8db599d4cb434b5aa06dab9ed
diff --git a/dev-python/voluptuous/voluptuous-0.12.1.ebuild b/dev-python/voluptuous/voluptuous-0.12.1.ebuild
new file mode 100644
index 000000000000..d0c398fb00b3
--- /dev/null
+++ b/dev-python/voluptuous/voluptuous-0.12.1.ebuild
@@ -0,0 +1,20 @@
+# 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="A Python data validation library."
+HOMEPAGE="https://github.com/alecthomas/voluptuous"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.11.5-fix-doctest.patch )
+
+distutils_enable_tests nose
diff --git a/dev-python/vpython/Manifest b/dev-python/vpython/Manifest
index 13b702d79860..386f9c5166a9 100644
--- a/dev-python/vpython/Manifest
+++ b/dev-python/vpython/Manifest
@@ -1,3 +1,3 @@
 DIST vpython-7.6.1.tar.gz 3552831 BLAKE2B 78281ebbdae2bf09d139569cd344f32aa77aad59ce988a72c57b9984774bc376348c6e69c9119822fe1fbd5dbe6cecf81f17da3977b257c64321e4d4f2deb755 SHA512 8a06bf41865a6bb61c6616c853889b24128f32a9ce1eb8cd9ff861e4995f700ea24e7ffc04fd1edf9cd823a1a592083202abecb1373d5f544facc8646f0cf30b
 EBUILD vpython-7.6.1-r2.ebuild 668 BLAKE2B 2a40d6c4d434a0c097e2acf2718e5f48bbb99e2a14d1d56d50360bdfcdcc37bea55d9b103da9edbd08fdf3a2da4fed9ed10489b004394a5091343b9f2f643b60 SHA512 e38bae96de59cd5af18d181fa158f9c36d57429629c0f0aaa6aaba93339084cff9542d10e4cb309a05b1bf31af46fc709816aaa3cd64608e9ac7adc13bc01b24
-MISC metadata.xml 621 BLAKE2B 9b76c9b14bafc55ba1e99bf584a43ebc4414183230809eae1994db3cf10b35e8d7591db002828c9a18e25c73c55183a0a27812d4b6491d282c2229bf17761733 SHA512 fa384102ed51e900a7b27be256688c2fe94cb9e08f5240f116ad3ee4b2581e47b2956efb6446de448554718311e212dde2eecedb5c9ecd01a59dff7e2f14eacc
+MISC metadata.xml 691 BLAKE2B 0478c7a9616036b5790aa415e6367f966086d51088b2780ccd735fe6c6ddbc1ccc53874363355c0b722d4304f0145b2422cbd16471c6a8c24d233654478c5701 SHA512 7d3bfe32e1e803656c00ed920aa67f0d769b3fa96548f35c9f321daf100f42fe0a2c340563345d24066f2eb347d6054e8e6aa47adae799cc12316a680236a5ed
diff --git a/dev-python/vpython/metadata.xml b/dev-python/vpython/metadata.xml
index 824d6a7836bd..87eed37424eb 100644
--- a/dev-python/vpython/metadata.xml
+++ b/dev-python/vpython/metadata.xml
@@ -13,4 +13,7 @@
 		If the code is launched outside a notebook (e.g. from the command line),
 		a browser window will open displaying the scene.
 	</longdescription>
+	<upstream>
+		<remote-id type="pypi">vpython</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/wand/Manifest b/dev-python/wand/Manifest
index 818b06cfabd6..c3987c834450 100644
--- a/dev-python/wand/Manifest
+++ b/dev-python/wand/Manifest
@@ -1,3 +1,5 @@
 DIST Wand-0.6.3.tar.gz 10506834 BLAKE2B 65ba3d5719f7ad8d77a088d94344cc96f14ca45e95850494033a395cc8772d431653a16b2c3494268f351ee4187e5f5f0dbc22058266e9526cff2312e9a2c5b9 SHA512 9aef97434cc8cdef0880d1d1b2bbbdadba807543489d2c82725aa0b5287718f2a10f5508ca7d72a859e242e2b3e205e5f95649cb43be56d5eec8a83c272d0bac
+DIST Wand-0.6.5.tar.gz 11477141 BLAKE2B 7257dbee8642d619d69d773aa5e0f70c27e32eb5ca4168746efb191ce6d2a49b000aee07127aa51e1906e52e7bc7f2375f39482edf6a841933e4eb2711217fed SHA512 7355888da6ea604759d4af8548d4c2e08d529c88d2720400bbfc6a19bdb03049f3faa5abcd5f3a9c69b705754e86ad4f511a76a0a310d5dece5c2774d74e543b
 EBUILD wand-0.6.3.ebuild 788 BLAKE2B 420a5ef0c4a2ea8467c743f54ed57b23525c7c93eff9f292241c66adcd7360fc381a18bae9c1617895497e6a10eeb8fcd46877a47e99f34ab933074d62083420 SHA512 e30871367c46c9d79d1572a8b91d3796cf98c42367d190ea92a9e465bd493c38f11d774e973ef5225b048a4d6f376373048911e1590a58b64c91a6c52848e264
+EBUILD wand-0.6.5.ebuild 732 BLAKE2B ee7f49fdfcf8bb9380c6f176e7c04798cf3f9684de9ed1808cf57e9a6cdd17df56085cfa12400ed7510137cdcd2e1dd037453defda17ea26c6f0a073f19b97a9 SHA512 fd9f0074f4235248f9dcc4e0ed16c74503d2bb4344e8ffbe9e5977282b0913faadf4a98aca85631591db723175dc4e7429622f9eaded227b414c3e766b378f1e
 MISC metadata.xml 432 BLAKE2B b4cf502cb70ef3ca2d5077a491e37fa6d610504ca76e1381a2220e734c6dc435f42a9a260805114e4803dcb8f69871fcb57b92ec9085734c7d2a06f0d7f3a040 SHA512 d5253cbcab45e68901d7678652329552082f0d95a0d38d797ac351f4419a77116ae18cdfbbd8561bbde14c9d99c6ba0b5ce0a435d34c10b99eb14288275709b6
diff --git a/dev-python/wand/wand-0.6.5.ebuild b/dev-python/wand/wand-0.6.5.ebuild
new file mode 100644
index 000000000000..e31b06bc29fe
--- /dev/null
+++ b/dev-python/wand/wand-0.6.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
+
+inherit distutils-r1
+
+MY_P="${PN^}-${PV}"
+DESCRIPTION="Ctypes-based simple ImageMagick binding for Python"
+HOMEPAGE="http://wand-py.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="media-gfx/imagemagick"
+BDEPEND="
+	test? (
+		media-gfx/imagemagick[fftw,jpeg,png,truetype,xml]
+	)
+"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+python_test() {
+	# PDF support is blocked by the default ImageMagick security policy
+	pytest -vv --skip-pdf || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/watchdog/Manifest b/dev-python/watchdog/Manifest
index 5ec0c93bf66a..7f94b69cb089 100644
--- a/dev-python/watchdog/Manifest
+++ b/dev-python/watchdog/Manifest
@@ -1,7 +1,11 @@
 DIST watchdog-0.10.3.tar.gz 89215 BLAKE2B bbe8a2ab3f84b7eff60d4ebd38ac928db85998910fc5b107dcd645c9b91388a9e45d317777f08288ce3bc2befcf9310bb7c8aef4f8e3309481919dc87e84b2a1 SHA512 6061b1393cd07038ee22271101bd6d5c847ee9732b14f63bbb5d94fba9f8273ca728cdc58b6f53a95d8213d0ed35bc71e8bb9c54960bf3aea2f64da066a864f5
 DIST watchdog-0.10.4.tar.gz 90303 BLAKE2B 0c057fe35383deaa6b7a66c24c07b2260153e94072b2769dd023210e0e5af90b4556ac18a4e8cab8af794c9dad8709205d9f48022458ee6c93fc0f2926b6f372 SHA512 abaadebd74dd869af545b5a3f10edc9d58f4f0f31f43aaf2244aed2c0ef56828f0b4cf9eda919727c832b20c79e95f50df7193dc8ea9d05d28a52dc322a3a497
+DIST watchdog-0.10.5.tar.gz 91432 BLAKE2B 0f10a94edf4cb79d68b83f0cc6eebc1eae9a00a0fd7b8164977a2511b952b6dda9d0b26404ef316a57524f948eb6676a5da65bb711530f64a4a37ab82576b9a9 SHA512 b107fe23b123360ba8ad049576bdbbb40061c70157bee0663bcf9ee9a9a9f65b95234540a477ba9ae6d617199ca1d77fe30b3b9dc4868bfef08a6b9099d6fe51
 DIST watchdog-0.8.3.tar.gz 83154 BLAKE2B d5d0635e83bbcd31544d5ea5811c2f202b0da76bd7a4086e8fc61e3293640e701b04599f95decaa82bee3705dbd6b91ad24b9dbd20edcfc329913600c8a3c932 SHA512 61f1db886e8e9a6d78b569329f4d5944c296778a5a34f94fbf115a748fb4c3be422bf4d3cc828e22fcdcd380fdf9009f5bd91a8a5edc87089afc58297a0b946f
+DIST watchdog-1.0.0.tar.gz 89861 BLAKE2B 79734397fc91e3c733fd28e8c607c07265230f8e7949b07e4236e4fe38af48cd0f758270990b384ccee88bc88311291cc3758f29296edda2dff06dc757d6d492 SHA512 e89f34aba7547022a48ff16e36e6a2eea340e80a4b1e1f8657d4e70d4a451ac43351aafc76978fb4241c583df11c2dd6c53cb1a03c43c2734f4a8a07d5b2604f
 EBUILD watchdog-0.10.3.ebuild 888 BLAKE2B 169d7d993f614971d0e2a6c5e520888a905482316b6da86fc3e67dcdcda6316e1c8b882c94c3a92dab54baaaa059dfbda3273b1c53e4c12075cb6ce394f2cc75 SHA512 8d28216095da4299398546f1bb0b689c099deda89a191cced12938efbf059cd05a93f3a8f6b50a7dc16d27c9237cf29fed15ca7032fbb4248021859de269182e
 EBUILD watchdog-0.10.4.ebuild 1022 BLAKE2B cd874ee4aac68a46c9103e478609755737fd08bc0bac6aca82394663011b515a4f07d7e281673bcc273d253282069f16161db6b5ff906bd6dbf7aa39df81010d SHA512 3f2a4892632e4b4173a27c27d2235394874cdf05ef158b47d8f5a2f646747fed2d393097ad6ede2b19489aa1b32c07909e1f3ff73c84bba5f9f5e60c2f3e4396
+EBUILD watchdog-0.10.5.ebuild 1022 BLAKE2B cd874ee4aac68a46c9103e478609755737fd08bc0bac6aca82394663011b515a4f07d7e281673bcc273d253282069f16161db6b5ff906bd6dbf7aa39df81010d SHA512 3f2a4892632e4b4173a27c27d2235394874cdf05ef158b47d8f5a2f646747fed2d393097ad6ede2b19489aa1b32c07909e1f3ff73c84bba5f9f5e60c2f3e4396
 EBUILD watchdog-0.8.3-r2.ebuild 866 BLAKE2B da2e726c073a1a91556f91aa35e61fdeb7314a414a2f144d4b16e0e4e9c2a14160f69641fbebb0fc257fd4f49eaf833da54b195c668eab2fa11818b82df25b7e SHA512 aceffd14697d54e2014bce38222d59d02a9321eb2388dc7e1d8bdf94369e3834a80de27efc121db2229f5a28d1eb363458a00fd2fe3a2f55c820f81b387de457
+EBUILD watchdog-1.0.0.ebuild 982 BLAKE2B a66951e4b2839a12b87699dfbea438ef864e27ba2e74da619d74dcc4c365e6ef0cbb6fd0b9ee50f69ee5c784db5d7aa8a8f08a7b79de175215e30675072abdbf SHA512 0baa9dcdf57b8acaf3de940b4518931b0d423584e3689f7dff172200a35d744f952cfb0bba888fe2ddd195f1d0ef9bb63e44ad857c26deb69a38aaee465aa164
 MISC metadata.xml 409 BLAKE2B 066a5f62332bfdbd1ee84be547214935022d96e8f51d270302fb891d8c9e438141bc4d42cda84cdf02ec65e80c5ad5dbdc8aaeffbf777bb7ee9b153c95cfdfa7 SHA512 dc751fd76505ab72f2e58c28fef326745ee464749e3640510679e852af6752906312f3d8c82b3b0220a120e0112c96e83d62738321a3bc7b71fd6aee803fea9a
diff --git a/dev-python/watchdog/watchdog-0.10.5.ebuild b/dev-python/watchdog/watchdog-0.10.5.ebuild
new file mode 100644
index 000000000000..44f305c9f08e
--- /dev/null
+++ b/dev-python/watchdog/watchdog-0.10.5.ebuild
@@ -0,0 +1,40 @@
+# 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} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python API and shell utilities to monitor file system events"
+HOMEPAGE="https://github.com/gorakhargosh/watchdog"
+SRC_URI="https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+
+CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	dev-python/argh[${PYTHON_USEDEP}]
+	dev-python/pathtools[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	test? (
+		>=dev-python/pytest-timeout-0.3[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/--cov/d' setup.cfg || die
+	# broken when django is installed
+	sed -i -e 's:test_eventlet_monkey_patching:_&:' \
+		tests/test_skip_repeats_queue.py || die
+	default
+}
+
+pkg_postinst() {
+	optfeature "Bash completion" dev-python/argcomplete
+}
diff --git a/dev-python/watchdog/watchdog-1.0.0.ebuild b/dev-python/watchdog/watchdog-1.0.0.ebuild
new file mode 100644
index 000000000000..fd006a578472
--- /dev/null
+++ b/dev-python/watchdog/watchdog-1.0.0.ebuild
@@ -0,0 +1,39 @@
+# 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} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python API and shell utilities to monitor file system events"
+HOMEPAGE="https://github.com/gorakhargosh/watchdog"
+SRC_URI="https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+
+CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	dev-python/argh[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	test? (
+		>=dev-python/pytest-timeout-0.3[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/--cov/d' setup.cfg || die
+	# broken when django is installed
+	sed -i -e 's:test_eventlet_monkey_patching:_&:' \
+		tests/test_skip_repeats_queue.py || die
+	default
+}
+
+pkg_postinst() {
+	optfeature "Bash completion" dev-python/argcomplete
+}
diff --git a/dev-python/wcmatch/Manifest b/dev-python/wcmatch/Manifest
new file mode 100644
index 000000000000..1474a52d2d05
--- /dev/null
+++ b/dev-python/wcmatch/Manifest
@@ -0,0 +1,3 @@
+DIST wcmatch-7.1.tar.gz 105744 BLAKE2B 0add1c68025c92ac57d6ea64d82bddb20bace60de5d319fb16e16802f208d788d876695bfcd186b80630039f544565c631d36e1c7327dee5d8c799eff8c80ce2 SHA512 79d62d85f13d245e38d0fe92a275e24058b86af8aaf9a926bfd950dad4ec47e40e763c18b08d3eb4ddd925832ae9910f13407094070442b41dbe2fe4ad11fb39
+EBUILD wcmatch-7.1.ebuild 1282 BLAKE2B b20d13b6cb341a90220bf601da53c5988e8bcb8f343236140b86e32b8bdf5d53b69b289f4a944b9544a5f950e9d285cb445c5d039f9b7bac4c16013eb6f69978 SHA512 a6e4a2b56a383e50ce8ac772e8db214da0a8e76bd420ad61b58cea1e624c429a73d010ca1400867fa2c8652c3636d0d02103468feb23e0d265be938507dc6e0e
+MISC metadata.xml 2929 BLAKE2B cd54289196c1541b0d4e57a1e342cfc7f06eb4acea5192390a9ff5b6cab54822678d4b6740e5c023db55909422ccc17ee925d4b889f210afce81ae40b77f7bce SHA512 ebe1f7a9a12be8c19797e830ba3429cfd03fb5983dbcab07851c6857d0dbcc59d3a02d8d57da2d6940a20bca2b2e3041e7e014fe45f97eebee4ac923d8114a90
diff --git a/dev-python/wcmatch/metadata.xml b/dev-python/wcmatch/metadata.xml
new file mode 100644
index 000000000000..a6af55c38820
--- /dev/null
+++ b/dev-python/wcmatch/metadata.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+	<maintainer type="person">
+		<email>lssndrbarbieri@gmail.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">facelessuser/wcmatch</remote-id>
+		<remote-id type="pypi">wcmatch</remote-id>
+	</upstream>
+	<longdescription lang="en">
+Wildcard Match provides an enhanced fnmatch, glob, and pathlib library in order to provide 
+file matching and globbing that more closely follows the features found in Bash. In some 
+ways these libraries are similar to Python's builtin libraries as they provide a similar 
+interface to match, filter, and glob the file system. But they also include a number of 
+features found in Bash's globbing such as backslash escaping, brace expansion, extended 
+glob pattern groups, etc. They also add a number of new useful functions as well, such as 
+globmatch which functions like fnmatch, but for paths.
+Wildcard Match also adds a file search utility called wcmatch that is built on top of fnmatch and globmatch. It was 
+originally written for Rummage, but split out into this project to be used by other 
+projects that may find its approach useful.
+Bash is used as a guide when making decisions on behavior for fnmatch and glob. Behavior may differ from Bash version to Bash version, 
+but an attempt is made to keep Wildcard Match up with the latest relevant changes. With 
+all of this said, there may be a few corner cases in which we've intentionally chosen to 
+not exactly mirror Bash. If an issue is found where Wildcard Match seems to deviate in an 
+illogical way, we'd love to hear about it in the issue tracker.
+Features
+A quick overview of Wildcard Match's
+Features:
+		Provides an interface comparable to Python's builtin in fnamtch, glob, and pathlib. 
+		Allows for a much more configurable experience when matching or globbing with many more features. Adds support for ** in glob.
+		Adds support for escaping characters with \.
+		Add support for POSIX style character classes inside sequences: [[:alnum:]], etc. The C locale is used for byte strings and Unicode properties for Unicode strings.
+		Adds support for brace expansion: a{b,{c,d}} --> ab ac ad.
+		Adds support for expanding ~ or ~username to the appropriate user path.
+		Adds support for extended match patterns: @(...), +(...), *(...), ?(...), and !(...).
+		Adds ability to match path names via the path centric globmatch.
+		Provides a pathlib variant that uses Wildcard Match's glob library instead of Python's default.
+		Provides an alternative file crawler called wcmatch.
+		And more...
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/wcmatch/wcmatch-7.1.ebuild b/dev-python/wcmatch/wcmatch-7.1.ebuild
new file mode 100644
index 000000000000..4fc94a4a4728
--- /dev/null
+++ b/dev-python/wcmatch/wcmatch-7.1.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_{7,8} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	~dev-python/mkdocs_pymdownx_material_extras-1.0.7
+	dev-python/mkdocs-material
+	dev-python/mkdocs-git-revision-date-localized-plugin
+	dev-python/mkdocs-minify-plugin
+	dev-python/pyspelling
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="Wildcard/glob file name matcher"
+HOMEPAGE="
+	https://github.com/facelessuser/wcmatch
+	https://pypi.org/project/wcmatch"
+SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/backrefs-4.1[${PYTHON_USEDEP}]
+	>=dev-python/bracex-2.0[${PYTHON_USEDEP}]
+"
+
+BDEPEND="test? (
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-vcs/git
+)"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# no such file or dir ~homedir
+	sed -i -e 's:test_tilde_user:_&:' \
+		tests/test_glob.py || die
+
+	# mkdocs-git-revision-date-localized-plugin needs git repo
+	if use doc; then
+		git init || die
+		git config --global user.email "you@example.com" || die
+		git config --global user.name "Your Name" || die
+		git add . || die
+		git commit -m 'init' || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/webassets/Manifest b/dev-python/webassets/Manifest
index fbf774589c73..0269440bde65 100644
--- a/dev-python/webassets/Manifest
+++ b/dev-python/webassets/Manifest
@@ -1,3 +1,3 @@
 DIST webassets-2.0.tar.gz 185864 BLAKE2B 8aaa7091c27644c6c464d13d106218e28531415458e67696c0243943a92a3869e23c7ff0aa8461abb876a178e3ad44f4b47a5366edb885d308dd8ec0f17ad034 SHA512 6d62d4e5c1ed81a2d235c24776b632574f3670ae3d863c5f5a79d0e1afc7acfa7965e532b7975503df758dbe6c8dbd857b250a6ea8e4b414c8f1ae12fb8addd7
 EBUILD webassets-2.0.ebuild 1011 BLAKE2B c669832fab7ed55991d8fc5c5f0244e02ef70f2be3c8e8ec4c8cbb0baf644346d41bceb83297ee206f89d3a1b24939e186e89f8f9e4355aa8043485dbaddc043 SHA512 e62940c944f3373e03012c20159d59b0338f8fdb9a226bd4b038deadcfb854f92d0b4ba0c95b4a0013101dfc73a98afe4b6bb3c6d779c21c414dd4260eb5a0e3
-MISC metadata.xml 334 BLAKE2B 070bcff10f1f0b3fdf01e30021d06ecfdc49952aedfde4a18c254eb9f160c8bf990d5816bdb510995818a73a2da25a77073a672d375cd07684214a325283e390 SHA512 5bcc0fe8286771e758641d97206f14e447f6e0ff49d6c6e91285e0cb6eb5a4116760851996679c79dcf5fdfb4c0252f299676847612fc345fca020e44fd4d2d8
+MISC metadata.xml 371 BLAKE2B 3260dac0e6393121b015ee0df310bfeb80fba14867996ba1013e48166ce179c78733b6b75e54eba2ee6cbdeac7afaf2b3b2f9999e325046c5f54018c3d4fe35b SHA512 da5f90fbae45bfda3486665355b9901f0d6d19f38b7dd65adb1dc08f8ad3d5480860db6bf96ec1052652a69f9cc7f44436a941c0a1bf096ade0430579429d814
diff --git a/dev-python/webassets/metadata.xml b/dev-python/webassets/metadata.xml
index 66aeb500eb66..66b566453bb3 100644
--- a/dev-python/webassets/metadata.xml
+++ b/dev-python/webassets/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">miracle2k/webassets</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">miracle2k/webassets</remote-id>
+		<remote-id type="pypi">webassets</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/websockets/Manifest b/dev-python/websockets/Manifest
index b8902c06de0e..087358269b57 100644
--- a/dev-python/websockets/Manifest
+++ b/dev-python/websockets/Manifest
@@ -1,3 +1,3 @@
 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
+MISC metadata.xml 386 BLAKE2B b7595dce278a7ae3d0f491ebef0abd2d9a84827b4ddbef8ab3ed16e21128713408f66295566b8fbae235b5446f5eba6ebc412e39bb37d86e19fc2fd2b2d34bad SHA512 e007ee258a91392d5fa3cec67a0e1efebb4f3a4a9e3a4ee40a0f76dcd8bf3b1b9089f2ddfb52939a76cad42dc63662e2c365406b867641d3503f6437c3213531
diff --git a/dev-python/websockets/metadata.xml b/dev-python/websockets/metadata.xml
index a3e93786e383..98f685d013f0 100644
--- a/dev-python/websockets/metadata.xml
+++ b/dev-python/websockets/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">aaugustin/websockets</remote-id>
+		<remote-id type="pypi">websockets</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/websockify/Manifest b/dev-python/websockify/Manifest
index 77330f25fb27..18644de16601 100644
--- a/dev-python/websockify/Manifest
+++ b/dev-python/websockify/Manifest
@@ -1,5 +1,5 @@
 AUX websockify-0.9.0-mock-tests.patch 18675 BLAKE2B e7dbb0d77bf264bdeef98a3aadc071c3612bd7cad5f6f72c2a748d75e7197ca59a328e7476e19970fa89a17fa9cdc869493dea7505b708cec4e3a020e1a8c545 SHA512 e14011a7b1aa4992f21e5f4293e04424faab2a740ed362bfd1c65daa16cc2cf0d7329df0511239b104a6a4618fbeadf39344227cc7cdc5f48a6b3cfeebf7e748
 DIST websockify-0.9.0.tar.gz 58493 BLAKE2B 622a36979ec083dd3ea747b43cd8fec0916f9eb6f1a2b8f9b7acabd38f41aec839b2101c5261fdf2474bc40ebbbef61c9ba51d2e57f749f1e1a1c46879fb5d65 SHA512 d2251f653a40dc6dca0e5541845565d968c60be96a20a9b70b0305c4b7578f7fe205d4b98a94bb77d7c9383a396833af90fe92a6ade7e1a6f2d9bf8513d372c8
-EBUILD websockify-0.9.0-r1.ebuild 774 BLAKE2B 48361695c13c1cc2bb1e6b339f250cb1cc9dbac1481923e385b80ed82ac05b7cf83868edf97512f2a273eec66fd4443ef172eb7d36ca7db26e40d89deecb07c7 SHA512 309df5ab2709ec566a2f8558e4337990719f846228ea83ae92b4f554fe8af304fa900370f921fbe20c221bbfec0d5a6ab3c7c3d78b3ac04a373b985f2ecd4ef1
-EBUILD websockify-0.9.0.ebuild 504 BLAKE2B 16075323e3432b978f691b98731974415cc7894fce65e434b2e88e625123dd40e1b7174e36b6237ec35cf20f1e11bba0c040ca5bbd85ace9323a242c62ad8e9f SHA512 9b07948208ac459fb78eb28b6d30b54e6e8b0ec493672e7b70ea4a11294597843491c8ace13332297f051629bbf4c06240688306375126a7dff23eefd613bbba
-MISC metadata.xml 453 BLAKE2B 3952e4a784c0495f9d3f4b754efb1f76d49573615737f0c17f2fe9b00a51518c78dfa6de9777567fcac7d654473c0f253a87f8aec32be22f18f8c9121912a6cf SHA512 264bf203b6a60818054f8003f131daff7188adc824584dfb12cf8622e65ebdcf181b95a5bac045f08ea618e6944259a13b422c6893a64581656d15561160274b
+EBUILD websockify-0.9.0-r1.ebuild 772 BLAKE2B c47567fb8441e4500139313a5f0ed9408b9109f23f70f7885d9ea89d3967251301216ec98449e958aa59f0a87d5fdfe7fc5d54e4bbac672eab68410ef1d9f009 SHA512 31707d49fc03e3a0219b6e5972f0bb4a45306d5a66edcc2bac921da55c40460a66e521b6adb12252edb582d64f9d460c6e1ecd0322ce8113e54f65b78bdf1dfc
+EBUILD websockify-0.9.0.ebuild 502 BLAKE2B efd3a969c4f347ace329ac8540c83e4294acf65e05baa9ec37b399e24c5576b17ae873923c3c49a3f77392c0fd2aff5b5dd46b6d5c9ad9da414f6fa56e2d877b SHA512 98610881bcbef6980e565406cc6d3627e715ca3eb5606170f7e17eaef77bf03460ab4ccddc94669a42b7686cd80c7a0ccaf83366c260986569b1d55c88727cb1
+MISC metadata.xml 484 BLAKE2B 27feb7f45e7ff325c6f8a774f75d861bbc96dd26b89bfa24eb7bbbeee78aae7dd6c8c8b03ce24323712e906ec064cb1e486bb0564747b36e76b3209c37ebb969 SHA512 9010dc54f71cfa3aa9a7670ce24e2404d8f615f0dbfc98a8b88cc0d248a8716a384f09eb80132cc3a9b9595b4f52fd5b4cfc20041a3d2b7cba0bdfab38355fd4
diff --git a/dev-python/websockify/metadata.xml b/dev-python/websockify/metadata.xml
index 67a4c5863e2b..3f9398bb2f8c 100644
--- a/dev-python/websockify/metadata.xml
+++ b/dev-python/websockify/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>prometheanfire@gentoo.org</email>
-    <name>Matthew Thode</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">kanaka/websockify</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">novnc/websockify</remote-id>
+		<remote-id type="pypi">websockify</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/websockify/websockify-0.9.0-r1.ebuild b/dev-python/websockify/websockify-0.9.0-r1.ebuild
index b1c7fb492170..e870a23be009 100644
--- a/dev-python/websockify/websockify-0.9.0-r1.ebuild
+++ b/dev-python/websockify/websockify-0.9.0-r1.ebuild
@@ -9,9 +9,9 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
-SRC_URI="https://github.com/kanaka/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/novnc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 DESCRIPTION="WebSockets support for any application/server"
-HOMEPAGE="https://github.com/kanaka/websockify"
+HOMEPAGE="https://github.com/novnc/websockify"
 
 LICENSE="LGPL-3"
 SLOT="0"
diff --git a/dev-python/websockify/websockify-0.9.0.ebuild b/dev-python/websockify/websockify-0.9.0.ebuild
index 047d8f7e1c67..9c3224c6c4ed 100644
--- a/dev-python/websockify/websockify-0.9.0.ebuild
+++ b/dev-python/websockify/websockify-0.9.0.ebuild
@@ -6,9 +6,9 @@ PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
-SRC_URI="https://github.com/kanaka/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/novnc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 DESCRIPTION="WebSockets support for any application/server"
-HOMEPAGE="https://github.com/kanaka/websockify"
+HOMEPAGE="https://github.com/novnc/websockify"
 
 LICENSE="LGPL-3"
 SLOT="0"
diff --git a/dev-python/werkzeug/Manifest b/dev-python/werkzeug/Manifest
index 582ad798182c..5f576fe22c1d 100644
--- a/dev-python/werkzeug/Manifest
+++ b/dev-python/werkzeug/Manifest
@@ -1,3 +1,3 @@
 DIST werkzeug-1.0.1.gh.tar.gz 907482 BLAKE2B d2dcdce8b1bcbb177b52b0915f2c0ac17d235dee3c77b23e81e4b35412d1f53a194d3c7c7f2a5c065ade99797effe72cc464cf6980b12c761a8a919338021660 SHA512 ba82120fb3e96e3a1334c6452d5ba1950fc016d2d147d643bbc2168ccec496f1dea799982ae8c578167155082c0bdbda5d56a23f64b4b6865f97e90e22df022e
 EBUILD werkzeug-1.0.1-r1.ebuild 1365 BLAKE2B 9a766d922117e30cbad2a429fb36eaeaeafd3ca1a8b87906da14294384231cff3b041a35d41ae32447271c6db691bb30f11e82b96cc03a853c543f743cd38917 SHA512 cde8a3f9efe564db81d1926603a06602962ed791417054aa8120249718f3043e979870bb08e4b5673a6dba0795a76dce7c9571225983dce0d28929d38c53267c
-MISC metadata.xml 321 BLAKE2B f2d43f339f0bc82cbc2b0081d1c571cba47744e59bceb960e0a9708d3401445e5d416fc3fd956f6bafc6d8e1d9309eaf5bdfc28e938f5450a9acc1b80cc88b9c SHA512 8c4768582ab693e8a95ad3cfb28b7ed6d7b926700393739c05b50a0297a31a37bad4b2b3ee388a963820258410dc8e2af2a40436821009c746916d0969b1d97a
+MISC metadata.xml 367 BLAKE2B 3a7fccc21ad8c434460cebeee5354dcc6fa0f667ae12b551fe8b4776c3a0d1bfbf3a92e5481eba85c1937bc1c9b4a7e17c21d70428ffc44f08f83b35f7037e42 SHA512 e0a3c3dce6af15bd50e7ac7e56afa18e9baab0f95c719c54b643fb906ac837f0e29e8cfaaf38f4e1ddb4a6434b6866c721d010604e3daa075d5a554183b494e6
diff --git a/dev-python/werkzeug/metadata.xml b/dev-python/werkzeug/metadata.xml
index c576c012fd48..5c23b5b59f19 100644
--- a/dev-python/werkzeug/metadata.xml
+++ b/dev-python/werkzeug/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">Werkzeug</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">Werkzeug</remote-id>
+		<remote-id type="github">pallets/werkzeug</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/wheel/Manifest b/dev-python/wheel/Manifest
index 10fbcdf7e38c..3da8b98f509b 100644
--- a/dev-python/wheel/Manifest
+++ b/dev-python/wheel/Manifest
@@ -1,3 +1,9 @@
 DIST wheel-0.35.1.gh.tar.gz 63563 BLAKE2B d1432a638b91e821cb9b9fc748567b9ad18bbfd4737cee915ee3e2c585c4758e79bcf163edac56a09f9e356d81a057214c8e84c5c75b45505c67aa761e97fe3f SHA512 34cd6d1a649842abd895418c0183e68f44e228be905041e1dd8562987fbab8aa617da9b78479cb8d56fb6bb8714ec1085b87640c385bfc933e215f6e33ccf55b
+DIST wheel-0.36.0.gh.tar.gz 65186 BLAKE2B 384dea20a6fdc2e9cc581c1e30814ac84285b8ca2ac5588fc837a1e27add493dedd38ead643776d1353a98cafa45a609e9655168fd09944cfe016d99e357fcd2 SHA512 1f851dfc18fa96d67bb96c61eec15999c46ea77c490173b71121810480f3c30f2de770a2e6e0712d04f35c91fcadbb276b05968e2b5db76dea882929f555f983
+DIST wheel-0.36.1.gh.tar.gz 65846 BLAKE2B 906bd8887ab0efc6542547c603d613e6b12e4ea56e8d037c3a4532e064f3d337cd5c161e2c2557cc832262a42eeda2850303f1d92e8de45f44321ebc9d47c955 SHA512 1f9a27604b0fa0d1ae4782bdba57956a70d74a9a736f4c41481b417cd1e8a86938705555c37835ffe1a061ef55f8adad3475bfc20e2c1fd8de8083dd5c72cca0
+DIST wheel-0.36.2.gh.tar.gz 67999 BLAKE2B 0bb6742ddb25a5b94f94fd071dfe63ae5fa555731625b4b8ca2c7abb1a255e24590ae9ea250ada0473fcd74f19bdca7e529f8eda1a79d8e394d8b339bd2a257a SHA512 23f3dd0540ecc8e762f37a4bb69713abe99125a605c03b1a3412cec910fb7a6cea3eee3910d7c98122b276170a17414c9132b57b57a30a4ba1283cea8f9e20fa
 EBUILD wheel-0.35.1-r1.ebuild 944 BLAKE2B 4cf6332485911a9489b814b08ae7ea2aca18bd0bfe18a61e51695c378f97912fa4533976deb51957a1f54bb2b66fc9f329baee1ca7f4d6daf95fd537e7f51f56 SHA512 8b7ce4b5d935301ed4db5bb472ef63acc2916cc9b8e94b9c274da90bf195a0cf0b69e35beb14a2607e73ef9120de1f52db53adb5159afc943963dbf83adca022
+EBUILD wheel-0.36.0.ebuild 964 BLAKE2B e49403d5096967aea04800b6315596a8fdcc92dbfff22d4d3e376934143164706c645e0468ff7dcf57aef474066981db74f59a6428e6514b14566897a7000a2e SHA512 0bc880f92bd0d34aac888d1007cb0eabbeab223984d9a8aa5968dc1157d390451f5e596e35d5d90fc70342ed243ca32c0646a86af1ad59e90ded7b933eae8ca8
+EBUILD wheel-0.36.1.ebuild 964 BLAKE2B e49403d5096967aea04800b6315596a8fdcc92dbfff22d4d3e376934143164706c645e0468ff7dcf57aef474066981db74f59a6428e6514b14566897a7000a2e SHA512 0bc880f92bd0d34aac888d1007cb0eabbeab223984d9a8aa5968dc1157d390451f5e596e35d5d90fc70342ed243ca32c0646a86af1ad59e90ded7b933eae8ca8
+EBUILD wheel-0.36.2.ebuild 964 BLAKE2B e49403d5096967aea04800b6315596a8fdcc92dbfff22d4d3e376934143164706c645e0468ff7dcf57aef474066981db74f59a6428e6514b14566897a7000a2e SHA512 0bc880f92bd0d34aac888d1007cb0eabbeab223984d9a8aa5968dc1157d390451f5e596e35d5d90fc70342ed243ca32c0646a86af1ad59e90ded7b933eae8ca8
 MISC metadata.xml 332 BLAKE2B 6c674dc3f3401ae851af12ce14e50ddfe100ffcf26caf3bd49dd93a19433d8c190fe3aabbeba3280f4eb96fe1856d58ce2a5b7c24ee15dacc4593d0534fbac9d SHA512 f0e8a4870fdc46f2a8cdb719832a7d1e108283a35f8f1a2756259c8823480509f9fdfdafdb59d9f0ec2f38c2e78ea6e2937ef5a086408e5e7aeb43b951e0c9a0
diff --git a/dev-python/wheel/wheel-0.36.0.ebuild b/dev-python/wheel/wheel-0.36.0.ebuild
new file mode 100644
index 000000000000..22ddbb0304ee
--- /dev/null
+++ b/dev-python/wheel/wheel-0.36.0.ebuild
@@ -0,0 +1,38 @@
+# 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,7,8,9} pypy3 )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="A built-package format for Python"
+HOMEPAGE="https://pypi.org/project/wheel/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/pypa/wheel/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed \
+		-e 's:--cov=wheel::g' \
+		-i setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	if ! python_is_python3; then
+		# install fails due to unicode in paths
+		ewarn "Testing is broken with py2.7, please test externally"
+		return
+	fi
+
+	distutils_install_for_testing --via-root
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/wheel/wheel-0.36.1.ebuild b/dev-python/wheel/wheel-0.36.1.ebuild
new file mode 100644
index 000000000000..22ddbb0304ee
--- /dev/null
+++ b/dev-python/wheel/wheel-0.36.1.ebuild
@@ -0,0 +1,38 @@
+# 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,7,8,9} pypy3 )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="A built-package format for Python"
+HOMEPAGE="https://pypi.org/project/wheel/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/pypa/wheel/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed \
+		-e 's:--cov=wheel::g' \
+		-i setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	if ! python_is_python3; then
+		# install fails due to unicode in paths
+		ewarn "Testing is broken with py2.7, please test externally"
+		return
+	fi
+
+	distutils_install_for_testing --via-root
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/wheel/wheel-0.36.2.ebuild b/dev-python/wheel/wheel-0.36.2.ebuild
new file mode 100644
index 000000000000..22ddbb0304ee
--- /dev/null
+++ b/dev-python/wheel/wheel-0.36.2.ebuild
@@ -0,0 +1,38 @@
+# 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,7,8,9} pypy3 )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="A built-package format for Python"
+HOMEPAGE="https://pypi.org/project/wheel/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/pypa/wheel/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed \
+		-e 's:--cov=wheel::g' \
+		-i setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	if ! python_is_python3; then
+		# install fails due to unicode in paths
+		ewarn "Testing is broken with py2.7, please test externally"
+		return
+	fi
+
+	distutils_install_for_testing --via-root
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/whichcraft/Manifest b/dev-python/whichcraft/Manifest
index e17cb55a621f..1009839dcd43 100644
--- a/dev-python/whichcraft/Manifest
+++ b/dev-python/whichcraft/Manifest
@@ -1,3 +1,3 @@
 DIST whichcraft-0.6.1.tar.gz 8676 BLAKE2B c08dc453b1143da9c46f63d894526784724bff4861c1862a460f557c74e64bbde72c0127f9df0f6547a5c2183fe770e3ceaf417fed88ce70691ec28605f42e75 SHA512 3a8bf524437f3ee0b5b6ee16e4516ba1c75bee738edfef03316b1ef32a58d036734d75e626f113ad434acc29ccc0cce145668867148af7aa10de1fd5f739d5f6
-EBUILD whichcraft-0.6.1.ebuild 489 BLAKE2B 8e0b87a904fca77548838b5b8d987500cb2ae2a643404f4a5baa9eb7e8956215258486bbf5e2641f1a8e29d0d4fcea49d42673dc8740d8ef88f47c5fa8c0f471 SHA512 e2ccdfe700ba314b3944ae67badec6abb1322242771a79114f9f1fd451a175d431d7d157271e44d1dcce48e2a4578cbe08bf49ea15830b0fd37d2c82aa6fbe11
-MISC metadata.xml 323 BLAKE2B c6cb200fc209a939570c4fc3df111f28a718c77d246ba4b5b12467913b137773ac13eb983a7b2aae04dae83764832fdea8a7b4d8cba35a6c745df41b3049fdbe SHA512 92c7755e3ce8289f8cb93c8fc453f8093c678c41f3fe04e0ea6d6fc3df93e1cc4754fb8b214b96a2bc35e0f6a51587c054cdad45c1061f7462db075558c38090
+EBUILD whichcraft-0.6.1.ebuild 499 BLAKE2B 72a985df1041286bb1e3495f415aebee257386f8cec5c238499ef186eb6f4a83972cb83c6786a2974a446b6d4017e4ddd083e61629bd1a805e0dde20d93bdd5d SHA512 1f050f64b9bbd591f7f073a4e7dd7c25c32dfef11bd910fb92c17316040b0bb181a7d87007d0ddb7e5498c8fd15e81d6930ee0f2b301a6f89c2cb53ed25cbd67
+MISC metadata.xml 376 BLAKE2B 3cfa50c1e893538962db2fc182b980d7f55699accdf221a0f5e1de183953143fcbcee0e4597a9b2b986b38a6c66777aef83338adb2ed6f8ee906fd9d01d3c922 SHA512 d221f99186561f484a961b6f45282e64c4ed8a9f3153eeb55716f70478a5f720647f8306bd9df5fc375ba4d541571ea26a87e8a4cc38f70233d501d208623679
diff --git a/dev-python/whichcraft/metadata.xml b/dev-python/whichcraft/metadata.xml
index 63dfb8da6a90..d854c649cfed 100644
--- a/dev-python/whichcraft/metadata.xml
+++ b/dev-python/whichcraft/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
@@ -6,6 +6,7 @@
 		<name>Python</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">pydanny/whichcraft</remote-id>
+		<remote-id type="github">cookiecutter/whichcraft</remote-id>
+		<remote-id type="pypi">whichcraft</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/whichcraft/whichcraft-0.6.1.ebuild b/dev-python/whichcraft/whichcraft-0.6.1.ebuild
index ba94ca599d3e..1dce34c398a5 100644
--- a/dev-python/whichcraft/whichcraft-0.6.1.ebuild
+++ b/dev-python/whichcraft/whichcraft-0.6.1.ebuild
@@ -8,8 +8,8 @@ PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="Cross-platform cross-python shutil.which functionality"
-HOMEPAGE="https://github.com/pydanny/whichcraft"
-SRC_URI="https://github.com/pydanny/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/cookiecutter/whichcraft"
+SRC_URI="https://github.com/cookiecutter/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/ws4py/Manifest b/dev-python/ws4py/Manifest
index 5c664c125f66..5a0ccc4e158e 100644
--- a/dev-python/ws4py/Manifest
+++ b/dev-python/ws4py/Manifest
@@ -2,4 +2,4 @@ AUX ws4py-0.5.1-python3.7+-compatibility.patch 3713 BLAKE2B f5c811b6dce12637307d
 DIST ws4py-0.5.1.tar.gz 116673 BLAKE2B 31db304800f0d3da61dc4c1a3381a8fcfcfa8f16b36d916311cc32f1d294c9f7b3627dac673edf824f529f485f825ca418ab1e1a8a2fda5583c6a6a1bd9b752c SHA512 4c90d66d37fb5bdc8f7fc9fd184b20a7dc2dae811ecf3a041477e3c26a2577008be7041799daca5b8c0de65cb2454022a6c135cf02534ca98b6946abbfce0e11
 EBUILD ws4py-0.5.1-r1.ebuild 1782 BLAKE2B 2974e13ccea65faa858dc30d31033f1e6f9c4fbd949445084cd8eef9996e932e11d388690572e74568da38a9304feed0718d5795161e1a1fa79325eba6c742e2 SHA512 2e401ba6367ab0fd14abf6caafeb61f8e5e9be1af59ab34d23e9b741d09186463e9a423558835b01bce7febc21920f06e0727b8ab0573c07a271500bb5bcf16d
 EBUILD ws4py-9999.ebuild 1784 BLAKE2B 43cf659f0e4c4c14e344dbf2f8b1f637f168233b14085ad10fcd5c96650306f5162d4bd5ba6487d366898c3f055632ea32fb2e807be4dfab1d33de62ad81ce1a SHA512 827f1ad7a9ed752a2dc2e0c0a55a83eb5f7109744134e4fb76e555e7baf97cbd059890cfa0d0d73b8b8624f420ab0a1f56c6d8778d571a8558c1285df5f85355
-MISC metadata.xml 480 BLAKE2B 464f4b1e941659251ece44c65b341bac398a73a13624f58a36113359866557789b255a4e45a23ff9305be2e7bcbd3ae9e30b11d0ab72a1496544b1e559e07a17 SHA512 f3785b920223b276874e389c7db00b20117aaa3e003ed03593490fda2bfcc4df20034a91a3e98c58ec30f52ad50bc81d91e2ea388e87e56bb91863edbdb6d231
+MISC metadata.xml 507 BLAKE2B e068388bd7979e65aa1319f5f528003dc2d2e20f686d9f7fdc6b48d98b115ca156ac05866fc5004649edcc64448e5a24f4b05818fa803827fd0ee3d053eb1da4 SHA512 658be5099572b43e2a0f23cfcb05f3b1e7b9e3e42e7686759b956ef0ea5407d5f4af72995ba4360d4df097099cd3058b5f9783be27ebf953098a3bcd5cc66a89
diff --git a/dev-python/ws4py/metadata.xml b/dev-python/ws4py/metadata.xml
index cb991999cfd6..b9be7d64e187 100644
--- a/dev-python/ws4py/metadata.xml
+++ b/dev-python/ws4py/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>whissi@gentoo.org</email>
-    <name>Thomas Deutschmann</name>
-  </maintainer>
-  <use>
-    <flag name="client">Install client modules</flag>
-    <flag name="server">Install server modules</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">Lawouach/WebSocket-for-Python</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>whissi@gentoo.org</email>
+		<name>Thomas Deutschmann</name>
+	</maintainer>
+	<use>
+		<flag name="client">Install client modules</flag>
+		<flag name="server">Install server modules</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">Lawouach/WebSocket-for-Python</remote-id>
+		<remote-id type="pypi">ws4py</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/wsaccel/Manifest b/dev-python/wsaccel/Manifest
index d384d2138697..07b6fa4e9a12 100644
--- a/dev-python/wsaccel/Manifest
+++ b/dev-python/wsaccel/Manifest
@@ -1,3 +1,5 @@
 DIST wsaccel-0.6.2_p20170108.zip 21344 BLAKE2B ecb8ef7888fb2ca8e6566d2b3fcbd3911a0df5a8c9f4be86a3cffb95afc31603c2477bd983f9d24ee7cf48c33cbcfb10068c38640ee2a888f46402756313cf29 SHA512 d0cf13360bd6cc0b51b8bee1d36a8ee544816c318e828bf6129ff85827636642cfebae4ef0e99d841cdf64f6c67006a649994804aa42d3d76e977a861aafb3b9
+DIST wsaccel-0.6.3.tar.gz 9723 BLAKE2B 75da0f27e07b52ed730d239ef807da7ba9dd342144ca2e78c32dc09b20c1ebfc006aa9969b1f811d172ca18b75533a4560a29112e56d6dfd472117a0d072fc8e SHA512 0fe97c7fa94cec1b9cf019507f55ce633a9b4bda86329937cddcfa25ba94755010813688cda77ee4fea1c50918e45cd50770bb27e7583e630c46e84d27c155da
 EBUILD wsaccel-0.6.2_p20170108.ebuild 634 BLAKE2B 69326564fb8da839f58dc73285f559ff07425800de0eebcb0dd851b3c94cce021b7ca1a25a2cb61557de416048afe606ce492ead9646f95a7718e5ec7910edd8 SHA512 56d108d7fa54ad878aa4e04b042418c7883e14d4bb17a2a2cc0ca1d89210ec458366c37325d45b38f86057cd7a0ef699f060fb121e74b9c0d6b8d0a7cf2453c2
+EBUILD wsaccel-0.6.3.ebuild 559 BLAKE2B d1d99ff3b9e336a02b7910eea4edaddfb26d57f6e26b45d87d39bed2a322fc9f04b6619485f2372801be176a9da6c9fda27d465974a04575f748f695ff27f838 SHA512 8c130efee3d51710f799dfc883854e2a6df4c6f6fffc96c4c941868b032098b22fbe066a197a35620d802257e699352e2d6c691afbca8c3065a5805541698e29
 MISC metadata.xml 377 BLAKE2B 9e994c8b6d0e89336fd1f2998f8544201ccccf3d647f3600e57ffddf21fb75e05bc3f8ffc2634dda9be9ba78709ac634d8d642cf110edd382d24ae055d860fc0 SHA512 cd6ff7d5e94219b550161b57a1c6f3736a8c78906a81a5e293046b9b3b454f97c1fb41dd7eb7034f45ab784c22189e3788f2e8d9c17a725743936796af3a4d6d
diff --git a/dev-python/wsaccel/wsaccel-0.6.3.ebuild b/dev-python/wsaccel/wsaccel-0.6.3.ebuild
new file mode 100644
index 000000000000..c71afde7b931
--- /dev/null
+++ b/dev-python/wsaccel/wsaccel-0.6.3.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,9} )
+inherit distutils-r1
+
+DESCRIPTION="Accelerator for ws4py, autobahn and tornado"
+HOMEPAGE="https://pypi.org/project/wsaccel/ https://github.com/methane/wsaccel"
+SRC_URI="https://github.com/methane/wsaccel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/wsproto/Manifest b/dev-python/wsproto/Manifest
index 74df7b017ac5..89ad853001c8 100644
--- a/dev-python/wsproto/Manifest
+++ b/dev-python/wsproto/Manifest
@@ -1,5 +1,5 @@
 DIST wsproto-0.15.0.tar.gz 51765 BLAKE2B 6eae2d2ceeb2d1e870c1ca70db22708fc2e5d10aac6b1d1a44ab00f4b31e18f21fd324c7e8c95e28769f4642601b775dc687eb28b419c5698ed68e617d054599 SHA512 c9666ec65374181da762f460f0c394a5bb599f8a0666989fb2d53e5e8822f5ebdd28eae3098e115d5bbacf6d6e1dd33a9cfeb808d569e1a01025eefaff18c531
 DIST wsproto-1.0.0.tar.gz 53423 BLAKE2B b4cc8c1ef0ccf324821b893b57fc86ab744c639dd07604618485004ef56ca105b5515e1f34a08ccc93de941b1a93eb76ef0d1946f11e05f80d40b98bfe7e4c56 SHA512 36f8c4eebf84bfe869f7124330898d22416b423f47396f2e3f72069e14f1763514e1df700c3e8ee81467cf973197e10143e088978d0688930fa98518af8773fb
 EBUILD wsproto-0.15.0.ebuild 507 BLAKE2B a010d403ef7e818dc7577d45898ed3ccba0879182f935c1cab9f55549ad9721413c7828f769562bb0f52dbe5c74a6822980b3b5d329acf5e9859f8046f75d6f3 SHA512 5b57c2fe1a79e68e245e58415071cc73cad18a8124b72d58af71307d3633d7aa1fc90f7f0e0eb6076fc97307ee2b5e4f5e0c3a1b36d5b0a7d56fe5f5d8c871d9
-EBUILD wsproto-1.0.0.ebuild 507 BLAKE2B 58fdd103e0c42b3d7d25477c21f74098ee97f64182301189a3b44230770485404fd42d340ab98c56c982b718a3611f40586a3e1a151ba97fce61c3934daed3fe SHA512 23ca8a584fa832aa7680f5a2f147ed16e1251675bd09f4ca3945c9b6008100e5b9bbc9c4d195d6f540bf99bae04294c5b8aff0341b3b136d2782d439a2c70320
-MISC metadata.xml 449 BLAKE2B 20905c7dcbfa8e649ec28d7825903e62987d2c5a77c2e66b21ee8493a9a7bd1294fe4cf89db71497a6580ec1f60aefff7406c0179b258f98db9a6e807d4f0883 SHA512 5652a88da35965492588df16a4b4d17318174284941e61dffa4a618820243ce6795fe566beb7c27a2d39ba56de776e71b49782e7294c7d43b4d48ce67466cc7c
+EBUILD wsproto-1.0.0.ebuild 508 BLAKE2B b8331e39cde2b26e4ca64ec8d009b393610cdcdc2dde46a07d967a48eb8cda3730721e482b3187739ac2a1c7582f92293757b78290fea85967e1432d7e225381 SHA512 af4874b74e5b8f25178f3ce910ed414ca9c210cf692d931b135dc551755d694b3cb61a1314560add93d14c68c4e1d42b4ff07ebaa67f1e0ba753875dfa98df11
+MISC metadata.xml 493 BLAKE2B 82485e0fa56d1f0e3e1bd3d6f54c929cacd58055d0993520134ed7bb74bfc34a990e65303b33ad2ec74c625f8c4d14f9f4e65a1c14e063995ce20a7bc6ae82b6 SHA512 83ef31eda65a98f50ee0e800cbb358b49f579ed893cd5cdcfb38a0da79b62a1359453127140dfce971b9dcbfc7da9efa83fc1426cfe40167f0ee987d0b9f9c56
diff --git a/dev-python/wsproto/metadata.xml b/dev-python/wsproto/metadata.xml
index c86be9415a41..787fac6ee143 100644
--- a/dev-python/wsproto/metadata.xml
+++ b/dev-python/wsproto/metadata.xml
@@ -7,8 +7,8 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">python-hyper/wsproto</remote-id>
+		<remote-id type="pypi">wsproto</remote-id>
 		<doc>https://wsproto.readthedocs.io/en/latest/</doc>
 		<bugs-to>https://github.com/python-hyper/wsproto/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
-
diff --git a/dev-python/wsproto/wsproto-1.0.0.ebuild b/dev-python/wsproto/wsproto-1.0.0.ebuild
index 642751d07b50..7ca2977395d4 100644
--- a/dev-python/wsproto/wsproto-1.0.0.ebuild
+++ b/dev-python/wsproto/wsproto-1.0.0.ebuild
@@ -8,7 +8,9 @@ PYTHON_COMPAT=( python3_{7,8,9} )
 inherit distutils-r1
 
 DESCRIPTION="WebSockets state-machine based protocol implementation"
-HOMEPAGE="https://github.com/python-hyper/wsproto https://pypi.python.org/pypi/wsproto"
+HOMEPAGE="
+	https://github.com/python-hyper/wsproto/
+	https://pypi.org/project/wsproto/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/wurlitzer/Manifest b/dev-python/wurlitzer/Manifest
index 9b93fa3f0654..f7027fec5209 100644
--- a/dev-python/wurlitzer/Manifest
+++ b/dev-python/wurlitzer/Manifest
@@ -1,3 +1,3 @@
 DIST wurlitzer-2.0.1.tar.gz 10638 BLAKE2B e5350a3920ae072f93a0043ec368766d8e190558b3e897e68b272b06d0d6ff7907f2aeecfd41a99b54804a596ad9f7d7062995a5c465724a2b87419ee801daa3 SHA512 06f67b666c2a364b5ee497fa2f0ab8640aeb2953b678e35b13e1558ab29bc5554f479731f9942d8f033275f5151bb9f86408e0f04b1120bae0f29b27649d783c
-EBUILD wurlitzer-2.0.1.ebuild 564 BLAKE2B c5c950a8ac8947f4c4e85d5c5a24aa337c8c578a3e312250fd576b620c1e4734c60bb35c4f668f7e88ac3853eea9ef6f59fd62047b49c1799d4b1af4a4fd044c SHA512 3bd785dda7bf432ea32de89cf1b81c6044ca60883ccaedf3ab38d0466e35a6c0f63992502240085bbfea45478872b3bef34669c4672e8c828008ec60d2894cc9
-MISC metadata.xml 412 BLAKE2B 1c1563b175b955ba98fa211a2277e49347a6e3bdf4aa4fc585a2eeab65b080e2b63ddaaac5958521f9e421ac3c0a8bb5872416e0186490b0185eea76d527dbab SHA512 d5cfa13aa12b5612ac426563ec40fe585231a3a599b91490d81745c5b77c9ea603335fedfac9d62e810694e25f2fa5ed71e47e13c85cb75db57c116db3164225
+EBUILD wurlitzer-2.0.1.ebuild 569 BLAKE2B c54003c3de45a32f78349bc83755062d09da21928e7b739bcd73213e861458a29eb09dd49b6c68621104cff88c1babd26331e4188ff5ef4318956c7797fe2cea SHA512 e26468979b6a7fbe1799d7473ae61f2f26412a2032de430d65f063e585aa679f4e94179b4fbbc383f2758ab5cd9657ba90f915cd48ca7e1fc9d49e5593c571ab
+MISC metadata.xml 502 BLAKE2B 78c6bbe92aa4613160a279a017e5beeaf5b5b9e6c2414572943056061138a6120fa87d4e768166d57cea6e1e3ac3686c5d1b32223f1824a30e630e8f0171d0d4 SHA512 5c51e4c9bdc3945ae89079b53a65795b44d188f7cae8893ff981bc628892f69b1352a11718adc2f1f3a06fc924cfefdd1c1e5ffc594671298830e6dfb2c806b3
diff --git a/dev-python/wurlitzer/metadata.xml b/dev-python/wurlitzer/metadata.xml
index dd0bd9c021f6..6371903dc20a 100644
--- a/dev-python/wurlitzer/metadata.xml
+++ b/dev-python/wurlitzer/metadata.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
-    <maintainer type="person">
-        <email>andrewammerlaan@riseup.net</email>
-        <name>Andrew Ammerlaan</name>
-    </maintainer>
-    <maintainer type="project">
-        <email>proxy-maint@gentoo.org</email>
-        <name>Proxy Maintainers</name>
-    </maintainer>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">wurlitzer</remote-id>
+		<remote-id type="github">minrk/wurlitzer</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/wurlitzer/wurlitzer-2.0.1.ebuild b/dev-python/wurlitzer/wurlitzer-2.0.1.ebuild
index b639486f7a03..479e70ee0a38 100644
--- a/dev-python/wurlitzer/wurlitzer-2.0.1.ebuild
+++ b/dev-python/wurlitzer/wurlitzer-2.0.1.ebuild
@@ -8,7 +8,9 @@ PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit distutils-r1
 
 DESCRIPTION="Capture C-level stdout/stderr in Python"
-HOMEPAGE="https://github.com/minrk/wurlitzer https://pypi.org/project/wurlitzer"
+HOMEPAGE="
+	https://github.com/minrk/wurlitzer/
+	https://pypi.org/project/wurlitzer/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index 2be6f7c307b6..2ad87dd39d0c 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -1,5 +1,5 @@
 AUX wxpython-4.0.6-no-webkit.patch 1411 BLAKE2B 222f85e79f55420ca2b04b3ba6a30293646f84894a45ac2b72852e3f72f187e333b2efd6d76cc02c5996ae75725ef40e882d45012c492b7f3a478666a01d0189 SHA512 82539d4ec63a8b21576de38b17fe2fdf095443b4cfeabf369c443d818ce402e62dcf257ccba022c3b0d671f914f5ef88e4ff40b9fc7d6276493c9a8caf2b76fa
 AUX wxpython-4.0.6-skip-broken-tests.patch 4113 BLAKE2B 920f1c0c6e1154de83c412ffdfa4b3276d01a5e9be8998be42634368f34217bd5b6505abced2ec3479b9ab4f40a5697405983740e599b76be1725bb963e3311e SHA512 04201012f1cc16913ff53a9d4868dbdaa6915b1a3a33f0342572aa56741207b6de6e274b91cd26a06511ae8d79d7fef247c2cababafd57130417caa4463a409a
 DIST wxPython-4.0.7.post2.tar.gz 68891167 BLAKE2B 77eb69f7a59e5be81c3d17b64c76e09a43efc9226bd87fd058483185871a95ce05dbb65614ec8b003edf52cbe1cb1a115856c0d622170c51ecacbb952106fe22 SHA512 7af89db90a0f7e6b644d61c1ede01ec36a2c295e46d44692ae9dbc4af923310c1b498a52f45b02a89e8917d844c6abe67e5f3fdd9c1d51da3312899319a349e4
-EBUILD wxpython-4.0.7.ebuild 2268 BLAKE2B 2bc10da16a8f7909a248e39708ccc84bdb12a5f7f220c878ae3ee6e46e1ee7df31901ad47cc9f88583061cfaf3fc9e6b9d9592b785a083f0d4f42670edba818b SHA512 a506c2a7104df5baacbfe50e6b836e20de17ab942d332c0fa7b7c9e01480003009ca53c8cd48a90617214e75c81bcad30a334d00124f31e7ffc10d589c0c34a8
-MISC metadata.xml 444 BLAKE2B ede5bde5d439eb6df2a438a3004367a8ed3e867837e259f86ba0fd2889345d7eaa7ba22ae683f56fb85d269a239bd31b7181205d4c1b311d2abd40d64e8ad11a SHA512 402f8994132035a8f7e1fee67f446ec3cd529f6ce0836422df5945e24995ac19d714c2729bd3acbb897c2d1581f7d99dd8ff8603211e28ed2d768a8868afa62e
+EBUILD wxpython-4.0.7.ebuild 2314 BLAKE2B c9c43a901647a6af7b72405213476f57e373ade92a38b98ba1edd8b2edb10614be2b5b99b90f70f04fb08597fa796939276a4fd5ed4ab5b39c11456521f545c4 SHA512 a2e2f910aa9626940ed4a733bfacf5b4157b54e4c2c5cb647a8fb13892be8168caccc07691b6d96ddff02afaa686417ce6e9d37dfb8d6b1b469ee6fc760308a6
+MISC metadata.xml 490 BLAKE2B b268c95de8e09d5027a6dff7413f8e85030c64610f0f5739321bca1c66892981e2e4273e3e4fc92f3edbbcee1d2ede23a366dfec9ffbc17c8b015b784847755f SHA512 a33e6390e4cfcedbe7a2e950b1f447195f439747e37acfa6ad234b58fd449d80b16d342213e5190fa3143c71a5e95861f11daff1b61fcb5015c3a5255a27cadb
diff --git a/dev-python/wxpython/metadata.xml b/dev-python/wxpython/metadata.xml
index 0796b4162e00..6efec25372fb 100644
--- a/dev-python/wxpython/metadata.xml
+++ b/dev-python/wxpython/metadata.xml
@@ -11,5 +11,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">wxWidgets/Phoenix</remote-id>
+		<remote-id type="pypi">wxPython</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/wxpython/wxpython-4.0.7.ebuild b/dev-python/wxpython/wxpython-4.0.7.ebuild
index 285139190e8f..18a64c761753 100644
--- a/dev-python/wxpython/wxpython-4.0.7.ebuild
+++ b/dev-python/wxpython/wxpython-4.0.7.ebuild
@@ -16,9 +16,11 @@ SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${MY_PV}.tar.gz"
 
 LICENSE="wxWinLL-3"
 SLOT="4.0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 ~sparc x86"
 IUSE="test webkit"
-RESTRICT="!test? ( test )"
+# Tests broken: #726812, #722716
+RESTRICT="test"
+#RESTRICT="!test? ( test )"
 
 # wxPython doesn't seem to be able to optionally disable features. webkit is
 # optionally patched out because it's so huge, but other elements are not,
diff --git a/dev-python/xarray/Manifest b/dev-python/xarray/Manifest
index 9f6175aa5b51..2781f99aab05 100644
--- a/dev-python/xarray/Manifest
+++ b/dev-python/xarray/Manifest
@@ -1,8 +1,5 @@
-AUX xarray-0.10.8-skip-broken-test.patch 513 BLAKE2B c4d6298732029f509df209679b7d5fa285a9093053a08a1668a7f12e97a9d2d3738b170b05eb0b681c1a631268dc8213124eafa6cbcb9ba8dbfb53d6da0dbd49 SHA512 8b70650a30d0e5ce5d6c88c19515fb176de2151414042ba8a73b340e2cc6bdc1976ec0b4c723b4943178a886d29bae1e192059452c61e8eb2065b39ed18f23c5
-DIST xarray-0.12.1.tar.gz 1745116 BLAKE2B f38380503347a17cfe11e930b5e275912fb4fb3f02de057e61b21ad1515c8f5e2d5c28007ebb20cecda0f4398b7c71ce239fb3d6f25a79600f5da509f0976359 SHA512 f9e8033b9387ec4175c9d65199aff9cdfc442abb9d2736fb47ab6170ab1e1860b4eb693317a64dad560ab6974f08f7c13f24ecf24c087154ae2d71203e584426
-DIST xarray-0.16.0.tar.gz 1987841 BLAKE2B 9e191d0c8416b3cbeac484b4bdb12a702314bd6bb982c958f346152ce31832f901c257c59adeca6d32f513de62245648610fd21f4d2ba0e9d6360239c2c4134a SHA512 25a4c967d316eac97389ac4f7e43483655ba93bec0af0f338416f8cd9493dc22b6709c7c66640dc5021f70438d2e26c8f419bda178bb6f27f951b8515b2610fc
 DIST xarray-0.16.1.tar.gz 2007111 BLAKE2B 426485a921669e2a5c92eec143d5470c5fabcbe9c0ec440c39b27b3b95aa2e87d494397c3b3ad69b0856a2c467b025beccd188aee40a5b96a5d411bb2d66ada6 SHA512 b02dc0a0993c1a41b839d693fb1b3639cfe2a449ae53da39adac01a19749e7945217716a8a07bedd9ef4d63f333a0ac4ce3fed6a8da9042468fdce2290656321
-EBUILD xarray-0.12.1.ebuild 819 BLAKE2B c15568e77135a74e626d0d6f7bca6f3da1fd0201b43937aaeaac741485b26f96a090242a84980a8aec33334206c8946a6e0d5a5f7e2819802c00218f0b893c58 SHA512 bf64094261b878e2909cd828a04385a44fef2242716b77c9156fafa42ab9f6b2bac7848948be30d382b11b0172390aeee38a21dfaeb389f1246f274899430efd
-EBUILD xarray-0.16.0.ebuild 982 BLAKE2B 99479a192c0bf087500b944ee2ea0deb0b9e264559a5b9128d3c3684119233adb9968ec7288f28d35e58eb37db3eab58ee89bbe20275ca1dac1f7592c2b9c606 SHA512 53262dc3a7e4d6ce554c14129245c124790b9ed4f4fef452c4aab8f1dcf21dac1673978b457a73eff46ccc545e167e4ae383b6b0556d4a63e0c952b408c887bb
-EBUILD xarray-0.16.1.ebuild 935 BLAKE2B eba45f22e6729d45c973a7dc0182b86857e98caff650d6d8f9e6310275c622bcf22cd45a88e4c1a35cd37c2340673f17aaaf72772b05dd9734790a325a1c2d1d SHA512 400680bc75d1b97a9f59e407189a88155e457c6e8605a0f7fd6e8bb717b3f31a3687fb365600038c85f32f9ba7147ddbad6b9b75900358694bf2e3c5d13a7008
+DIST xarray-0.16.2.tar.gz 2018053 BLAKE2B 3b95c688a3979323b93ec46c9f218795fbf9df56a7ba1459a507ac36379b3240c351cbb3f1907a204199c6c0c4c0c1c516552548d1e03fb987ad718561aa9772 SHA512 f6cd3eee2012e3b544874388c4824e911ce5d213cd393bf01b10deb9742a1168f41629e4f1e49220228771cac920980eaa98a599a6d62c383dd3da7b3bfe0dd8
+EBUILD xarray-0.16.1.ebuild 934 BLAKE2B 495aec100f0d8e541397ccd53fb0f56995f087e73ee5d6428080714e93dca94423c021778fefd9520c11aea249710f8bef0bc35ab7b806141a9539ecafc76ce0 SHA512 90b7b8af54625edb445033b755d360dbe8fa9b253a65b1eb6102d7c3f5e46700121610766731335ae968dcd5a96a1a7157e6b65c9755ba45059a1f03c6281c30
+EBUILD xarray-0.16.2.ebuild 936 BLAKE2B 530b0210443897ede392262d6f439046c3adac756ab38786e01b48ce61264b087475e6106e33f1559193c2b778060dce3bebdfd4fa4c1f89ebbc3941630adcdd SHA512 ec036c61b4a8f514fef95680b3a49b6cbe2d2965183d954d200eca8e86b0aee5d8d09673bc35547f4919c42002bfdf792af5fc5aed67f7d0762d16e4dae5ee90
 MISC metadata.xml 508 BLAKE2B ec48fcbe3d7ecc1907ba57f065ff83affaf8a449a50d39faed113192bbf1dd60ae145550c4794b0fcc000a20f1701a5e9cebaa01782e294ed5300ed5cd82704d SHA512 937f1589c8b6eaa65f70d7b273e60935eaed889895996e5f952dece64a0982130fa5f50f09f25041a86f88f7646e76ba9ca3580ae8adcefa1f83a4effc5409c3
diff --git a/dev-python/xarray/files/xarray-0.10.8-skip-broken-test.patch b/dev-python/xarray/files/xarray-0.10.8-skip-broken-test.patch
deleted file mode 100644
index 62798cbcb5ba..000000000000
--- a/dev-python/xarray/files/xarray-0.10.8-skip-broken-test.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/xarray/tests/test_variable.py b/xarray/tests/test_variable.py
-index 290c7a6e..d49a048e 100644
---- a/xarray/tests/test_variable.py
-+++ b/xarray/tests/test_variable.py
-@@ -373,6 +373,7 @@ class VariableSubclassTestCases(object):
-             assert v[0].values == np.asarray(data)[0]
-             assert np.asarray(v[0]) == np.asarray(data)[0]
- 
-+    @pytest.mark.skip("Fails on Gentoo")
-     def test_equals_all_dtypes(self):
-         for v, _ in self.example_1d_objects():
-             v2 = v.copy()
diff --git a/dev-python/xarray/xarray-0.12.1.ebuild b/dev-python/xarray/xarray-0.12.1.ebuild
deleted file mode 100644
index 5339b36685a5..000000000000
--- a/dev-python/xarray/xarray-0.12.1.ebuild
+++ /dev/null
@@ -1,37 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="N-D labeled arrays and datasets in Python"
-HOMEPAGE="https://xarray.pydata.org/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/numpy-1.14[${PYTHON_USEDEP}]
-	>=dev-python/pandas-0.19.2[${PYTHON_USEDEP}]"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/dask-0.18.2[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		>=dev-python/scipy-1.1[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.10.8-skip-broken-test.patch"
-)
-
-python_test() {
-	pytest -v || die
-}
diff --git a/dev-python/xarray/xarray-0.16.1.ebuild b/dev-python/xarray/xarray-0.16.1.ebuild
index 2028b99f72d8..8a88be7efd44 100644
--- a/dev-python/xarray/xarray-0.16.1.ebuild
+++ b/dev-python/xarray/xarray-0.16.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/numpy-1.15[${PYTHON_USEDEP}]
diff --git a/dev-python/xarray/xarray-0.16.0.ebuild b/dev-python/xarray/xarray-0.16.2.ebuild
index f2df870cfa95..e4da2b36730c 100644
--- a/dev-python/xarray/xarray-0.16.0.ebuild
+++ b/dev-python/xarray/xarray-0.16.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 # pkg_resources use in code
-DISTUTILS_USE_SETUPTOOLS=manual
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
@@ -15,12 +15,11 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/numpy-1.15[${PYTHON_USEDEP}]
-	>=dev-python/pandas-0.25[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-41.2[${PYTHON_USEDEP}]"
+	>=dev-python/pandas-0.25[${PYTHON_USEDEP}]"
 # note: most of test dependencies are optional
 BDEPEND="
 	test? (
diff --git a/dev-python/xcffib/Manifest b/dev-python/xcffib/Manifest
index 52313684836c..e6c18e604147 100644
--- a/dev-python/xcffib/Manifest
+++ b/dev-python/xcffib/Manifest
@@ -1,3 +1,7 @@
 DIST xcffib-0.10.1.tar.gz 84689 BLAKE2B e36ad4f9c6bf5bc63400ae35d0d58ea1def00f299c0f811807cde430e6a6850132e77584359f77fb2f4ce5fdf5f22ec91ed22e1b7ce5d6d318b7a8dc5f3e0939 SHA512 98412fe36962108902dc0599f05ac9be5d7412d7f12fc6566e020c2ce84ae4a536a20ae2dfddd2dc9a536f37cd82539bf19e1993ee65f0b09c44372008cd7edf
+DIST xcffib-0.11.0.tar.gz 84750 BLAKE2B adc1faebc8f0e83150f50e1b711175f5f4617124e07a4d5744b7d1c116cdb89f6d68617cc0ad0efccf2d9465e6bbd2504ee08c322c61228728aeeccb57fe55fa SHA512 22b82844295b277e2abb363ff818e7163037542ffc1ec2874a948f3b3cc63e9a8fad371fa87099910546a17f2f6f1bfb8f62214869fa30a196fc198adce14384
+DIST xcffib-0.11.1.tar.gz 84713 BLAKE2B 6ab1ad6e582d71214cd719fdfa898e561e29d5750f5befe5c71173cfe34f2dff7dbd52fe93e618aab695646850f7ef5420114e2b1e725150c643904cdaba560a SHA512 09f4e19b88258446af26628c3a8e694c1f938fe3b5456e797b06174602fa0e9ef6e4eab76daccfd169d98fb7e869c910e6216d1f71fa2853e62b82c62c667669
 EBUILD xcffib-0.10.1.ebuild 669 BLAKE2B 053ad1204935b13c10a8ddee72fed71ac8ff7b0cf1ab5434ba28668279d293392ebfe6a228de641aac9cc0afc91c0a0dd0fbfaba0b0c428e38e0fbc05d63dd13 SHA512 ecd0dc08026ecad9944a64ee45eb604682513c6bf00633ea5bec86e6c398be8a0d86bbebd48ba03387561610ad38a103f2d0a7313b0af97e642591195e0809bc
+EBUILD xcffib-0.11.0.ebuild 673 BLAKE2B eafbe77a9b6d9cadabfd393ea2789e18799593bbf7efd665113700639be1b6df89374b6c4d978cad4a9dd487676f2e9ee314034aa38dc7f6c094dc175450e556 SHA512 d0f3a1c49ec07ed74a4bb6f98a914fa94e400a6642e384c0c9a06a556239d0c1b509beeb7d1700eac0e48737b9a4b99b19a9f65f616561570f3a7cec0df39cb7
+EBUILD xcffib-0.11.1.ebuild 673 BLAKE2B eafbe77a9b6d9cadabfd393ea2789e18799593bbf7efd665113700639be1b6df89374b6c4d978cad4a9dd487676f2e9ee314034aa38dc7f6c094dc175450e556 SHA512 d0f3a1c49ec07ed74a4bb6f98a914fa94e400a6642e384c0c9a06a556239d0c1b509beeb7d1700eac0e48737b9a4b99b19a9f65f616561570f3a7cec0df39cb7
 MISC metadata.xml 373 BLAKE2B e21d3d9113705facf550e641e786485f657d976a1cbc19f5f1513d534e9a6bde20f68b104a95914dbe95347e0144c0cb0bdc8f87df31906f5f70be71324495dd SHA512 2c7291bce1de8d82151379bcdcc039344659570feec49b82ce9e7274b5e0abecf8499fe7c595b06f71c37ab7bfcb3f2ce8771f216282a50b6c1aba5dffc1008c
diff --git a/dev-python/xcffib/xcffib-0.11.0.ebuild b/dev-python/xcffib/xcffib-0.11.0.ebuild
new file mode 100644
index 000000000000..790a52834b15
--- /dev/null
+++ b/dev-python/xcffib/xcffib-0.11.0.ebuild
@@ -0,0 +1,31 @@
+# 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="A drop in replacement for xpyb, an XCB python binding"
+HOMEPAGE="https://github.com/tych0/xcffib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+DEPEND="x11-libs/libxcb"
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]
+	' 'python*')
+	dev-python/six[${PYTHON_USEDEP}]
+	${DEPEND}"
+BDEPEND="
+	test? (
+		x11-base/xorg-server[xvfb]
+		x11-apps/xeyes
+	)"
+
+distutils_enable_tests nose
diff --git a/dev-python/xcffib/xcffib-0.11.1.ebuild b/dev-python/xcffib/xcffib-0.11.1.ebuild
new file mode 100644
index 000000000000..790a52834b15
--- /dev/null
+++ b/dev-python/xcffib/xcffib-0.11.1.ebuild
@@ -0,0 +1,31 @@
+# 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="A drop in replacement for xpyb, an XCB python binding"
+HOMEPAGE="https://github.com/tych0/xcffib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+DEPEND="x11-libs/libxcb"
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]
+	' 'python*')
+	dev-python/six[${PYTHON_USEDEP}]
+	${DEPEND}"
+BDEPEND="
+	test? (
+		x11-base/xorg-server[xvfb]
+		x11-apps/xeyes
+	)"
+
+distutils_enable_tests nose
diff --git a/dev-python/xdoctest/Manifest b/dev-python/xdoctest/Manifest
index 2eeef5b4bd64..cd1668d6fe45 100644
--- a/dev-python/xdoctest/Manifest
+++ b/dev-python/xdoctest/Manifest
@@ -1,3 +1,3 @@
 DIST xdoctest-0.15.0.tar.gz 629125 BLAKE2B f5144365c4d1d58c107ac0603a1d99cd5bc622d3772fc7f2c907193ea863d9ff99bd183cc7fac12e2f85b7647ba25d5ae6878c06d3df9a5cdda9a1f143b43110 SHA512 114add93a75807d787c674b0649f92ff011987705f640912f876c4a4c3103cef90b0fae1959d5a85ef399b80695e9cbfcae6e809950ff5651fa211f54326682d
 EBUILD xdoctest-0.15.0.ebuild 1047 BLAKE2B e49775712ebc0f0d3a539c679eab947a63b04f137b8c1415d1b71aaf8da248a2f8357b2f676ea3bc68dc94241ac2ad4cb6cdbf3c195c6d8264d77621399f7ebf SHA512 08ea02966f507f0775532828cf41c36678fd315990027a0b2b3e63e362571783a036de3c04c13444e007961b3e3adeaa10c7570d92d90e37b63177e887fe3c4e
-MISC metadata.xml 254 BLAKE2B 975bbf0379cab76237f5c98a5722b00f260e44a5c216bb096be1d9c4dff854c39b5ade4b1b0e82130b40b7a77172d5cb8a57e62cd7c0d2046a06cdd2483f4c6a SHA512 4ddb51fe1406eb74843b84f306330d4fba63c96c52fd5c9c806418a93dc8d4f2be6310f39a841fa6abf856e277a8f48e32bc5f6cd4d73ee9d608367bf2e8f96e
+MISC metadata.xml 324 BLAKE2B fd830431a39700b7b25d72a8ca23707e9d8a75723809fa60d2d38854e6bfb4a4100cb68503cc8189833c53ead1d7a2b1d874d2915aeb2820357d481612eaecc8 SHA512 392ed2441c68b3e157f7b9d6f815c018f3ebbfeb1563f1672be6a7e2bfa687e06063727e1005f5a0caa9e7fed229cd344d66be172022b236ae020d2d7455b5f3
diff --git a/dev-python/xdoctest/metadata.xml b/dev-python/xdoctest/metadata.xml
index ca93985fb0db..c4ab9400881e 100644
--- a/dev-python/xdoctest/metadata.xml
+++ b/dev-python/xdoctest/metadata.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">xdoctest</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/xmlschema/Manifest b/dev-python/xmlschema/Manifest
index 7eff3682247d..2fa752fa607a 100644
--- a/dev-python/xmlschema/Manifest
+++ b/dev-python/xmlschema/Manifest
@@ -1,12 +1,6 @@
 AUX xmlschema-1.2.5-skip_network_tests.patch 488 BLAKE2B 0be194d30f0155492f486a5e485de57c17aed76777c808854eff074af7d775a54596621d4fcc9416c4dc9e5f808a747d0037b4dd53365cfa225a431dc3c01d5f SHA512 1781f91a190fec6b9ecc754e36035312e4b68644a5c2343868fc076fd30021317e8d5b85365b44a5eb186c98b60d27f265729a46a5234078c98680a6453d73f1
-DIST xmlschema-1.2.3.tar.gz 322076 BLAKE2B 2b6c587772a14b4b804a35614a2e1e77ade9be0ef25cabfc331efc3a443058fd51c178339f1d6df2cbda77d2a8d1c2ac2c33155406e7e7f36c10225ecb70a3e7 SHA512 15c47c7e93cb0bf14534dfc298848ba4ac332677583ee14eca0c5908fd935e1a3dc01b96f92e7df6eb45b215eae2b67d74ee2d4d227fb3e3360be944815532b7
-DIST xmlschema-1.2.4.tar.gz 287636 BLAKE2B bbb06fcf0e93b98ad7b9746fa0492bc79705dab79fa3d738bc02368e5d777b61cce60f6bd65f095dc99395037d7f0af3056c0877f0c96efb830fa65e1a389c2b SHA512 27f50890728be149e3c36a5ad706b27c32efecf859699a99bebe9a0b81dea2c1ab733860366a2cf0d30680de7f45d8ae581cb445ba78708db3ed25ff7eef94ee
 DIST xmlschema-1.2.5.tar.gz 290750 BLAKE2B b6fb6722f1f9468cbae6507522c4398a7d0aff11918479b8e89e24986df2ad1ae4fe8640c5fe532319c6e7dbdb958d81df8cf81f1ceb18db09c406fc6a137219 SHA512 f821f041b7be483039746d7c7771117d4cac6189dd02a0f95235ea6597300dead39813b1ede9b6871fad93e50aa55f01f7da4e485c7074f66d78a76f1b57e7cf
-DIST xmlschema-1.3.0.tar.gz 319713 BLAKE2B 81c94fb346aaa0f3b17d168f239fc24368ccc59fecdae615fd2a249d44072b2e6db637f802d6fca632b98ead5a85ac2b6f924abc3dc42b4c646de3ca5dd9635d SHA512 b505b3a8e375e669631b8b8c4b0867fab7e48200da7bfb6b97f5bd5f604f5e30d4d00c72d919765db8663f7eaf98f4c6cc6491aeef520ee0cc49041062c5b3bc
 DIST xmlschema-1.3.1.tar.gz 318853 BLAKE2B 1f2f960c5dad0c82a7ca0345bca052560d39f07b3fff9f443ec5d206a2ec92743462be2209e69a9330f432dbeb7e5908dae4168f7815cf64c141047876844453 SHA512 3bd2ba3004c1a397aff1c81c1105a603dd219f9c2c4afd0742aea3d7263dd0c50adbc05f4ccf96ad0a0f8bd5c116002152eba8194619e6bb636ef46111e6a2a4
-EBUILD xmlschema-1.2.3-r1.ebuild 763 BLAKE2B 3f7af1950d66b8a06f8a5ec03f5ab1328c1b706176a798ff9d351a6cd3db23021f84518cb97d8781b2fd7d15cc916383b7f3bcecfc147aa128565c7374f27364 SHA512 2e32194600becc9cde92b0b5398c79b06cbcc519a69b7b089c6a4c231ff685e77125d3f9856b43157ef94656a1ddff5bdb42cbab65c669e2840d4d8a671642a2
-EBUILD xmlschema-1.2.4.ebuild 766 BLAKE2B c9147a07df0b09551acb0193555a0dc41ec7b6b7af77c2c05a967143631e7109fe876f1676d7c27bd7200f5f5241a7e106cda72fda9971bf627a326134c625f9 SHA512 bdcc764d8dd5e78386842921fc76bd320211bae812d9ba241480960dedd9c4587089647f28abc3ecb9b2023afc8e2f2662e02088eac9813086351cca7b369e2b
-EBUILD xmlschema-1.2.5.ebuild 892 BLAKE2B a76dc8b5d295a9088827d51129695b15a3fc788e39c5d193aae5663f1d419dfdf68de733acbd2e9e005f743d859de434be274c29eb2305992bdcef938f1d81f2 SHA512 feb3f9d9a802ad0a60686e17446f3e38ffd5b640aa9cc9e92949fbd7f6f9383cc2fb0d25c879b1b4c5f92a7005c92420d7bde8895f47ffddbac12afd5d5506e7
-EBUILD xmlschema-1.3.0.ebuild 769 BLAKE2B d9127d956cddc0f8fb552563025e852a83647a7ff29de816dc4a3ca8ebe8b81a5e136d8114c6e96157b750fed85a5db2e28058fd49e8854d2388deb757b91eb6 SHA512 ff611755005ff59170d0c283ff6ba622127b3234e98edcacbab158c46678a19f4e8b6bf94671caaf6200972c87a1d563021e1b82b0f88dd37ad96a7b5aca9625
+EBUILD xmlschema-1.2.5.ebuild 884 BLAKE2B f6854e571012b091ee18bbe586dfa6746d743d855a30a7420e1b7f223ab7bd5f054e186b83768c856819cb565a508ed96f85121e754b46d4700f473e9c78dea6 SHA512 58b4c2da6c7a39864f0272819fed4ea09d666263d28f3a6543523c00a46444af1ad95c77090799e211781caecd3d3805f3b70f93a89e9a9947ea0f14b803e32f
 EBUILD xmlschema-1.3.1.ebuild 780 BLAKE2B fd341466fc0e59b4721c3c2a92e04f6196ddb92255285229be982c6c5e99cdb0b31a5ad8cc258df978a49d10cdf7f4c14a5f8827d42bd4f71ab94e6a04db7353 SHA512 5c2a1fdaf9aa7feb4551aa96bdac6bbcf6028576f67fb52641f4035d78f4e04d894bf71a48f72d4d8a201ad55f581f452912cc378c599aa1e6d4d30e9ef90f48
 MISC metadata.xml 375 BLAKE2B 16a422a1beab981008ef66eccca94cace74cb244fb6123d2495e13045b4c786bf00f2807d3ac73e98f1c962fc0ccb7f7aa84f565dff54e2ef2077776a85bd479 SHA512 db2b030851d7357aea0b41066bcfa36b9ae81c745f413a3cdc1a528a38f2ea1a8c7876abff7f139801185f075be9e841d637f238b9d3bc37fa212f13c06ec411
diff --git a/dev-python/xmlschema/xmlschema-1.2.3-r1.ebuild b/dev-python/xmlschema/xmlschema-1.2.3-r1.ebuild
deleted file mode 100644
index cabebd229cca..000000000000
--- a/dev-python/xmlschema/xmlschema-1.2.3-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="An XML Schema validator and decoder"
-HOMEPAGE="https://github.com/sissaschool/xmlschema https://pypi.org/project/xmlschema/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/elementpath-2.0.0[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	"${EPYTHON}" tests/test_all.py -v ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/xmlschema/xmlschema-1.2.4.ebuild b/dev-python/xmlschema/xmlschema-1.2.4.ebuild
deleted file mode 100644
index 261c0c06b2bb..000000000000
--- a/dev-python/xmlschema/xmlschema-1.2.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="An XML Schema validator and decoder"
-HOMEPAGE="https://github.com/sissaschool/xmlschema https://pypi.org/project/xmlschema/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/elementpath-2.0.2[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	"${EPYTHON}" tests/test_all.py -v ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/xmlschema/xmlschema-1.2.5.ebuild b/dev-python/xmlschema/xmlschema-1.2.5.ebuild
index a97acabc5320..65ccfa46c57e 100644
--- a/dev-python/xmlschema/xmlschema-1.2.5.ebuild
+++ b/dev-python/xmlschema/xmlschema-1.2.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/xmlschema/xmlschema-1.3.0.ebuild b/dev-python/xmlschema/xmlschema-1.3.0.ebuild
deleted file mode 100644
index 28637b92bf4f..000000000000
--- a/dev-python/xmlschema/xmlschema-1.3.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2019-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} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="An XML Schema validator and decoder"
-HOMEPAGE="https://github.com/sissaschool/xmlschema https://pypi.org/project/xmlschema/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/elementpath-2.0.2[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	"${EPYTHON}" tests/test_all.py -v ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/xxhash/Manifest b/dev-python/xxhash/Manifest
index 0de3cfbeef96..348ca4aa1406 100644
--- a/dev-python/xxhash/Manifest
+++ b/dev-python/xxhash/Manifest
@@ -1,3 +1,3 @@
 DIST xxhash-2.0.0.tar.gz 64099 BLAKE2B bf4a013b70f02945b00b01043b34ff32bda0ce8aac5a533a0c7c606665a4054f443a46b1f60454b4d19a064db276ea66370a159d4037df49d5213dfc33703421 SHA512 c0d303f2705542ef8edb78ccccf42e3da6904e81cecb52f45861d0f0215f0882ad1617167273781c19bb5ff7ed776ec41a36a380eab2ce59e02636fc76f4b009
 EBUILD xxhash-2.0.0.ebuild 658 BLAKE2B 5ed31268925214e3b4440343827eaabd622dab055877195180b238c77ca4b0d45d08b1f587c29d94c511a7a9fe269e3beadc32b4b22ef58da210124e6eeb005d SHA512 08296dc2d5465d7a92cda7231c4397232c48302d422df3b7a7bcc8e8ed79071dc3370411d0fcc5212eff75300c69276b3da0712b86ede7807884e9809e01ab3a
-MISC metadata.xml 419 BLAKE2B 3c95ab655b449a422530861428bc659fd4f5678439abda9a7b5893fa4c9f67e780fb040cd391b8c0774a66c1576d8334b17e5a98fb42f18774c13ffdc4ca697a SHA512 d3e579f2293ce696a1959c93d77680a90ed5a441d26bf90c52d17132a27490c6ae4347f0fce76013e35072304b430b3def8976f4f2b66b83ff0f4dfa560142fa
+MISC metadata.xml 390 BLAKE2B ebee20a30e611d19eb3a6b96f7bd93bdf837c91f6afb911edeeb3fcb0f790bdd35a1f9fba23b8843ffbb81bb3a0f3d9b9ef81f86d349ecef4dcbb5fa212196de SHA512 73a407a2285c3b351167de10f384642ba6006b8c0c5eee96b07af927544195e082e71e53e7cabcd55250a0b2544840f71d64732fe3f797f526c7ae376a7c3f72
diff --git a/dev-python/xxhash/metadata.xml b/dev-python/xxhash/metadata.xml
index da5553da7dc9..6d246345d389 100644
--- a/dev-python/xxhash/metadata.xml
+++ b/dev-python/xxhash/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="project">
-        <email>3dprint@gentoo.org</email>
-        <name>Gentoo 3D Printer Project</name>
-    </maintainer>
-    <upstream>
-        <remote-id type="github">mikedh/trimesh</remote-id>
-        <remote-id type="pypi">xxhash</remote-id>
-    </upstream>
+	<maintainer type="project">
+		<email>3dprint@gentoo.org</email>
+		<name>Gentoo 3D Printer Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">xxhash</remote-id>
+		<remote-id type="github">ifduyue/python-xxhash</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/yapf/Manifest b/dev-python/yapf/Manifest
index 674eadceaf21..59b69dbb64e5 100644
--- a/dev-python/yapf/Manifest
+++ b/dev-python/yapf/Manifest
@@ -1,3 +1,3 @@
 DIST yapf-0.30.0.tar.gz 168259 BLAKE2B 1c5955028531dbcc20870ef84f3ba225a203f94367edc4e7ee8245a641cd83de0e57b0d55a4c93e8ef6f7bbe8b56f26b06a257968e132a04beffd77a8f951d5f SHA512 a282213d0171671a24d44b7a00b69f65163e7a7b8edfbede5cc38c809236a71f7adc8bfc3c4a1d1e66ac3cb2d9c6bb54b1303a2875ec09cdaddaa71d2039f84b
 EBUILD yapf-0.30.0.ebuild 456 BLAKE2B 9cdd99259d9161c5a457f08f68569334ca83d7fe21d2eabffda2a26f9bd96dd1f3b9dedb40721b4cb1dd7ad84a3a289f92d9e690f8650f56173e3cc3911d1953 SHA512 8e66048bd2096838cc002f2dbd609181fea4fda8583e184cab3391762a20341c467d7f17343bf6202d438ed341b9115a0ca1101e8680495732be7a0618fe7fa6
-MISC metadata.xml 658 BLAKE2B bd04267b635e205f88ad59f2005a9699ab10970e3ba7fc8917591259e78eec9f1ce7de08d75345635277ba996fed4f7a393989000b78100695e169636d7db999 SHA512 b8c79baca3d700b265485273bcb51394e15e9688b1bb834fd29f00809188032a711f8bc05af7038589c657e9329478542ed7e6b47e420c9aa91f6605eaca20d7
+MISC metadata.xml 724 BLAKE2B b0eeb025dd9ec712e90d159a58210908462096321083ca0eda359ebe7678e2299f8d50fcda5ed94fcbf45fb10facc5c2a99070dd9f1a6f432fe33e3b06fb6e15 SHA512 120983f53a5a6a6092224a3e4f4fa0f4d1b9966fde7f688432c8f1b5d6e4fbd47a7e6baea91d78dbe818fa23abb6c064b82f82a937af2d4b975ade97463d7886
diff --git a/dev-python/yapf/metadata.xml b/dev-python/yapf/metadata.xml
index 01578e600b81..602784a7a255 100644
--- a/dev-python/yapf/metadata.xml
+++ b/dev-python/yapf/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>chr@chymera.eu</email>
 		<name>Horea Christian</name>
 	</maintainer>
-		<maintainer type="project">
+	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
@@ -15,4 +15,7 @@
 		formatting that conforms to the style guide, even if the original code
 		didn't violate the style guide.
 	</longdescription>
+	<upstream>
+		<remote-id type="pypi">yapf</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/yappi/Manifest b/dev-python/yappi/Manifest
index d5ddeee5c944..10f706924ce8 100644
--- a/dev-python/yappi/Manifest
+++ b/dev-python/yappi/Manifest
@@ -3,5 +3,5 @@ AUX yappi-1.3.0-tests.patch 563 BLAKE2B 7415bb3e8c69634aadc605871414a17101e91e3e
 DIST yappi-1.2.5.tar.gz 928100 BLAKE2B 1d303226821d53fb215ac29f8363d9f564f9f40096b5ba8f67475c4074012316f523afb6d770cff879038cd333ef7f050b29c015e2dd2e517859f66a0e1f36f3 SHA512 ec784e76b56e8bc0c3cfe07c90d0810fa90d5a7da62f36187e8a09a9d6e01f3c2d74320de3dd3f4bf1d4a9425fee319c7a575a9d35ad5412c1501c934f1ba353
 DIST yappi-1.3.0.tar.gz 928100 BLAKE2B 1d303226821d53fb215ac29f8363d9f564f9f40096b5ba8f67475c4074012316f523afb6d770cff879038cd333ef7f050b29c015e2dd2e517859f66a0e1f36f3 SHA512 ec784e76b56e8bc0c3cfe07c90d0810fa90d5a7da62f36187e8a09a9d6e01f3c2d74320de3dd3f4bf1d4a9425fee319c7a575a9d35ad5412c1501c934f1ba353
 EBUILD yappi-1.2.5-r1.ebuild 976 BLAKE2B 3f047a3015a88861d59e9a2038a641ad8aced7c66f04001855ce50d37ae830bcae60e16df89ec9a6930c4649aef724311bfec311a72f555dcece057fdae3ae67 SHA512 171960875c3d2c67fabea15def17f077f7b9a0caac90ec2c195ca9d1e6256f77c2cbd3781e643d32c1c484b51c49533c4a50b77b4eedd12c1c85e4374c00739a
-EBUILD yappi-1.3.0.ebuild 900 BLAKE2B 7628b6ec6db08185b663bf5f75214f001e47b3f23f587a070d4453751eaf6baca3c10b4e0c5d27ee72fbef426201cdc24204fd34ff59d3fd450bd494d5419164 SHA512 03f5f9739097acfe20ade79c1dccc023353aba4492413d75c8b97cfdd0e4026108b28e5535340e98270805477a4708d7f079d0b140bbb7dc62ee182f88a7c628
+EBUILD yappi-1.3.0.ebuild 899 BLAKE2B 16b548bfff14c447de6ad8a619ecad564812d0a4eb82b47a95f4979a6f4bba478f2d4e9e80d62527ccc2e9ea52bccd0b7a7a395f0c38c3edf5de5e0a7b888910 SHA512 7e8510ae1655211a411cdec831bc0196176d0b5861ffbb4c4fac01eefd770c08f49a8621eacb42c9862f50bb80e3de9af25bcfb283d5a971e901990a0e419dd2
 MISC metadata.xml 488 BLAKE2B 2ac7151d74622eb9e76ce39ef336aa6c729b4249e781747916936fc88e0aac76d54626b8383c58cdb6661ef080b3ee37c8bab7eb00a4befac7b0523f5552afc2 SHA512 a85e098364030d565901db988e7848181b51db19d17eef2a97ab40ab4e318ccf03e2a72201ebe28ca56965c2327ebdf9e01f5230be9a46d4d273a08cb8473af3
diff --git a/dev-python/yappi/yappi-1.3.0.ebuild b/dev-python/yappi/yappi-1.3.0.ebuild
index 6b63a3df849c..ad3b69aae527 100644
--- a/dev-python/yappi/yappi-1.3.0.ebuild
+++ b/dev-python/yappi/yappi-1.3.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${COMMIT_HASH}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 x86"
 
 #RDEPEND="
 #	$(python_gen_cond_dep 'dev-python/contextvars[${PYTHON_USEDEP}]' 'python3_6')
diff --git a/dev-python/yapsy/Manifest b/dev-python/yapsy/Manifest
index 445d4fa0421e..8031406e730c 100644
--- a/dev-python/yapsy/Manifest
+++ b/dev-python/yapsy/Manifest
@@ -1,3 +1,3 @@
 DIST Yapsy-1.12.2.tar.gz 83986 BLAKE2B e6a2650383a7f0c9bf72d4abf21fffb2abcfdc4115a2a1578a2987b7eef1fc04de9099947c1b9dd510d54a89d9b11f86ac0ca3b13510c6417e94ff92dfec12b6 SHA512 3fdb4de1a6d8f836e22d82354492b99ec9883443c389393d25ea40a08bb0b6ae03db9c947af55237b67764facd4d55a09a36cdba107c8d9202f3700fd55c31fa
 EBUILD yapsy-1.12.2.ebuild 481 BLAKE2B 3b85f97ecb5f30d09a0eb139492247aadc6cbab2c3f7eb4669728c1a88132cddee64ee403d8acc9e24f8386a7d85c742d548d45a6b50401391756460d4af7bbf SHA512 11effd4478830ccaa5b569ed2cc4dac5c4d54199f0b781fb467c4b3e6a794cbfcc0bf048e317a7f88c7b03f19b2b87e68498d32c59d145630affbd0c450c0ce7
-MISC metadata.xml 423 BLAKE2B a30bb50714d2efa8d7bf299e53a3992ab24fd55ef2670fc7a15f25ed6fd864fd112940b0a202491307de2f74eb339292e32a475a7cbe89cf1dbd2ea4f6f47b8c SHA512 73e423d31a622b7b15bf672cdbada8378d069954acecdf6d729f05ca4297ef01016519adf362b322dced4694de829f079c80a17c836b5ee458b772a3c5fd36d8
+MISC metadata.xml 466 BLAKE2B f86d60766949f90d56dfb674db326574de8995470658e1d468365bda4fec5fa11e8a18215c31d5828f251d58fc8fb768d595d4a872218b3610cf9e156ac26853 SHA512 5b0bb85601ebb66d9cf1168e5564bda60c62d8f4088377d13b3997469a33c2bd50a15bdfc2f5c7756f9a229fac7f54294e636f6f31af86c72c9caa59f4437928
diff --git a/dev-python/yapsy/metadata.xml b/dev-python/yapsy/metadata.xml
index 59dcad63b3ad..e34e857fd2eb 100644
--- a/dev-python/yapsy/metadata.xml
+++ b/dev-python/yapsy/metadata.xml
@@ -11,5 +11,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">yapsy</remote-id>
+		<remote-id type="pypi">Yapsy</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/yaswfp/Manifest b/dev-python/yaswfp/Manifest
index aa40a25304e9..d6785e40c719 100644
--- a/dev-python/yaswfp/Manifest
+++ b/dev-python/yaswfp/Manifest
@@ -1,3 +1,3 @@
 DIST yaswfp-0.9.3.tar.gz 29845 BLAKE2B 2c5961b79d8378b707a920a4c6a1d75cf8cb09cc6a689035c7118758de3fc1f6fddf6a23e91f4cddea5f7370e4b558b40dfd4a05b16d7fb5f881c5ca74beb4a5 SHA512 06fb5d38c92f418fff77d812507621236b3fc74cf75786031bbd81ac1e61767a29647c7f1d0ffbb25d2f6f1a8749e5a732896ad66956e16c886e24e85915f72b
 EBUILD yaswfp-0.9.3-r1.ebuild 427 BLAKE2B 151d3df78af89514ba959e3ff20a87b3ff22d7c8e0df63f68e98a832d2aaafa0a60af3f25e279eab50d6591227688217b7d03fe6ef9ceb05d15da46b0457e9b3 SHA512 b30a1703c438a99006c8a4a4f6510202fdf3dccbc9eeaa79391608240b06ff4f123f12d041eb2163dd0350824aa295c273aab1600b535b5b7e65fe119f071a4e
-MISC metadata.xml 422 BLAKE2B 0fed51023c52483d2d3eeba60346b73a868edd674560a780d3922f6fb1d71f0298dd9bb7dbcaed7db391f16256760bd6f62d6466d145a0f1e23d628bc097d023 SHA512 9d637b30376341d6d3f781b96d899021d78b29035ac41b4e33653ba50856dda8cb3764304899a9048f32ad459e651f31d1d83b18bbc0258038ccd09b8415bdcb
+MISC metadata.xml 483 BLAKE2B f34efe0a4c7f5dad0ee483229b2215e8d52dd8d8a7db263d74b557bd22e84d87701dd15db52da1e02c7a3e7cbdd9754165afdf62361c6c8a91cbdce86c67b3ee SHA512 f7d15aa5bc14d27a6e8151c8e971a53f75759838f4b5d7542aedf4fa7f7cbef03c5d402d00b2320acf4ed79089de9855d20e664e0760df606ddf9fdffdb7cc6f
diff --git a/dev-python/yaswfp/metadata.xml b/dev-python/yaswfp/metadata.xml
index cb2c1dd76282..c2588c30bcaa 100644
--- a/dev-python/yaswfp/metadata.xml
+++ b/dev-python/yaswfp/metadata.xml
@@ -11,5 +11,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">yaswfp</remote-id>
+		<remote-id type="github">facundobatista/yaswfp</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/zVMCloudConnector/Manifest b/dev-python/zVMCloudConnector/Manifest
index e98848820cc4..9c1af4475b84 100644
--- a/dev-python/zVMCloudConnector/Manifest
+++ b/dev-python/zVMCloudConnector/Manifest
@@ -1,3 +1,3 @@
 DIST zVMCloudConnector-1.4.1.tar.gz 238562 BLAKE2B 048caf53328cb96589ba4cdba747dce662cf931a9356e10325733800188e945a7f32cbfc5d6eed7900563b384952b8103b446d28c4c5c5ff7b51444605c7a8bc SHA512 206776bd04ef547df530438efe6209db7374c33727d13269f6f3632aa69c74713b358e628dc4fab8afc6657ac65a17bd2ec4c6f2984385de2187581fd734e65c
 EBUILD zVMCloudConnector-1.4.1.ebuild 794 BLAKE2B 2c82395e9c7b977308dbc51c8ba8d4a744533038b37843da89e17b57e7ae01d4e1bedc55e95705ff75816e8dc599b5094f8d2c4f9e241108385919f0bcea647d SHA512 661ffe5e30374ecc356c9afc0f6d726b16f81c6b3ad1c4cea867bf5710cc75a36b326ed3597f50bc5c59bf299fff15eca77f41d7474fbb20f40fcce9e9cd3e81
-MISC metadata.xml 530 BLAKE2B 8376b5853991714f02d764dd8a29fc99eea8b524264114fb29118b55a30ac33aa643d1235ad2c8d4ed42836ea6e818e4a544defaa9eb598d13bb1405adb054bd SHA512 0a9490c18da93cc8d55373ba27ac71d4a81a77756bcbf9817a08a74c0903aa00f891cb758903007b0e17ee81256dd0eb4ab559d0e1974c8f94668552a11e5fbc
+MISC metadata.xml 610 BLAKE2B d0bd6d549ec1ed5702ccbdc95c859ea0fe4f190a25644b0e4218bf7cbceea2e4e50e3932968cb032cde699307698f69b469d0699f821a3238fde83a751059717 SHA512 0c1bcff24e7e2b6a3518a19b85985df1fcdb0df9a6e6eca7dea3274b576215a53d7b457830207d39676cf93caf77448f1ef1dbe793e883287d00df7668d85331
diff --git a/dev-python/zVMCloudConnector/metadata.xml b/dev-python/zVMCloudConnector/metadata.xml
index f0b577005701..4b9db07e2990 100644
--- a/dev-python/zVMCloudConnector/metadata.xml
+++ b/dev-python/zVMCloudConnector/metadata.xml
@@ -11,4 +11,7 @@
 	<longdescription lang="en">
 		z/VM cloud connector is a development sdk for manage z/VM. It provides a set of APIs to operate z/VM including guest, image, network, volume etc.
 	</longdescription>
+	<upstream>
+		<remote-id type="pypi">zVMCloudConnector</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/zc-lockfile/Manifest b/dev-python/zc-lockfile/Manifest
index 8ab7e889d7c4..1ccae51551cc 100644
--- a/dev-python/zc-lockfile/Manifest
+++ b/dev-python/zc-lockfile/Manifest
@@ -1,3 +1,3 @@
 DIST zc.lockfile-2.0.tar.gz 11923 BLAKE2B 7609f64eef4521f0aa95dc899b253570a317bd997cced00665a2dbe22cf7f834ce75daaf4fdf79520157dee31742758aad1844d49c5eccb780e7d5fd2e8e5ac5 SHA512 2586bafacb12540383695a24cb01fd284e61bfa3fcb16431ed0e91278e547c68983363fb69c1ffbd54f7c22db43300ba018ccd2fb3e21666c98860415b7a3c3b
 EBUILD zc-lockfile-2.0.ebuild 1058 BLAKE2B 0886a9b01c7809bb5903f959cff14f0bc5c15dad25998b3e4f20212fbd6ca2df386c6ed2734e86155d8797bc3ac1bd5c1d7b69233fef3a15a219ffb725583295 SHA512 9f210de756daaf664d9ba8aa03024b1e8bcae11d7cdeec3d35dc0e887fce6c1961acd40e489302b9774e65f862fce817f0b46939eedc49df2bafa836a2806e30
-MISC metadata.xml 349 BLAKE2B d750432001725ac1266b82b174011a342b115739dcce7a9ba4da4465a907f64620f0e5e4e38cf6b41beffc4021cfd070b1f68b6da88f2a309f44c45d23b4b40f SHA512 6152f78467097c2e5ed0c65dbdf6bcedd84310b74c9ee92efda96fb855db3f0f990387a48f58f34e2c9f4769bc0f7a28b1c6c4be7e9561f6a3c4a22fa279cf0f
+MISC metadata.xml 423 BLAKE2B 41733af56123f04fc6f6f464597c83b1f72b60867edeaa1c04d90e76ac49463db1976ed54b4399d03aefa5203d71ae5e004a415e512d9aa7dd4c9095b32711e1 SHA512 138224c2b0a22e5b77330ad2c2d8050ed28b2470ccfedbccaf42d412925e7a5c06e278045ddc70be6f398dd50186b403135f75c0c5e308582fea12f42394ca7c
diff --git a/dev-python/zc-lockfile/metadata.xml b/dev-python/zc-lockfile/metadata.xml
index 9f8e145958a9..a0536cb67925 100644
--- a/dev-python/zc-lockfile/metadata.xml
+++ b/dev-python/zc-lockfile/metadata.xml
@@ -9,4 +9,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">zc.lockfile</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/zconfig/Manifest b/dev-python/zconfig/Manifest
index 4c90101aae0d..3d8120ef54c6 100644
--- a/dev-python/zconfig/Manifest
+++ b/dev-python/zconfig/Manifest
@@ -1,3 +1,3 @@
 DIST ZConfig-3.5.0.tar.gz 127317 BLAKE2B 735d554072d4be4ee0552151a6bd0401e66bc0a7a091d97656a2c95efb13580d264a39e28c11e096ee77f57bc96d684720c22c981f5dbd82ce012d40c94d33ea SHA512 14af4de2adcb7e5404a4fd8e1a1903758c584898fda7c4d2a660616c37023f0e0b5d4acac789a930c2900eb501528899d51c4ea4c4050535cfbaa629e9159558
-EBUILD zconfig-3.5.0.ebuild 924 BLAKE2B 4664f8d5bb50819af410e6a02f97d63e895718d3806e9c0a9372dea2d0d00492ef3d9206cf364f933180b77f658a5b71d1913dd9652a21112b7065bd932abf57 SHA512 ae679b368fc558a8c40b90e240a2dcfdb107dfdb2748345f35b32c69d59f18301482d6f968eafdd19b9863fb71476552fa81efdb628233c6b2a554259110a0ba
-MISC metadata.xml 1466 BLAKE2B ec9f04749ab0badfeabf3a1a87d40b394b3494cfcb8f838a0e821d3db37ad55e5578b6145c10ba65d2d36c2034696f33311b4d2e7ce3c7c1220d3ec1c96c6c08 SHA512 f49a9d63ebd430f154e115a4e7786bae532add4774f929b3bf326cebcffb17b41e002929913c209b4acf80e3c94a8313f33efdce0eb5ac2516c9aef595659ae9
+EBUILD zconfig-3.5.0.ebuild 921 BLAKE2B 7609c7614fd9da7afe71e748bed5f7be74d5fff12f8c473526b1945b15cbc31c9000d8258eebd8de40d6b5691b79077b55210838254f7907c6ea2764c505a579 SHA512 31e83dc06b5bf78b20f5fb3e410baa51b21aea01ec9a423c5b33a240dd24e6284055c23d0d77eb8ad26c7d9f793ff3e7b3e4841c9684a21e6c8e7bdbc8ef10d2
+MISC metadata.xml 1493 BLAKE2B 2aa4b507ca0e016ab9b706913128984896622aa85904dd73bdb8e337339dcca8dab9df6153f275721081b9954d102bc6ef6645621f153243df9714c6d96984ef SHA512 81db84d822dca56d5e582bf22aa1b08b4b32b80143851ef890460ba39bc05179dd97ac5afc7bf0fdb839c1807783a4d9b1347d66f133effe6ffef90d801944e2
diff --git a/dev-python/zconfig/metadata.xml b/dev-python/zconfig/metadata.xml
index c2d543f28177..ed502c98fcf9 100644
--- a/dev-python/zconfig/metadata.xml
+++ b/dev-python/zconfig/metadata.xml
@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>lssndrbarbieri@gmail.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">zopefoundation/ZConfig</remote-id>
-  </upstream>
-  <longdescription lang="en">
+	<maintainer type="person">
+		<email>lssndrbarbieri@gmail.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">zopefoundation/ZConfig</remote-id>
+		<remote-id type="pypi">ZConfig</remote-id>
+	</upstream>
+	<longdescription lang="en">
 ZConfig is a configuration library intended for general use. It supports a hierarchical schema-driven configuration model that allows a schema to specify data conversion routines written in Python. ZConfig’s model is very different from the model supported by the ConfigParser module found in Python’s standard library, and is more suitable to configuration-intensive applications.
 
 ZConfig schema are written in an XML-based language and are able to “import” schema components provided by Python packages. Since components are able to bind to conversion functions provided by Python code in the package (or elsewhere), configuration objects can be arbitrarily complex, with values that have been verified against arbitrary constraints. This makes it easy for applications to separate configuration support from configuration loading even with configuration data being defined and consumed by a wide range of separate packages.
-  </longdescription>
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-python/zconfig/zconfig-3.5.0.ebuild b/dev-python/zconfig/zconfig-3.5.0.ebuild
index 8e47fe2dcdc1..83eb4344a6fb 100644
--- a/dev-python/zconfig/zconfig-3.5.0.ebuild
+++ b/dev-python/zconfig/zconfig-3.5.0.ebuild
@@ -12,7 +12,7 @@ MY_PN="ZConfig"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="A configuration library supporting a hierarchical schema-driven configuration model"
-HOMEPAGE="https://pypi.python.org/pypi/ZConfig"
+HOMEPAGE="https://pypi.org/project/ZConfig/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="ZPL"
diff --git a/dev-python/zeep/Manifest b/dev-python/zeep/Manifest
index 2bd4b4d0c37a..ddbb4bdd1edc 100644
--- a/dev-python/zeep/Manifest
+++ b/dev-python/zeep/Manifest
@@ -1,3 +1,3 @@
 DIST zeep-3.4.0.tar.gz 163748 BLAKE2B 52709b22bf3dbe228630fcaca33dbfb1f9bb2fd6fab9a2f3ad1cfdf92f84aa2a5b1b71dbd5d41eca3bc12a9ac022d27191929533578441ff020e574fe2b95cd8 SHA512 31adea141ffaabb122a2127bcbba2742ed15d4cef91907c8db4aefd8550b2259502a4122825cbfa62559fd5babd3d0c6ce2bf82dd3b79cd9026d8ca008897349
-EBUILD zeep-3.4.0.ebuild 1104 BLAKE2B 574fec4955e588977abc0e66ca4c71984cea96d02f12e889106647acae0933bdc7ec4179898d69b9b17e4b870712450e1963e86935de04836b04b363099d8f57 SHA512 cc0e4bbfadef38cdeb1007d7fc42d3599c33dbff8f8ba33bbf73f18390f7743a20cf9449f70c052d3f32e6e7c29d33fc6302e185d205560393e1b37a0d4c37d3
+EBUILD zeep-3.4.0.ebuild 1100 BLAKE2B ce598c3edae9d9800cf1b8651fc47956d4d360620433857c9700416e11ae909d92a3cb29d2b1d2b3ffb280b0d859018e329a60ed745772b75c4717b645a490b3 SHA512 7cd4d85465cb3ea9d1b9af21869e1aa3a6ba70be065ac1739c31a42f856fdc36ab84fe296fa500e7cd11049c79fb054722a52a8355385ff588ea02d0e147677f
 MISC metadata.xml 501 BLAKE2B e687afec70f3c42b91871c4a5fd797626a9a6970368256d5bc5f69653125ac00f5a46a409e25da431ed5f4a7e3c03f7521ee80ec863178473dafb3ee6114064e SHA512 32553eaa2336be92c78412d2253f4e299c793fa9a42c8c4f3d969880a4b356da1d43d62bf1ea7866b1e462075b10b1033a7a3713086bde6d8eb0bcd829c6a144
diff --git a/dev-python/zeep/zeep-3.4.0.ebuild b/dev-python/zeep/zeep-3.4.0.ebuild
index 8a508a3b5ca2..24b289bc4397 100644
--- a/dev-python/zeep/zeep-3.4.0.ebuild
+++ b/dev-python/zeep/zeep-3.4.0.ebuild
@@ -1,9 +1,12 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+DISTUTILS_USE_SETUPTOOLS=bdepend
 
-PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="A modern/fast Python SOAP client based on lxml / requests"
@@ -15,8 +18,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="async -tornado"
 
-DEPEND="dev-python/setuptools"
-RDEPEND="${DEPEND}
+RDEPEND="
 	>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
 	>=dev-python/attrs-17.2.0[${PYTHON_USEDEP}]
 	>=dev-python/cached-property-1.3.0[${PYTHON_USEDEP}]
diff --git a/dev-python/zeroconf/Manifest b/dev-python/zeroconf/Manifest
index 061fa551d25a..61f0960027f1 100644
--- a/dev-python/zeroconf/Manifest
+++ b/dev-python/zeroconf/Manifest
@@ -1,3 +1,7 @@
+DIST python-zeroconf-0.28.7.gh.tar.gz 60821 BLAKE2B e8c99505d1b149319552c808ee17bd3cd37a016c094d5f273f5d3545670ecf6f9cff58178293816e9cd671cf9e342b0a99641d6b9b3d32626dac4e72d983380e SHA512 8cc5c9b2e964c170c2aa53a3c07f2cd634cb113737fdf2e7a924b0b1c5ffb7c2d1e97b589cce36a4216f427e0e64dfba373f9f96b6117e835a9aa68a911edea0
 DIST zeroconf-0.24.4.tar.gz 51866 BLAKE2B dd71bda4b0759c61a3e5895e766dff6516ea81ca0c8c9f5a95a8093de8a3a9b15722b99a6af0092b02c1b292bcdb11c02c9f165003b56ca8a793f4a4ca8fd891 SHA512 71678521b05016a7404005a06c8109f861cc8bfe2b3375ac6f1da8f63771271a3d9a095a8db6ccea2e062c5cc28b750a50fbe69218de72646b13a5f03359ea17
-EBUILD zeroconf-0.24.4.ebuild 888 BLAKE2B f77a3e22a1a2f174767afeb10dc53bbc70406c25aacb6bb3a9e276f3fcfa2900683354ef5850649f49b2ab78ff4da7a1e627590bda9558c0a350ed486161595e SHA512 2bb8369e2ec5e6bc4ebe3b0e01a19f6bb67919e9d8f50253fed4fc34d0a6d81798a6e97ae4a1de461784b558f6eb4fe17eb3d6cecd5b76c247d9b543ea778214
+DIST zeroconf-0.28.6.tar.gz 61487 BLAKE2B 2ded05d0e63d9f4918da925c179ee198dac68cf7a51d8f63beaaa697b04d297c7e892c97b1cedd51f9ab4af23e79e50bd3d85eb1af804c0fc0c67461501a508e SHA512 405786a25531efc42acf967838e74b67960b7ecdbee5db0633a56ba3e1774b9bd71fac58bcf29ab57ef6328560ee0f0f8cfa126ea42637ff53fb18c479a92f62
+EBUILD zeroconf-0.24.4.ebuild 890 BLAKE2B 841dfc5ae64f77eac07133a4f58e5d23505410c12c4adfd38f161297a6db3d6dd6f7f5c8baf8b1c83b78bfbd316ce3ebccbba732c37a8e3319d8b0b0770c366f SHA512 2afd01e0fdabb391958c1f453bf9f459e433bced93422afbe6b2292457e3639b6b7ca7cf73992526cad7625e1c94c4951b290098d8b153639e9b0628cb2252fe
+EBUILD zeroconf-0.28.6.ebuild 900 BLAKE2B a4becb3f2c92b739f27bb8a5df2a154a502ae89fed01379a07ea139e0e67e1376433239d5e4d56422b765cf6e13fb030f8878e1b05d99b7252ee97d202d90b61 SHA512 45fd053fa6289069c90e1d90167b4205faa957149e1b3e0d30e8beb0a58df9610058675a3b1ead600990b8809a2d2285f9154c35d35718e5d4a8a9a9763e8cca
+EBUILD zeroconf-0.28.7.ebuild 873 BLAKE2B 8c31070af7da401629fea526f3893894ee639648d4bd12af9c85248e3a920fd28b63158f140790fcd17d9ef496380d5a68cdc1f9e42f9816cb9445887373ca84 SHA512 811bd3cb3d9a158cf4a1940fe36db6e3d66e3e28da15c4800662981d6231105b0af2679699510389d14d1411b5c5cd5f1fc7d601379fd04d7a2b49dd193ab8d9
 MISC metadata.xml 387 BLAKE2B 9dea981cf6247ad6fb6ddb3b060671ddb031ec703dc00e61e2efb4909478d01b5dfa309ed848dafe321d388156d16f44bc7b803dab79731205e374b5f046757c SHA512 ccee11a4aad084b1ac1dd901d966e1424b7ad3769b4bdf62c2dd44f9cbb6ec1a566443967ba45b37ef6241f43d2a06c17ebb5028254fbf40e0a480fcc3d76f89
diff --git a/dev-python/zeroconf/zeroconf-0.24.4.ebuild b/dev-python/zeroconf/zeroconf-0.24.4.ebuild
index e25945a5db77..670067cd5c12 100644
--- a/dev-python/zeroconf/zeroconf-0.24.4.ebuild
+++ b/dev-python/zeroconf/zeroconf-0.24.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/zeroconf/zeroconf-0.28.6.ebuild b/dev-python/zeroconf/zeroconf-0.28.6.ebuild
new file mode 100644
index 000000000000..821b003fcdef
--- /dev/null
+++ b/dev-python/zeroconf/zeroconf-0.28.6.ebuild
@@ -0,0 +1,38 @@
+# 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="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
+HOMEPAGE="https://github.com/jstasiak/python-zeroconf https://pypi.org/project/zeroconf/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=">=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+# Not included
+RESTRICT="test"
+
+python_prepare_all() {
+	# It's virtual/python-enum34
+	sed \
+		-e "s:'enum-compat',::g" \
+		-i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests --verbose || die
+}
diff --git a/dev-python/zeroconf/zeroconf-0.28.7.ebuild b/dev-python/zeroconf/zeroconf-0.28.7.ebuild
new file mode 100644
index 000000000000..276d5ec5755d
--- /dev/null
+++ b/dev-python/zeroconf/zeroconf-0.28.7.ebuild
@@ -0,0 +1,33 @@
+# 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
+
+MY_P=python-zeroconf-${PV}
+DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
+HOMEPAGE="
+	https://github.com/jstasiak/python-zeroconf/
+	https://pypi.org/project/zeroconf/"
+SRC_URI="
+	https://github.com/jstasiak/python-zeroconf/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND=">=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# broken in network-sandbox
+	sed -e 's:test_launch_and_close:_&:' \
+		-e 's:test_integration_with_listener_ipv6:_&:' \
+		-i zeroconf/test.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/zstandard/Manifest b/dev-python/zstandard/Manifest
index aaa790165ddd..f8134145b508 100644
--- a/dev-python/zstandard/Manifest
+++ b/dev-python/zstandard/Manifest
@@ -1,5 +1,7 @@
 DIST zstandard-0.14.0.tar.gz 676761 BLAKE2B f90fcee6571f89eb5964ba50c722be8f3b846a0aaa6f79bd41389131ce332a4c6f7ec3d2eabd16268a42d211c7c02c2f7379019ef44272eb23cc74a20e5e9b3d SHA512 57c62eb7dedde2a2178f79a5658b87b5c5f176b282311273953003824272afa03e126a79b57fc8b75e9e15585d44d6b9931318a8ea5e7c75ec0feebbd7eb6cf0
+DIST zstandard-0.14.1.tar.gz 676849 BLAKE2B ad2a89371301e64428de90adf8770ebb7b43b06d720f5e0e9b490dc8771c55a974625105128c3a8052d68230d2670a802adfbf64708729440fdf624ca8d4fccb SHA512 e49f294816f0c7da35914363dbbdfcc4d432f7fa8367192e07a5d0c093ec8af76966fd0a95b4e8316091f056a8027c383ca73cc9ed506b29e2f9a31bc9ad3379
 DIST zstandard-0.8.1.tar.gz 463785 BLAKE2B ac4dce58cefa05d265824004464bad89a7f4c4e5f19ac1d8b5b8b0ad6f806318e2b82ffb6f3a290e3605961801909b339b1e5d89fdccd76fd28c75a695a92e0a SHA512 0ddbe22381397443c6c9f84e64f9358160bede104c4f48351119d880ac4f88994739b0b3915454567d2b2b04930c6ead5aa290a40323ba4b0bacf5e97809793c
 EBUILD zstandard-0.14.0-r1.ebuild 788 BLAKE2B d72c1baf43b98f514891578bda39897d893ba961a9544c5fd9e3c756080d57504ce23e869707f3a94e43f0e9d2381cc328f360bb725cac421e6f68e98157cfdb SHA512 fde59fa42f61d83c6fe405b130a721b5baeaaf2013f69abf583f50ee4d0f42f84ee557060429a75f0d55b067364f6434d64a24f3e6e0152327619e2f23044415
+EBUILD zstandard-0.14.1.ebuild 794 BLAKE2B d767bc9c845e52b1a1aad45e6640f09073ec46b0f9798d1c0a31160958aea1660eea5d361e6a020e72f2aeecf4df16a54bc494ff1208e89955a6a310e4c95fa3 SHA512 00df3555231d2b5ba43d0fd497191ae72ab9cf7a1163bed326cb01b31937d6b3417001994e3ccbd34f217b2fce3c049132d7660dbdffe5b9319d00b275f71b51
 EBUILD zstandard-0.8.1-r1.ebuild 658 BLAKE2B b4f3e0ad9bc4312b80c5248d0423215e67e9d2044b1f3c3eef5234a89a525dbae2708fc76d4f128ddb5f57e9d2993450e00f1804dbc8455e1700f5d268c4a1de SHA512 0d12ac97dcfc60abc8a1ddf33e11d846e5d8aaa46362bd5eeb535de0a8e049b9b1a9a3a75cf6f16c165a5ad7abac996db77712fd3684706cc39f3373ca6ff4ec
 MISC metadata.xml 377 BLAKE2B 987c1e1f5a7a37a8686acf05929a8c7cfa702358d5c8fcb678ebec0e28ab590d2dbfe92892330d006b202cc4fbc22eb4fec8876902ab56f44990a59932d6c0f3 SHA512 54b4b2a4b98fda27659ac1cb39e16ff788687aa814d882822ffdfa9c085b04bb3a24885f9a08ea73b05b959ed6441a6ff5090c1159300c1d024f1abf239cb141
diff --git a/dev-python/zstandard/zstandard-0.14.1.ebuild b/dev-python/zstandard/zstandard-0.14.1.ebuild
new file mode 100644
index 000000000000..86f9c0f9f030
--- /dev/null
+++ b/dev-python/zstandard/zstandard-0.14.1.ebuild
@@ -0,0 +1,27 @@
+# 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="Zstandard Bindings for Python"
+HOMEPAGE="https://pypi.org/project/zstandard/ https://github.com/indygreg/python-zstandard"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND=">=dev-python/cffi-1.14.0-r2:=[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? ( dev-python/hypothesis[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests setup.py
+
+python_compile() {
+	local MAKEOPTS=-j1
+	distutils-r1_python_compile
+}
diff --git a/dev-python/zxcvbn/Manifest b/dev-python/zxcvbn/Manifest
index 8a1b920da634..1dbacb087ab2 100644
--- a/dev-python/zxcvbn/Manifest
+++ b/dev-python/zxcvbn/Manifest
@@ -1,3 +1,3 @@
 DIST zxcvbn-4.4.28.gh.tar.gz 9392042 BLAKE2B e3baf57df00819243f9588c8203598b14b9f03e0a232d53152584b3b74872baef7050fdf8f11f25e8a8776e2e4a7a0af15c9045f07700fe686c6cb021f794f2b SHA512 be85f976dcf685e2885edff116147cc4549f9c86dee4317b61b84dc4f36ab2c8c2f3468d5d1a55e8890693c852a09104b14360f9ce43feb3727f8fc164eb78f1
 EBUILD zxcvbn-4.4.28.ebuild 508 BLAKE2B a202c2b6a220225801ad36685183f23de6fc419bf4300a6f48ca0d6a7afa146c4c48f07f5d59e3a2ba91a7ea0f371090b606c7bbd9ed012c3a807914cdff0085 SHA512 1cf28786a2509d438a9622cd9abd007221bdce063582d655af75c5ccfdf5f06f9d16043ee0b458af594f8b92cacfc215b6bfeff65406841601fe604b71f2c1b3
-MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
+MISC metadata.xml 287 BLAKE2B 83af213048e4beb93034bb8d4ab8eb6710fc67a2f3c1ed0c686918aae530a1a7b35f0ff9b691676ba3d4af08cccbdcdb905e5661a9bb08c5dedf77d5fd7bf337 SHA512 71cece3d691079796102e3deb3e44ddb7595454a1367ff911a08de12fd991ea6ef80230af0b61ae96d3dbce00a4129c7d0b319b6a3c02d34c2f5d61a52602bf9
diff --git a/dev-python/zxcvbn/metadata.xml b/dev-python/zxcvbn/metadata.xml
index 266e3f19ca59..7f590bf4c960 100644
--- a/dev-python/zxcvbn/metadata.xml
+++ b/dev-python/zxcvbn/metadata.xml
@@ -4,4 +4,7 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">zxcvbn</remote-id>
+	</upstream>
 </pkgmetadata>
author	V3n3RiX <venerix@redcorelinux.org>	2020-12-14 13:26:14 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-12-14 13:26:14 +0000
commit	6abbf81ef2f298e3221ff5e67a1f3c5f23958212 (patch)
tree	25413d1cb3a0cbfe36029db32398c0f333609215 /dev-python
parent	9c417bacd51da6d8b57fa9f37425161d30d4b95b (diff)