Updating liguros repo

author: Palica <palica+gitlab@liguros.net> 2020-06-28 12:52:46 +0200
committer: Palica <palica+gitlab@liguros.net> 2020-06-28 12:52:46 +0200
commit: 201b7f407a64a15a8477ea3c0f0fcb9fdaf33fe7 (patch)
tree: 0be73d02b5be9f6baafdc73d27817551c37396a2 /dev-python
parent: ecdac123787b96ce6649f0f91da12ea6458cc2b1 (diff)
download: baldeagleos-repo-201b7f407a64a15a8477ea3c0f0fcb9fdaf33fe7.tar.gz
baldeagleos-repo-201b7f407a64a15a8477ea3c0f0fcb9fdaf33fe7.tar.xz
baldeagleos-repo-201b7f407a64a15a8477ea3c0f0fcb9fdaf33fe7.zip
139 files changed, 1107 insertions, 466 deletions
diff --git a/dev-python/argcomplete/argcomplete-1.11.1-r1.ebuild b/dev-python/argcomplete/argcomplete-1.11.1-r1.ebuild
index 46e21d551440..eefc33c78356 100644
--- a/dev-python/argcomplete/argcomplete-1.11.1-r1.ebuild
+++ b/dev-python/argcomplete/argcomplete-1.11.1-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 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/argon2-cffi/Manifest b/dev-python/argon2-cffi/Manifest
new file mode 100644
index 000000000000..f2c4dea9eb21
--- /dev/null
+++ b/dev-python/argon2-cffi/Manifest
@@ -0,0 +1 @@
+DIST argon2-cffi-20.1.0.tar.gz 1814415 BLAKE2B c216349beffa263fd96df23f40a8102b56a88b8320e64ac062ecfea4582efa34b298ba223437bfbfc422b68a3d9b9ea769c384db078c633103f2aae3cd38bd5b SHA512 d1d798e3e51ed67c4f523a66081fea99479ee986b5cfc36b250954e757b9846625681445447f9347519d9988f8a2ace2e3c8ce5817c5c6b4767819cf56ee0af2
diff --git a/dev-python/argon2_cffi/argon2_cffi-19.1.0.ebuild b/dev-python/argon2-cffi/argon2-cffi-20.1.0.ebuild
index 511ca6b470b2..fd169244b16c 100644
--- a/dev-python/argon2_cffi/argon2_cffi-19.1.0.ebuild
+++ b/dev-python/argon2-cffi/argon2-cffi-20.1.0.ebuild
@@ -14,15 +14,13 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-COMMON_DEPEND="
+DEPEND="
 	app-crypt/argon2:=
 	dev-python/six[${PYTHON_USEDEP}]
 	virtual/python-cffi[${PYTHON_USEDEP}]
 "
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
+RDEPEND="${DEPEND}"
+BDEPEND="test? (
 		dev-python/hypothesis[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-python/argon2_cffi/metadata.xml b/dev-python/argon2-cffi/metadata.xml
index 274cc7d1ee97..edec129622aa 100644
--- a/dev-python/argon2_cffi/metadata.xml
+++ b/dev-python/argon2-cffi/metadata.xml
@@ -13,10 +13,9 @@
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
-  <longdescription>CFFI bindings for the Argon2 password hashing library.</longdescription>
   <upstream>
-    <remote-id type="pypi">argon2_cffi</remote-id>
-    <remote-id type="github">hynek/argon2_cffi</remote-id>
+    <remote-id type="pypi">argon2-cffi</remote-id>
+    <remote-id type="github">hynek/argon2-cffi</remote-id>
   </upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/argon2_cffi/Manifest b/dev-python/argon2_cffi/Manifest
deleted file mode 100644
index a07906082a0e..000000000000
--- a/dev-python/argon2_cffi/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST argon2_cffi-19.1.0.tar.gz 1808120 BLAKE2B f30afe3c270fe4ff41ee97418a49480d7ec7235db659d033926cb7380afb664ab61cfb41fbae2f8581c6873c474746431a1360abc134244803acab73836ed533 SHA512 9bc10f0dfbb199e0ae0c9bd6a7c9183a5b0b108966d89bacf8ee744a926d400bccc14869b889a2482be4a5c48bd7ed0464cf316ecad74b758a5493beed7d466c
diff --git a/dev-python/autopep8/metadata.xml b/dev-python/autopep8/metadata.xml
index 8862320cacc9..5ca20d7e70a9 100644
--- a/dev-python/autopep8/metadata.xml
+++ b/dev-python/autopep8/metadata.xml
@@ -10,5 +10,5 @@
     <remote-id type="pypi">autopep8</remote-id>
     <remote-id type="github">hhatto/autopep8</remote-id>
   </upstream>
-  <origin>kit-fixups</origin>
+  <origin>ports</origin>
 </pkgmetadata>
diff --git a/dev-python/bitarray/metadata.xml b/dev-python/bitarray/metadata.xml
index 7d73fa5bf43b..73ccecd4aca5 100644
--- a/dev-python/bitarray/metadata.xml
+++ b/dev-python/bitarray/metadata.xml
@@ -20,5 +20,5 @@ you may find this module useful.
     <remote-id type="pypi">bitarray</remote-id>
     <remote-id type="github">ilanschnell/bitarray</remote-id>
   </upstream>
-  <origin>kit-fixups</origin>
+  <origin>ports</origin>
 </pkgmetadata>
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index a7b254c5c558..1b153ed2dd96 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -2,6 +2,7 @@ DIST boto3-1.10.2.tar.gz 272071 BLAKE2B 9c3b90ae751784946a84d0cf31ed0111526ed97b
 DIST boto3-1.12.48.tar.gz 292124 BLAKE2B 0baf8fb4cfa040ba05b296d15a523a5de32677684143145b12dd54182d4fedbffa5656d36ab854006c0cc6009a1bca351bb5ac2ea757cb70b446924bcae625a8 SHA512 3cf5533dd5d9aa51cf46ef81ba25bb7afbc73b1e745ea5ae47935b22da290c7d2101e377b3225f970168201dde0bf2ee967e24eed86548f9045eb72840afea6b
 DIST boto3-1.13.26.tar.gz 296782 BLAKE2B 117bb18679fe3ae8c4feee1a5fb2d1df1923764bba3dce72040ccc802d10bb88263744a0491195f414761b6755353775a8a413a121a5a0fc42373a4e9b8aac1a SHA512 513ea4b39a5af4ae8e45f6b8b315a19d5184998fa881782bf2e6074aee36a709b51813fc9fe403bb8dbfb9b51ead50367af18f0918a1c88a37eab263ccddd11a
 DIST boto3-1.14.0.tar.gz 297008 BLAKE2B 7f5eaf4958395b47e936596b385b5a4daa20dbed6b777a407b6c2f70d3004d89fb963f479a1a3c8be22a3cbbfdb21f59a1f3c3ea4b967fce4799fc965899bcf1 SHA512 12ce4765f22e848aac0c29d1f95ed7b63964868f18c14073f93c74e442babf8708aa69cb6c17bd7c3aa5dacda6beb67bb4a4afe86fcd298308c70abfb77802d4
+DIST boto3-1.14.11.tar.gz 298578 BLAKE2B c78ba0957c4252adeaefb7ac3e335e3db6044752cd06731b6f7367bbfdbbb2db25d717ddf8954eabce745bca07d2980445a725977d3f12a5914e8620502e7f88 SHA512 069e21ca8aa5b7d30ff7ea9f94bb4d939495f0ce30a831e985687eafe4cd22ce830af2427b645df16ddcd51126c366ff61243bb7251a2aecbef46b8573d2e124
 DIST boto3-1.14.2.tar.gz 297730 BLAKE2B 174bc2435247db4421ffbf1ca0ef2cb772a9b6f357cbb438996ad635fca8ae5cd1005df3f8fdc6c63607797115c2379bb10c43edcfaf8393394f241b1e7a1ca1 SHA512 6ad539e568fe90c2f7408f37d28f194ac7094f6393858e487bf2afa73b8b53c90c8ab489bbe56f7c594351b24aaa82bfc9f81c9d68fadaecaec5acc3352fad5e
 DIST boto3-1.14.5.tar.gz 297919 BLAKE2B 9428ddfa1a5549bfb8319cc91292dace9245a9db94eec373f571342808cdda7c1bf2b683ccddbcae532aca79666971b5cff7646756dff7baa24e291b348ff0f0 SHA512 7c65b1a1b6070b8954b7a705b1473543be6a4939c8594327cdaf8c91ff557bfdb49611e18f2bc6b0213fc13ef4cdbf57da7e632ac93dacf6d887f7a18889ff59
 DIST boto3-1.14.8.tar.gz 297922 BLAKE2B e71a74155a6e32b310063c6c80ceb960db816898271f01066099d9ef162e90c5c446ea29b7164d957cc4d02e546eec59eb62f9168aa7e5f6e149c2d97fa14928 SHA512 a5c1c63664c406dc6b923ee565d30572173084b43a4539605cfc36a959d5d8fbcf0864720732128f26ba84fe8e4aabb31842d656e6e189860a41b365955e63ae
diff --git a/dev-python/boto3/boto3-1.14.11.ebuild b/dev-python/boto3/boto3-1.14.11.ebuild
new file mode 100644
index 000000000000..062b762234a9
--- /dev/null
+++ b/dev-python/boto3/boto3-1.14.11.ebuild
@@ -0,0 +1,53 @@
+# 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
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-1.17.0[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit tests/functional ||
+		die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 72466f75098d..6abb3c4291d9 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -8,6 +8,7 @@ DIST botocore-1.16.26.tar.gz 6458468 BLAKE2B e753f7dcb3d75a86da78536883e44cbd493
 DIST botocore-1.16.6.tar.gz 6386032 BLAKE2B e909e2fa021d5b1be333a31758af408cdc6e11224addefac31b87b8ce9983350aeaaf862feaf040490fad8eb87d7dde800bd8a77156410e6a734f567e2cc1055 SHA512 1f265a0a8adb7f0172f02448d3be5aeacf11e3fb7023da8d81e6d19c39d97cac99cfe3a70997e682deb44a4fd78304e4a0c1df43787f3139bbccbe852c682a82
 DIST botocore-1.16.7.tar.gz 6391893 BLAKE2B 19a8770ef1058e5601a1c292e2e17e1625e4d5d0d1845b59bbd403a2c285da1a774935e9d1e1fa7ca26a1e3c4703b29fcbb2f021a7251aa3ca756c80b2ba0461 SHA512 0ab2b4ff4096049cd92b96c710a38867a53b2dba0f07a319ec1a2f9b3cbce60776026c62e3eaaebe571b6ad26eb5c1c258b2dd350a444d30e54b342bcd675768
 DIST botocore-1.17.0.tar.gz 6478558 BLAKE2B 761ff2d57079a52ce38a6d56639fb0771d1fc4fb6a3494badecaacd4cea1ef74a69fe23d9fe62827993a3b6c33b963a2a199300f37fa3e7dc42433135c00f035 SHA512 a43b2f99e44ef9de3cf740b8fc1d74976d9ff6831639229a704f9300011405861789c9af26ea657f64244f5d67cff19aa94f95e5d2df73ee4f2dc10ccdeabae3
+DIST botocore-1.17.11.tar.gz 6508848 BLAKE2B 91e38db3868fb2cba9ffa6a1dfc95bd6557bb5ed8844a148b99603fb8557dc269fd652bfac3132d0b0b07fbb9063ed2762ad461cb75280cef7570bd251268029 SHA512 7ae6129985b58d1f24d0892a4506681af23d45d68be217aa5ddd06cdc2e8440edab3983f3f7dd0bb1993275d2ae0cfdd5406aaa7643f807dca4ed3ed71bf9eee
 DIST botocore-1.17.2.tar.gz 6481390 BLAKE2B 009f8857be93c2fccb52e83176614401ae89835ea32fd0043248f7f66765d06e44df72ed31b5370cc1ed106cf45b531f4e4e7e7cbc3dc1d6e1524cb7914654d4 SHA512 ff19b1708686cbb574b01c9924a6acb7eaf7607b5f19a759d5c1dc1f7a7efae960e0c81d26d384101da5aaddc3bf0d8b4800d8908af34392d23779d4b9064487
 DIST botocore-1.17.5.tar.gz 6491397 BLAKE2B e6d45050e0f9d9919edff7dcea0866c9360fc8b8a09a82bcb6636621b49d7c9d06025639d8acf8740bf6d272371cabc9afff51e48214d240f1e81cd76abcab65 SHA512 2cf87d79a50f10d386907a0ef5b0e427b299b342d3661dfa64860828a0854dcd7f2ef3e0febdc30772aabf93efb39f4f35d52d3f28aec641e886fb5c05e30a3a
 DIST botocore-1.17.8.tar.gz 6499259 BLAKE2B bbec0755ac5c96f8b86d9391db36b58c28a2eff61b69ddccbbfcf0d7b349e1b5c99a2ab3619e50c6eda6a781e5361dd11f674126a596e23f505fde81a9b77949 SHA512 3f0c06e5fb335cc33ed589205ca378d4270d26dfb7f4b6196953205d24de4f71bf09c47b722449e51325d7643be6767f7a542d79765649ea3581247bc219f88d
diff --git a/dev-python/botocore/botocore-1.17.11.ebuild b/dev-python/botocore/botocore-1.17.11.ebuild
new file mode 100644
index 000000000000..c08c6f6ff899
--- /dev/null
+++ b/dev-python/botocore/botocore-1.17.11.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="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 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+	"${FILESDIR}/botocore-1.16.7-unlock-deps.patch"
+)
+
+distutils_enable_sphinx docs \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# py3.9
+	find -name '*.py' -exec \
+		sed -i -e 's:cElementTree:ElementTree:' {} + || 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/brython/Manifest b/dev-python/brython/Manifest
index fe5e95acd796..c6a694f3d44d 100644
--- a/dev-python/brython/Manifest
+++ b/dev-python/brython/Manifest
@@ -1,2 +1 @@
-DIST brython-3.7.2.tar.gz 10403203 BLAKE2B 1fb7778a961c68a873033321fdf7a5b24f422d52195ff1f0606384c76007ab87a1949ead2ffcd7b660b544a9833acf90b254a542ea8856510579bacd0be8477d SHA512 76bdbc005832b4980e38ff4bf2fd705291eb06ee6b9f0c4b25a90df9ab4e6da6638990abb37ebf526d064f54823a9b4ff387edd919db69b1eb3bfc8ed27d6290
 DIST brython-3.7.3.tar.gz 10403156 BLAKE2B a30c957925149f1b7eb736c1fcacd171dffb5846f6a343227596e759820c794c265befbb04137e797c1eabe8d9f0a3faa93fe425e4b0c13fda4c78b4c4bb1ecd SHA512 f234c7bc67d935e5bd5bfa8e473bccf90245ab4dabccd363bc5e9e01e1c9ea9d95989c5f8b323c158e286ac4a66106eb07722d1fcc82353ad036e35b4fda5669
diff --git a/dev-python/brython/brython-3.7.2.ebuild b/dev-python/brython/brython-3.7.2.ebuild
deleted file mode 100644
index 8c1259305c3f..000000000000
--- a/dev-python/brython/brython-3.7.2.ebuild
+++ /dev/null
@@ -1,38 +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 webapp python-single-r1
-
-DESCRIPTION="A Python 3 implementation for client-side web programming"
-HOMEPAGE="http://www.brython.info"
-SRC_URI="https://github.com/${PN}-dev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-
-need_httpd_cgi
-
-pkg_setup() {
-	webapp_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_install() {
-	dodoc LICENCE.txt README.md
-	rm -v LICENCE.txt README.md bower.json .{git*,tra*} server.py || die
-
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_src_install
-}
diff --git a/dev-python/brython/brython-3.7.3.ebuild b/dev-python/brython/brython-3.7.3.ebuild
index 715ffeb233e1..ce838901b946 100644
--- a/dev-python/brython/brython-3.7.3.ebuild
+++ b/dev-python/brython/brython-3.7.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{7,8} )
 
 inherit webapp python-single-r1
 
diff --git a/dev-python/chameleon/Manifest b/dev-python/chameleon/Manifest
index ed2d969a98e5..01b05f54fdc4 100644
--- a/dev-python/chameleon/Manifest
+++ b/dev-python/chameleon/Manifest
@@ -2,3 +2,4 @@ DIST chameleon-3.7.0.gh.tar.gz 135209 BLAKE2B 14e890eca1a3c211dfb5a658457473b219
 DIST chameleon-3.7.1.gh.tar.gz 135230 BLAKE2B f0bd4dd90f7ea976e96101c2937f0ae5db110531caf28890042d0cd7a628489f03f9e2e3eed16dea2981ebb6e064a53adf95638102dfde6c8218e41e0473b32d SHA512 158b418fa6fbd13cd48d913ab34fb4f16450aa0fa3b382c6c829efed3100753814449a1d4004c9bc45d327d2a66130db0518b9c28943af300b4b310e955c426c
 DIST chameleon-3.7.2.gh.tar.gz 135311 BLAKE2B da6803bc6c064151b9d0cbe7761bbb44f73b1fd24fcf77d2e906c410768a1c99fa04225ae4aa719282bbb1f4fd0d51a6c710901016bb5c24f78ba2184f978f27 SHA512 3025fa92bdff3279fc404ad08d73d46bee82afd421f1d81982bd5cd2ea3fdffadf22efdb8b66157dbdf4d0cd793ac06b1a0daac4eb17a2a1ce9f14a65d4a6f8d
 DIST chameleon-3.7.4.gh.tar.gz 135403 BLAKE2B 5cdcfb60975283a8c4d7623e002962dea336cf4414a9a212e9f9bab10ece4627ec36c80744d91428daea187e50956be89be128f25966e7d6069ad141992cfbde SHA512 429a2ff78b27996ee9c21cbc076614accf328e880f03f084e52395987a36c1eabd679428bf8400807bb909a60a31a5c899218640be0d0230ded7309e9ba6753b
+DIST chameleon-3.8.0.gh.tar.gz 135496 BLAKE2B ee21337bb59e4d724a2b9e647af399ceef2946ec3fc4679a78ba79c10ad78c7b41f0585bb0081c02604045e08f126e5f851bdf0c091679561e3591153c49cd1b SHA512 7eaeee53a215fe93142ad57e40d161816fdcfa9a24d68a4648f09ae0a49a2439ccf8f0ace700780025e196471dc1cb8941cd77b120c84876cec77c89e883534d
diff --git a/dev-python/chameleon/chameleon-3.8.0.ebuild b/dev-python/chameleon/chameleon-3.8.0.ebuild
new file mode 100644
index 000000000000..6f8ba1fc5c20
--- /dev/null
+++ b/dev-python/chameleon/chameleon-3.8.0.ebuild
@@ -0,0 +1,21 @@
+# 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="Fast HTML/XML template compiler for Python"
+HOMEPAGE="https://github.com/malthe/chameleon
+	https://pypi.org/project/Chameleon/"
+SRC_URI="
+	https://github.com/malthe/chameleon/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="repoze"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests setup.py
diff --git a/dev-python/cheroot/cheroot-8.3.0-r1.ebuild b/dev-python/cheroot/cheroot-8.3.0-r1.ebuild
index dd650231758b..70a6ae89fac9 100644
--- a/dev-python/cheroot/cheroot-8.3.0-r1.ebuild
+++ b/dev-python/cheroot/cheroot-8.3.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/C/${PN/c/C}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 
 RDEPEND="
 	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
diff --git a/dev-python/clang-python/clang-python-10.0.1.9999.ebuild b/dev-python/clang-python/clang-python-10.0.1.9999.ebuild
index e1b9340c6319..6d7cb294e651 100644
--- a/dev-python/clang-python/clang-python-10.0.1.9999.ebuild
+++ b/dev-python/clang-python/clang-python-10.0.1.9999.ebuild
@@ -27,11 +27,6 @@ RDEPEND="
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	cd "${WORKDIR}" || die
-	default
-}
-
 python_test() {
 	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/clang-python/clang-python-10.0.1_rc1.ebuild b/dev-python/clang-python/clang-python-10.0.1_rc1.ebuild
index e1b9340c6319..6d7cb294e651 100644
--- a/dev-python/clang-python/clang-python-10.0.1_rc1.ebuild
+++ b/dev-python/clang-python/clang-python-10.0.1_rc1.ebuild
@@ -27,11 +27,6 @@ RDEPEND="
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	cd "${WORKDIR}" || die
-	default
-}
-
 python_test() {
 	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/clang-python/clang-python-11.0.0.9999.ebuild b/dev-python/clang-python/clang-python-11.0.0.9999.ebuild
index e1b9340c6319..6d7cb294e651 100644
--- a/dev-python/clang-python/clang-python-11.0.0.9999.ebuild
+++ b/dev-python/clang-python/clang-python-11.0.0.9999.ebuild
@@ -27,11 +27,6 @@ RDEPEND="
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	cd "${WORKDIR}" || die
-	default
-}
-
 python_test() {
 	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/daemonize/metadata.xml b/dev-python/daemonize/metadata.xml
index e24b5b716def..8cbad720b37e 100644
--- a/dev-python/daemonize/metadata.xml
+++ b/dev-python/daemonize/metadata.xml
@@ -8,5 +8,5 @@
   <upstream>
     <remote-id type="github">thesharp/daemonize</remote-id>
   </upstream>
-  <origin>kit-fixups</origin>
+  <origin>ports</origin>
 </pkgmetadata>
diff --git a/dev-python/django-otp/Manifest b/dev-python/django-otp/Manifest
index 3272c6292f4c..e93ea4a04f3a 100644
--- a/dev-python/django-otp/Manifest
+++ b/dev-python/django-otp/Manifest
@@ -1,3 +1,4 @@
 DIST django-otp-0.9.0.gh.tar.gz 60204 BLAKE2B c71b27e007580410fea3cf8110631801c8c08f7e325c3586cb5a41a9618b371b5d65e3b030a5b483cb6cda684fe837cd40aa1c5d04f54dc82cda750b8ba8aeb9 SHA512 dd3c99e928ebf1ba5b6f6b2f34fcf8a1f86ad64ece17a9bd97c56be239f165808f6d1025e2826a12a8eadc150fe49920a0b7ef398d83542cd97a4a6f391505fe
 DIST django-otp-0.9.1.gh.tar.gz 60230 BLAKE2B 1a912e35f8245d3411fc1a9b26dd53d99df5dba5f2a5f68003bc4d535365af336d8664f81cc42f140247bb0e7150c0a60a3308d96cda1e41681dc93520f112d2 SHA512 600286653c035527a2a7978f19c3b9683805ab4562f12afcc2140adf92705239b8f9141b9979a6c30110cf7f3cc13c67019f39448d3cb8db61c4e1b0cdbcee88
 DIST django-otp-0.9.2.gh.tar.gz 61366 BLAKE2B 5016e352db2cfd60d94cd38986185fddab84bf997b72ff5ec3b59cc5944afa74ef67deca7691fd78e28f2aa75bccb9b976707ab6822a6781e541157d4810d8cb SHA512 9634ab23d006d768cec8f3a6685a77e54f8bee89854af2d431eb99560819139518738eb9f1a124190633dbd99f47388f5fa9685bd199a0918f73b263894ea051
+DIST django-otp-0.9.3.gh.tar.gz 63488 BLAKE2B 186af524cdfa3084bfc14deab1a4422a2da2a61b94d85f6c84a01ca0876b68d3f4b478ab2ed37b7d73ca273a2cce3bf4a6ad16c07cc2961bb6e5a0f26c80b1aa SHA512 23e73c1fb0af43c9ba946af5bd1a4ea2dc5abd2b6e9e543a0b7ec37296f0132e9203e3df3d8d0a70448d63453b8111921343c04fc3f073c505d6dac332fc0042
diff --git a/dev-python/django-otp/django-otp-0.9.3.ebuild b/dev-python/django-otp/django-otp-0.9.3.ebuild
new file mode 100644
index 000000000000..b14eef63539e
--- /dev/null
+++ b/dev-python/django-otp/django-otp-0.9.3.ebuild
@@ -0,0 +1,35 @@
+# 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="Django framework adding two-factor authentication using one-time passwords"
+HOMEPAGE="https://github.com/django-otp/django-otp/"
+SRC_URI="
+	https://github.com/django-otp/django-otp/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/django-1.11[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/qrcode[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)"
+
+python_test() {
+	local -x PYTHONPATH=test:${PYTHONPATH}
+	local -x DJANGO_SETTINGS_MODULE=test_project.settings
+	django-admin test -v 2 django_otp || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/django/django-2.2.12.ebuild b/dev-python/django/django-2.2.12.ebuild
index ed9cd2f94b31..60543908ceab 100644
--- a/dev-python/django/django-2.2.12.ebuild
+++ b/dev-python/django/django-2.2.12.ebuild
@@ -23,7 +23,7 @@ LICENSE+=" Apache-2.0"
 # admin icons, jquery, xregexp.js
 LICENSE+=" MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc sqlite test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/django/django-2.2.13.ebuild b/dev-python/django/django-2.2.13.ebuild
index ed9cd2f94b31..60543908ceab 100644
--- a/dev-python/django/django-2.2.13.ebuild
+++ b/dev-python/django/django-2.2.13.ebuild
@@ -23,7 +23,7 @@ LICENSE+=" Apache-2.0"
 # admin icons, jquery, xregexp.js
 LICENSE+=" MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc sqlite test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/dogpile-cache/dogpile-cache-0.7.1.ebuild b/dev-python/dogpile-cache/dogpile-cache-0.7.1.ebuild
index 5c7a7cc3fbec..c5765e5413bd 100644
--- a/dev-python/dogpile-cache/dogpile-cache-0.7.1.ebuild
+++ b/dev-python/dogpile-cache/dogpile-cache-0.7.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/dogpile.cache-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/falcon/Manifest b/dev-python/falcon/Manifest
index 710a335ff4e3..8aeea13a6f49 100644
--- a/dev-python/falcon/Manifest
+++ b/dev-python/falcon/Manifest
@@ -1,2 +1 @@
-DIST falcon-1.3.0.tar.gz 507250 BLAKE2B 3ba3a989f2e9eb281f519e36a24772fe329fee849097028f3183b0e0c7908b7e06dbf0a70ba28cf7570dccbe88fa87703c47d985ea3cf761ea7d6ec3d41ac04b SHA512 a92d0b641152f653f47c9cb9b2e368d643aae14dcabe7028450d190bd08b883d37116d23d3a1ae4e092207f15926f66b12f57e38dd2edd347f6f8df48baa65ce
 DIST falcon-2.0.0.tar.gz 1075333 BLAKE2B 338e0b2474d743171fb0bc9dc3a05da428e6d46fc25e7cf1e978f799ed70e76bf265f32ba2cdf16d6eec8ea03b7b6111f70aa5b8f59141b7029d8ba9b03cd0d1 SHA512 d5365f91eb312cd058773d0a3809b5d8631acc188b9ee884e7c7db35664138608998f397d3fd831c568cafaf261cca2734b9dc7fb60590062e316ad1dbc74614
diff --git a/dev-python/falcon/falcon-1.3.0.ebuild b/dev-python/falcon/falcon-1.3.0.ebuild
deleted file mode 100644
index 4f9fc7b9191e..000000000000
--- a/dev-python/falcon/falcon-1.3.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=5
-
-# Python 2.6 is supported, but depends on ordereddict, which has been in
-# improvise for months and is a minimal package. If needed
-# please let me know. PyPy also works
-PYTHON_COMPAT=( python3_6 )
-
-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"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+cython test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]
-	dev-python/python-mimeparse[${PYTHON_USEDEP}]
-	cython? ( dev-python/cython[${PYTHON_USEDEP}] )"
-
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/cython[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}] )"
-
-python_test() {
-	nosetests || die "Testing failed with ${EPYTHON}"
-}
-
-src_prepare() {
-	if ! use cython; then
-		sed -i -e 's/if with_cython:/if False:/' setup.py \
-			|| die 'sed failed.'
-	fi
-
-	# fix tests installation : potential file collision
-	sed -e 's@^where = tests@where = falcon/tests@g' -i setup.cfg || die
-	mv tests falcon/
-}
diff --git a/dev-python/flask-babel/flask-babel-1.0.0.ebuild b/dev-python/flask-babel/flask-babel-1.0.0.ebuild
index f04883a8808b..59c7c7d3d1ac 100644
--- a/dev-python/flask-babel/flask-babel-1.0.0.ebuild
+++ b/dev-python/flask-babel/flask-babel-1.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
 inherit distutils-r1
 
 MY_PN="Flask-Babel"
