Adding metadata

43 files changed, 253 insertions, 993 deletions

diff --git a/dev-python/asgiref/Manifest b/dev-python/asgiref/Manifest
index 735c3399505f..a97fd0db9b55 100644
--- a/dev-python/asgiref/Manifest
+++ b/dev-python/asgiref/Manifest
@@ -1,3 +1 @@
-DIST asgiref-3.3.4.tar.gz 30780 BLAKE2B f14a5ae3cc3d0c67a827b4b8d002c9d92388285f7388b7ac439b11fbe2e72b6dee5a9c38637e6b5189e3a3625d24a806b5aeff1ffc41861fd4947d7b7c4621ba SHA512 e224ce82f9156e3efde316f3e209a9fbb9494cb9347d6652e19ed130921143de8d3e2a45f50352bf13fcdf229c291e68a0348fff31de144e58cd1a53b4eb0c31
-DIST asgiref-3.4.0.tar.gz 32396 BLAKE2B bbf80c4f5bfc7eaf2f27896913a59f522643de35a5eac45807b88f0b2deef6acef408a6d3abb939c4653554415028b5eea68e99ee45247e384848c554ab61c7c SHA512 259dd6fafcd4db73554a4bd26f6000b33c61e8e4d42294bc22826bc95e89959bcc3f9f97d8f0b5dc7e0cf8420890ea8ab368232b4046254e8c91ad010f6509c0
 DIST asgiref-3.4.1.tar.gz 32529 BLAKE2B 4b5f3b33e165468d71711cf28a5a6161866cd7495140cb67ff028aba5a2586414783d2fa7ce744e99e269714d9d64a019a67c852fd4546ba1f71625473010b9f SHA512 af266fc3eac58c21f2ab3f66e522067388f9cf232b17344fb5afbc408c034e61a1cce02362ec5dc494985beef099800f75cf7de28dc057c45e4bcb973b0a6dbe
diff --git a/dev-python/asgiref/asgiref-3.3.4.ebuild b/dev-python/asgiref/asgiref-3.3.4.ebuild
deleted file mode 100644
index 42a3b5f70b5c..000000000000
--- a/dev-python/asgiref/asgiref-3.3.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="ASGI utilities (successor to WSGI)"
-HOMEPAGE="
-	https://asgi.readthedocs.io/en/latest/
-	https://github.com/django/asgiref/
-	https://pypi.org/project/asgiref/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' python3_7 pypy3)"
-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/asgiref-3.4.0.ebuild b/dev-python/asgiref/asgiref-3.4.0.ebuild
deleted file mode 100644
index 805dc825b650..000000000000
--- a/dev-python/asgiref/asgiref-3.4.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="ASGI utilities (successor to WSGI)"
-HOMEPAGE="
-	https://asgi.readthedocs.io/en/latest/
-	https://github.com/django/asgiref/
-	https://pypi.org/project/asgiref/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' python3_7 pypy3)"
-BDEPEND="
-	test? ( dev-python/pytest-asyncio[${PYTHON_USEDEP}] )"
-
-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
deleted file mode 100644
index 1cd017ddfbde..000000000000
--- a/dev-python/asgiref/files/asgiref-3.3.4-py310-warnings.patch
+++ /dev/null
@@ -1,235 +0,0 @@
-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/crcmod/crcmod-1.7-r4.ebuild b/dev-python/crcmod/crcmod-1.7-r4.ebuild
index 3d28b316013b..5761d0fb9b34 100644
--- a/dev-python/crcmod/crcmod-1.7-r4.ebuild
+++ b/dev-python/crcmod/crcmod-1.7-r4.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit distutils-r1
 
 DESCRIPTION="Python CRC Generator module"
-HOMEPAGE="https://sourceforge.net/projects/crcmod/"
+HOMEPAGE="http://crcmod.sourceforge.net/"
 SRC_URI="mirror://sourceforge/crcmod/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/executing/Manifest b/dev-python/executing/Manifest
index 54651edfaafe..11c1715b6c18 100644
--- a/dev-python/executing/Manifest
+++ b/dev-python/executing/Manifest
@@ -1,2 +1,3 @@
 DIST executing-0.6.0.gh.tar.gz 330731 BLAKE2B f6a86072907c5140aefb45beb46bcc8c6e3e242e2e821046e59f0eafe1d5c16efe3c08dd1b19b1ce85388fd9cc4757bfe586b95fb490a594cfee4f5e69b5a0af SHA512 5d2f621ff4cbfd55ac43b555f771b129ade5d20f882f4e5d6a060a1a099abad73cc4128c9e6bd32fccc40c4c85c51c28b3be40ab16f163e1ceaaad07f1936ab7
 DIST executing-0.7.0.gh.tar.gz 452550 BLAKE2B 9b3bdb49b3b00ca17952db747d3f0f3995e8dffbc170bcb2260e7c34ce9e6b0c8e1620be2e2776445a6114add4e2437eaeae8a308391e2c121b6484b5bc6056c SHA512 08ee347f0bcaf04ca2c6010762a6d2d5b054b3590029c55d18d6efae5a5db7c6c5a0948cce9d9684e4bfbfd9ea19326e4ac2c96be40535c0500c28c28ce81e07
