Adding metadata

46 files changed, 688 insertions, 126 deletions

diff --git a/dev-python/asgiref/asgiref-3.3.4.ebuild b/dev-python/asgiref/asgiref-3.3.4.ebuild
index 0f245b0430a2..07055d8c24ed 100644
--- a/dev-python/asgiref/asgiref-3.3.4.ebuild
+++ b/dev-python/asgiref/asgiref-3.3.4.ebuild
@@ -24,4 +24,9 @@ RDEPEND="
 BDEPEND="
 	test? ( dev-python/pytest-asyncio[${PYTHON_USEDEP}] )"
 
+PATCHES=(
+	# Provided to upstream: https://github.com/django/asgiref/pull/262
+	"${FILESDIR}/${P}-py310-warnings.patch"
+)
+
 distutils_enable_tests pytest
diff --git a/dev-python/asgiref/files/asgiref-3.3.4-py310-warnings.patch b/dev-python/asgiref/files/asgiref-3.3.4-py310-warnings.patch
new file mode 100644
index 000000000000..1cd017ddfbde
--- /dev/null
+++ b/dev-python/asgiref/files/asgiref-3.3.4-py310-warnings.patch
@@ -0,0 +1,235 @@
+From 0c9e989f18b99ea24a1fb3ea2c8a66fd295c2178 Mon Sep 17 00:00:00 2001
+From: Ekaterina Vaartis <vaartis@kotobank.ch>
+Date: Thu, 20 May 2021 19:44:15 +0300
+Subject: [PATCH] Fix deprecation warnings for python 3.10
+
+asyncio.get_event_loop was marked as deprecated, the documnetation
+now refers to asyncio.get_running_loop([1])
+
+asyncio.ensure_future issues a deprecation warning if there is no
+running event loop([2]), so use asyncio.run which creates and destroys the
+loop itself
+
+asyncio.gather issues a warning if run outside of event
+loop (i.e. there is no running event loop)([3]), so wrap it into an
+async def
+
+explicit passing of coroutine objects to asyncio.wait is deprecated
+since 3.8([4]), so wrap them in asyncio.create_task
+
+plus, add 3.10 to tox.ini
+
+[1]: https://docs.python.org/3.10/library/asyncio-eventloop.html#asyncio.get_event_loop
+[2]: https://docs.python.org/3.10/library/asyncio-future.html#asyncio.ensure_future
+[3]: https://docs.python.org/3.10/library/asyncio-task.html#asyncio.gather
+[4]: https://docs.python.org/3.10/library/asyncio-task.html#asyncio.wait
+---
+ asgiref/compatibility.py       | 14 ++++++++++++++
+ asgiref/server.py              |  8 ++++----
+ asgiref/sync.py                | 15 ++++++++++-----
+ tests/test_sync.py             | 19 ++++++++++++++-----
+ tests/test_sync_contextvars.py |  3 ++-
+ tox.ini                        |  2 +-
+ 6 files changed, 45 insertions(+), 16 deletions(-)
+
+diff --git a/asgiref/compatibility.py b/asgiref/compatibility.py
+index eccaee0..614b2e6 100644
+--- a/asgiref/compatibility.py
++++ b/asgiref/compatibility.py
+@@ -1,5 +1,6 @@
+ import asyncio
+ import inspect
++import sys
+ 
+ 
+ def is_double_callable(application):
+@@ -45,3 +46,16 @@ def guarantee_single_callable(application):
+     if is_double_callable(application):
+         application = double_to_single_callable(application)
+     return application
++
++
++if sys.version_info >= (3, 7):
++    # these were introduced in 3.7
++    get_running_loop = asyncio.get_running_loop
++    run_future = asyncio.run
++    create_task = asyncio.create_task
++else:
++    # marked as deprecated in 3.10, did not exist before 3.7
++    get_running_loop = asyncio.get_event_loop
++    run_future = asyncio.ensure_future
++    # does nothing, this is fine for <3.7
++    create_task = lambda task: task
+diff --git a/asgiref/server.py b/asgiref/server.py
+index f975f78..fb1c394 100644
+--- a/asgiref/server.py
++++ b/asgiref/server.py
+@@ -3,7 +3,7 @@ import logging
+ import time
+ import traceback
+ 
+-from .compatibility import guarantee_single_callable
++from .compatibility import get_running_loop, guarantee_single_callable, run_future
+ 
+ logger = logging.getLogger(__name__)
+ 
+@@ -56,7 +56,7 @@ class StatelessServer:
+         """
+         Runs the asyncio event loop with our handler loop.
+         """
+-        event_loop = asyncio.get_event_loop()
++        event_loop = get_running_loop()
+         asyncio.ensure_future(self.application_checker())
+         try:
+             event_loop.run_until_complete(self.handle())
+@@ -88,12 +88,12 @@ class StatelessServer:
+         input_queue = asyncio.Queue()
+         application_instance = guarantee_single_callable(self.application)
+         # Run it, and stash the future for later checking
+-        future = asyncio.ensure_future(
++        future = run_future(
+             application_instance(
+                 scope=scope,
+                 receive=input_queue.get,
+                 send=lambda message: self.application_send(scope, message),
+-            )
++            ),
+         )
+         self.application_instances[scope_id] = {
+             "input_queue": input_queue,
+diff --git a/asgiref/sync.py b/asgiref/sync.py
+index 6b87c7e..9476e66 100644
+--- a/asgiref/sync.py
++++ b/asgiref/sync.py
+@@ -9,6 +9,7 @@ import weakref
+ from concurrent.futures import Future, ThreadPoolExecutor
+ from typing import Any, Callable, Dict, Optional, Union
+ 
++from .compatibility import get_running_loop
+ from .current_thread_executor import CurrentThreadExecutor
+ from .local import Local
+ 
+@@ -132,7 +133,7 @@ class AsyncToSync:
+             self.main_event_loop = None
+         else:
+             try:
+-                self.main_event_loop = asyncio.get_event_loop()
++                self.main_event_loop = get_running_loop()
+             except RuntimeError:
+                 # There's no event loop in this thread. Look for the threadlocal if
+                 # we're inside SyncToAsync
+@@ -151,7 +152,7 @@ class AsyncToSync:
+     def __call__(self, *args, **kwargs):
+         # You can't call AsyncToSync from a thread with a running event loop
+         try:
+-            event_loop = asyncio.get_event_loop()
++            event_loop = get_running_loop()
+         except RuntimeError:
+             pass
+         else:
+@@ -238,7 +239,11 @@ class AsyncToSync:
+                     tasks = asyncio.Task.all_tasks(loop)
+                 for task in tasks:
+                     task.cancel()
+-                loop.run_until_complete(asyncio.gather(*tasks, return_exceptions=True))
++
++                async def gather():
++                    await asyncio.gather(*tasks, return_exceptions=True)
++
++                loop.run_until_complete(gather())
+                 for task in tasks:
+                     if task.cancelled():
+                         continue
+@@ -320,7 +325,7 @@ class SyncToAsync:
+ 
+     # If they've set ASGI_THREADS, update the default asyncio executor for now
+     if "ASGI_THREADS" in os.environ:
+-        loop = asyncio.get_event_loop()
++        loop = get_running_loop()
+         loop.set_default_executor(
+             ThreadPoolExecutor(max_workers=int(os.environ["ASGI_THREADS"]))
+         )
+@@ -370,7 +375,7 @@ class SyncToAsync:
+             pass
+ 
+     async def __call__(self, *args, **kwargs):
+-        loop = asyncio.get_event_loop()
++        loop = get_running_loop()
+ 
+         # Work out what thread to run the code in
+         if self._thread_sensitive:
+diff --git a/tests/test_sync.py b/tests/test_sync.py
+index cf0e0c5..8ed76a7 100644
+--- a/tests/test_sync.py
++++ b/tests/test_sync.py
+@@ -9,6 +9,7 @@ from unittest import TestCase
+ 
+ import pytest
+ 
++from asgiref.compatibility import create_task, get_running_loop
+ from asgiref.sync import ThreadSensitiveContext, async_to_sync, sync_to_async
+ 
+ 
+@@ -33,12 +34,17 @@ async def test_sync_to_async():
+     assert result == 42
+     assert end - start >= 1
+     # Set workers to 1, call it twice and make sure that works right
+-    loop = asyncio.get_event_loop()
+-    old_executor = loop._default_executor
++    loop = get_running_loop()
++    old_executor = loop._default_executor or ThreadPoolExecutor()
+     loop.set_default_executor(ThreadPoolExecutor(max_workers=1))
+     try:
+         start = time.monotonic()
+-        await asyncio.wait([async_function(), async_function()])
++        await asyncio.wait(
++            [
++                create_task(async_function()),
++                create_task(async_function()),
++            ]
++        )
+         end = time.monotonic()
+         # It should take at least 2 seconds as there's only one worker.
+         assert end - start >= 2
+@@ -428,7 +434,7 @@ async def test_thread_sensitive_outside_async():
+         result["thread"] = threading.current_thread()
+ 
+     # Run it (in supposed parallel!)
+-    await asyncio.wait([outer(result_1), inner(result_2)])
++    await asyncio.wait([create_task(outer(result_1)), create_task(inner(result_2))])
+ 
+     # They should not have run in the main thread, but in the same thread
+     assert result_1["thread"] != threading.current_thread()
+@@ -449,7 +455,10 @@ async def test_thread_sensitive_with_context_matches():
+         async with ThreadSensitiveContext():
+             # Run it (in supposed parallel!)
+             await asyncio.wait(
+-                [store_thread_async(result_1), store_thread_async(result_2)]
++                [
++                    create_task(store_thread_async(result_1)),
++                    create_task(store_thread_async(result_2)),
++                ]
+             )
+ 
+     await fn()
+diff --git a/tests/test_sync_contextvars.py b/tests/test_sync_contextvars.py
+index b1027aa..9665bf9 100644
+--- a/tests/test_sync_contextvars.py
++++ b/tests/test_sync_contextvars.py
+@@ -4,6 +4,7 @@ import time
+ 
+ import pytest
+ 
++from asgiref.compatibility import create_task
+ from asgiref.sync import ThreadSensitiveContext, async_to_sync, sync_to_async
+ 
+ contextvars = pytest.importorskip("contextvars")
+@@ -25,7 +26,7 @@ async def test_thread_sensitive_with_context_different():
+             await store_thread(result)
+ 
+     # Run it (in true parallel!)
+-    await asyncio.wait([fn(result_1), fn(result_2)])
++    await asyncio.wait([create_task(fn(result_1)), create_task(fn(result_2))])
+ 
+     # They should not have run in the main thread, and on different threads
+     assert result_1["thread"] != threading.current_thread()
diff --git a/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.0.ebuild b/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.0.ebuild
index 7925abe82f1f..68f63ece4c66 100644
--- a/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.0.ebuild
+++ b/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.0.ebuild
@@ -16,6 +16,6 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 
 BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
diff --git a/dev-python/dictdiffer/Manifest b/dev-python/dictdiffer/Manifest
new file mode 100644
index 000000000000..1b275b52ba2f
--- /dev/null
+++ b/dev-python/dictdiffer/Manifest
@@ -0,0 +1 @@
+DIST dictdiffer-0.8.1.tar.gz 28555 BLAKE2B 0a6d330134c368e11e07b23d7fe592e72b64b02ede99eb2d52c2d7452b4d2505e7e3afa75ba76c30cbbd663d9cc4c073d8f236200fdfa2866c8beadd097d63b7 SHA512 e221bb0e25a35380519bf775a63fc0d692112dab15a46c8878ef2c9a6780932c8550a4486c4eab7803619a79c2f794a590a5c9ae0fbbccac04b5b11feaf38bbb
diff --git a/dev-python/dictdiffer/dictdiffer-0.8.1.ebuild b/dev-python/dictdiffer/dictdiffer-0.8.1.ebuild
new file mode 100644
index 000000000000..6c3795474229
--- /dev/null
+++ b/dev-python/dictdiffer/dictdiffer-0.8.1.ebuild
@@ -0,0 +1,45 @@
+# 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="Dictdiffer is a library that helps you to diff and patch dictionaries"
+HOMEPAGE="
+	https://github.com/inveniosoftware/dictdiffer/
+	https://pypi.org/project/dictdiffer/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+SLOT="0"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/isort[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+# Requires self to be already installed
+#distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+
+python_prepare_all() {
+	# remove dep on pytest-runner
+	sed -i -e '/pytest-runner/d' setup.py || die
+
+	# remove dep on pytest-pep8 and pytest-cov
+	sed -i -e '/addopts/d' pytest.ini || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/dictdiffer/metadata.xml b/dev-python/dictdiffer/metadata.xml
new file mode 100644
index 000000000000..67022595fb07
--- /dev/null
+++ b/dev-python/dictdiffer/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>andrewammerlaan@gentoo.org</email>
+  <name>Andrew Ammerlaan</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">inveniosoftware/dictdiffer</remote-id>
+  <remote-id type="pypi">dictdiffer</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/flask-login/flask-login-0.5.0.ebuild b/dev-python/flask-login/flask-login-0.5.0.ebuild
index 46b922e13db0..5e0ab2c0fc8e 100644
--- a/dev-python/flask-login/flask-login-0.5.0.ebuild
+++ b/dev-python/flask-login/flask-login-0.5.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit distutils-r1
 
 DESCRIPTION="Login session support for Flask"
diff --git a/dev-python/flask/flask-2.0.0.ebuild b/dev-python/flask/flask-2.0.0-r1.ebuild
index b0d77840ee0e..c54131348f29 100644
--- a/dev-python/flask/flask-2.0.0.ebuild
+++ b/dev-python/flask/flask-2.0.0-r1.ebuild
@@ -24,12 +24,15 @@ SLOT="0"
 IUSE="examples"
 
 RDEPEND="
-	>=dev-python/asgiref-3.2[${PYTHON_USEDEP}]
 	>=dev-python/click-7.1.2[${PYTHON_USEDEP}]
 	dev-python/blinker[${PYTHON_USEDEP}]
 	>=dev-python/itsdangerous-2.0[${PYTHON_USEDEP}]
 	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
 	>=dev-python/werkzeug-2.0[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		>=dev-python/asgiref-3.2[${PYTHON_USEDEP}]
+	)"
 
 distutils_enable_sphinx docs
 distutils_enable_tests pytest
diff --git a/dev-python/flask/flask-9999.ebuild b/dev-python/flask/flask-9999.ebuild
index cf44f9a04ed5..c54131348f29 100644
--- a/dev-python/flask/flask-9999.ebuild
+++ b/dev-python/flask/flask-9999.ebuild
@@ -4,7 +4,6 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
 inherit distutils-r1
 
 DESCRIPTION="A microframework based on Werkzeug, Jinja2 and good intentions"
@@ -16,33 +15,33 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
+IUSE="examples"
 
-RDEPEND="dev-python/click[${PYTHON_USEDEP}]
+RDEPEND="
+	>=dev-python/click-7.1.2[${PYTHON_USEDEP}]
 	dev-python/blinker[${PYTHON_USEDEP}]
-	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
-	>=dev-python/werkzeug-0.15[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+	>=dev-python/itsdangerous-2.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
+	>=dev-python/werkzeug-2.0[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		>=dev-python/asgiref-3.2[${PYTHON_USEDEP}]
+	)"
 
 distutils_enable_sphinx docs
+distutils_enable_tests pytest
 
 python_test() {
-	PYTHONPATH=${S}/examples/flaskr:${S}/examples/minitwit${PYTHONPATH:+:${PYTHONPATH}} \
-		pytest -vv -p no:httpbin || die "Testing failed with ${EPYTHON}"
+	epytest -p no:httpbin
 }
 
 python_install_all() {
 	use examples && dodoc -r examples
-
 	distutils-r1_python_install_all
 }
diff --git a/dev-python/httpbin/httpbin-0.7.0-r2.ebuild b/dev-python/httpbin/httpbin-0.7.0-r2.ebuild
index 235f59a0c1d7..034fddeefcda 100644
--- a/dev-python/httpbin/httpbin-0.7.0-r2.ebuild
+++ b/dev-python/httpbin/httpbin-0.7.0-r2.ebuild
@@ -36,3 +36,14 @@ PATCHES=(
 )
 
 distutils_enable_tests unittest
+
+src_prepare() {
+	# a new version of flask or whatever converts relative redirects
+	# to absolute; this package is dead anyway, so just skip
+	# the relevant tests
+	sed -e 's:test_redirect:_&:' \
+		-e 's:test_relative:_&:' \
+		-i test_httpbin.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/netifaces/netifaces-0.10.9.ebuild b/dev-python/netifaces/netifaces-0.10.9.ebuild
index 09c1c2e3a09a..1d3fd12fe09e 100644
--- a/dev-python/netifaces/netifaces-0.10.9.ebuild
+++ b/dev-python/netifaces/netifaces-0.10.9.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/pytest-datadir/metadata.xml b/dev-python/pytest-datadir/metadata.xml
index 1f90b05afba7..82b379c0a741 100644
--- a/dev-python/pytest-datadir/metadata.xml
+++ b/dev-python/pytest-datadir/metadata.xml
@@ -9,4 +9,5 @@
   <remote-id type="pypi">pytest-datadir</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/pytest-datadir/pytest-datadir-1.3.1.ebuild b/dev-python/pytest-datadir/pytest-datadir-1.3.1.ebuild
index 4a2bbba67c3f..af861b6ecbab 100644
--- a/dev-python/pytest-datadir/pytest-datadir-1.3.1.ebuild
+++ b/dev-python/pytest-datadir/pytest-datadir-1.3.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/pytest-describe/metadata.xml b/dev-python/pytest-describe/metadata.xml
index cc68a3eaac15..81e93948de60 100644
--- a/dev-python/pytest-describe/metadata.xml
+++ b/dev-python/pytest-describe/metadata.xml
@@ -10,4 +10,5 @@
   <remote-id type="github">pytest-dev/pytest-describe</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/pytest-describe/pytest-describe-1.0.0.ebuild b/dev-python/pytest-describe/pytest-describe-1.0.0.ebuild
index 317eaca04461..3d45a704827b 100644
--- a/dev-python/pytest-describe/pytest-describe-1.0.0.ebuild
+++ b/dev-python/pytest-describe/pytest-describe-1.0.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"
@@ -15,16 +15,13 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-python/pytest-2.6.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? ( ${RDEPEND} )"
+
+distutils_enable_tests pytest
 
 python_test() {
 	# We need to disable some plugins because tests don't like unexpected
 	# output
-	PYTEST_ADDOPTS="-p no:flaky -p no:capturelog" pytest -vv ||
-		die "Tests failed under ${EPYTHON}"
+	PYTEST_ADDOPTS="-p no:flaky -p no:capturelog" epytest
 }
diff --git a/dev-python/pytest-httpbin/pytest-httpbin-1.0.0-r1.ebuild b/dev-python/pytest-httpbin/pytest-httpbin-1.0.0-r1.ebuild
index 31f5ab23db68..ce7721b670a3 100644
--- a/dev-python/pytest-httpbin/pytest-httpbin-1.0.0-r1.ebuild
+++ b/dev-python/pytest-httpbin/pytest-httpbin-1.0.0-r1.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/pytest-runner/Manifest b/dev-python/pytest-runner/Manifest
index 82cb74eda4e2..d6d0a0c227d0 100644
--- a/dev-python/pytest-runner/Manifest
+++ b/dev-python/pytest-runner/Manifest
@@ -1,2 +1,2 @@
-DIST pytest-runner-5.2.tar.gz 15534 BLAKE2B 0bcbd5991808aaa4b85b9071ce142e03287683e919687fa76f5b7929ad07dca6ae6edaf7ad30a1bc1ba0163f43505ec18ab2cd5e0462399b8252c8ca761d7b29 SHA512 5fc62a4e681cfa0ef25dc815ccbbfe1a7ca0e9e7783c2ba2db0da7d2539f11c08d6c3fad2ab3dfe7f0d50fe7bfb41127b11ec9af67ef8e32361655bc910c8245
 DIST pytest-runner-5.3.0.tar.gz 20115 BLAKE2B b69c004d42de45f8f7ce814b2049c449afdc7a619fc57ecf6696561f0e34553f0235264e459cdbb3fb91e097d793d861e6a614070cdee88a38f04ba4f40265fd SHA512 35ead39da1e0280fb676afc4c4b9b2792ba63a8bfd4dfcacaf33d14537eb03ca7c3432ccc39cbe95a7e7af68b0c2145cb945dc396508c3a3e696f06dafba148d
+DIST pytest-runner-5.3.1.tar.gz 16262 BLAKE2B 2531bec32afb29a63253289f30880a7f6e74f0dc8626518c17326b74615697a8f7ef3075077a5da61c235e71ffed7aca9bdd64e3722d9381ecbdc66bc4fcbeed SHA512 7104ea8d714cc48fd69cbaedab5e71553889d1bc58b61bbb0d80a1de1cd9002eca2e05d6bc726c984ed4e4c4a276a757153164058295d445e458d763a888bcb6
diff --git a/dev-python/pytest-runner/pytest-runner-5.2.ebuild b/dev-python/pytest-runner/pytest-runner-5.3.1.ebuild
index 2f5dbd468bf2..524c158badca 100644
--- a/dev-python/pytest-runner/pytest-runner-5.2.ebuild
+++ b/dev-python/pytest-runner/pytest-runner-5.3.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 2020-2021 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
-EAPI="7"
+EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit distutils-r1
 
 DESCRIPTION="Adds support for tests during installation of setup.py files"
 HOMEPAGE="https://pypi.org/project/pytest-runner/ https://github.com/pytest-dev/pytest-runner"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+SRC_URI="https://files.pythonhosted.org/packages/2a/04/c3223812b3427ffa95110c5781eae7fe8bc3e9e1fe4e2328bee17b9e5820/${P}.tar.gz"
 
 LICENSE="MIT"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
diff --git a/dev-python/python-mpv/Manifest b/dev-python/python-mpv/Manifest
new file mode 100644
index 000000000000..6a8e3e885d64
--- /dev/null
+++ b/dev-python/python-mpv/Manifest
@@ -0,0 +1 @@
+DIST python-mpv-0.5.2.tar.gz 207755 BLAKE2B 3222a54db145a66ae8b992f1c4e8243c50099573586fd8be9a2d88ff360898bf9b72905c22c8d056178b7917f093a494dce9138f3f8bb5782152dc38b71b1dad SHA512 cd542b0866d6c75395f1ca00bb6df3981998dd801dcee97b15e080fe66e94270f15daa674f663aa6974dcf6aa425d6e17f8476031badeec035727b2b690816f3
diff --git a/dev-python/python-mpv/metadata.xml b/dev-python/python-mpv/metadata.xml
new file mode 100644
index 000000000000..80fc3e97d0d7
--- /dev/null
+++ b/dev-python/python-mpv/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+  <email>andrewammerlaan@gentoo.org</email>
+  <name>Andrew Ammerlaan</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/python-mpv/python-mpv-0.5.2.ebuild b/dev-python/python-mpv/python-mpv-0.5.2.ebuild
new file mode 100644
index 000000000000..04d9f0eabc92
--- /dev/null
+++ b/dev-python/python-mpv/python-mpv-0.5.2.ebuild
@@ -0,0 +1,29 @@
+# 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
+
+DESCRIPTION="Python interface to the mpv media player"
+HOMEPAGE="https://github.com/jaseg/python-mpv"
+SRC_URI="https://github.com/jaseg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	media-video/mpv[libmpv]
+	dev-python/pillow[${PYTHON_USEDEP}]
+"
+
+BDEPEND="test? ( dev-python/xvfbwrapper[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+python_test() {
+	virtx pytest -vv
+}
diff --git a/dev-python/python-vlc/Manifest b/dev-python/python-vlc/Manifest
new file mode 100644
index 000000000000..539fd9789f5e
--- /dev/null
+++ b/dev-python/python-vlc/Manifest
@@ -0,0 +1 @@
+DIST python-vlc-3.0.12118.tar.gz 148685 BLAKE2B 356963caea1a14fdc9d5ba814fc442fd8d93fe327ebea7fd51ede52d29aaf7b72af3e9d6de9a7e1372515694738fbeda49c698793fecd80a47ab5f51b01f3d08 SHA512 d84e373b77b763c169fa4c2ffcdec979fca44cc40e873865b6a55d79481f2b01711fee48f8ab7ca2506ed73a72b970b6fd410f121c24120640ddc0ef5efbd05b
diff --git a/dev-python/python-vlc/metadata.xml b/dev-python/python-vlc/metadata.xml
new file mode 100644
index 000000000000..80fc3e97d0d7
--- /dev/null
+++ b/dev-python/python-vlc/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+  <email>andrewammerlaan@gentoo.org</email>
+  <name>Andrew Ammerlaan</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/python-vlc/python-vlc-3.0.12118.ebuild b/dev-python/python-vlc/python-vlc-3.0.12118.ebuild
new file mode 100644
index 000000000000..9e72a92c7c18
--- /dev/null
+++ b/dev-python/python-vlc/python-vlc-3.0.12118.ebuild
@@ -0,0 +1,21 @@
+# 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 ctypes-based bindings for libvlc"
+HOMEPAGE="https://github.com/oaubert/python-vlc
+	https://wiki.videolan.org/Python_bindings/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	media-video/vlc
+"
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index 5b3f6ed93d8f..aba84b2ac9cb 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -1,3 +1,2 @@
 DIST pfbfer-20070710.zip 677333 BLAKE2B 100214476a361a5e5d1f3da0999591345f6e3a3f8c6bc3f6a3e9eca734190c6259758a43302c6e41254d33491fe535eb7d5dd07aa9727c912424bebc31fc18df SHA512 6fd4a5d955464b10d13a7b748703450c1fe120d5ed09e8cfa1b4dfa9c183c59fe001df29433af551796b0df62544b7ddc364f9bb1bdcc2cd300434340ffcc4f2
-DIST reportlab-3.5.66.tar.gz 2911372 BLAKE2B 58bc718157066a82eece18141e08547b8360dd653d2365fdbe1708fee2f1f8dffeced60500b4e866c31947fae00b78ab9853983563fb89e5b34827173c71a534 SHA512 81fac9fd751a451bd5bf6c91efcf9e250ec1c028587c9ed76129d7fd20c4efa17ea0ae45f08dd43a33adf6f4a2c5338a557e869b85d0b6405626720b0e9221a8
 DIST reportlab-3.5.67.tar.gz 2911726 BLAKE2B 8dbd3bb54c2c651616c3b6be905ac7b43b3a8f30f630d2f9b91882416cb4513751affa507870fdd801b5aa53480498ecc9a5fe3902ab38d72288b6f48ce892e9 SHA512 5a0ec58f0ee925079f3756bac309bd5aaf159118a4ed7ec6467721ead23e5db37839014bb49f1804a0dee4532ce21f9c78adec99ec61a4aeffd957184d489a6c
diff --git a/dev-python/reportlab/reportlab-3.5.66.ebuild b/dev-python/reportlab/reportlab-3.5.66.ebuild
deleted file mode 100644
index d74b7879ed8c..000000000000
--- a/dev-python/reportlab/reportlab-3.5.66.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} )
-inherit distutils-r1
-
-DESCRIPTION="Tools for generating printable PDF documents from any data source"
-HOMEPAGE="
-	https://www.reportlab.com/
-	https://pypi.org/project/reportlab/"
-SRC_URI="
-	mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
-	https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	media-libs/freetype
-	media-libs/libart_lgpl
-	sys-libs/zlib:="
-RDEPEND="
-	${DEPEND}
-	dev-python/pillow[tiff,truetype,jpeg(+),${PYTHON_USEDEP}]"
-BDEPEND="
-	app-arch/unzip"
-
-distutils_enable_sphinx docs/source
-distutils_enable_tests unittest
-
-PATCHES=(
-	# bug 738312, remove -L/usr/lib from link line
-	"${FILESDIR}"/${PN}-3.5.48-usr-lib-LLD.patch
-)
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${P}/src/reportlab/fonts || die
-	unpack pfbfer-20070710.zip
-}
-
-python_prepare_all() {
-	# tests requiring Internet access
-	sed -i -e 's:test0:_&:' \
-		tests/test_platypus_general.py \
-		tests/test_platypus_images.py || die
-	sed -i -e 's:test9:_&:' tests/test_lib_utils.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_configure() {
-	mydistutilsargs=(
-		--no-download-t1-files
-		--use-system-libart
-	)
-}
-
-python_test() {
-	pushd tests >/dev/null || die
-	"${EPYTHON}" runAll.py -v || die "Testing failed with ${EPYTHON}"
-	popd >/dev/null || die
-}
diff --git a/dev-python/reportlab/reportlab-3.5.67.ebuild b/dev-python/reportlab/reportlab-3.5.67.ebuild
index 23cd4265ebb4..d74b7879ed8c 100644
--- a/dev-python/reportlab/reportlab-3.5.67.ebuild
+++ b/dev-python/reportlab/reportlab-3.5.67.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	media-libs/freetype
diff --git a/dev-python/requests/requests-2.25.1-r2.ebuild b/dev-python/requests/requests-2.25.1-r2.ebuild
index 7eb67b9fa555..c9a7a5046c81 100644
--- a/dev-python/requests/requests-2.25.1-r2.ebuild
+++ b/dev-python/requests/requests-2.25.1-r2.ebuild
@@ -54,6 +54,8 @@ python_test() {
 		tests/test_requests.py::TestRequests::test_https_warnings
 		tests/test_requests.py::TestTimeout::test_connect_timeout
 		tests/test_requests.py::TestTimeout::test_total_timeout_connect
+		# TODO: openssl?
+		tests/test_requests.py::TestRequests::test_pyopenssl_redirect
 	)
 
 	epytest ${deselect[@]/#/--deselect }
diff --git a/dev-python/semantic_version/semantic_version-2.8.5.ebuild b/dev-python/semantic_version/semantic_version-2.8.5.ebuild
index 5d19d836b1f5..e605a79edc9c 100644
--- a/dev-python/semantic_version/semantic_version-2.8.5.ebuild
+++ b/dev-python/semantic_version/semantic_version-2.8.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit distutils-r1
 
 DESCRIPTION="Python library providing a few tools handling SemVer in Python"
@@ -18,3 +18,7 @@ KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
 distutils_enable_sphinx docs \
 	dev-python/sphinx_rtd_theme
 distutils_enable_tests pytest
+
+python_test() {
+	epytest -p no:django
+}
diff --git a/dev-python/sphinx-autodoc-typehints/Manifest b/dev-python/sphinx-autodoc-typehints/Manifest
new file mode 100644
index 000000000000..c3b115698f0f
--- /dev/null
+++ b/dev-python/sphinx-autodoc-typehints/Manifest
@@ -0,0 +1 @@
+DIST sphinx-autodoc-typehints-1.12.0.tar.gz 19494 BLAKE2B beacc4f8ab453612dfd5264f1c65fd6bdd957269a28ee5b71b762d0baf5a3d4be58398b32d4263f996648281c1139f47a7564e8fc6444a94095f6a970b4cc27a SHA512 92fa340495a48111fa3d600d8c46d83214505ac2a5c71cb1303e846ac439f1e0ff14f8ce8dfd5ffdb6a62a9fa15dde8a5227f946840d9377ad5f7fde25894b75
diff --git a/dev-python/sphinx-autodoc-typehints/metadata.xml b/dev-python/sphinx-autodoc-typehints/metadata.xml
new file mode 100644
index 000000000000..148c7679f69b
--- /dev/null
+++ b/dev-python/sphinx-autodoc-typehints/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+  <email>andrewammerlaan@gentoo.org</email>
+  <name>Andrew Ammerlaan</name>
+ </maintainer>
+ <longdescription lang="en">
+This extension allows you to use Python 3 annotations for documenting acceptable argument types and return value types of functions. This allows you to use type hints in a very natural fashion
+  </longdescription>
+ <upstream>
+  <remote-id type="github">agronholm/sphinx-autodoc-typehints</remote-id>
+  <remote-id type="pypi">sphinx-autodoc-typehints</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.12.0.ebuild b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.12.0.ebuild
new file mode 100644
index 000000000000..360c883e9a69
--- /dev/null
+++ b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.12.0.ebuild
@@ -0,0 +1,43 @@
+# 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="Type hints support for the Sphinx autodoc extension "
+HOMEPAGE="
+	https://github.com/agronholm/sphinx-autodoc-typehints/
+	https://pypi.org/project/sphinx-autodoc-typehints/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+SLOT="0"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/sphobjinv[${PYTHON_USEDEP}]
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	)
+"
+
+# https://github.com/agronholm/sphinx-autodoc-typehints/issues/176
+RDEPEND="<dev-python/sphinx-4[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# why on earth would this have to connect to the internet
+	sed -i \
+		-e 's:test_parse_annotation:_&:' \
+		-e 's:test_format_annotation:_&:' \
+		-e 's:test_format_annotation_both_libs:_&:' \
+		tests/test_sphinx_autodoc_typehints.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/sphobjinv/Manifest b/dev-python/sphobjinv/Manifest
new file mode 100644
index 000000000000..6fa2f2762a66
--- /dev/null
+++ b/dev-python/sphobjinv/Manifest
@@ -0,0 +1 @@
+DIST sphobjinv-2.1.tar.gz 1144017 BLAKE2B 71878e1bac5202ab74298b56cd6172236ea524050323e0d6b8bbc0c89f1937d75f10d40b4071cfbe8c9031641e9a0ecb283da908c40840a61c12a7c892438241 SHA512 cde77d73b09b72358b0ac5b0d8f1a748e78dce6664d1b849ba68f5ff70dc43cbcff4581374d0151be29c4d97efe2920c5c00ff68918371243be158031e9554fa
diff --git a/dev-python/sphobjinv/metadata.xml b/dev-python/sphobjinv/metadata.xml
new file mode 100644
index 000000000000..f7eaf323484b
--- /dev/null
+++ b/dev-python/sphobjinv/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+  <email>andrewammerlaan@gentoo.org</email>
+  <name>Andrew Ammerlaan</name>
+ </maintainer>
+ <longdescription lang="en">
+Using Sphinx?
+
+Having trouble writing cross-references?
+
+sphobjinv (short for ‘sphinx objects.inv’) can help!
+
+The syntax required for a functional Sphinx cross-reference is highly non-obvious in many cases. Sometimes Sphinx can guess correctly what you mean, but it’s pretty hit-or-miss. The best approach is to provide Sphinx with a completely specified cross-reference, and that’s where sphobjinv comes in.
+  </longdescription>
+ <upstream>
+  <remote-id type="github">bskinn/sphobjinv</remote-id>
+  <remote-id type="pypi">sphobjinv</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/sphobjinv/sphobjinv-2.1.ebuild b/dev-python/sphobjinv/sphobjinv-2.1.ebuild
new file mode 100644
index 000000000000..5ed336179140
--- /dev/null
+++ b/dev-python/sphobjinv/sphobjinv-2.1.ebuild
@@ -0,0 +1,53 @@
+# 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="Sphinx objects.inv Inspection/Manipulation Tool"
+HOMEPAGE="
+	https://github.com/bskinn/sphobjinv/
+	https://pypi.org/project/sphobjinv/
+"
+SRC_URI="https://github.com/bskinn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+SLOT="0"
+
+# This requires pytest-check, but that does not work at all, even if it
+# is installed it still fails to find the check fixture
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-python/attrs-19.2[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+	>=dev-python/fuzzywuzzy-0.8[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]"
+
+BDEPEND="
+	test? (
+		dev-python/dictdiffer[${PYTHON_USEDEP}]
+		dev-python/pytest-ordering[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		>=dev-python/stdio-mgr-1.0.1[${PYTHON_USEDEP}]
+		dev-python/timeout-decorator[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc/source \
+	dev-python/sphinx_rtd_theme \
+	dev-python/sphinx-issues \
+	dev-python/sphinxcontrib-programoutput
+
+python_prepare_all() {
+	# --strict option is deprecated in pytest>6
+	sed -i -e '/addopts/d' tox.ini || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/stdio-mgr/Manifest b/dev-python/stdio-mgr/Manifest
new file mode 100644
index 000000000000..59da72d82f9b
--- /dev/null
+++ b/dev-python/stdio-mgr/Manifest
@@ -0,0 +1 @@
+DIST stdio-mgr-1.0.1.tar.gz 8447 BLAKE2B 72038ea34177829d77ac239585775557b5a0a253879c027b2aad64045ec8bafbfdc250d94fe61cde96f06616f774edf42b384bfef7fbf69af442b0a9b703cf9a SHA512 2d18e5d65faa7a73373b56fdac3893768a65a36bed17f017b647e71431a6bff44ce1d39022f1dbbd31ddc9c0e704743a164f4b7610fb62d75aa34ecb53331366
diff --git a/dev-python/stdio-mgr/metadata.xml b/dev-python/stdio-mgr/metadata.xml
new file mode 100644
index 000000000000..d0c5c2654767
--- /dev/null
+++ b/dev-python/stdio-mgr/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+  <email>andrewammerlaan@gentoo.org</email>
+  <name>Andrew Ammerlaan</name>
+ </maintainer>
+ <longdescription lang="en">
+Have a CLI Python application?
+
+Want to automate testing of the actual console input &amp; output of your user-facing components?
+
+stdio Manager can help.
+
+While some functionality here is more or less duplicative of redirect_stdout and redirect_stderr in contextlib within the standard library, it provides (i) a much more concise way to mock both stdout and stderr at the same time, and (ii) a mechanism for mocking stdin, which is not available in contextlib.
+  </longdescription>
+ <upstream>
+  <remote-id type="github">bskinn/stdio-mgr</remote-id>
+  <remote-id type="pypi">stdio-mgr</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/stdio-mgr/stdio-mgr-1.0.1.ebuild b/dev-python/stdio-mgr/stdio-mgr-1.0.1.ebuild
new file mode 100644
index 000000000000..215d413ef0a9
--- /dev/null
+++ b/dev-python/stdio-mgr/stdio-mgr-1.0.1.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="Context manager for mocking/wrapping stdin/stdout/stderr"
+HOMEPAGE="
+	https://github.com/bskinn/stdio-mgr/
+	https://pypi.org/project/stdio-mgr/
+"
+SRC_URI="https://github.com/bskinn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+SLOT="0"
+
+RDEPEND=">=dev-python/attrs-17.1[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+# doc directory is not included in the release tarball for some reason
+#distutils_enable_sphinx doc \
+#				dev-python/sphinxcontrib-programoutput \
+#				dev-python/sphinx_rtd_theme
+
+python_test() {
+	# skip the doctests
+	epytest tests
+}
diff --git a/dev-python/tekore/Manifest b/dev-python/tekore/Manifest
new file mode 100644
index 000000000000..18eb751ff376
--- /dev/null
+++ b/dev-python/tekore/Manifest
@@ -0,0 +1 @@
+DIST tekore-3.7.1.tar.gz 258235 BLAKE2B e04edfab294ac3dac1fb086f296bf3fcc463cdad981d435fdd19ec812f1bb2ff79cacaa94d5105dc1070dd56602cc9a502537c68020cb27b2eb5b3c93788f193 SHA512 ed315a0b5b071265d2ba12d996bedafdea87286fd1beecc14d247176f2bdd2245e0220fb186ce4bd6eec2bc13a764f74b067ce1e546d8c30e618a4bdc3bf02e0
diff --git a/dev-python/tekore/metadata.xml b/dev-python/tekore/metadata.xml
new file mode 100644
index 000000000000..c5334abcb4b8
--- /dev/null
+++ b/dev-python/tekore/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>andrewammerlaan@gentoo.org</email>
+  <name>Andrew Ammerlaan</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">felix-hilden/tekore</remote-id>
+  <remote-id type="pypi">tekore</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/tekore/tekore-3.7.1.ebuild b/dev-python/tekore/tekore-3.7.1.ebuild
new file mode 100644
index 000000000000..76adce28b6b1
--- /dev/null
+++ b/dev-python/tekore/tekore-3.7.1.ebuild
@@ -0,0 +1,44 @@
+# 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="Spotify Web API client"
+HOMEPAGE="
+	https://tekore.readthedocs.io
+	https://github.com/felix-hilden/tekore
+"
+SRC_URI="https://github.com/felix-hilden/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/httpx-0.11[${PYTHON_USEDEP}]
+	<dev-python/httpx-0.18[${PYTHON_USEDEP}]
+"
+
+BDEPEND="test? (
+	>=dev-python/pytest-asyncio-0.11[${PYTHON_USEDEP}]
+	<dev-python/pytest-asyncio-0.15[${PYTHON_USEDEP}]
+)"
+
+DOCS="readme.rst"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs/src \
+	dev-python/sphinx_rtd_theme \
+	dev-python/sphinx-autodoc-typehints
+
+python_prepare_all() {
+	# requires network
+	sed -i -e 's:test_bad_arguments_raises_error:_&:' \
+			tests/auth/expiring.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/twisted/twisted-21.2.0.ebuild b/dev-python/twisted/twisted-21.2.0.ebuild
index 6d29fa59c6ee..bfdc71312ff7 100644
--- a/dev-python/twisted/twisted-21.2.0.ebuild
+++ b/dev-python/twisted/twisted-21.2.0.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${PN}-${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="conch crypt http2 serial test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/typed-ast/Manifest b/dev-python/typed-ast/Manifest
index 3e2e8e9f8194..12650b008bc9 100644
--- a/dev-python/typed-ast/Manifest
+++ b/dev-python/typed-ast/Manifest
@@ -1,2 +1 @@
-DIST typed_ast-1.4.2.tar.gz 208583 BLAKE2B fb94967409c073b3390a133232259605aab0ee893fe53deb0e97a07c814b1c2021815beab4fa680653f75a44b53eb3f02d7c9e330cf51195c2dd668762c9e0be SHA512 9a46f2a4c48bd267445a773463771824be958dfdd1a2df21356d0a763ee2029b51d5b0fddeb16df202f89ba86019640ab45ba520fdad5c550250fe2a135605fe
 DIST typed_ast-1.4.3.tar.gz 210893 BLAKE2B 9e0bbaac73d97c13303c783d4e91b015570d9b9ad74361e1bcfe67259982459003ea6c24602ce004fe1447c4375090d5fa58006e18af28da256f6b25d9aa20b1 SHA512 7ac06e277c883afd1a7161601ffca0114aa63db257695a4bf4c64d819a7192fe52167edb57991aefc7accc6a9902b5faf2ba9e4032c4b9be31f1db7a091607c9
diff --git a/dev-python/typed-ast/typed-ast-1.4.2.ebuild b/dev-python/typed-ast/typed-ast-1.4.2.ebuild
deleted file mode 100644
index b71c1ef05cf4..000000000000
--- a/dev-python/typed-ast/typed-ast-1.4.2.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} )
-inherit distutils-r1
-
-DESCRIPTION="Python typed-ast backported"
-HOMEPAGE="https://pypi.org/project/typed-ast/ https://github.com/python/typed_ast"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/_}/${P/-/_}.tar.gz"
-S="${WORKDIR}/${P/-/_}"
-
-LICENSE="Apache-2.0 MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
-
-distutils_enable_tests pytest
-
-python_test() {
-	cd "${BUILD_DIR}" || die
-	epytest
-}
diff --git a/dev-python/typed-ast/typed-ast-1.4.3.ebuild b/dev-python/typed-ast/typed-ast-1.4.3.ebuild
index 4aed1baa7554..b71c1ef05cf4 100644
--- a/dev-python/typed-ast/typed-ast-1.4.3.ebuild
+++ b/dev-python/typed-ast/typed-ast-1.4.3.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${P/-/_}"
 
 LICENSE="Apache-2.0 MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/werkzeug/werkzeug-2.0.1-r1.ebuild b/dev-python/werkzeug/werkzeug-2.0.1-r1.ebuild
index 0808a888329d..66b9d686a1a1 100644
--- a/dev-python/werkzeug/werkzeug-2.0.1-r1.ebuild
+++ b/dev-python/werkzeug/werkzeug-2.0.1-r1.ebuild
@@ -31,7 +31,6 @@ BDEPEND="
 		dev-python/pytest-timeout[${PYTHON_USEDEP}]
 		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
 		dev-python/watchdog[${PYTHON_USEDEP}]
-		~dev-python/werkzeug-${PV}[${PYTHON_USEDEP}]
 	)"
 
 distutils_enable_tests pytest
@@ -40,7 +39,19 @@ PATCHES=(
 	"${FILESDIR}"/${P}-py310.patch
 )
 
+src_prepare() {
+	distutils-r1_src_prepare
+	# prevent esetup.py install from zipping the egg
+	sed -i -e '/\[options\]/azip_safe = False' setup.cfg || die
+}
+
 python_test() {
+	"${EPYTHON}" -m venv --system-site-packages --without-pip \
+		"${BUILD_DIR}"/venv || die
+	local -x PATH=${BUILD_DIR}/venv/bin:${PATH}
+	unset PYTHONPATH
+	esetup.py install
+
 	# the default portage tempdir is too long for AF_UNIX sockets
 	local -x TMPDIR=/tmp
 	epytest -p no:httpbin tests