Adding metadata

35 files changed, 402 insertions, 417 deletions

diff --git a/dev-python/cfgv/Manifest b/dev-python/cfgv/Manifest
index 6cba52378ac1..719425bd2526 100644
--- a/dev-python/cfgv/Manifest
+++ b/dev-python/cfgv/Manifest
@@ -1,2 +1 @@
-DIST cfgv-3.2.0.tar.gz 10268 BLAKE2B 26cd22c1ed7b0de48638d2bb0e30a4ac0c3060d5020d04c29ca5c41c1337531d16a1c7de6e66044e90c3b0dbd5f4b15ba6c3dda2ae73953b8d6be3f74825b813 SHA512 6f1a54b505d298a9806a739edffc79feea41638f766ddc25f0712001e5bceb206153e3a957dcf4909fbe125b6e9bd077aba6317d00e632a06ed24f1dfd06c555
 DIST cfgv-3.3.0.tar.gz 10393 BLAKE2B d4cf565884aaab6a81716382ba8e3244e36a3381b771f7e206053fa80500205bd3b70b62b611ce4a7f0cb143a763d51eb10b1e29333b7f06e29cb406f9f7f6b8 SHA512 23a238c76635404b150bbc3bb1eafd8eb521171e69bb3f3fee55a0a24c12d2ee152cc7453a41952d2f41a6cb72575dacf4b990dbd443f69026a770c87a1e081f
diff --git a/dev-python/cfgv/cfgv-3.2.0.ebuild b/dev-python/cfgv/cfgv-3.2.0.ebuild
deleted file mode 100644
index d886e09d601c..000000000000
--- a/dev-python/cfgv/cfgv-3.2.0.ebuild
+++ /dev/null
@@ -1,18 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="Validate configuration and produce human-readable error messages"
-HOMEPAGE="https://github.com/asottile/cfgv"
-SRC_URI="https://github.com/asottile/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-distutils_enable_tests pytest
diff --git a/dev-python/cfgv/cfgv-3.3.0.ebuild b/dev-python/cfgv/cfgv-3.3.0.ebuild
index 04dfe6691f21..9d914e71c484 100644
--- a/dev-python/cfgv/cfgv-3.3.0.ebuild
+++ b/dev-python/cfgv/cfgv-3.3.0.ebuild
@@ -13,6 +13,6 @@ SRC_URI="https://github.com/asottile/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa"
+KEYWORDS="amd64 ~hppa"
 
 distutils_enable_tests pytest
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index c6854c8a8148..f3e4e8c778e9 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -1,3 +1,4 @@
 DIST dask-2021.5.0.tar.gz 3710206 BLAKE2B d02bd280a704cf03fb403c58567be33c414171ef3ee1eed2f788cf2b3026c2aa3806c19a8e9f239c93a0eb8ab2474f14fa80b8e1057ae0db1c0ce4a68f0cedad SHA512 bfc2c870df02f1879907621cb9abdce8bf03d07fea2823acea68b220ed414ee146036b73eb50c92608140ed18566e7a53807dcc1fdf534876920467979908592
 DIST dask-2021.6.0.tar.gz 3717136 BLAKE2B bc524dc4e885588ea92c0b24b6abe917b6a3989f7faa21d4dffa490f2952f4f7e90ce55e28ed97b34e44bf2c41a753fe80f092559999fa42e450b289c4b89933 SHA512 a4a1e86c286e0796f7ed79dd10c5c0f80e40bb246a7c25d45aed5e73a2d6c1da8743bf6b61ca784a8412403aa6e62007c937bbbdd8ffccf7170443454ff5601d
 DIST dask-2021.6.1.tar.gz 3725331 BLAKE2B 7b466507b968dafd2c6f3a3db70c3f557ed877bd489067ff5243794c44a9e77f9b72b4a000eb0865d2096845b3c6005739214bed1215ae053d9d1c313c6bb52c SHA512 c3c032ae8d67994cb924e23787a571ad75ac88ee682542aa486dd76b38ba25c809593e9bb11a716589eeea437aaf8b69a4ecdf676c417fe566d92a2b1a8678b6
