Adding metadata

57 files changed, 661 insertions, 119 deletions

diff --git a/dev-python/PyECLib/PyECLib-1.6.0.ebuild b/dev-python/PyECLib/PyECLib-1.6.0.ebuild
index cbc955724096..272eadc6fa24 100644
--- a/dev-python/PyECLib/PyECLib-1.6.0.ebuild
+++ b/dev-python/PyECLib/PyECLib-1.6.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 
-inherit distutils-r1 eutils multilib
+inherit distutils-r1 multilib
 
 DESCRIPTION="Messaging API for RPC and notifications over different messaging transports"
 HOMEPAGE="https://pypi.org/project/PyECLib/"
diff --git a/dev-python/SaltTesting/SaltTesting-2018.9.21.ebuild b/dev-python/SaltTesting/SaltTesting-2018.9.21.ebuild
index cbf14a777245..4981d9e6f546 100644
--- a/dev-python/SaltTesting/SaltTesting-2018.9.21.ebuild
+++ b/dev-python/SaltTesting/SaltTesting-2018.9.21.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 
-inherit eutils distutils-r1
+inherit distutils-r1
 
 DESCRIPTION="Required testing tools needed in the several Salt Stack projects"
 HOMEPAGE="https://saltstack.com/community/"
diff --git a/dev-python/aesara/Manifest b/dev-python/aesara/Manifest
index 6df6c24ff22f..ccc3e7157247 100644
--- a/dev-python/aesara/Manifest
+++ b/dev-python/aesara/Manifest
@@ -4,3 +4,4 @@ DIST aesara-rel-2.0.3.tar.gz 8019978 BLAKE2B 5e3a7cdca08569a06b7731ff55894c61859
 DIST aesara-rel-2.0.4.tar.gz 8020138 BLAKE2B 4fa1d0d1979eaac1635cd09d9af61ae4be0cbac3722c37cba54a81a93f358f72a7b6c543e2f8c4b120262469e27f96273bffb9222a2c36f58284bc5b7c148d89 SHA512 8205cbbdfb2ce901ea4991a2dc82a8809d1151b2a8da9382cb5306ecb916793c927f8e7c057cc32145802625883476d6a69b5e19b69a69bc843b0114775918ae
 DIST aesara-rel-2.0.5.tar.gz 8020447 BLAKE2B 97a08e01b06fa6ce86d0d81fa02a9bc9bb9d7f25c2bfe25e68d46864519899f5a530871a6ca8e07a64732239207869fe88ca235e2ba102aa0eae8360310234cd SHA512 dc69c7e1f5dc30c5e29bf37957ca3e84d370cce054d61656b44398324385a7490d7b6f4edaffd0019196e2a413124b05f44b9b7c618851a51247bc6b79559849
 DIST aesara-rel-2.0.6.tar.gz 8020607 BLAKE2B 0a51936fe089061038e9dd60e210d7a0820438a03508fb1aa7f843c9c3dbba86295a7e0471f97084e7ba87e2a771bb640a6f87ce974b219767d2344e2a94b190 SHA512 1370cb4408b694d5b97610229951cfa9e74f42c10347eff375d5aba0aaa60a7c88f5db2a7c101ec6916a40d6cf12b5646e7422dd5e9617f414619d79c55f02fb
