Adding metadata

author: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2021-05-09 13:50:50 +0000
committer: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2021-05-09 13:50:50 +0000
commit: 7c9577d88eb2a9d92c8f03f7fa42947696be2525 (patch)
tree: a01795ca7c7f33cfebba43757d70f30d0faed309 /dev-python
parent: 933759f3fcaf3d378991b18fa19eead3812b1be0 (diff)
download: baldeagleos-repo-7c9577d88eb2a9d92c8f03f7fa42947696be2525.tar.gz
baldeagleos-repo-7c9577d88eb2a9d92c8f03f7fa42947696be2525.tar.xz
baldeagleos-repo-7c9577d88eb2a9d92c8f03f7fa42947696be2525.zip
81 files changed, 320 insertions, 1437 deletions
diff --git a/dev-python/async_generator/async_generator-1.10.ebuild b/dev-python/async_generator/async_generator-1.10.ebuild
index 84e0eb2bfc31..c374172c61f1 100644
--- a/dev-python/async_generator/async_generator-1.10.ebuild
+++ b/dev-python/async_generator/async_generator-1.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ DOCS=( README.rst )
 
 python_test() {
 	pushd "${BUILD_DIR}/lib" >/dev/null || die
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-	rm -rf .pytest_cache || die
+	epytest
+	rm -rf .hypothesis .pytest_cache || die
 	popd >/dev/null || die
 }
diff --git a/dev-python/clang-python/clang-python-12.0.0.9999.ebuild b/dev-python/clang-python/clang-python-12.0.0.9999.ebuild
index 67e212aefbf7..2f2f8087f297 100644
--- a/dev-python/clang-python/clang-python-12.0.0.9999.ebuild
+++ b/dev-python/clang-python/clang-python-12.0.0.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/dash-core-components/Manifest b/dev-python/dash-core-components/Manifest
deleted file mode 100644
index e770719e06f1..000000000000
--- a/dev-python/dash-core-components/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST dash-core-components-1.16.0.tar.gz 13922229 BLAKE2B 7ca8dd411e3a8714902266b11a9f39420c7455601cdcbde81ad86690846bbf574fd0c65019f69fcb0ea86f511802eee080d1e4fca1cd88b82c9898aeb5055ceb SHA512 f2648fa8331296db812e897e2976aab1ca357f81b547dda57710773b4e0ef98019f928d5a0a6add426693550fb483c04ec7e0311318cab113f10fc5dca19e197
diff --git a/dev-python/dash-core-components/dash-core-components-1.16.0.ebuild b/dev-python/dash-core-components/dash-core-components-1.16.0.ebuild
deleted file mode 100644
index d85082eba468..000000000000
--- a/dev-python/dash-core-components/dash-core-components-1.16.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Core components suite for Dash"
-HOMEPAGE="https://plot.ly/dash"
-SRC_URI="https://github.com/plotly/${PN}/archive/refs/tags/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-BDEPEND=""
diff --git a/dev-python/dash-core-components/metadata.xml b/dev-python/dash-core-components/metadata.xml
deleted file mode 100644
index 70e2209d43b1..000000000000
--- a/dev-python/dash-core-components/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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>
- <maintainer type="person">
-  <email>tupone@gentoo.org</email>
-  <name>Tupone Alfredo</name>
- </maintainer>
- 
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-python/dash-html-components/Manifest b/dev-python/dash-html-components/Manifest
deleted file mode 100644
index 6567923e52bb..000000000000
--- a/dev-python/dash-html-components/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST dash-html-components-1.1.3.tar.gz 375680 BLAKE2B e489d8d5fe3c832ae8be82ea1eac83b8a8c8df8b6ac9ce1d122178f63c4ce355c39195bd828e503c51605ed5e774eaff38cf16da9a1c486fd0eff404cd85694f SHA512 dfcc41ef7a52f0d5cc97db9e94b00eb7707cea7c5f95e89832d1b74a1554d9d9f9c3b5df57509fe959b06c53f2a281b7070adde45d3c19003c13983a10ca2509
diff --git a/dev-python/dash-html-components/dash-html-components-1.1.3.ebuild b/dev-python/dash-html-components/dash-html-components-1.1.3.ebuild
deleted file mode 100644
index d11ffc7f5821..000000000000
--- a/dev-python/dash-html-components/dash-html-components-1.1.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Vanilla HTML components for Dash"
-HOMEPAGE="https://plot.ly/dash"
-SRC_URI="https://github.com/plotly/${PN}/archive/refs/tags/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-BDEPEND=""
diff --git a/dev-python/dash-html-components/metadata.xml b/dev-python/dash-html-components/metadata.xml
deleted file mode 100644
index 70e2209d43b1..000000000000
--- a/dev-python/dash-html-components/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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>
- <maintainer type="person">
-  <email>tupone@gentoo.org</email>
-  <name>Tupone Alfredo</name>
- </maintainer>
- 
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-python/dash-table/Manifest b/dev-python/dash-table/Manifest
deleted file mode 100644
index fb78f350a952..000000000000
--- a/dev-python/dash-table/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST dash-table-4.11.3.tar.gz 9504642 BLAKE2B d48e1448caf19f555d8e8436de295d6999dc4caabd4e80d188ec9921278dc4e48b6631dbf4a572cd190210bb83f0a73986c0c93c269b931aeff1fd52e152e248 SHA512 580de0b92ae114cd65e5a2a85aa96a78cbf3364173135ddb29ac3d2edd3ad2aa7b526d447481f78379da2c2420ed9cc8d6a83836565ccac31249ecc4a94a3db5
diff --git a/dev-python/dash-table/dash-table-4.11.3.ebuild b/dev-python/dash-table/dash-table-4.11.3.ebuild
deleted file mode 100644
index c468288f7660..000000000000
--- a/dev-python/dash-table/dash-table-4.11.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="First-Class interactive DataTable for Dash"
-HOMEPAGE="https://plot.ly/dash"
-SRC_URI="https://github.com/plotly/${PN}/archive/refs/tags/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-BDEPEND=""
diff --git a/dev-python/dash-table/metadata.xml b/dev-python/dash-table/metadata.xml
deleted file mode 100644
index 70e2209d43b1..000000000000
--- a/dev-python/dash-table/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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>
- <maintainer type="person">
-  <email>tupone@gentoo.org</email>
-  <name>Tupone Alfredo</name>
- </maintainer>
- 
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-python/dash/Manifest b/dev-python/dash/Manifest
deleted file mode 100644
index 6098a5f8d1a3..000000000000
--- a/dev-python/dash/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST dash-1.20.0.tar.gz 1786368 BLAKE2B 2826336f72b9bea80be6ef77df49109b7b68ed93678b606c998a1906907551551a3228e1140d20c6e1b5bf5e53fb9cebd0c0a4d7ab5cc1a590e47ef351558a40 SHA512 670cf593068370c70f1db25c70c7a76ce98c696efbff1146cc90f90a99b8b48bf80cf47688504d173ef253ccb9f1170c2067b3af9414eacb226f7ef25149ffff
diff --git a/dev-python/dash/dash-1.20.0.ebuild b/dev-python/dash/dash-1.20.0.ebuild
deleted file mode 100644
index 2abbdff0e56b..000000000000
--- a/dev-python/dash/dash-1.20.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Python framework for building ML & data science web apps"
-HOMEPAGE="https://github.com/plotly/dash"
-SRC_URI="https://github.com/plotly/${PN}/archive/refs/tags/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	dev-python/future[${PYTHON_USEDEP}]
-	dev-python/dash-table[${PYTHON_USEDEP}]
-	dev-python/dash-html-components[${PYTHON_USEDEP}]
-	dev-python/dash-core-components[${PYTHON_USEDEP}]
-	dev-python/plotly[${PYTHON_USEDEP}]
-	dev-python/flask-compress[${PYTHON_USEDEP}]"
-BDEPEND=""
-
-src_prepare() {
-	distutils-r1_src_prepare
-	cd dash-renderer
-	distutils-r1_src_prepare
-}
-
-src_configure() {
-	distutils-r1_src_configure
-	cd dash-renderer
-	distutils-r1_src_configure
-}
-
-src_compile() {
-	distutils-r1_src_compile
-	cd dash-renderer
-	distutils-r1_src_compile
-}
-
-src_install() {
-	distutils-r1_src_install
-	cd dash-renderer
-	distutils-r1_src_install
-}
diff --git a/dev-python/dash/metadata.xml b/dev-python/dash/metadata.xml
deleted file mode 100644
index 70e2209d43b1..000000000000
--- a/dev-python/dash/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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>
- <maintainer type="person">
-  <email>tupone@gentoo.org</email>
-  <name>Tupone Alfredo</name>
- </maintainer>
- 
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-python/deepmerge/Manifest b/dev-python/deepmerge/Manifest
index e9d83979015f..8cd32614929d 100644
--- a/dev-python/deepmerge/Manifest
+++ b/dev-python/deepmerge/Manifest
@@ -1,3 +1 @@
-DIST deepmerge-0.1.1_p1.tar.gz 14317 BLAKE2B 0e327b129a63f1f3fd5a18ae5c895452a823401f54b614c6c085f82e9332b86800e9ccc42fbd2d6c9904e6ae0bc999b393e9af542c310a76c8975567b9b2346f SHA512 72a40609a31dbb692908365f32a94527280e7d1bceed27f27a9a17d6f30551054235de608cef5e88f285bf33b9c155c0aa4aebf74f1c9f8049f0751073593083
-DIST deepmerge-0.2.1.gh.tar.gz 14427 BLAKE2B 0039debcecdbfaf8c4b6f721f6a000dcaf5da41a5601ed2091e00ce496fa14b1c19580a443da0de75c67656e829cb7fc04b13a6604a671ed491ba4e41bb9e08e SHA512 e4e1b87121473be062b77fea4e3cdee85fe4cb3f98a15eabf3a9fbb2f9e209f3caa0fd0a4c1fc20e42aa89d7c1c8d0ecdffde9f99791f3a9f47b6dcfa78f48b0
 DIST deepmerge-0.3.0.gh.tar.gz 14872 BLAKE2B 33983eb14c00583c53efd34fc032a6ba16efba7663eb35a1b215a291484abfbf68f83bc23abf2c518b8ec3924da608caf82b5b8afd432b832e9a3f4f3d9dcd9e SHA512 2770f9d01d0a62034850d450c2646a5e4aaae418b8b278ec3d7e14c31813d2acd4ac06295f30884b7fa75258332270bbf179f6f174862a1e20fc0e35fba7fd47
