Adding metadata

author: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2021-11-22 01:40:48 +0000
committer: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2021-11-22 01:40:48 +0000
commit: 897bc52a56ca0e12d2c98c20da030693679b1913 (patch)
tree: 9b2989760e530c9b03dc8461e886b6e10c9b34cb /dev-python
parent: bbe03519a37a075f45ee85b37dca2d5bb5a20fca (diff)
download: baldeagleos-repo-897bc52a56ca0e12d2c98c20da030693679b1913.tar.gz
baldeagleos-repo-897bc52a56ca0e12d2c98c20da030693679b1913.tar.xz
baldeagleos-repo-897bc52a56ca0e12d2c98c20da030693679b1913.zip
87 files changed, 217 insertions, 1126 deletions
diff --git a/dev-python/aiohttp-socks/Manifest b/dev-python/aiohttp-socks/Manifest
index 9e0b89de848f..3ba0a03f307e 100644
--- a/dev-python/aiohttp-socks/Manifest
+++ b/dev-python/aiohttp-socks/Manifest
@@ -1 +1,2 @@
 DIST aiohttp-socks-0.6.0.tar.gz 19789 BLAKE2B 56a9279f78e2a7a391183e6b68f9b33d878dc9b328d3096ca649b136e321ed372a9f9e8f7a02282c32568ac458639bd76b341f87722eeac46741d68064cc035b SHA512 15a5869d24955cba9548d8bd7cf1ec29b27a024603ca1b1d4abf8f93c70702434542c66ced1d8b28ae851034dad1ae8e2eaa4ed9a3729be35ec1e3c853237811