+DIST aesara-rel-2.0.7.tar.gz 8020485 BLAKE2B 91c02c5d6826694b08bf3276f9c08e98f5a68a34b7d4a4f4813b44794f625cb0b67677fc8eff8496f19f84b462b30d740645b19b3031640a550b8b07288980ef SHA512 63f636d7293127b21196072fd05edf25f2d03702d5568308ddb35c2d425100aa4087eb282f30a123124e43bedbc82d84209293c2d2de6f598c7b3b6704fc38aa
diff --git a/dev-python/aesara/aesara-2.0.7.ebuild b/dev-python/aesara/aesara-2.0.7.ebuild
new file mode 100644
index 000000000000..86db63192539
--- /dev/null
+++ b/dev-python/aesara/aesara-2.0.7.ebuild
@@ -0,0 +1,64 @@
+# Copyright 2021 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,10} )
+inherit distutils-r1 optfeature
+
+MY_P=aesara-rel-${PV}
+DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
+HOMEPAGE="https://github.com/pymc-devs/aesara"
+SRC_URI="https://github.com/pymc-devs/aesara/archive/rel-${PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/filelock[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx doc 'dev-python/sphinx_rtd_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -i -e "s/tests.\*/tests\*/" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local exclude=(
+		# speed tests are unreliable
+		tests/scan/test_basic.py::test_speed
+		tests/scan/test_basic.py::test_speed_rnn
+		tests/scan/test_basic.py::test_speed_batchrnn
+		tests/link/test_vm.py::test_speed
+		tests/link/test_vm.py::test_speed_lazy
+		tests/tensor/test_gc.py::test_merge_opt_runtime
+	)
+
+	distutils_install_for_testing --via-root
+	epytest ${exclude[@]/#/--deselect } \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+# https://dev.gentoo.org/~mgorny/python-guide/concept.html#packaging-pkgutil-style-namespaces-in-gentoo
+python_install() {
+	rm "${BUILD_DIR}"/lib/bin/__init__.py || die
+	distutils-r1_python_install
+}
+
+pkg_postinst() {
+	optfeature "GPU code generation/execution on NVIDIA gpus" dev-util/nvidia-cuda-toolkit dev-util/nvidia-cuda-sdk
+	optfeature "GPU/CPU code generation on CUDA and OpenCL devices" dev-libs/libgpuarray dev-python/pycuda
+}
diff --git a/dev-python/ansible-runner/Manifest b/dev-python/ansible-runner/Manifest
new file mode 100644
index 000000000000..cb89918aa272
--- /dev/null
+++ b/dev-python/ansible-runner/Manifest
@@ -0,0 +1 @@
+DIST ansible-runner-1.4.7.tar.gz 47112 BLAKE2B 0e9ac2f63179dda44a403d90bd218f848929c2e46cc25fb5a6e34ace36db24619d3498b18319d7f49b078ea4a5d149c2eeef1671fdfe2a495cdd4cc61ca8209c SHA512 504d1e25abfe39fc5a7867f799accabe98c8a065eda06869f04a5ef2a5bb30058623497c761c8fa99d39372d1215046431484eebdaa2850f50de75a273b70ab3
diff --git a/dev-python/ansible-runner/ansible-runner-1.4.7-r1.ebuild b/dev-python/ansible-runner/ansible-runner-1.4.7-r1.ebuild
new file mode 100644
index 000000000000..a7e9729ebdbe
--- /dev/null
+++ b/dev-python/ansible-runner/ansible-runner-1.4.7-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="A tool and python library that helps when interfacing with Ansible"
+HOMEPAGE="https://github.com/ansible/ansible-runner"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RDEPEND="
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/python-daemon[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -e 's|find_packages()|find_packages(exclude=["test", "test.*"])|' -i setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/ansible-runner/metadata.xml b/dev-python/ansible-runner/metadata.xml
new file mode 100644
index 000000000000..fe992368c36d
--- /dev/null
+++ b/dev-python/ansible-runner/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+  <email>zmedico@gentoo.org</email>
+  <name>Zac Medico</name>
+ </maintainer>
+ <longdescription lang="en">
+A tool and python library that helps when interfacing with Ansible
+directly or as part of another system whether that be through a
+container image interface, as a standalone tool, or as a Python module
+that can be imported. The goal is to provide a stable and consistent
+interface abstraction to Ansible.
+</longdescription>
+ <upstream>
+  <remote-id type="pypi">ansible-runner</remote-id>
+  <remote-id type="github">ansible/ansible-runner</remote-id>
+  <bugs-to>https://github.com/ansible/ansible-runner/issues</bugs-to>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/awxkit/Manifest b/dev-python/awxkit/Manifest
new file mode 100644
index 000000000000..2bb705955617
--- /dev/null
+++ b/dev-python/awxkit/Manifest
@@ -0,0 +1 @@
+DIST awxkit-19.0.0.tar.gz 95820 BLAKE2B eadb3ffbfd5a1bf2835e4a7df788e06676cd7c8132c8527c04c4876e87039b72ed00775ddc342e0b31bb0c4a7036b3ecb0456761b9a6a1a5f40e60656fd06521 SHA512 169531549fd668e9917db55f2d61d8959645659496f249d9bb94432b9d7449aa549a751aa3c0255c38334e24684e4039e581d26aa2c291ede88b623824b78ff9
diff --git a/dev-python/awxkit/awxkit-19.0.0-r1.ebuild b/dev-python/awxkit/awxkit-19.0.0-r1.ebuild
new file mode 100644
index 000000000000..55ccf935961d
--- /dev/null
+++ b/dev-python/awxkit/awxkit-19.0.0-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Command line interface for Ansible AWX"
+HOMEPAGE="https://github.com/ansible/awx"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/websocket-client[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -e 's|websocket-client==[[:digit:]\.]*|websocket-client|' -i setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/awxkit/metadata.xml b/dev-python/awxkit/metadata.xml
new file mode 100644
index 000000000000..d83c473ac1e8
--- /dev/null
+++ b/dev-python/awxkit/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+  <email>zmedico@gentoo.org</email>
+  <name>Zac Medico</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="pypi">awxkit</remote-id>
+  <remote-id type="github">ansible/awx</remote-id>
+  <bugs-to>https://github.com/ansible/awx/issues</bugs-to>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 506ce3608c2c..8abeb6658553 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -4,3 +4,4 @@ DIST boto3-1.17.49.tar.gz 360898 BLAKE2B 6fa6fddf1f5df4d28ed2163feef1f3e3349c909
 DIST boto3-1.17.50.tar.gz 361144 BLAKE2B 2c8549cfb2017e0a2aa6a164c286685e71abe8c7a773baeabc50603ab243b993db88f85a1e5d7d0d9e1c9541df8ed3bab70077d2890f73c1ef760f2bcae85894 SHA512 1cb9405de5b960f55f01ec5d13f3385e8ea99354fc465ae342d3b072ebe179be800ce3100304068731a0a9912b7ea09099c94fe9cf736d0e8a5c88c28d4c9b93
 DIST boto3-1.17.51.tar.gz 361593 BLAKE2B de24e833330b4dc1f3011c824745af6cf521d166cacee0dd01884e23490441c12d78c868cb59635e73f2a0b0765339973ff98cb3db63d34444d426555a32a38a SHA512 c17047c24a1973ea34aec381c0a86e6c4ddac79aa4d1485a155fd92e5d21bc726659d14c829c2f1b4869341537adf4c03cfbcfd32aa8ced4d2966a8fe03256c2
 DIST boto3-1.17.52.tar.gz 361931 BLAKE2B d7660d9e304faeec4f0922a03df2805ee8e619ca0c7c0a822f9defa46ac3f1bf53158ae83034e885dd11382383365b6ef901e6f8c0f985fa327d9ebeb1ba54bd SHA512 76f02eb6bd8e70a6b9c7a44ac14a479b23ba50f37ced6644c511e2bd3e8cd19f803c59e900f47918f52cb0be2522843d6a0c7dae18f595c7ac9f35ceee93c50a
+DIST boto3-1.17.53.tar.gz 362118 BLAKE2B 5f143166cee5a3a3201eb2575cce540ba21772d1b436e255d304503ab49fadad80f737ae652fd6917bd70ee3a308b955a9c1bbe0e592d7df298f55089638b4dd SHA512 87496e0ab4ac12cbd8f0c10669f8d64f4e6183baf5bdc4f7f4e732e46e073d8a54417149e21f10c6b38562f3f105646d85dc21675ca23f75c9a8dba252f571b1
diff --git a/dev-python/boto3/boto3-1.17.53.ebuild b/dev-python/boto3/boto3-1.17.53.ebuild
new file mode 100644
index 000000000000..2df16964cdb0
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.53.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index ad8af08031e7..58414758c4bc 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -4,3 +4,4 @@ DIST botocore-1.20.49.tar.gz 7630973 BLAKE2B 89d10ece5cd645d6904046804c2b2d789d7
 DIST botocore-1.20.50.tar.gz 7632505 BLAKE2B e52668e217d7dd9769df9cd8e45ee6b50dbc7c4e2f5cc2e05006e9770b45a10bf4f952fa2365511c92223e38b8a440950495ba435cd1a52b190f43f39a56ee73 SHA512 b6d564852d832269be9a553aa629fa5ec77185e997ebe6df16bbd5bd738982ddd8f25378d52286abb24f49bcc494829b9a40735125d62750878534f70c5b718e
 DIST botocore-1.20.51.tar.gz 7636119 BLAKE2B 3c2892b1bdd7697232a3426874178b248aa7d026cd3559f46e5dc2e552cc5f9c7fc2a37575e69f31674e26eeaf2eae6015c8fc60e4b735e9c421dc2d47aa117b SHA512 98a816632f618df85b8d4fe5b1871856e9b77e4b3c627fd189fb36e8170380fa7e2304178a5e3bfcea206e9a6829bc0eab2455e16e7f21fd7271a7491fc8faf0
 DIST botocore-1.20.52.tar.gz 7649448 BLAKE2B 3b27f838ca985df19ab97200c57eea65e43202170aacec270974cd29c8b7f6ea4cab9ad9d53332059aba0d1736fcbb3dd5048b076d8d23ef71f542f734325fc2 SHA512 68a0a66ef0fb732b66ce81043b87dff9174a83edcb2bdfa4779bed05c76738e51f9934f29873cb7d8daf111750e7e5fc12229eb9838c96d3fc8e58b3290b2ca6
+DIST botocore-1.20.53.tar.gz 7650473 BLAKE2B 797280da052c547c10dc7c391b4d070624bd52ae8372f46e29b863ef5abf02f167d459f1013e2b46e3bb6878203f6dc7dabbad141fc89a52a46a770ec45a0cfb SHA512 ad7bc9fd06b24c8f15826ed19d6c5163d048206724c91dc82df58bb9d1bdcddaafd116543fe667df356fd5c098a975621f2e649df5937f97f54ddc9c15867252
diff --git a/dev-python/botocore/botocore-1.20.53.ebuild b/dev-python/botocore/botocore-1.20.53.ebuild
new file mode 100644
index 000000000000..9d681f87244c
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.53.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/flake8/Manifest b/dev-python/flake8/Manifest
index 29a6978be30f..f0818db095a7 100644
--- a/dev-python/flake8/Manifest
+++ b/dev-python/flake8/Manifest
@@ -1,2 +1,3 @@
 DIST flake8-3.8.4.tar.gz 163583 BLAKE2B 221234931365912adffec99c7c6761d2f35918222bee902ade4d8009d24f6918c66d23fc4b973fe653152cc6857b62ba859780b0d9de53fb91b7ea0379bee9d0 SHA512 51ed09beed50175573e6184b404431b3f89aa6594c40c70ed8288982fe12c2a68992e36d69c99013188f03555bf9fef1ba4f111f8e389cef1e1daa69b41ff5b0
 DIST flake8-3.9.0.tar.gz 164144 BLAKE2B e265a392445038b04ee2d8c24a763b4b1eebe9682295b70d14c07dbd739b34abbe5f76bc01dd31df7c666a106b62c5312c0522d6771c5649a91d2720a9d14467 SHA512 bfeaa13737f23318da8673c28f0f10463c0aad71a01fe70797321de3b9b7efbe7b5d0ee0664b8440db6b35d7f29f157848757d55fcac531a0c6da6371d681b65
+DIST flake8-3.9.1.tar.gz 164752 BLAKE2B 07f5049f8445bce87cee1509769e13f275f0e531b78a2769218233ac02a45ed7a8dc061f5253e4c136b47bfddfb574527d99dfff36d338516824167335f9a5fc SHA512 c592308fa32ae73982e6441624a989bdc213b639b0473f7342e75f11e3844282a713dce1f4649575d375766fa1d6b2a1840707109ac8d4672c0d2917f89a3d33
diff --git a/dev-python/flake8/flake8-3.9.1.ebuild b/dev-python/flake8/flake8-3.9.1.ebuild
new file mode 100644
index 000000000000..2cbe2ba49a28
--- /dev/null
+++ b/dev-python/flake8/flake8-3.9.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
+HOMEPAGE="https://gitlab.com/pycqa/flake8 https://pypi.org/project/flake8/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+
+# requires.txt inc. mccabe however that creates a circular dep
+RDEPEND="
+	>=dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
+	<dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
+	<dev-python/pycodestyle-2.8.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3 python3_{6,7})
+"
+PDEPEND="
+	>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
+	<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}
+	test? (
+		${PDEPEND}
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source dev-python/sphinx-prompt dev-python/sphinx_rtd_theme
+distutils_enable_tests --install pytest
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index d97a0a41ee00..03fa87a75e3c 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1,3 +1,4 @@
 DIST google-auth-1.27.1.tar.gz 157876 BLAKE2B 0a06451e8a800231972b5b167d45410791b38a1616043912befb5554eff217bd1af70bf34aaf455fe68f9f515ea143cb2446800231006c369005de6981f7f466 SHA512 d640bb5395f956fd3442ea31145af2d72855108bff6b11dfeecfd4b48ad4fa50efba838e423bace310e78bbae74860d6c031d4ee873a7ab6dd522eb49e3fbdab
 DIST google-auth-1.28.0.tar.gz 158266 BLAKE2B 7e1fcdd0a6d155c0170012d43062fa5df2c9dd731105990af6d055c0dc8f9c36917776876a25caedd4b804acf24cdebd93a0953a9f7642563a5abc05cc946156 SHA512 a02db23132950c99e032d8318451cd67127f1e9fc57731a8a76505a360d77484aef1859e54d8e4efa1bcde3f6f5379c3324d54cf57c0a95fb1fa7765f43e9581
 DIST google-auth-1.28.1.tar.gz 158294 BLAKE2B 3b6e7e746a10fee3f2fcbe1003fa3f5ea94582d092da32e44d8b9772babfb4db321780d1c4253f212971603d0e1212d10fc24dca10c3978faf06bfd8d9a96532 SHA512 e07dac8c0e9814d10bd53302c19cc37339b31141cc20c9fc7b6de8656abd68225f9a7c5502a8c64527c9bdaadd4158b7fa29e5564d02e878ee9acb3d9605c15a
+DIST google-auth-1.29.0.tar.gz 167058 BLAKE2B 0c6c9ac11330e46757bc554f7ae984d4ab94562e4524e0c579c0878fb093201240ebabc3a4f44f8d9f530a82ad5f84dd76100d57e2f874b78315c7f0d2cfb4fd SHA512 a6c8ca93ef493f16b7b16c2e1456891a09635bbc4a39053dc2c4cdca2f739692a74e4588c61c8aa5f06c1a5355ef304771770e26f1656edc0ef4c3c291df796d
diff --git a/dev-python/google-auth/google-auth-1.29.0.ebuild b/dev-python/google-auth/google-auth-1.29.0.ebuild
new file mode 100644
index 000000000000..acb15b9634c5
--- /dev/null
+++ b/dev-python/google-auth/google-auth-1.29.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Google Authentication Library"
+HOMEPAGE="
+	https://github.com/googleapis/google-auth-library-python/
+	https://pypi.org/project/google-auth/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND="
+	dev-python/namespace-google[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}]
+	"
+BDEPEND="
+	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/grpcio[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/oauth2client[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/pyu2f[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		dev-python/urllib3[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/hypothesis/hypothesis-6.6.0.ebuild b/dev-python/hypothesis/hypothesis-6.6.0.ebuild
index 6dbcfe242e0a..e4cc694764b8 100644
--- a/dev-python/hypothesis/hypothesis-6.6.0.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.6.0.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
 PYTHON_REQ_USE="threads(+),sqlite"
 
-inherit distutils-r1 eutils multiprocessing optfeature
+inherit distutils-r1 multiprocessing optfeature
 
 DESCRIPTION="A library for property based testing"
 HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
diff --git a/dev-python/hypothesis/hypothesis-6.8.1.ebuild b/dev-python/hypothesis/hypothesis-6.8.1.ebuild
index f20e753a168b..29dc15959261 100644
--- a/dev-python/hypothesis/hypothesis-6.8.1.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.8.1.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
 PYTHON_REQ_USE="threads(+),sqlite"
 
-inherit distutils-r1 eutils multiprocessing optfeature
+inherit distutils-r1 multiprocessing optfeature
 
 DESCRIPTION="A library for property based testing"
 HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
diff --git a/dev-python/hypothesis/hypothesis-6.8.9.ebuild b/dev-python/hypothesis/hypothesis-6.8.9.ebuild
index f20e753a168b..29dc15959261 100644
--- a/dev-python/hypothesis/hypothesis-6.8.9.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.8.9.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
 PYTHON_REQ_USE="threads(+),sqlite"
 
-inherit distutils-r1 eutils multiprocessing optfeature
+inherit distutils-r1 multiprocessing optfeature
 
 DESCRIPTION="A library for property based testing"
 HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
diff --git a/dev-python/hypothesis/hypothesis-6.9.0.ebuild b/dev-python/hypothesis/hypothesis-6.9.0.ebuild
index f20e753a168b..29dc15959261 100644
--- a/dev-python/hypothesis/hypothesis-6.9.0.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.9.0.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
 PYTHON_REQ_USE="threads(+),sqlite"
 
-inherit distutils-r1 eutils multiprocessing optfeature
+inherit distutils-r1 multiprocessing optfeature
 
 DESCRIPTION="A library for property based testing"
 HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
diff --git a/dev-python/hypothesis/hypothesis-6.9.1.ebuild b/dev-python/hypothesis/hypothesis-6.9.1.ebuild
index f20e753a168b..29dc15959261 100644
--- a/dev-python/hypothesis/hypothesis-6.9.1.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.9.1.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
 PYTHON_REQ_USE="threads(+),sqlite"
 
-inherit distutils-r1 eutils multiprocessing optfeature
+inherit distutils-r1 multiprocessing optfeature
 
 DESCRIPTION="A library for property based testing"
 HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
diff --git a/dev-python/hypothesis/hypothesis-6.9.2.ebuild b/dev-python/hypothesis/hypothesis-6.9.2.ebuild
index f20e753a168b..29dc15959261 100644
--- a/dev-python/hypothesis/hypothesis-6.9.2.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.9.2.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
 PYTHON_REQ_USE="threads(+),sqlite"
 
-inherit distutils-r1 eutils multiprocessing optfeature
+inherit distutils-r1 multiprocessing optfeature
 
 DESCRIPTION="A library for property based testing"
 HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
diff --git a/dev-python/jaraco-path/jaraco-path-3.3.1.ebuild b/dev-python/jaraco-path/jaraco-path-3.3.1.ebuild
index d67bf59d3317..b6da85edb3af 100644
--- a/dev-python/jaraco-path/jaraco-path-3.3.1.ebuild
+++ b/dev-python/jaraco-path/jaraco-path-3.3.1.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ppc64 ~s390 sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc ~x86 ~x64-macos"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/jsonref/jsonref-0.1.ebuild b/dev-python/jsonref/jsonref-0.1.ebuild
index 408bd0349b15..54a679f625bc 100644
--- a/dev-python/jsonref/jsonref-0.1.ebuild
+++ b/dev-python/jsonref/jsonref-0.1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 
-inherit eutils distutils-r1
+inherit distutils-r1
 
 DESCRIPTION="An implementation of JSON Reference for Python"
 HOMEPAGE="https://github.com/gazpachoking/jsonref https://pypi.org/project/jsonref/"
diff --git a/dev-python/lmdb/Manifest b/dev-python/lmdb/Manifest
index 340e635e5775..3de40e454fb5 100644
--- a/dev-python/lmdb/Manifest
+++ b/dev-python/lmdb/Manifest
@@ -1 +1,2 @@
 DIST lmdb-1.1.1.tar.gz 880359 BLAKE2B b202154eae151d3748e9e90fcb71a3c8a722923c2583e469ef1a0017a4c3dfdfd62d99db24fb79e7da1fc7c6a4fb695d9db5ed6a67750967788a12fe0ba24761 SHA512 4621c87dd646f8ca37f4cdc40ffa2fe809ca4da21b335856e50e6d0ae07f3828d424cde9cc383e4cdc761cd9311eb504d67678a33de51c1931a006ec86a2fcd0
+DIST lmdb-1.2.0.tar.gz 881437 BLAKE2B bcb045868c100bcb82daed99bdbd73699dcb5a0e982679f1d9f49747f468e2ab2cbc412ba020b9deca7263fece501c25d984397ee2969187c8118da920c691aa SHA512 75c7aeb3e98ffddb9e40b4eb7404afd3c6ade93753488eac2cb5facfab3ec9b660d925b8bd1c40ca5f8180cb6ca33483020bb4c5ddc074b841693ba278883529
diff --git a/dev-python/lmdb/lmdb-1.2.0-r1.ebuild b/dev-python/lmdb/lmdb-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..9b68d94ddd43
--- /dev/null
+++ b/dev-python/lmdb/lmdb-1.2.0-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for the Lightning Database"
+HOMEPAGE="https://github.com/jnwatson/py-lmdb/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="OPENLDAP"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-db/lmdb-0.9.28:=
+	$(python_gen_cond_dep '
+		dev-python/cffi[${PYTHON_USEDEP}]
+	' 'python*')"
+DEPEND="${RDEPEND}"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+python_compile() {
+	LMDB_FORCE_SYSTEM=1 distutils-r1_python_compile
+}
+
+python_test() {
+	epytest tests
+}
+
+python_install() {
+	# This is required when the CFFI extension is used (for PyPy3)
+	LMDB_FORCE_SYSTEM=1 distutils-r1_python_install
+}
diff --git a/dev-python/mygpoclient/mygpoclient-1.8.ebuild b/dev-python/mygpoclient/mygpoclient-1.8.ebuild
index f5498a948c41..153e43aa1fa6 100644
--- a/dev-python/mygpoclient/mygpoclient-1.8.ebuild
+++ b/dev-python/mygpoclient/mygpoclient-1.8.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 
-inherit distutils-r1 eutils
+inherit distutils-r1
 
 DESCRIPTION="A gpodder.net client library"
 HOMEPAGE="https://github.com/gpodder/mygpoclient
diff --git a/dev-python/namespace-ruamel/namespace-ruamel-1.ebuild b/dev-python/namespace-ruamel/namespace-ruamel-1.ebuild
index 457ea813d926..64a54a0784a3 100644
--- a/dev-python/namespace-ruamel/namespace-ruamel-1.ebuild
+++ b/dev-python/namespace-ruamel/namespace-ruamel-1.ebuild
@@ -13,7 +13,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/pycxx/pycxx-7.1.2-r2.ebuild b/dev-python/pycxx/pycxx-7.1.2-r2.ebuild
index 0837d8c225b9..b38289822e2d 100644
--- a/dev-python/pycxx/pycxx-7.1.2-r2.ebuild
+++ b/dev-python/pycxx/pycxx-7.1.2-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
+
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 DISTUTILS_USE_SETUPTOOLS=no
-
-inherit eutils distutils-r1
+inherit distutils-r1
 
 DESCRIPTION="Set of facilities to extend Python with C++"
 HOMEPAGE="https://sourceforge.net/projects/cxx/"
diff --git a/dev-python/pyicu/Manifest b/dev-python/pyicu/Manifest
index 611ddaa1ad2b..ba703cb377b8 100644
--- a/dev-python/pyicu/Manifest
+++ b/dev-python/pyicu/Manifest
@@ -1,2 +1,3 @@
 DIST PyICU-2.6.tar.gz 233826 BLAKE2B 318b87b878f8d49f47f48780567751671f5f88902c4cae9a243a81300b002ca6ea2336aee38bfc76a3037326f15f197fd71819173b678c68094d16f8db51864e SHA512 ab4c167cbeb80a23904476e51a3c16aa4721e26840b1d4c2f44b5a610e5467a6880c45f27636efb9e44e8e4302a095d437f4868409103270d79ecd56a3d90c9c
 DIST pyicu-v2.7.1.tar.bz2 238508 BLAKE2B 20fed10bde607effc4d7f5e3882508e2673b4def29417fb888853565ddbbd3de22db986bf9801b8886570e080e1b50a2d941d18fcb39587fdf9a4e6bd5afefb0 SHA512 9d6a0c713396e0391a8617e68ad5ec5410e2dbb7ea0decad02816530ecc5a5ce8dc6b0ef905107b45f0e62c9d60e1e0d565ad18aeaf92e38fefd1c123e8754b5
+DIST pyicu-v2.7.2.tar.bz2 238645 BLAKE2B cca24a2cda18e943ac00a50b9a28342845af156b66bffcae2ec915e8e5d97577e1c5975b6711051558223278ccd7ad33782d02e759427ace4ce609fcad1c7ba6 SHA512 ece8a7a7e5162de8a2ad7a1ae1310ca4f32c6d27695942580a9a4cd1755a94c4230fe9f9e1c9a6b5a7d4a712b2ad570660e89316f437a7af502521e91137960e
diff --git a/dev-python/pyicu/pyicu-2.7.2.ebuild b/dev-python/pyicu/pyicu-2.7.2.ebuild
new file mode 100644
index 000000000000..117ff101f621
--- /dev/null
+++ b/dev-python/pyicu/pyicu-2.7.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+MY_P=${P/-/-v}
+DESCRIPTION="Python bindings for dev-libs/icu"
+HOMEPAGE="
+	https://gitlab.pyicu.org/main/pyicu/
+	https://pypi.org/project/PyICU/"
+SRC_URI="
+	https://gitlab.pyicu.org/main/pyicu/-/archive/v${PV}/${MY_P}.tar.bz2"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-libs/icu:="
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGES CREDITS README.md )
+
+distutils_enable_tests pytest
diff --git a/dev-python/pysvn/pysvn-1.9.11.ebuild b/dev-python/pysvn/pysvn-1.9.11.ebuild
index 75f2e648de74..e355066124ee 100644
--- a/dev-python/pysvn/pysvn-1.9.11.ebuild
+++ b/dev-python/pysvn/pysvn-1.9.11.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 
-inherit eutils distutils-r1 toolchain-funcs
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_IN_SOURCE_BUILD=true
+inherit distutils-r1 toolchain-funcs
 
 DESCRIPTION="Object-oriented python bindings for subversion"
 HOMEPAGE="https://pysvn.sourceforge.io/"
@@ -22,8 +23,6 @@ RDEPEND="${DEPEND}"
 
 PATCHES=( "${FILESDIR}"/${P}-respect-flags.patch )
 
-DISTUTILS_IN_SOURCE_BUILD=true
-
 python_prepare_all() {
 	# Don't use internal copy of dev-python/pycxx.
 	rm -r Import || die
diff --git a/dev-python/python-engineio/Manifest b/dev-python/python-engineio/Manifest
index 66d67a727785..6caadd23bd2e 100644
--- a/dev-python/python-engineio/Manifest
+++ b/dev-python/python-engineio/Manifest
@@ -1,2 +1,3 @@
 DIST python-engineio-3.12.1.tar.gz 37158 BLAKE2B a3f75b0ec197248029a2a257eee7694298d916bc444705df7a941e8106d09e5bc802cd612c88e526883083730797e4835e13db93121714a701af17d894ac53cf SHA512 f81012e264025dc24845986e67c7d19d46048e072a409483a130630e07efb84e831e188d3f277dd0f7d26351015009afcef0d2058bb19dacee68d6c56837fa1d
 DIST python-engineio-4.0.1.gh.tar.gz 296000 BLAKE2B dc3b2c3f25ebbfb9d795e3c08e82b2e001fbc785dfb1666f137d8b261b65a90a15af7527917bdd9c636f076f75e01c65b498145ae5051649e1264eb9339d9f7e SHA512 83886ed1a60465127b7eb42a8437196cd68f4c538076237e4f64ff36f6fb02d1e45bd6730d4bb6209c931e05b4c2e10bae60451d1d4644071178ff44a73805e9
+DIST python-engineio-4.1.0.gh.tar.gz 296431 BLAKE2B 5ab267aba4dc6e49d26166b661da5b40961d328efb92dbcb653a405f62956f33b28dbf48cd891d0e74314da998be477f917dd6eabdf154877cd80077e4172c9f SHA512 5dea0ffc24138664216eefd6f917280d6199e4c2661a2e41622bb7f4cf03467d60d555e5c28ba23c35f59ae8b549902d235308242bbc5607ac91fd61580e0c4f
diff --git a/dev-python/python-engineio/python-engineio-4.1.0.ebuild b/dev-python/python-engineio/python-engineio-4.1.0.ebuild
new file mode 100644
index 000000000000..a70d4d391c86
--- /dev/null
+++ b/dev-python/python-engineio/python-engineio-4.1.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of the Engine.IO realtime server."
+HOMEPAGE="
+	https://python-engineio.readthedocs.io/
+	https://github.com/miguelgrinberg/python-engineio/
+	https://pypi.org/project/python-engineio/"
+SRC_URI="
+	https://github.com/miguelgrinberg/python-engineio/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/aiohttp[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/websocket-client[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/eventlet[${PYTHON_USEDEP}]
+		www-servers/tornado[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.8.0.ebuild b/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.8.0.ebuild
index 88a8670f2ba3..80aa5ced0d6c 100644
--- a/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.8.0.ebuild
+++ b/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.8.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/ruamel-dl-tagged-releases/${MY_P}.tar.xz -> ${P}.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 
 RDEPEND="dev-python/namespace-ruamel[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/ruamel-yaml/Manifest b/dev-python/ruamel-yaml/Manifest
index 1dd8386e15e2..ed780b11a105 100644
--- a/dev-python/ruamel-yaml/Manifest
+++ b/dev-python/ruamel-yaml/Manifest
@@ -1,5 +1,3 @@
 DIST ruamel-yaml-0.16.13.tar.xz 178756 BLAKE2B 19ee4713786a33853f42256e5cd3187e9e19b931ebd83a133365de3f080721c5a6f5fb41ff3079473461df47a0ab149981c5e94d08321da8b3c9eb311c226945 SHA512 1366fc0b3b5ea2699ca324636403576134ccc7c725b13c21a7752d1b16c644c93c7f7d82ddc337087d2c02947f95263d7a3fdd162f552ac3a78fa36f1f17b3f1
-DIST ruamel-yaml-0.17.0.tar.xz 177532 BLAKE2B 8935acef9210f61283a659ffeb1137524b374b26b49e48677a49233f30e4abdd709357dcfe6f0e998405fed9143e0848825418e4af60f3d37f10f957d15f8555 SHA512 a6532c6f02f03211f6afe25c051c192c8b791e71cc32a9f6acaf830f7ed0e80531326ba436902870500bea5509cb36bd89f1b4a9a7c919b8069d6bc0eed2c2b8
 DIST ruamel-yaml-0.17.2.tar.xz 177648 BLAKE2B 6cc62131027823ab71033c01f4638d6e36bd642ebbe2d92bd44ef7d501f3bdf6104afe192947d50915f9b1d7bc35972be285b8ee455a3d351fa31c39701fc563 SHA512 0d75f6de1ec9e0e65e65227a8dbe4acd41e79748be12592fae879916437b272673fc810940cdd52ad0cd185b129cfa82c72d3ab6e7020e857fe89aca6329af81
 DIST ruamel-yaml-0.17.4.tar.xz 178028 BLAKE2B 24c9f61cf8e158377ae839f73dcceab8fdbb8071d1a792a37bd96158993602625967805f177719bbe88e917ccaf10ba210b6c01e91bb750f4df6bcc8a4a66450 SHA512 4c3d51ff00ace64e00d5bc8314c8cb6bc193da2a90e2cc9b9ed97510a7035778917c56e10b85cafab50f296f2f46d8817ad1abfa01b0498715f4972d91545dd3
-DIST ruamel.yaml-0.16.12.tar.gz 147355 BLAKE2B 6e91116029dba57b81580f4ce34a066fc49ec2c6167c2bd6ec2ae940b16bc12ba53cbd4c62f9ae3975664917ce990b050e9f15b434f5ff66f9dece5426049c9d SHA512 21be4d956d01164b84233c3d3945a4e56351a8fc59c35a8e71b1276da84aa43b125e3860f9884e95a1f895bc53e0b85b6d3f0f4b03512d629a892d8664e3ecd6
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.16.12-r1.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.16.12-r1.ebuild
deleted file mode 100644
index d225b3ec443a..000000000000
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.16.12-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-MY_PN="${PN//-/.}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="YAML parser/emitter that supports roundtrip comment preservation"
-HOMEPAGE="https://pypi.org/project/ruamel.yaml/ https://sourceforge.net/p/ruamel-yaml"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-
-RDEPEND="dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}"/${MY_P}
-
-python_install() {
-	distutils-r1_python_install --single-version-externally-managed
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.16.13-r1.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.16.13-r1.ebuild
index b3c4e8b74b1e..80f598e556c6 100644
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.16.13-r1.ebuild
+++ b/dev-python/ruamel-yaml/ruamel-yaml-0.16.13-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/ruamel-dl-tagged-releases/${MY_P}.tar.xz -> ${P}.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="test"
 
 RDEPEND="dev-python/namespace-ruamel[${PYTHON_USEDEP}]
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.17.0.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.17.0.ebuild
deleted file mode 100644
index decbe5e1340b..000000000000
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.17.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-MY_PN="${PN//-/.}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="YAML parser/emitter that supports roundtrip comment preservation"
-HOMEPAGE="
-	https://pypi.org/project/ruamel.yaml/
-	https://sourceforge.net/p/ruamel-yaml/"
-# PyPI tarballs do not include tests
-SRC_URI="mirror://sourceforge/ruamel-dl-tagged-releases/${MY_P}.tar.xz -> ${P}.tar.xz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/namespace-ruamel[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/ruamel-std-pathlib[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-# Old PyYAML tests from lib/ require special set-up and are invoked indirectly
-# via test_z_olddata, tell pytest itself to leave the subdir alone.
-python_test() {
-	local deselect=()
-
-	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
-		_test/test_deprecation.py::test_collections_deprecation
-	)
-
-	epytest --ignore _test/lib/ ${deselect[@]/#/--deselect }
-}
-
-python_install() {
-	distutils-r1_python_install --single-version-externally-managed
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/scrypt/Manifest b/dev-python/scrypt/Manifest
index 0d6cd20ea785..2f6ed1652e95 100644
--- a/dev-python/scrypt/Manifest
+++ b/dev-python/scrypt/Manifest
@@ -1 +1,2 @@
 DIST scrypt-0.8.16.tar.gz 54205 BLAKE2B ce4f86f8bacb4f12408604822a32c9f63f96a155469cca1d2aa50cf67fc9e9576432f13ef49694a9d7ce21696aedcef27419fc0d3aad67a87d16c3bf8c0f94c4 SHA512 9498637d1354a84021f2c069a919ff157ff189d1385453397a9c43e522de77af9d628a90d649d50e9243abfc0b96efe4e38b615322d83133137bad94d448ef06
+DIST scrypt-0.8.18.tar.gz 56651 BLAKE2B d0e71e0677ab5f159da829eaf8e794fab9fa9290ff3688e525c4f2e9c60fda532d1c302fe4088bd8e88e06e926ef95d06bad145697e8a13e2662eda7027479b7 SHA512 b033203f65dd63c1e915eeff6232c01f806eb01d3ce18e753b6161ae667555095fe775585dd0d4e15ae228f2d4862860093c1a18d5b810b438d032df9fb24d81
diff --git a/dev-python/scrypt/scrypt-0.8.18.ebuild b/dev-python/scrypt/scrypt-0.8.18.ebuild
new file mode 100644
index 000000000000..cee61a76ceb3
--- /dev/null
+++ b/dev-python/scrypt/scrypt-0.8.18.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Bindings for the scrypt key derivation function library"
+HOMEPAGE="https://github.com/holgern/py-scrypt/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+# no functional changes since 0.8.16, so no point in upgrading
+KEYWORDS=""
+SLOT="0"
+IUSE="libressl"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+"
+DEPEND="${RDEPEND}"
+
+distutils_enable_tests unittest
diff --git a/dev-python/setuptools/setuptools-54.1.1.ebuild b/dev-python/setuptools/setuptools-54.1.1.ebuild
index 379341416047..1f5bff65f716 100644
--- a/dev-python/setuptools/setuptools-54.1.1.ebuild
+++ b/dev-python/setuptools/setuptools-54.1.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/spyder-line-profiler/spyder-line-profiler-0.2.1.ebuild b/dev-python/spyder-line-profiler/spyder-line-profiler-0.2.1.ebuild
index 99bec11d3e14..b65a1e2076d0 100644
--- a/dev-python/spyder-line-profiler/spyder-line-profiler-0.2.1.ebuild
+++ b/dev-python/spyder-line-profiler/spyder-line-profiler-0.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/spyder-memory-profiler/spyder-memory-profiler-0.2.1.ebuild b/dev-python/spyder-memory-profiler/spyder-memory-profiler-0.2.1.ebuild
index fb17ecf32a5a..5d0291d0a1ba 100644
--- a/dev-python/spyder-memory-profiler/spyder-memory-profiler-0.2.1.ebuild
+++ b/dev-python/spyder-memory-profiler/spyder-memory-profiler-0.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/spyder-terminal/spyder-terminal-0.5.0.ebuild b/dev-python/spyder-terminal/spyder-terminal-0.5.0.ebuild
index d619855f9173..f069e703c451 100644
--- a/dev-python/spyder-terminal/spyder-terminal-0.5.0.ebuild
+++ b/dev-python/spyder-terminal/spyder-terminal-0.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/spyder-unittest/spyder-unittest-0.4.1.ebuild b/dev-python/spyder-unittest/spyder-unittest-0.4.1.ebuild
index a2ce91f6fa78..b65fe0d1a4e5 100644
--- a/dev-python/spyder-unittest/spyder-unittest-0.4.1.ebuild
+++ b/dev-python/spyder-unittest/spyder-unittest-0.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/spyder-vim/spyder-vim-0_pre20201026.ebuild b/dev-python/spyder-vim/spyder-vim-0_pre20201026.ebuild
index 8aac3604d83b..9ab2159d393f 100644
--- a/dev-python/spyder-vim/spyder-vim-0_pre20201026.ebuild
+++ b/dev-python/spyder-vim/spyder-vim-0_pre20201026.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index fc62b0bf011d..5c330beb71d4 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -4,3 +4,4 @@ DIST SQLAlchemy-1.4.2.tar.gz 7464092 BLAKE2B dd4cf617a66ed4eba54e41ebaead189409e
 DIST SQLAlchemy-1.4.5.tar.gz 7502502 BLAKE2B d3b07bdf65a31e124d705c22de9ec9d57f5324f61b5ee2e5df13dbcf9e02154983179f87da06bcdc2e19b08375a51a500faa72a67ed7415a51ea266623f70a1b SHA512 1b7e709b0a2c1adaa536c247d411e67abf41b6346fd2592af15d063b7cc52811091890470c2cb553cf8e07e4e1ce31ea46afc82a1266e7e737be4f9bd52bb9f0
 DIST SQLAlchemy-1.4.6.tar.gz 7519545 BLAKE2B ba7c9abc716dc20f5342d1f133d1a1959dff8c804268440215e9181f58cac3d2bae3052c76abf3de2551330af5946cd7f8427acaca9d73ae068444db8cc22c5b SHA512 09914c9cce75f7d973fc55bd79099c8998da343ff727eb1ab5ab3ad23555a7d8386709f9e431c7ad2eadb938dac1d79839073ee554d81bfea4128f77e73dc20a
 DIST SQLAlchemy-1.4.7.tar.gz 7531300 BLAKE2B c0b7288fc909f3402a28bccb84dee916a7bffdb5a3e1cd49ee05ca5c1f113f39302a9534436a558638070b21a75a87b2b10b47d17c6672d1bb908ac37d5e10b5 SHA512 54d9812decb2b0b1611c7c3b08001e1e35904f97c54417bfc3e3ba2ff13b6ccc11f74a34b5a7d77095e0a6d48cb356df9af64b189f4122ab04886eccc2b2e455
+DIST SQLAlchemy-1.4.8.tar.gz 7539106 BLAKE2B 063fc2c5bf8408e216cb52e873131eac60469b17da309743d0fcaa50292bc5799c309ce14301ff4769b1d8d1ce33b2fa543f22b967057bedffce13fad469f343 SHA512 2263683ba659871b55a41917e13b16e823accf0017e28c5225e869c81f5aa1983aeb7425afd15136296be9d1ad021721095b949fb7d869c2cdc50d05a39f6a02
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.8.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.8.ebuild
new file mode 100644
index 000000000000..aa99618e929b
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.8.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 multiprocessing optfeature
+
+MY_PN="SQLAlchemy"
+MY_P="${MY_PN}-${PV/_beta/b}"
+
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="examples +sqlite test"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' python3_7 pypy3)
+"
+# Use pytest-xdist to speed up tests
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# remove optional/partial dep on greenlet, greenlet is not very portable
+	sed -i -e '/greenlet/d' setup.cfg || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# Disable tests hardcoding function call counts specific to Python versions.
+	epytest --ignore test/aaa_profiling \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "MySQL support" dev-python/mysqlclient dev-python/pymysql \
+		dev-python/mysql-connector-python
+	optfeature "mssql support" dev-python/pymssql
+	optfeature "postgresql support" dev-python/psycopg:2
+}
diff --git a/dev-python/tinycss/metadata.xml b/dev-python/tinycss/metadata.xml
index 02ac5b06ce68..cfb92c776dbc 100644
--- a/dev-python/tinycss/metadata.xml
+++ b/dev-python/tinycss/metadata.xml
@@ -10,4 +10,5 @@
   <remote-id type="github">SimonSapin/tinycss</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/tinycss/tinycss-0.4.ebuild b/dev-python/tinycss/tinycss-0.4.ebuild
index 31793e8c92fb..9be7953e1274 100644
--- a/dev-python/tinycss/tinycss-0.4.ebuild
+++ b/dev-python/tinycss/tinycss-0.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 
@@ -15,15 +15,13 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 
 DOCS=( CHANGES README.rst )
-#RESTRICT="test"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs
 
 python_prepare_all() {
 	rm setup.cfg || die
diff --git a/dev-python/txgithub/txgithub-15.0.0-r1.ebuild b/dev-python/txgithub/txgithub-15.0.0-r1.ebuild
index 88574b4c0b77..de471650c538 100644
--- a/dev-python/txgithub/txgithub-15.0.0-r1.ebuild
+++ b/dev-python/txgithub/txgithub-15.0.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 
-inherit eutils distutils-r1
+inherit distutils-r1
 
 DESCRIPTION="GitHub API client implemented using Twisted"
 HOMEPAGE="https://github.com/tomprince/txgithub https://pypi.org/project/txgithub/"
diff --git a/dev-python/wheel/wheel-0.36.2.ebuild b/dev-python/wheel/wheel-0.36.2.ebuild
index df8a0699e65f..2b0f6af87101 100644
--- a/dev-python/wheel/wheel-0.36.2.ebuild
+++ b/dev-python/wheel/wheel-0.36.2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
 
-inherit distutils-r1 eutils
+inherit distutils-r1
 
 DESCRIPTION="A built-package format for Python"
 HOMEPAGE="https://pypi.org/project/wheel/"
diff --git a/dev-python/zope-interface/Manifest b/dev-python/zope-interface/Manifest
index 3771804b5106..6d1d4cad705a 100644
--- a/dev-python/zope-interface/Manifest
+++ b/dev-python/zope-interface/Manifest
@@ -1,2 +1,3 @@
 DIST zope.interface-5.2.0.tar.gz 227058 BLAKE2B d5afcaf56d77431436bc6f2ccf566e835c0908f7037ecd2a93e2b2681c0588b2baeacb0ec50207e59e67f7c4ac3cc76bca657330b48991f22835637985b85ccd SHA512 64688b8a823d63fc78720ee15d59cc54c07a700dc45e46336cb23cd1a0a3eb998284a4d954d3fa08c7f26b35583c0284fb2fcd18f84f3133ce93f7c3ade0a988
 DIST zope.interface-5.3.0.tar.gz 241964 BLAKE2B 4b1ea32f3f08e2d49afa402358760dd575057bc4487ad52686a2aaceee782501c3c1891dda00cbd306abe35e7bfea4cf41a4a340644258cf478a637abd62c103 SHA512 3544c64d64f32e4635031325b38500b8ed5888b03821c5ff2e07c2d88bb50ccb0b6fe24c6a55813bbe05caf2b847be832182e04dcd8e9ff29f1e68c1fda7c680
+DIST zope.interface-5.4.0.tar.gz 249329 BLAKE2B 3a35ce6ff2a9984ed865cfb3bc3371e8069eb416d11bddbc56e27db4d76762fb1b87d295b51258ec006fddcbb38a8752b47a2d7874c0c8a959ca78101eae2750 SHA512 ef15d63397e05ad9fc44b2d5d786b0399b6973bb5f4866fab839ff612756f3157f2099d0f5c0469b574a5c8b5920a7c2a5c6eab8e8f84c24d5c43e816669bffe
diff --git a/dev-python/zope-interface/zope-interface-5.4.0.ebuild b/dev-python/zope-interface/zope-interface-5.4.0.ebuild
new file mode 100644
index 000000000000..3de37efdae2b
--- /dev/null
+++ b/dev-python/zope-interface/zope-interface-5.4.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# pkg_resources namespace
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN=${PN/-/.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Interfaces for Python"
+HOMEPAGE="https://pypi.org/project/zope.interface/ https://github.com/zopefoundation/zope.interface"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	dev-python/namespace-zope[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/zope-event[${PYTHON_USEDEP}]
+		dev-python/zope-testing[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/5.1.0-drop-coverage.patch
+)
+
+distutils_enable_tests setup.py
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
+		append-flags -fno-strict-aliasing
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# remove .pth files since dev-python/namespace-zope handles the ns
+	find "${D}" -name '*.pth' -delete || die
+}