diff --git a/dev-python/deepmerge/deepmerge-0.1.1_p1.ebuild b/dev-python/deepmerge/deepmerge-0.1.1_p1.ebuild
deleted file mode 100644
index 52421230d555..000000000000
--- a/dev-python/deepmerge/deepmerge-0.1.1_p1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-MY_COMMIT="587279c6771abb13ed831ebc2cba3c9e4d81e7e5"
-DESCRIPTION="Tools to handle merging of nested data structures in python"
-HOMEPAGE="https://deepmerge.readthedocs.io/en/latest"
-SRC_URI="https://github.com/toumorokoshi/deepmerge/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_COMMIT}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -i -e '/vcver/d' setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/deepmerge/deepmerge-0.2.1.ebuild b/dev-python/deepmerge/deepmerge-0.2.1.ebuild
deleted file mode 100644
index c518b1b3fe7a..000000000000
--- a/dev-python/deepmerge/deepmerge-0.2.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Tools to handle merging of nested data structures in python"
-HOMEPAGE="https://deepmerge.readthedocs.io/en/latest"
-SRC_URI="
-	https://github.com/toumorokoshi/deepmerge/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/denonavr/Manifest b/dev-python/denonavr/Manifest
index 64b0ca3173f6..08c706c62926 100644
--- a/dev-python/denonavr/Manifest
+++ b/dev-python/denonavr/Manifest
@@ -1,7 +1,2 @@
-DIST denonavr-0.10.1.tar.gz 111775 BLAKE2B c96cd3f4597766fdd1d4d5182ad5eadcc3808f6aa7cd1f4029d29bfe204df561283ebb7cc7ecac836bb1d6614c43d8d56f12bd2b0a7dceb2d0c6fd92e8321d22 SHA512 a13d357f88b10fe9d75f81e3baf26232fe557c4c06d0205a12f40b858dd41a159d9a2b88ccd8b0138414f53195036ef4bb49aea2d9bcddfc03079faecea84fc4
-DIST denonavr-0.10.3.tar.gz 120245 BLAKE2B 573e6b97a5b1af102e8e23e67d0edc339d27188f0d233a2890fac37da7848c6f6f28e31ae7b5d9c419aac2512bd29e4320901b16aa3d1ae423b446522bed93a4 SHA512 b025a64e3d97ad6941e1850b66cadc5163b0fef309b6a978f1f823142ec4897f45a47e00726f6a92d1ab22fadaa4c5ba74d955bab7d821a69e3a7dd10435579a
-DIST denonavr-0.10.4.tar.gz 120868 BLAKE2B d4581a35351eb70ad06fafb522591224ca9993fa117ce46fc6bf1b0fb4361cd4a01bb0bedab812d23fe5b626513eee5b15816f25f6f3259dcf72e3076fed8366 SHA512 fb9247ed78a591eaee24a5e9bf9d2051a449d91003caefb0dba939c4f2286376671eb05a68460cbb80590b39c85fb923e014df899274f3fe97c2cdf71a4cea4d
-DIST denonavr-0.10.5.tar.gz 120862 BLAKE2B bea9620d5c4e6f8523f032c041bbfa67d6e756b27cc8f3add7dd24314bc333f2e515bb9d566630a2c72628f8bd40dae3739c205ba991487c5e99cab28070a1ca SHA512 3ffc005812801c08183b1049519f797346675ae1499368e8ee8eddb87e2a14fffa9152fe2909e7cdd6297e3af424fc37afebc860e1e0af36e99609f78cf0072b
 DIST denonavr-0.10.6.tar.gz 124692 BLAKE2B f0af92e0160d0533389e69dfad5740c432d52b3b6446288a572ef62aa9c8610397d3d8d5770ce6b46b4ad224b2782fc8a63a4f548a4237251d52695f5b4dde95 SHA512 336183e04e2f3f98faa1878a472ce69cc2fe7519398b34a61126cd6539ae6e40c60329d5b2f914e3dc85a9dbb11a1eb8fe9669f4e2910838d5ffcee0da7633c5