+DIST aiohttp-socks-0.6.1.tar.gz 19825 BLAKE2B 3f83d186e1311c7dc4468dcd52f3d4c6aa0b98028e5892f10a15278cbbeedf42934f2ae8730f4248cad46a606e7ba5b20584ad4dbf4efe1704b27fa74afcf015 SHA512 a26429bb911f7720689e1880cbd1b19d1865edcf5aea0fe7e059a46fc8d1cc4599c24210b485b1b62ac3438429a6922174e5d5e9cfe8be9857ac0d18977f3784
diff --git a/dev-python/aiohttp-socks/aiohttp-socks-0.6.1.ebuild b/dev-python/aiohttp-socks/aiohttp-socks-0.6.1.ebuild
new file mode 100644
index 000000000000..4007e71bdfdc
--- /dev/null
+++ b/dev-python/aiohttp-socks/aiohttp-socks-0.6.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="SOCKS proxy connector for aiohttp"
+HOMEPAGE="https://pypi.org/project/aiohttp-socks/ https://github.com/romis2012/aiohttp-socks"
+SRC_URI="https://github.com/romis2012/aiohttp-socks/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/aiohttp-2.3.2[${PYTHON_USEDEP}]
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/python-socks-1.2.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/yarl[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index 63ea38e41c56..318922813315 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,7 +1,5 @@
-DIST astroid-2.6.6.tar.gz 368118 BLAKE2B c5117566579ee6c8ccf973e180b3de3cd3896110221627cfa16d17fbeb049954d4452d3f55ab4161751a9eb7892fbd49090eb8e82c5a90f5985ec13a9f5d1fdd SHA512 a077c291b90f52d353d27b8e6aee2ffca1d69bf0e1e7185c32f3959853d9f2957f411975e5bf66f27d73b66cce6bd1e55529de6b7d0a17dea5399edf3a404825
 DIST astroid-2.7.3.tar.gz 378876 BLAKE2B 016ab6e798f1a608c0e0ce0bd81865145349c70497d09e336ec8b21eaf01ea365c204f42daf6d55d148f6873ef15e223adc9baf4a09dc8945158e4b5e24f1ebb SHA512 03a886c2daef640cf0a85f38e39b6e12080dc722862cb03386d1355f3f955ea46a7bb7b85c2887f52ba6d0ecb6243c653c7f1cd44d6c7429f2cd29c1dfd2297f
-DIST astroid-2.8.0.tar.gz 384821 BLAKE2B 74150d67fd883b2bd4356c49c9c1b148a5e98b4d219405e745474c536691276d029bf8a0bb9275ab9df3d09a9b3492a147c67676ab1f80c9c7d3ad10f240bec4 SHA512 0f14f094a6dc753f0171b462f856fb1bfb1b979a8853f76da14beb04a5b02662f6b4e63c3241ce2c9a37f63490a86300152cbe9509c43e0209d5ef536d693b08
-DIST astroid-2.8.2.tar.gz 388957 BLAKE2B 0e91b1978d8715f91b24e1d7f817bf7db3c4ca8c2c7af09f5df98b5a40c9307d54ec4051f08aa5062ffe51e5c396ae2e38078e1e124e23855fc207e34638719c SHA512 15b73c24517217ab54157d6568abf2c81c70e47980aece58eaf1d946e9d5d44316467ddaf2153fd8f6278cea80cfd09dc31783b215305c71c09d1e4e6f406862
-DIST astroid-2.8.3.tar.gz 389855 BLAKE2B 355d6ae4a7c1bc9726e46a6eecf7538ecf91294220b10bcf4af26882b2c928544b6337c7368032587ba31bd0de19ed962d092bf8a783f74720d313b33fc96b90 SHA512 b93aed7a3092b726ef0d3e1b1703bf3e198d6eeea8d6faf40da8616d33a093f7e249dde930b85be7e0c358f5a151de12cad8571daa8cfc346d082670c556db08
 DIST astroid-2.8.4.tar.gz 391667 BLAKE2B 118a9dce88ac081d0057134cf4fb158fb8ca9c0d9807e9071910c86cad90c42518b7033a05504f617dcaf2cab73afe26be35224bf6b14aef618f77c15da07424 SHA512 8dc0746cabee8ae6f171d89df4ff2236b0f7c525694356e7169fb7ba5dc61a0febc04e4dfd1d116bc120170e5c70814b74df7625a2cce9b35aab40558bf6bd41
 DIST astroid-2.8.5.tar.gz 393800 BLAKE2B eb3e7abe877da8054dd9e5bbad89e23e8cc6bfdb5c224674c1559d0bf6fbdfd562ef33d65457b26394fc9de38f77e5ce3c15509d71993d0d07ddfd00b97fbcd2 SHA512 4dcad05763419db2814c4e6a8f0a9b62d967e8855ac77a3cedf90f6186d5c68bcf037ac36e4af8dfcbaad3abab3b8ec2485a5973f5ac1952971c335a827948ce
+DIST astroid-2.8.6.tar.gz 394852 BLAKE2B 400531227ce5a8b0f284f51ccb2d37aeb0463ee0fc7faceb3fd33b4bd727b7283421fb69c50eba3246217e06dca2cecfac49030d33c7e2a7cf252144860b50a3 SHA512 8fae723f0b7df34ba51d7f97634b09173956ae1eaa1543b81af8a80b5d9c9fcbdd96de709da2432a935dd5fc7369f9f1ea03cf2b7e3f0b09dac8485145d8f1d9
+DIST astroid-2.9.0.tar.gz 404906 BLAKE2B 2aefe21392289b95a4ea3bde047e6f33b6915f4feac722164b4c35cc97dedb83f7d2e7f277485c5a3a8c7abc7865ccd88923266aa675755eeb17b0bd22077931 SHA512 949520268303a257102c2348920df9ff779bf5736739be5985b0441fae664212bee476445dc5d52478e789e08bbd5826ef83cf8a730a73d4e2d6eb04251c3cee
diff --git a/dev-python/astroid/astroid-2.6.6-r1.ebuild b/dev-python/astroid/astroid-2.6.6-r1.ebuild
deleted file mode 100644
index 360a78280ea1..000000000000
--- a/dev-python/astroid/astroid-2.6.6-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="
-	https://github.com/PyCQA/astroid/
-	https://pypi.org/project/astroid/"
-SRC_URI="
-	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-# Version specified in __pkginfo__.py.
-RDEPEND="
-	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/wrapt-1.13[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local deselect=(
-		# no clue why it's broken
-		tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
-	)
-
-	# Faker causes sys.path_importer_cache keys to be overwritten
-	# with PosixPaths
-	epytest -p no:faker ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/astroid/astroid-2.8.2-r1.ebuild b/dev-python/astroid/astroid-2.8.2-r1.ebuild
deleted file mode 100644
index 54a9689e278c..000000000000
--- a/dev-python/astroid/astroid-2.8.2-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="
-	https://github.com/PyCQA/astroid/
-	https://pypi.org/project/astroid/"
-SRC_URI="
-	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-# Version specified in __pkginfo__.py.
-RDEPEND="
-	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-3.10[${PYTHON_USEDEP}]
-	<dev-python/wrapt-1.13[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local deselect=(
-		# no clue why it's broken
-		tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
-	)
-
-	# Faker causes sys.path_importer_cache keys to be overwritten
-	# with PosixPaths
-	epytest -p no:faker ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/astroid/astroid-2.8.4.ebuild b/dev-python/astroid/astroid-2.8.4.ebuild
index 5ce9c5de2ad1..7a9ba7c70f89 100644
--- a/dev-python/astroid/astroid-2.8.4.ebuild
+++ b/dev-python/astroid/astroid-2.8.4.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 # Version specified in __pkginfo__.py.
 RDEPEND="
diff --git a/dev-python/astroid/astroid-2.8.3.ebuild b/dev-python/astroid/astroid-2.8.6.ebuild
index 5ce9c5de2ad1..5ce9c5de2ad1 100644
--- a/dev-python/astroid/astroid-2.8.3.ebuild
+++ b/dev-python/astroid/astroid-2.8.6.ebuild
diff --git a/dev-python/astroid/astroid-2.8.0-r1.ebuild b/dev-python/astroid/astroid-2.9.0.ebuild
index fbc587789563..5ce9c5de2ad1 100644
--- a/dev-python/astroid/astroid-2.8.0-r1.ebuild
+++ b/dev-python/astroid/astroid-2.9.0.ebuild
@@ -18,13 +18,13 @@ SRC_URI="
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 # Version specified in __pkginfo__.py.
 RDEPEND="
 	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
 	>=dev-python/typing-extensions-3.10[${PYTHON_USEDEP}]
-	<dev-python/wrapt-1.13[${PYTHON_USEDEP}]"
+	<dev-python/wrapt-1.14[${PYTHON_USEDEP}]"
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	test? (
diff --git a/dev-python/backrefs/Manifest b/dev-python/backrefs/Manifest
index ece7afdff601..183db6075505 100644
--- a/dev-python/backrefs/Manifest
+++ b/dev-python/backrefs/Manifest
@@ -1,3 +1 @@
-DIST backrefs-5.0.1.tar.gz 4120179 BLAKE2B 2cd8fb84c7e416be330cb9afdb894f6f8574b66698acc1d63abae8ff5bfcccd4bf29b724dcf2a25a637ea0fde46865b18a5ff1bfbff955a01798037752dc3d97 SHA512 e2212bd7dce017308fa558ccfe7faf617ed6107523db8b2e4a3ad7b60aa1d7aabdaea2632abd6a3f1f022eac949d7036a7afe522b5f086ef1888a0e67e834894
-DIST backrefs-5.1.tar.gz 5216647 BLAKE2B 060d153f0d5d674e7b2e6f744a9b283d10f9f47fb355fe5d5703cd83b2507852d606d51cdefcf37617ee12f7bc71d487bc50254763415c02422524da9d71aae6 SHA512 b5123e46f0bf2108060c7e4f350538159c08ee7fe3b07bbed44aaadc0481047262af80b7bf08066db423a86b4e8660a91c9e03ea41a7bb039c3d17ae3faa81fd
 DIST backrefs-5.2.tar.gz 5220528 BLAKE2B b786df162f37406c36b99d9d4d36ed439837dae2f1d138238d5afc6e9ab108f1c4be1802606e14892ae08d7e3878f5c5068a6923de14d13ab89ef6749fd69b6e SHA512 fd68cd90deaf299a3bb21f70126db51f537e6dc1126fa38beda63901dccfe4db81842aea23eb20ac9311bfef74ff2339ebffdb8cdbcfed197c3ef0fd5b3e793b
diff --git a/dev-python/backrefs/backrefs-5.0.1.ebuild b/dev-python/backrefs/backrefs-5.0.1.ebuild
deleted file mode 100644
index 205c148e299c..000000000000
--- a/dev-python/backrefs/backrefs-5.0.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	~dev-python/mkdocs_pymdownx_material_extras-1.0.7
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-material
-	dev-python/pyspelling
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Wrapper around re or regex that adds additional back references"
-HOMEPAGE="
-	https://github.com/facelessuser/backrefs/
-	https://pypi.org/project/backrefs/
-"
-SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/regex[${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/backrefs/backrefs-5.1.ebuild b/dev-python/backrefs/backrefs-5.1.ebuild
deleted file mode 100644
index efef6a087d20..000000000000
--- a/dev-python/backrefs/backrefs-5.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	~dev-python/mkdocs_pymdownx_material_extras-1.0.7
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-material
-	dev-python/pyspelling
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Wrapper around re or regex that adds additional back references"
-HOMEPAGE="
-	https://github.com/facelessuser/backrefs/
-	https://pypi.org/project/backrefs/
-"
-SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/regex[${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/backrefs/backrefs-5.2.ebuild b/dev-python/backrefs/backrefs-5.2.ebuild
index efef6a087d20..624bf6f8bb31 100644
--- a/dev-python/backrefs/backrefs-5.2.ebuild
+++ b/dev-python/backrefs/backrefs-5.2.ebuild
@@ -25,7 +25,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/bracex/Manifest b/dev-python/bracex/Manifest
index b7d574463b12..c86d52a00d04 100644
--- a/dev-python/bracex/Manifest
+++ b/dev-python/bracex/Manifest
@@ -1,3 +1 @@
-DIST bracex-2.1.1.tar.gz 26078 BLAKE2B 7313aac70d2bdb8473396a651a5d62a399084a0277e8c4665ef79fbe00347b86fc9793066584275f2a77c6c4cc217e6235f2f06ef4977f733039984c562ec529 SHA512 922f627a001c239cf5ace47fb2f295e04200116add01ff969f8de49067098dea43286c3c739d51286b283d354cb6e411b7e2e6cb1c4863ba78edccc7bd461c86
 DIST bracex-2.2.1.tar.gz 27642 BLAKE2B e9eb12dd70b3cf1c6abd8a59f19d8f77f8fc85e07efad02a2c0213266b93641406d05fa8454b2b4cd6870b7f866a22c0b2132d690444f1910a599c9b17594065 SHA512 cad9faf73258493581606bf5c8068d34a82fdcca338dd6a1d7da5dacfbee1932f48d04d6f295151d79f02495ddf89aa6a5d53d6596db7bd53ddb3cd23d59a71d
-DIST bracex-2.2.tar.gz 27605 BLAKE2B 18e14711840c02c814c44c0f7f939e69091d34f8e1d25494e802ce5d5ae1debce73bb9cb7cf27ff6e431cc7a71e2fc3f247109c2b24875af5c06aba315028e8f SHA512 386b30b528085569df0a891df3cf7a343aed692efe27f8050373adf39877ffbb191c48574f4d078acdd441ff76ab90912f2337461e36171561209a6608f10546
diff --git a/dev-python/bracex/bracex-2.1.1.ebuild b/dev-python/bracex/bracex-2.1.1.ebuild
deleted file mode 100644
index 48eb89dbb6a2..000000000000
--- a/dev-python/bracex/bracex-2.1.1.ebuild
+++ /dev/null
@@ -1,45 +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} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	dev-python/mkdocs-material
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs_pymdownx_material_extras
-	dev-python/pyspelling
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Bash style brace expansion for Python"
-HOMEPAGE="
-	https://github.com/facelessuser/bracex/
-	https://pypi.org/project/bracex/
-"
-SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-BDEPEND="test? ( 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/bracex/bracex-2.2.1.ebuild b/dev-python/bracex/bracex-2.2.1.ebuild
index 3f07b7f58b92..981afc78d4c1 100644
--- a/dev-python/bracex/bracex-2.2.1.ebuild
+++ b/dev-python/bracex/bracex-2.2.1.ebuild
@@ -25,7 +25,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 BDEPEND="test? ( dev-vcs/git )"
 
diff --git a/dev-python/bracex/bracex-2.2.ebuild b/dev-python/bracex/bracex-2.2.ebuild
deleted file mode 100644
index 3f07b7f58b92..000000000000
--- a/dev-python/bracex/bracex-2.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	dev-python/mkdocs-material
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs_pymdownx_material_extras
-	dev-python/pyspelling
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Bash style brace expansion for Python"
-HOMEPAGE="
-	https://github.com/facelessuser/bracex/
-	https://pypi.org/project/bracex/
-"
-SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-
-BDEPEND="test? ( 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/cbor2/cbor2-5.4.2.ebuild b/dev-python/cbor2/cbor2-5.4.2.ebuild
index 1c43b2381841..194e5dbf1f64 100644
--- a/dev-python/cbor2/cbor2-5.4.2.ebuild
+++ b/dev-python/cbor2/cbor2-5.4.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
diff --git a/dev-python/cffi/cffi-1.15.0.ebuild b/dev-python/cffi/cffi-1.15.0.ebuild
index 08186075aaa5..6c23c708b493 100644
--- a/dev-python/cffi/cffi-1.15.0.ebuild
+++ b/dev-python/cffi/cffi-1.15.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="dev-libs/libffi:="
 RDEPEND="${DEPEND}
diff --git a/dev-python/configshell-fb/Manifest b/dev-python/configshell-fb/Manifest
index eec9fe017a14..13fc21a18c1e 100644
--- a/dev-python/configshell-fb/Manifest
+++ b/dev-python/configshell-fb/Manifest
@@ -1,2 +1 @@
-DIST configshell-fb-1.1.28.tar.gz 55076 BLAKE2B 8f7ab1b6172412dffd77d1ba89082f815b90167b5bc7e15c26c26a101e2e8a0ab5bc716c040f41124a9d5a5038b751e4cd882124d70fe2fda2b796ef43dc97c8 SHA512 7d05fdfca5646ec05d5f4b2ea499235237f5f3157c1330ed46dcc76ce8dea5cca0e3ec4d4376db2ec8358438737fb54286cb0c712c0f16637128670d2858dd4d
 DIST configshell-fb-1.1.29.tar.gz 55036 BLAKE2B 4a9a8f2573b43a9c8ddbda837e831c96b221f4499acb1aeeb990a7b1050c5572e9b745857ac9d1de4089d1758dd1284d0555da524def80e0a1caac18bb43a921 SHA512 0d7663cf58431c8b0be5618e5ef454838489e11a3074e5bd63145c3ea965065e37f1a41b5775363a35498a4d5dd86ad5453feb58dd74853cd77ae196b44c658e
diff --git a/dev-python/configshell-fb/configshell-fb-1.1.28.ebuild b/dev-python/configshell-fb/configshell-fb-1.1.28.ebuild
deleted file mode 100644
index 6455f121a069..000000000000
--- a/dev-python/configshell-fb/configshell-fb-1.1.28.ebuild
+++ /dev/null
@@ -1,19 +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="A Python library for building configuration shells"
-HOMEPAGE="https://github.com/open-iscsi/configshell-fb"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/urwid[${PYTHON_USEDEP}]"
diff --git a/dev-python/configshell-fb/configshell-fb-1.1.29.ebuild b/dev-python/configshell-fb/configshell-fb-1.1.29.ebuild
index 78ed86820730..6455f121a069 100644
--- a/dev-python/configshell-fb/configshell-fb-1.1.29.ebuild
+++ b/dev-python/configshell-fb/configshell-fb-1.1.29.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-python/pyparsing[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/cov-core/cov-core-1.15.0-r3.ebuild b/dev-python/cov-core/cov-core-1.15.0-r3.ebuild
index fb3fc6053444..9494790e3e02 100644
--- a/dev-python/cov-core/cov-core-1.15.0-r3.ebuild
+++ b/dev-python/cov-core/cov-core-1.15.0-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND=">=dev-python/coverage-3.6[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/flask-htmlmin/flask-htmlmin-2.2.0.ebuild b/dev-python/flask-htmlmin/flask-htmlmin-2.2.0.ebuild
index bb754cd1ceaa..53a9eb5d47a0 100644
--- a/dev-python/flask-htmlmin/flask-htmlmin-2.2.0.ebuild
+++ b/dev-python/flask-htmlmin/flask-htmlmin-2.2.0.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	app-text/cssmin[${PYTHON_USEDEP}]
diff --git a/dev-python/ghp-import/Manifest b/dev-python/ghp-import/Manifest
index d099361d98db..c63b91c70662 100644
--- a/dev-python/ghp-import/Manifest
+++ b/dev-python/ghp-import/Manifest
@@ -1,2 +1 @@
-DIST ghp-import-2.0.1.tar.gz 11158 BLAKE2B c091d193cbfd44d90e62fe843775412a74f7962228130ba381ca07f5af93ea2296e989cffd025fd7d6a50ae5e526afe69fb00f49a6780b9b2f49ee8f06e2d3e1 SHA512 8e53b1a516a8d9780159d57b3973ebe02bbc4f60788470ec823c99608c2b026f5c43a12796506adf039420f06964a11d9e7e318cf9ea10df167faddd8b6f9707
 DIST ghp-import-2.0.2.tar.gz 10928 BLAKE2B 7479917284af9a8f8ac460f43d97c9d5fe29c4dc3663698e5b76e9ba1b0a7cdcd8d93fb1f112cdcfaa6689f70f280b4dc49c6f8e632784c11121f1fede1f8eaf SHA512 554c466f1275d905d7698539fe74b662f43c26b9497e83bc3615849ba2815dcbce6ae01fa14eb1c2245987ccc1b497afe175e3e0ddef3de561fc14ea24792d4e
diff --git a/dev-python/ghp-import/ghp-import-2.0.1.ebuild b/dev-python/ghp-import/ghp-import-2.0.1.ebuild
deleted file mode 100644
index b571d608a3ff..000000000000
--- a/dev-python/ghp-import/ghp-import-2.0.1.ebuild
+++ /dev/null
@@ -1,20 +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="Copy your docs directly to the gh-pages branch"
-HOMEPAGE="https://github.com/c-w/ghp-import"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/ghp-import/ghp-import-2.0.2.ebuild b/dev-python/ghp-import/ghp-import-2.0.2.ebuild
index 4bb4a85aa534..49ffd80bd943 100644
--- a/dev-python/ghp-import/ghp-import-2.0.2.ebuild
+++ b/dev-python/ghp-import/ghp-import-2.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
diff --git a/dev-python/lunr/Manifest b/dev-python/lunr/Manifest
index e6d8863902a8..85cc7846b39a 100644
--- a/dev-python/lunr/Manifest
+++ b/dev-python/lunr/Manifest
@@ -1,2 +1 @@
-DIST lunr-0.6.0.tar.gz 839533 BLAKE2B fce81bfe0e12138b8ab335ecec828ac18be13f0d9f823218de11d701c4d44f54c06360c4c8f1c96fd36b634094b6f10bd964c9d4e154dc208cad1f36e4b32f47 SHA512 2067c34c12f77ab0fb32c7f800ea3c647a1073c061a14f2b72b2b95fc8d624429aa37e85992eee5d5b24add179eab1d81af52af09f0db67d6cae459a5faa0925
 DIST lunr-0.6.1.tar.gz 853421 BLAKE2B 7cc1624c91d07fa4e30ae789cbdffa1d98c011bd17a314bdb498ecfb7941fca7f0b6f36738377d10c17a7e400f8555be52fee8a1e03d3dfd8d931db88c4e25c9 SHA512 991569b6657c4cba653c999aa7610768303d1b184142c7f82a6c8ab44459b01cf7ae7db9f3bc45512161452b73e3b4cfbac3e8f7a0738e1f4b1429a8d8fe73e1
diff --git a/dev-python/lunr/lunr-0.6.0.ebuild b/dev-python/lunr/lunr-0.6.0.ebuild
deleted file mode 100644
index b15f0ece0c02..000000000000
--- a/dev-python/lunr/lunr-0.6.0.ebuild
+++ /dev/null
@@ -1,32 +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} )
-
-DOCS_BUILDER="mkdocs"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="A Python implementation of Lunr.js"
-HOMEPAGE="https://github.com/yeraydiazdiaz/lunr.py"
-SRC_URI="https://github.com/yeraydiazdiaz/lunr.py/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}.py-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-python/nltk[${PYTHON_USEDEP}]"
-
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	tests/acceptance_tests
-)
diff --git a/dev-python/lunr/lunr-0.6.1.ebuild b/dev-python/lunr/lunr-0.6.1.ebuild
index cb1876c81f2c..94392ac66e97 100644
--- a/dev-python/lunr/lunr-0.6.1.ebuild
+++ b/dev-python/lunr/lunr-0.6.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}.py-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-python/nltk[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/markups/Manifest b/dev-python/markups/Manifest
index 968fc538c45f..562520ca67f8 100644
--- a/dev-python/markups/Manifest
+++ b/dev-python/markups/Manifest
@@ -1 +1,2 @@
 DIST Markups-3.1.2.tar.gz 20608 BLAKE2B 01f5e740b4d26c4a8c611070b0ffb879009cc241bd320f257d266e57f9f35becd728a45f1bbff98eb066c24abfb21a84c36d07814e0f54550c259c62fd48dbdb SHA512 5374c6c80eb71b4190af4c3ba47ec46fe7a92739d72feb023a571488dde6fdc377e98f2e24bc0c4e6cb7b4aa3b0f8aea90befa93e301cf6b02fcc4856affbceb
+DIST Markups-3.1.3.tar.gz 20868 BLAKE2B 9c6c55bba6a9e8e6dbeaba268014ab59762838fe1e65fd0551c90e0f83245643565cae099e0f5faa4801928c5c0966f5e5afa4ab2db04939f6c1062dc476f3ac SHA512 324c3c45063e192ebde0fcd10e868b2053fb2758076092b180e1d8eed965dd41b2ea252a081b750637454395c163a92145f68e2a6fd8eb3eded8927baf044484
diff --git a/dev-python/markups/markups-3.1.3.ebuild b/dev-python/markups/markups-3.1.3.ebuild
new file mode 100644
index 000000000000..ddaf0a46955c
--- /dev/null
+++ b/dev-python/markups/markups-3.1.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+MY_P=${P^}
+DESCRIPTION="A wrapper around various text markups"
+HOMEPAGE="
+	https://pymarkups.readthedocs.io/en/latest/
+	https://github.com/retext-project/pymarkups
+	https://pypi.org/project/Markups/
+"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${PN^}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/markdown[${PYTHON_USEDEP}]
+	dev-python/python-markdown-math[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		app-text/pytextile[${PYTHON_USEDEP}]
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/pymdown-extensions[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+distutils_enable_sphinx docs
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index 697c6fb92b09..4ac4829d10e9 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -1,2 +1 @@
-DIST mkdocs-material-7.2.6.tar.gz 6804732 BLAKE2B 908a076d032a251baa9bde0255a1f8bbf12799cda3e0cec5bf332ad824f9e5bbc920c579b12f80d491488e01b6547f324c9617aaacdcdff573c49c61f5c54ffb SHA512 9b871ef8cd1d27e50df62f8de428d59bd4fec27dc76401fac36cb1ff6961416a25ddd2f133ab6eef80297e43359014ab7b482a93295650e5cf21e1b6fd2e4b1e
 DIST mkdocs-material-7.3.4.tar.gz 7319409 BLAKE2B 5e3805bdb4186637795011436281d5e2082fa7ec9d3f2eb07e2ee3ceb245ae1dbe81d461f59529fe2b821042a254b6d69a0838f01f470387bccca4a9a85179a3 SHA512 052245d69e7d19bdfa4db7e2d1d880cf49bd850ea79371cd222ecaab8964840e5b2b09bf4646f1a30f56b0161be6f3f163bcc81291ccbb0e6f47f7c24e741ab8
diff --git a/dev-python/mkdocs-material/mkdocs-material-7.2.6.ebuild b/dev-python/mkdocs-material/mkdocs-material-7.2.6.ebuild
deleted file mode 100644
index 4ef34b61e82c..000000000000
--- a/dev-python/mkdocs-material/mkdocs-material-7.2.6.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-redirects
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="A Material Design theme for MkDocs"
-HOMEPAGE="
-	https://github.com/squidfunk/mkdocs-material
-	https://pypi.org/project/mkdocs-material
-"
-SRC_URI="https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.2.2[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.4[${PYTHON_USEDEP}]
-	>=dev-python/pymdown-extensions-7.0[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-material-extensions-1.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/mkdocs-material/mkdocs-material-7.3.4.ebuild b/dev-python/mkdocs-material/mkdocs-material-7.3.4.ebuild
index 7bcbb9207a68..9a3d859a26e6 100644
--- a/dev-python/mkdocs-material/mkdocs-material-7.3.4.ebuild
+++ b/dev-python/mkdocs-material/mkdocs-material-7.3.4.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/jinja-2.11.1[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs-minify-plugin/Manifest b/dev-python/mkdocs-minify-plugin/Manifest
index 3ece867a1c82..70592b54a856 100644
--- a/dev-python/mkdocs-minify-plugin/Manifest
+++ b/dev-python/mkdocs-minify-plugin/Manifest
@@ -1,2 +1 @@
-DIST mkdocs-minify-plugin-0.4.0.tar.gz 3097 BLAKE2B b1bba66539cc3470e922ff2bd1c6ae21de401ea343e2bd313bc93ec692e15794476681d48c9dceb9edd09f3c6274dd9174d5861137312ce9b9836e02f34a52e4 SHA512 6a42f649a2a867b2c796de3c602f19375705859fc9b3592fc1d8c102b42a96d7bb7150a4f75b281843ece40bd19ca5bb82654c658e1fe6d1b94f34c8279b2602
 DIST mkdocs-minify-plugin-0.5.0.tar.gz 3387 BLAKE2B bce05582eab831976b430d5c331c0e51cecf790f4db6f3bd089ff6f0f5421c0b824c9bf6637a6b00555eee203b23cbd5fc3a0e81fcb5a8697ab7c06e94a9d2e0 SHA512 a31770c9de39439ba5eb4e35acd088aa7df2d7fa39f7942819c0b25429abb7b2b0626765f26f4d4fc77fd11e48dfdf90f9eb93e999cf7b641bb630c852eec50a
diff --git a/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.4.0.ebuild b/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.4.0.ebuild
deleted file mode 100644
index 00844ff07ce8..000000000000
--- a/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.4.0.ebuild
+++ /dev/null
@@ -1,25 +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="An MkDocs plugin to minify HTML and/or JS files prior to being written to disk"
-HOMEPAGE="
-	https://github.com/byrnereese/mkdocs-minify-plugin
-	https://pypi.org/project/mkdocs-minify-plugin/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/mkdocs-1.0.4[${PYTHON_USEDEP}]
-	>=app-text/htmlmin-0.1.4[${PYTHON_USEDEP}]
-	>=dev-python/jsmin-2.2.2[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.5.0.ebuild b/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.5.0.ebuild
index ad8bbb9f23ff..b6ac1b196280 100644
--- a/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.5.0.ebuild
+++ b/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.5.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/mkdocs-1.0.4[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs/Manifest b/dev-python/mkdocs/Manifest
index 905586879663..f427076fefe4 100644
--- a/dev-python/mkdocs/Manifest
+++ b/dev-python/mkdocs/Manifest
@@ -1,2 +1 @@
-DIST mkdocs-1.2.2.tar.gz 6919165 BLAKE2B eba8d585c3653640bd3babbba3a1fab6aa9dc3ee365536ee7b0956e38250611bab3180c6a7f08eefb1e1a3637d07a0f366179570a9bb69df4f02a605610a770f SHA512 6cb111fcb3167a39e1d282d24b5e67d806c3e7506f55ef11a227b37ceeaea950142db2bc1db3709caaa2813c62ef8c4ef74aeb26e62f4f10aeee528e0532eccd
 DIST mkdocs-1.2.3.tar.gz 6919177 BLAKE2B 43ff118149a497dd366f7132487564be51ffeaff644a519c7bf9e52a3e3239e9696c21616e5d7494f7c4af8ee60ec77f27fd15e80f5c5c6c1b2db4cf1f672e44 SHA512 03385bc940df8a6b3668300f3752afe973b95f149bee58217ace82063aacb661dbd000a2a7a383c4804434473c3945cec3cb41d6608388350da3098c32709541
diff --git a/dev-python/mkdocs/mkdocs-1.2.2.ebuild b/dev-python/mkdocs/mkdocs-1.2.2.ebuild
deleted file mode 100644
index 9fab7aa84fed..000000000000
--- a/dev-python/mkdocs/mkdocs-1.2.2.ebuild
+++ /dev/null
@@ -1,73 +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="Project documentation with Markdown"
-HOMEPAGE="https://www.mkdocs.org https://github.com/mkdocs/mkdocs"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-IUSE="doc"
-
-BDEPEND="
-	doc? (
-		$(python_gen_any_dep '
-			dev-python/mdx_gh_links[${PYTHON_USEDEP}]
-			dev-python/mkdocs-redirects[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-RDEPEND="
-	>=dev-python/Babel-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/click-3.3[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-	>=dev-python/watchdog-2.0[${PYTHON_USEDEP}]
-	>=dev-python/ghp-import-1.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml_env_tag-0.1[${PYTHON_USEDEP}]
-	>=dev-python/importlib_metadata-3.10[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.5[${PYTHON_USEDEP}]
-	>=dev-python/mergedeep-1.3.4[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests --install nose
-
-python_prepare_all() {
-	# Tests fails if additional themes are installed
-	sed -i -e 's:test_get_themes:_&:' \
-		mkdocs/tests/utils/utils_tests.py || die
-
-	# Skip this network test, "does not appear to be an IPv4 or IPv6 address"
-	sed -i -e 's/test_IP_normalization/_&/' \
-		mkdocs/tests/config/config_options_tests.py || die
-
-	# livereload has been dropped in this release, this test is a remnant
-	rm mkdocs/tests/livereload_tests.py || die
-
-	# fix apparent typo in test (importing wrong thing)
-	sed -i -e 's/from localization import/from mkdocs.localization import/g' \
-		mkdocs/tests/theme_tests.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	default
-	if use doc; then
-		# cannot just do mkdocs build, because that fails if
-		# the package isn't already installed
-		python -m mkdocs build || die "Failed to make docs"
-		# Colliding files found by ecompress:
-		rm site/sitemap.xml.gz || die
-		HTML_DOCS=( "site/." )
-	fi
-}
diff --git a/dev-python/mkdocs/mkdocs-1.2.3.ebuild b/dev-python/mkdocs/mkdocs-1.2.3.ebuild
index c828a1e204ac..0f0b5e301ca6 100644
--- a/dev-python/mkdocs/mkdocs-1.2.3.ebuild
+++ b/dev-python/mkdocs/mkdocs-1.2.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 IUSE="doc"
 
diff --git a/dev-python/mkdocs_pymdownx_material_extras/Manifest b/dev-python/mkdocs_pymdownx_material_extras/Manifest
index 5aa8f12a61fe..7f08914a5145 100644
--- a/dev-python/mkdocs_pymdownx_material_extras/Manifest
+++ b/dev-python/mkdocs_pymdownx_material_extras/Manifest
@@ -1,4 +1,3 @@
 DIST mkdocs_pymdownx_material_extras-1.0.7.tar.gz 17995 BLAKE2B a7a8715ec07b9ef5551eadb37e618f45ca2f8f3c707aa5269eb7d2587db70ba29cfaa8027bb606c4264bbf93d7b3950d7a5dc03640b71afc677658b044d064fa SHA512 33fe8fddd0ee5856fdfb02068e2698f26a8db139458d7736715b776fbc2d8ae8ccb3170dbb786c52338e4e7a1612006046eb429f2268469f6f2bb5ba7f8e256d
 DIST mkdocs_pymdownx_material_extras-1.1.3.tar.gz 40029 BLAKE2B faa17e6e4d27a5d5e34a98a6830e34b934f8623fafb87a73051eb424cf95d29c5dd185bbfbbe49dd3e93eeee00a8310ac0543d480ab70e5abee4047b1cecc774 SHA512 340818ebcd8f9cf175e5049028d0932a0d6208de3d8f86cf5ea47747680079c6b9b3bf27e0c32ee10ee6a1bc7ab8ffc6cc3aa48470be43ed32adfde74f44d5dd
-DIST mkdocs_pymdownx_material_extras-1.4.0.tar.gz 41238 BLAKE2B d30f4d90822298c82bf9d7c5467d2f022664adee9c910eac82b2b35a740b29a4b01e4e5b61677ccfa98cdd9691032f67b9004065a405712b1d997b70615fec23 SHA512 a3131052d2b2d5619a487edcc5ea8b7b5386a4671ac210028fa72525610a0e86117ccaf3b095f64d2438c49e135a721d8312cae1c44de16bb699822e54b958a6
 DIST mkdocs_pymdownx_material_extras-1.5.4.tar.gz 23911 BLAKE2B e78216219a6f66c287c2f556e2e593eccee53529092c5b571593ff6635b0657a23ff83e894fa3d8dda37bb65842d1da434dcf540a9c390927f47c95da189c253 SHA512 77e315cfdb659a13d92e89096bef26a10397e079338f57aac1141ef6000e06705b96d820478ffa6e7827c7873130fbfc6b32a29e1a145d6c788df160e339a758
diff --git a/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.4.0.ebuild b/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.4.0.ebuild
deleted file mode 100644
index 85b18b14bfe9..000000000000
--- a/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.4.0.ebuild
+++ /dev/null
@@ -1,22 +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="Custom alterations based on Mkdocs-Material"
-HOMEPAGE="
-	https://github.com/facelessuser/mkdocs_pymdownx_material_extras
-	https://pypi.org/project/mkdocs-pymdownx-material-extras"
-SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/mkdocs-material-5.0.2[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.5.4.ebuild b/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.5.4.ebuild
index bd3392b9519c..c5b7a851c007 100644
--- a/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.5.4.ebuild
+++ b/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.5.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/mkdocs-material-5.0.2[${PYTHON_USEDEP}]
diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest
index 5d70009c1654..deda8a56ffe3 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -2,3 +2,4 @@ DIST moto-2.0.5.tar.gz 1551415 BLAKE2B 452cb94443188e1715145bee574f04924d894a3d6
 DIST moto-2.2.12.tar.gz 1941427 BLAKE2B d1f85e46f4072b0e1c48e727d9e99eec12001a5397e738a5ab2e776c59e273a887c72dc5e5fdf2e6b61028f4eddb4b6fa809288bf7b087502192139eae170127 SHA512 a55e96bfe1f1c4a4523be30040350fc2929fb4385a62cc5a96a8fb34febed54d442be0e169f836f813e956c9e388fce8b9c405c59ad023011f9c7c76362c3729
 DIST moto-2.2.14.tar.gz 1962233 BLAKE2B 2e61a2a946bdb51280fc16a2efd47e88e9643a04cebec1fc117a984b3bb8be366523fb202fe558137c4bf5c6a9e8b2e035adceda6fd37712b004d650d3d042fd SHA512 2f6c5a498f95760e910174c91562aa4f5a223d691efc1db65b66508c407641473b5b94512e67f48ed02e3733421cc51eba7aa569b19e92cf58ffa6bbcb81b362
 DIST moto-2.2.15.tar.gz 1962356 BLAKE2B 469f9c0eb36552b475b5e76fe286a6e50ae6379a9b0436a40eb290fd033123b2b400b6b85a1dd66b01176f1795a0211831acf10efac1a44a09f17efe325fad3b SHA512 2fffb3d095cd7274891d1d9ff5eee07550773eb06d1410205db39c75234e37833bda12aca7c29fda5b1d415145e55e7c7d59f8a03f3163c8f752e968fc273d3a
+DIST moto-2.2.16.tar.gz 1982590 BLAKE2B 016760c1eebd418ddb281f9cf438d9e13c868409ca1465a2a8b8292c714b7a3e4a6d47bef7a506e5c8d4128282f4f68cfea30eb61940464be4a5e27e0749e035 SHA512 bca5d5a8efa6ba204caf0cfcae700ee4079ac0a1aca22eb4adfa09f3e81f0bb43daa24088a55578022fc7b25ae14c9f41701d9557f2dd09b818fdd25ba4c3e78
diff --git a/dev-python/moto/moto-2.2.16.ebuild b/dev-python/moto/moto-2.2.16.ebuild
new file mode 100644
index 000000000000..f9548678aa18
--- /dev/null
+++ b/dev-python/moto/moto-2.2.16.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Mock library for boto"
+HOMEPAGE="https://github.com/spulec/moto"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/backports-tempfile[${PYTHON_USEDEP}]' python3_{6,7})
+	dev-python/boto[${PYTHON_USEDEP}]
+	dev-python/cfn-lint[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
+	dev-python/cookies[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
+	>=dev-python/boto3-1.9.201[${PYTHON_USEDEP}]
+	>=dev-python/botocore-1.12.201[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/flask-cors[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	dev-python/pretty-yaml[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/python-jose[${PYTHON_USEDEP}]
+	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
+	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	dev-python/zipp[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# unpin indirect dep on ecdsa that's supposed to workaround pip bugs
+	sed -i -e '/ecdsa/s:<0.15::' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
+		tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
+		tests/test_swf/responses/test_decision_tasks.py::test_respond_decision_task_completed_with_schedule_activity_task_boto3
+		tests/test_swf/responses/test_timeouts.py::test_activity_task_heartbeat_timeout_boto3
+		tests/test_swf/responses/test_timeouts.py::test_decision_task_start_to_close_timeout_boto3
+		tests/test_swf/responses/test_timeouts.py::test_workflow_execution_start_to_close_timeout_boto3
+		# Needs network (or docker?) but not marked as such, bug #807031
+		# TODO: report upstream
+		tests/test_batch/test_batch_jobs.py::test_terminate_job
+		tests/test_batch/test_batch_jobs.py::test_cancel_running_job
+		tests/test_batch/test_batch_jobs.py::test_dependencies
+		tests/test_batch/test_batch_jobs.py::test_container_overrides
+		tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed
+		tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
+		tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
+		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
+	)
+
+	# pytest-django causes freezegun try to mangle stuff inside django
+	# which fails when django is not really used
+	epytest -p no:django -m 'not network'
+}
diff --git a/dev-python/oslo-context/Manifest b/dev-python/oslo-context/Manifest
index 66219d0cfd3b..2fa6c79ce69d 100644
--- a/dev-python/oslo-context/Manifest
+++ b/dev-python/oslo-context/Manifest
@@ -1,2 +1 @@
-DIST oslo.context-3.3.1.tar.gz 32676 BLAKE2B 38d5eaf7a3162fdb6a8887f2c627ee192950d743a9de929ea332495099bcc76e27a192ce6e8a3b010e190ef749ea67dcf168476bc84ede99d43c1ec8b11e1734 SHA512 40f3418020246066841e62e5579ac4a1c761c92c5f439b07059cd0b6b2e8984d2e1dacfa57af7c6d9c97c2fda8eeb5cfde76f2110a36ef21513b42d0d3bffc73
 DIST oslo.context-3.4.0.tar.gz 32954 BLAKE2B 9f22ce6af5efcfec8ab92bdb6c806e420b09037bce08b68fd43684fd459cb12b8196a1e6ee48dcb41ae7aa5d4679851fbed2058709d17e5bb7efc85c9b6d04ea SHA512 bf31c01237352a296e46fdb533ea921dce24cd3c3a918e39f7ff17305104d8f033527738fe562dfe61c8700dbce96e26433068503ca8c5cf9dffb0780e42ec53
diff --git a/dev-python/oslo-context/oslo-context-3.3.1.ebuild b/dev-python/oslo-context/oslo-context-3.3.1.ebuild
deleted file mode 100644
index c038ff827493..000000000000
--- a/dev-python/oslo-context/oslo-context-3.3.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Helpers to maintain useful information about a request context"
-HOMEPAGE="https://pypi.org/project/oslo.context/"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.context/oslo.context-${PV}.tar.gz"
-S="${WORKDIR}/oslo.context-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-RDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx doc/source \
-	dev-python/openstackdocstheme
diff --git a/dev-python/oslo-context/oslo-context-3.4.0.ebuild b/dev-python/oslo-context/oslo-context-3.4.0.ebuild
index 87eaaea6e915..c038ff827493 100644
--- a/dev-python/oslo-context/oslo-context-3.4.0.ebuild
+++ b/dev-python/oslo-context/oslo-context-3.4.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.context-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-log/Manifest b/dev-python/oslo-log/Manifest
index 674633d74ede..fa6b9ccb4f58 100644
--- a/dev-python/oslo-log/Manifest
+++ b/dev-python/oslo-log/Manifest
@@ -1,2 +1 @@
-DIST oslo.log-4.6.0.tar.gz 92331 BLAKE2B 974f8fef0f132c5429b6512c39b770206947eae9e7a195d7a570b9da6b5bdca675440c800b6ec969ab950e375d4d4ae722d08cf662fe644949322ddc80df01df SHA512 991b661be12b2d16060b621e743fb65809f753b240d5039cd4d51f13a95d6852404156d46507fc611b612cb656d68960026c8735f4f91b32caf89e09499a3c7b
 DIST oslo.log-4.6.1.tar.gz 92280 BLAKE2B d85cfde57e8ae094a81ad5e28e9a715bdb484272da1aab7dbb29c71e24ed24a5090448da8787a4083bef8ed0018bfb954aecda85f548cb35cf6ca2a9aa5b229a SHA512 8e34133096a011d24396990ed904f1efa5a46e7aec471ab36553b7b0e6736fc3bc22e7d628d6f304f584ea3a162e2945652d9bd0a82c0a1a53efb8e58824ea33
diff --git a/dev-python/oslo-log/oslo-log-4.6.0.ebuild b/dev-python/oslo-log/oslo-log-4.6.0.ebuild
deleted file mode 100644
index 18af66da0a17..000000000000
--- a/dev-python/oslo-log/oslo-log-4.6.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="OpenStack logging config library, configuration for all openstack projects."
-HOMEPAGE="https://pypi.org/project/oslo.log/ https://github.com/openstack/oslo.log"
-SRC_URI="mirror://pypi/o/oslo.log/oslo.log-${PV}.tar.gz"
-S="${WORKDIR}/oslo.log-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-RDEPEND=">=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.25.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.19.0[${PYTHON_USEDEP}]
-	>=dev-python/pyinotify-0.9.6[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]"
-BDEPEND=">=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/testtools-2.3.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.3.0[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx doc/source \
-	dev-python/openstackdocstheme \
-	dev-python/oslo-config
-
-python_test() {
-	eunittest -b
-}
diff --git a/dev-python/oslo-log/oslo-log-4.6.1.ebuild b/dev-python/oslo-log/oslo-log-4.6.1.ebuild
index 855cc0e08a53..18af66da0a17 100644
--- a/dev-python/oslo-log/oslo-log-4.6.1.ebuild
+++ b/dev-python/oslo-log/oslo-log-4.6.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.log-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 RDEPEND=">=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
 	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-utils/Manifest b/dev-python/oslo-utils/Manifest
index 3c27cd11f82c..b28ac1c51368 100644
--- a/dev-python/oslo-utils/Manifest
+++ b/dev-python/oslo-utils/Manifest
@@ -1,3 +1,2 @@
-DIST oslo.utils-4.10.0.tar.gz 100481 BLAKE2B 45bb815943912b08256cfba943fb729202346eb8b2ec4b3d2ec5ca8ffed55e321f2abe2a579202240b529e4520bbd70a23ec0dec760f74aaffdd236ee2769723 SHA512 ff51fcd4d12701bf9e729d7bc1e8d6091a7768e7583fcf7ba879e69ad53c6425216c76fef783012f3d9f7cc5947179c4470225416e314c9c0836d201a6d76c14
 DIST oslo.utils-4.11.0.tar.gz 100897 BLAKE2B a020682e89ba86a4b8390c842ffabcfd3d923168c89071c380d50de289e91a5c0247ce47dea3f17675ac14fe7e8129744bf7f5aa8a4aad6ff90d1d01cbd2b589 SHA512 837d111bec78364501a4d92039f76cdfc761b9302eae4badf3700d983f2ff19ffa3497835fef81c28b28760b9aa0325aecafa559b00b3d7593c1d1b2ca916702
 DIST oslo.utils-4.12.0.tar.gz 100927 BLAKE2B 6f175d7c08a9084af083d1e2a339ef81c9d49f832f0c94b17fe652485f077d787731bbef61bb7b4cc30188b776b7494f53700b76a736be70cff0ce5b4da5b11d SHA512 a31d307199584d6aa891464e0d9ef218d0a2aa6b54337e081ac3d787d883dfa088484f894c421c4cbf428ce2a53b6547770d469299ec7b9d0159e5a38fde06e3
diff --git a/dev-python/oslo-utils/oslo-utils-4.10.0.ebuild b/dev-python/oslo-utils/oslo-utils-4.10.0.ebuild
deleted file mode 100644
index f0a613f174b9..000000000000
--- a/dev-python/oslo-utils/oslo-utils-4.10.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-MY_P=${P/-/.}
-DESCRIPTION="Oslo Utility library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${PN::1}/${PN/-/.}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-RDEPEND="
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.2.0[${PYTHON_USEDEP}]
-	>dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# spurious rdep
-	sed -i -e '/pbr/d' requirements.txt || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/oslo-utils/oslo-utils-4.11.0.ebuild b/dev-python/oslo-utils/oslo-utils-4.11.0.ebuild
index 8e1700c3447c..f0a613f174b9 100644
--- a/dev-python/oslo-utils/oslo-utils-4.11.0.ebuild
+++ b/dev-python/oslo-utils/oslo-utils-4.11.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 RDEPEND="
 	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
diff --git a/dev-python/paho-mqtt/Manifest b/dev-python/paho-mqtt/Manifest
index 835b27430bec..7deb8bf07d47 100644
--- a/dev-python/paho-mqtt/Manifest
+++ b/dev-python/paho-mqtt/Manifest
@@ -1,2 +1 @@
-DIST paho-mqtt-1.5.1.tar.gz 144740 BLAKE2B 1c218f1109476fe9b28c26e1113717448377c53a2b9e01437f93d4a29f77e3b61f59492c263f160825ddcce25f907dbf72d3078954cc378d4846afb435d79bba SHA512 7e686bcc702f70c45ab061aa9833d42c4356d5002d27a035a685ca384a5b7d5e9dfd88ac95183816e08dd131463582707acd1d2e0f6de0f7dbbb6a6d0a615c97
 DIST paho-mqtt-1.6.0.tar.gz 145605 BLAKE2B 8f8dfba1c57520793041221e470258a644a0e5c9d462244615f7d7481d1ef8ef4d3209ea9664c4f34bcd70f07addd7fbfbe5857853339b02a266ad2e43acbf90 SHA512 06a18a83b6743c816b4323324c78906ea8937366424d2c3aab3eac565dff040254f1384500cee9cff60d3931131b9f6298ae24795eaff486b03fc998140ece72
diff --git a/dev-python/paho-mqtt/files/paho-mqtt-1.5.0-strip-test-dependency.patch b/dev-python/paho-mqtt/files/paho-mqtt-1.5.0-strip-test-dependency.patch
deleted file mode 100644
index 9c8307359337..000000000000
--- a/dev-python/paho-mqtt/files/paho-mqtt-1.5.0-strip-test-dependency.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-# Remove Pylama from test dependencies.
-
-diff --git a/setup.cfg b/setup.cfg
-index 84551cd..73bd714 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -1,9 +1,6 @@
- [aliases]
- test=pytest
- [tool:pytest]
--addopts=-r xs --pylama
-+addopts=-r xs
- strict=True
- testpaths=tests src
--[pylama]
--linters=pyflakes
--skip=tests/*
-diff --git a/setup.py b/setup.py
-index 8441de1..2878352 100644
---- a/setup.py
-+++ b/setup.py
-@@ -11,7 +11,7 @@ with open('README.rst', 'rb') as readme_file:
-     readme = readme_file.read().decode('utf-8')
- 
- requirements = []
--test_requirements = ['pytest', 'pylama', 'six']
-+test_requirements = ['pytest', 'six']
- needs_pytest = {'pytest', 'test', 'ptr'}.intersection(sys.argv)
- setup_requirements = ['pytest-runner'] if needs_pytest else []
- extra_requirements = {'proxy': ['PySocks']}
--- 
diff --git a/dev-python/paho-mqtt/paho-mqtt-1.5.1.ebuild b/dev-python/paho-mqtt/paho-mqtt-1.5.1.ebuild
deleted file mode 100644
index 4a9e777a6fa8..000000000000
--- a/dev-python/paho-mqtt/paho-mqtt-1.5.1.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} )
-
-inherit distutils-r1
-
-DESCRIPTION="A client class with support for MQTT v5.0, v3.1.1, and v3.1"
-HOMEPAGE="https://www.eclipse.org/paho/index.php?page=clients/python https://github.com/eclipse/paho.mqtt.python"
-SRC_URI="https://github.com/eclipse/paho.mqtt.python/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/paho.mqtt.python-${PV}"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND=""
-DEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-	) "
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.5.0-strip-test-dependency.patch"
-)
diff --git a/dev-python/paho-mqtt/paho-mqtt-1.6.0.ebuild b/dev-python/paho-mqtt/paho-mqtt-1.6.0.ebuild
index be7c1ccddb28..a24e397c0bf7 100644
--- a/dev-python/paho-mqtt/paho-mqtt-1.6.0.ebuild
+++ b/dev-python/paho-mqtt/paho-mqtt-1.6.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/paho.mqtt.python-${PV}"
 
 LICENSE="EPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/pycares/Manifest b/dev-python/pycares/Manifest
index 6b8ea4e9a3b7..d672ee1b4d11 100644
--- a/dev-python/pycares/Manifest
+++ b/dev-python/pycares/Manifest
@@ -1,2 +1 @@
-DIST pycares-4.0.0.tar.gz 43512 BLAKE2B cccfd5738582da570a2b9b17e6e31764ff2fffe4306f08c09374707a8e1c997ca7bdf0c867252c6ec66712622c927989c4d8bcad42075c48cb2af0a5364908e8 SHA512 796f14fb13c5e848b98459287d9658e8d81a48b2b6e08793f794bf9bcf7381bd400f43a07b50b23c4578579098dab5954beae09f8d35da7b809552f701d03b05
 DIST pycares-4.1.2.tar.gz 43668 BLAKE2B 4b26f8643ff5ce297981b0b60b3afb34b249138e8f702dd4aa0a38935e9e5338d048f3be1b4fb64d6d8b2259a279a8881dbd44b412c10427dbd7eee664e70495 SHA512 6fb2d24fb5f2638c55424608b02ebe9f630866d644decfb663ab9d8e2bb7a42629748fa220054747f9c36ce3dcb42f3b8e457c5c39009f94b564ff07efde0c84
diff --git a/dev-python/pycares/pycares-4.0.0.ebuild b/dev-python/pycares/pycares-4.0.0.ebuild
deleted file mode 100644
index 447544f8e99d..000000000000
--- a/dev-python/pycares/pycares-4.0.0.ebuild
+++ /dev/null
@@ -1,31 +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 interface for c-ares"
-HOMEPAGE="https://github.com/saghul/pycares/"
-SRC_URI="https://github.com/saghul/pycares/archive/${P/_p/-fix}.tar.gz"
-S=${WORKDIR}/${PN}-${P/_p/-fix}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-# Tests fail with network-sandbox, since they try to resolve google.com
-PROPERTIES="test_network"
-RESTRICT="test"
-
-DEPEND="net-dns/c-ares"
-BDEPEND="virtual/python-cffi[${PYTHON_USEDEP}]"
-RDEPEND="
-	${DEPEND}
-	${BDEPEND}"
-
-export PYCARES_USE_SYSTEM_LIB=1
-
-python_test() {
-	"${EPYTHON}" tests/tests.py -v || die
-}
diff --git a/dev-python/pycares/pycares-4.1.2.ebuild b/dev-python/pycares/pycares-4.1.2.ebuild
index 2c7326fc2871..bbbc1ae28ca3 100644
--- a/dev-python/pycares/pycares-4.1.2.ebuild
+++ b/dev-python/pycares/pycares-4.1.2.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${PN}-${P/_p/-fix}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="test"
 # Tests fail with network-sandbox, since they try to resolve google.com
 PROPERTIES="test_network"
diff --git a/dev-python/pytest-asyncio/Manifest b/dev-python/pytest-asyncio/Manifest
index 3f306596d278..66bea71a5cb0 100644
--- a/dev-python/pytest-asyncio/Manifest
+++ b/dev-python/pytest-asyncio/Manifest
@@ -1,2 +1 @@
-DIST pytest-asyncio-0.15.1.tar.gz 15653 BLAKE2B 8f10c46672a18d6992248482f9e3eb68ca9d3bae5163d5924e6363a15bc97dbfdc8b9dfc21a8a89ee4a6e21d76b083b1aa5a077fe581f0f2f0bd4c5a7b519cc9 SHA512 1813d49e0dd55f563d9bf058e009da61a17f61e081cc53626b5f1db623ba04905b6bea3ecba423dc931668053310176b634339d6526c7ea729d9aad87e4f044d
 DIST pytest-asyncio-0.16.0.tar.gz 15819 BLAKE2B c999b8680a45704bcb6f4690a910aa3d2edd9965e53cf4eb59dc8119696add4553d6b3e1b010c3cac52c8fd8563be8c86afe0616132a274e73df673630b032a7 SHA512 f0059a6d05bf0c4e208f0058e30d5baf8284e630b8b91fa217f52eec18abe6b057dabfdadce2c5282e02bd4ea4cdb27f9ef62c4c308375cce1795d75a036db22
diff --git a/dev-python/pytest-asyncio/files/pytest-asyncio-0.15.1-310-test-warnings.patch b/dev-python/pytest-asyncio/files/pytest-asyncio-0.15.1-310-test-warnings.patch
deleted file mode 100644
index 50f1c9f2d168..000000000000
--- a/dev-python/pytest-asyncio/files/pytest-asyncio-0.15.1-310-test-warnings.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/setup.cfg b/setup.cfg
-index 0161086..047501c 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -8,6 +8,7 @@ show_missing = true
- addopts = -rsx --tb=short
- testpaths = tests
- filterwarnings = error
-+    ignore::DeprecationWarning
- 
- [metadata]
- # ensure LICENSE is included in wheel metadata
diff --git a/dev-python/pytest-asyncio/pytest-asyncio-0.15.1.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.15.1.ebuild
deleted file mode 100644
index f771541e762e..000000000000
--- a/dev-python/pytest-asyncio/pytest-asyncio-0.15.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2019-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="Library for testing asyncio code with pytest"
-HOMEPAGE="https://github.com/pytest-dev/pytest-asyncio
-	https://pypi.org/project/pytest-asyncio/"
-SRC_URI="https://github.com/pytest-dev/pytest-asyncio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/pytest-5.4.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		>=dev-python/hypothesis-3.64[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${P}-310-test-warnings.patch"
-)
-
-distutils_enable_tests --install pytest
diff --git a/dev-python/pytest-asyncio/pytest-asyncio-0.16.0.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.16.0.ebuild
index a5fbe3f468f0..8add7fea5983 100644
--- a/dev-python/pytest-asyncio/pytest-asyncio-0.16.0.ebuild
+++ b/dev-python/pytest-asyncio/pytest-asyncio-0.16.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pytest-dev/pytest-asyncio/archive/v${PV}.tar.gz -> $
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/pytest-5.4.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-debian/Manifest b/dev-python/python-debian/Manifest
index 7114386ff375..85fe2d44c9e3 100644
--- a/dev-python/python-debian/Manifest
+++ b/dev-python/python-debian/Manifest
@@ -1,2 +1 @@
-DIST python-debian_0.1.40.tar.xz 319952 BLAKE2B 4d5c2d3202ef09fc8eba4e0c4f9a5861d0662f288768cb9026e1ab43309a57fb21c0b8e87734c9310f39646e071947b31b17bd48b71510e7d783af9f337c3ed1 SHA512 73ed735a3c7bb43208aa26ea9fd64fc658e111dc201ae8c1947a4e5835ebd675e37b78d2895d72bd5ed2b6afa491e77b50bd5f10d62ea8299fbdda6c0b9e5095
 DIST python-debian_0.1.42.tar.xz 173928 BLAKE2B 615be084cba8ff11eaaefc1b40335b73a16604b864600dbeb717ba65ee94f1d3a62f845a59c3db5b915346de4211fdde811593db989b143f4d60e7b425b98d2d SHA512 923831077d0a42dafd22277579e714af33b99612e5282f5d95bc884b2faec05321f8caaad20b72b25ce88d8c2449a6a23913c5377ed0bdc30d4ef87e39341ff7
diff --git a/dev-python/python-debian/files/0.1.39-disable-apt-pkg.patch b/dev-python/python-debian/files/0.1.39-disable-apt-pkg.patch
deleted file mode 100644
index 6765b2f6c3a0..000000000000
--- a/dev-python/python-debian/files/0.1.39-disable-apt-pkg.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-From e87972d4ae499d7049338ddb0d5009b6527a93dc Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Mon, 8 Feb 2021 22:24:33 -0500
-Subject: [PATCH] Disable apt_pkg support
-
----
- lib/debian/deb822.py            |  4 +--
- lib/debian/tests/test_deb822.py | 58 ---------------------------------
- 2 files changed, 2 insertions(+), 60 deletions(-)
-
-diff --git a/lib/debian/deb822.py b/lib/debian/deb822.py
-index 46cf81a..158033f 100644
---- a/lib/debian/deb822.py
-+++ b/lib/debian/deb822.py
-@@ -2286,7 +2286,7 @@ class Sources(Dsc, _PkgRelationMixin):
-     def iter_paragraphs(cls,
-                         sequence,                # type: InputDataType
-                         fields=None,             # type: Optional[List[str]]
--                        use_apt_pkg=True,        # type: bool
-+                        use_apt_pkg=False,       # type: bool
-                         shared_storage=False,    # type: bool
-                         encoding="utf-8",        # type: str
-                         strict=None,             # type: Optional[Dict[str, bool]]
-@@ -2328,7 +2328,7 @@ class Packages(Deb822, _PkgRelationMixin, _VersionAccessorMixin):
-     def iter_paragraphs(cls,
-                         sequence,              # type: InputDataType
-                         fields=None,           # type: Optional[List[str]]
--                        use_apt_pkg=True,      # type: bool
-+                        use_apt_pkg=False,     # type: bool
-                         shared_storage=False,  # type: bool
-                         encoding="utf-8",      # type: str
-                         strict=None,           # type: Optional[Dict[str, bool]]
-diff --git a/lib/debian/tests/test_deb822.py b/lib/debian/tests/test_deb822.py
-index f386391..7fb11fa 100755
---- a/lib/debian/tests/test_deb822.py
-+++ b/lib/debian/tests/test_deb822.py
-@@ -42,8 +42,6 @@ else:
-     from StringIO import StringIO
-     BytesIO = StringIO
- 
--import apt_pkg
--
- from debian import deb822
- from debian.debian_support import Version
- 
-@@ -541,11 +539,6 @@ with open("test_deb822.pickle", "wb") as fh:
-         for d in deb822.Deb822.iter_paragraphs(text, use_apt_pkg=False):
-             self.assertWellParsed(d, PARSED_PACKAGE)
- 
--        with self.assertWarns(UserWarning):
--            # The StringIO is not a real file so this will raise a warning
--            for d in deb822.Deb822.iter_paragraphs(text, use_apt_pkg=True):
--                self.assertWellParsed(d, PARSED_PACKAGE)
--
-     def test_iter_paragraphs_file(self):
-         # type: () -> None
-         text = StringIO()
-@@ -564,10 +557,6 @@ with open("test_deb822.pickle", "wb") as fh:
-             for d in deb822.Deb822.iter_paragraphs(fh, use_apt_pkg=False):
-                 self.assertWellParsed(d, PARSED_PACKAGE)
- 
--            fh.seek(0)
--            for d in deb822.Deb822.iter_paragraphs(fh, use_apt_pkg=True):
--                self.assertWellParsed(d, PARSED_PACKAGE)
--
- 
-     def test_iter_paragraphs_with_gpg(self):
-         # type: () -> None
-@@ -640,12 +629,7 @@ with open("test_deb822.pickle", "wb") as fh:
-                 test_count(deb822.Deb822.iter_paragraphs, 2)
-                 test_count(deb822.Deb822.iter_paragraphs, 2, use_apt_pkg=False)
- 
--                # apt_pkg used, should not split
--                test_count(deb822.Deb822.iter_paragraphs, 1, use_apt_pkg=True)
--
-                 # Specialised iter_paragraphs force use of apt_pkg and don't split
--                test_count(deb822.Packages.iter_paragraphs, 1, use_apt_pkg=True)
--                test_count(deb822.Sources.iter_paragraphs, 1, use_apt_pkg=True)
-                 test_count(deb822.Packages.iter_paragraphs, 1, use_apt_pkg=False)
-                 test_count(deb822.Sources.iter_paragraphs, 1, use_apt_pkg=False)
- 
-@@ -692,32 +676,12 @@ with open("test_deb822.pickle", "wb") as fh:
-                 s.write(b"\n")
-             self.assertEqual(s.getvalue(), packages_content)
- 
--    def test_iter_paragraphs_apt_shared_storage_packages(self):
--        # type: () -> None
--        self._test_iter_paragraphs(find_test_file("test_Packages"),
--                                   deb822.Packages,
--                                   use_apt_pkg=True, shared_storage=True)
--    def test_iter_paragraphs_apt_no_shared_storage_packages(self):
--        # type: () -> None
--        self._test_iter_paragraphs(find_test_file("test_Packages"),
--                                   deb822.Packages,
--                                   use_apt_pkg=True, shared_storage=False)
-     def test_iter_paragraphs_no_apt_no_shared_storage_packages(self):
-         # type: () -> None
-         self._test_iter_paragraphs(find_test_file("test_Packages"),
-                                    deb822.Packages,
-                                    use_apt_pkg=False, shared_storage=False)
- 
--    def test_iter_paragraphs_apt_shared_storage_sources(self):
--        # type: () -> None
--        self._test_iter_paragraphs(find_test_file("test_Sources"),
--                                   deb822.Sources,
--                                   use_apt_pkg=True, shared_storage=True)
--    def test_iter_paragraphs_apt_no_shared_storage_sources(self):
--        # type: () -> None
--        self._test_iter_paragraphs(find_test_file("test_Sources"),
--                                   deb822.Sources,
--                                   use_apt_pkg=True, shared_storage=False)
-     def test_iter_paragraphs_no_apt_no_shared_storage_sources(self):
-         # type: () -> None
-         self._test_iter_paragraphs(find_test_file("test_Sources"),
-@@ -1091,28 +1055,6 @@ Description: python modules to work with Debian-related data formats
-             self.assertWellParsed(paragraphs[i],
-                                   PARSED_PARAGRAPHS_WITH_COMMENTS[i])
- 
--    def test_iter_paragraphs_comments_use_apt_pkg(self):
--        # type: () -> None
--        """ apt_pkg does not support comments within multiline fields
--
--        This test checks that a file with comments inside multiline fields
--        generates an error from the apt_pkg parser.
--
--        See also https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=750247#35
--                 https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=807351
--        """
--        try:
--            fd, filename = tempfile.mkstemp()
--            fp = os.fdopen(fd, 'wb')
--            fp.write(UNPARSED_PARAGRAPHS_WITH_COMMENTS.encode('utf-8'))
--            fp.close()
--
--            with open_utf8(filename) as fh:
--                with self.assertRaises(apt_pkg.Error):
--                    list(deb822.Deb822.iter_paragraphs(fh, use_apt_pkg=True))
--        finally:
--            os.remove(filename)
--
-     def test_iter_paragraphs_comments_native(self):
-         # type: () -> None
-         paragraphs = list(deb822.Deb822.iter_paragraphs(
--- 
-2.30.0
-
diff --git a/dev-python/python-debian/python-debian-0.1.40.ebuild b/dev-python/python-debian/python-debian-0.1.40.ebuild
deleted file mode 100644
index c3d29168c148..000000000000
--- a/dev-python/python-debian/python-debian-0.1.40.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2011-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Python modules to work with Debian-related data formats"
-HOMEPAGE="https://salsa.debian.org/python-debian-team/python-debian"
-SRC_URI="mirror://debian/pool/main/${P:0:1}/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="GPL-2 GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? ( app-arch/dpkg )
-"
-
-distutils_enable_tests unittest
-
-PATCHES=( "${FILESDIR}/0.1.39-disable-apt-pkg.patch" )
-
-python_compile_all() {
-	${EPYTHON} lib/debian/doc-debtags > README.debtags || die
-}
-
-python_test() {
-	eunittest lib
-}
diff --git a/dev-python/python-debian/python-debian-0.1.42.ebuild b/dev-python/python-debian/python-debian-0.1.42.ebuild
index c02a27cb091f..0bda1db9a958 100644
--- a/dev-python/python-debian/python-debian-0.1.42.ebuild
+++ b/dev-python/python-debian/python-debian-0.1.42.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/${P:0:1}/${PN}/${PN}_${PV}.tar.xz"
 
 LICENSE="GPL-2 GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 arm x86"
 
 RDEPEND="
 	dev-python/chardet[${PYTHON_USEDEP}]
diff --git a/dev-python/pytz_deprecation_shim/pytz_deprecation_shim-0.1.0_p0-r1.ebuild b/dev-python/pytz_deprecation_shim/pytz_deprecation_shim-0.1.0_p0-r1.ebuild
index 9dbd203b91f5..45821933a1cd 100644
--- a/dev-python/pytz_deprecation_shim/pytz_deprecation_shim-0.1.0_p0-r1.ebuild
+++ b/dev-python/pytz_deprecation_shim/pytz_deprecation_shim-0.1.0_p0-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/pyyaml/pyyaml-6.0.ebuild b/dev-python/pyyaml/pyyaml-6.0.ebuild
index 9c2cbf1aa336..c2673feb164a 100644
--- a/dev-python/pyyaml/pyyaml-6.0.ebuild
+++ b/dev-python/pyyaml/pyyaml-6.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/yaml/pyyaml/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="examples"
 
 RDEPEND="dev-libs/libyaml:="
diff --git a/dev-python/rcssmin/Manifest b/dev-python/rcssmin/Manifest
index f64423e8bf73..a3be10438c19 100644
--- a/dev-python/rcssmin/Manifest
+++ b/dev-python/rcssmin/Manifest
@@ -1 +1,2 @@
 DIST rcssmin-1.0.6.tar.gz 582894 BLAKE2B 64fcd9bd9ea96037acfcbb0edf5ddba45f0804cb1862fb60dffaa5b60a0ee2a0927fc237fd04cbf9be438a9468b54dfccb56729a6d191ee323d9ccb819857dbc SHA512 5129a6007755a5b1949256bba7ad3616a08034d7bfcf06a1f9d8143897dddc5d2f6b8a0ebde7abb2e8b12e5b1aee2e46260e59101a78f35026e15f9f6503db77
+DIST rcssmin-1.1.0.tar.gz 580779 BLAKE2B 162ec087b791a4ee0c23994cea431e01f76c199c1d2118a75c9e49ebfc0d4f46fc4088126032851446acf2bd7b76b8f17095896100338636f4df8de75612f55d SHA512 9dc7fac0fef73c389baf8fc132e58599471517a2b77b13fe6bfabd30246b46bf859f7307ff1606d6634bdcdc472bdde0882fe7282018a34fba7b8fc80f6e9279
diff --git a/dev-python/rcssmin/rcssmin-1.1.0.ebuild b/dev-python/rcssmin/rcssmin-1.1.0.ebuild
new file mode 100644
index 000000000000..413a7d051fa9
--- /dev/null
+++ b/dev-python/rcssmin/rcssmin-1.1.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="CSS minifier written in python."
+HOMEPAGE="http://opensource.perlig.de/rcssmin/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+distutils_enable_tests pytest
+
+src_configure() {
+	export SETUP_CEXT_REQUIRED=1
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	mv "${D}/usr/share/doc/${PN}" "${D}/usr/share/doc/${PF}"
+}
diff --git a/dev-python/reportlab/reportlab-3.6.2.ebuild b/dev-python/reportlab/reportlab-3.6.2.ebuild
index 05b4f8f567b8..b7bf963cd077 100644
--- a/dev-python/reportlab/reportlab-3.6.2.ebuild
+++ b/dev-python/reportlab/reportlab-3.6.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	media-libs/freetype
diff --git a/dev-python/rope/Manifest b/dev-python/rope/Manifest
index bbea060f6e52..015118a67749 100644
--- a/dev-python/rope/Manifest
+++ b/dev-python/rope/Manifest
@@ -1,2 +1 @@
-DIST rope-0.20.1.tar.gz 257811 BLAKE2B 58f11c02e68e08c532d08a4b36c08316afb42329f10ca67f7f73f0e19ef6b09aaf4b4e4fb1e90cf0af61c9779efc067e42945f9f10cf0abe4ff82b8cb3c8b5f6 SHA512 328016e711a7d684fa316b3eb8ebc233bcdf579d2545d038dedc703be82e6d5b4a8af8a9fba96569c84b9cab4450a139013ec25ae16a082c699920ea9096ce7f
 DIST rope-0.21.0.tar.gz 256456 BLAKE2B f9ed997933794caaeaee7c9951ea46c1fc50983f93433b227151366f720198f96966faa28993d2a8a54e667a34cc318c322068bc47fd38789c9604aea9586c53 SHA512 b1b882087b235849b04beeb85c253eecdcc06e0d75ba54975db9c4e60e68178f7acb87a58a9a24dc942994cfbfc3662e05000d00965278697b0db412411b4c44
diff --git a/dev-python/rope/rope-0.20.1.ebuild b/dev-python/rope/rope-0.20.1.ebuild
deleted file mode 100644
index 08cc04102ddb..000000000000
--- a/dev-python/rope/rope-0.20.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Python refactoring library"
-HOMEPAGE="https://github.com/python-rope/rope"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-# Dependency for docbuild documentation which is not noted in
-# setup.py, using standard docutils builds docs successfully.
-BDEPEND="
-	doc? ( dev-python/docutils[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest-timeout[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-python_compile_all() {
-	if use doc; then
-		pushd docs > /dev/null || die
-		mkdir build || die
-		local i
-		for i in ./*.rst; do
-			rst2html.py $i > ./build/${i/rst/html} || die
-		done
-		popd > /dev/null || die
-	fi
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/rope/rope-0.21.0.ebuild b/dev-python/rope/rope-0.21.0.ebuild
index a85054180d87..08cc04102ddb 100644
--- a/dev-python/rope/rope-0.21.0.ebuild
+++ b/dev-python/rope/rope-0.21.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 # Dependency for docbuild documentation which is not noted in
diff --git a/dev-python/smmap/Manifest b/dev-python/smmap/Manifest
index 1a283d09f873..d889a90c6533 100644
--- a/dev-python/smmap/Manifest
+++ b/dev-python/smmap/Manifest
@@ -1,2 +1 @@
-DIST smmap-4.0.0.tar.gz 22524 BLAKE2B 2edd07925d9511879cb816f1e80d5fe7920ef91635f085b8d0ca81fa8d46bf0a1dfce7eab6f70250b93602a5a10e8170045f0720cf9fe3b26911d4e8b419f4cf SHA512 fae59fd4e8ccc95cbc07be3ece208e862948c2b537850376b169acc15b9f0b1d94d412fde88647c245dda117dbbdab4db6426e1d95f3f9779bdd40c2d9c7d2cd
 DIST smmap-5.0.0.tar.gz 22437 BLAKE2B 2ff55ff412b10fe6c431df5f1589deb9f6f1c3277ee1ac651513e302d31b4f7ff986bfc548c5fefd66775f0eb7aef11dd8f2821f0e50a2e76d9bfcfaa9c047bd SHA512 03ae478bc83d02416f57bb3f6afc9c80bcb2d4249f3169390ac139b88be94258463dee7744fdf0fd54a7cfe109795a110c43f2b81ffd8546601de274667d353d
diff --git a/dev-python/smmap/smmap-4.0.0.ebuild b/dev-python/smmap/smmap-4.0.0.ebuild
deleted file mode 100644
index 7c0df58df6dd..000000000000
--- a/dev-python/smmap/smmap-4.0.0.ebuild
+++ /dev/null
@@ -1,20 +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="A pure Python implementation of a sliding window memory map manager"
-HOMEPAGE="
-	https://pypi.org/project/smmap/
-	https://github.com/gitpython-developers/smmap/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-SLOT="0"
-
-distutils_enable_tests unittest
diff --git a/dev-python/smmap/smmap-5.0.0.ebuild b/dev-python/smmap/smmap-5.0.0.ebuild
index c99c5a8475e2..dca8af02f462 100644
--- a/dev-python/smmap/smmap-5.0.0.ebuild
+++ b/dev-python/smmap/smmap-5.0.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 SLOT="0"
 
 distutils_enable_tests unittest
diff --git a/dev-python/snakeoil/Manifest b/dev-python/snakeoil/Manifest
index 94199528025e..9e4b15befdd1 100644
--- a/dev-python/snakeoil/Manifest
+++ b/dev-python/snakeoil/Manifest
@@ -1,2 +1 @@
-DIST snakeoil-0.9.5.tar.gz 266086 BLAKE2B 635d2d821e47a92a668b2e95364d6587f0f74c21438356e708d6b16ed6c027df39a28f73d261d8ae06eb32de471124cd5ba5df0fc899f59dad5f7d2363391e00 SHA512 0762d90932bdf995160b3410e224660dae2cce327cdc30d5093ca9e3d16d3e910f88e409a87d2d7da211b850f7d0b7d9c70f053462dd9a651e4202b8ca018105
 DIST snakeoil-0.9.7.tar.gz 261551 BLAKE2B 6739541d1e40b3ac5c4908e6bb92b5b40957f49119307d6046fd17327394ae0406c01dc10396cb568ceb3757ba3367b930441d08079e9be635eeb6f14bd02e3a SHA512 c2626d8050bf24b4ce3f6fed5c6b8993fa9a5ebb40dd664c7008caffe4b26237edeecd3de8fe90f3a1c5756de3d770c3b9e1ef2e95cc052a5f8fcf22058925f6
diff --git a/dev-python/snakeoil/snakeoil-0.9.5.ebuild b/dev-python/snakeoil/snakeoil-0.9.5.ebuild
deleted file mode 100644
index 44d607590a18..000000000000
--- a/dev-python/snakeoil/snakeoil-0.9.5.ebuild
+++ /dev/null
@@ -1,28 +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
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="misc common functionality and useful optimizations"
-HOMEPAGE="https://github.com/pkgcore/snakeoil"
-
-LICENSE="BSD BSD-2 MIT"
-SLOT="0"
-
-RDEPEND="
-	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]"
-
-[[ ${PV} == 9999 ]] && BDEPEND+=" dev-python/cython[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/tzlocal/tzlocal-4.1.ebuild b/dev-python/tzlocal/tzlocal-4.1.ebuild
index 99bac2fbe2c3..678232801053 100644
--- a/dev-python/tzlocal/tzlocal-4.1.ebuild
+++ b/dev-python/tzlocal/tzlocal-4.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/regebro/tzlocal/archive/${PV}.tar.gz -> ${P}.gh.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	dev-python/pytz_deprecation_shim[${PYTHON_USEDEP}]
diff --git a/dev-python/versioneer/Manifest b/dev-python/versioneer/Manifest
index 441beb03df77..c86611ee7490 100644
--- a/dev-python/versioneer/Manifest
+++ b/dev-python/versioneer/Manifest
@@ -1,2 +1 @@
-DIST versioneer-0.20.tar.gz 50634 BLAKE2B 4a64f311b5b7028f15a20c8111f462399bf49340b6ac42272af20427fe5ce722c9d589c04dcb66fe66782ad3ce3491f5fd4807ca06b3caa2342fe3750bedc1be SHA512 7751af838639f06f1f87224b3f87e5d466cf11f32e4da35646a1ea84ba8d21901d47137fab6bde2632f5aaecc2f90f9bbf5968d3fcd3b074e5145762bdde1ae7
 DIST versioneer-0.21.tar.gz 50072 BLAKE2B 83b56dc61b7ba6dd1fb274f08b08e501ab0e209d915785c3a62d733524270a8bd1f60fb09dd3d97c2030fa4e8e154e8351de51beb17774189ae68c12fca1e12a SHA512 a75e68cf1d11ddca220e8e617cd4c2e17b20d8d683c9e6ab94e8470695eee8fa00f7b5a9cb5cfeabd984446dffab70cb7acc749296c235a6a6f1c815f1729583
diff --git a/dev-python/versioneer/versioneer-0.20.ebuild b/dev-python/versioneer/versioneer-0.20.ebuild
deleted file mode 100644
index aac4ecc5eff5..000000000000
--- a/dev-python/versioneer/versioneer-0.20.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Easy VCS-based management of project version strings"
-HOMEPAGE="
-	https://pypi.org/project/versioneer/
-	https://github.com/python-versioneer/python-versioneer/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="public-domain"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-python_test() {
-	esetup.py make_versioneer
-
-	git config --global user.email "you@example.com" || die
-	git config --global user.name "Your Name" || die
-
-	"${EPYTHON}" test/git/test_git.py -v || die
-}
diff --git a/dev-python/versioneer/versioneer-0.21.ebuild b/dev-python/versioneer/versioneer-0.21.ebuild
index 5436c0a7c38e..aac4ecc5eff5 100644
--- a/dev-python/versioneer/versioneer-0.21.ebuild
+++ b/dev-python/versioneer/versioneer-0.21.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="public-domain"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/zstandard/zstandard-0.16.0.ebuild b/dev-python/zstandard/zstandard-0.16.0.ebuild
index dfdbdc5b7ce2..496fa1026788 100644
--- a/dev-python/zstandard/zstandard-0.16.0.ebuild
+++ b/dev-python/zstandard/zstandard-0.16.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="
 	app-arch/zstd:="
author	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2021-11-22 01:40:48 +0000
committer	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2021-11-22 01:40:48 +0000
commit	897bc52a56ca0e12d2c98c20da030693679b1913 (patch)
tree	9b2989760e530c9b03dc8461e886b6e10c9b34cb /dev-python
parent	bbe03519a37a075f45ee85b37dca2d5bb5a20fca (diff)
download	baldeagleos-repo-897bc52a56ca0e12d2c98c20da030693679b1913.tar.gz baldeagleos-repo-897bc52a56ca0e12d2c98c20da030693679b1913.tar.xz baldeagleos-repo-897bc52a56ca0e12d2c98c20da030693679b1913.zip