+DIST executing-0.8.0.gh.tar.gz 494306 BLAKE2B 37ce7c743380dcac85e6843e8ee708c8d876c5de883e49786da67d94dc9a7bf983bb36278a823ddb2bc9291e7219125cf870fac8c0c28979a4b49e951410d5e5 SHA512 6f88052f61479c5fe4aba1925e90f3daea3852f636c5c17d94a08dfa4de909fb3187650ff07c1dc66b4b3bec4a04cfdaf4cfe0c37903f67b2d716691d07a93d8
diff --git a/dev-python/executing/executing-0.8.0.ebuild b/dev-python/executing/executing-0.8.0.ebuild
new file mode 100644
index 000000000000..44645805f0dc
--- /dev/null
+++ b/dev-python/executing/executing-0.8.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Get information about what a Python frame is currently doing"
+HOMEPAGE="
+	https://github.com/alexmojaki/executing/
+	https://pypi.org/project/executing/"
+SRC_URI="
+	https://github.com/alexmojaki/executing/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+# asttokens is optional runtime dep
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	test? (
+		dev-python/asttokens[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	# this test explodes when collected by pytest
+	"${EPYTHON}" tests/test_main.py || die "Tests failed with ${EPYTHON}"
+	epytest tests/test_pytest.py
+}
diff --git a/dev-python/flit/Manifest b/dev-python/flit/Manifest
index b98e888eed18..84ed16c295b1 100644
--- a/dev-python/flit/Manifest
+++ b/dev-python/flit/Manifest
@@ -1,2 +1,3 @@
 DIST flit-2.1.0.tar.gz 106459 BLAKE2B db51d8cc119ae8aa5f8d0ac1655cd29390065567391cbdf06ca7dbb98a79e96a6d8f318273c2f9a58aaf549090a903360701a844ac071d15304a21ea54052a91 SHA512 0fcbfaa1e5e83216a5c98cc87b0a8f2aa17e2c184ec3f09c7dd0dd5e695311be62344ac4f101cb71f87390513496f8c1152a2cd8d7363202f7696ee002f07a55
 DIST flit-3.2.0.tar.gz 115192 BLAKE2B dda4b9f5b56b9868d737516841d7fc49c0e97ef8a71f9f0628112f68c3dadae89a87aef56cebfe8ec3762af5970d206fe462add146d52b3893fb8852fd7f9625 SHA512 1db7c4118fe1d70d1e318db3bc282747d6cc3f3b626ad68420fa056e585caad9ff0a3f230e17c919ea260ddeb6330effc4bbed8b30d11ed7b27e78d9d7af0445
+DIST flit-3.3.0.tar.gz 117809 BLAKE2B 8ad74f70406e41b35b44886b145b52d83fc30d0a1395bf711807da2ae3974ae8606113e4bcd556694854c48c8c01c3c03b4a1021c7cc3e33cce0e99a5abbb9ea SHA512 904889298aab581640e8323fd68c83d753ea97af0ed1b8f438f192d84d09ced83718440a03d23864885fcf966de9665c3046f0f3a1b1d4170b2decf8430ff006
diff --git a/dev-python/flit/flit-3.2.0.ebuild b/dev-python/flit/flit-3.2.0.ebuild
index 2e0423afed39..a4425fca5a24 100644
--- a/dev-python/flit/flit-3.2.0.ebuild
+++ b/dev-python/flit/flit-3.2.0.ebuild
@@ -1,8 +1,9 @@
 # Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
 PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
 inherit distutils-r1
 
@@ -13,7 +14,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
 
 RDEPEND="
 	>=dev-python/flit_core-3.2.0[${PYTHON_USEDEP}]
@@ -22,7 +22,7 @@ RDEPEND="
 	dev-python/requests_download[${PYTHON_USEDEP}]
 	dev-python/toml[${PYTHON_USEDEP}]
 "
-BDEPEND="${RDEPEND}
+BDEPEND="
 	sys-apps/grep
 	sys-apps/findutils
 	test? (
@@ -39,10 +39,3 @@ distutils_enable_tests pytest
 distutils_enable_sphinx doc \
 	dev-python/sphinxcontrib-github-alt \
 	dev-python/pygments-github-lexers \
-
-python_prepare_all() {
-	printf -- "from setuptools import setup, find_packages\nsetup(name='%s',version='%s',%s)" \
-		"${PN}" "${PV}" "packages=find_packages(exclude=['tests'])" > setup.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/flit/flit-3.3.0.ebuild b/dev-python/flit/flit-3.3.0.ebuild
new file mode 100644
index 000000000000..7aac596e790d
--- /dev/null
+++ b/dev-python/flit/flit-3.3.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Simplified packaging of Python modules"
+HOMEPAGE="https://github.com/takluyver/flit https://flit.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/flit_core-3.3.0[${PYTHON_USEDEP}]
+	dev-python/intreehooks[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/requests_download[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	sys-apps/grep
+	sys-apps/findutils
+	test? (
+		dev-python/responses[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/flit-3.2.0-tests.patch"
+)
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc \
+	dev-python/sphinxcontrib-github-alt \
+	dev-python/pygments-github-lexers \
diff --git a/dev-python/flit/metadata.xml b/dev-python/flit/metadata.xml
index 608b2548fba8..14834ed02675 100644
--- a/dev-python/flit/metadata.xml
+++ b/dev-python/flit/metadata.xml
@@ -5,6 +5,10 @@
   <email>chutzpah@gentoo.org</email>
   <name>Patrick McLean</name>
  </maintainer>
+ <maintainer type="project">
+  <email>python@gentoo.org</email>
+  <name>Python</name>
+ </maintainer>
  <upstream>
   <remote-id type="pypi">flit</remote-id>
  </upstream>
diff --git a/dev-python/flit_core/Manifest b/dev-python/flit_core/Manifest
index 50b536be6edc..0fe95b691f1f 100644
--- a/dev-python/flit_core/Manifest
+++ b/dev-python/flit_core/Manifest
@@ -1,2 +1,3 @@
 DIST flit_core-2.1.0.tar.gz 22978 BLAKE2B 87cb5ced56666eb9ae4963628864b66c77758c823b34712770a61a52cb7916196c0d6f51e7b2ad9804b853f27a257966aabef7dd9c95155af8e76f5100b1c9fa SHA512 dfc11cdd62af367b56773e5e0b28763554cd27a272a040a5dd35c8fae4f1e6695b2e2b15b6e63f6aa52df9854874eccc31f6eaf5b349ed85aa33cc5e1d2e1acd
 DIST flit_core-3.2.0.tar.gz 27417 BLAKE2B 8fe53ee47ce9b850b9200f2c1c4c88e3f7e29257fb1c488e3eefe79121634ef4f272db7e96d9621962de2e576da5b684c64653475ebb702bee313564b7fb41cd SHA512 660b787f0a4fc85d8d893087369b378ba5583e1dad82feb8ca3737e70c8c0a5ab5d95a38b7d3e9edff481d5207e946f6e6c7e60f22f96a1de0d2daeef6f16c2b
+DIST flit_core-3.3.0.tar.gz 26424 BLAKE2B a7237b51f16ed4158d5f09cbe92ccee7cbb3b19e67937028e86f4e1c9d58c9fe9244ea6337bc7c7c5bb29e204d011ee95a6d3fbe596d728ce66f1e00a830fb0c SHA512 5d7b1a43a9d9a7c0cf30b1f73d208963ae51247aec2b9a91aad6412afe781ee927ddd82ecea6057d36ec18af917938500f518845206ec150dd6b604905a1f2f4
diff --git a/dev-python/flit_core/flit_core-3.3.0.ebuild b/dev-python/flit_core/flit_core-3.3.0.ebuild
new file mode 100644
index 000000000000..cf6116470234
--- /dev/null
+++ b/dev-python/flit_core/flit_core-3.3.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Simplified packaging of Python modules (core module)"
+HOMEPAGE="https://pypi.org/project/flit-core/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/intreehooks[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pyproject2setuppy-11[${PYTHON_USEDEP}]
+	test? ( dev-python/testpath[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index b92f07f57c95..d9a8e6a29722 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -1,8 +1,5 @@
-DIST pip-21.1.2.tar.gz 8772481 BLAKE2B 23dbcc5dd7e7f66934282b9c93958267eb367d418b6c814032b7b89e0d94c73c143626781b8df081394019d2e575030b7a2fd61bb5221992ce2060cf069e8b04 SHA512 54a2b6074fcb2640868dedcabb5087b79a53a8ad57ec4ab5acf2862b8037403d8f156c2853ab60c2f10c6af999a0a90774f0bc3eca2978a82590935d37af167f
 DIST pip-21.1.3.tar.gz 8772944 BLAKE2B 4c50fcb7c05e05d11b137d08547d9d55f19687442b8d44caf05d19917b200bcf860032cb28745e41d51afda80a7ac09d60afb8d619ade5b965ed87bac1133006 SHA512 21bdc78f24751981ae49c9fda0430fc92b8d33eb7a546bc344e8cea4aa85dcd42191ef8eb3fdfb4f3d1cb5921698f819d73e6e190d8745cf7ddfa52732d95999
 DIST pip-21.2.1.tar.gz 8781474 BLAKE2B 6a6a4972de31cea2f9ee2d70df00acec65efe344fa13e56ecf9b2f55125baa2effb30bf25c7649f5f30b2ecf9b5ebb7d32dc0f2dfa101444510c8573bd0c60be SHA512 2fff39703eb387ded66552ee62c2b3e4d18da6e8a904399919a5c51f65ddf1695ad410408fe5370877a1ce9992e7c07e091a1852dfb136ce5580e31fc1c03b81
-DIST setuptools-56.0.0-py3-none-any.whl 784941 BLAKE2B 136352bcaeeb803f94983db2e0f9ec79dacc23a6742a2f6f1b4bdd2b29a104f4965d78f9b4adf1a501c7bf39d4ed85a6786b03489f90872661afbf5e674fd3f9 SHA512 32405236e9c2936cde137bc4d4d07b548391336ce0511cd5677dcd1f85c7a142b0947e03cdceaeb37067874f5aa71daacaa1a6af95ae9fe3ad8af264f61e10f4
 DIST setuptools-57.4.0-py3-none-any.whl 819017 BLAKE2B afba86cf9aeea58ee869fdc11bbb192abbf2f89710e468b90dc291fec228ca16202483e36195a5ad4e2b8d210326bc83e2be6ec696ab413d94ffaeb05bb9c030 SHA512 9bf230f4e0e72acab07ab372a6ca05adb3d175a8079d2f73d327c632f3d27b8ee10442d3e60f4c94a6e61d5ba2212fc78187ca6e1717e15bb570bdce4263fd0b
-DIST virtualenv-16.7.10.tar.gz 5116776 BLAKE2B 42f0a4b4330850b504f8febd991ef6ecdcbb0821efdd94ca324a8cc34a68a760a8a98de97f0cb2384d8e6cbb0ce8f261995c6433886444e29b75ba0ce09ca12c SHA512 f06d7c354ce1910f04dbcbe1a77e60392653bbe4f638bafbe9284454db2c0e5d63cf9159201d0916fc01aaba91d45fb733b63096c38517fcd83fd00ed8b26d28
 DIST virtualenv-16.7.11.tar.gz 8134533 BLAKE2B ea81e11c210d911bf9576edf7b1754721b270adcc5d9633415d33b8f659149d64932fe2d366200121ec00c266c25dae380e248add438fc357477114eba4dfb4e SHA512 82d0d2a964508511e8e1686703581ff543f65791dc2449d9741d46ea57c4c89673947d2477ba374176f05fcea2a5ca572aa650c61c4f3271c4d73d1ff9d9ff42
 DIST wheel-0.36.2-py2.py3-none-any.whl 35046 BLAKE2B bc4e8dab7c74eea34d3b4a813b7eaf6295a99a396a861b6cdd76f743043e89140bad132bdd13e385e8945ce02e0798e1d3ac73fc1b23bde5b2a83e4bb4dd5cdc SHA512 6bb5119b4d3704fe1e3c1eaaa3124edab13f61b46f8a0a8e75974fac4e5b25d8b53606071a03a8d8990ad1cfe2ab247ddea260098df2c0c35ae965be47080284
diff --git a/dev-python/pip/files/virtualenv-16.7.10-py310.patch b/dev-python/pip/files/virtualenv-16.7.10-py310.patch
deleted file mode 100644
index 27c17a07445f..000000000000
--- a/dev-python/pip/files/virtualenv-16.7.10-py310.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From b4aef0a53ba63c34e45413754705af4e438ef5df Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
-Date: Wed, 5 May 2021 10:59:02 +0200
-Subject: [PATCH] Legacy: Use sysconfig.get_default_scheme() where available
- (#2109)
-
----
- .pre-commit-config.yaml      | 43 ------------------------------------
- docs/changelog/2109.misc.rst |  1 +
- virtualenv.py                |  3 ++-
- 3 files changed, 3 insertions(+), 44 deletions(-)
- delete mode 100644 .pre-commit-config.yaml
- create mode 100644 docs/changelog/2109.misc.rst
-
-diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
-deleted file mode 100644
-index 0b8234b7d..000000000
---- a/.pre-commit-config.yaml
-+++ /dev/null
-@@ -1,43 +0,0 @@
--repos:
---   repo: https://github.com/ambv/black
--    rev: 19.10b0
--    hooks:
--    -   id: black
--        args: [--safe]
--        language_version: python3.8
---   repo: https://github.com/asottile/blacken-docs
--    rev: v1.3.0
--    hooks:
--    -   id: blacken-docs
--        additional_dependencies: [black==19.3b0]
--        language_version: python3.8
---   repo: https://github.com/asottile/seed-isort-config
--    rev: v1.9.3
--    hooks:
--    -   id: seed-isort-config
--        args: [--application-directories, '.']
---   repo: https://github.com/pre-commit/mirrors-isort
--    rev: v4.3.21
--    hooks:
--    -   id: isort
---   repo: https://github.com/pre-commit/pre-commit-hooks
--    rev: v2.4.0
--    hooks:
--    -   id: trailing-whitespace
--    -   id: end-of-file-fixer
--    -   id: check-yaml
--    -   id: debug-statements
--    -   id: check-merge-conflict
--    -   id: trailing-whitespace
--    -   id: check-docstring-first
--    -   id: flake8
--        additional_dependencies: ["flake8-bugbear == 19.8.0"]
--        language_version: python3.8
---   repo: https://github.com/asottile/pyupgrade
--    rev: v1.25.1
--    hooks:
--    -   id: pyupgrade
---   repo: https://github.com/pre-commit/pygrep-hooks
--    rev: v1.4.2
--    hooks:
--    -   id: rst-backticks
-diff --git a/docs/changelog/2109.misc.rst b/docs/changelog/2109.misc.rst
-new file mode 100644
-index 000000000..985f955df
---- /dev/null
-+++ b/docs/changelog/2109.misc.rst
-@@ -0,0 +1 @@
-+Preserve compatibility with Python 3.10 - by ``hroncok``
-diff --git a/virtualenv.py b/virtualenv.py
-index 3085d1d18..86aa65674 100755
---- a/virtualenv.py
-+++ b/virtualenv.py
-@@ -1809,7 +1809,8 @@ def fix_local_scheme(home_dir, symlink=True):
-         pass
-     else:
-         # noinspection PyProtectedMember
--        if sysconfig._get_default_scheme() == "posix_local":
-+        get_scheme = getattr(sysconfig, "get_default_scheme", None) or sysconfig._get_default_scheme
-+        if get_scheme() == "posix_local":
-             local_path = os.path.join(home_dir, "local")
-             if not os.path.exists(local_path):
-                 os.mkdir(local_path)
diff --git a/dev-python/pip/pip-21.1.2-r1.ebuild b/dev-python/pip/pip-21.1.2-r1.ebuild
deleted file mode 100644
index 7ee3a3171b47..000000000000
--- a/dev-python/pip/pip-21.1.2-r1.ebuild
+++ /dev/null
@@ -1,133 +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="ssl(+),threads(+)"
-
-inherit bash-completion-r1 distutils-r1
-
-# setuptools & wheel .whl files are required for testing,
-# the exact version is not very important.
-SETUPTOOLS_WHL="setuptools-56.0.0-py3-none-any.whl"
-WHEEL_WHL="wheel-0.36.2-py2.py3-none-any.whl"
-# upstream still requires virtualenv-16 for testing, we are now fetching
-# it directly to avoid blockers with virtualenv-20
-VENV_PV=16.7.10
-
-DESCRIPTION="Installs python packages -- replacement for easy_install"
-HOMEPAGE="
-	https://pip.pypa.io/en/stable/
-	https://pypi.org/project/pip/
-	https://github.com/pypa/pip/"
-SRC_URI="
-	https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	test? (
-		https://files.pythonhosted.org/packages/py3/s/setuptools/${SETUPTOOLS_WHL}
-		https://files.pythonhosted.org/packages/py2.py3/w/wheel/${WHEEL_WHL}
-		https://github.com/pypa/virtualenv/archive/${VENV_PV}.tar.gz
-			-> virtualenv-${VENV_PV}.tar.gz
-	)
-"
-
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
-SLOT="0"
-IUSE="test vanilla"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/scripttest[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/${PN}-21.1-no-coverage.patch"
-	)
-	if ! use vanilla; then
-		PATCHES+=( "${FILESDIR}/pip-20.0.2-disable-system-install.patch" )
-	fi
-
-	distutils-r1_python_prepare_all
-
-	if use test; then
-		mkdir tests/data/common_wheels/ || die
-		cp "${DISTDIR}"/{${SETUPTOOLS_WHL},${WHEEL_WHL}} \
-			tests/data/common_wheels/ || die
-
-		pushd "${WORKDIR}/virtualenv-${VENV_PV}" >/dev/null || die
-		eapply "${FILESDIR}/virtualenv-${VENV_PV}-py310.patch"
-		popd >/dev/null || die
-	fi
-}
-
-python_test() {
-	if [[ ${EPYTHON} == pypy* ]]; then
-		ewarn "Skipping tests on ${EPYTHON} since they are very broken"
-		return 0
-	fi
-
-	local deselect=(
-		tests/functional/test_install.py::test_double_install_fail
-		tests/functional/test_list.py::test_multiple_exclude_and_normalization
-		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-download]'
-		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-install]'
-		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-list]'
-		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-wheel]'
-		tests/functional/test_install.py::test_install_pip_does_not_modify_pip_when_satisfied
-		# Internet
-		tests/functional/test_install.py::test_install_editable_with_prefix_setup_cfg
-	)
-
-	[[ ${EPYTHON} == python3.10 ]] && deselect+=(
-		tests/lib/test_lib.py::test_correct_pip_version
-		# uses vendored packaging that uses deprecated distutils
-		tests/functional/test_warning.py::test_pip_works_with_warnings_as_errors
-	)
-
-	distutils_install_for_testing
-	pushd "${WORKDIR}/virtualenv-${VENV_PV}" >/dev/null || die
-	distutils_install_for_testing
-	popd >/dev/null || die
-
-	local -x GENTOO_PIP_TESTING=1 \
-		PATH="${TEST_DIR}/scripts:${PATH}" \
-		PYTHONPATH="${TEST_DIR}/lib:${BUILD_DIR}/lib"
-	epytest ${deselect[@]/#/--deselect } -m "not network"
-}
-
-python_install_all() {
-	# Prevent dbus auto-launch
-	# https://bugs.gentoo.org/692178
-	export DBUS_SESSION_BUS_ADDRESS="disabled:"
-
-	local DOCS=( AUTHORS.txt docs/html/**/*.rst )
-	distutils-r1_python_install_all
-
-	COMPLETION="${T}"/completion.tmp
-
-	# 'pip completion' command embeds full $0 into completion script, which confuses
-	# 'complete' and causes QA warning when running as "${PYTHON} -m pip".
-	# This trick sets correct $0 while still calling just installed pip.
-	local pipcmd='import sys; sys.argv[0] = "pip"; from pip._internal.cli.main import main; sys.exit(main())'
-
-	${PYTHON} -c "${pipcmd}" completion --bash > "${COMPLETION}" || die
-	newbashcomp "${COMPLETION}" ${PN}
-
-	${PYTHON} -c "${pipcmd}" completion --zsh > "${COMPLETION}" || die
-	insinto /usr/share/zsh/site-functions
-	newins "${COMPLETION}" _pip
-}
diff --git a/dev-python/pmw/pmw-2.0.1-r2.ebuild b/dev-python/pmw/pmw-2.0.1-r2.ebuild
index 7a909a97e2f8..6ca1cd0843d0 100644
--- a/dev-python/pmw/pmw-2.0.1-r2.ebuild
+++ b/dev-python/pmw/pmw-2.0.1-r2.ebuild
@@ -13,7 +13,7 @@ MY_PN="Pmw"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Toolkit for building high-level compound Python widgets using the Tkinter module"
-HOMEPAGE="https://sourceforge.net/projects/pmw/"
+HOMEPAGE="http://pmw.sourceforge.net/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/pycdio/Manifest b/dev-python/pycdio/Manifest
index 2a11f3cf0079..2ea8c840bd43 100644
--- a/dev-python/pycdio/Manifest
+++ b/dev-python/pycdio/Manifest
@@ -1 +1,2 @@
 DIST pycdio-2.1.0.tar.gz 241434 BLAKE2B eb981fdf52b205e14c6dd353ac4aca9a9e82dba6967a53b9059f8a265ef80832fe7236d68b2af7a6e408665fce0f5ed3541289e0b7d282834c4feb8e6b428fc4 SHA512 dc18fbd212f7040b8b06efaf263b17568e9c2d089cff7dfc4dda50a7225059e44c9c86e2d81ade92cf09c823f7189b5723fb601cb12f0884dc04e9f5418c5927
+DIST pycdio-2.1.1.tar.gz 246562 BLAKE2B 7dbbf384f9d70aade922172c6dd070229c1ffc65a76a491c45f91ec176bced9af0dc0e08f50f8ad78828273de14166eae886b402f282a10bdad3f8302276ef01 SHA512 4c756b1c2f39332add86e01af129ccb608178306be42c9719c163b6bad0ba4de3916ac477c6866450890e094b14a2689a24e7d19bcf13846330555c2bb1feaa7
diff --git a/dev-python/pycdio/pycdio-2.1.1.ebuild b/dev-python/pycdio/pycdio-2.1.1.ebuild
new file mode 100644
index 000000000000..7ffcca11a4c3
--- /dev/null
+++ b/dev-python/pycdio/pycdio-2.1.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Python OO interface to libcdio (CD Input and Control library)"
+HOMEPAGE="https://savannah.gnu.org/projects/libcdio/ https://pypi.org/project/pycdio/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+BDEPEND="dev-lang/swig"
+DEPEND=">=dev-libs/libcdio-2.0.0"
+RDEPEND="${DEPEND}"
+
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# Remove obsolete sys.path and adjust 'data' paths in examples.
+	sed -i \
+		-e "s:^sys.path.insert.*::" \
+		-e "s:\.\./data:./data:g" \
+		example/*.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use examples; then
+		docinto examples
+		dodoc -r example/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/pycxx/pycxx-7.1.5.ebuild b/dev-python/pycxx/pycxx-7.1.5.ebuild
index b38289822e2d..dacaf4576c49 100644
--- a/dev-python/pycxx/pycxx-7.1.5.ebuild
+++ b/dev-python/pycxx/pycxx-7.1.5.ebuild
@@ -8,7 +8,7 @@ DISTUTILS_USE_SETUPTOOLS=no
 inherit distutils-r1
 
 DESCRIPTION="Set of facilities to extend Python with C++"
-HOMEPAGE="https://sourceforge.net/projects/cxx/"
+HOMEPAGE="http://cxx.sourceforge.net"
 SRC_URI="mirror://sourceforge/cxx/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/pydyf/Manifest b/dev-python/pydyf/Manifest
new file mode 100644
index 000000000000..7cd4ce005205
--- /dev/null
+++ b/dev-python/pydyf/Manifest
@@ -0,0 +1 @@
+DIST pydyf-0.0.3.gh.tar.gz 25610 BLAKE2B c236896e56163bb64267e28106a2058f0c6e85e918bd441537df9a494bd7b75c39dda247a0c4b99a918bb439f88a412763975d2d64ab4d8d7cfd0dab2d142f8e SHA512 bc72d5bf93bd4aff653b6496a07278c5ef8b22629f137f9a3dc8713dce4851d2772d4b1ae13d59fa0203c962405f93842e7d5159be1b276632419d6642add149
diff --git a/dev-python/pydyf/metadata.xml b/dev-python/pydyf/metadata.xml
new file mode 100644
index 000000000000..f5e04bf7d664
--- /dev/null
+++ b/dev-python/pydyf/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+  <email>python@gentoo.org</email>
+ </maintainer>
+ <upstream>
+  <remote-id type="pypi">pydyf</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/pydyf/pydyf-0.0.3.ebuild b/dev-python/pydyf/pydyf-0.0.3.ebuild
new file mode 100644
index 000000000000..00fcddeb6c7e
--- /dev/null
+++ b/dev-python/pydyf/pydyf-0.0.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="A low-level PDF generator"
+HOMEPAGE="
+	https://pypi.org/project/pydyf/
+	https://github.com/CourtBouillon/pydyf/"
+SRC_URI="
+	https://github.com/CourtBouillon/pydyf/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? ( dev-python/pillow[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/addopts/d' pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pyenchant/pyenchant-3.2.1.ebuild b/dev-python/pyenchant/pyenchant-3.2.1.ebuild
index 581e48c7dfe8..f17a960c65b6 100644
--- a/dev-python/pyenchant/pyenchant-3.2.1.ebuild
+++ b/dev-python/pyenchant/pyenchant-3.2.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc ~x86"
 
 RDEPEND="app-text/enchant:*"
 BDEPEND="
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index 3ab1c52bfe64..1907c6eaca4f 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -1,7 +1,2 @@
-DIST pylint-2.8.2.gh.tar.gz 734667 BLAKE2B 1525273298f39163de4db7946a749768cb9bcf7e11f89791944ccb5fb8d0918eedfc80d5e559d33934d468dd5781d4cb4921b9407daf2842613a8e3ba7d134e0 SHA512 7023603668f540ecc0b35f3289377855c4c0df01e04a9af255f5c8031f568f6b76508bb3a7f0aba8e76a86b63eae423908c30f47258d6dee46bb23320c952701
-DIST pylint-2.9.0.gh.tar.gz 768301 BLAKE2B a86ccb83d3155acee0165dc7b0095f5b7741c62e7b1f127349eef643cd1d0513ed2f5aaa89d78728806f03b08645ed1579aafb073d649e928d4c415e50dc8a49 SHA512 b524a3d3241702c1fc34ca9ee38815d02e7f4572d8ff3c132141ac7d9c7ff59f88995b92ccfcf18fd57e04be8f24571ef0ab99e6b4ce615f0f6957022d1d1467
-DIST pylint-2.9.1.gh.tar.gz 769124 BLAKE2B feabb520c22722df73471e87e05f22f0fb937113c9d02e39bf4e2554479c58a5044afe565c107e9478d868284b8875fec65b976633dddb4bc9d7748b35640218 SHA512 7aea388c6e62fd53e6775a4732da87269f3df22f995241621eb9b8d72c8573b6a4fa9545b1553db91f09eee013bd695e075d69c35436b05623576f13f1317cb6
 DIST pylint-2.9.3.gh.tar.gz 770364 BLAKE2B 3892286ffbd79b417c6decba44bce97f45192299ac8e2ec0e24770b2dd6cf1c28bac790626a478d47a6124ec0470ea9fc0d4230c5a1e807532852844445bb95a SHA512 45c037b970b66254b54a4810a5609dc098b5493d409826333e6a75f9ff0fc02921162711d88c45fd2f437e6521f639c33b25b714830a977c501612ee497501bb
-DIST pylint-2.9.4.gh.tar.gz 777252 BLAKE2B 84bc535b3c471be5d01a02ee67494d993cc257f0938e1bb0e35b1d64415d256c4f0dabd45cdc3319716c67e5e71ea935b63633f56b97013bd8616296343709d5 SHA512 9b5db20cf2d858e662c309b11cf28bf247b7c5f90de4f747733a0288ff4acced02e0e6b83145e7d940772eb9debf297b9ee6976e0f3ffbd73aaacaa3f4cb51e6
-DIST pylint-2.9.5.gh.tar.gz 778090 BLAKE2B cbcf5427665f56cc37afd08fb537fcc3f17697ca7cdbd7da97bad4093f344c9b961a156f5d141e070fa84c7e07293175a70585a8c996c9cffb7cef80717752af SHA512 84695bae88704391752f4b0944e39f5b44933fee8d88a8839729845b93bbe59876da08ab98645217c4ff2a98fd793a92063123b25a595fb332ce0a3943bcf7e7
 DIST pylint-2.9.6.gh.tar.gz 779390 BLAKE2B b1d8794e1e7ccdde87919eb943f83287c0a7b85b67f3722cbbe68887f2c61ab30b354548e25b70c661234647e35f79beb6aaad5f6be6bfde8c2475cf03676922 SHA512 a23ff089853398df2e4232767ca87c21e4ab4fc6805de80db796c78c56e0da1ade9b0586f5c14a98524bf607e0d240c354cf63287eec7dfdce263188eb19ddce
diff --git a/dev-python/pylint/pylint-2.8.2.ebuild b/dev-python/pylint/pylint-2.8.2.ebuild
deleted file mode 100644
index 22d837162553..000000000000
--- a/dev-python/pylint/pylint-2.8.2.ebuild
+++ /dev/null
@@ -1,67 +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} )
-PYTHON_REQ_USE="threads(+)"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Python code static checker"
-HOMEPAGE="https://www.logilab.org/project/pylint
-	https://pypi.org/project/pylint/
-	https://github.com/pycqa/pylint/"
-SRC_URI="
-	https://github.com/pycqa/pylint/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
-IUSE="examples"
-
-RDEPEND="
-	<dev-python/astroid-2.7[${PYTHON_USEDEP}]
-	>=dev-python/astroid-2.5.6[${PYTHON_USEDEP}]
-	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
-	<dev-python/isort-6[${PYTHON_USEDEP}]
-	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.7[${PYTHON_USEDEP}]
-	>=dev-python/toml-0.7.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4.4-sphinx-theme.patch"
-)
-
-distutils_enable_sphinx doc --no-autodoc
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local skipped_tests=(
-		# No need to run the benchmarks
-		tests/benchmark/test_baseline_benchmarks.py
-		# Fails when graphviz is installed (?!)
-		tests/test_import_graph.py::test_missing_graphviz
-		# TODO
-		'tests/lint/unittest_expand_modules.py::test_expand_modules[files_or_modules1-expected1]'
-	)
-	# Specify the test directory explicitly to avoid import file mismatches
-	epytest tests ${skipped_tests[@]/#/--deselect }
-}
-
-python_install_all() {
-	if use examples ; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto examples
-		dodoc -r examples/.
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pylint/pylint-2.9.0.ebuild b/dev-python/pylint/pylint-2.9.0.ebuild
deleted file mode 100644
index c0e4a405d141..000000000000
--- a/dev-python/pylint/pylint-2.9.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python code static checker"
-HOMEPAGE="https://www.logilab.org/project/pylint
-	https://pypi.org/project/pylint/
-	https://github.com/pycqa/pylint/"
-SRC_URI="
-	https://github.com/pycqa/pylint/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="examples"
-
-RDEPEND="
-	<dev-python/astroid-2.7[${PYTHON_USEDEP}]
-	>=dev-python/astroid-2.6.1[${PYTHON_USEDEP}]
-	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
-	<dev-python/isort-6[${PYTHON_USEDEP}]
-	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.7[${PYTHON_USEDEP}]
-	>=dev-python/toml-0.7.1[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4.4-sphinx-theme.patch"
-)
-
-distutils_enable_sphinx doc --no-autodoc
-distutils_enable_tests pytest
-
-python_test() {
-	local skipped_tests=(
-		# No need to run the benchmarks
-		tests/benchmark/test_baseline_benchmarks.py
-		# Fails when graphviz is installed (?!)
-#		tests/test_import_graph.py::test_missing_graphviz
-		# TODO
-#		'tests/lint/unittest_expand_modules.py::test_expand_modules[files_or_modules1-expected1]'
-	)
-	# Specify the test directory explicitly to avoid import file mismatches
-	epytest tests ${skipped_tests[@]/#/--deselect }
-}
-
-python_install_all() {
-	if use examples ; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto examples
-		dodoc -r examples/.
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pylint/pylint-2.9.1.ebuild b/dev-python/pylint/pylint-2.9.1.ebuild
deleted file mode 100644
index b8dcf410ca2b..000000000000
--- a/dev-python/pylint/pylint-2.9.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python code static checker"
-HOMEPAGE="https://www.logilab.org/project/pylint
-	https://pypi.org/project/pylint/
-	https://github.com/pycqa/pylint/"
-SRC_URI="
-	https://github.com/pycqa/pylint/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="examples"
-
-RDEPEND="
-	<dev-python/astroid-2.7[${PYTHON_USEDEP}]
-	>=dev-python/astroid-2.6.2[${PYTHON_USEDEP}]
-	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
-	<dev-python/isort-6[${PYTHON_USEDEP}]
-	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.7[${PYTHON_USEDEP}]
-	>=dev-python/toml-0.7.1[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4.4-sphinx-theme.patch"
-)
-
-distutils_enable_sphinx doc --no-autodoc
-distutils_enable_tests pytest
-
-python_test() {
-	local skipped_tests=(
-		# No need to run the benchmarks
-		tests/benchmark/test_baseline_benchmarks.py
-	)
-	# Specify the test directory explicitly to avoid import file mismatches
-	epytest tests ${skipped_tests[@]/#/--deselect }
-}
-
-python_install_all() {
-	if use examples ; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto examples
-		dodoc -r examples/.
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pylint/pylint-2.9.3.ebuild b/dev-python/pylint/pylint-2.9.3.ebuild
index 8d8a86fba9a8..922c60af119e 100644
--- a/dev-python/pylint/pylint-2.9.3.ebuild
+++ b/dev-python/pylint/pylint-2.9.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/pylint/pylint-2.9.4.ebuild b/dev-python/pylint/pylint-2.9.4.ebuild
deleted file mode 100644
index a83576eef8cc..000000000000
--- a/dev-python/pylint/pylint-2.9.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python code static checker"
-HOMEPAGE="https://www.logilab.org/project/pylint
-	https://pypi.org/project/pylint/
-	https://github.com/pycqa/pylint/"
-SRC_URI="
-	https://github.com/pycqa/pylint/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="examples"
-
-RDEPEND="
-	<dev-python/astroid-2.7[${PYTHON_USEDEP}]
-	>=dev-python/astroid-2.6.4[${PYTHON_USEDEP}]
-	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
-	<dev-python/isort-6[${PYTHON_USEDEP}]
-	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.7[${PYTHON_USEDEP}]
-	>=dev-python/toml-0.7.1[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4.4-sphinx-theme.patch"
-)
-
-distutils_enable_sphinx doc --no-autodoc
-distutils_enable_tests pytest
-
-python_test() {
-	local skipped_tests=(
-		# No need to run the benchmarks
-		tests/benchmark/test_baseline_benchmarks.py
-	)
-	# Specify the test directory explicitly to avoid import file mismatches
-	epytest tests ${skipped_tests[@]/#/--deselect }
-}
-
-python_install_all() {
-	if use examples ; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto examples
-		dodoc -r examples/.
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pylint/pylint-2.9.5.ebuild b/dev-python/pylint/pylint-2.9.5.ebuild
deleted file mode 100644
index 3007ff106485..000000000000
--- a/dev-python/pylint/pylint-2.9.5.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python code static checker"
-HOMEPAGE="https://www.logilab.org/project/pylint
-	https://pypi.org/project/pylint/
-	https://github.com/pycqa/pylint/"
-SRC_URI="
-	https://github.com/pycqa/pylint/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="examples"
-
-RDEPEND="
-	<dev-python/astroid-2.7[${PYTHON_USEDEP}]
-	>=dev-python/astroid-2.6.5[${PYTHON_USEDEP}]
-	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
-	<dev-python/isort-6[${PYTHON_USEDEP}]
-	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.7[${PYTHON_USEDEP}]
-	>=dev-python/toml-0.7.1[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4.4-sphinx-theme.patch"
-)
-
-distutils_enable_sphinx doc --no-autodoc
-distutils_enable_tests pytest
-
-python_test() {
-	local skipped_tests=(
-		# No need to run the benchmarks
-		tests/benchmark/test_baseline_benchmarks.py
-	)
-	# Specify the test directory explicitly to avoid import file mismatches
-	epytest tests ${skipped_tests[@]/#/--deselect }
-}
-
-python_install_all() {
-	if use examples ; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto examples
-		dodoc -r examples/.
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyopengl/pyopengl-3.1.5.ebuild b/dev-python/pyopengl/pyopengl-3.1.5.ebuild
index 20d5ace3cdac..7e26101248b7 100644
--- a/dev-python/pyopengl/pyopengl-3.1.5.ebuild
+++ b/dev-python/pyopengl/pyopengl-3.1.5.ebuild
@@ -12,7 +12,7 @@ MY_PN="PyOpenGL"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Python OpenGL bindings"
-HOMEPAGE="https://sourceforge.net/projects/pyopengl/ https://pypi.org/project/PyOpenGL/"
+HOMEPAGE="http://pyopengl.sourceforge.net/ https://pypi.org/project/PyOpenGL/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-python/python-debian/Manifest b/dev-python/python-debian/Manifest
index ef60d287df96..d01aef71f708 100644
--- a/dev-python/python-debian/Manifest
+++ b/dev-python/python-debian/Manifest
@@ -1,2 +1 @@
-DIST python-debian_0.1.39.tar.xz 319020 BLAKE2B de38ddc6e4878404f9685a264e1198e513cb57f7bfea064e4512ee00049d007b6007ee7fea42e18bd2f12dc8132582fbea2235694b5f908c9ae5cbc830cfe98a SHA512 de29ef224a17b149dde8cf6bb4b9fe77aa1fdfc040463163fb97f7e4ed283f16af43422e26c352183fd74e9e0ff6b41a91ee18c63b5534d5c9de2ef663c8f4df
 DIST python-debian_0.1.40.tar.xz 319952 BLAKE2B 4d5c2d3202ef09fc8eba4e0c4f9a5861d0662f288768cb9026e1ab43309a57fb21c0b8e87734c9310f39646e071947b31b17bd48b71510e7d783af9f337c3ed1 SHA512 73ed735a3c7bb43208aa26ea9fd64fc658e111dc201ae8c1947a4e5835ebd675e37b78d2895d72bd5ed2b6afa491e77b50bd5f10d62ea8299fbdda6c0b9e5095
diff --git a/dev-python/python-debian/python-debian-0.1.39.ebuild b/dev-python/python-debian/python-debian-0.1.39.ebuild
deleted file mode 100644
index 68f263ae2929..000000000000
--- a/dev-python/python-debian/python-debian-0.1.39.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2011-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 modules to work with Debian-related data formats"
-HOMEPAGE="https://salsa.debian.org/python-debian-team/python-debian"
-SRC_URI="mirror://debian/pool/main/${P:0:1}/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="GPL-2 GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? ( app-arch/dpkg )
-"
-
-distutils_enable_tests unittest
-
-PATCHES=( "${FILESDIR}/0.1.39-disable-apt-pkg.patch" )
-
-python_compile_all() {
-	${EPYTHON} lib/debian/doc-debtags > README.debtags || die
-}
-
-python_test() {
-	eunittest lib
-}
diff --git a/dev-python/pythondialog/pythondialog-3.5.1.ebuild b/dev-python/pythondialog/pythondialog-3.5.1.ebuild
index 614e106d9970..c2be7cfad954 100644
--- a/dev-python/pythondialog/pythondialog-3.5.1.ebuild
+++ b/dev-python/pythondialog/pythondialog-3.5.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="A Python module for making simple text/console-mode user interfaces"
-HOMEPAGE="https://sourceforge.net/projects/pythondialog/"
+HOMEPAGE="http://pythondialog.sourceforge.net/"
 SRC_URI="mirror://sourceforge/pythondialog/${PV}/python3-${P}.tar.bz2"
 
 LICENSE="LGPL-2"
diff --git a/dev-python/quex/quex-0.71.2.ebuild b/dev-python/quex/quex-0.71.2.ebuild
index f6f3abd61f4f..f3b998960542 100644
--- a/dev-python/quex/quex-0.71.2.ebuild
+++ b/dev-python/quex/quex-0.71.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit python-single-r1
 
 DESCRIPTION="Mode Oriented Directly Coded Lexical Analyser Generator"
-HOMEPAGE="https://sourceforge.net/projects/quex/"
+HOMEPAGE="http://quex.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
 
 LICENSE="LGPL-2.1"
diff --git a/dev-python/ruamel-yaml/Manifest b/dev-python/ruamel-yaml/Manifest
index cf99433442b3..1287d758d894 100644
--- a/dev-python/ruamel-yaml/Manifest
+++ b/dev-python/ruamel-yaml/Manifest
@@ -1,2 +1 @@
 DIST ruamel-yaml-0.17.10.tar.xz 183116 BLAKE2B 2795f470a3f7da609780109dfac502a5b47184f465c68420f467209275c8857418a4ec7424e130df2e7acef614d93f91551910eceb06cd9e49b365bb23d2a015 SHA512 3cd2598fa37564c44c74720e72babcd2252b2dbcdde626bdcf771b591da5d2852d90bb1f22428e28cd7ec38304be2a437aa0569ffbd3ebb526b2b79a955bc88d
-DIST ruamel-yaml-0.17.9.tar.xz 183112 BLAKE2B 3dc33257435aa164724f8023c3bcd2f693c5dfbb4ac52467c821902819183e119f46e7dbcdab50216c019aa38a3d8fb94eb382c85edc0a08a278492ef53b2597 SHA512 dabc5540f68454d8abb46434bc91161ceb7bc613593c6aad79a4148c4526248d6053e356eb745e4cec7816885c1352f62d3c0a61d3d8a40315fd3ffb0e2f57ef
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.17.9.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.17.9.ebuild
deleted file mode 100644
index 070fa5af3dba..000000000000
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.17.9.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 ~riscv 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/urllib3/Manifest b/dev-python/urllib3/Manifest
index db0a91444981..1315b669df3c 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -1,2 +1 @@
-DIST urllib3-1.26.5.tar.gz 292865 BLAKE2B 0b22a485635f70f198c022c13d03af2b1a9b6907276e3bc3acaa2242e1c632447762f86e9588e735462e6479ff93a172f458691ea9bf28ceaebd5e1cfbc55501 SHA512 4a1899b223b00894d49f6dff5fc95d410e5b0ab28c11f7e3cd82d03e50438b0c5b0adf693a33fd80f1586312dc0012836713998674da15531bf82d52645881f6
 DIST urllib3-1.26.6.tar.gz 289927 BLAKE2B 197b0df759b27fc4906c565426e9c7b533fad56f10695ab5ae6c6c4d05d5c889dba906be526d8b8f41405f29696046b7db6e2cbb2fa16843af80e072138cc35f SHA512 19eb4b88b7a575db717db420ff79b304769d9a6d2b576a236d69719101c4d52d6b0079bd049c885e630f0dfd60471f8bb33836847e0569652cddece910ec2979
diff --git a/dev-python/urllib3/urllib3-1.26.5.ebuild b/dev-python/urllib3/urllib3-1.26.5.ebuild
deleted file mode 100644
index 7f51095934da..000000000000
--- a/dev-python/urllib3/urllib3-1.26.5.ebuild
+++ /dev/null
@@ -1,65 +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="ssl(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
-HOMEPAGE="https://github.com/urllib3/urllib3"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="brotli test"
-RESTRICT="!test? ( test )"
-
-# dev-python/{pyopenssl,cryptography,idna,certifi} are optional runtime
-# dependencies. Do not add them to RDEPEND. They should be unnecessary with
-# modern versions of python (>= 3.2).
-RDEPEND="
-	>=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
-	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
-	brotli? ( dev-python/brotlicffi[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep "
-			${RDEPEND}
-			dev-python/brotlicffi[\${PYTHON_USEDEP}]
-			dev-python/mock[\${PYTHON_USEDEP}]
-			dev-python/pytest[\${PYTHON_USEDEP}]
-			dev-python/pytest-freezegun[\${PYTHON_USEDEP}]
-			>=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}]
-			>=www-servers/tornado-4.2.1[\${PYTHON_USEDEP}]
-		" python3_{6..10})
-	)
-"
-
-python_prepare_all() {
-	# tests failing if 'localhost.' cannot be resolved
-	sed -e 's:test_dotted_fqdn:_&:' \
-		-i test/with_dummyserver/test_https.py || die
-	sed -e 's:test_request_host_header_ignores_fqdn_dot:_&:' \
-		-i test/with_dummyserver/test_socketlevel.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x CI=1
-	# FIXME: get tornado ported
-	# please keep in sync with BDEPEND!
-	has "${EPYTHON}" python3.{6..10} || continue
-
-	local deselect=(
-		# TODO?
-		test/with_dummyserver/test_socketlevel.py::TestSocketClosing::test_timeout_errors_cause_retries
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/weasyprint/Manifest b/dev-python/weasyprint/Manifest
index 75a4329f47ea..e6ff078566cc 100644
--- a/dev-python/weasyprint/Manifest
+++ b/dev-python/weasyprint/Manifest
@@ -2,3 +2,4 @@ DIST WeasyPrint-51.tar.gz 308411 BLAKE2B f88f9e1abc09986d51d92d8a153c71242cadc8c
 DIST WeasyPrint-52.3.tar.gz 325076 BLAKE2B 2981a487938d4ceefe20da36262438a64c30beaff340be6bd48b0140f63ea3971ca80a36386dde2db270e1555b137a89480673c4fdc2fa49079efdf58e53029b SHA512 7db740dd8f7264f73efe6e2505c603cedb1f8e5c053447b03517bdb003b933e1ef58f15482d4ab316b04b6631f9102752670f8b56989983cab80f7bd110746c9
 DIST WeasyPrint-52.4.tar.gz 325062 BLAKE2B ead641007e84664dfc1a9b95a227d5c6539e19e629d95d68b663b46a873ffa83b203897dd4d03c5d72f00e2737268c64624b97a37840c86d4a555f5b1a20a7bb SHA512 0003f9b46452e60118e7f6944f0bf48b6f548814dae10f990bedb124d3c67d9c530c30ee142d416f448b3b479f54b4fcdf01e31747957438192c77031926cb8c
 DIST WeasyPrint-52.5.tar.gz 325050 BLAKE2B 425a21acba183a3313069724972a7627aeaf326ce42e84789c02552f51a660be7b1d2855b76a3034ae09c316b6f0a13219464b88af8bb8f0ca59ab8ffd263223 SHA512 0ce86db000adef95fabfb335c069ad2a602ed98056219cedde905c550b04b10b0881d72fbdd38a48fae4e263825f5fbd8a70ce13932083afb8930eacc5817fb5
+DIST weasyprint-53.0.tar.gz 386339 BLAKE2B 6d8e30a02d54061557e549a685944de7cbc61f4c1b46b23dbaef66e87232325f630fd5a34cf5c846599612914f9306b5235fad65a008e19a7c200af2f4c7d9da SHA512 de34ee5654ee90aec82b67c1bc7d9496fe3a4247b2a649ab110d1613c4780fd9ae611c9da177de07e5287749978af9a4a7d5c102d0940e5fd970e5aa8586c47e
diff --git a/dev-python/weasyprint/weasyprint-53.0.ebuild b/dev-python/weasyprint/weasyprint-53.0.ebuild
new file mode 100644
index 000000000000..9de3bd49bcbc
--- /dev/null
+++ b/dev-python/weasyprint/weasyprint-53.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Visual rendering engine for HTML and CSS that can export to PDF"
+HOMEPAGE="https://weasyprint.org https://github.com/Kozea/WeasyPrint"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="jpeg tiff"
+
+# Note: specific subslot of pango since it inlines some of pango headers.
+#	>=dev-python/lxml-3.0[${PYTHON_USEDEP}]
+RDEPEND="
+	>=dev-python/cffi-0.6:=[${PYTHON_USEDEP}]
+	>=dev-python/cssselect2-0.1[${PYTHON_USEDEP}]
+	>=dev-python/fonttools-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/html5lib-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/pillow-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pydyf-0.0.3[${PYTHON_USEDEP}]
+	>=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/tinycss2-1.0.0[${PYTHON_USEDEP}]
+	x11-libs/pango
+"
+
+BDEPEND="
+	test? (
+		media-fonts/ahem
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/addopts/d' pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/yapsy/yapsy-1.12.2.ebuild b/dev-python/yapsy/yapsy-1.12.2.ebuild
index f76c5e5197bc..c395d4c3daf2 100644
--- a/dev-python/yapsy/yapsy-1.12.2.ebuild
+++ b/dev-python/yapsy/yapsy-1.12.2.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 MY_P="Yapsy-${PV}"
 DESCRIPTION="A fat-free DIY Python plugin management toolkit"
-HOMEPAGE="https://sourceforge.net/projects/yapsy/"
+HOMEPAGE="http://yapsy.sourceforge.net/"
 SRC_URI="mirror://sourceforge/yapsy/${MY_P}/${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"