-DIST denonavr-0.9.10.tar.gz 102045 BLAKE2B 2b0cde47d5ea50b218b04b696756d003494ff92f99ba88509312e1a2a8ce19f0bdc0c51671a7097fa1e7d7f63194d6435ddcfb31d902bf855368d69643c4c64a SHA512 8e0bb6a25eb38e798759dbee301371691c1b34e934054897d65d8829b7f7593044522fe4667c005abcf428ed1234016fb8bbf083e05c51502f722e4d8df3b155
-DIST denonavr-0.9.9.tar.gz 101902 BLAKE2B de30ad9520781eaa66a651f8a77ed88c76daa191f0de716f2cc00e21a8c8ae8883c5aa0c32167754062517763f903949626e04342a2342894a632cb9b94d2e20 SHA512 45d3b4fc6f8487caed0911ff7dd90dd28482de688429b8d0fae68db9a5d78959005ab2aab1b34eab34e964f4e82bccb6d57aadea367f81fc4a7927e54d771728
+DIST denonavr-0.10.7.tar.gz 148282 BLAKE2B a5168c1b00ce1e8223d619a8e2e7ae663fa913d673b6f62580daf57ff76d8da4306681d92df0e32e612376038255bc52e25a1f59dd5f6a429685c8bd9146d843 SHA512 6667edeb4272ce909f8bc2dfa51b31d78915ae6085064bbf0f53714f8b473e0fad24eb6484a10abb093ef27d59faeaebdffdb55eadb03f8b64e864642364a791
diff --git a/dev-python/denonavr/denonavr-0.10.1.ebuild b/dev-python/denonavr/denonavr-0.10.1.ebuild
deleted file mode 100644
index 8f2f4bd801ef..000000000000
--- a/dev-python/denonavr/denonavr-0.10.1.ebuild
+++ /dev/null
@@ -1,34 +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="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Automation Library for Denon AVR receivers"
-HOMEPAGE="https://github.com/scarface-4711/denonavr"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/async-lru[${PYTHON_USEDEP}]
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	dev-python/httpx[${PYTHON_USEDEP}]
-	dev-python/netifaces[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-httpx[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/denonavr/denonavr-0.10.3.ebuild b/dev-python/denonavr/denonavr-0.10.3.ebuild
deleted file mode 100644
index 8f2f4bd801ef..000000000000
--- a/dev-python/denonavr/denonavr-0.10.3.ebuild
+++ /dev/null
@@ -1,34 +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="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Automation Library for Denon AVR receivers"
-HOMEPAGE="https://github.com/scarface-4711/denonavr"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/async-lru[${PYTHON_USEDEP}]
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	dev-python/httpx[${PYTHON_USEDEP}]
-	dev-python/netifaces[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-httpx[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/denonavr/denonavr-0.10.4.ebuild b/dev-python/denonavr/denonavr-0.10.4.ebuild
deleted file mode 100644
index 8f2f4bd801ef..000000000000
--- a/dev-python/denonavr/denonavr-0.10.4.ebuild
+++ /dev/null
@@ -1,34 +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="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Automation Library for Denon AVR receivers"
-HOMEPAGE="https://github.com/scarface-4711/denonavr"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/async-lru[${PYTHON_USEDEP}]
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	dev-python/httpx[${PYTHON_USEDEP}]
-	dev-python/netifaces[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-httpx[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/denonavr/denonavr-0.10.5.ebuild b/dev-python/denonavr/denonavr-0.10.7.ebuild
index 8f2f4bd801ef..55e6fb5d6dee 100644
--- a/dev-python/denonavr/denonavr-0.10.5.ebuild
+++ b/dev-python/denonavr/denonavr-0.10.7.ebuild
@@ -17,12 +17,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
-	dev-python/async-lru[${PYTHON_USEDEP}]
+	dev-python/asyncstdlib[${PYTHON_USEDEP}]
 	dev-python/attrs[${PYTHON_USEDEP}]
 	dev-python/defusedxml[${PYTHON_USEDEP}]
 	dev-python/httpx[${PYTHON_USEDEP}]
 	dev-python/netifaces[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? (
diff --git a/dev-python/denonavr/denonavr-0.9.10.ebuild b/dev-python/denonavr/denonavr-0.9.10.ebuild
deleted file mode 100644
index ad8d3b90498f..000000000000
--- a/dev-python/denonavr/denonavr-0.9.10.ebuild
+++ /dev/null
@@ -1,30 +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="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Automation Library for Denon AVR receivers"
-HOMEPAGE="https://github.com/scarface-4711/denonavr"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/netifaces[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/denonavr/denonavr-0.9.9.ebuild b/dev-python/denonavr/denonavr-0.9.9.ebuild
deleted file mode 100644
index f7231b3b430b..000000000000
--- a/dev-python/denonavr/denonavr-0.9.9.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 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="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Automation Library for Denon AVR receivers"
-HOMEPAGE="https://github.com/scarface-4711/denonavr"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/netifaces[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/django-otp/Manifest b/dev-python/django-otp/Manifest
index f3112c9113f0..291a0959abde 100644
--- a/dev-python/django-otp/Manifest
+++ b/dev-python/django-otp/Manifest
@@ -1,3 +1,4 @@
 DIST django-otp-1.0.2.gh.tar.gz 66885 BLAKE2B be98b68f0aa5df25835afa28a23d25e0353dc2d556e62bdf1610a44a409a8e48422e17f274b21eb7cbd421cc4a25a35d01e5d7b3bd99d9caec8c8060da26f57a SHA512 6fe7f79858bdf362dd35e1aeb87c086edd5daf17d4429fc4cb39f3d287ee4c7cf8fb2d6d8f6a7d1b4606104d6732a705b9285f9fec93e4e7c7ca3f3f52541ddd
 DIST django-otp-1.0.3.gh.tar.gz 67007 BLAKE2B 33aed04898afb6ad3940e06436a1d2b4b9349e8fcd55acba0719084939fb9b111e0c266f4964826491f91f832c16f2e4d505486016bfad416706e3e7ef6f3f37 SHA512 7b661228377fa57812a45888e415478cee49d1e343cbc814ba8631f4c354077901ec82f79e69abd00c6bad1dffa026d3e03f4cf0809b074ae1e02ab2cf878137
 DIST django-otp-1.0.4.gh.tar.gz 68976 BLAKE2B 30908c3769ca9c05c850524d8a3b155f7ac8fcfa8e69073622d83808d7b78293604f9b332e59b074a6737188ca4f53ede13d31d283588605ca17f994bf5d4e5e SHA512 7b37fbc56a708f5c26e6204fba344235c7823db66d7e3e56b74516efc8a1de4150c088ce2d94c04c10855f438b077599d361a4d2c2263e8ff2936309dc0ddb6e
+DIST django-otp-1.0.5.gh.tar.gz 68677 BLAKE2B fd4fe66695faf4a75fc9cdab69241520c42c50d013121375bed2cb0f04a71def8e64588e3ac5727cfb319cb025273cb5adfd5d3b0dbab06590967c58e2b36e37 SHA512 bfdfe6d5058a6bead28a756392a76301cb821b5ea4f61dff8d376aa7732aa92bf8d709cb964d23e94ed37ec0e3ae45768f4fc4a98aaabfb2be0788bb0059f10c
diff --git a/dev-python/django-otp/django-otp-1.0.5.ebuild b/dev-python/django-otp/django-otp-1.0.5.ebuild
new file mode 100644
index 000000000000..2ae5bc1de9dd
--- /dev/null
+++ b/dev-python/django-otp/django-otp-1.0.5.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Django framework adding two-factor authentication using one-time passwords"
+HOMEPAGE="https://github.com/django-otp/django-otp/"
+SRC_URI="
+	https://github.com/django-otp/django-otp/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/django-2.2[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/qrcode[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)"
+
+python_test() {
+	local -x PYTHONPATH=test:${PYTHONPATH}
+	local -x DJANGO_SETTINGS_MODULE=test_project.settings
+	django-admin test -v 2 django_otp || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 9a0807f7d406..9b3bbca974b6 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,12 +1,6 @@
-DIST Django-2.2.21.checksum.txt 2557 BLAKE2B 76c1588760de34bdd4274eb12abcb60dd476ef1057dd7679ae76f8b7fe916c40c26ab19a821075523c5ae886802af7aa267efafe3d8192ad14ac18557651f5cf SHA512 83d4893e83eaf271f783c177549f8267a2d84969a6d87447f3cb9d9cb36d9acb48564867644c7d95763f9a3888dd9d8647233733b92b432c54e4472f8c34a5fd
-DIST Django-2.2.21.tar.gz 9209871 BLAKE2B 616215d43fc879bd4f01fb6fec7f3fa47c4630bcc961c8606c01a6e25c2ff27dfdf886db7dc03f8445b52957c1ad858fb8bb5e7cd25c97a927646bba436399de SHA512 37d1f58c23907792e49c827fe1efe4345fd5d74ca85b44d1f492d45c9f4f7cc9ebfbd59dc6a142bb24b666fb89e2ee62a3bc3e2242cd25d5c1e801a3f07a2589
 DIST Django-2.2.22.checksum.txt 2551 BLAKE2B b08f1d904caedfad04eceb57a704cec9dc660e59d2ceeddbd98f16b8bf4f578a030f1baaef7e8eb7ffb022bcf11957642d08b972eec12aed12e51d41bacea07a SHA512 20adea9a59fad6974679836f044bd4a1089faa881a7efbf15fc6a17e3a674ff9b638708bdfa7724b82d80db73c64b478eed08cec6eb5d040100aec20078dc1df
 DIST Django-2.2.22.tar.gz 9182392 BLAKE2B f68141772ec101332a2a0c7b1b2216a14535404e814d80a6a350effcd4ee07eb6a4271f997a43d24e4a083fef690492714858b2c92d982fb113352f6fd062545 SHA512 215497034224dbbbffb3e70f9c50e51a149c9962074d2ae7152a664d21f7e762a7f62baebad2387037feff02e880e1dfdfa04ad797907ba5daf65276c2b99fd7
 DIST Django-3.1.10.checksum.txt 2551 BLAKE2B 811e820ef036301ee1a6aafb2f74e5809baee591b37a04e5726bff4086f58d29e13ef7b0fd5f95fe9316232cff45ebd2d7c69fbdcd9a3d1322ede118c4577a65 SHA512 b1eb565dfb978cd4819817b1f0fbb9685c1a7d9d9863ea4a0da137056add6af98d6051eae1b81f37bfb0e673993a4af7dd760811e343bb2fd7a0d98a3ee1663a
 DIST Django-3.1.10.tar.gz 9654073 BLAKE2B c3729b7007b0b8309fda111f7bd988c861fb1002da3683e972a01bcd2aecfc6b42e896f91297239cba2061106096226552c26eb50325ea5b50f5a5df3a191bfd SHA512 6dd3c7a5cd1b5cbeb6e62f72fa56fce260bd407a3ac659ddee893489efae7a6bea862ecc113da342a2ed4cffa39e564c55dd20792b5435f9f00fef5488579aad
-DIST Django-3.1.9.checksum.txt 2548 BLAKE2B 2b733f7ef48b861fd97136a4efa034420e956e506020336ffaec4de7aa7d967d88bcfc5d8574afde317a74f95703378489109334569a84e163fcc635c59378ee SHA512 4558df4393661deb44c0b0c4658aeef3757e8e16dab98b177d0f5102398530dc96d526a955e4f7c88b2d0c40af544e7f9f6deb8d2697c4626c19e16f1860fb06
-DIST Django-3.1.9.tar.gz 9673018 BLAKE2B 6212bb48b31566ed2d87f2bdf7922b6e3e93df06b4f8f7ddb1fd20a1a7465856ccc280dad6885f1d2fbf90c6c1919cbc0830416e82e4123fee1c116561d0631c SHA512 7df6afd2539407727a250a981488c80450b882772ecf0edb778182a828d4c80a47b668e64e6e2adc8d21fcab92aef5322cfae3f386369688087774708e75fa13
-DIST Django-3.2.1.checksum.txt 2548 BLAKE2B 2f5feeffd4cc664e5ef97de2ae1428a9f432f4480fee846bf8abefbecdd4e418736ca700481e3fc6f114d6c62ff083dae60cefee4e5d8481f97f013fba1e0242 SHA512 32cfa9d890059fda32bbd0062b0333bad4b1b616bd555a99870fad09e7d3c662117b4fd5fb98ac7e634daf199434c2f58fdaeb28d895cf714ae05fbf7eef1b91
-DIST Django-3.2.1.tar.gz 9820723 BLAKE2B 968104e3a42310effe8a81b46eb7e17b97aa8f92fddaeef6a1dbee49947d9711daf0c71628fb9c4384a4e7bcb63041a15151f71a368f20934db80513967f0ea2 SHA512 5f3f80047cdcb6c9a07ca0dc9d6d83d190c8c0215311f39e6e441384659c92e4fa42bf4677d297a4ba8520a0bfbd78c4b2ca13cf467c1e1220c0c6a3131ba444
 DIST Django-3.2.2.checksum.txt 2542 BLAKE2B 1a61ea4e8415d77b50d0dc227905596941a9cfed019c3442be1d7529d0b82204b08e15befdcccccd3a7a4625b762e99526b762053e9ec7c29068caa2dfe055a1 SHA512 eebb6e7172d85af3d6f65296d816f40cacd78c8270bd198d275c3c2844e9106ec517265490e7371d5df803d044ee1534a4eb836d2a279d395884c1ec7b9cb0f5
 DIST Django-3.2.2.tar.gz 9796920 BLAKE2B 09a720d169702f1d80b592e8a4c8e136b9b3c4539db44f8bcf3ef7d0e6bb678892b7ad4bbeac89fc887c9938cb35d8a9d3fee9a58e692f99c37e81f01615a6b4 SHA512 28d1d56cdf883f8fb5e438124be53dbefaa0045d1acf0b4b8b455a482422e2b88ffc5a3c8be2ee1b7d3c39fe29cfa854b44b438c3d43323483bd35e0d05f9e49
diff --git a/dev-python/django/django-2.2.21.ebuild b/dev-python/django/django-2.2.21.ebuild
deleted file mode 100644
index db5371e1a8e2..000000000000
--- a/dev-python/django/django-2.2.21.ebuild
+++ /dev/null
@@ -1,93 +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='sqlite?,threads(+)'
-
-inherit bash-completion-r1 distutils-r1 optfeature verify-sig
-
-MY_P=${P^}
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
-SRC_URI="
-	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
-	verify-sig? ( https://media.djangoproject.com/pgp/${MY_P}.checksum.txt )"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-# admin fonts: Roboto (media-fonts/roboto)
-LICENSE+=" Apache-2.0"
-# admin icons, jquery, xregexp.js
-LICENSE+=" MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="doc sqlite test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
-BDEPEND="
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		$(python_gen_impl_dep sqlite)
-		${RDEPEND}
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[webp,${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/selenium[${PYTHON_USEDEP}]
-		dev-python/tblib[${PYTHON_USEDEP}]
-		sys-devel/gettext
-	)
-	verify-sig? ( app-crypt/openpgp-keys-django )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0.7-bashcomp.patch
-	"${FILESDIR}"/django-2.2.21-fix-bpo43882.patch
-)
-
-distutils_enable_sphinx docs --no-autodoc
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc
-
-src_unpack() {
-	if use verify-sig; then
-		cd "${DISTDIR}" || die
-		verify-sig_verify_signed_checksums \
-			"${MY_P}.checksum.txt" sha256 "${MY_P}.tar.gz"
-		cd "${WORKDIR}" || die
-	fi
-
-	default
-}
-
-python_test() {
-	# Tests have non-standard assumptions about PYTHONPATH,
-	# and don't work with ${BUILD_DIR}/lib.
-	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp extras/django_bash_completion ${PN}-admin
-	bashcomp_alias ${PN}-admin django-admin.py
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature_header "Additional Backend support can be enabled via:"
-	optfeature "MySQL backend support" dev-python/mysqlclient
-	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	optfeature_header
-	optfeature "GEO Django" "sci-libs/gdal[geos]"
-	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" dev-python/pillow
-	optfeature "Password encryption" dev-python/bcrypt
-	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
-}
diff --git a/dev-python/django/django-2.2.22.ebuild b/dev-python/django/django-2.2.22.ebuild
index 0ee1bbac738c..b0990cd9a686 100644
--- a/dev-python/django/django-2.2.22.ebuild
+++ b/dev-python/django/django-2.2.22.ebuild
@@ -22,7 +22,7 @@ LICENSE+=" Apache-2.0"
 # admin icons, jquery, xregexp.js
 LICENSE+=" MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="doc sqlite test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/django/django-3.1.10.ebuild b/dev-python/django/django-3.1.10.ebuild
index 18563ceb80f8..8528d5201b25 100644
--- a/dev-python/django/django-3.1.10.ebuild
+++ b/dev-python/django/django-3.1.10.ebuild
@@ -22,15 +22,12 @@ LICENSE+=" Apache-2.0"
 # admin icons, jquery, xregexp.js
 LICENSE+=" MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86 ~x64-macos"
 IUSE="doc sqlite test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	|| (
-		>=dev-python/asgiref-3.3.4[${PYTHON_USEDEP}]
-		<dev-python/asgiref-3.3.2[${PYTHON_USEDEP}]
-	)
+	>=dev-python/asgiref-3.3.4[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
 	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/django/django-3.1.9.ebuild b/dev-python/django/django-3.1.9.ebuild
deleted file mode 100644
index aad589629e48..000000000000
--- a/dev-python/django/django-3.1.9.ebuild
+++ /dev/null
@@ -1,99 +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='sqlite?,threads(+)'
-
-inherit bash-completion-r1 distutils-r1 optfeature verify-sig
-
-MY_P=${P^}
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
-SRC_URI="
-	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
-	verify-sig? ( https://media.djangoproject.com/pgp/${MY_P}.checksum.txt )"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-# admin fonts: Roboto (media-fonts/roboto)
-LICENSE+=" Apache-2.0"
-# admin icons, jquery, xregexp.js
-LICENSE+=" MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86 ~x64-macos"
-IUSE="doc sqlite test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	|| (
-		>=dev-python/asgiref-3.3.4[${PYTHON_USEDEP}]
-		<dev-python/asgiref-3.3.2[${PYTHON_USEDEP}]
-	)
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
-BDEPEND="
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		$(python_gen_impl_dep sqlite)
-		${RDEPEND}
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[webp,${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/selenium[${PYTHON_USEDEP}]
-		dev-python/tblib[${PYTHON_USEDEP}]
-		sys-devel/gettext
-		!!<dev-python/ipython-7.21.0-r1
-		!!=dev-python/ipython-7.22.0-r0
-	)
-	verify-sig? ( >=app-crypt/openpgp-keys-django-20201201 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1-bashcomp.patch
-	"${FILESDIR}"/django-2.2.21-fix-bpo43882.patch
-)
-
-distutils_enable_sphinx docs --no-autodoc
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc
-
-src_unpack() {
-	if use verify-sig; then
-		cd "${DISTDIR}" || die
-		verify-sig_verify_signed_checksums \
-			"${MY_P}.checksum.txt" sha256 "${MY_P}.tar.gz"
-		cd "${WORKDIR}" || die
-	fi
-
-	default
-}
-
-python_test() {
-	# Tests have non-standard assumptions about PYTHONPATH,
-	# and don't work with ${BUILD_DIR}/lib.
-	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp extras/django_bash_completion ${PN}-admin
-	bashcomp_alias ${PN}-admin django-admin.py
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature_header "Additional Backend support can be enabled via:"
-	optfeature "MySQL backend support" dev-python/mysqlclient
-	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	optfeature_header
-	optfeature "GEO Django" "sci-libs/gdal[geos]"
-	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" dev-python/pillow
-	optfeature "Password encryption" dev-python/bcrypt
-	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
-}
diff --git a/dev-python/django/django-3.2.1.ebuild b/dev-python/django/django-3.2.1.ebuild
deleted file mode 100644
index 2b8dbead8e94..000000000000
--- a/dev-python/django/django-3.2.1.ebuild
+++ /dev/null
@@ -1,95 +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='sqlite?,threads(+)'
-
-inherit bash-completion-r1 distutils-r1 optfeature verify-sig
-
-MY_P=${P^}
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
-SRC_URI="
-	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
-	verify-sig? ( https://media.djangoproject.com/pgp/${MY_P}.checksum.txt )"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-# admin fonts: Roboto (media-fonts/roboto)
-LICENSE+=" Apache-2.0"
-# admin icons, jquery, xregexp.js
-LICENSE+=" MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
-IUSE="doc sqlite test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/asgiref-3.3.4[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		${RDEPEND}
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[webp,${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/selenium[${PYTHON_USEDEP}]
-		dev-python/tblib[${PYTHON_USEDEP}]
-		sys-devel/gettext
-		!!<dev-python/ipython-7.21.0-r1
-		!!=dev-python/ipython-7.22.0-r0
-	)
-	verify-sig? ( >=app-crypt/openpgp-keys-django-20201201 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1-bashcomp.patch
-	"${FILESDIR}"/django-2.2.21-fix-bpo43882.patch
-)
-
-distutils_enable_sphinx docs --no-autodoc
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc
-
-src_unpack() {
-	if use verify-sig; then
-		cd "${DISTDIR}" || die
-		verify-sig_verify_signed_checksums \
-			"${MY_P}.checksum.txt" sha256 "${MY_P}.tar.gz"
-		cd "${WORKDIR}" || die
-	fi
-
-	default
-}
-
-python_test() {
-	# Tests have non-standard assumptions about PYTHONPATH,
-	# and don't work with ${BUILD_DIR}/lib.
-	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp extras/django_bash_completion ${PN}-admin
-	bashcomp_alias ${PN}-admin django-admin.py
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature_header "Additional Backend support can be enabled via:"
-	optfeature "MySQL backend support" dev-python/mysqlclient
-	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	optfeature_header
-	optfeature "GEO Django" "sci-libs/gdal[geos]"
-	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" dev-python/pillow
-	optfeature "Password encryption" dev-python/bcrypt
-	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
-}
diff --git a/dev-python/django/django-3.2.2.ebuild b/dev-python/django/django-3.2.2.ebuild
index 705984d913bb..49e424cf2f78 100644
--- a/dev-python/django/django-3.2.2.ebuild
+++ b/dev-python/django/django-3.2.2.ebuild
@@ -22,7 +22,7 @@ LICENSE+=" Apache-2.0"
 # admin icons, jquery, xregexp.js
 LICENSE+=" MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86 ~x64-macos"
 IUSE="doc sqlite test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/django/files/django-2.2.21-fix-bpo43882.patch b/dev-python/django/files/django-2.2.21-fix-bpo43882.patch
deleted file mode 100644
index dc5d333be940..000000000000
--- a/dev-python/django/files/django-2.2.21-fix-bpo43882.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From bf04b74b155f91b47ca986543348bdf644f2ffb0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 4 May 2021 13:10:50 +0200
-Subject: [PATCH] Reject URLs containing LF, CR or HT to workaround bpo43882
-
----
- django/core/validators.py | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/django/core/validators.py b/django/core/validators.py
-index a385819510..bab034912a 100644
---- a/django/core/validators.py
-+++ b/django/core/validators.py
-@@ -110,6 +110,8 @@ class URLValidator(RegexValidator):
-         try:
-             super().__call__(value)
-         except ValidationError as e:
-+            if '\r' in value or '\n' in value or '\t' in value:
-+                raise e
-             # Trivial case failed. Try for possible IDN domain
-             if value:
-                 try:
--- 
-2.31.1
-
diff --git a/dev-python/dominate/dominate-2.6.0.ebuild b/dev-python/dominate/dominate-2.6.0.ebuild
index 1a93657ae1a9..57ad3ee76041 100644
--- a/dev-python/dominate/dominate-2.6.0.ebuild
+++ b/dev-python/dominate/dominate-2.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/fire/Manifest b/dev-python/fire/Manifest
deleted file mode 100644
index 458e85959f89..000000000000
--- a/dev-python/fire/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST fire-0.3.1.tar.gz 99035 BLAKE2B 32d961c31d255d310ebd4048aee409d42e7890d741e845c6d4f7487eda20ccb09da02509110ded35c67bcc912c0392ff2bbd0c45f7cf2559a6255971f49a09ce SHA512 cbd9e66c74c706552da44b275d7ce637ab3ce1b34cad9981ca74be2e75f1b2219d330ea914873617334357c8b02a330bc275ae62938c9afcdf1733fb809f4e20
diff --git a/dev-python/fire/fire-0.3.1.ebuild b/dev-python/fire/fire-0.3.1.ebuild
deleted file mode 100644
index 1ed0195fd168..000000000000
--- a/dev-python/fire/fire-0.3.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="library for automatically generating command line interfaces"
-HOMEPAGE="https://github.com/google/python-fire"
-SRC_URI="https://github.com/google/python-fire/archive/refs/tags/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/termcolor[${PYTHON_USEDEP}]"
-BDEPEND=""
-
-S="${WORKDIR}"/python-${P}
diff --git a/dev-python/fire/metadata.xml b/dev-python/fire/metadata.xml
deleted file mode 100644
index 70e2209d43b1..000000000000
--- a/dev-python/fire/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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>
- <maintainer type="person">
-  <email>tupone@gentoo.org</email>
-  <name>Tupone Alfredo</name>
- </maintainer>
- 
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-python/flake8/Manifest b/dev-python/flake8/Manifest
index f0818db095a7..7b02bba580a6 100644
--- a/dev-python/flake8/Manifest
+++ b/dev-python/flake8/Manifest
@@ -1,3 +1,4 @@
 DIST flake8-3.8.4.tar.gz 163583 BLAKE2B 221234931365912adffec99c7c6761d2f35918222bee902ade4d8009d24f6918c66d23fc4b973fe653152cc6857b62ba859780b0d9de53fb91b7ea0379bee9d0 SHA512 51ed09beed50175573e6184b404431b3f89aa6594c40c70ed8288982fe12c2a68992e36d69c99013188f03555bf9fef1ba4f111f8e389cef1e1daa69b41ff5b0
 DIST flake8-3.9.0.tar.gz 164144 BLAKE2B e265a392445038b04ee2d8c24a763b4b1eebe9682295b70d14c07dbd739b34abbe5f76bc01dd31df7c666a106b62c5312c0522d6771c5649a91d2720a9d14467 SHA512 bfeaa13737f23318da8673c28f0f10463c0aad71a01fe70797321de3b9b7efbe7b5d0ee0664b8440db6b35d7f29f157848757d55fcac531a0c6da6371d681b65
 DIST flake8-3.9.1.tar.gz 164752 BLAKE2B 07f5049f8445bce87cee1509769e13f275f0e531b78a2769218233ac02a45ed7a8dc061f5253e4c136b47bfddfb574527d99dfff36d338516824167335f9a5fc SHA512 c592308fa32ae73982e6441624a989bdc213b639b0473f7342e75f11e3844282a713dce1f4649575d375766fa1d6b2a1840707109ac8d4672c0d2917f89a3d33
+DIST flake8-3.9.2.tar.gz 164777 BLAKE2B 1c991296a3e47e4c41f1196fcaf1e7ea059226dfb41657a52fc4f5a9023b54dba21dd99635398e12f37f52f6e498a0a1fb7d87aba0fe7098ebbdfb54dc5598b0 SHA512 618fe1b35070b24395e5d4da9fa1b1f6308abf6f85d8de71b8b553f84d70d9cd7d2a6f616fa1418db9a8b5ad3efab038f4e2d7c6020c0c1bdeb8157e666911fd
diff --git a/dev-python/flake8/flake8-3.9.2.ebuild b/dev-python/flake8/flake8-3.9.2.ebuild
new file mode 100644
index 000000000000..0ecb8279e7f5
--- /dev/null
+++ b/dev-python/flake8/flake8-3.9.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
+HOMEPAGE="https://gitlab.com/pycqa/flake8 https://pypi.org/project/flake8/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+
+# requires.txt inc. mccabe however that creates a circular dep
+RDEPEND="
+	>=dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
+	<dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
+	<dev-python/pycodestyle-2.8.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3 python3_{6,7})
+"
+PDEPEND="
+	>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
+	<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}
+	test? (
+		${PDEPEND}
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source dev-python/sphinx-prompt dev-python/sphinx_rtd_theme
+distutils_enable_tests --install pytest
diff --git a/dev-python/fsspec/Manifest b/dev-python/fsspec/Manifest
index 83a50a560940..34d4148f0f37 100644
--- a/dev-python/fsspec/Manifest
+++ b/dev-python/fsspec/Manifest
@@ -1,4 +1 @@
-DIST filesystem_spec-0.8.5.tar.gz 255904 BLAKE2B df400276dbc53a453e9e9a00acb2e93a86a5f239237533bab036a16bd48d6d709f68241febe75f6f72281162ba4a563a087405a1064e18805ce2501095d778fb SHA512 20001fd02348f15e764a9e20eab98267f6746bd7e86187914d3db3098061aa62cb296595c3519696ae1e99ef896d49df0fcec846aaf6e5c281dd1a344ef6c393
-DIST filesystem_spec-0.8.7.tar.gz 277744 BLAKE2B 4957b716d622ecd2a1bb381b291253970682dde2c90a0e8dd76dfcc3ce3c9ba55846d97df8c1fcedd4e0d5af1c10eccc6c94418f2e78e9fffde846d12c11e170 SHA512 6eb89bf1e19ac1313aad2217aaaf4686f2e2e831a2cd339f9e12b8319fb080b82f0b90b10af53c2e6febd98a34ae8520444fee3c6394e7ab5fd5ca68d56e5454
-DIST filesystem_spec-0.9.0.tar.gz 286641 BLAKE2B 70603c14d955640251f0922afaf7fa7cd3739c827218cb708fac27883b671e059ef17eb02b4d482904278855d06958e2159b49e232c558f78befd925472bca6f SHA512 68235dc592a7c7e85e5aab1b4409825f9c0a15c6841f96f54cef66c1b6ef166e930b910bd140bbaeb818f2f1f3dfc9a5752f3c479a97b6c5ce8e7d7ea98721af
 DIST filesystem_spec-2021.04.0.tar.gz 288179 BLAKE2B 896982345533fef9593f393209202e0a90473e9826ced9d69854dca20c66c64b85e1b1c44413dda718cdd1af7f41ac821b4d67b600536b32a873a4f73ab32801 SHA512 6806d6fbae89b514955a309346f19b2d199db10aecece728d117798368c311e3fbb38161fd5a54ea4a60ee7e656d2e50fdf8c4444ec3d6bdd761229b4a6341f2
diff --git a/dev-python/fsspec/files/fsspec-0.8.2-test-cleanup.patch b/dev-python/fsspec/files/fsspec-0.8.2-test-cleanup.patch
deleted file mode 100644
index 8227c2d23c66..000000000000
--- a/dev-python/fsspec/files/fsspec-0.8.2-test-cleanup.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From f933694238f78fbef91367d5051d515e0f9d0635 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 16 Dec 2020 11:32:04 +0100
-Subject: [PATCH] clean up properly after test_git
-
-Restore original directory after test_git.  Otherwise, next tests
-are run in non-existing directory and fail:
-
-[...]
->           cwd = os.getcwd()
-E           FileNotFoundError: [Errno 2] No such file or directory
-
-/usr/lib/python3.9/site-packages/gunicorn/util.py:443: FileNotFoundError
-
-While at it, reflow the logic so that the temporary directory is always
-cleaned, even if the test fails in middle of setup.
----
- fsspec/implementations/tests/test_git.py | 42 +++++++++++++-----------
- 1 file changed, 22 insertions(+), 20 deletions(-)
-
-diff --git a/fsspec/implementations/tests/test_git.py b/fsspec/implementations/tests/test_git.py
-index 562b228..4cd4c3f 100644
---- a/fsspec/implementations/tests/test_git.py
-+++ b/fsspec/implementations/tests/test_git.py
-@@ -10,30 +10,32 @@ pygit2 = pytest.importorskip("pygit2")
- 
- @pytest.fixture()
- def repo():
-+    orig_dir = os.getcwd()
-     d = tempfile.mkdtemp()
--    os.chdir(d)
--    subprocess.call("git init", shell=True, cwd=d)
--    subprocess.call("git init", shell=True, cwd=d)
--    subprocess.call('git config user.email "you@example.com"', shell=True, cwd=d)
--    subprocess.call('git config user.name "Your Name"', shell=True, cwd=d)
--    open(os.path.join(d, "file1"), "wb").write(b"data0")
--    subprocess.call("git add file1", shell=True, cwd=d)
--    subprocess.call('git commit -m "init"', shell=True, cwd=d)
--    sha = open(os.path.join(d, ".git/refs/heads/master"), "r").read().strip()
--    open(os.path.join(d, "file1"), "wb").write(b"data00")
--    subprocess.check_output('git commit -a -m "tagger"', shell=True, cwd=d)
--    subprocess.call('git tag -a thetag -m "make tag"', shell=True, cwd=d)
--    open(os.path.join(d, "file2"), "wb").write(b"data000")
--    subprocess.call("git add file2", shell=True)
--    subprocess.call('git commit -m "master tip"', shell=True, cwd=d)
--    subprocess.call("git checkout -b abranch", shell=True, cwd=d)
--    os.mkdir("inner")
--    open(os.path.join(d, "inner", "file1"), "wb").write(b"data3")
--    subprocess.call("git add inner/file1", shell=True, cwd=d)
--    subprocess.call('git commit -m "branch tip"', shell=True, cwd=d)
-     try:
-+        os.chdir(d)
-+        subprocess.call("git init", shell=True, cwd=d)
-+        subprocess.call("git init", shell=True, cwd=d)
-+        subprocess.call('git config user.email "you@example.com"', shell=True, cwd=d)
-+        subprocess.call('git config user.name "Your Name"', shell=True, cwd=d)
-+        open(os.path.join(d, "file1"), "wb").write(b"data0")
-+        subprocess.call("git add file1", shell=True, cwd=d)
-+        subprocess.call('git commit -m "init"', shell=True, cwd=d)
-+        sha = open(os.path.join(d, ".git/refs/heads/master"), "r").read().strip()
-+        open(os.path.join(d, "file1"), "wb").write(b"data00")
-+        subprocess.check_output('git commit -a -m "tagger"', shell=True, cwd=d)
-+        subprocess.call('git tag -a thetag -m "make tag"', shell=True, cwd=d)
-+        open(os.path.join(d, "file2"), "wb").write(b"data000")
-+        subprocess.call("git add file2", shell=True)
-+        subprocess.call('git commit -m "master tip"', shell=True, cwd=d)
-+        subprocess.call("git checkout -b abranch", shell=True, cwd=d)
-+        os.mkdir("inner")
-+        open(os.path.join(d, "inner", "file1"), "wb").write(b"data3")
-+        subprocess.call("git add inner/file1", shell=True, cwd=d)
-+        subprocess.call('git commit -m "branch tip"', shell=True, cwd=d)
-         yield d, sha
-     finally:
-+        os.chdir(orig_dir)
-         shutil.rmtree(d)
- 
- 
--- 
-2.29.2
-
diff --git a/dev-python/fsspec/fsspec-0.8.5.ebuild b/dev-python/fsspec/fsspec-0.8.5.ebuild
deleted file mode 100644
index 6dad2333ccde..000000000000
--- a/dev-python/fsspec/fsspec-0.8.5.ebuild
+++ /dev/null
@@ -1,50 +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} )
-inherit distutils-r1
-
-MY_P=filesystem_spec-${PV}
-
-DESCRIPTION="A specification that python filesystems should adhere to"
-HOMEPAGE="https://github.com/intake/filesystem_spec/
-	https://pypi.org/project/fsspec/"
-SRC_URI="
-	https://github.com/intake/filesystem_spec/archive/${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-BDEPEND="
-	dev-python/versioneer[${PYTHON_USEDEP}]
-	test? (
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/fsspec-0.8.2-test-cleanup.patch
-)
-
-src_test() {
-	git config --global user.email "you@example.com" || die
-	git config --global user.name "Your Name" || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	# sftp and smb require server started via docker
-	pytest -vv \
-		--ignore fsspec/implementations/tests/test_sftp.py \
-		--ignore fsspec/implementations/tests/test_smb.py ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/fsspec/fsspec-0.8.7.ebuild b/dev-python/fsspec/fsspec-0.8.7.ebuild
deleted file mode 100644
index 6d33d5b4bf16..000000000000
--- a/dev-python/fsspec/fsspec-0.8.7.ebuild
+++ /dev/null
@@ -1,48 +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} )
-inherit distutils-r1
-
-MY_P=filesystem_spec-${PV}
-
-DESCRIPTION="A specification that python filesystems should adhere to"
-HOMEPAGE="https://github.com/intake/filesystem_spec/
-	https://pypi.org/project/fsspec/"
-SRC_URI="
-	https://github.com/intake/filesystem_spec/archive/${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-BDEPEND="
-	dev-python/versioneer[${PYTHON_USEDEP}]
-	test? (
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-distutils_enable_tests pytest
-
-src_test() {
-	git config --global user.email "you@example.com" || die
-	git config --global user.name "Your Name" || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	# sftp and smb require server started via docker
-	pytest -vv \
-		--deselect fsspec/tests/test_spec.py::test_find \
-		--ignore fsspec/implementations/tests/test_dbfs.py \
-		--ignore fsspec/implementations/tests/test_sftp.py \
-		--ignore fsspec/implementations/tests/test_smb.py ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/fsspec/fsspec-0.9.0.ebuild b/dev-python/fsspec/fsspec-0.9.0.ebuild
deleted file mode 100644
index 0d583cf6fd29..000000000000
--- a/dev-python/fsspec/fsspec-0.9.0.ebuild
+++ /dev/null
@@ -1,48 +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} )
-inherit distutils-r1
-
-MY_P=filesystem_spec-${PV}
-
-DESCRIPTION="A specification that python filesystems should adhere to"
-HOMEPAGE="https://github.com/intake/filesystem_spec/
-	https://pypi.org/project/fsspec/"
-SRC_URI="
-	https://github.com/intake/filesystem_spec/archive/${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-BDEPEND="
-	dev-python/versioneer[${PYTHON_USEDEP}]
-	test? (
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-distutils_enable_tests pytest
-
-src_test() {
-	git config --global user.email "you@example.com" || die
-	git config --global user.name "Your Name" || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	# sftp and smb require server started via docker
-	pytest -vv \
-		--deselect fsspec/tests/test_spec.py::test_find \
-		--ignore fsspec/implementations/tests/test_dbfs.py \
-		--ignore fsspec/implementations/tests/test_sftp.py \
-		--ignore fsspec/implementations/tests/test_smb.py ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/fsspec/fsspec-2021.04.0.ebuild b/dev-python/fsspec/fsspec-2021.04.0.ebuild
index 0264e4aa640c..c5a02edcf4c4 100644
--- a/dev-python/fsspec/fsspec-2021.04.0.ebuild
+++ b/dev-python/fsspec/fsspec-2021.04.0.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 BDEPEND="
 	dev-python/versioneer[${PYTHON_USEDEP}]
diff --git a/dev-python/h11/Manifest b/dev-python/h11/Manifest
index 9ae4e0ec8302..6eaa87ec259b 100644
--- a/dev-python/h11/Manifest
+++ b/dev-python/h11/Manifest
@@ -1,2 +1 @@
-DIST h11-0.11.0.tar.gz 97509 BLAKE2B 51e4eee959f36775317ac67450c80a6484309efcdd5adad3737d2d80ab5d9808d5d8aeb0118aa79f88848c052c330542ebfb4c03b96bdd805015fd9ad9f9fd41 SHA512 13dba59afd949d715fd693e5224e57dea5c923eb91b0981a5b5987bbe6e6e00e32552e1602353a48458615a8dd21f2a561961747ae15291eb3462fe42cef3f82
 DIST h11-0.12.0.tar.gz 98121 BLAKE2B 8e510461e0256a49166ad3b11394d715634d036642629b216f0c94785245909fc3d9ab89ba3048b857f1ae030cae7ed0b3195745739d80c74028a85848a762db SHA512 ba2a2c185af270185ba5e1fd80ec9308e35afcd60a125a77cbeae2669f462983d063339371312f154a7c80c154ac97796ab36782b36549235435dcfd81b93421
diff --git a/dev-python/h11/h11-0.11.0.ebuild b/dev-python/h11/h11-0.11.0.ebuild
deleted file mode 100644
index 70036ff9e16c..000000000000
--- a/dev-python/h11/h11-0.11.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A pure-Python implementation of HTTP/1.1 inspired by hyper-h2"
-HOMEPAGE="https://github.com/python-hyper/h11/ https://pypi.org/project/h11/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/inflection/inflection-0.5.1.ebuild b/dev-python/inflection/inflection-0.5.1.ebuild
index 5a70233042b2..692e94a43f70 100644
--- a/dev-python/inflection/inflection-0.5.1.ebuild
+++ b/dev-python/inflection/inflection-0.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index 406eec664695..bf700c29430e 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1,3 +1,2 @@
-DIST ipykernel-5.5.0.tar.gz 112600 BLAKE2B d1df26095e9badd5eb1fe4665bac01c254375407ac3af1f014d78b9e6dd6613c6a5830c09a63191ea84c36fc31a5d9faf73b1a29dab1a020e225636f6f2f0c90 SHA512 b1726d765f4debbb4c5efcc5e2d9745d8e51ada8e1417b31463b7c9546c6887cc6c0787fd32729b4013544e2bd41829dfd289dbb45b0c5dbb026eb57a47ec51a
 DIST ipykernel-5.5.3.tar.gz 112656 BLAKE2B 4cad13f24baafc591558136405c8c643e12033ffd01b5608ffdef5442080c3e2003c0f2c4b1562c1f326b4c10e124afc358f5258a6c59b7c9db90b8bb23278e3 SHA512 7b7f0a0aed71f7713934ac071e7283be2028a221fa2b87cad8c2d26821909f81d21dec23a5f72c91e7c9de639b0d7430957c8cc58bbc026d95bd81bb0a005800
 DIST ipykernel-5.5.4.tar.gz 112728 BLAKE2B 489e12d0cbde2f80f2c921f026c7b84554b1fef481164e07f89b063127b01d106fc6b19f830ac321d79285fb9df065352dbc0c2a997b3629a64e766d2e50f347 SHA512 96728321fe71d528435415eda917c623269af734598a78168144d983aa64db4f9ced981fa67c83263da1ed878831669d821b84a769a08a271adafacfcbb75bf9
diff --git a/dev-python/ipykernel/ipykernel-5.5.0-r1.ebuild b/dev-python/ipykernel/ipykernel-5.5.0-r1.ebuild
deleted file mode 100644
index 7ba3bf9006ea..000000000000
--- a/dev-python/ipykernel/ipykernel-5.5.0-r1.ebuild
+++ /dev/null
@@ -1,41 +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(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="IPython Kernel for Jupyter"
-HOMEPAGE="https://github.com/ipython/ipykernel"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/ipython[${PYTHON_USEDEP}]
-	<dev-python/jupyter_client-6.2[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/nose_warnings_filters[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# skip tests that require numpy, also some of them fail
-	# https://github.com/ipython/ipykernel/issues/574
-	rm ipykernel/tests/test_serialize.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/ipykernel/ipykernel-5.5.3-r1.ebuild b/dev-python/ipykernel/ipykernel-5.5.3-r1.ebuild
index aa8f6598a7f9..ffca34e5493a 100644
--- a/dev-python/ipykernel/ipykernel-5.5.3-r1.ebuild
+++ b/dev-python/ipykernel/ipykernel-5.5.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/jupyter-dash/Manifest b/dev-python/jupyter-dash/Manifest
deleted file mode 100644
index 5ee181a10bb6..000000000000
--- a/dev-python/jupyter-dash/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jupyter-dash-0.4.0.tar.gz 42855 BLAKE2B 6ee097892e8175d72883005a4b8097e1069d3550d845dc8728991c78d437d74f571e3e1e4fddf7c8df716c0921a5910c9fbc654f0a56c0f177f14c7b2c1bd336 SHA512 16774dfe54122096cdf672408af8fb7f0246ba7db1429eeee21a9b10645990d859208e13b743119c90e5b0ae042eeb32e91e56205139d9cf792f5995e467ccf9
diff --git a/dev-python/jupyter-dash/jupyter-dash-0.4.0.ebuild b/dev-python/jupyter-dash/jupyter-dash-0.4.0.ebuild
deleted file mode 100644
index b195b2b7dce9..000000000000
--- a/dev-python/jupyter-dash/jupyter-dash-0.4.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Plotly Dash apps from within Jupyter environments"
-HOMEPAGE="https://plotly.com/dash/"
-SRC_URI="https://github.com/plotly/${PN}/archive/refs/tags/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	dev-python/ansi2html[${PYTHON_USEDEP}]
-	dev-python/dash[${PYTHON_USEDEP}]
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/retrying[${PYTHON_USEDEP}]"
-BDEPEND=""
-
-src_install () {
-	distutils-r1_src_install
-	mv "${D}"/usr/etc "${D}"/ || die
-}
diff --git a/dev-python/jupyter-dash/metadata.xml b/dev-python/jupyter-dash/metadata.xml
deleted file mode 100644
index 70e2209d43b1..000000000000
--- a/dev-python/jupyter-dash/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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>
- <maintainer type="person">
-  <email>tupone@gentoo.org</email>
-  <name>Tupone Alfredo</name>
- </maintainer>
- 
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-python/prometheus_client/Manifest b/dev-python/prometheus_client/Manifest
index a8c146a3c460..8317e54b7930 100644
--- a/dev-python/prometheus_client/Manifest
+++ b/dev-python/prometheus_client/Manifest
@@ -1,3 +1 @@
-DIST prometheus_client-0.10.0.tar.gz 71598 BLAKE2B 013b73c3f417fc6102ab6ebe77381b34dee1b6bd7a32af88934ba4dcf6652cd73524de0c489aa2adaa02869c17094eedd95cd87858c9cd2f019001c7fea41a0b SHA512 add7f5dae5f3353df755a1cd74d4a4b08f4217c8eed1880f6abf0ac4629e3179afa6298f93b407babd215b8b6aa84587297da68d6625c27088110e615cb0df10
 DIST prometheus_client-0.10.1.tar.gz 71676 BLAKE2B 63a597eca0f7684013ca2de8cda9d9ca7ab64d3ff923e3d328c1e54e794ea9e34771795117a8cd8254063028ceedd9c50d15c89bba48d3994e79629ebae6df14 SHA512 231c86bfeb2a35fbaf172005ead5b790b107c55f3657d94ad417c0036cc72ad6b48ebef7d52d2fdd1bca9b98032d1057250a880b002a29e98efa803886f26766
-DIST prometheus_client-0.9.0.tar.gz 68176 BLAKE2B e20f599e6a4d39226e48cafeca879b87389fdb5a6eda401161ce448cb0b46a89ce0cccc1b78e2fc8cb60cc461253345b9ba52809c861f0a187171c33095f625a SHA512 1d68ca35169972c50bb56ede88c47408ee27b3e795fcf03798313aed2dbc5db5532fe6886998c118258b76e431c6e49aa0ac19b9206cad63711901497258aaa5
diff --git a/dev-python/prometheus_client/prometheus_client-0.10.0.ebuild b/dev-python/prometheus_client/prometheus_client-0.10.0.ebuild
deleted file mode 100644
index 1e789d82721b..000000000000
--- a/dev-python/prometheus_client/prometheus_client-0.10.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Python client for the Prometheus monitoring system"
-HOMEPAGE="https://pypi.org/project/prometheus-client/
-	https://github.com/prometheus/client_python/"
-SRC_URI="https://github.com/prometheus/client_python/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/client_python-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="dev-python/twisted[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/prometheus_client/prometheus_client-0.10.1.ebuild b/dev-python/prometheus_client/prometheus_client-0.10.1.ebuild
index 1e789d82721b..c2272dc951f1 100644
--- a/dev-python/prometheus_client/prometheus_client-0.10.1.ebuild
+++ b/dev-python/prometheus_client/prometheus_client-0.10.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/client_python-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="dev-python/twisted[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/prometheus_client/prometheus_client-0.9.0.ebuild b/dev-python/prometheus_client/prometheus_client-0.9.0.ebuild
deleted file mode 100644
index 0eeab4b94128..000000000000
--- a/dev-python/prometheus_client/prometheus_client-0.9.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 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 client for the Prometheus monitoring system"
-HOMEPAGE="https://pypi.org/project/prometheus-client/
-	https://github.com/prometheus/client_python/"
-SRC_URI="https://github.com/prometheus/client_python/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/client_python-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="dev-python/twisted[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pudb/Manifest b/dev-python/pudb/Manifest
index 6c331995a833..6901d0b9ddf3 100644
--- a/dev-python/pudb/Manifest
+++ b/dev-python/pudb/Manifest
@@ -1 +1,2 @@
 DIST pudb-2020.1.tar.gz 70838 BLAKE2B c0f9ebf88851ebd859876e3e9b29239c72e308d7a544aee26baeb44a47ec3de75aed031ca10ef67c32d0262ffa690bfc063122524e64afa7d5763afb9a5baccf SHA512 4878c3f375d96130ca9a1afe668227b6f08e876e618bcffb47b1507be6bf7a393d88ab5f65f33c6497c98e645a188d5f3eaabb4f6a1e49d8d09b0f8b6b17ba14
+DIST pudb-2021.1.tar.gz 216707 BLAKE2B 1287fa48607e9b73dd0bed063b29933dd4de6ab598ad99217ab13a719a6b9654765bc44c28150962ba22703733a4e956c39e843414444c3b7fff67cefe70d7d8 SHA512 54d62f1342ab461e58a382c0eb654ecc9d3bd759844bab2f0a339e91ba805670e4dc7ccd84e8188f34e06a07ac770f1c0cddd4a4ef916885af0bdc638db81fcf
diff --git a/dev-python/pudb/pudb-2020.1.ebuild b/dev-python/pudb/pudb-2020.1.ebuild
index 774dc21737b4..e379dd848556 100644
--- a/dev-python/pudb/pudb-2020.1.ebuild
+++ b/dev-python/pudb/pudb-2020.1.ebuild
@@ -4,8 +4,6 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
 inherit distutils-r1
 
 DESCRIPTION="A full-screen, console-based Python debugger"
@@ -20,6 +18,4 @@ RDEPEND="
 	dev-python/urwid[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]"
 
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+distutils_enable_tests pytest
diff --git a/dev-python/pudb/pudb-2021.1.ebuild b/dev-python/pudb/pudb-2021.1.ebuild
new file mode 100644
index 000000000000..e379dd848556
--- /dev/null
+++ b/dev-python/pudb/pudb-2021.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="A full-screen, console-based Python debugger"
+HOMEPAGE="https://pypi.org/project/pudb/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/urwid[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/py-amqp/py-amqp-5.0.6.ebuild b/dev-python/py-amqp/py-amqp-5.0.6.ebuild
index 24d64ada5fbe..04d3e858c916 100644
--- a/dev-python/py-amqp/py-amqp-5.0.6.ebuild
+++ b/dev-python/py-amqp/py-amqp-5.0.6.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="extras"
 
 BDEPEND="
diff --git a/dev-python/py-gfm/Manifest b/dev-python/py-gfm/Manifest
index eda48d5ecc32..2ef7d0dbec7c 100644
--- a/dev-python/py-gfm/Manifest
+++ b/dev-python/py-gfm/Manifest
@@ -1 +1,2 @@
 DIST py-gfm-0.1.4.tar.gz 21015 BLAKE2B a3060453ce9b2c0a4c3112f003439527c03b7b0be439b63620575e95265d8a65c1053546f9cacf19b6006ef2cbcfe5d8dae762740ce6e6aa035706a94bc611d1 SHA512 4730035b8a6168b6d2987a4a5f9a0ca70564e6797b7c88ec43f04152fa77c5a396f204b6143fc0bb3a53ab364b6d11b2274663b8b64d4640afba2a21cd1e3c6a
+DIST py-gfm-1.0.2.tar.gz 15134 BLAKE2B 9aefb7a804f6b857ccaf55f006b9e7317e7a45de285a95ce65664361f5f644be630c912824d09de959df2962ddfa64efe8b77738a59b1679150c63649a1d116a SHA512 a1c3a39c86f0588744690811503d35596d83a5fdfe725295c9ba0820364c586bd7ab9a2beb2379122ca13dcbb1fb9aa2ab0c8c7348d4a483d8ffc8686631a8f5
diff --git a/dev-python/py-gfm/metadata.xml b/dev-python/py-gfm/metadata.xml
index 1e820e221b2e..adc4d779d530 100644
--- a/dev-python/py-gfm/metadata.xml
+++ b/dev-python/py-gfm/metadata.xml
@@ -10,4 +10,5 @@
   <remote-id type="pypi">py-gfm</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-python/py-gfm/py-gfm-1.0.2.ebuild b/dev-python/py-gfm/py-gfm-1.0.2.ebuild
new file mode 100644
index 000000000000..3c107e52b9e3
--- /dev/null
+++ b/dev-python/py-gfm/py-gfm-1.0.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Github-Flavored Markdown for Python-Markdown"
+HOMEPAGE="https://github.com/Zopieux/py-gfm"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND="dev-python/markdown[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index b448b2f318f9..1f76320c75ed 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -1,6 +1,2 @@
-DIST pylint-2.7.1.tar.gz 708916 BLAKE2B 606637ff25daccba741ae5bcdecb6a2be50bc17393009193a29312b4a218622d23287a0f0c5a81e79e77cc54dfe529483ad01fa39445103f240addaa3ad58bf7 SHA512 eebf1d3da5ca072cb912ecffebf183c79f2f8b2c2b14044751aad202d75d06d1c06abb561d4581990b92fe54c06b570a1de39b792b0d729cf300c01c82c4e3c0
-DIST pylint-2.7.2.tar.gz 709177 BLAKE2B 5e4daeb19b6b18d570f4d78b01cc5023d5d245840160fdbddb194ab7036118742ffe3075ee27c37bd7a700d11d9006dc9abaaba9cf9596ae1b63941f139da7ac SHA512 800b210fbe5665db390d5c885d103856dc474b4e43d2f752bdcfcea36121132c26eecdcb67620c4a90456823f11a33568de4d37d59eea692dcd1751d931420f7
 DIST pylint-2.7.4.tar.gz 715507 BLAKE2B 141506c067195422d0b052924baf87c363c89e28b3279f5173d989ac9247163184840251bd05dfb7dbb765f7b2e921a851fde0323b6c4cc231bc58911c77f692 SHA512 2b7ec9ab3325209021cb0282a6dacabf7ddd1f5e4049157610015ac8c11413471defc9e0528f81e1a60c2b259260f1bde1d04286776b3f32f771968b9866d734
-DIST pylint-2.8.0.tar.gz 734325 BLAKE2B 479c6f409a7da46d8416c4c06f76937b70ddbffab64d57a9107f9b04283fa985186684d3d146c5ca585a0e8e9369d28e4fbeb5f53262662d94edd862694dd4fa SHA512 d4f6b6c6046265beb0e17b8d375d2604a889bf9b6569d4dae9cdec3f92c8c76d440f6527c9d42f7197a73d4a65fab73f57e5ab99c98d40681119eb051b117211
-DIST pylint-2.8.1.tar.gz 734583 BLAKE2B eb28c54a952c87f9cf59d18956dbc632ff89f4d3a91423a84ee3d4468e5af5fe7fcf37288964af0f36884bc0c46d400e2414bbf114a4a06f75a5c8da50ba9030 SHA512 ec8710396f07cdec8a395748ffda403a1f3fbd00094a1ad32e976c52be946c08b9e32521205dc165a0284467c68d9f467be40d141907bcd148b94e285eeca606
 DIST pylint-2.8.2.gh.tar.gz 734667 BLAKE2B 1525273298f39163de4db7946a749768cb9bcf7e11f89791944ccb5fb8d0918eedfc80d5e559d33934d468dd5781d4cb4921b9407daf2842613a8e3ba7d134e0 SHA512 7023603668f540ecc0b35f3289377855c4c0df01e04a9af255f5c8031f568f6b76508bb3a7f0aba8e76a86b63eae423908c30f47258d6dee46bb23320c952701
diff --git a/dev-python/pylint/pylint-2.7.1.ebuild b/dev-python/pylint/pylint-2.7.1.ebuild
deleted file mode 100644
index a747b2ec473b..000000000000
--- a/dev-python/pylint/pylint-2.7.1.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="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
-IUSE="examples"
-
-# Mirror requirements from pylint/__pkginfo__.py
-RDEPEND="
-	~dev-python/astroid-2.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}]
-"
-BDEPEND="
-	test? (
-		dev-python/six[${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=(
-		# Fails when PYTHONPATH ends with a colon
-		# https://github.com/PyCQA/pylint/issues/3636
-		tests/test_self.py::TestRunTC::test_do_not_import_files_from_local_directory
-		# No need to run the benchmarks
-		tests/benchmark/test_baseline_benchmarks.py
-	)
-	# Specify the test directory explicitly to avoid import file mismatches
-	pytest -vv tests ${skipped_tests[@]/#/--deselect } \
-		|| die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	doman man/{pylint,pyreverse}.1
-	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.7.2-r1.ebuild b/dev-python/pylint/pylint-2.7.2-r1.ebuild
deleted file mode 100644
index e4dcb655dc0c..000000000000
--- a/dev-python/pylint/pylint-2.7.2-r1.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} )
-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="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="examples"
-
-# Mirror requirements from pylint/__pkginfo__.py
-RDEPEND="
-	<dev-python/astroid-2.6[${PYTHON_USEDEP}]
-	>=dev-python/astroid-2.5.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}]
-"
-BDEPEND="
-	test? (
-		dev-python/six[${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
-	pytest -vv tests ${skipped_tests[@]/#/--deselect } \
-		|| die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	doman man/{pylint,pyreverse}.1
-	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.7.4.ebuild b/dev-python/pylint/pylint-2.7.4.ebuild
index b1e54c7f72ee..778da8e90e5e 100644
--- a/dev-python/pylint/pylint-2.7.4.ebuild
+++ b/dev-python/pylint/pylint-2.7.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 IUSE="examples"
 
 # Mirror requirements from pylint/__pkginfo__.py
diff --git a/dev-python/pylint/pylint-2.8.0.ebuild b/dev-python/pylint/pylint-2.8.0.ebuild
deleted file mode 100644
index 7b341bedcf62..000000000000
--- a/dev-python/pylint/pylint-2.8.0.ebuild
+++ /dev/null
@@ -1,69 +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/${P}.tar.gz"
-S=${WORKDIR}/${PN}-${P}
-
-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.5.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
-		# 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]'
-	)
-	[[ ${EPYTHON} == python3.8 ]] && skipped_tests+=(
-		# TODO
-		'tests/test_functional.py::test_functional[typing_deprecated_alias]'
-		'tests/test_functional.py::test_functional[typing_consider_using_alias]'
-		'tests/test_functional.py::test_functional[typing_consider_using_alias_without_future]'
-	)
-	# 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.8.1.ebuild b/dev-python/pylint/pylint-2.8.1.ebuild
deleted file mode 100644
index d39df1f105ba..000000000000
--- a/dev-python/pylint/pylint-2.8.1.ebuild
+++ /dev/null
@@ -1,63 +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/${P}.tar.gz"
-S=${WORKDIR}/${PN}-${P}
-
-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.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}]
-"
-
-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/pymdown-extensions/Manifest b/dev-python/pymdown-extensions/Manifest
index a5ec80e2f091..40b5d9511431 100644
--- a/dev-python/pymdown-extensions/Manifest
+++ b/dev-python/pymdown-extensions/Manifest
@@ -1,2 +1,3 @@
 DIST pymdown-extensions-8.0.1.tar.gz 642787 BLAKE2B fe25fd828633bb1a653430431de9fd2f9abc881ff457d2c630befd7c094a147f4d4883088488a66c601190794c15fdfb8297a3252ba3b070412b2f18872f6126 SHA512 3f85bfe9128dcdc63cea4c2eb4d55173d697ae9d112559a74527ed64b3bd63f67eee119b81a54d0ac927bc21b6eb8411c03dc7afc77673739a81772c10ebe62a
 DIST pymdown-extensions-8.1.1.tar.gz 650451 BLAKE2B d72b4ff60747a5f2142b778d75ba438757f35e1bb45d1cf005c9ec7b187b8c6aa1e890ca1bf01b3a202dfd38c8f813c928041870a30bb2e0fc035e2a5ff9809e SHA512 a1472858b6afeb9b582cf97a4471e09e25dddcb0504d58f8aa703802fe0c075a0af2fa8e1895f02b48b5959297c37cd1feee789741d93a1739f9d19c3341b108
+DIST pymdown-extensions-8.2.tar.gz 766818 BLAKE2B db14bcb0e7bf572e97c6dc7d7ebb00780ce081f9006a0d067c98c369433c147e42b93eab0dfaddfed6f93030ab32f0ae1c7c0ac3c08a1f7f07fee15a1be1a398 SHA512 220465b2a2d0f9563c119dae61d2527207a4f3a1d24ea1b1585997c9c23c4a7c0bbc23b4dc7c551e533ac3af20c7852cb7b8cce6dd3908844aafcd801d20e14d
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-8.2.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-8.2.ebuild
new file mode 100644
index 000000000000..f7191e613f74
--- /dev/null
+++ b/dev-python/pymdown-extensions/pymdown-extensions-8.2.ebuild
@@ -0,0 +1,52 @@
+# 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} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-git-revision-date-localized-plugin
+	dev-python/mkdocs-minify-plugin
+	dev-python/mkdocs-material
+	dev-python/pymdown-lexers
+	dev-python/pyspelling
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="Extensions for Python Markdown"
+HOMEPAGE="
+	https://github.com/facelessuser/pymdown-extensions/
+	https://pypi.org/project/pymdown-extensions/
+"
+SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-python/markdown-3.2[${PYTHON_USEDEP}]"
+
+BDEPEND="
+	test? (
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# mkdocs-git-revision-date-localized-plugin needs git repo
+	if use doc; then
+		git init || die
+		git config --global user.email "you@example.com" || die
+		git config --global user.name "Your Name" || die
+		git add . || die
+		git commit -m 'init' || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/sniffio/metadata.xml b/dev-python/sniffio/metadata.xml
index 8b2c7fa64880..81f0007765c7 100644
--- a/dev-python/sniffio/metadata.xml
+++ b/dev-python/sniffio/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
  <maintainer type="project">
   <email>python@gentoo.org</email>
+  <name>Python</name>
  </maintainer>
  <upstream>
   <remote-id type="github">python-trio/sniffio</remote-id>
diff --git a/dev-python/sniffio/sniffio-1.2.0.ebuild b/dev-python/sniffio/sniffio-1.2.0.ebuild
index a23ae11a629c..5a709c51bf7d 100644
--- a/dev-python/sniffio/sniffio-1.2.0.ebuild
+++ b/dev-python/sniffio/sniffio-1.2.0.ebuild
@@ -26,6 +26,5 @@ python_test() {
 		sniffio/_tests/test_sniffio.py::test_curio
 	)
 
-	pytest -vv ${deselect[@]/#/--deselect } ||
-		die "Tests failed with ${EPYTHON}"
+	epytest ${deselect[@]/#/--deselect }
 }
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index 474837296ae3..dbd5fd9b1c9d 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -1 +1,2 @@
 DIST Sphinx-3.5.4.tar.gz 5911093 BLAKE2B 8740714dfaf3733bf57d0b277315b4e7b5cad86247ea30dcbc4f5dadf5f5169329050b7be43ec8625c47df9dcc19afcc6c4d782725c7007f8178b7eb7be7dc05 SHA512 853379f3b0496772846be9beb072c2c8a69ff899ffe4c6435b448ea639a32138c61403f9c14f62f4f78b2e526a2ee7c05b4196eabdeee37bcae6aa98df992125
+DIST Sphinx-4.0.0.tar.gz 6104929 BLAKE2B 1f29e9c9e12957ed9c8f058b0b8ac3aa584db3867a6e4de35e73400362c2c25afd087a1048b8b35d59730d5401c51139173bd558a8fb0178f6f0351a5284f7cd SHA512 aa70be0a1a1f136257e253819fe7075116d48f21f2db716f87ca383737ff28c1c3e6a802fbf7ab3e9624c655966b5f02f746fb54f65ee9996da4bbee22294738
diff --git a/dev-python/sphinx/sphinx-4.0.0.ebuild b/dev-python/sphinx/sphinx-4.0.0.ebuild
new file mode 100644
index 000000000000..51236c790f8c
--- /dev/null
+++ b/dev-python/sphinx/sphinx-4.0.0.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python documentation generator"
+HOMEPAGE="https://www.sphinx-doc.org/
+	https://github.com/sphinx-doc/sphinx"
+SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
+S=${WORKDIR}/${P^}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc latex"
+
+RDEPEND="
+	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/imagesize[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-devhelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-jsmath[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-htmlhelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-serializinghtml[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typed-ast[${PYTHON_USEDEP}]
+	' python3_7)
+	latex? (
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)"
+BDEPEND="
+	doc? (
+		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
+		media-gfx/graphviz
+	)
+	test? (
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		virtual/imagemagick-tools[jpeg,png,svg]
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.2.1-doc-link.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# disable internet access
+	sed -i -e 's:^intersphinx_mapping:disabled_&:' \
+		doc/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile
+
+	# Generate the grammar. It will be caught by install somehow.
+	# Note that the tests usually do it for us. However, I don't want
+	# to trust USE=test really running all the tests, especially
+	# with FEATURES=test-fail-continue.
+	pushd "${BUILD_DIR}"/lib >/dev/null || die
+	"${EPYTHON}" -m sphinx.pycode.__init__ || die "Grammar generation failed."
+	popd >/dev/null || die
+}
+
+python_compile_all() {
+	if use doc; then
+		esetup.py build_sphinx
+		HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	fi
+}
+
+python_test() {
+	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
+	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
+
+	local deselect=(
+		# these tests require Internet access
+		tests/test_build_latex.py::test_latex_images
+		tests/test_build_linkcheck.py::test_defaults
+		tests/test_build_linkcheck.py::test_defaults_json
+		tests/test_build_linkcheck.py::test_anchors_ignored
+	)
+	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
+		tests/test_ext_autodoc.py::test_autodoc_inherited_members_None
+		tests/test_ext_autodoc.py::test_automethod_for_builtin
+		tests/test_ext_autodoc.py::test_partialfunction
+		tests/test_ext_autodoc.py::test_autodoc_typed_instance_variables
+		tests/test_ext_autodoc.py::test_autodoc_typed_inherited_instance_variables
+		tests/test_ext_autodoc.py::test_cython
+		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_subclass_of_generic_type
+		tests/test_ext_autodoc_autodata.py::test_autodata_type_comment
+		tests/test_ext_autodoc_autofunction.py::test_builtin_function
+		tests/test_ext_autodoc_autofunction.py::test_methoddescriptor
+		tests/test_ext_autodoc_configs.py::test_autodoc_typehints_signature
+		tests/test_ext_autodoc_configs.py::test_autodoc_type_aliases
+		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module
+		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module_skipped
+		tests/test_pycode_parser.py::test_annotated_assignment
+		tests/test_build_linkcheck.py::test_connect_to_selfsigned_fails
+	)
+
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/urwid/urwid-2.1.1.ebuild b/dev-python/urwid/urwid-2.1.1.ebuild
index 08d50a3eed38..c29db1ea5e61 100644
--- a/dev-python/urwid/urwid-2.1.1.ebuild
+++ b/dev-python/urwid/urwid-2.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -31,15 +31,6 @@ src_prepare() {
 	distutils-r1_src_prepare
 }
 
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		export CFLAGS
-	fi
-
-	distutils-r1_python_compile
-}
-
 python_install_all() {
 	use examples && dodoc -r examples
 	distutils-r1_python_install_all
diff --git a/dev-python/whisper/whisper-1.1.7.ebuild b/dev-python/whisper/whisper-1.1.7.ebuild
index 807062114f84..29c37cf1df55 100644
--- a/dev-python/whisper/whisper-1.1.7.ebuild
+++ b/dev-python/whisper/whisper-1.1.7.ebuild
@@ -15,19 +15,7 @@ SRC_URI="https://github.com/graphite-project/${PN}/archive/${PV}.tar.gz -> ${P}.
 LICENSE="Apache-2.0"
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
 
 distutils_enable_tests pytest
-
-#python_test() {
-#	py.test || die "tests failed with ${EPYTHON}"
-#}
diff --git a/dev-python/xstatic/xstatic-1.0.2.ebuild b/dev-python/xstatic/xstatic-1.0.2.ebuild
index 80f0e1a13355..c050497341e1 100644
--- a/dev-python/xstatic/xstatic-1.0.2.ebuild
+++ b/dev-python/xstatic/xstatic-1.0.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2020-2021 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7,8,9,10} )
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 
 inherit distutils-r1
author	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2021-05-09 13:50:50 +0000
committer	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2021-05-09 13:50:50 +0000
commit	7c9577d88eb2a9d92c8f03f7fa42947696be2525 (patch)
tree	a01795ca7c7f33cfebba43757d70f30d0faed309 /dev-python
parent	933759f3fcaf3d378991b18fa19eead3812b1be0 (diff)
download	baldeagleos-repo-7c9577d88eb2a9d92c8f03f7fa42947696be2525.tar.gz baldeagleos-repo-7c9577d88eb2a9d92c8f03f7fa42947696be2525.tar.xz baldeagleos-repo-7c9577d88eb2a9d92c8f03f7fa42947696be2525.zip