diff --git a/dev-python/flask-babelex/flask-babelex-0.9.4.ebuild b/dev-python/flask-babelex/flask-babelex-0.9.4.ebuild
index 75210c43206e..b24481782f87 100644
--- a/dev-python/flask-babelex/flask-babelex-0.9.4.ebuild
+++ b/dev-python/flask-babelex/flask-babelex-0.9.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit distutils-r1
 
 MY_PN="Flask-BabelEx"
diff --git a/dev-python/flask-gravatar/flask-gravatar-0.5.0.ebuild b/dev-python/flask-gravatar/flask-gravatar-0.5.0.ebuild
index 42f669f664ff..978e75e8d1e3 100644
--- a/dev-python/flask-gravatar/flask-gravatar-0.5.0.ebuild
+++ b/dev-python/flask-gravatar/flask-gravatar-0.5.0.ebuild
@@ -6,23 +6,31 @@ EAPI=6
 MY_PN="Flask-Gravatar"
 MY_P=${MY_PN}-${PV}
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit distutils-r1
 
 DESCRIPTION="Small extension for Flask to make usage of Gravatar service easy"
 HOMEPAGE="https://github.com/zzzsochi/Flask-Gravatar/"
 SRC_URI="mirror://pypi/F/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
-
 SLOT="0"
-
 KEYWORDS="amd64 x86"
 
 RDEPEND="dev-python/flask[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/pytest-runner[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
 
-S=${WORKDIR}/${MY_P}
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/pytest-runner/d' setup.py || die
+	sed -e 's:--pep8::' \
+		-e 's:--cov=flask_gravatar --cov-report=term-missing::' \
+		-i pytest.ini || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	cd tests || die
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/flask-htmlmin/Manifest b/dev-python/flask-htmlmin/Manifest
index 77e7430d0c46..01acbc3c6ea1 100644
--- a/dev-python/flask-htmlmin/Manifest
+++ b/dev-python/flask-htmlmin/Manifest
@@ -1 +1,2 @@
 DIST Flask-HTMLmin-1.5.2.tar.gz 3807 BLAKE2B 226d0ba30ce3c0f0d8077f67d3a56aabf6606ac31858fd051f46203123fdbb2e3707575a91f545b7ec57a1e6f4cf62f87c3d387cc7ec321d7f1f9e4b3c6038fd SHA512 b468b95329054f996ad275b00f58dd2cddf52a029eeb08ff83acc5ef37ff0557af4e98181c445a980da2eeb21dd913ec1da08e0953fb97765d4790731353dcc2
