diff --git a/dev-libs/olm/olm-3.2.2-r1.ebuild b/dev-libs/olm/olm-3.2.2-r1.ebuild
new file mode 100644
index 0000000..7ea86d6
--- /dev/null
+++ b/dev-libs/olm/olm-3.2.2-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_OPTIONAL=1
+
+inherit cmake distutils-r1
+
+DESCRIPTION="An implementation of the Double Ratchet cryptographic ratchet in C++"
+HOMEPAGE="https://git.matrix.org/git/olm/about/"
+
+if [[ "${PV}" == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.matrix.org/matrix-org/${PN}.git"
+else
+	SRC_URI="https://gitlab.matrix.org/matrix-org/${PN}/-/archive/${PV}/${P}.tar.bz2"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0/$(ver_cut 1)"
+IUSE="python test"
+REQUIRED_USE="doc? ( python )"
+
+DEPEND="
+	python? (
+		>=dev-python/cffi-1.0.0[${PYTHON_USEDEP}]
+		dev-python/future[${PYTHON_USEDEP}]
+		test? (
+			  dev-python/aspectlib[${PYTHON_USEDEP}]
+			  dev-python/pytest-benchmark[${PYTHON_USEDEP}]
+			  dev-python/pytest-cov[${PYTHON_USEDEP}]
+			  dev-python/pytest-flake8[${PYTHON_USEDEP}]
+			  dev-python/pytest-isort[${PYTHON_USEDEP}]
+		)
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx "${S}"/python/docs
+
+DOCS=( "${S}/docs/" )
+
+src_prepare() {
+	cmake_src_prepare
+	if use python; then
+		pushd python || die
+		distutils-r1_src_prepare
+		popd || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DOLM_TESTS=$(usex test ON OFF)
+	)
+	cmake_src_configure
+	if use python; then
+		pushd python || die
+		distutils-r1_src_configure
+		popd || die
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+	if use python; then
+		pushd python || die
+		# Let python build find the already built libolm
+		export LIBRARY_PATH="${BUILD_DIR}/"
+		distutils-r1_src_compile
+		popd || die
+	fi
+}
+
+src_install() {
+	cmake_src_install
+	if use python; then
+		pushd python || die
+		distutils-r1_src_install
+		popd || die
+	fi
+	einstalldocs
+}
+
+src_test() {
+	emake test
+	if use python; then
+		pushd python || die
+		distutils-r1_src_test
+		popd || die
+	fi
+}
diff --git a/dev-perl/File-Rename/File-Rename-1.20.ebuild b/dev-perl/File-Rename/File-Rename-1.20.ebuild
new file mode 100644
index 0000000..ce42c1b
--- /dev/null
+++ b/dev-perl/File-Rename/File-Rename-1.20.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=RMBARKER
+inherit perl-module
+
+DESCRIPTION="Perl extension for renaming multiple files"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# No virtuals for
+#   Pod::Usage
+#   File::Basename
+#   Test::More
+
+RDEPEND="
+	virtual/perl-ExtUtils-MakeMaker
+	virtual/perl-File-Spec
+	virtual/perl-Getopt-Long
+"
+BDEPEND="
+	dev-perl/Module-Build
+	virtual/perl-File-Spec
+"
+
+# There are differences between distributions on the name of this binary.
+# currently Debian derivatives call it prename while Arch derivatives call
+# it perl-rename. It can't be named "rename" as util-linux provides
+# a binary of the same name.
+
+src_prepare() {
+	# Rename script name from "rename" to "prename" to not conflict with "rename" from util-linux
+	sed -i '/my \$script/,/;/ s/\([^-]\)rename/\1prename/' Build.PL || die
+	# Modify man page to make sense with previous change to script name
+	sed -i \
+		-e '/\=head1 NAME/,/^rename/ s/^rename/prename/' \
+		-e '/\=head1 SYNOPSIS/,/B<rename>/ s/B<rename>/B<prename>/' \
+		-e '/\=head1 DESCRIPTION/,/C<rename>/ s/C<rename>/C<prename>/' \
+		-e '/\=head2 Examples/,/\=head1 OPTIONS/ s/\(^\s\)rename/\1prename/' \
+		rename.PL || die
+	default
+}
diff --git a/dev-perl/File-Rename/Manifest b/dev-perl/File-Rename/Manifest
index 3a7b219..f4fcea4 100644
--- a/dev-perl/File-Rename/Manifest
+++ b/dev-perl/File-Rename/Manifest
@@ -1 +1,2 @@
 DIST File-Rename-1.10.tar.gz 13674 BLAKE2B ef6125835660a6bad7fde0b4f59c854951e709651a0610ab02b756c9c03dae36c655104b34ebaf14fedb76ac06be670966a6c771f77656fd471d6cbfc6549712 SHA512 c40b091692fc3a53b128d8089754fafaf2e072f9b77e962617a9618639f2cb7c547a369949e4f41594d2bc9961ab99ec789c6151c5fc473e5ac160fd375ce629
+DIST File-Rename-1.20.tar.gz 15139 BLAKE2B b0ecdd0ceda467c7fe92bd218d91dc950686d79756690ced78173c87affb93547067df2fbb567b987d6b5acf9afabd56eb0930840b0add7716aeb83dcaa72f3a SHA512 3ba6bfe6f1b69c4f8e43ea7164d6c84a368f4954e29ca731bc7e59d35b59a62c82aa9d7a1a617c15d63a227ba5c73f76d1cb0939d1b393fd2c53fe8d4f441966
diff --git a/dev-python/aiofiles/Manifest b/dev-python/aiofiles/Manifest
deleted file mode 100644
index 2c0b011..0000000
--- a/dev-python/aiofiles/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST aiofiles-0.5.0.tar.gz 13332 BLAKE2B ccd044ce9fcd74b2a6419b4f0e9e3977086c9685741dbb734a7f9222ab96dca58b5330ad0d0cd9f10fce03ee123add7101825f047451344fc451c40a4352674e SHA512 89eb1af506bdf5f3f2e9c3afe90f17d521ada1cdeb449dcdc800d4faa4edc1c9ca93811915aa059d8c5a1b0a3aaa40231a46b3d041ca745e071628293bddf1b7
diff --git a/dev-python/aiofiles/aiofiles-0.5.0.ebuild b/dev-python/aiofiles/aiofiles-0.5.0.ebuild
deleted file mode 100644
index ae63743..0000000
--- a/dev-python/aiofiles/aiofiles-0.5.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Copied from the Gentoo repo, only exists to add python3,9 support in PYTHON_COMPAT
-
-DISTUTILS_USE_SETUPTOOLS=bdepend
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="File support for asyncio"
-HOMEPAGE="https://github.com/Tinche/aiofiles"
-SRC_URI="https://github.com/Tinche/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="test? (
-	>=dev-python/pytest-5.4[${PYTHON_USEDEP}]
-	dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/aiofiles/metadata.xml b/dev-python/aiofiles/metadata.xml
deleted file mode 100644
index c31c7fb..0000000
--- a/dev-python/aiofiles/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<upstream>
-		<remote-id type="github">Tinche/aiofiles</remote-id>
-		<bugs-to>https://github.com/Tinche/aiofiles/issues</bugs-to>
-		<remote-id type="pypi">aiofiles</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/aioresponses/Manifest b/dev-python/aioresponses/Manifest
new file mode 100644
index 0000000..542a81e
--- /dev/null
+++ b/dev-python/aioresponses/Manifest
@@ -0,0 +1 @@
+DIST aioresponses-0.7.2.tar.gz 28135 BLAKE2B 300d06ed43ad81d61fe9cab4002b9e9bb062a48aabed8aed21e3a8e26d8e153546ed079e6dda6ef26c6df2e843663ed9e02b2855ac71e011b873da926923a72d SHA512 847c687990c38733c714cfd7b4f268406392aeea6764f084dae25f43246b7b5731f149067fb921864b1b22c9e7b2ca66254ff311d726333d0b23a5566ab18029
diff --git a/dev-python/aioresponses/aioresponses-0.7.2.ebuild b/dev-python/aioresponses/aioresponses-0.7.2.ebuild
new file mode 100644
index 0000000..59e5857
--- /dev/null
+++ b/dev-python/aioresponses/aioresponses-0.7.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="Aioresponses is a helper for mock/fake web requests in python aiohttp package. "
+HOMEPAGE="https://github.com/pnuckowski/aioresponses"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+# Tests hard depend on internet access
+RESTRICT="test"
+#RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/aiohttp[${PYTHON_USEDEP}]
+"
+#DEPEND="
+#	test? (
+#		  ${RDEPEND}
+#		  dev-python/ddt[${PYTHON_USEDEP}]
+#		  dev-python/pytest-cov[${PYTHON_USEDEP}]
+#	)
+#"
+BDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx )
+"
+
+#distutils_enable_tests pytest
+
+python_compile_all() {
+	use doc && emake -C docs -j1 html
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/aioresponses/metadata.xml b/dev-python/aioresponses/metadata.xml
new file mode 100644
index 0000000..017bcb1
--- /dev/null
+++ b/dev-python/aioresponses/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>parona@protonmail.com</email>
+    <name>Alfred Wingate</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">pnuckowski/aioresponses</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/aspectlib/Manifest b/dev-python/aspectlib/Manifest
new file mode 100644
index 0000000..df45009
--- /dev/null
+++ b/dev-python/aspectlib/Manifest
@@ -0,0 +1 @@
+DIST aspectlib-1.5.2.tar.gz 163704 BLAKE2B a4bc51fc75ec1d3dd659e1de78b80c16145f927ee1af5cb41ab9a049051683da708ce63efaa4ad767066ed4cc463108f8be74ebc4145b868d8a5ed07b2a73652 SHA512 999f7e893aee15d5bd89ae9aa45b82b639aae777ec5e946f7f0ee5aa7c2153d6a05ae0f1e95b7f5cdb4f4d12f188093479d9c50df6c7521003e83289cabb494b
diff --git a/dev-python/aspectlib/aspectlib-1.5.2.ebuild b/dev-python/aspectlib/aspectlib-1.5.2.ebuild
new file mode 100644
index 0000000..843c2fa
--- /dev/null
+++ b/dev-python/aspectlib/aspectlib-1.5.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="An aspect-oriented programming, monkey-patch and decorators library."
+HOMEPAGE="https://github.com/ionelmc/python-aspectlib"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/fields[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/sphinx-py3doc-enhanced-theme[${PYTHON_USEDEP}]
+	test? (
+		  ${RDEPEND}
+		  dev-python/process-tests[${PYTHON_USEDEP}]
+		  www-servers/tornado[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	dev-python/sphinx
+"
+
+distutils_enable_tests pytest
+
+PATCHES=( "${FILESDIR}/Remove-tornado-6-test-constraint.patch" )
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build -b html docs docs/_build/html || die
+	fi
+	sphinx-build -b man docs docs/_build/man || die
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	doman docs/_build/man/*
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/aspectlib/files/Remove-tornado-6-test-constraint.patch b/dev-python/aspectlib/files/Remove-tornado-6-test-constraint.patch
new file mode 100644
index 0000000..a4c8256
--- /dev/null
+++ b/dev-python/aspectlib/files/Remove-tornado-6-test-constraint.patch
@@ -0,0 +1,43 @@
+From 7dccb198dfb426f529b81a28a755f3c02f8b50cb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ionel=20Cristian=20M=C4=83rie=C8=99?= <contact@ionelmc.ro>
+Date: Sun, 2 May 2021 09:50:43 +0300
+Subject: [PATCH] Remove tornado<6 test constraint. Ref #15.
+
+---
+ tests/test_integrations_py3.py | 5 ++++-
+ tox.ini                        | 3 ++-
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test_integrations_py3.py b/tests/test_integrations_py3.py
+index e025eac..596589d 100644
+--- a/tests/test_integrations_py3.py
++++ b/tests/test_integrations_py3.py
+@@ -36,7 +36,10 @@ def test_decorate_tornado_coroutine():
+     @gen.coroutine
+     @debug.log(print_to=buf, module=False, stacktrace=2, result_repr=repr)
+     def coro():
+-        yield gen.Task(loop.add_timeout, timedelta(microseconds=10))
++        if hasattr(gen, 'Task'):
++            yield gen.Task(loop.add_timeout, timedelta(microseconds=10))
++        else:
++            yield gen.sleep(0.01)
+         return "result"
+ 
+     loop = ioloop.IOLoop.current()
+diff --git a/tox.ini b/tox.ini
+index c9cbc83..1bd1d1c 100644
+--- a/tox.ini
++++ b/tox.ini
+@@ -51,7 +51,8 @@ deps =
+     pytest-clarity
+     pytest-cov
+     pytest-travis-fold
+-    tornado<6.0
++    six
++    tornado
+ commands =
+     {posargs:pytest --cov --cov-report=term-missing -vv --ignore=src}
+ 
+-- 
+2.26.3
+
diff --git a/dev-python/aspectlib/metadata.xml b/dev-python/aspectlib/metadata.xml
new file mode 100644
index 0000000..ab96243
--- /dev/null
+++ b/dev-python/aspectlib/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>parona@protonmail.com</email>
+    <name>Alfred Wingate</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ionelmc/python-aspectlib</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/blist/blist-1.3.6.ebuild b/dev-python/blist/blist-1.3.6.ebuild
index 9963584..63ad3a9 100644
--- a/dev-python/blist/blist-1.3.6.ebuild
+++ b/dev-python/blist/blist-1.3.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..8} )
 inherit distutils-r1
 
 DESCRIPTION="A list-like type"
diff --git a/dev-python/hsluv-python/Manifest b/dev-python/hsluv-python/Manifest
index 00c6ee9..94f2169 100644
--- a/dev-python/hsluv-python/Manifest
+++ b/dev-python/hsluv-python/Manifest
@@ -1 +1,2 @@
+DIST hsluv-5.0.2.tar.gz 540619 BLAKE2B 287774633764fdd8f030a1f447e71ba5e6f99b30219905a8dd2d7632be7e99331244f765da1ded081f6c7250e94e8aa169a30160248221dee18a018118a2955b SHA512 0ad9ccb09412ae27f8ba6a160570b517939615eed19fe50f45a8def8ce99943752703c6c3ad2804d8abbafb680488070b48df50b275ebda742edd71f63ca457e
 DIST hsluv-python-5.0.0.tar.gz 540464 BLAKE2B 1358b26195b4868c438eb90c536814008c2a0922bc1c9205f7cc0853b7c471b18d74cd5d67e0ad7185bf8d9baed55a2e58b467ea6477242175e46910fdb3084a SHA512 01f880c5aebbf3c861b7dd593b0b5c215ca2223e24c80b18efa8c5457caab9fdcddae7462964d7f165bdd676022e0958ee9fc91000ae6c44a7faa0fd916a974d
diff --git a/dev-python/hsluv-python/hsluv-python-5.0.2.ebuild b/dev-python/hsluv-python/hsluv-python-5.0.2.ebuild
new file mode 100644
index 0000000..f08ac6e
--- /dev/null
+++ b/dev-python/hsluv-python/hsluv-python-5.0.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_PN="hsluv"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python implementation of HSLuv "
+HOMEPAGE="http://pypi.org/project/hsluv"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+distutils_enable_tests pytest
diff --git a/dev-python/matrix-nio/Manifest b/dev-python/matrix-nio/Manifest
index 256dee8..45be6cd 100644
--- a/dev-python/matrix-nio/Manifest
+++ b/dev-python/matrix-nio/Manifest
@@ -1,2 +1,2 @@
-DIST matrix-nio-0.16.0.tar.gz 228958 BLAKE2B 4b863f5dbf14334d3db0b346a79bb9cff34968b07d6c7a232416d5d38513dc1055c2ebe2c4c2eb6d15f603b062b12e46843d9362c3f35b5eafde9b9e4625e46f SHA512 5ae84a9cb8ba3f0a2f3fc3f4da39f4df54a74cd22e2508d8345c54edd2b9a5d944adcf0b466f631cd8fc0e89aae77519af86629bfb366d9ef6de0e357ff5139c
 DIST matrix-nio-0.17.0.tar.gz 240551 BLAKE2B 245faaf8604d14962b167ceddeb2cff03089c26216e3b8e695fb9e821cbbfe1c7d468d2f9a2e0a3d7a5f522c4f5b5d98c8fb661884a8e1fc48f7e6e7a848e9fa SHA512 eee5f6f97eab81ef28d8aaaf580a8f91ed56ae13b3795f89eaf90ead7fb62b2ce7c71cc768aac01dd9baacc44b36dff00cacaf9d51ef62f009c05d3ae3f3241e
+DIST matrix-nio-0.18.1.tar.gz 240808 BLAKE2B e4048eb7271ecb0208d766987c8151ad52bf4105dd84aafd12264bdb24165684bdbd5c1740cf595953847aa1280abd2c1c13ed9d96680ec3ea445005a611130e SHA512 46974d52f02cba71df25ee38c41d7bc458b6f8a1cd089cd6e15cb3ea0cfe2e47387ef5c415f2a18a2d01dac8e4d4b378e7aad9f5162371b6f0f40172929962d4
diff --git a/dev-python/matrix-nio/matrix-nio-0.16.0.ebuild b/dev-python/matrix-nio/matrix-nio-0.16.0.ebuild
deleted file mode 100644
index 0e4cc3d..0000000
--- a/dev-python/matrix-nio/matrix-nio-0.16.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9})
-DISTUTILS_USE_SETUPTOOLS="pyproject.toml"
-
-inherit distutils-r1
-
-DESCRIPTION="A Python Matrix client library, designed according to sans I/O principles"
-HOMEPAGE="https://github.com/poljar/matrix-nio"
-SRC_URI="https://github.com/poljar/matrix-nio/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="e2e"
-
-
-RDEPEND="
-	dev-python/future
-	dev-python/aiohttp
-	dev-python/aiofiles
-	dev-python/h11
-	dev-python/hyper-h2
-	dev-python/logbook
-	dev-python/jsonschema
-	dev-python/unpaddedbase64
-	dev-python/pycryptodome
-	e2e? (
-		>=dev-libs/olm-3.1.5[python(-)]
-		>=dev-python/peewee-3.9.5
-		dev-python/cachetools
-		dev-python/atomicwrites
-	)
-"
diff --git a/dev-python/matrix-nio/matrix-nio-0.18.1.ebuild b/dev-python/matrix-nio/matrix-nio-0.18.1.ebuild
new file mode 100644
index 0000000..d43c0fb
--- /dev/null
+++ b/dev-python/matrix-nio/matrix-nio-0.18.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9})
+DISTUTILS_USE_SETUPTOOLS="pyproject.toml"
+
+inherit distutils-r1
+
+DESCRIPTION="A Python Matrix client library, designed according to sans I/O principles"
+HOMEPAGE="https://github.com/poljar/matrix-nio"
+SRC_URI="https://github.com/poljar/matrix-nio/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc e2e test"
+
+RDEPEND="
+	>=dev-python/future-0.18.2[${PYTHON_USEDEP}]
+	>=dev-python/aiohttp-3.7.4[${PYTHON_USEDEP}]
+	>=dev-python/aiohttp-socks-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/aiofiles-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/h11-0.12.0[${PYTHON_USEDEP}]
+	>=dev-python/hyper-h2-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/logbook-1.5.3[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/unpaddedbase64-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/pycryptodome-3.10.1[${PYTHON_USEDEP}]
+	e2e? (
+		>=dev-libs/olm-3.1.3[python(-),${PYTHON_USEDEP}]
+		>=dev-python/peewee-3.14.4[${PYTHON_USEDEP}]
+		>=dev-python/cachetools-4.2.1[${PYTHON_USEDEP}]
+		>=dev-python/atomicwrites-1.4.0[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="
+	test? (
+		  ${RDEPEND}
+		  dev-python/aioresponses[${PYTHON_USEDEP}]
+		  dev-python/atomicwrites[${PYTHON_USEDEP}]
+		  dev-python/cachetools[${PYTHON_USEDEP}]
+		  dev-python/Faker[${PYTHON_USEDEP}]
+		  dev-python/peewee[${PYTHON_USEDEP}]
+		  dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+		  dev-python/pytest-flake8[${PYTHON_USEDEP}]
+		  dev-python/pytest-isort[${PYTHON_USEDEP}]
+		  dev-python/pytest-cov[${PYTHON_USEDEP}]
+		  dev-python/pytest-benchmark[${PYTHON_USEDEP}]
+		  dev-python/hpack[${PYTHON_USEDEP}]
+		  dev-python/hyperframe[${PYTHON_USEDEP}]
+		  dev-python/hypothesis[${PYTHON_USEDEP}]
+		  dev-python/mypy[${PYTHON_USEDEP}]
+		  dev-python/mypy_extensions[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	doc? ( dev-python/sphinx )
+"
+
+distutils_enable_tests pytest
+
+# Tests dont parallelize happily
+
+python_compile_all() {
+	if use doc; then
+		emacs -C docs html || die
+	fi
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pygal/Manifest b/dev-python/pygal/Manifest
new file mode 100644
index 0000000..2b4893b
--- /dev/null
+++ b/dev-python/pygal/Manifest
@@ -0,0 +1 @@
+DIST pygal-3.0.0.dev1.tar.gz 3586092 BLAKE2B 4b266df0b3cbc21aae5270578383d58c2e63928f151ea81e760a036044027d64a6f2f2ccbc964d5918e1134ee07b9e4d175bdcbf59d84c09f8f8e9b35f707a7f SHA512 d4ddeb7533513ff605d331b6b7c3ebc10c02ccacbab509c77e3c594b0417a82e7744e12f8cb416d9232066933f432a616c84f0cd9e246543fea447345cd364a7
diff --git a/dev-python/pygal/metadata.xml b/dev-python/pygal/metadata.xml
new file mode 100644
index 0000000..c23acc4
--- /dev/null
+++ b/dev-python/pygal/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>parona@protonmail.com</email>
+    <name>Alfred Wingate</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">Kozea/pygal</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pygal/pygal-3.0.0_pre1.ebuild b/dev-python/pygal/pygal-3.0.0_pre1.ebuild
new file mode 100644
index 0000000..a847859
--- /dev/null
+++ b/dev-python/pygal/pygal-3.0.0_pre1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1 multiprocessing
+
+MY_P="${PN}-${PV/_pre/.dev}"
+
+DESCRIPTION="PYthon svg GrAph plotting Library "
+# http://pygal.org/ is dead as of 20210519, therefore use the next best thing
+HOMEPAGE="https://github.com/Kozea/pygal"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="man test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/lxml[${PYTHON_USEDEP}]
+	media-gfx/cairosvg[${PYTHON_USEDEP}]
+"
+DEPEND="
+	man? (
+		 dev-python/pygal_sphinx_directives
+		 dev-python/sphinx_rtd_theme
+	)
+	test? (
+		  ${RDEPEND}
+		  dev-python/flask[${PYTHON_USEDEP}]
+		  dev-python/pygal_maps_ch[${PYTHON_USEDEP}]
+		  dev-python/pygal_maps_fr[${PYTHON_USEDEP}]
+		  dev-python/pygal_maps_world[${PYTHON_USEDEP}]
+		  dev-python/pytest-cov[${PYTHON_USEDEP}]
+		  dev-python/pytest-flake8[${PYTHON_USEDEP}]
+		  dev-python/pytest-isort[${PYTHON_USEDEP}]
+		  dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		  dev-python/pyquery[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	man? ( dev-python/sphinx )
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs dev-python/pygal_sphinx_directives dev-python/sphinx_rtd_theme
+
+python_prepare_all() {
+	sed -i -e '/pytest-runner/d' setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use man && emake -C docs -j1 man
+	sphinx_compile_all
+}
+
+python_test() {
+	epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+python_install_all() {
+	use man && doman docs/_build/man/*
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pygal_maps_ch/Manifest b/dev-python/pygal_maps_ch/Manifest
new file mode 100644
index 0000000..07d53e5
--- /dev/null
+++ b/dev-python/pygal_maps_ch/Manifest
@@ -0,0 +1 @@
+DIST pygal_maps_ch-1.0.1.tar.gz 57742 BLAKE2B 1c82f26e4466c54f3954341ea4b3b6ae04e5e6b2d6c4d01ce06a5eb5b4a1d00b887263d06bddac8e357663f8d22b36460ed4f99d164e8843a0a3ca05556421ce SHA512 1fb8a2db13742e6c2660b9be5cbdc26c8d30e9baa54561742b732e6c62d66f52ee0f30271f3205f353cb048822312e855fea8fdef049a1cea46f59e6435f62d5
diff --git a/dev-python/pygal_maps_ch/metadata.xml b/dev-python/pygal_maps_ch/metadata.xml
new file mode 100644
index 0000000..d873d4b
--- /dev/null
+++ b/dev-python/pygal_maps_ch/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>parona@protonmail.com</email>
+    <name>Alfred Wingate</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pygal_maps_ch</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pygal_maps_ch/pygal_maps_ch-1.0.1.ebuild b/dev-python/pygal_maps_ch/pygal_maps_ch-1.0.1.ebuild
new file mode 100644
index 0000000..30342d5
--- /dev/null
+++ b/dev-python/pygal_maps_ch/pygal_maps_ch-1.0.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="Swiss canton map for pygal"
+# http://pygal.org/ is dead as of 20210519, therefore use the next best thing
+HOMEPAGE="https://pypi.org/project/pygal_maps_ch/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+# There are no tests
+RESTRICT="test"
+
+RDEPEND="dev-python/pygal[${PYTHON_USEDEP}]"
diff --git a/dev-python/pygal_maps_fr/Manifest b/dev-python/pygal_maps_fr/Manifest
new file mode 100644
index 0000000..2da4183
--- /dev/null
+++ b/dev-python/pygal_maps_fr/Manifest
@@ -0,0 +1 @@
+DIST pygal_maps_fr-1.1.0.tar.gz 410058 BLAKE2B b5cb696ae10c06bd79eb5d15d29e8309b8d6cb8be476af37d5eccfded321db75a3f30facc11f22f21e860399df7393693e83060d988087b7d65654e6512c4a45 SHA512 897b3f1a4a7b63c1d7e668d94c9c073f45d336425c0367e23ead53e0cf667dda4984d3d8981a56e4228fcbc65b191a2f82f07a49e05f1135d0efc80770ede88e
diff --git a/dev-python/pygal_maps_fr/metadata.xml b/dev-python/pygal_maps_fr/metadata.xml
new file mode 100644
index 0000000..d290941
--- /dev/null
+++ b/dev-python/pygal_maps_fr/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>parona@protonmail.com</email>
+    <name>Alfred Wingate</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pygal_maps_fr</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pygal_maps_fr/pygal_maps_fr-1.1.0.ebuild b/dev-python/pygal_maps_fr/pygal_maps_fr-1.1.0.ebuild
new file mode 100644
index 0000000..cee476c
--- /dev/null
+++ b/dev-python/pygal_maps_fr/pygal_maps_fr-1.1.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="French maps for pygal"
+# http://pygal.org/ is dead as of 20210519, therefore use the next best thing
+HOMEPAGE="https://pypi.org/project/pygal_maps_fr/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+# There are no tests
+RESTRICT="test"
+
+RDEPEND="dev-python/pygal[${PYTHON_USEDEP}]"
diff --git a/dev-python/pygal_maps_world/Manifest b/dev-python/pygal_maps_world/Manifest
new file mode 100644
index 0000000..26aef14
--- /dev/null
+++ b/dev-python/pygal_maps_world/Manifest
@@ -0,0 +1 @@
+DIST pygal_maps_world-1.0.2.tar.gz 270781 BLAKE2B 820881ebf16dc76bb33209155fcbf8b42fa5cba5377f8a480e72fc217cb98acb749884894598adb77963abc4159ef6439da14f92d5987687779032c24d5e0852 SHA512 382c0bdffe9df6c0c4704c9eb87e142a30c4f6b8844d53e9f12a93e92214100d609d3b023379761607c9c3c1cb760230fe284b9b8b3d8f2f91f63dd306b97f53
diff --git a/dev-python/pygal_maps_world/metadata.xml b/dev-python/pygal_maps_world/metadata.xml
new file mode 100644
index 0000000..4b99416
--- /dev/null
+++ b/dev-python/pygal_maps_world/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>parona@protonmail.com</email>
+    <name>Alfred Wingate</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pygal_maps_world</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pygal_maps_world/pygal_maps_world-1.0.2.ebuild b/dev-python/pygal_maps_world/pygal_maps_world-1.0.2.ebuild
new file mode 100644
index 0000000..68ab335
--- /dev/null
+++ b/dev-python/pygal_maps_world/pygal_maps_world-1.0.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="World maps for pygal"
+# http://pygal.org/ is dead as of 20210519, therefore use the next best thing
+HOMEPAGE="https://pypi.org/project/pygal_maps_world/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+# There are no tests
+RESTRICT="test"
+
+RDEPEND="dev-python/pygal[${PYTHON_USEDEP}]"
diff --git a/dev-python/pygal_sphinx_directives/Manifest b/dev-python/pygal_sphinx_directives/Manifest
new file mode 100644
index 0000000..8de5c81
--- /dev/null
+++ b/dev-python/pygal_sphinx_directives/Manifest
@@ -0,0 +1 @@
+DIST pygal_sphinx_directives-1.0.1.tar.gz 1270 BLAKE2B 48d54fdca26dfad7d4c33d77682a3aeffd8f0c2a707fe8a38a8437dda0e2da9778a40dd23dfc268fe6e8aded40ee6652eb7e9d54381c82452f971f6924041e13 SHA512 b7c7730433beb16f6731cac712f036137e6ad304946f6727196b50807e05658950e3b02e93cd8d10ffa08320258ae2f21c120621b6dd00ad5eef88c5ffaffb9e
diff --git a/dev-python/pygal_sphinx_directives/metadata.xml b/dev-python/pygal_sphinx_directives/metadata.xml
new file mode 100644
index 0000000..b4e85f5
--- /dev/null
+++ b/dev-python/pygal_sphinx_directives/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>parona@protonmail.com</email>
+    <name>Alfred Wingate</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pygal_sphinx_directives</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pygal_sphinx_directives/pygal_sphinx_directives-1.0.1.ebuild b/dev-python/pygal_sphinx_directives/pygal_sphinx_directives-1.0.1.ebuild
new file mode 100644
index 0000000..ecc7ed3
--- /dev/null
+++ b/dev-python/pygal_sphinx_directives/pygal_sphinx_directives-1.0.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="Pygal sphinx integration"
+HOMEPAGE="https://pypi.org/project/pygal_sphinx_directives/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+# There are no tests
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/pygal[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/pygaljs/Manifest b/dev-python/pygaljs/Manifest
new file mode 100644
index 0000000..ae21075
--- /dev/null
+++ b/dev-python/pygaljs/Manifest
@@ -0,0 +1 @@
+DIST pygaljs-1.0.2.tar.gz 89711 BLAKE2B 64287ac1238183e34b99275218f8598546b455f9de7df0f8285691e253a8421d1287eb9c499910eed47d2e971d4f709d0341a7e56129cbcca70c938105e1d5ad SHA512 d7e0000e8cc55cde9ca455c4761c83202a95aadb2431086cb5ee21b44307f35ccc8431a50b43699814d0cdec0d8f4c14df68ec19c0ad0ac27f2c7eec85799a82
diff --git a/dev-python/pygaljs/metadata.xml b/dev-python/pygaljs/metadata.xml
new file mode 100644
index 0000000..6489861
--- /dev/null
+++ b/dev-python/pygaljs/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>parona@protonmail.com</email>
+    <name>Alfred Wingate</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ionelmc/python-pygaljs</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pygaljs/pygaljs-1.0.2.ebuild b/dev-python/pygaljs/pygaljs-1.0.2.ebuild
new file mode 100644
index 0000000..275aee3
--- /dev/null
+++ b/dev-python/pygaljs/pygaljs-1.0.2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="Python package providing assets from pygal.js"
+HOMEPAGE="https://github.com/ionelmc/python-pygaljs"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+distutils_enable_tests pytest
+
+DOCS=( "README.rst" )
diff --git a/dev-python/pytest-benchmark/Manifest b/dev-python/pytest-benchmark/Manifest
new file mode 100644
index 0000000..2b52de3
--- /dev/null
+++ b/dev-python/pytest-benchmark/Manifest
@@ -0,0 +1 @@
+DIST pytest-benchmark-3.4.1.tar.gz 340349 BLAKE2B 474743ef6c2d098ca6451e6da1a40686a529af901bf40ba8daf900844166895c676e3a95e8c252557d97d6668e077f625f96c90c00cdb4a1de021a5e5abae479 SHA512 630b27462796aea97c2d878bb936009d59e1c33be3f4219113eae5e389d2cd7912a7f7bc10a1a9a7abbfc4f69213be10a3cc68bbdceef0783f4b0a8a13600119
diff --git a/dev-python/pytest-benchmark/metadata.xml b/dev-python/pytest-benchmark/metadata.xml
new file mode 100644
index 0000000..b7d0c9b
--- /dev/null
+++ b/dev-python/pytest-benchmark/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>parona@protonmail.com</email>
+    <name>Alfred Wingate</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ionelmc/pytest-benchmark</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pytest-benchmark/pytest-benchmark-3.4.1.ebuild b/dev-python/pytest-benchmark/pytest-benchmark-3.4.1.ebuild
new file mode 100644
index 0000000..29ee627
--- /dev/null
+++ b/dev-python/pytest-benchmark/pytest-benchmark-3.4.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="py.test fixture for benchmarking code"
+HOMEPAGE="https://github.com/ionelmc/pytest-benchmark"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/aspectlib[${PYTHON_USEDEP}]
+	dev-python/elasticsearch-py[${PYTHON_USEDEP}]
+	dev-python/py-cpuinfo[${PYTHON_USEDEP}]
+	dev-python/pygal[${PYTHON_USEDEP}]
+	dev-python/pygaljs[${PYTHON_USEDEP}]
+	dev-python/pytest[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/sphinx-py3doc-enhanced-theme[${PYTHON_USEDEP}]
+	test? (
+		  ${RDEPEND}
+		  dev-python/freezegun[${PYTHON_USEDEP}]
+		  dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	dev-python/sphinx
+"
+
+distutils_enable_tests pytest
+
+DOCS=( "README.rst" )
+
+python_prepare_all() {
+	sed -i\
+		-e "/def test_help(testdir):/i@pytest.mark.xfail(reason='Not quite sure why it fails in the ebuild, please tell if it succeeds')" \
+		-e "/def test_help_compare(testdir, args):/i@pytest.mark.xfail(reason='Not quite sure why it fails in the ebuild, please tell if it succeeds')" \
+		tests/test_cli.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build -b html docs docs/_build/html || die
+	fi
+	sphinx-build -b man docs docs/_build/man || die
+}
+
+python_test() {
+	distutils_install_for_testing
+	epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	doman docs/_build/man/*
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pytest-black/Manifest b/dev-python/pytest-black/Manifest
new file mode 100644
index 0000000..3603865
--- /dev/null
+++ b/dev-python/pytest-black/Manifest
@@ -0,0 +1 @@
+DIST pytest-black-0.3.12.tar.gz 6898 BLAKE2B d37326527e9b3c4f755a99c71f254150b9eadc48e0dc4863af518ccf40dc97a60354402442dd979ead546a72a25398ae4d380fde5ca96afda76ae07415de95f0 SHA512 3bf6cc27a872f351ad1b49650d5b4758d14fea65627008204d2f45557c61e597def6aa6eb6f61fb439ebf783b4df997a3c4320ccbb65ee99d0dd9eaa6fde05bd
diff --git a/dev-python/pytest-black/files/fix-pytest.tmpdir.makefile-call.patch b/dev-python/pytest-black/files/fix-pytest.tmpdir.makefile-call.patch
new file mode 100644
index 0000000..3b59f09
--- /dev/null
+++ b/dev-python/pytest-black/files/fix-pytest.tmpdir.makefile-call.patch
@@ -0,0 +1,49 @@
+From 475cf71aa9de3ededa972ffb36fb47ad79278531 Mon Sep 17 00:00:00 2001
+From: Ben Greiner <code@bnavigator.de>
+Date: Mon, 15 Mar 2021 11:42:27 +0100
+Subject: [PATCH] fix pytest.tmpdir.makefile call
+
+---
+ tests/test_black.py | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/tests/test_black.py b/tests/test_black.py
+index 0405169..a7a6026 100644
+--- a/tests/test_black.py
++++ b/tests/test_black.py
+@@ -72,8 +72,8 @@ def test_exclude(testdir):
+     """Assert test is skipped if path is excluded even if also included
+     """
+     testdir.makefile(
+-        "pyproject.toml",
+-        """
++        ".toml",
++        pyproject = """
+         [tool.black]
+             include = 'test_exclude.py'
+             exclude = '.*'
+@@ -100,8 +100,8 @@ def test_exclude_folder(testdir):
+     """Assert test is skipped for files in a folder
+     """
+     testdir.makefile(
+-        "pyproject.toml",
+-        """
++        ".toml",
++        pyproject = """
+         [tool.black]
+             exclude = '''
+             (
+@@ -137,8 +137,8 @@ def test_include(testdir):
+     """Assert test is not skipped if path is included but not excluded
+     """
+     testdir.makefile(
+-        "pyproject.toml",
+-        """
++        ".toml",
++        pyproject = """
+         [tool.black]
+             include = 'test_include'
+     """,
+-- 
+2.26.3
+
diff --git a/dev-python/pytest-black/metadata.xml b/dev-python/pytest-black/metadata.xml
new file mode 100644
index 0000000..7a963b7
--- /dev/null
+++ b/dev-python/pytest-black/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>parona@protonmail.com</email>
+    <name>Alfred Wingate</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">shopkeep/pytest-black</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pytest-black/pytest-black-0.3.12.ebuild b/dev-python/pytest-black/pytest-black-0.3.12.ebuild
new file mode 100644
index 0000000..e585f84
--- /dev/null
+++ b/dev-python/pytest-black/pytest-black-0.3.12.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="pytest plugin to enable formatting checks with black "
+HOMEPAGE="https://github.com/shopkeep/pytest-black"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/black[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+"
+DEPEND="test? ( ${RDEPEND} )"
+
+distutils_enable_tests pytest
+
+DOCS=( "README.md" )
+
+# Fix tests for pytest6
+# https://github.com/shopkeep/pytest-black/pull/53
+PATCHES=( "${FILESDIR}/fix-pytest.tmpdir.makefile-call.patch" )
diff --git a/dev-python/pytest-isort/Manifest b/dev-python/pytest-isort/Manifest
new file mode 100644
index 0000000..95b9ba1
--- /dev/null
+++ b/dev-python/pytest-isort/Manifest
@@ -0,0 +1 @@
+DIST pytest-isort-2.0.0.tar.gz 7637 BLAKE2B aeb1797612fcba6f7421ffbd2c349d2353fccd60e88d314e9e64fb9b29bfd94b013a46edc46bbb863a501bd002451a1008ee6841b49f0f8d6dfba86211615afd SHA512 fc2e1f197da7893a96e9958e7527ee42f03e42206028701be5f90d684cb9bd077a61f516de2fc1446765ceaed07c188c05e2ff9a35fa0c1fea97b2c878c09d98
diff --git a/dev-python/pytest-isort/metadata.xml b/dev-python/pytest-isort/metadata.xml
new file mode 100644
index 0000000..8c7a15f
--- /dev/null
+++ b/dev-python/pytest-isort/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>parona@protonmail.com</email>
+    <name>Alfred Wingate</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">stephrdev/pytest-isort</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pytest-isort/pytest-isort-2.0.0.ebuild b/dev-python/pytest-isort/pytest-isort-2.0.0.ebuild
new file mode 100644
index 0000000..801ff91
--- /dev/null
+++ b/dev-python/pytest-isort/pytest-isort-2.0.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="py.test plugin to check import ordering using isort"
+HOMEPAGE="https://github.com/stephrdev/pytest-isort"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/isort[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		  ${RDEPEND}
+	)
+"
+
+distutils_enable_tests pytest
+
+DOCS=( "README.rst" )
diff --git a/dev-python/sphinx-py3doc-enhanced-theme/Manifest b/dev-python/sphinx-py3doc-enhanced-theme/Manifest
new file mode 100644
index 0000000..01d0c3c
--- /dev/null
+++ b/dev-python/sphinx-py3doc-enhanced-theme/Manifest
@@ -0,0 +1 @@
+DIST sphinx-py3doc-enhanced-theme-2.4.0.tar.gz 42093 BLAKE2B 020deec0d589d8052f2cce6faaeb8764b596a042584a0988dbcd73f0dc11c647db35b1b91fac63413ad211025fb98bbcc76a5bb2caa1cece56b907e021a0c20d SHA512 3ba362bf9179bdd69cd50fe7759cecd1ce89c7c5e7cd5f50d6f92af9835369436fc34b5dcc39295197828481041d30cf59dea3a929d232abd6b62e9e066b60f2
diff --git a/dev-python/sphinx-py3doc-enhanced-theme/files/Allow-missing-env-var.patch b/dev-python/sphinx-py3doc-enhanced-theme/files/Allow-missing-env-var.patch
new file mode 100644
index 0000000..c8045f9
--- /dev/null
+++ b/dev-python/sphinx-py3doc-enhanced-theme/files/Allow-missing-env-var.patch
@@ -0,0 +1,48 @@
+From 56f88757c722d479fc8978f8a8be8469124970e2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ionel=20Cristian=20M=C4=83rie=C8=99?= <contact@ionelmc.ro>
+Date: Tue, 4 May 2021 16:18:21 +0300
+Subject: [PATCH] Allow missing env var. Closes #14.
+
+---
+ tests/conf.py | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/tests/conf.py b/tests/conf.py
+index 50baef3..2b251bb 100644
+--- a/tests/conf.py
++++ b/tests/conf.py
+@@ -3,6 +3,7 @@ from __future__ import unicode_literals
+ 
+ import os
+ 
++import sphinx_py3doc_enhanced_theme
+ 
+ extensions = [
+     'sphinx.ext.autodoc',
+@@ -24,13 +25,13 @@ year = '2014-2015'
+ author = 'Ionel Cristian Mărieș'
+ copyright = '{0}, {1}'.format(year, author)
+ version = release = '2.4.0'
+-import sphinx_py3doc_enhanced_theme
++
+ html_theme = "sphinx_py3doc_enhanced_theme"
+ html_theme_path = [sphinx_py3doc_enhanced_theme.get_html_theme_path()]
+ html_theme_options = {
+     'githuburl': 'https://github.com/ionelmc/sphinx-py3doc-enhanced-theme/',
+ }
+-if os.environ['EXTRASTYLING'] == 'false':
++if os.environ.get('EXTRASTYLING', 'false') == 'false':
+     html_theme_options.update({
+         'bodyfont': '"Lucida Grande",Arial,sans-serif',
+         'headfont': '"Lucida Grande",Arial,sans-serif',
+@@ -47,6 +48,6 @@ html_use_smartypants = True
+ html_last_updated_fmt = '%b %d, %Y'
+ html_split_index = True
+ html_sidebars = {
+-   '**': ['searchbox.html', 'globaltoc.html', 'sourcelink.html'],
++    '**': ['searchbox.html', 'globaltoc.html', 'sourcelink.html'],
+ }
+ html_short_title = '%s-%s' % (project, version)
+-- 
+2.26.3
+
diff --git a/dev-python/sphinx-py3doc-enhanced-theme/files/backport-for-setupcfg.patch b/dev-python/sphinx-py3doc-enhanced-theme/files/backport-for-setupcfg.patch
new file mode 100644
index 0000000..36d3ac0
--- /dev/null
+++ b/dev-python/sphinx-py3doc-enhanced-theme/files/backport-for-setupcfg.patch
@@ -0,0 +1,75 @@
+From a013b01a0bb99807b016f907b07564bf32925fda Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ionel=20Cristian=20M=C4=83rie=C8=99?= <contact@ionelmc.ro>
+Date: Tue, 4 May 2021 15:57:39 +0300
+Subject: [PATCH] Update skel.
+
+---
+ setup.cfg | 40 ++++++++++++++++++----------------------
+ 1 file changed, 18 insertions(+), 22 deletions(-)
+
+diff --git a/setup.cfg b/setup.cfg
+index 33f1bea..65215db 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -1,39 +1,35 @@
+ [bdist_wheel]
+ universal = 1
+ 
+-[aliases]
+-release = register clean --all sdist bdist_wheel
+-
+ [flake8]
+ max-line-length = 140
+-exclude = tests/*,*/migrations/*,*/south_migrations/*
++exclude = .tox,.eggs,ci/templates,build,dist
+ 
+-[pytest]
++[tool:pytest]
++# If a pytest section is found in one of the possible config files
++# (pytest.ini, tox.ini or setup.cfg), then pytest will not look for any others,
++# so if you add a pytest config section elsewhere,
++# you will need to delete this section from setup.cfg.
+ norecursedirs =
+-    .git
+-    .tox
+-    .env
+-    dist
+-    build
+-    south_migrations
+     migrations
++
+ python_files =
+     test_*.py
+     *_test.py
+     tests.py
+ addopts =
+-    -rxEfs
+-    --strict
+-    --ignore=docs/conf.py
+-    --ignore=setup.py
+-    --ignore=ci
++    -ra
++    --strict-markers
+     --doctest-modules
+     --doctest-glob=\*.rst
+     --tb=short
++testpaths =
++    tests
+ 
+-[isort]
+-force_single_line=True
+-line_length=120
+-known_first_party=sphinx_py3doc_enhanced_theme
+-default_section=THIRDPARTY
+-forced_separate=test_sphinx_py3doc_enhanced_theme
+\ No newline at end of file
++[tool:isort]
++force_single_line = True
++line_length = 120
++known_first_party = sphinx_py3doc_enhanced_theme
++default_section = THIRDPARTY
++forced_separate = test_sphinx_py3doc_enhanced_theme
++skip = .tox,.eggs,ci/templates,build,dist
+-- 
+2.26.3
+
diff --git a/dev-python/sphinx-py3doc-enhanced-theme/files/test.patch b/dev-python/sphinx-py3doc-enhanced-theme/files/test.patch
new file mode 100644
index 0000000..7a3686a
--- /dev/null
+++ b/dev-python/sphinx-py3doc-enhanced-theme/files/test.patch
@@ -0,0 +1,67 @@
+--- a/setup.cfg	2016-12-17 03:51:53.000000000 +0200
++++ b/setup.cfg	2021-05-21 18:12:08.900317387 +0300
+@@ -9,37 +9,31 @@
+ exclude = tests/*,*/migrations/*,*/south_migrations/*
+ 
+ [pytest]
+-norecursedirs = 
+-	.git
+-	.tox
+-	.env
+-	dist
+-	build
+-	south_migrations
+-	migrations
+-python_files = 
+-	test_*.py
+-	*_test.py
+-	tests.py
+-addopts = 
+-	-rxEfs
+-	--strict
+-	--ignore=docs/conf.py
+-	--ignore=setup.py
+-	--ignore=ci
+-	--doctest-modules
+-	--doctest-glob=\*.rst
+-	--tb=short
++norecursedirs =
++    .git
++    .tox
++    .env
++    dist
++    build
++    south_migrations
++    migrations
++python_files =
++    test_*.py
++    *_test.py
++    tests.py
++addopts =
++    -rxEfs
++    --strict
++    --ignore=docs/conf.py
++    --ignore=setup.py
++    --ignore=ci
++    --doctest-modules
++    --doctest-glob=\*.rst
++    --tb=short
+ 
+ [isort]
+-force_single_line = True
+-line_length = 120
+-known_first_party = sphinx_py3doc_enhanced_theme
+-default_section = THIRDPARTY
+-forced_separate = test_sphinx_py3doc_enhanced_theme
+-
+-[egg_info]
+-tag_build = 
+-tag_date = 0
+-tag_svn_revision = 0
+-
++force_single_line=True
++line_length=120
++known_first_party=sphinx_py3doc_enhanced_theme
++default_section=THIRDPARTY
++forced_separate=test_sphinx_py3doc_enhanced_theme
+\ No newline at end of file
diff --git a/dev-python/sphinx-py3doc-enhanced-theme/files/undo-pypi-modification-to-setupcfg.patch b/dev-python/sphinx-py3doc-enhanced-theme/files/undo-pypi-modification-to-setupcfg.patch
new file mode 100644
index 0000000..7a3686a
--- /dev/null
+++ b/dev-python/sphinx-py3doc-enhanced-theme/files/undo-pypi-modification-to-setupcfg.patch
@@ -0,0 +1,67 @@
+--- a/setup.cfg	2016-12-17 03:51:53.000000000 +0200
++++ b/setup.cfg	2021-05-21 18:12:08.900317387 +0300
+@@ -9,37 +9,31 @@
+ exclude = tests/*,*/migrations/*,*/south_migrations/*
+ 
+ [pytest]
+-norecursedirs = 
+-	.git
+-	.tox
+-	.env
+-	dist
+-	build
+-	south_migrations
+-	migrations
+-python_files = 
+-	test_*.py
+-	*_test.py
+-	tests.py
+-addopts = 
+-	-rxEfs
+-	--strict
+-	--ignore=docs/conf.py
+-	--ignore=setup.py
+-	--ignore=ci
+-	--doctest-modules
+-	--doctest-glob=\*.rst
+-	--tb=short
++norecursedirs =
++    .git
++    .tox
++    .env
++    dist
++    build
++    south_migrations
++    migrations
++python_files =
++    test_*.py
++    *_test.py
++    tests.py
++addopts =
++    -rxEfs
++    --strict
++    --ignore=docs/conf.py
++    --ignore=setup.py
++    --ignore=ci
++    --doctest-modules
++    --doctest-glob=\*.rst
++    --tb=short
+ 
+ [isort]
+-force_single_line = True
+-line_length = 120
+-known_first_party = sphinx_py3doc_enhanced_theme
+-default_section = THIRDPARTY
+-forced_separate = test_sphinx_py3doc_enhanced_theme
+-
+-[egg_info]
+-tag_build = 
+-tag_date = 0
+-tag_svn_revision = 0
+-
++force_single_line=True
++line_length=120
++known_first_party=sphinx_py3doc_enhanced_theme
++default_section=THIRDPARTY
++forced_separate=test_sphinx_py3doc_enhanced_theme
+\ No newline at end of file
diff --git a/dev-python/sphinx-py3doc-enhanced-theme/metadata.xml b/dev-python/sphinx-py3doc-enhanced-theme/metadata.xml
new file mode 100644
index 0000000..50f2bc0
--- /dev/null
+++ b/dev-python/sphinx-py3doc-enhanced-theme/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>parona@protonmail.com</email>
+    <name>Alfred Wingate</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ionelmc/sphinx-py3doc-enhanced-theme</remote-id>
+  </upstream>
+  <longdescription>
+    A theme based on the theme of https://docs.python.org/3/ with some responsive enhancements.
+  </longdescription>
+</pkgmetadata>
diff --git a/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.4.0.ebuild b/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.4.0.ebuild
new file mode 100644
index 0000000..d689f77
--- /dev/null
+++ b/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.4.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="A theme based on the theme of https://docs.python.org/3/."
+HOMEPAGE="https://github.com/ionelmc/sphinx-py3doc-enhanced-theme"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+# TODO: figure out how to fix tests
+RESTRICT="test"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}/Allow-missing-env-var.patch"
+	"${FILESDIR}/undo-pypi-modification-to-setupcfg.patch"
+	"${FILESDIR}/backport-for-setupcfg.patch"
+)
+DOCS=( "README.rst" )
diff --git a/dev-python/unpaddedbase64/Manifest b/dev-python/unpaddedbase64/Manifest
index 26c5184..3c1cef8 100644
--- a/dev-python/unpaddedbase64/Manifest
+++ b/dev-python/unpaddedbase64/Manifest
@@ -1 +1,2 @@
 DIST unpaddedbase64-1.1.0.tar.gz 5889 BLAKE2B a343bca718be9be7f8689e47fb43ee01d427709d8ac9e00804be976084c6622a57dbd509629ade248fdda0ff9a25bf7442624abf256809d8c6d0b5e5ee747dee SHA512 7e5954d8c4fbf55f21c8cda493e7db613feaa16224139ea550958073c182e4fba953c5f9670c72d1d0fc1402144a1dbeb9fa4df437a8ac51a29cce715e14f15d
+DIST unpaddedbase64-2.1.0.tar.gz 5621 BLAKE2B 9ccf1620b745cf208f260f357434316e37fca674e61984d14d2a25c2d44c66da51d42ef0dde272a9a5589c754e441981f33af80736d3c8f15c5b39f2a46da4e4 SHA512 ad4fe4f631c278dac69d7369661b3557a266d8324c07c6db8dda53042775ccf769180cb6bc4a532c50744e3b163fd7c7c843b7c3d50bcdd3cb9b4e4632a37100
diff --git a/dev-python/unpaddedbase64/metadata.xml b/dev-python/unpaddedbase64/metadata.xml
index 562a194..7954d92 100644
--- a/dev-python/unpaddedbase64/metadata.xml
+++ b/dev-python/unpaddedbase64/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email> parona@protonmail.com </email>
-		<name> Alfred Wingate </name>
-	</maintainer>
+  <maintainer type="person">
+    <email> parona@protonmail.com </email>
+    <name> Alfred Wingate </name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">matrix-org/python-unpaddedbase64</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/unpaddedbase64/unpaddedbase64-2.1.0.ebuild b/dev-python/unpaddedbase64/unpaddedbase64-2.1.0.ebuild
new file mode 100644
index 0000000..d1a4364
--- /dev/null
+++ b/dev-python/unpaddedbase64/unpaddedbase64-2.1.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS="pyproject.toml"
+
+inherit distutils-r1
+
+DESCRIPTION="Encode and decode Base64 without "=" padding."
+HOMEPAGE="https://github.com/matrix-org/python-unpaddedbase64"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
diff --git a/dev-python/watchgod/Manifest b/dev-python/watchgod/Manifest
index 50084a1..2df1213 100644
--- a/dev-python/watchgod/Manifest
+++ b/dev-python/watchgod/Manifest
@@ -1 +1,2 @@
 DIST watchgod-0.6.tar.gz 13261 BLAKE2B 6cf32f6ea467fd4cdb3b0da30aa56bfbf3909adb25d2d44621733c665dccf77b203e99049655793a674f688f3adc8519d8e95156932ccfb9dceda28888bac115 SHA512 1eaa0febc4ba8b1e4bbd6e7bae8f2312c2eeaae395ebbf76953fdf937d4eda06bad818574000d6b96abfefe391affb5d007426bbf7867578293729decc6b61fb
+DIST watchgod-0.7.tar.gz 13580 BLAKE2B 1e047762da6b85f8fe900993db1dd7ae5b32d7c74715a92fc2b7a8991a753189660232665db4fd9881fb12eb33ea01819424fa3c2f41a7031a972b2f092ee598 SHA512 1278b6046172853bfa8a4e9bff4bb6aa72dc881e0e068975ccb5251f47130de6aa06affa49eae53cc61e08caa4f68c1788551143da2f4b2ebea143bb39297c94
diff --git a/dev-python/watchgod/watchgod-0.7.ebuild b/dev-python/watchgod/watchgod-0.7.ebuild
new file mode 100644
index 0000000..d8a5305
--- /dev/null
+++ b/dev-python/watchgod/watchgod-0.7.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Simple, modern file watching and code reload in python."
+HOMEPAGE="https://github.com/samuelcolvin/watchgod"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"