+DIST dask-2021.6.2.tar.gz 3725731 BLAKE2B 957cf70c328462c87eb52bb2fe3d471705ab6bbc233badb8d5ba93ade4b7caa05e47399f26f37b69213df16e76fdf8f042a082a0d2d96797bca836311349a6b3 SHA512 2949a0a028d08794936faaeeea3b36c97ac1492288519efa0fd1e6bbb9b5b52b730657b8b342a47ca0183d98e9179836423847670fc12c14be0890daa4b773b4
diff --git a/dev-python/dask/dask-2021.6.2.ebuild b/dev-python/dask/dask-2021.6.2.ebuild
new file mode 100644
index 000000000000..9a86e0660c7e
--- /dev/null
+++ b/dev-python/dask/dask-2021.6.2.ebuild
@@ -0,0 +1,42 @@
+# 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="Task scheduling and blocked algorithms for parallel processing"
+HOMEPAGE="https://dask.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
+	>=dev-python/fsspec-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.15.1[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.25.0[${PYTHON_USEDEP}]
+	>=dev-python/partd-0.3.10[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/toolz-0.8.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/toolz[${PYTHON_USEDEP}]
+	test? (
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/numexpr[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.4[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest -p no:flaky -m "not network"
+}
diff --git a/dev-python/fonttools/metadata.xml b/dev-python/fonttools/metadata.xml
index 34794911ecd0..578619ed5c40 100644
--- a/dev-python/fonttools/metadata.xml
+++ b/dev-python/fonttools/metadata.xml
@@ -10,5 +10,4 @@
   <remote-id type="pypi">fonttools</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
- <stabilize-allarches/>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/fsspec/Manifest b/dev-python/fsspec/Manifest
index 4f23bc45b1e3..418da215814f 100644
--- a/dev-python/fsspec/Manifest
+++ b/dev-python/fsspec/Manifest
@@ -1 +1,2 @@
 DIST filesystem_spec-2021.05.0.tar.gz 292796 BLAKE2B 5d56d860ced1a72c27d2031b7d257a4bcbd52f6b2fed5275fbcbf7088375fde26652f0a003e919ebd3948d5e9833d802304234282ca858a7a2a19bfa11f66aa8 SHA512 7c27a1ad4e21efdcc0f31f91a9929e4c09db7b9421e7bf8d2f485e961f6887a4a5c083f38f8d7b09005a4cf11f55c93cce4617e3dc6c2b241ed20f7847ad711e
+DIST filesystem_spec-2021.06.1.tar.gz 297254 BLAKE2B e360c0780df2ace31a2a7e15f7269f23140ddbc6bd6a1f657cfddbab2b1f285d79a0c88f8d63e406d4a53fd3737f77012eb9837479707a778ab043503ade9d18 SHA512 1d59c2c53b1a4a604ff3762eca8484d7ed60fba98548cc77d7ed014ddf1513cef046ceeec41911cdecd414bdbb4e3c669a3a3f65da08dabf5a70cc2985d06b73
diff --git a/dev-python/fsspec/files/fsspec-2021.06.1-ujson.patch b/dev-python/fsspec/files/fsspec-2021.06.1-ujson.patch
new file mode 100644
index 000000000000..0c76d8ac71df
--- /dev/null
+++ b/dev-python/fsspec/files/fsspec-2021.06.1-ujson.patch
@@ -0,0 +1,32 @@
+From 270423008d401d9f03a31f08c53a7b13fa193573 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 23 Jun 2021 09:23:31 +0200
+Subject: [PATCH] Fix test_unmodel to accept ujson encoding without whitespace
+
+The ujson encoding for test_unmodel data is b'"Conventions":"UGRID-0.9.0"'
+(without a space after ':') that breaks the test for me.  Update
+the test to make the whitespace optional.
+
+That said, I have tried multiple ujson versions, going back to <3,
+and was not able to reproduce the output with space.
+---
+ fsspec/implementations/tests/test_reference.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/fsspec/implementations/tests/test_reference.py b/fsspec/implementations/tests/test_reference.py
+index a1a8fdc..15a32d5 100644
+--- a/fsspec/implementations/tests/test_reference.py
++++ b/fsspec/implementations/tests/test_reference.py
+@@ -104,7 +104,8 @@ jdata = """{
+ 
+ def test_unmodel():
+     refs = _unmodel_hdf5(json.loads(jdata))
+-    assert b'"Conventions": "UGRID-0.9.0"' in refs[".zattrs"]
++    # apparently the output may or may not contain a space after ':'
++    assert b'"Conventions":"UGRID-0.9.0"' in refs[".zattrs"].replace(b' ', b'')
+     assert refs["adcirc_mesh/0"] == ("https://url", 8928, 8932)
+ 
+ 
+-- 
+2.32.0
+
diff --git a/dev-python/fsspec/fsspec-2021.06.1.ebuild b/dev-python/fsspec/fsspec-2021.06.1.ebuild
new file mode 100644
index 000000000000..47fc1d992d23
--- /dev/null
+++ b/dev-python/fsspec/fsspec-2021.06.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2020-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=filesystem_spec-${PV}
+
+DESCRIPTION="A specification that python filesystems should adhere to"
+HOMEPAGE="https://github.com/intake/filesystem_spec/
+	https://pypi.org/project/fsspec/"
+SRC_URI="
+	https://github.com/intake/filesystem_spec/archive/${PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+BDEPEND="
+	dev-python/versioneer[${PYTHON_USEDEP}]
+	test? (
+		dev-python/aiohttp[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${P}-ujson.patch
+)
+
+src_test() {
+	git config --global user.email "you@example.com" || die
+	git config --global user.name "Your Name" || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	# sftp and smb require server started via docker
+	epytest \
+		--deselect fsspec/tests/test_spec.py::test_find \
+		--ignore fsspec/implementations/tests/test_dbfs.py \
+		--ignore fsspec/implementations/tests/test_sftp.py \
+		--ignore fsspec/implementations/tests/test_smb.py
+}
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 08182bd9c901..e10403d58cff 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,3 +1,4 @@
+DIST google-api-python-client-2.10.0.tar.gz 25252980 BLAKE2B 25932dec798518217eb724b3514de6f45e57543703396516f3d1a4599f40cb258893d2b2c7e706ef341a6217459a08ebfdf61e2d16949bf8831aed2f79fa80c0 SHA512 acc6ff1a6cad0d568e3af2c7fa4ac5fc3f908adcda1bc846aebc473cdf9f63b873fdf3182c44c3afe50a1f26a645be21b7b33335e67afb09210c001ba22365ad
 DIST google-api-python-client-2.4.0.tar.gz 24853833 BLAKE2B 4ed2083a9bb8b4f8fe31ab5dbd7875c0c36c972cdb0f71a59565fe4eb23ff1ef0a40794acd7af9646c1ee3904fbab3caaeb2700a3660b66d3069d2bc4f811e76 SHA512 db545850b9d2746e3bcf7b4a2f12b0d4827bd68f44d5627fd80d39bff2ca3303c8d520f72ee17637fe700bc935548706ce885ff0d7fe737ae157668e0314fbc6
 DIST google-api-python-client-2.7.0.tar.gz 25488451 BLAKE2B a8a761944fed3970ae0cf53b2cb926a6670ac37323c39085a5f7fb4f354451292fca4bbb2c34a72d086dfa961b74a72f66319f6bbc2505ef70f5c94aff3f7a0e SHA512 531e919cc9d0cffc49b31d881a6ee3adb2d9cc166813b5884c300e9a3b63b28c9c269a0d1efe47961fa61f79ec5adb8a12e2208b644fd62ed4baa66c56d219ba
 DIST google-api-python-client-2.8.0.tar.gz 25286774 BLAKE2B b21aebda062984b9eb8f2f5c563016f0f8f663883dc8ddb913053ff3df32c652c6a83f924f3e19136e5edec085e12c43cc584bc9898630122c77a219810033bc SHA512 cc3c55438b2f5835b52d17d04a749919c4865991ff78cf95920d0941a55e1493eae502a13f6565cfe1db799ce9950659e8baaa690bada058d711309861c8d07e
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.10.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.10.0.ebuild
new file mode 100644
index 000000000000..65426126077e
--- /dev/null
+++ b/dev-python/google-api-python-client/google-api-python-client-2.10.0.ebuild
@@ -0,0 +1,49 @@
+# 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="Google API Client for Python"
+HOMEPAGE="https://github.com/googleapis/google-api-python-client"
+SRC_URI="https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
+	<dev-python/httplib2-1[${PYTHON_USEDEP}]
+	dev-python/google-api-core[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.16.0[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
+	<dev-python/uritemplate-4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.13.0[${PYTHON_USEDEP}]
+	<dev-python/six-2[${PYTHON_USEDEP}]
+	"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/oauth2client[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests --install pytest
+
+python_test() {
+	local deselect=(
+		# require Internet access (and credentials)
+		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
+		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
+	)
+
+	distutils_install_for_testing
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/keystoneauth/keystoneauth-4.2.1-r1.ebuild b/dev-python/keystoneauth/keystoneauth-4.2.1-r1.ebuild
new file mode 100644
index 000000000000..6e0905e6a885
--- /dev/null
+++ b/dev-python/keystoneauth/keystoneauth-4.2.1-r1.ebuild
@@ -0,0 +1,54 @@
+# 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="This package contains tools for authenticating to an OpenStack-based cloud."
+HOMEPAGE="https://github.com/openstack/keystoneauth"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}1/${PN}1-${PV}.tar.gz"
+S="${WORKDIR}/${PN}1-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+RDEPEND="${CDEPEND}
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/os-service-types-1.2.0[${PYTHON_USEDEP}]"
+BDEPEND="${CDEPEND}
+	test? (
+		>=dev-python/betamax-0.7.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		dev-python/hacking[${PYTHON_USEDEP}]
+		>=dev-python/lxml-4.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oauthlib-0.6.2[${PYTHON_USEDEP}]
+		>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
+		>=dev-python/requests-kerberos-0.8.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# relies on specific test runner name
+	sed -i -e 's:run\.py:unittest_or_fail.py:' \
+		keystoneauth1/tests/unit/test_session.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	eunittest -b
+}
diff --git a/dev-python/keystoneauth/keystoneauth-4.2.1.ebuild b/dev-python/keystoneauth/keystoneauth-4.2.1.ebuild
index b3b16919ab7c..28e118864e0c 100644
--- a/dev-python/keystoneauth/keystoneauth-4.2.1.ebuild
+++ b/dev-python/keystoneauth/keystoneauth-4.2.1.ebuild
@@ -2,9 +2,8 @@
 # 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
 
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit distutils-r1
 
 DESCRIPTION="This package contains tools for authenticating to an OpenStack-based cloud."
diff --git a/dev-python/keystoneauth/metadata.xml b/dev-python/keystoneauth/metadata.xml
index 35b3f17004d8..8440aee603a2 100644
--- a/dev-python/keystoneauth/metadata.xml
+++ b/dev-python/keystoneauth/metadata.xml
@@ -5,6 +5,10 @@
   <email>prometheanfire@gentoo.org</email>
   <name>Matthew Thode</name>
  </maintainer>
+ <maintainer type="project">
+  <email>python@gentoo.org</email>
+  <name>Python</name>
+ </maintainer>
  <upstream>
   <remote-id type="github">openstack/keystoneauth</remote-id>
   <remote-id type="pypi">keystoneauth1</remote-id>
diff --git a/dev-python/mypy/Manifest b/dev-python/mypy/Manifest
index 050ba92c227f..5b9a705cdc60 100644
--- a/dev-python/mypy/Manifest
+++ b/dev-python/mypy/Manifest
@@ -1,3 +1,4 @@
 DIST mypy-0.812.tar.gz 2122474 BLAKE2B 3bfbfe3010798d49bcf00aa1d926ffa8a54be50fb2e88f4ffc3cde3edba80a9b74853de17126394dc1806c07b740b5f8e7775f2fe4b2312e0a85134b446a690b SHA512 ee89f56a7a01214540f9b727f153a075a097b161b7f654d926d1080ae540ec68303629a4fe691fcb53d37c3eb08924bf01d22cdf1c3761b414a3bc40af3363e6
 DIST mypy-0.902.tar.gz 2549241 BLAKE2B ba8bce0434b08c379907f96f22c030048ff8c45f426eb4a6b6951059974bd3f35b5e6bc759b9b6ff0237d43811d01181e58ea2cf919fda3e2649c37825d86134 SHA512 b896d5a614982d60dbeffadf56a5faff3d809c4d2af299fc658a67c09c3f36cab961d8516d38ea682227d9a06613a3aff7bb041ba1346354b81ec1187316d258
+DIST mypy-0.910.tar.gz 2551057 BLAKE2B a3c6939c8f0e2ea19a3a3f91031330df2fb25a93cc3f9239535f15c17eedcca5716cc75c5412a1d345d8572d396c3d7128e38989fd694833cb6aec8366ac4afe SHA512 49060c13da8bf17385b6b1db6efa9ac5771f2bac92d26760c4087cf128de22846b8a062f38e83ecff524e7893f8c9cd0647a2ef89e10387138544436a2840459
 DIST typeshed-add4d92f050fb11d3901c6f0ee579a122d4a7a98.tar.gz 600241 BLAKE2B 2bf91ba7bfa2ed3e2369d70ab76ce152e00f321e79f36ef7c264d477e350579eaade222e8347b4105fb93b847d944ce0aa182466ce636649098a2df69c09ee5d SHA512 8497ee9719e162f84556407296d383e0b7e695cf6cd60bbf7f34c1d7aada3926fd5516ce7ea3863e11b3bcb87f12617733082f020718610e467877872f0b4487
diff --git a/dev-python/mypy/metadata.xml b/dev-python/mypy/metadata.xml
index 6268f080b402..0de15a65a794 100644
--- a/dev-python/mypy/metadata.xml
+++ b/dev-python/mypy/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="person">
-  <email>ikelos@gentoo.org</email>
-  <name>Mike Auty</name>
- </maintainer>
  <maintainer type="project">
   <email>python@gentoo.org</email>
   <name>Python</name>
diff --git a/dev-python/mypy/mypy-0.910.ebuild b/dev-python/mypy/mypy-0.910.ebuild
new file mode 100644
index 000000000000..745d8e0da7fd
--- /dev/null
+++ b/dev-python/mypy/mypy-0.910.ebuild
@@ -0,0 +1,58 @@
+# 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="Optional static typing for Python"
+HOMEPAGE="http://www.mypy-lang.org/"
+TYPESHED_COMMIT="add4d92f050fb11d3901c6f0ee579a122d4a7a98"
+SRC_URI="
+	https://github.com/python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# stubgen collides with this package: https://bugs.gentoo.org/585594
+RDEPEND="
+	!dev-util/stubgen
+	>=dev-python/psutil-4[${PYTHON_USEDEP}]
+	>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]
+	<dev-python/typed-ast-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
+	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
+	<dev-python/mypy_extensions-0.5.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/attrs-18.0[${PYTHON_USEDEP}]
+		>=dev-python/lxml-4.4.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-6.1.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-xdist-1.18[${PYTHON_USEDEP}]
+		>=dev-python/py-1.5.2[${PYTHON_USEDEP}]
+		>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+# this requires packaging a lot of type stubs
+export MYPY_USE_MYPYC=0
+
+python_test() {
+	local deselect=(
+		# TODO
+		mypy/test/teststubtest.py
+	)
+
+	# Some mypy/test/testcmdline.py::PythonCmdlineSuite tests
+	# fail with high COLUMNS values
+	local -x COLUMNS=80
+	epytest ${deselect[@]/#/--deselect } \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
diff --git a/dev-python/os-service-types/os-service-types-1.7.0-r1.ebuild b/dev-python/os-service-types/os-service-types-1.7.0-r1.ebuild
new file mode 100644
index 000000000000..a6d0a8ea393b
--- /dev/null
+++ b/dev-python/os-service-types/os-service-types-1.7.0-r1.ebuild
@@ -0,0 +1,31 @@
+# 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="A library to handle official service types for OpenStack and it's aliases."
+HOMEPAGE="https://github.com/openstack/os-service-types"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+RDEPEND="${CDEPEND}"
+BDEPEND="
+	${CDEPEND}
+	test? (
+		>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
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 1657427b274c..06d62f2b5ce0 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
@@ -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/oslo-utils/oslo-utils-4.6.0.ebuild b/dev-python/oslo-utils/oslo-utils-4.6.0-r1.ebuild
index 6c1bf8544b3b..e919858bef61 100644
--- a/dev-python/oslo-utils/oslo-utils-4.6.0.ebuild
+++ b/dev-python/oslo-utils/oslo-utils-4.6.0-r1.ebuild
@@ -33,11 +33,13 @@ RDEPEND="
 BDEPEND="
 	${CDEPEND}
 	>dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
-	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-	>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
+	)
 "
 
 distutils_enable_tests unittest
diff --git a/dev-python/pyglet/Manifest b/dev-python/pyglet/Manifest
index f770b538be02..7fa937cddf74 100644
--- a/dev-python/pyglet/Manifest
+++ b/dev-python/pyglet/Manifest
@@ -1,2 +1,3 @@
 DIST pyglet-1.5.16.tar.gz 6446875 BLAKE2B bdc40303b096a91924eb1b9c541cea199792ebf36d857f0466df4c5dff4ec2945dbc6e6c4933a293ae5bd5033dbcf49af913f3b0915082f33ea98a7d5f66fde6 SHA512 5cd1c604245c45f4b9d56c6a6290d301f8a925a4988d847df978b0f4431afb46046592f25d73b54cdf99402022a616afb3eb9c579d5ac29160408a74769f7a43
 DIST pyglet-1.5.17.tar.gz 6448500 BLAKE2B c2e27d5525c1e8eb5203b935b6a901283521ed12cf08b1d18297bd2772b83ee4fd721a9aac4fc41b6249b140b36e70d060d3649f4d2eb30f1e6f1f8fd42aa314 SHA512 3bb9594c02894fc58937b9312187b7848843d591fadb8e46553602ebad7c4b2bfd5dc615cc5f5d0cc1f8b59f10afda8e5130a0dee3c2066decb7af3faf114dae
+DIST pyglet-1.5.18.tar.gz 6440818 BLAKE2B cb7832000e0df96cd794f8eff9ba41aac8571542fbc45d1607df3935a7ed53ba8fd46b6bba40f6d5d53adfb2024aad1930cba1889b5d40d342457f7dc06db5d1 SHA512 d6ceddecccb36a90bef38c4a1608e866bb90ebb72eaaff693a2eb34678c7a50c99213a69042c569c22d54cc04a4b11d37ea8da47425958505261ebcf99bd28ce
diff --git a/dev-python/pyglet/pyglet-1.5.18.ebuild b/dev-python/pyglet/pyglet-1.5.18.ebuild
new file mode 100644
index 000000000000..ec477d627d0b
--- /dev/null
+++ b/dev-python/pyglet/pyglet-1.5.18.ebuild
@@ -0,0 +1,62 @@
+# 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 virtualx xdg-utils
+
+DESCRIPTION="Cross-platform windowing and multimedia library for Python"
+HOMEPAGE="http://pyglet.org/"
+SRC_URI="https://github.com/pyglet/pyglet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples image +sound"
+
+BDEPEND="
+	test? (
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/gst-python[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	virtual/glu
+	virtual/opengl
+	image? ( || (
+		dev-python/pillow[${PYTHON_USEDEP}]
+		x11-libs/gtk+:2
+	) )
+	sound? ( || (
+		media-libs/openal
+		media-sound/pulseaudio
+	) )
+"
+#	ffmpeg? ( media-libs/avbin-bin )
+
+DOCS=( DESIGN NOTICE README.md RELEASE_NOTES )
+
+distutils_enable_tests pytest
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	xdg_environment_reset
+
+	# Specify path to avoid running interactive tests
+	# We could add in integration tests, but they're slow
+	epytest tests/unit
+}
+
+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/requestsexceptions/requestsexceptions-1.4.0.ebuild b/dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild
index d7fc8845749a..075c0b2c2891 100644
--- a/dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild
+++ b/dev-python/requestsexceptions/requestsexceptions-1.4.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
@@ -14,7 +14,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 x86"
-IUSE=""
 
 DEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
 RDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 0c26a73a2ad2..e22163866b09 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -1,9 +1,4 @@
 DIST SQLAlchemy-1.3.24.tar.gz 6353598 BLAKE2B 6eb92b20fa3412a1f1398e18e902e3338320973287afa4a37477ec28d47e7422a19c3a60e6290a6da7b23512c0d818a26400958d02097def778c917f098bb3db SHA512 4f5f0a23e80e1cebe541f8748a7e794e8964d986252803b3289a7cea732ad22557e00221775332e2766b6ff16ad5d9069223f441f8880ca6d0c47011f15fee5b
-DIST SQLAlchemy-1.4.11.tar.gz 7551299 BLAKE2B 65f560223f1f1656ec90a2b46b5447e92908cb7a8124f1a16f59ae04e5c22b9c4b7a30cbc0d1c8ebf31d31f544619223bdff0546fcfe6124195c4430bc8167c5 SHA512 28d5da109d754183e7f1887c652c47cd7162afec285a44ed6bc51566dc40d43cdb8cd1794f93f31b2e085488025f04243613d500936c220aaab3aedb75fb6dcd
-DIST SQLAlchemy-1.4.12.tar.gz 7583069 BLAKE2B a3097c53ba1c8e979c3eab712e51da39214710e174a90cdabd5f5588fcb01d2d45436e8019a1026780474e2fde7663495cffa411c58b255e847aa584a38ca26a SHA512 5863e4982c260d39e79db3a8fffd7ca6710b7f6ab0f73f9ddb09860e27d679fe2c92e0eaab9fe6914b38be4390c0eb685adef6624b06874fb43d96027b545659
-DIST SQLAlchemy-1.4.13.tar.gz 7589942 BLAKE2B 08e9fb6112aa71738f27dc4ce86ebe2274dd2513f39ded7211a5617ecd677f37fe31de754a24ecd519b227b141287ad86d0d0337f3d278d4c4ca5b67e2a1a79d SHA512 fb81c71922a768221f6675686fb2696b5e6d1f2e72231611e9afd20b7659193247eef4191841799fb1fe6a51304629efb6d3fba5dc298fdf70f248010bce8bb3
-DIST SQLAlchemy-1.4.14.tar.gz 7599698 BLAKE2B 500a6257829244e1181b8ef5cb39fb87b62ae2d7ca054fedb580b7431b32d15c8f68600b881eb67eb97a73301660ab96793ab12094ae901782ce4eebdc8929db SHA512 2f33ab034467344ffb19aa3934148faaa4a57e4ffa5f97008d814d54149da4e15cfca14d138b9fb656227e25932ca95cf7321209c31c2706405d3916dc2fb9c0
 DIST SQLAlchemy-1.4.15.tar.gz 7621840 BLAKE2B 74299b92e8ae9d6017c961c44281cc43921f8505e9b141c75cc19899f693a2276b2849daef6dbe35f0d62179354740c76adc318b6b37d551679cc8ba3c47681f SHA512 b9a640ccfb7caabb88c4891748699442073db2bea6d1e5a33eb508863616c94ddbf162b3ecd5e502daf20d798d20b8ef5b4b29ed679af9161e117a23862327c2
-DIST SQLAlchemy-1.4.16.tar.gz 7629704 BLAKE2B 46626cb38e3ec2c5b5c203a03da1a613cb5b66f2906edc54c03843b87ce8f12fbacb6fcd8b2b36584c53516de24b8c1bae041489a376472e4d2e6e2a301b707b SHA512 035c740b49356b1226ed79f188d022904d93190e5391edd350e44e63301333efcfc6c47477ce5119fdbebd49aa3e21b2764d3e4dcc6be5948428f1d8cf11c84c
-DIST SQLAlchemy-1.4.17.tar.gz 7630929 BLAKE2B 88b75c930caf674aa6d927336573f0e40fc89ae72735c11479eaa15de56754807b5412409d383857104a3027fcae346e747cc605525fe88c0a0f9d4ff39fcc7a SHA512 ff99a3a9c440fcdc10f6f43905672f72929fff430b3d9583b8e81693ff9d54ad5d9607b8041787074072cdf1ba03b31db9255cca1c50c8a43f275a0905e9f0bd
 DIST SQLAlchemy-1.4.18.tar.gz 7643090 BLAKE2B 8046bb9f9aa459eec95af57e597540552f6cd79ca3c393abf66d7370754e8433d743e739803929aaf0e2788b0c0419c022ddda1517d38da6580f3afeee1bc4d4 SHA512 06110bf727fd6d83404da2e031a27163c06059bf9eae4cc5b79ce047b5bab67b54432890091fa03abd9644156b92569001ae78c48c22799ab3bec220d4bbe1a0
+DIST SQLAlchemy-1.4.19.tar.gz 7675110 BLAKE2B 61afe9e8937cc1eca9a6c10eef03959422a6dc73e562b47c820b01fbeb61099113d1d30e4de0448ae07abc064db190a9a0b9550d4f8c324a73d277c2c9e7958b SHA512 656e5fd2c1e5c5f9979ad3e38b0f927e8756423d5c988ccb5247cde2f8d354b4623cb57af24c7226758878e429514ae828047fad623ee332ae524b714ab3f18f
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.11.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.11.ebuild
deleted file mode 100644
index aa99618e929b..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.11.ebuild
+++ /dev/null
@@ -1,66 +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 )
-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/sqlalchemy/sqlalchemy-1.4.12.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.12.ebuild
deleted file mode 100644
index aa99618e929b..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.12.ebuild
+++ /dev/null
@@ -1,66 +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 )
-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/sqlalchemy/sqlalchemy-1.4.14.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.14.ebuild
deleted file mode 100644
index aa99618e929b..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.14.ebuild
+++ /dev/null
@@ -1,66 +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 )
-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/sqlalchemy/sqlalchemy-1.4.16.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.16.ebuild
deleted file mode 100644
index aa99618e929b..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.16.ebuild
+++ /dev/null
@@ -1,66 +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 )
-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/sqlalchemy/sqlalchemy-1.4.17.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.17.ebuild
deleted file mode 100644
index aa99618e929b..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.17.ebuild
+++ /dev/null
@@ -1,66 +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 )
-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/sqlalchemy/sqlalchemy-1.4.13.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.19.ebuild
index aa99618e929b..cd59127c0d8e 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.13.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.19.ebuild
@@ -24,7 +24,7 @@ IUSE="examples +sqlite test"
 RDEPEND="
 	$(python_gen_cond_dep '
 		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' python3_7 pypy3)
+	' pypy3)
 "
 # Use pytest-xdist to speed up tests
 BDEPEND="
diff --git a/dev-python/vdf/Manifest b/dev-python/vdf/Manifest
index 2ac463c41962..0007d605882a 100644
--- a/dev-python/vdf/Manifest
+++ b/dev-python/vdf/Manifest
@@ -1,2 +1 @@
-DIST vdf-3.3.tar.gz 15799 BLAKE2B 48e12d6456f776ae7bf3a3dfec3bbe49f6089ce57720f4ab7beec7502604da290018c7af75f7bb58b1d8a25dc44daea7e028f70d75f7eecdaa9277e9f75a6fd0 SHA512 10b944ff88313001cdfd416b04f13daa7350aad75d3f790b6562cd3953fb5adebf7a0b54be24d853d68eb7ef2b8b469569ed37b3aafb0a2f4d0c6caa6816335f
 DIST vdf-3.4.tar.gz 17082 BLAKE2B f4f65134d5b1b5e52fcbc438b3bfd9000006659d8198e37e377edfda1c6166df0687ce44caf704feffeaa0d23356fffbfce11d467a093e8eb623ccb39a3da9d0 SHA512 a22668039d32cb1ef4660ea187a3a144a32e55e5b02c4c567b850d059a47beac111f9164c67bbe3e7b67d15117efe7b207882465b2353a65b7e0f0c107e88d5c
diff --git a/dev-python/vdf/files/vdf-3.2-mock_from_stdlib.patch b/dev-python/vdf/files/vdf-3.2-mock_from_stdlib.patch
deleted file mode 100644
index 511e5dd1ddc3..000000000000
--- a/dev-python/vdf/files/vdf-3.2-mock_from_stdlib.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/tests/test_vdf.py
-+++ b/tests/test_vdf.py
-@@ -1,5 +1,5 @@
- import unittest
--import mock
-+import unittest.mock as mock
- import sys
- 
- try:
diff --git a/dev-python/vdf/files/vdf-3.3-collections_abc.patch b/dev-python/vdf/files/vdf-3.3-collections_abc.patch
deleted file mode 100644
index 22c647601688..000000000000
--- a/dev-python/vdf/files/vdf-3.3-collections_abc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/vdf/vdict.py
-+++ b/vdf/vdict.py
-@@ -5,7 +5,7 @@
-     _iter_values = 'values'
-     _range = range
-     _string_type = str
--    import collections as _c
-+    import collections.abc as _c
-     class _kView(_c.KeysView):
-         def __iter__(self):
-             return self._mapping.iterkeys()
diff --git a/dev-python/vdf/vdf-3.3.ebuild b/dev-python/vdf/vdf-3.3.ebuild
deleted file mode 100644
index 10ebd5ab1129..000000000000
--- a/dev-python/vdf/vdf-3.3.ebuild
+++ /dev/null
@@ -1,23 +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
-
-DESCRIPTION="A module for (de)serialization to and from VDF, Valve's key-value text format"
-HOMEPAGE="https://github.com/ValvePython/vdf"
-SRC_URI="https://codeload.github.com/ValvePython/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.2-mock_from_stdlib.patch
-	"${FILESDIR}"/${PN}-3.3-collections_abc.patch
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/vdf/vdf-3.4.ebuild b/dev-python/vdf/vdf-3.4.ebuild
index f2c0600d6560..742780cbbfae 100644
--- a/dev-python/vdf/vdf-3.4.ebuild
+++ b/dev-python/vdf/vdf-3.4.ebuild
@@ -13,6 +13,6 @@ SRC_URI="https://codeload.github.com/ValvePython/${PN}/tar.gz/v${PV} -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 distutils_enable_tests pytest