+DIST Flask-HTMLmin-2.0.2.gh.tar.gz 12178 BLAKE2B 38d21e06058728be9f6a23c8b18dd0f209833723d63bdf07262f37ff0fd6ac0de810bc164bfb6e91ed446e6402f93f204468f9c2307cf45c3a1609361be33992 SHA512 ea863644baecdf54d6b0a920ad0cbd84880e6c029a7d5313f0964f03233a74b7d11b3e15431ecf02fc6c33b38241e472968ed1bcad5b8163d14001678a4833e2
diff --git a/dev-python/flask-htmlmin/flask-htmlmin-1.5.2.ebuild b/dev-python/flask-htmlmin/flask-htmlmin-1.5.2.ebuild
index 489947e8b23b..7c60730ff5b9 100644
--- a/dev-python/flask-htmlmin/flask-htmlmin-1.5.2.ebuild
+++ b/dev-python/flask-htmlmin/flask-htmlmin-1.5.2.ebuild
@@ -12,24 +12,18 @@ inherit distutils-r1
 DESCRIPTION="Minimize your flask rendered html"
 HOMEPAGE="https://github.com/hamidfzm/Flask-HTMLmin"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
-
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 RDEPEND="
-	app-text/htmlmin
-	dev-python/flask
-"
-
-DEPEND="${RDEPEND}
-	dev-python/pytest-runner[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
+	app-text/htmlmin[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
 "
 
-S="${WORKDIR}/${MY_P}"
-
-# Needs some kind of magic to actually test.
-RESTRICT="test"
+src_prepare() {
+	sed -i -e '/pytest-runner/d' setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/flask-htmlmin/flask-htmlmin-2.0.2.ebuild b/dev-python/flask-htmlmin/flask-htmlmin-2.0.2.ebuild
new file mode 100644
index 000000000000..4a13092ac2d1
--- /dev/null
+++ b/dev-python/flask-htmlmin/flask-htmlmin-2.0.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="Flask-HTMLmin"
+MY_P=${MY_PN}-${PV}
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit distutils-r1
+
+DESCRIPTION="Minimize your flask rendered html"
+HOMEPAGE="https://github.com/hamidfzm/Flask-HTMLmin"
+SRC_URI="
+	https://github.com/hamidfzm/Flask-HTMLmin/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	app-text/htmlmin[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/pytest-runner/d' setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/flask-jwt-extended/metadata.xml b/dev-python/flask-jwt-extended/metadata.xml
index 0accb8ac74bb..cdf2998da5c1 100644
--- a/dev-python/flask-jwt-extended/metadata.xml
+++ b/dev-python/flask-jwt-extended/metadata.xml
@@ -12,5 +12,5 @@
   <upstream>
     <remote-id type="github">vimalloc/flask-jwt-extended</remote-id>
   </upstream>
-  <origin>kit-fixups</origin>
+  <origin>ports</origin>
 </pkgmetadata>
diff --git a/dev-python/flask-login/flask-login-0.4.1-r1.ebuild b/dev-python/flask-login/flask-login-0.4.1-r1.ebuild
index 075238b8bd32..b65ef6f89e3c 100644
--- a/dev-python/flask-login/flask-login-0.4.1-r1.ebuild
+++ b/dev-python/flask-login/flask-login-0.4.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
 inherit distutils-r1
 
 DESCRIPTION="Login session support for Flask"
diff --git a/dev-python/flask-mail/flask-mail-0.9.1-r1.ebuild b/dev-python/flask-mail/flask-mail-0.9.1-r1.ebuild
index 9268034b9763..e8d56406bb8f 100644
--- a/dev-python/flask-mail/flask-mail-0.9.1-r1.ebuild
+++ b/dev-python/flask-mail/flask-mail-0.9.1-r1.ebuild
@@ -1,9 +1,9 @@
 # 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,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit distutils-r1
 
 MY_PN="Flask-Mail"
@@ -12,32 +12,18 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Flask extension for sending email"
 HOMEPAGE="https://pythonhosted.org/Flask-Mail/ https://pypi.org/project/Flask-Mail/"
 SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
 	dev-python/blinker[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
+BDEPEND="
+	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/speaklater[${PYTHON_USEDEP}] )"
 
-S="${WORKDIR}/${MY_P}"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	nosetests -v || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
+distutils_enable_sphinx docs
+distutils_enable_tests nose
diff --git a/dev-python/flask-principal/flask-principal-0.4.0-r1.ebuild b/dev-python/flask-principal/flask-principal-0.4.0-r1.ebuild
index ac5c8e80ea8f..19c475d31766 100644
--- a/dev-python/flask-principal/flask-principal-0.4.0-r1.ebuild
+++ b/dev-python/flask-principal/flask-principal-0.4.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit distutils-r1
 
 DESCRIPTION="Identity management for flask"
@@ -14,15 +14,8 @@ SRC_URI="https://github.com/mattupstate/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
 	dev-python/blinker[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
 
-python_test() {
-	nosetests -v || die "Testing failed with ${EPYTHON}"
-}
+distutils_enable_tests nose
diff --git a/dev-python/flask-security/flask-security-3.0.0.ebuild b/dev-python/flask-security/flask-security-3.0.0.ebuild
index 349a0a18f98f..5544516760b3 100644
--- a/dev-python/flask-security/flask-security-3.0.0.ebuild
+++ b/dev-python/flask-security/flask-security-3.0.0.ebuild
@@ -31,8 +31,6 @@ RDEPEND=">=dev-python/flask-0.11[${PYTHON_USEDEP}]
 "
 
 DEPEND="${RDEPEND}
-	dev-python/pytest-runner[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
@@ -43,6 +41,11 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+src_prepare() {
+	sed -i -e '/pytest-runner/d' setup.py || die
+	distutils-r1_src_prepare
+}
+
 python_test() {
 	nosetests -v || die "Testing failed with ${EPYTHON}"
 }
diff --git a/dev-python/flask-wtf/flask-wtf-0.14.3.ebuild b/dev-python/flask-wtf/flask-wtf-0.14.3.ebuild
index 507179b7af31..49e218201e0f 100644
--- a/dev-python/flask-wtf/flask-wtf-0.14.3.ebuild
+++ b/dev-python/flask-wtf/flask-wtf-0.14.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit distutils-r1
 
 MY_PN="Flask-WTF"
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 75051bc37ff9..8d0b41a602c3 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -9,3 +9,4 @@ DIST hypothesis-python-5.16.1.tar.gz 9011388 BLAKE2B 9d80cd296475846404ded5c466e
 DIST hypothesis-python-5.16.2.tar.gz 9011495 BLAKE2B ecac1ddd0c214a06e8822fc04f9fd9378933b1c3721c1a3aabfa605d45df21b22b76a497f5fa1bef3009ceba52d582c9f69a0918fdcaf7df7b3c03405f8eb7a9 SHA512 91feb7b81c4c36468b05318c0db7ce3b607374b55bf2609bb587d316448f087fab44b99cde1cb5fc440df8d31ef2dd6c154281f13dd7bc6d1de4e463cdabf66a
 DIST hypothesis-python-5.16.3.tar.gz 9011952 BLAKE2B d74a68c4ee1e5aacf4be1da5a4656011b0a15f990106c21298101d36e9a097c5dfd165987ad90a45f3a0b74375c4da609cd750f618242b94f34e03b6de0ee866 SHA512 912d984995d4ad8f06e98eb2cc327629328990fc1c072527ce261b637e16622acaf4d0d93928f9dd2d6601ab78f69aa6cf129d5cd7c1c00e50754ebc06957df0
 DIST hypothesis-python-5.18.0.tar.gz 9013356 BLAKE2B 3863414e54e40ac5f2a45edbb57fbee058e82f04cbde9eadb99ed6b03a2a2684777b46eabdbe136aea74b835e343485d80cfe98c263afa537c7437e7566f796f SHA512 b1a1f37f1f58a6401a31f32ef0e7de452b8a8bd71fe5aeb72eeac197a23b78c3ff17b61f7940e2a2a755f7f008f0ea3df5b0f2ad5e4c0d2d316bf13dbd7cbdaf
+DIST hypothesis-python-5.18.1.tar.gz 9013452 BLAKE2B a513c19a19b3ff49c78d97839dea7d857d9a00f7d42e5e0376cd6fec9ff9a86f9b6b9471da474ec7724e41254105c0ac65fc7d772f01bfc40f6deda200f11629 SHA512 19455699ed50d30767edc5627f797992f2542aeb3ca9e38603a68ffe1108f0287baa183e4dca101f21eaea6c7c7501e135b5baf9e09117a2cae92ec1e437e8b5
diff --git a/dev-python/hypothesis/hypothesis-5.18.1.ebuild b/dev-python/hypothesis/hypothesis-5.18.1.ebuild
new file mode 100644
index 000000000000..494668bd6a8e
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-5.18.1.ebuild
@@ -0,0 +1,56 @@
+# 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
+
+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 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/pytest-5.3.5[${PYTHON_USEDEP}]
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+src_prepare() {
+	# avoid pytest-xdist dep for one test
+	sed -i -e 's:test_prints_statistics_given_option_under_xdist:_&:' \
+		tests/pytest/test_statistics.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	pytest -vv tests/cover tests/pytest tests/quality ||
+		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/importlib_metadata/importlib_metadata-1.6.1.ebuild b/dev-python/importlib_metadata/importlib_metadata-1.6.1.ebuild
index 2dd30d987f03..0982cef9a7c3 100644
--- a/dev-python/importlib_metadata/importlib_metadata-1.6.1.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-1.6.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/zipp[${PYTHON_USEDEP}]
diff --git a/dev-python/jmespath/jmespath-0.9.3-r1.ebuild b/dev-python/jmespath/jmespath-0.9.3-r1.ebuild
index bb8ec31e1837..744deec9e2ff 100644
--- a/dev-python/jmespath/jmespath-0.9.3-r1.ebuild
+++ b/dev-python/jmespath/jmespath-0.9.3-r1.ebuild
@@ -12,6 +12,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests nose
diff --git a/dev-python/jsonpatch/jsonpatch-1.25.ebuild b/dev-python/jsonpatch/jsonpatch-1.25.ebuild
index a78accbc67f4..e8cf3b1d7450 100644
--- a/dev-python/jsonpatch/jsonpatch-1.25.ebuild
+++ b/dev-python/jsonpatch/jsonpatch-1.25.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/python-json-patch-${PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/lit/lit-10.0.1.9999.ebuild b/dev-python/lit/lit-10.0.1.9999.ebuild
index c9394c7a1190..b9123ef7bf14 100644
--- a/dev-python/lit/lit-10.0.1.9999.ebuild
+++ b/dev-python/lit/lit-10.0.1.9999.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python2_7 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/"
@@ -34,6 +34,6 @@ 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-10.0.1_rc1.ebuild b/dev-python/lit/lit-10.0.1_rc1.ebuild
index c9394c7a1190..b9123ef7bf14 100644
--- a/dev-python/lit/lit-10.0.1_rc1.ebuild
+++ b/dev-python/lit/lit-10.0.1_rc1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python2_7 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/"
@@ -34,6 +34,6 @@ 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-11.0.0.9999.ebuild b/dev-python/lit/lit-11.0.0.9999.ebuild
index c9394c7a1190..b9123ef7bf14 100644
--- a/dev-python/lit/lit-11.0.0.9999.ebuild
+++ b/dev-python/lit/lit-11.0.0.9999.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python2_7 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/"
@@ -34,6 +34,6 @@ 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/moto/moto-1.3.14-r1.ebuild b/dev-python/moto/moto-1.3.14-r1.ebuild
index 71f3637af836..915c8ed2a58b 100644
--- a/dev-python/moto/moto-1.3.14-r1.ebuild
+++ b/dev-python/moto/moto-1.3.14-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/munch/munch-2.5.0-r1.ebuild b/dev-python/munch/munch-2.5.0-r1.ebuild
index 5f016a764937..f0a35b912d19 100644
--- a/dev-python/munch/munch-2.5.0-r1.ebuild
+++ b/dev-python/munch/munch-2.5.0-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/Infinidat/munch"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 SLOT="0"
 
 BDEPEND="
diff --git a/dev-python/mwparserfromhell/metadata.xml b/dev-python/mwparserfromhell/metadata.xml
index 5a6fcfc056aa..6d6d509dc184 100644
--- a/dev-python/mwparserfromhell/metadata.xml
+++ b/dev-python/mwparserfromhell/metadata.xml
@@ -8,5 +8,5 @@
   <upstream>
     <remote-id type="github">earwig/mwparserfromhell</remote-id>
   </upstream>
-  <origin>kit-fixups</origin>
+  <origin>ports</origin>
 </pkgmetadata>
diff --git a/dev-python/mypy/mypy-0.781.ebuild b/dev-python/mypy/mypy-0.781.ebuild
index 1dffa3c0c695..78823c7e84b7 100644
--- a/dev-python/mypy/mypy-0.781.ebuild
+++ b/dev-python/mypy/mypy-0.781.ebuild
@@ -32,7 +32,8 @@ DEPEND="
 			>=dev-python/pytest-cov-2.4.0[${PYTHON_USEDEP}]
 			>=dev-python/psutil-5.4.0[${PYTHON_USEDEP}]
 			>=dev-python/lxml-4.1.1[${PYTHON_USEDEP}]
-			>=dev-python/py-1.5.2[${PYTHON_USEDEP}] )
+			>=dev-python/py-1.5.2[${PYTHON_USEDEP}]
+			>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}] )
 	doc? (
 		dev-python/sphinx[${PYTHON_USEDEP}]
 		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
diff --git a/dev-python/netifaces/netifaces-0.10.9.ebuild b/dev-python/netifaces/netifaces-0.10.9.ebuild
index ef001cdeedf4..faa08acf317a 100644
--- a/dev-python/netifaces/netifaces-0.10.9.ebuild
+++ b/dev-python/netifaces/netifaces-0.10.9.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/nuitka/Manifest b/dev-python/nuitka/Manifest
index 753d5c9b0b4e..8d5ea5c5adca 100644
--- a/dev-python/nuitka/Manifest
+++ b/dev-python/nuitka/Manifest
@@ -1,2 +1,2 @@
-DIST Nuitka-0.6.6.tar.gz 2276002 BLAKE2B 74ada1032d5eef3068e6c0fbd088437014de8752b71ce98b90bb868bb7241efe301d4fa1ef661f00f54730ca3d27470cc6c804bc2b394085349ad9a1aed0feb4 SHA512 82752105fc5b5d5d09d460ba25a6424420ff055ea841a32c6e32ec9099870ceefe06dcadab347fe689cec94f4d8891a4125910f7cff504a8aa736139b29c2a8b
 DIST Nuitka-0.6.7.tar.gz 2284868 BLAKE2B 91c2e5362697d8c14f0627d757c70922aff3ccc2c9eb359f6b303e9ae7580d594106328b9fe644e8f668018aae496e50041948bdfbf59c27fe1ce0e50eb90177 SHA512 9f3dbfe67f2618a5363aa47974fe0199428a4798e79ebfcf78f15365048a6c676b5b2c9d5569adcd264389c66f643b3190647dc17acb76e59b9b95ee6762f5a2
+DIST Nuitka-0.6.8.tar.gz 2390759 BLAKE2B 5f207a2dcac6a2825143268d3c28eab113705c050b67dbbfd3b655a0221ca3c04b2b206f3e8a85b4f17d28db52c11f19ea6260d2e7853c382942a76a15dc1973 SHA512 d9a9add759736c35fda57bbf82382effbcebce954228e56bf7c124502b96513f17a7083ded66da3ee33c52443b18c92839bff59a5c081d8fe44d6eec6c15fe54
diff --git a/dev-python/nuitka/nuitka-0.6.6.ebuild b/dev-python/nuitka/nuitka-0.6.8.ebuild
index 08ab6c59bf2b..7c8d263ff4db 100644
--- a/dev-python/nuitka/nuitka-0.6.6.ebuild
+++ b/dev-python/nuitka/nuitka-0.6.8.ebuild
@@ -5,9 +5,9 @@ EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS="rdepend"
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit distutils-r1 eutils python-utils-r1
+inherit distutils-r1 eutils
 
 DESCRIPTION="Python to native compiler"
 HOMEPAGE="https://www.nuitka.net"
@@ -22,11 +22,13 @@ BDEPEND="dev-util/scons[${PYTHON_USEDEP}]"
 RDEPEND="${BDEPEND}
 	dev-python/appdirs[${PYTHON_USEDEP}]"
 
+DOCS=( Changelog.pdf Developer_Manual.pdf README.pdf )
 S="${WORKDIR}/${P^}"
 
 python_install() {
 	distutils-r1_python_install
 	python_optimize
+	doman doc/nuitka.1 doc/nuitka3.1 doc/nuitka3-run.1 doc/nuitka-run.1
 }
 
 pkg_postinst() {
diff --git a/dev-python/os-service-types/os-service-types-1.7.0.ebuild b/dev-python/os-service-types/os-service-types-1.7.0.ebuild
index 9934f1e7a8cc..6db0f3f857eb 100644
--- a/dev-python/os-service-types/os-service-types-1.7.0.ebuild
+++ b/dev-python/os-service-types/os-service-types-1.7.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-config/Manifest b/dev-python/oslo-config/Manifest
index 7270bef23319..fb45fe5ebd77 100644
--- a/dev-python/oslo-config/Manifest
+++ b/dev-python/oslo-config/Manifest
@@ -1,2 +1,2 @@
 DIST oslo-config-6.11.2.tar.gz 152842 BLAKE2B 9217232e11252cd59bed9ae35ebad28fe8013f5608fe45544f7fb1d35cfb0a27c1172fd2f565f812ca3d9672d30df2962ac51de551cc50c8fefaae2266943959 SHA512 47e92c14d873a127e12fa734d975032bfa560a624111625b622d1b1896ce6e786ca661312afa894176941d4e8b13a2f6f5b44a05092e23f5fe1f8f78596498ae
-DIST oslo-config-8.0.2.tar.gz 148224 BLAKE2B 5f3bc55857a01429063a0c7afbce041f48952ca1db7bd732e83d40d68f86951db9bcdb79a80926c5b7ec747fde574817cc6a562c217b441b0bb61381d70ca4b6 SHA512 675ec0602cc8850e7a25733d24ead104a85541f09983924d90b829687fde22c5fe3947a67e0b8a024927b3fd40973cc7c144b26ba751cd86650ca210686ea8e5
+DIST oslo-config-8.0.3.tar.gz 147691 BLAKE2B 9af2a1ff399b52261561d268f6b9cc673629af572faadc736e851826ccf84ea8fcb8b8846b62f85671934f5214f289301157da7197dd5a15ad6e9ec1792bdb31 SHA512 09c49b0917d20c74e59efd6b8cca0394f98c337b075f916ae21f6072ce6f28a90a701a3f63f0737e4b3161cf4795fdb2be9b01091fd00828990cbc715683b0f4
diff --git a/dev-python/oslo-config/oslo-config-8.0.2.ebuild b/dev-python/oslo-config/oslo-config-8.0.3.ebuild
index ceaab62f1656..ceaab62f1656 100644
--- a/dev-python/oslo-config/oslo-config-8.0.2.ebuild
+++ b/dev-python/oslo-config/oslo-config-8.0.3.ebuild
diff --git a/dev-python/oslo-messaging/Manifest b/dev-python/oslo-messaging/Manifest
index dc5fa50cb471..c534f59935ca 100644
--- a/dev-python/oslo-messaging/Manifest
+++ b/dev-python/oslo-messaging/Manifest
@@ -1,2 +1,3 @@
 DIST oslo.messaging-10.2.0.tar.gz 255431 BLAKE2B 971f24845b4d0440fb600b459b4a41c94220e387cbe2ef16a5c93d72e0582116702254c4d8106f5f3f3a3435b1c5bfaceffbb1c6ed3e671f7c269fb6d5ca3cb3 SHA512 404aed31f2808de744d7fd141257aca3d2db2b65645eebfffa7edb364e50803621af98886dc60b46042e525a7a98a12f3208ba472dcf805524cd0defdd441060
 DIST oslo.messaging-12.1.0.tar.gz 253854 BLAKE2B 6db26884f69be59cecd904b8ca0edc44a7f4e6a50ada154f28bf3a2a431896345ea7981ad7b195c12abe3f4d78d259c036e18e5544d2564e04d373c7cf2575b0 SHA512 1649f3520b6785eb5bf0f68cf174c1f60f32675ab6fa1400997704e97df7b24dcd63de751ab2313b839619b4eb250612ea32996c6c3c9956f7145010ca38cba2
+DIST oslo.messaging-12.1.1.tar.gz 255540 BLAKE2B 54ab60244090d3602de9395ea4f6ffa4bfa78783642aecaf7bb37db62c1a5cb63d69c612d2d1085ef96611429a8c7b337ac1849d93ed857a2cb51bbae6265ed2 SHA512 0f55f2c21dfd5f83efbf53f8c0cfa65d8572166662a183998c896c61475a38c47ae6e2376c5a153049d2f91e3321d6a75accf4de4ef11b4ec8626b448c0637a9
diff --git a/dev-python/oslo-messaging/oslo-messaging-12.1.1.ebuild b/dev-python/oslo-messaging/oslo-messaging-12.1.1.ebuild
new file mode 100644
index 000000000000..9e9105ff46e7
--- /dev/null
+++ b/dev-python/oslo-messaging/oslo-messaging-12.1.1.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_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/ovs/Manifest b/dev-python/ovs/Manifest
index 4b12b669448f..7a705c8f206e 100644
--- a/dev-python/ovs/Manifest
+++ b/dev-python/ovs/Manifest
@@ -1,3 +1,2 @@
-DIST ovs-2.10.0.tar.gz 98548 BLAKE2B 9ab3ea02dbfab1622106ead1e19a96b279d73ee758fbdcfadcb50526b8652a80443c817513b0df92b78a6e788d7215386f18c5e9e59d71536cf481eac8b3a264 SHA512 9b7de41aceb2f3c08df765b97c5149cd66579f361b427b3bb6c24ab20cf922de688a82a99b1d98778311f15b37c73be2769a95b01c96db4fed122e272aab2adf
 DIST ovs-2.11.0.tar.gz 98933 BLAKE2B 8735cd4db64291790327fc1e8b144b76e4804472a99990488d57686c9eaf51ec1ee4cc0d4e1b0c3aaf979b547936c77cdb6f7656b0b16e16df45fe0d9b8c5f8d SHA512 104d9f783a1ff0bfe93fc17235c7a9d595fab5007ee3bb490ef064f7893756fdc4c7306c0b03f4c2fb5179efbb038ed163ca4de8c9c417426c6e157c0f17c39b
 DIST ovs-2.13.0.tar.gz 100450 BLAKE2B 943486bf0aad0e8e9eac96c85aeccb32fd36c60689623acc76175eafc286f4689142d6ea6953224e0a4ea8e4437c56738cb5b113286114de0898bf783cd49668 SHA512 7ec8980257ae87d24dbabc5900cf81253490bcfa0431f96b79280603da04a972fc536055bf532d2b251e03e007b49b34e8118b0f323e5fee05c116824d68562c
diff --git a/dev-python/ovs/metadata.xml b/dev-python/ovs/metadata.xml
index 07ccea8f4616..d6ea0f625a3f 100644
--- a/dev-python/ovs/metadata.xml
+++ b/dev-python/ovs/metadata.xml
@@ -5,9 +5,6 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
-	<longdescription lang="en">
-		Openvsywitch python bindings
-	</longdescription>
 	<upstream>
 		<remote-id type="github">openvswitch/ovs</remote-id>
 		<remote-id type="pypi">ovs</remote-id>
diff --git a/dev-python/ovs/ovs-2.10.0-r1.ebuild b/dev-python/ovs/ovs-2.10.0-r1.ebuild
deleted file mode 100644
index ffad9a0f0909..000000000000
--- a/dev-python/ovs/ovs-2.10.0-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="OVS bindings for python."
-HOMEPAGE="https://github.com/openvswitch/ovs/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="dev-python/sortedcontainers[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/ovs/ovs-2.13.0.ebuild b/dev-python/ovs/ovs-2.13.0.ebuild
index 2cdc6e7a0c2f..f6e3fdf10c2f 100644
--- a/dev-python/ovs/ovs-2.13.0.ebuild
+++ b/dev-python/ovs/ovs-2.13.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="dev-python/sortedcontainers[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/dev-python/parsel/metadata.xml b/dev-python/parsel/metadata.xml
index 45490811d128..71898790eccb 100644
--- a/dev-python/parsel/metadata.xml
+++ b/dev-python/parsel/metadata.xml
@@ -8,5 +8,5 @@
   <upstream>
     <remote-id type="github">scrapy/parsel</remote-id>
   </upstream>
-  <origin>kit-fixups</origin>
+  <origin>ports</origin>
 </pkgmetadata>
diff --git a/dev-python/podcastparser/metadata.xml b/dev-python/podcastparser/metadata.xml
index 455cd1430e60..621cd08ccce8 100644
--- a/dev-python/podcastparser/metadata.xml
+++ b/dev-python/podcastparser/metadata.xml
@@ -8,5 +8,5 @@
   <upstream>
     <remote-id type="github">gpodder/podcastparser</remote-id>
   </upstream>
-  <origin>kit-fixups</origin>
+  <origin>ports</origin>
 </pkgmetadata>
diff --git a/dev-python/progress/metadata.xml b/dev-python/progress/metadata.xml
index 24b5c993f526..8195434710ae 100644
--- a/dev-python/progress/metadata.xml
+++ b/dev-python/progress/metadata.xml
@@ -9,5 +9,5 @@
 		<remote-id type="pypi">progress</remote-id>
 		<remote-id type="github">verigak/progress</remote-id>
 	</upstream>
-	<origin>kit-fixups</origin>
+	<origin>ports</origin>
 </pkgmetadata>
diff --git a/dev-python/pudb/Manifest b/dev-python/pudb/Manifest
index baccd3885f0b..0609cba590b8 100644
--- a/dev-python/pudb/Manifest
+++ b/dev-python/pudb/Manifest
@@ -1 +1,2 @@
 DIST pudb-2018.1.tar.gz 56771 BLAKE2B 1c57392a2dcf1a178035fd5824b253a0b5ad19990d32360956b55696f76f40c69b3baaaff14bd4bbc4556bb7c7e12bbcf4f00aea057555480771bd27c1ec4ced SHA512 4f0311d5a8642ff7097c2bceecde9a45999ad4567e008507cc8f977cc1e452cbbb80be525d08703c3e22038831b6b94e9b5b46ea1f1a1dc2d4292c8df9ef7ca7
+DIST pudb-2019.2.tar.gz 59548 BLAKE2B 2df98688948ea79b8bbe125735aef04b3ea5d6db4adba503610c3fc88201cd0ae6da3249371f9ef78d1f4650901a02cc25738201e4891695f7726c919dcdd702 SHA512 231663b404e0e7d35f32235c02d4878b41a043054821c3d39d4a05d45c1e45aff0eaffb0a6d96669676b52538ca99a69de64014f922e3c80405d34198c6d4812
diff --git a/dev-python/pudb/pudb-2019.2.ebuild b/dev-python/pudb/pudb-2019.2.ebuild
new file mode 100644
index 000000000000..53fee37bef92
--- /dev/null
+++ b/dev-python/pudb/pudb-2019.2.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} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="A full-screen, console-based Python debugger"
+HOMEPAGE="https://pypi.org/project/pudb/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/urwid[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pycodestyle/metadata.xml b/dev-python/pycodestyle/metadata.xml
index f87aa9a276ee..9ec632dec83c 100644
--- a/dev-python/pycodestyle/metadata.xml
+++ b/dev-python/pycodestyle/metadata.xml
@@ -9,5 +9,5 @@
     <remote-id type="pypi">pycodestyle</remote-id>
     <remote-id type="github">PyCQA/pycodestyle</remote-id>
   </upstream>
-	<origin>kit-fixups</origin>
+	<origin>ports</origin>
 </pkgmetadata>
diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index 23f5c70077db..15a6fd65a10c 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -1,2 +1,3 @@
 DIST pycryptodome-3.9.4.tar.gz 11575825 BLAKE2B c153fe71179d633a5722480c4c42cc133100f524a8ba9d3cd9380b7e172564c276b70b97ef36437fa3a149c418903802f410c9d1807d5d72345dffb0aa568223 SHA512 d99e4e431d77856ce3ae33526984cadf2fa6aa82b1f692a2ad0ae893f6a1e9538e6d71d281578e6bd733a816664d1683364c64441196cbc6ee1278f9d6eac62c
 DIST pycryptodome-3.9.7.tar.gz 15451558 BLAKE2B dca2cf3500d4011b8c37937c3f844db3e8e4afbec2c421552bcdc08df32ae46d8a2dadfaa2d48aac2356374f30154d439cb9e988e1035c570b0adebc58b259e1 SHA512 2ee8ec1094ca2b3813c25b96c71988db479b23ea2e76937275d0fd6421653efd1ce7a1e279c7a20a9de7edcb59e0927121a42112b85afc052edcd6ab2db74c26
+DIST pycryptodome-3.9.8.tar.gz 15633268 BLAKE2B 8c4f8d4839be0fb09556677514ee6c7f832684f20eb4e355cee87eb5b52a5c09e12712c1865ff89fb5dd6c628ca027374c7cab8a2287aafa4eecedf1095f1a12 SHA512 894e763720df284804fd686d5805980853b86773bb3097bf03d929818b9944e5a257e47414275f302966864751e50ae34dea19ad749910f1ceac31833a53ef7c
diff --git a/dev-python/pycryptodome/pycryptodome-3.9.7.ebuild b/dev-python/pycryptodome/pycryptodome-3.9.7.ebuild
index 43e92f7ffb38..e6a6117b2a0d 100644
--- a/dev-python/pycryptodome/pycryptodome-3.9.7.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.9.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 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=""
 
 RDEPEND="dev-libs/gmp:0
diff --git a/dev-python/pycryptodome/pycryptodome-3.9.8.ebuild b/dev-python/pycryptodome/pycryptodome-3.9.8.ebuild
new file mode 100644
index 000000000000..43e92f7ffb38
--- /dev/null
+++ b/dev-python/pycryptodome/pycryptodome-3.9.8.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=( python2_7 python3_{6,7,8,9} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="A self-contained cryptographic library for Python"
+HOMEPAGE="https://www.pycryptodome.org https://github.com/Legrandin/pycryptodome https://pypi.org/project/pycryptodome/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+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"
+IUSE=""
+
+RDEPEND="dev-libs/gmp:0
+	virtual/python-cffi[${PYTHON_USEDEP}]
+	!dev-python/pycrypto"
+BDEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/pycryptodome-3.9.4-parallel-make.patch"
+)
+
+distutils_enable_tests setup.py
+
+python_prepare_all() {
+	# parallel make fixes
+	#  Multiple targets were compiling the same file, setuptools doesn't
+	#  understand this and you get race conditions where a file gets
+	#  overwritten while it's linking. This makes the files look like separate
+	#  files so this race won't happen
+	ln src/blowfish.c src/blowfish_eks.c || die
+	ln src/mont.c src/mont_math.c || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pyfakefs/pyfakefs-4.0.2.ebuild b/dev-python/pyfakefs/pyfakefs-4.0.2.ebuild
index d793aa33856b..c064df196ec3 100644
--- a/dev-python/pyfakefs/pyfakefs-4.0.2.ebuild
+++ b/dev-python/pyfakefs/pyfakefs-4.0.2.ebuild
@@ -15,7 +15,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 ~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/pykerberos/Manifest b/dev-python/pykerberos/Manifest
index 996066f24dad..5e9369c1a850 100644
--- a/dev-python/pykerberos/Manifest
+++ b/dev-python/pykerberos/Manifest
@@ -1 +1,2 @@
+DIST PyKerberos-1.3.0.tar.gz 41033 BLAKE2B 5805df2c258a75321dab5fe84fcbf1de706cb7c14a710c914ae4918dd39f79036a4f4033a068982778f73d9f00a4ca45b80e9cfc59c6a246a236f3c6931bacc5 SHA512 ed2644a236993d9737af43be951d57207fc787a74e82f343b265461b456923763610f1ce1b46d7d56f22d6452be1418b98707b8529b22fd8abf299143e52cf69
 DIST pykerberos-1.2.1.tar.gz 24535 BLAKE2B 5c6253d99857a5061f708e213e24e0ac34a6fa2a39332d5a0f27f30f1ac9eec45654966113c3036cf9bbe27ee9642748afe4cef845d2ceda26286ced1e2277e0 SHA512 048ed0238911b3e9970a5567ddc2b5e3b551e24bd8d08f06e5807f238c566ead9998e0efb0e3207f178ef2a8c9116f4ed4b7c728b9279f7a88f0945a7c4b081f
diff --git a/dev-python/pykerberos/metadata.xml b/dev-python/pykerberos/metadata.xml
index 596d0f7da8dc..ca060fcfa27e 100644
--- a/dev-python/pykerberos/metadata.xml
+++ b/dev-python/pykerberos/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>maksbotan@gentoo.org</email>
-    <name>Maxim Koltsov</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">pykerberos</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>maksbotan@gentoo.org</email>
+		<name>Maxim Koltsov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pykerberos</remote-id>
+	</upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/pykerberos/pykerberos-1.3.0.ebuild b/dev-python/pykerberos/pykerberos-1.3.0.ebuild
new file mode 100644
index 000000000000..1a5dbde1c25e
--- /dev/null
+++ b/dev-python/pykerberos/pykerberos-1.3.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python2_7 python3_{6..9} )
+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://github.com/apple/ccs-pykerberos/
+	https://pypi.org/project/kerberos/"
+SRC_URI="
+	https://github.com/apple/ccs-pykerberos/archive/${MY_P}.tar.gz"
+S=${WORKDIR}/ccs-pykerberos-${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+# test environment is non-trivial to set up, so just use docker
+# (see python_test below)
+# also for alpha/beta Python releases support:
+# https://github.com/apple/ccs-pykerberos/pull/83/commits/5f1130a1305b5f6e7d7d8b41067c4713f0c8950f
+RESTRICT="test"
+
+RDEPEND="app-crypt/mit-krb5"
+DEPEND="${RDEPEND}"
+
+python_test() {
+	set -- docker run \
+		-v "${PWD}:/app" \
+		-w /app \
+		-e PYENV=$("${EPYTHON}" -c 'import sys; print(sys.version.split()[0])') \
+		-e KERBEROS_USERNAME=administrator \
+		-e KERBEROS_PASSWORD=Password01 \
+		-e KERBEROS_REALM=example.com \
+		-e KERBEROS_PORT=80 \
+		ubuntu:16.04 \
+		/bin/bash .travis.sh
+	echo "${@}" >&2
+	"${@}" || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/pymongo/pymongo-3.10.1.ebuild b/dev-python/pymongo/pymongo-3.10.1.ebuild
index be2abc3cb002..e29624b5f6c5 100644
--- a/dev-python/pymongo/pymongo-3.10.1.ebuild
+++ b/dev-python/pymongo/pymongo-3.10.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6..9} )
 inherit check-reqs distutils-r1
 
 DESCRIPTION="Python driver for MongoDB"
@@ -14,14 +14,12 @@ 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}] )
 "
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+BDEPEND="
 	test? (
 		>=dev-db/mongodb-2.6.0
 		dev-python/nose[${PYTHON_USEDEP}]
@@ -29,6 +27,8 @@ DEPEND="${RDEPEND}
 "
 DISTUTILS_IN_SOURCE_BUILD=1
 
+distutils_enable_sphinx doc
+
 reqcheck() {
 	if use test; then
 		# During the tests, database size reaches 1.5G.
@@ -46,11 +46,15 @@ pkg_setup() {
 	reqcheck pkg_setup
 }
 
-python_compile_all() {
-	if use doc; then
-		mkdir html || die
-		sphinx-build doc html || die
-	fi
+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() {
@@ -111,9 +115,3 @@ python_test() {
 
 	rm -rf "${dbpath}" || die
 }
-
-python_install_all() {
-	use doc && local HTML_DOCS=( html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyopencl/Manifest b/dev-python/pyopencl/Manifest
index 7595d5001778..995e4b8e6284 100644
--- a/dev-python/pyopencl/Manifest
+++ b/dev-python/pyopencl/Manifest
@@ -1,2 +1,3 @@
 DIST pyopencl-2017.2.tar.gz 350145 BLAKE2B 12c481893158f97dec612256b36e710ab52356c8b5f644f3710b5e34d4d10df3b27137ad76f29543fe16b3da725471e206aa5f69c646a79a65246d6091c686a9 SHA512 49f2ff619d8c214a3962b8444e68ba415dda032abaf9eeab259fcd1b21fbaab10bd057035161baef7f0182995834082218a6667464c01645231a94c88aa5c18b
 DIST pyopencl-2019.1.2.tar.gz 343805 BLAKE2B 027b231231532403a5e18249bd438e1a5a67805a685e46fd9506f7286957b14068540f93a3733149aeba2a720f6c71e91db74351916ca974739374a05f2d2c74 SHA512 b2850622253f480cafacadbb9d13afea801af9d4dd52679f132fc0e5f1d4c2f4d3bdf83c9ed64c14c19ead75e6d36afa8b57ff52bbea135fc02291b1fe7b8636
+DIST pyopencl-2020.2.tar.gz 351600 BLAKE2B 47a733d7a552f5d1f69a1a9710c3262d50c26651ed9f46146829babe28962e236e2c1b9ba3d3d14207f28bdc562323a94ab4c51dbf5fcf1a0b12282b3c6aff50 SHA512 233bbf2e99507d3a832222cc8149bf7ac17332a550e4867f843fcc2b31104d961a3f0d972b0a1878d4716b2da4548f1390560141cd09cb1ba13300c541b058b9
diff --git a/dev-python/pyopencl/metadata.xml b/dev-python/pyopencl/metadata.xml
index c0614b08a7bb..541243eefe1e 100644
--- a/dev-python/pyopencl/metadata.xml
+++ b/dev-python/pyopencl/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-needed-->
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pyopencl</remote-id>
 	</upstream>
diff --git a/dev-python/pyopencl/pyopencl-2019.1.2.ebuild b/dev-python/pyopencl/pyopencl-2019.1.2.ebuild
index 73b273d25bb7..fbc6d6a64740 100644
--- a/dev-python/pyopencl/pyopencl-2019.1.2.ebuild
+++ b/dev-python/pyopencl/pyopencl-2019.1.2.ebuild
@@ -28,7 +28,13 @@ RDEPEND="
 	>=virtual/opencl-2"
 DEPEND="${RDEPEND}"
 
-distutils_enable_tests pytest
+# 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=()
@@ -41,11 +47,6 @@ python_configure_all() {
 		"${myconf[@]}"
 }
 
-python_test() {
-	cd "${S}/test" || die
-	pytest -vv || die "Testsuite failed under ${EPYTHON}"
-}
-
 python_install_all() {
 	if use examples; then
 		dodoc -r examples
diff --git a/dev-python/pyopencl/pyopencl-2020.2.ebuild b/dev-python/pyopencl/pyopencl-2020.2.ebuild
new file mode 100644
index 000000000000..e5fbb9b9f447
--- /dev/null
+++ b/dev-python/pyopencl/pyopencl-2020.2.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/pytest-asyncio/Manifest b/dev-python/pytest-asyncio/Manifest
index 85601f8bbf52..dde9d6f94ac5 100644
--- a/dev-python/pytest-asyncio/Manifest
+++ b/dev-python/pytest-asyncio/Manifest
@@ -1,3 +1,4 @@
 DIST pytest-asyncio-0.10.0.tar.gz 13968 BLAKE2B 4e63d527b20c767b8f0777ed684a15abe54009be72db8a50ca3b37ef95dceb884168d8081c651e2bbd6d818529d6809bb3498055fedc7f951f5675d58f50e408 SHA512 78160d1918c5d3d2172f74fa07bf4bf6d0bc416666011dd5b83b3a7f385ec30fc65d49c01bba5dd0e16ad9dcd9d72d8ab062526f3268d60cd2e24a35b5a8f883
 DIST pytest-asyncio-0.11.0.tar.gz 14070 BLAKE2B a97cc52a013e126c7aa48b21e8fdfb69c589efffefdfe0f1cef09ce98c1dd150f4298bfa9d707dfc264a6d48c71839847f929237204ba2a36e1bb1aae4e95cbe SHA512 db1d6a9c4b3f6f24014eacf3b108d76e5b2d6761d35260f20023638cd898b6f0b499dd475bc07abd58bc73bee2a88b565c3ebcced2460e619a1b375fa6a27a64
 DIST pytest-asyncio-0.12.0.tar.gz 14294 BLAKE2B f62bb025bd3e35b5b4571b232ae2dabe5ef42075fa98f2f5ba28f78f16d81eadeb68b7dcd11a9f8170c1077c331c7abbb0fadc02863458ef03d238b399e6f37d SHA512 2e69bfff3f0b35cc82381b841229749d309967ce1d36972933f5bc6d5dff45934608310ed3fa1805dc38ab41bf913a881493c28d6d0e9be733b624cd2fda97d3
+DIST pytest-asyncio-0.14.0.tar.gz 14796 BLAKE2B 0a110dabde491293dc10452239971809ec6a4006a2036e848aac067df1af328d0d1d5c7afae8cfc1ecf5c919c0922050e2db182065500ec614a8094d3799c0cd SHA512 d1fadff152a0c94f80a8272a0dd293bd9d9300ad9e79c69556b5901c1a8ce00545f7715e503a383e3f4f35c8090d8f9ec33d16739b85378b59b1786a50441fca
diff --git a/dev-python/pytest-asyncio/pytest-asyncio-0.14.0.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.14.0.ebuild
new file mode 100644
index 000000000000..64dfa2878e8f
--- /dev/null
+++ b/dev-python/pytest-asyncio/pytest-asyncio-0.14.0.ebuild
@@ -0,0 +1,33 @@
+# 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Library for testing asyncio code with pytest"
+HOMEPAGE="https://github.com/pytest-dev/pytest-asyncio
+	https://pypi.org/project/pytest-asyncio/"
+SRC_URI="https://github.com/pytest-dev/pytest-asyncio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	>=dev-python/pytest-5.4.0"
+BDEPEND="
+	test? (
+		dev-python/async_generator[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-3.64[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pytest-forked/Manifest b/dev-python/pytest-forked/Manifest
index 8cf2a4b0791f..05434d38073e 100644
--- a/dev-python/pytest-forked/Manifest
+++ b/dev-python/pytest-forked/Manifest
@@ -1 +1,2 @@
 DIST pytest-forked-1.1.3.tar.gz 7308 BLAKE2B 70711228a5a815de23cbd07b2b628e336a26ccecf420dc9d30d9e9b7ed33bc362b0ba74a8f90fb7cb8dc9e7e0f61d2ac22da55584a84e8ac3a26fcfc2878a802 SHA512 2086884b0e78841b3cdf8eb2b144b8fa60ba95e4be79bc58a2b5775a5f997dddef59377f7c993e54974fbbe13e73fe8688eed4d035e85293e35a143c5f0180f3
+DIST pytest-forked-1.2.0.tar.gz 9533 BLAKE2B f9762fd34ffa05eb0abe143388c9608563b0b3d8d5f8c6cbb2e5e36271f4625f10e573042e66d5be5f7f9e124cb5171e570e0d59f2bc1100d2d88ee54c9b4e9b SHA512 d7ed2c36213cfb81988e84e370e0504add77fdb79d31aed4d7aabb73943042f860b4a3ca6c9aad7de5b11234631b1e0f66eb067fcb46079d2cc4ba53ef0cabfb
diff --git a/dev-python/pytest-forked/pytest-forked-1.2.0.ebuild b/dev-python/pytest-forked/pytest-forked-1.2.0.ebuild
new file mode 100644
index 000000000000..d1217706c9c8
--- /dev/null
+++ b/dev-python/pytest-forked/pytest-forked-1.2.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="run tests in isolated forked subprocesses"
+HOMEPAGE="https://pypi.org/project/pytest-forked/ https://github.com/pytest-dev/pytest-forked"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/pytest-3.1.0[${PYTHON_USEDEP}]"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND} )"
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv -p no:flaky || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/pytest/pytest-4.6.11.ebuild b/dev-python/pytest/pytest-4.6.11.ebuild
index 3b3c73704f42..32e713dd573d 100644
--- a/dev-python/pytest/pytest-4.6.11.ebuild
+++ b/dev-python/pytest/pytest-4.6.11.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"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/python-email-validator/metadata.xml b/dev-python/python-email-validator/metadata.xml
index 8f747e0c2a7b..198746921202 100644
--- a/dev-python/python-email-validator/metadata.xml
+++ b/dev-python/python-email-validator/metadata.xml
@@ -14,6 +14,10 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">JoshData/python-email-validator</remote-id>
 		<remote-id type="pypi">email-validator</remote-id>
diff --git a/dev-python/python-email-validator/python-email-validator-1.1.1.ebuild b/dev-python/python-email-validator/python-email-validator-1.1.1.ebuild
index d70287ef4b62..8cd9e9bd41e1 100644
--- a/dev-python/python-email-validator/python-email-validator-1.1.1.ebuild
+++ b/dev-python/python-email-validator/python-email-validator-1.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
diff --git a/dev-python/python-nbxmpp/Manifest b/dev-python/python-nbxmpp/Manifest
index dfb5d28cdac4..d1ac5c90fb05 100644
--- a/dev-python/python-nbxmpp/Manifest
+++ b/dev-python/python-nbxmpp/Manifest
@@ -1 +1,2 @@
 DIST python-nbxmpp-0.6.10.tar.bz2 1063786 BLAKE2B 6d7295a5e6f926cbca709e0774ae8c141e20293c723f3a431a52bacc64639e7cee5820b4e070fae35397a5e5d8c76089d5d1966bf53cef8f0da462134321df6e SHA512 0982a6035ee30edfe9f7d5cc11dcc870ad1dddca851fffc2c26088cd28083f56f5c57df49dcd28b5e6967f02aef03e0ad2f7b2036a908748c66e5e7510e6c7ed
+DIST python-nbxmpp-1.0.0.tar.bz2 111378 BLAKE2B 1dd0fff8e14bb438727a05ba0bd3db3613d91fa08f593cae3e77aec6240ece41a403a324aa3fee89e3173703f185e65e875aa1a49d877d2fc0235d664af9d083 SHA512 4eb1c4ec33ea4008b8ef4cf57e2a7a63450008974ae109af70455a49e716ea5ad612629fb2c7e0b06e69a77ee28b592a089469a645ecdd1bc2160a907804c2ac
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-1.0.0.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-1.0.0.ebuild
new file mode 100644
index 000000000000..32580d7acdac
--- /dev/null
+++ b/dev-python/python-nbxmpp/python-nbxmpp-1.0.0.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,7,8} )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Python library to use Jabber/XMPP networks in a non-blocking way"
+HOMEPAGE="https://dev.gajim.org/gajim/python-nbxmpp/"
+SRC_URI="https://dev.gajim.org/gajim/python-nbxmpp/-/archive/nbxmpp-${PV}/python-nbxmpp-nbxmpp-${PV}.tar.bz2 -> ${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
diff --git a/dev-python/python-sshpubkeys/python-sshpubkeys-3.1.0.ebuild b/dev-python/python-sshpubkeys/python-sshpubkeys-3.1.0.ebuild
index 8d2ecb683814..295c1da3eca1 100644
--- a/dev-python/python-sshpubkeys/python-sshpubkeys-3.1.0.ebuild
+++ b/dev-python/python-sshpubkeys/python-sshpubkeys-3.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ojarva/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/pytools/Manifest b/dev-python/pytools/Manifest
index b44ddf7b774a..f0208775f25f 100644
--- a/dev-python/pytools/Manifest
+++ b/dev-python/pytools/Manifest
@@ -1,2 +1,2 @@
-DIST pytools-2017.4.tar.gz 51339 BLAKE2B 725518ea3aab7fb158134f9539fe1f42603beebb547260e3556466d89b084bcd0adc367bbad63a461553c88eb5c50e2c2f510a02bfb99b9e3affab29eaddf148 SHA512 4f588b725bc478303d539851110ad627baa2768d5d013434ca20e36fa315a842d0f7c3adebd5ae948f642fc5b9ad4940fbe1ee6afeaf0f16c4bc937210e9fa19
 DIST pytools-2020.1.tar.gz 60662 BLAKE2B fcab8af5e10a483f9fdbb835bbc18fc98ebf3da80da9c8e98ff5131eb4a9e780562827966ba15f64df17ee46c48ef2498caf292e29b6b838ebfc5a49a1dccbae SHA512 b8b6513677f84fe97dfee9b96449ce6f2bad5d1dbd51a4f36b080136efd3b1d97850f02ec52e8e70c317104f99ad383dd9d2b260f0c151eb11851b03efcefe58
+DIST pytools-2020.3.1.tar.gz 67635 BLAKE2B e10f80ee743165b0c1f9ee7a171a313ef70644ce4a7bd10a04764bd0e1244b9c98077d659b119b34f0976bfae6ac3caa172f5b24ea967da487536b59aab4a9cd SHA512 819e4d10efffac95f75e07838cd05052136f5a62183680119763dde4952013530493a2292bcb73541b6d329823feca32befa89fcf2dfe5cbe5cd1b00240b40e8
diff --git a/dev-python/pytools/metadata.xml b/dev-python/pytools/metadata.xml
index 9fbbec5095e1..d290555ed72e 100644
--- a/dev-python/pytools/metadata.xml
+++ b/dev-python/pytools/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-needed-->
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pytools</remote-id>
 		<remote-id type="github">inducer/pytools</remote-id>
diff --git a/dev-python/pytools/pytools-2017.4-r1.ebuild b/dev-python/pytools/pytools-2020.3.1.ebuild
index dfcbd576f345..e822631055e5 100644
--- a/dev-python/pytools/pytools-2017.4-r1.ebuild
+++ b/dev-python/pytools/pytools-2020.3.1.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE='sqlite'
+DISTUTILS_USE_SETUPTOOLS=bdepend
 
 inherit distutils-r1
 
@@ -14,24 +15,11 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
+KEYWORDS="~amd64"
 
-RDEPEND="
-	>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+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}]
-"
-DEPEND="
-	>=dev-python/setuptools-0.7.2[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
+	>=dev-python/six-1.8.0[${PYTHON_USEDEP}]"
 
-python_test() {
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
+distutils_enable_tests pytest
diff --git a/dev-python/queuelib/metadata.xml b/dev-python/queuelib/metadata.xml
index 326c5bf34007..b1ce977be45b 100644
--- a/dev-python/queuelib/metadata.xml
+++ b/dev-python/queuelib/metadata.xml
@@ -8,5 +8,5 @@
   <upstream>
     <remote-id type="github">scrapy/queuelib</remote-id>
   </upstream>
-  <origin>kit-fixups</origin>
+  <origin>ports</origin>
 </pkgmetadata>
diff --git a/dev-python/rarfile/Manifest b/dev-python/rarfile/Manifest
index 896fa48cfa2d..4accbe0769cb 100644
--- a/dev-python/rarfile/Manifest
+++ b/dev-python/rarfile/Manifest
@@ -1 +1,2 @@
 DIST rarfile-3.0.tar.gz 110665 BLAKE2B bdafa33600f1c7791af40f4e8c7b6a43e502980dab22bf6792a1b19eab53ea6c29bb6cb2ae4989b9f43d58c326b89ce466b9e2f82f60bad4892131895b15d400 SHA512 b0b816bf09fe455e4d8d35b447c30e7810468a6927555164a1b513d4161f3fd4e77a37439620bd935c3a12e46b1e5eda3e35d7d281899d2f9fd26b6e989aa6e4
+DIST rarfile-3.1.tar.gz 121579 BLAKE2B 3419eb0433866e060cc55fb94806a1ef0591c811e3b88eac97b05519e8e72cdb7da1e7f19fec1d5cadf60fa4caba4717cafe3fb1133556ef2d6f327da52c8c34 SHA512 eb910b0adfd1f28497163aa7994ab268d7780707e09931cb01014ffa51d985410b0bc17e5fb9ca133992b28115a0b5f443d01215624145d280f29e7065abb9d9
diff --git a/dev-python/rarfile/rarfile-3.1.ebuild b/dev-python/rarfile/rarfile-3.1.ebuild
new file mode 100644
index 000000000000..f7282bc66968
--- /dev/null
+++ b/dev-python/rarfile/rarfile-3.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,7,8} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Module for RAR archive reading"
+HOMEPAGE="https://github.com/markokr/rarfile"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+compressed"
+
+RDEPEND="compressed? ( || ( app-arch/unrar app-arch/rar ) )"
+
+distutils_enable_tests pytest
diff --git a/dev-python/reportlab/files/reportlab-3.5.13-disable-network-tests.patch b/dev-python/reportlab/files/reportlab-3.5.13-disable-network-tests.patch
deleted file mode 100644
index e1a760d4d464..000000000000
--- a/dev-python/reportlab/files/reportlab-3.5.13-disable-network-tests.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -r f52d1198146d tests/test_lib_utils.py
---- a/tests/test_lib_utils.py	Tue Jan 15 16:06:40 2019 +0000
-+++ b/tests/test_lib_utils.py	Sun Jan 27 10:21:29 2019 -0500
-@@ -112,7 +112,7 @@
-         "test open and read of a relative file: URL"
-         b = _rel_open_and_read('file:../docs/images/Edit_Prefs.gif')
- 
--    def test9(self):
-+    def xtest9(self):
-         "test open and read of an http: URL"
-         from reportlab.lib.utils import open_and_read
-         b = open_and_read('http://www.reportlab.com/rsrc/encryption.gif')
-diff -r f52d1198146d tests/test_platypus_general.py
---- a/tests/test_platypus_general.py	Tue Jan 15 16:06:40 2019 +0000
-+++ b/tests/test_platypus_general.py	Sun Jan 27 10:21:29 2019 -0500
-@@ -587,7 +587,7 @@
- 
- class PlatypusTestCase(unittest.TestCase):
- 
--    def test0(self):
-+    def xtest0(self):
-         "Make a platypus document"
-         run()
diff --git a/dev-python/reportlab/files/reportlab-3.5.13-pillow-VERSION.patch b/dev-python/reportlab/files/reportlab-3.5.13-pillow-VERSION.patch
deleted file mode 100644
index 3b2093d9a8c5..000000000000
--- a/dev-python/reportlab/files/reportlab-3.5.13-pillow-VERSION.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/src/reportlab/lib/utils.py
-+++ b/src/reportlab/lib/utils.py
-@@ -883,7 +883,13 @@
-                     im = self._image
-                     mode = self.mode = im.mode
-                     if mode in ('LA','RGBA'):
--                        if Image.VERSION.startswith('1.1.7'): im.load()
-+                        # Pillow 6.0.0 and above have removed the 'VERSION' attribute
-+                        # https://bitbucket.org/rptlab/reportlab/issues/176/incompatibility-with-pillow-600
-+                        try:
-+                            im_ver = Image.__version__
-+                        except AttributeError:
-+                            im_ver = Image.VERSION
-+                        if im_ver.startswith('1.1.7'): im.load()
-                         self._dataA = ImageReader(im.split()[3 if mode=='RGBA' else 1])
-                         nm = mode[:-1]
-                         im = im.convert(nm)
diff --git a/dev-python/requests-unixsocket/metadata.xml b/dev-python/requests-unixsocket/metadata.xml
index 335f53a032ae..060051408b73 100644
--- a/dev-python/requests-unixsocket/metadata.xml
+++ b/dev-python/requests-unixsocket/metadata.xml
@@ -8,5 +8,5 @@
   <upstream>
     <remote-id type="github">msabramo/requests-unixsocket</remote-id>
   </upstream>
-  <origin>kit-fixups</origin>
+  <origin>ports</origin>
 </pkgmetadata>
diff --git a/dev-python/requests-unixsocket/requests-unixsocket-0.2.0.ebuild b/dev-python/requests-unixsocket/requests-unixsocket-0.2.0.ebuild
index a1dbba1b2420..b7089b7d40d2 100644
--- a/dev-python/requests-unixsocket/requests-unixsocket-0.2.0.ebuild
+++ b/dev-python/requests-unixsocket/requests-unixsocket-0.2.0.ebuild
@@ -17,8 +17,8 @@ IUSE=""
 
 RDEPEND=""
 DEPEND="
-        dev-python/pbr[${PYTHON_USEDEP}]
-        dev-python/setuptools[${PYTHON_USEDEP}]
-        dev-python/requests[${PYTHON_USEDEP}]
-        dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/pbr[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild b/dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild
index 80335091eb41..44dacc0e238c 100644
--- a/dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild
+++ b/dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/rfc3986/Manifest b/dev-python/rfc3986/Manifest
index a7c98c77d759..b5023286e087 100644
--- a/dev-python/rfc3986/Manifest
+++ b/dev-python/rfc3986/Manifest
@@ -1,2 +1,3 @@
 DIST rfc3986-1.2.0.tar.gz 40162 BLAKE2B d51db37285366fdc7a6d25632afe440bbcdf4fbca46488082286824f046cfd81129b8f0e0695f986120276cf446dde5751dc52ebeb5f2f61f60c5acb92f2da1a SHA512 b88bdc47fa2daa6a9ffc339b1b997a85d0c8b3bf3ab271554e2a1a684c0394370e9cba07a82a542f39533a4c8cae69414234545db6caa2508e0ee7e7f8bdff3d
 DIST rfc3986-1.3.2.tar.gz 44225 BLAKE2B f4cc72ed3c2dcc7132527cd33fd6b9f0136f789fdb229cc33b02bf2dd596b2f762e3e4cf8af63f239408b55cdf056cf54315a0a9cdf734a4203fad24b00ce594 SHA512 c086c55295d80ccf33dbfeff06059303119e7a407bfc405b7f75ec30413221ec58d3061d75fd3ca696b7acf9b1be1dfcc785e01280bf659a53be43ab1f300b15
+DIST rfc3986-1.4.0.tar.gz 44912 BLAKE2B 595a644f8f92823ad31113ce88218cb30d16b37ec7303c0d8e89d2d2b1e18448d99003e95d61dcf09cb64aae517037bae798d1e89c74b652d517a648e80856e8 SHA512 dbcddc09331b794eafed8c2d7b81b7b632ba5cae2741e33ad12e781bc923427a05febd2f2715d037f35769b18c8d790546dfd4bbebe6e71d35777745e446888b
diff --git a/dev-python/rfc3986/metadata.xml b/dev-python/rfc3986/metadata.xml
index c1907d140d2a..e0fb17ba6c35 100644
--- a/dev-python/rfc3986/metadata.xml
+++ b/dev-python/rfc3986/metadata.xml
@@ -9,6 +9,10 @@
     <email>openstack@gentoo.org</email>
     <name>Openstack</name>
   </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <stabilize-allarches/>
   <use>
     <flag name="idna">enable support for the IDNA specification (RFC 5891)</flag>
diff --git a/dev-python/rfc3986/rfc3986-1.3.2.ebuild b/dev-python/rfc3986/rfc3986-1.3.2.ebuild
index d30c59714ba3..a132830441ff 100644
--- a/dev-python/rfc3986/rfc3986-1.3.2.ebuild
+++ b/dev-python/rfc3986/rfc3986-1.3.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3)
+PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3)
 
 inherit distutils-r1
 
diff --git a/dev-python/rfc3986/rfc3986-1.4.0.ebuild b/dev-python/rfc3986/rfc3986-1.4.0.ebuild
new file mode 100644
index 000000000000..a132830441ff
--- /dev/null
+++ b/dev-python/rfc3986/rfc3986-1.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=( python2_7 python3_{6..9} pypy3)
+
+inherit distutils-r1
+
+DESCRIPTION="Validating URI References per RFC 3986"
+HOMEPAGE="https://tools.ietf.org/html/rfc3986
+	https://github.com/python-hyper/rfc3986
+	https://rfc3986.rtfd.org"
+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"
+IUSE="idna"
+
+RDEPEND="
+	idna? ( dev-python/idna[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	test? ( dev-python/idna[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/scrapy/Manifest b/dev-python/scrapy/Manifest
index 29c119ec241e..60e49c7bf8b9 100644
--- a/dev-python/scrapy/Manifest
+++ b/dev-python/scrapy/Manifest
@@ -1 +1,2 @@
 DIST scrapy-2.1.0.tar.gz 1201552 BLAKE2B 5f44c82876d9e4405fc4e6a8466baf7640cb1122d1d137b139e8d1626dc3956efa1db3339493d9dac85cf4d5c8cb0ac542b91242064793ea3d92aae1d2b0cf99 SHA512 72bf6ebcabd6022236cfb8ab4479d577e38417a8c4bcfec80539bd25711cb39ceb44702f801fa0f029777411840506e07da1982ff19776e458ab697756e3f31c
+DIST scrapy-2.2.0.tar.gz 1213914 BLAKE2B 4584fb86f8f2583b5c4d6652b6329ec8dc2d9685776a64a1f998e5e1431b1510c0c63f74de822cc8e67228657085da5009b7145288213b9f2481c24ad51d7a40 SHA512 d5530b37942a0de23e39c442c44d6788bf78a4f316b97e76cb120cabc5c36e097c838f67aaaf307460a3aed9907aa6832f16d476494722e653eb81068f92aa27
diff --git a/dev-python/scrapy/metadata.xml b/dev-python/scrapy/metadata.xml
index 51de13077613..2a4856ae2e21 100644
--- a/dev-python/scrapy/metadata.xml
+++ b/dev-python/scrapy/metadata.xml
@@ -8,5 +8,5 @@
   <upstream>
     <remote-id type="github">scrapy/scrapy</remote-id>
   </upstream>
-  <origin>kit-fixups</origin>
+  <origin>ports</origin>
 </pkgmetadata>
diff --git a/dev-python/scrapy/scrapy-2.2.0.ebuild b/dev-python/scrapy/scrapy-2.2.0.ebuild
new file mode 100644
index 000000000000..1de37136e388
--- /dev/null
+++ b/dev-python/scrapy/scrapy-2.2.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 2020 by Liguros authors
+# Distributed under the terms of the GNU General Public License v2
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="A high-level Web Crawling and Web Scraping framework"
+HOMEPAGE="https://scrapy.org/"
+SRC_URI="https://github.com/scrapy/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="boto doc ibl -test ssl"
+
+RDEPEND="
+	>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
+	dev-libs/libxml2[python,${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	>=dev-python/parsel-1.5[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.4[${PYTHON_USEDEP}]
+	>=dev-python/pydispatcher-2.0.5[${PYTHON_USEDEP}]
+	ibl? ( dev-python/numpy[${PYTHON_USEDEP}] )
+	ssl? (
+			>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
+			dev-python/cryptography[${PYTHON_USEDEP}]
+	)
+	boto? ( dev-python/boto3[${PYTHON_USEDEP}] )
+	>=dev-python/twisted-17.9[${PYTHON_USEDEP}]
+	>=dev-python/w3lib-1.17.0[${PYTHON_USEDEP}]
+	>=dev-python/queuelib-1.1.1[${PYTHON_USEDEP}]
+	>=dev-python/cssselect-0.9[${PYTHON_USEDEP}]
+	>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
+	dev-python/service_identity[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/functools32[${PYTHON_USEDEP}]' python2_7)
+	"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		=net-proxy/mitmproxy-0.10.1[${PYTHON_USEDEP}]
+		=dev-python/netlib-0.10.1[${PYTHON_USEDEP}]
+		dev-python/jmespath[${PYTHON_USEDEP}]
+		dev-python/testfixtures[${PYTHON_USEDEP}]
+		net-ftp/vsftpd
+	)
+"
+
+# pytest-twisted listed as a test dep but not in portage.
+# Testsuite currently survives without it, so appears optional
+
+REQUIRED_USE="test? ( ssl boto )" 
+
+python_prepare_all() {
+	sed -e "s/PyDispatcher/PyPyDispatcher/g" -i setup.py || die
+
+	# https://github.com/scrapy/scrapy/issues/1464
+	# Disable failing tests known to pass according to upstream
+	# Awaiting a fix planned by package owner.
+	sed -e 's:test_https_connect_tunnel:_&:' \
+			-e 's:test_https_connect_tunnel_error:_&:' \
+			-e 's:test_https_tunnel_auth_error:_&:' \
+			-e 's:test_https_tunnel_without_leak_proxy_authorization_header:_&:' \
+			-i tests/test_proxy_connect.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+			PYTHONPATH="${S}" emake -C docs html || die "emake html failed"
+	fi
+}
+
+python_test() {
+	py.test ${PN} tests || die "tests failed"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/semantic_version/Manifest b/dev-python/semantic_version/Manifest
index e2f29ab33f4d..cf0c6cd59504 100644
--- a/dev-python/semantic_version/Manifest
+++ b/dev-python/semantic_version/Manifest
@@ -1 +1,2 @@
 DIST semantic_version-2.8.4.tar.gz 49774 BLAKE2B 30dc1bbca9e24db993e2c9eae2ba05e7a102ba8baae10bc49640d74a3fe9ff943b7606b7c7cbad3d7b25d65a10df7ab587179b5a9bfe73822eb62b945074db23 SHA512 2ed9a8ae03384731865c0b160a9bc92f9c877b610a4ecf15c30969886f15e7cdf77cf384997f96126a8a77534e032c70f587c835fe288fe4ab3e9e2061cb6f47
+DIST semantic_version-2.8.5.tar.gz 50009 BLAKE2B 5f966ca68358d4963b3a41574c100a8f78275445285aebbfa47d1febb0b7a2eb3a638254d4d1bd8e093acbef47a101ef0a0d7a86475313aefa211d2a0a3cfc19 SHA512 2ab59024c148239d78de062ff3a357f81a33fd066b6be8b6f9ef0753841a4945829b1c11899cfbda6c3ff09e00aa3b689e1fb6f8b9a92bbb3c2a62dd713b6049
diff --git a/dev-python/semantic_version/semantic_version-2.8.4.ebuild b/dev-python/semantic_version/semantic_version-2.8.4.ebuild
index cf11169d38f7..31cf61f76904 100644
--- a/dev-python/semantic_version/semantic_version-2.8.4.ebuild
+++ b/dev-python/semantic_version/semantic_version-2.8.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
 inherit distutils-r1
 
 DESCRIPTION="Python library providing a few tools handling SemVer in Python"
diff --git a/dev-python/semantic_version/semantic_version-2.8.5.ebuild b/dev-python/semantic_version/semantic_version-2.8.5.ebuild
new file mode 100644
index 000000000000..cad82361d1cd
--- /dev/null
+++ b/dev-python/semantic_version/semantic_version-2.8.5.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=( pypy3 python3_{6..9} )
+inherit distutils-r1
+
+DESCRIPTION="Python library providing a few tools handling SemVer in Python"
+HOMEPAGE="https://pypi.org/project/semantic_version/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+#SRC_URI="https://github.com/rbarrois/python-semanticversion/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
diff --git a/dev-python/smartypants/metadata.xml b/dev-python/smartypants/metadata.xml
index 8ea327c05d81..42a2ba79e1d0 100644
--- a/dev-python/smartypants/metadata.xml
+++ b/dev-python/smartypants/metadata.xml
@@ -8,5 +8,5 @@
   <upstream>
     <remote-id type="pypi">smartypants</remote-id>
   </upstream>
-  <origin>kit-fixups</origin>
+  <origin>ports</origin>
 </pkgmetadata>
diff --git a/dev-python/smartypants/smartypants-2.0.1-r1.ebuild b/dev-python/smartypants/smartypants-2.0.1-r1.ebuild
index 34dd4d341c0c..11179912b9e3 100755
--- a/dev-python/smartypants/smartypants-2.0.1-r1.ebuild
+++ b/dev-python/smartypants/smartypants-2.0.1-r1.ebuild
@@ -1,5 +1,5 @@
+# Copyright 2020 LiGurOs Authors
 # Distributed under the terms of the GNU General Public License v2
-
 EAPI=6
 
 PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
diff --git a/dev-python/speaklater/speaklater-1.3-r1.ebuild b/dev-python/speaklater/speaklater-1.3-r1.ebuild
index 2be303dcc63a..d7bee32595a3 100644
--- a/dev-python/speaklater/speaklater-1.3-r1.ebuild
+++ b/dev-python/speaklater/speaklater-1.3-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7,3_8} pypy )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit distutils-r1
 
 DESCRIPTION="Lazy strings for Python"
@@ -13,22 +13,16 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-python_prepare() {
+python_configure_all() {
 	# https://github.com/mitsuhiko/speaklater/issues/2
-	if python_is_python3; then
-		2to3 -n -w --no-diffs ${PN}.py || die
-		2to3 -d -n -w --no-diffs ${PN}.py || die
-		# fix unicode in doctests
-		sed -ri "s/(^ {4}l?)u'/\1'/" ${PN}.py || die
-	fi
+	2to3 -n -w --no-diffs ${PN}.py || die
+	2to3 -d -n -w --no-diffs ${PN}.py || die
+	# fix unicode in doctests
+	sed -ri "s/(^ {4}l?)u'/\1'/" ${PN}.py || die
 }
 
 python_test() {
-	"${PYTHON}" -m doctest -v ${PN}.py || die "tests failed with ${EPYTHON}"
+	"${EPYTHON}" -m doctest -v speaklater.py ||
+		die "tests failed with ${EPYTHON}"
 }
diff --git a/dev-python/stevedore/Manifest b/dev-python/stevedore/Manifest
index bfb120da19ea..cad34e96020a 100644
--- a/dev-python/stevedore/Manifest
+++ b/dev-python/stevedore/Manifest
@@ -1,4 +1,2 @@
 DIST stevedore-1.31.0.tar.gz 505482 BLAKE2B c69ecf61b32ab996f23aa913a9f226f64164b94e9420da8b7dd5a8ba568a228bd2f536052ab9378167fd2fe2e0d8d7b42515580a966eeffb5beeaf55dbba69ad SHA512 07b641b63766eddd094690acad81c1417a9721d785f81ca11da0ec2afed455d1beedfea5be4dcfd833d9379d650b193e26207ec0411d274bdf399ea2acd321a0
-DIST stevedore-1.32.0.tar.gz 510344 BLAKE2B 96de6598245e88900ba0f0bd69b976425fc5be2c783f32c551ebb2536dc5fde7fab18121947f3f9caa4d7d822372ad502d272285cc66368bfc39c566821a0160 SHA512 98c66b9ac827f69737cc2522029108831380b4bf4c633786d9819b52be930f6116ce5bfab58e724a2efad147830fcb6353409322fc5e01617d35d1c8aafb0259
-DIST stevedore-2.0.0.tar.gz 508206 BLAKE2B c8e8d1044d1af4e2d0366cd836c36783f49a97c54761070d0af3d7c31b7a3bbdc8d98dfadf2425b73b30d7a37b3bb5ca3cde71a6eea76513f9c565aa7c94511d SHA512 10b091749b638330703c256e8614a9519059edcaf109944a0ca04bda5c5fde0d9ab473dc8293cde809867dbd1c2a23cd96d0faaa1f7d802ad68aa0a5aa972a0e
 DIST stevedore-2.0.1.tar.gz 505248 BLAKE2B 2fee9467b70aa605ca89060e839a2c00deec571f15f014cb8118710e9221fef65ec15172d727dbafb5d5e2adf15ce0e94919804e2ec7ee72ae9e47afe2a6b88f SHA512 1efe46983975b1a0f176f847874c68dd91538fc3c029facbbf0f96891894176e0eeaf28c19e674baa9e9dae024deabae0555c846e36211a9be6cbba5e2ecd710
diff --git a/dev-python/stevedore/stevedore-1.32.0.ebuild b/dev-python/stevedore/stevedore-1.32.0.ebuild
deleted file mode 100644
index 96df662c46eb..000000000000
--- a/dev-python/stevedore/stevedore-1.32.0.ebuild
+++ /dev/null
@@ -1,39 +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} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-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 ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/mock-2.0.0[${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/stevedore/stevedore-2.0.0.ebuild b/dev-python/stevedore/stevedore-2.0.0.ebuild
deleted file mode 100644
index 96df662c46eb..000000000000
--- a/dev-python/stevedore/stevedore-2.0.0.ebuild
+++ /dev/null
@@ -1,39 +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} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-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 ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/mock-2.0.0[${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/stevedore/stevedore-2.0.1.ebuild b/dev-python/stevedore/stevedore-2.0.1.ebuild
index 3b75793f9ca4..6095da755c55 100644
--- a/dev-python/stevedore/stevedore-2.0.1.ebuild
+++ b/dev-python/stevedore/stevedore-2.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm64 hppa ~ia64 ~ppc64 sparc x86"
 
 RDEPEND="
 	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
diff --git a/dev-python/tornado-xstatic/metadata.xml b/dev-python/tornado-xstatic/metadata.xml
index 892b5aea930c..f19b834351c7 100644
--- a/dev-python/tornado-xstatic/metadata.xml
+++ b/dev-python/tornado-xstatic/metadata.xml
@@ -9,5 +9,5 @@
     <remote-id type="github">takluyver/tornado_xstatic</remote-id>
     <remote-id type="pypi">tornado_xstatic</remote-id>
   </upstream>
-  <origin>kit-fixups</origin>
+  <origin>ports</origin>
 </pkgmetadata>
diff --git a/dev-python/traceback2/traceback2-1.4.0.ebuild b/dev-python/traceback2/traceback2-1.4.0.ebuild
index e0ffb58165cc..110badcd4a48 100644
--- a/dev-python/traceback2/traceback2-1.4.0.ebuild
+++ b/dev-python/traceback2/traceback2-1.4.0.ebuild
@@ -19,7 +19,10 @@ RDEPEND="
 	dev-python/linecache2[${PYTHON_USEDEP}]"
 BDEPEND="
 	dev-python/pbr[${PYTHON_USEDEP}]
-	test? ( dev-python/unittest2[${PYTHON_USEDEP}] )"
+	test? (
+		dev-python/contextlib2[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+	)"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/twine/Manifest b/dev-python/twine/Manifest
index 0be7f610e9e4..fa0e211d1afa 100644
--- a/dev-python/twine/Manifest
+++ b/dev-python/twine/Manifest
@@ -1,2 +1,3 @@
 DIST twine-1.15.0.tar.gz 135851 BLAKE2B 5e85c30e23615e9fa7e40ed767412560b29c42ec777afbb17850781a384bc2d3787534a8114a65ac2374ab80441eb2d3b6d75dcff400e7b47a42453a9210130d SHA512 e0eae05c108e1e766a0a8ec684e3423b0537c8aa671675f30403171fd4f48ec65666d407df53f6dd9eefa0b98e5fd2fdf7dbf1f0f9150686c499de131f6f2435
 DIST twine-3.1.1.tar.gz 138692 BLAKE2B d96e207b5ef1314f547f5e8fbf36565d5cf29f0dd19438d41fcbb154a98b854c669740b533a28cd79501933f0cef57767e63a83f135fcdbc196df8865cfc4d8a SHA512 446b36a1816db6131e279bda26e62c58f9659d86178d498ebb9f7c5287b61cf969e625debe4b4cb1e32832e0eecbcedcf4913319ae0bf7eb287f56e550d33ed9
+DIST twine-3.2.0.tar.gz 145280 BLAKE2B b25fa984486a375e09705703a47994b529f6e5b48c6733c0a07b57bec6c0dfcdf4096d6ac6b0f9b7a7bfebfb32ea1cfb49c5de79f29495eb2a8fc59a5f8de4e5 SHA512 9959430913ea570d22f2d8b94e929af36b409b71691b3f66de8ddb77cfbfbe36590e21a6062db2a4a4f56ce2eb96984b0a474a93ea96b7734f53ada7a6411c28
diff --git a/dev-python/twine/twine-3.2.0.ebuild b/dev-python/twine/twine-3.2.0.ebuild
new file mode 100644
index 000000000000..c41930434c29
--- /dev/null
+++ b/dev-python/twine/twine-3.2.0.ebuild
@@ -0,0 +1,63 @@
+# 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="Collection of utilities for publishing packages on PyPI"
+HOMEPAGE="https://twine.readthedocs.io/ https://github.com/pypa/twine https://pypi.org/project/twine/"
+SRC_URI="https://github.com/pypa/twine/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-python/jaraco-envs[${PYTHON_USEDEP}]
+		dev-python/jaraco-functools[${PYTHON_USEDEP}]
+		dev-python/munch[${PYTHON_USEDEP}]
+		dev-python/portend[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pypiserver[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	>=dev-python/tqdm-4.14[${PYTHON_USEDEP}]
+	>=dev-python/pkginfo-1.4.2[${PYTHON_USEDEP}]
+	>=dev-python/readme_renderer-21.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-0.8.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' python3_{6,7} pypy{,3})
+	>=dev-python/keyring-15.1[${PYTHON_USEDEP}]
+	>=dev-python/rfc3986-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.4.3[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	# avoid a setuptools_scm dependency
+	sed -i "s:use_scm_version=True:version='${PV}',name='${PN//-/.}':" setup.py || die
+	sed -r -i "s:setuptools(_|-)scm[[:space:]]*([><=]{1,2}[[:space:]]*[0-9.a-zA-Z]+|)[[:space:]]*::" \
+		setup.cfg || die
+
+	# requires internet
+	sed -e 's:test_check_status_code_for_wrong_repo_url:_&:' \
+		-i tests/test_upload.py || die
+	rm -f tests/test_integration.py || die
+
+	sed -i -e '/--cov/d' pytest.ini || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/typogrify/metadata.xml b/dev-python/typogrify/metadata.xml
index a758947936be..f3fb8f5fbd0e 100644
--- a/dev-python/typogrify/metadata.xml
+++ b/dev-python/typogrify/metadata.xml
@@ -9,5 +9,5 @@
     <remote-id type="pypi">typogrify</remote-id>
     <remote-id type="github">mintchaos/typogrify</remote-id>
   </upstream>
-  <origin>kit-fixups</origin>
+  <origin>ports</origin>
 </pkgmetadata>
diff --git a/dev-python/typogrify/typogrify-2.0.7-r1.ebuild b/dev-python/typogrify/typogrify-2.0.7-r1.ebuild
index 24486bf07c3c..1abdfe7d2278 100755
--- a/dev-python/typogrify/typogrify-2.0.7-r1.ebuild
+++ b/dev-python/typogrify/typogrify-2.0.7-r1.ebuild
@@ -1,5 +1,5 @@
+# Copyright 2020 LiGurOs Authors
 # Distributed under the terms of the GNU General Public License v2
-
 EAPI=6
 
 PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
diff --git a/dev-python/virtualenv/virtualenv-20.0.23.ebuild b/dev-python/virtualenv/virtualenv-20.0.23.ebuild
index a7fac541d104..6c1825d6e7d5 100644
--- a/dev-python/virtualenv/virtualenv-20.0.23.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.0.23.ebuild
@@ -40,23 +40,24 @@ RDEPEND="
 	' -2 python3_6 pypy3)"
 # coverage is used somehow magically in virtualenv, maybe it actually
 # tests something useful
-BDEPEND="${RDEPEND}
+BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		>=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
+		${RDEPEND}
 		$(python_gen_cond_dep '
+			dev-python/coverage[${PYTHON_USEDEP}]
+			>=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
+			>=dev-python/pytest-5[${PYTHON_USEDEP}]
+			>=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
+			>=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
 			>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-		' -3)
+		' 'python3*')
 	)"
 
 distutils_enable_sphinx docs \
 	dev-python/sphinx_rtd_theme \
 	dev-python/towncrier
-distutils_enable_tests pytest
 
 src_prepare() {
 	# we don't have xonsh
diff --git a/dev-python/w3lib/metadata.xml b/dev-python/w3lib/metadata.xml
index f50b76eb7f7e..5b2f183c9ffc 100644
--- a/dev-python/w3lib/metadata.xml
+++ b/dev-python/w3lib/metadata.xml
@@ -8,5 +8,5 @@
   <upstream>
     <remote-id type="github">scrapy/w3lib</remote-id>
   </upstream>
-  <origin>kit-fixups</origin>
+  <origin>ports</origin>
 </pkgmetadata>
diff --git a/dev-python/watchdog/Manifest b/dev-python/watchdog/Manifest
index 3a32f1936e37..4512a63d18cd 100644
--- a/dev-python/watchdog/Manifest
+++ b/dev-python/watchdog/Manifest
@@ -1,3 +1,4 @@
 DIST watchdog-0.10.2.tar.gz 88902 BLAKE2B f6fc6b9dd867a69139289fe6189f90fbc35897a63db1685da85960358141e5eed8391c1aba0cbb899b197056ae80141795090de7f73d821a1819b5c63361cc65 SHA512 3563a9686ce304350f33bbf4b16933cd0db5d6ab17676dfcc779b86cf9ddd06c42462ec40ad5c046cf4aa4b603aa477865de45daef05f9c6af3a441bcab16dbb
+DIST watchdog-0.10.3.tar.gz 89215 BLAKE2B bbe8a2ab3f84b7eff60d4ebd38ac928db85998910fc5b107dcd645c9b91388a9e45d317777f08288ce3bc2befcf9310bb7c8aef4f8e3309481919dc87e84b2a1 SHA512 6061b1393cd07038ee22271101bd6d5c847ee9732b14f63bbb5d94fba9f8273ca728cdc58b6f53a95d8213d0ed35bc71e8bb9c54960bf3aea2f64da066a864f5
 DIST watchdog-0.8.3.tar.gz 83154 BLAKE2B d5d0635e83bbcd31544d5ea5811c2f202b0da76bd7a4086e8fc61e3293640e701b04599f95decaa82bee3705dbd6b91ad24b9dbd20edcfc329913600c8a3c932 SHA512 61f1db886e8e9a6d78b569329f4d5944c296778a5a34f94fbf115a748fb4c3be422bf4d3cc828e22fcdcd380fdf9009f5bd91a8a5edc87089afc58297a0b946f
 DIST watchdog-0.9.0.tar.gz 90597 BLAKE2B 4b83061f49204f13ccdb129c31bd53af256e5541d7a3f6452e59682ab64f37dc2a38e9a82ddcc2cec0ed5c52baed27d62b2fab7eebe2433d924209860b5d4a00 SHA512 97fca2642209150a611d931d6f2049a9941a3494a6c566bc18eaa45a8fc2fbd02c712b37a85cc1375eeb65715706ba6b8ecf781b99951721988c318f81eff7c6
diff --git a/dev-python/watchdog/watchdog-0.10.3.ebuild b/dev-python/watchdog/watchdog-0.10.3.ebuild
new file mode 100644
index 000000000000..6420d472f83a
--- /dev/null
+++ b/dev-python/watchdog/watchdog-0.10.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..9} )
+
+inherit distutils-r1 eutils
+
+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
+	default
+}
+
+pkg_postinst() {
+	optfeature "Bash completion" dev-python/argcomplete
+}
diff --git a/dev-python/wcwidth/Manifest b/dev-python/wcwidth/Manifest
index ac43b2663046..6c3ac689e936 100644
--- a/dev-python/wcwidth/Manifest
+++ b/dev-python/wcwidth/Manifest
@@ -2,3 +2,4 @@ DIST wcwidth-0.1.8.tar.gz 19957 BLAKE2B dd4ba31bec5161a9509b0ef7e73901c3ff31b2ce
 DIST wcwidth-0.1.9.tar.gz 24764 BLAKE2B c7a5a50a8628649810dddd37b1af4c7ea52b2d0d2e516bd24e04675849e6f402e6ef4b7cea0fb507c5446b455d8725f497771bb30cd4d7eafa90cbb6fc2d01b4 SHA512 3aee69efb8714f4426bfd424b80f4f4e5758174d84f725dd0e1448de1b4b4dd385ffd4f72440d5f763b7a82325857e9164742dbb7fa9e15d5db54744c262d0ba
 DIST wcwidth-0.2.2.gh.tar.gz 46929 BLAKE2B 8dac0a793417b04aaccd2235bdd3dee30e18b068a41e515934d2e7b6efb354039adba767db011a2782c9e1f5b8d2568f4ef73ae09361bf8f608491d252bccc21 SHA512 e644a8f83ac5974174e7dae35784c4f9310e39fcfd49d98d6da0f59efd19a0734d5c65e252689843346eb6adad62edfef76658648b34779191fbcf0655188d52
 DIST wcwidth-0.2.4.gh.tar.gz 47355 BLAKE2B 152befc1f9e8630f407a78c70c9121dcbf27a9bc165ef82ec80a6e0793eda5fa89829542dc14959eedf9cc7676edb0212b29bac95c8f041b9f007d03d2a05852 SHA512 69123170421f7f37a9d09e44860cace29b303701b7be8941d7af403b0f4044b273c136da5726689f13c061587fda24f944ef1da918712bed0eda8c00c7a208c0
+DIST wcwidth-0.2.5.gh.tar.gz 47514 BLAKE2B 0ac5fb08283c23039453408da2edac36e2079fde8fc903002785e2e0f8bed55d1d6a291181097f73e4ec8152b6eaa4f4553b0b39fe1cadc7a99bacb2d7e55d2c SHA512 3f1f1fefd3ee9f06ea2051842e8c3bb09a92501f031124b8514bec444eaa8594ab9649534b4264340d475716d5a6571dbe5ae932f685160defd75c19295e60f9
diff --git a/dev-python/wcwidth/wcwidth-0.2.5.ebuild b/dev-python/wcwidth/wcwidth-0.2.5.ebuild
new file mode 100644
index 000000000000..00627f52df55
--- /dev/null
+++ b/dev-python/wcwidth/wcwidth-0.2.5.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=( python2_7 python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Measures number of Terminal column cells of wide-character codes"
+HOMEPAGE="https://pypi.org/project/wcwidth/ https://github.com/jquast/wcwidth"
+SRC_URI="
+	https://github.com/jquast/wcwidth/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]
+	' -2)"
+
+distutils_enable_tests pytest
+
+DOCS=()
+
+src_prepare() {
+	sed -e 's:--cov-append::' \
+		-e 's:--cov-report=html::' \
+		-e 's:--cov=wcwidth::' \
+		-i tox.ini || die
+	sed -i -e 's:test_package_version:_&:' tests/test_core.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/wtforms/Manifest b/dev-python/wtforms/Manifest
index af2b52ac4479..1946487d7fa2 100644
--- a/dev-python/wtforms/Manifest
+++ b/dev-python/wtforms/Manifest
@@ -1 +1,2 @@
 DIST WTForms-2.2.1.tar.gz 156904 BLAKE2B bec7c526f72b264888f7be45ba15d2bc4d194b09adc8ca5806cfc04cd1671663c851b7f1c99c602bb3e13d14a38733be61613058e46481bcea59901ac1f5b6b2 SHA512 06478790a8a4bf728e5436edaa63c7c0e596f71d63b273e1f296f9255d9fa3e31a7bfa95971c214a8cea684034ac3c77b05371f4b4e14da9d9ef2c5afadabde0
+DIST WTForms-2.3.1.tar.gz 162773 BLAKE2B b51b5cb26c550a2502c8c70c1de91c7e6e320f60e2df3ab2b9a5cd755dbbb753d8d2fa05837657aa639929b380e8c65fd25182192538ccef837cae0869b19c80 SHA512 40b810d2d0ce6d2e7880615fb5c3b3e55cfade8e352be5d626d0de16f00a9ef4626ffa106b67d0cbef15e42513073db52ba1ceb04cb18146bba0ba9c26236fdd
diff --git a/dev-python/wtforms/wtforms-2.2.1.ebuild b/dev-python/wtforms/wtforms-2.2.1.ebuild
index aeb0c540d6e9..e52ad989976d 100644
--- a/dev-python/wtforms/wtforms-2.2.1.ebuild
+++ b/dev-python/wtforms/wtforms-2.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( pypy3 python2_7 python3_{6..9} )
 inherit distutils-r1
 
 MY_PN="WTForms"
@@ -22,8 +22,6 @@ RESTRICT="!test? ( test )"
 S="${WORKDIR}/${MY_P}"
 
 BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( >=dev-python/sphinx-0.6[${PYTHON_USEDEP}] )
 	test? (
 		dev-python/Babel[${PYTHON_USEDEP}]
 		dev-python/python-dateutil[${PYTHON_USEDEP}]
@@ -32,6 +30,8 @@ BDEPEND="
 	)
 "
 
+distutils_enable_sphinx docs
+
 python_prepare_all() {
 	# Extension-tests are written for an older version of Django
 	# Disable pep8 even when it is installed
@@ -43,17 +43,6 @@ python_prepare_all() {
 	distutils-r1_python_prepare_all
 }
 
-python_compile_all() {
-	if use doc; then
-		emake -C docs html
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
 python_test() {
 	"${EPYTHON}" tests/runtests.py -v || die
 }
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/wtforms/wtforms-2.3.1.ebuild b/dev-python/wtforms/wtforms-2.3.1.ebuild
new file mode 100644
index 000000000000..6651bb04febe
--- /dev/null
+++ b/dev-python/wtforms/wtforms-2.3.1.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=( pypy3 python3_{6..9} )
+inherit distutils-r1
+
+MY_PN="WTForms"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Flexible forms validation and rendering library for python web development"
+HOMEPAGE="https://wtforms.readthedocs.io/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/markupsafe[${PYTHON_USEDEP}]"
+
+BDEPEND="
+	test? (
+		dev-python/Babel[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/python-email-validator[${PYTHON_USEDEP}]
+		dev-python/sqlalchemy[${PYTHON_USEDEP}]
+		dev-python/webob[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+python_prepare_all() {
+	# Extension-tests are written for an older version of Django
+	# Disable pep8 even when it is installed
+	sed \
+		-e "s|'ext_django.tests', ||" \
+		-e "/import pep8/d" \
+		-e "s|has_pep8 = True|has_pep8 = False|" \
+		-i tests/runtests.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${EPYTHON}" tests/runtests.py -v || die
+}
diff --git a/dev-python/xstatic-termjs/metadata.xml b/dev-python/xstatic-termjs/metadata.xml
index 88c7ccf63de4..7b3e55d60379 100644
--- a/dev-python/xstatic-termjs/metadata.xml
+++ b/dev-python/xstatic-termjs/metadata.xml
@@ -9,5 +9,5 @@
     <remote-id type="pypi">XStatic-termjs</remote-id>
     <remote-id type="github">taklyver/XStatic-termjs</remote-id>
   </upstream>
-  <origin>kit-fixups</origin>
+  <origin>ports</origin>
 </pkgmetadata>
diff --git a/dev-python/xstatic-termjs/xstatic-termjs-0.0.7.0.ebuild b/dev-python/xstatic-termjs/xstatic-termjs-0.0.7.0.ebuild
index 6d78f220bda7..dbbd0fbf1726 100644
--- a/dev-python/xstatic-termjs/xstatic-termjs-0.0.7.0.ebuild
+++ b/dev-python/xstatic-termjs/xstatic-termjs-0.0.7.0.ebuild
@@ -1,6 +1,5 @@
 # Copyright 2020 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
-
 EAPI=6
 
 PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
diff --git a/dev-python/xstatic/metadata.xml b/dev-python/xstatic/metadata.xml
index 103ce9e52ca2..49eeee4b1817 100644
--- a/dev-python/xstatic/metadata.xml
+++ b/dev-python/xstatic/metadata.xml
@@ -8,5 +8,5 @@
   <upstream>
     <remote-id type="pypi">XStatic</remote-id>
   </upstream>
-	<origin>kit-fixups</origin>
+	<origin>ports</origin>
 </pkgmetadata>
diff --git a/dev-python/yapf/yapf-0.30.0.ebuild b/dev-python/yapf/yapf-0.30.0.ebuild
index 24a461376faa..ca683033d50a 100644
--- a/dev-python/yapf/yapf-0.30.0.ebuild
+++ b/dev-python/yapf/yapf-0.30.0.ebuild
@@ -13,6 +13,6 @@ SRC_URI="https://github.com/google/yapf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 distutils_enable_tests setup.py
author	Palica <palica+gitlab@liguros.net>	2020-06-28 12:52:46 +0200
committer	Palica <palica+gitlab@liguros.net>	2020-06-28 12:52:46 +0200
commit	201b7f407a64a15a8477ea3c0f0fcb9fdaf33fe7 (patch)
tree	0be73d02b5be9f6baafdc73d27817551c37396a2 /dev-python
parent	ecdac123787b96ce6649f0f91da12ea6458cc2b1 (diff)
download	baldeagleos-repo-201b7f407a64a15a8477ea3c0f0fcb9fdaf33fe7.tar.gz baldeagleos-repo-201b7f407a64a15a8477ea3c0f0fcb9fdaf33fe7.tar.xz baldeagleos-repo-201b7f407a64a15a8477ea3c0f0fcb9fdaf33fe7.zip