Updating liguros repo

44 files changed, 168 insertions, 850 deletions

diff --git a/dev-python/blosc/blosc-1.10.1.ebuild b/dev-python/blosc/blosc-1.10.1.ebuild
index 8d81ccad8ac8..c69fff3a84cd 100644
--- a/dev-python/blosc/blosc-1.10.1.ebuild
+++ b/dev-python/blosc/blosc-1.10.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
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 9d65cd7975de..382aae1872cb 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,8 +1,4 @@
-DIST boto3-1.16.36.tar.gz 341458 BLAKE2B 7e4cf667cd59caa8433226eb6914412370bfa4c002f6f5d992fe49c93528d59d5740de6c8782af71d94461ea704a36d8ed46ccadfbf83982504ab507aab9b058 SHA512 06d9c6e721d1ab529e6a598b14ba6f740bec32a8165582853149b9aa294f0a272d0da4222f0dc7ef83055d91b4b0a0176e65bb34784990aca43e44db43650a2d
 DIST boto3-1.16.43.tar.gz 342444 BLAKE2B 1a367fa252eab6738533c7bec2bc370dcc206f25c4290ea34632ef82a0e308aa4521af7bd2e9755782b3b66b438c528e67f55f7238183ffff2318bfb7361e924 SHA512 1cd757a2751e48b9075f99724a9980d882751542f5a7794a4cbddc46f82a1bbf00b8e0908e0cd2db16726636750d591aee26b00004a454c35d24ab79de9c80b9
 DIST boto3-1.16.50.tar.gz 342744 BLAKE2B a6581acbdb07f2d8ce21ddf384b471d281d58910366dee0669f0f726118eabd52de8a4fe129915b9044bd484950155c32fa4f4941e1ef6ce55249213ba29f2f3 SHA512 de483be833917a2c478c0fe651ffe4143dc6c742e259711a955be41a8b76197353b295526695ca800bb860b95e0378dc461119bfa163c4be0faa3b6c2ccfc097
 DIST boto3-1.16.56.tar.gz 344547 BLAKE2B da32affd031a7efd7f55ec390f657d02caaf37d5c226ed811934e101dee1fcdc6df8b678ddaa181cdec140ad70525ff0a462885eee21f924040b1f2051d0f1f0 SHA512 2f35d4331db005ecb8dca5c780ebb2347242564f541e5b9585f0645e113255aeb8dff2210ecc42a2768f2b58c6731d59d6cb5eb7ac143e7aafd2bf21eae7d7ab
-DIST boto3-1.16.57.tar.gz 344712 BLAKE2B 572a70f9afad3502d9f2bbaa5950654e45d40269bbb995e96d94573b423d4e182d314e36de97435c93f9608c780b79e073da79fcd4dd699899a83b60d864907d SHA512 a588ebdd03d189b63999523a2f68c0f1021b82299bf9875f7aebc3120b8db61afd9d784fb65885c87efe9e8ebe416f3c601ddd9615965a61a5910bb1f8e89e9f
-DIST boto3-1.16.58.tar.gz 344789 BLAKE2B dfaac853e0e26b17612dbf20ffa83363c3bfcfcaca4f31b1c6e987c073c291eebe3c692a0f530b0491bc5042b3de627607694bd90df57f4df8503057233dfb14 SHA512 6d1fba2f614398b7b897e422a387553fcd796027f9929f6df5dc862ce06385d2b21e119246ad7e86b71ca050cd3f29a9801101d0cf3bdb8f5fd7772bb6ee9e66
-DIST boto3-1.16.59.tar.gz 344923 BLAKE2B 24c81452191a5c48b8fde37c5ba08c2c9f4cd521220cf2dfbf8b275261e3a90a66a1f5091455f79d113dd7fbcbb9ccb3f3938fdf1a845df631e6e7a444b3faf6 SHA512 1ed87af12e4672690b184df791bfaac82345a46148a7e7b4cb5c67c42b6091cba15453df5b049c796d0d8baff3cd0220fca279ef9b6df1ee1f489e39fb8e8e30
 DIST boto3-1.16.60.tar.gz 344983 BLAKE2B c479bc65a04ef01576b046452b125eef931274923dcc3122ca216affd7de55198ace650cf3923fe062ee9a1246d9bd6b2a9e512b88aa91ca5dd8426f3c341958 SHA512 cc7764ace2f94b657de3f6fba977c0b8dcf3e71d159e3ea93fe2d2a6c2e02357655dc08d5ad21e4884173f5a79204c8405d833b4f78063e7f071e7ff8299de7f
diff --git a/dev-python/boto3/boto3-1.16.36.ebuild b/dev-python/boto3/boto3-1.16.36.ebuild
deleted file mode 100644
index ed20a9d55fa0..000000000000
--- a/dev-python/boto3/boto3-1.16.36.ebuild
+++ /dev/null
@@ -1,56 +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} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.16.43.ebuild b/dev-python/boto3/boto3-1.16.43.ebuild
index af8cbcbae607..ed20a9d55fa0 100644
--- a/dev-python/boto3/boto3-1.16.43.ebuild
+++ b/dev-python/boto3/boto3-1.16.43.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
@@ -17,7 +17,7 @@ if [[ "${PV}" == "9999" ]]; then
 	BOTOCORE_PV=${PV}
 else
 	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 	# botocore is x.(y+3).z
 	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
diff --git a/dev-python/boto3/boto3-1.16.57.ebuild b/dev-python/boto3/boto3-1.16.57.ebuild
deleted file mode 100644
index 2df16964cdb0..000000000000
--- a/dev-python/boto3/boto3-1.16.57.ebuild
+++ /dev/null
@@ -1,56 +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} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.16.58.ebuild b/dev-python/boto3/boto3-1.16.58.ebuild
deleted file mode 100644
index 2df16964cdb0..000000000000
--- a/dev-python/boto3/boto3-1.16.58.ebuild
+++ /dev/null
@@ -1,56 +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} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.16.59.ebuild b/dev-python/boto3/boto3-1.16.59.ebuild
deleted file mode 100644
index 2df16964cdb0..000000000000
--- a/dev-python/boto3/boto3-1.16.59.ebuild
+++ /dev/null
@@ -1,56 +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} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 1e5c13ecada5..537f269c2fa2 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,8 +1,4 @@
-DIST botocore-1.19.36.tar.gz 7291325 BLAKE2B d1f79298a0f47d704418cac8390a5d500b1f300fc9bdbc0b215a3630adb70c29a951c6dff2a6ebfde42872cbc3af4c442d09fa0233b2c957521e6a5e05816c60 SHA512 420ad7c59496b2b74ba6ecde8dc40ac3e47c5676335f7471448fcdde5b70bda3bd7516963788d8a7a940aaa9cf488b6529e6fbd2842806f58520cd8e2dc15a60
 DIST botocore-1.19.43.tar.gz 7374325 BLAKE2B 7def5221bee4774a6b8a33e6499e499588ff18f8b144e669bdf9b01ae4a3e370e3aed5a3a960360123e57299da9b0293aa8da9108fe114f8ae34521b2920f479 SHA512 a1b97cbb779d8c8fe3495dd18d3d635e38c5c49e5b5fb31b7764029cf3063a7fda44711defc45783b3afb844bead46e686705af57472a7ff27af8b7e21645ad5
 DIST botocore-1.19.50.tar.gz 7382888 BLAKE2B 7de2ef7a7d051427191b13cdd47d3ebd9b4de505e3e17aa7dfb42de9a5eebffa2f06317a559631d219acc4380cc68c7dcfa1d6b0dc9cb123b2fa0315dd81df4e SHA512 7d1a8ff53e22fc265d8ac6492c0607f8948c9aa5862abaded93c605c3a3e4e98e535308e5ec1500a480636e03dbc3d849ec2b1dbf0efb22dffa841ce1cb551f9
 DIST botocore-1.19.56.tar.gz 7390812 BLAKE2B 3bec12ce19f39f12a72f7f59f226568cb5af59d6f9a40447a7a1fdc0f27eea06d0cfe5a5b12d2152189b700ddaa016592e95059fa42208c590cb698c568c2d63 SHA512 76988a7ddc588dba48f2444a99159247a0f178c67378fcb6eac51e3f5cfd0ab385960f0fb68bbc483f79e74c9b891070d34a39e9566eb8c24ce903b9ae24dfa5
-DIST botocore-1.19.57.tar.gz 7393040 BLAKE2B 1eb29dbf95a373fc516febfe2222129f42f2c82fc37a5a6c8e1519b3f5fe63e760c0b4440573c7eb86c94a1463ecddc3046c024cc0415fe53e1a76e9362edc71 SHA512 da4cc5009a755f3be975169ba5226586f4de425f3bed2ea6eda3235bd4fc4591155715a410f47073afa7f606b290f371e776643b0d8d43a00313599630f7390a
-DIST botocore-1.19.58.tar.gz 7395107 BLAKE2B 8ec21595faef30401cc84802cd1863cf9557240e733d2bd4c9ce2418f8fa3ab93d5e7f7fb4a3e35f0a5f4bc3c79bdc87be1fed3d5a66943a545d263d674cf54e SHA512 8fc7348df4a755097ba6c68db67f4685c137ccd2a82257d035588cab6dc72a4765aaf8c9748962a4e5ee5b19f8aa0c5f25feac051592464a04acad27e8fd1e09
-DIST botocore-1.19.59.tar.gz 7430783 BLAKE2B 1837dc9c3dd2948dcb37adbe5b0421c0dc4fbd245be94ef5947f8544e06b271670a78e1927cd3805906389855d973801b45b615b89dcc7c766a5252dad76d5ea SHA512 c3a9cafe5f1f8c7fecf41a7119d0b99062c4bc9be0cd1f0a7e255a13e9809af05b5e8b1e4468afda3236e8babd080241d1dc237ef668161933b5d722b3e3f7dd
 DIST botocore-1.19.60.tar.gz 7432208 BLAKE2B 6dd879a5c0c812dd218a71f9712758ec6195b4770afc582bb1e062be360e7909e33ef62896e08be1bc8c57840333cc6fb8f4ce3817b248acff58258654b6a138 SHA512 d38a278dbca897b06d4d7589084b6f3d385051ec346a716b9ce90f1e8980abc2c617f94aa6e3f13960fc86820393dd7c1ed2d391a6bf1fea3edc6f1ba750b24d
diff --git a/dev-python/botocore/botocore-1.19.36.ebuild b/dev-python/botocore/botocore-1.19.36.ebuild
deleted file mode 100644
index 4c682b6b25d3..000000000000
--- a/dev-python/botocore/botocore-1.19.36.ebuild
+++ /dev/null
@@ -1,59 +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="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-	# very unstable
-	sed -i -e 's:test_stress_test_token_bucket:_&:' \
-		tests/functional/retries/test_bucket.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# note: suites need to be run separately as one of the unit tests
-	# seems to be leaking mocks and breaking a few functional tests
-	nosetests -v tests/unit ||
-		die "unit tests failed under ${EPYTHON}"
-	nosetests -v tests/functional ||
-		die "functional tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/botocore/botocore-1.19.43.ebuild b/dev-python/botocore/botocore-1.19.43.ebuild
index 7bbd989ca3a9..4c682b6b25d3 100644
--- a/dev-python/botocore/botocore-1.19.43.ebuild
+++ b/dev-python/botocore/botocore-1.19.43.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
@@ -16,7 +16,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 fi
 
 RDEPEND="
diff --git a/dev-python/botocore/botocore-1.19.57.ebuild b/dev-python/botocore/botocore-1.19.57.ebuild
deleted file mode 100644
index 9d681f87244c..000000000000
--- a/dev-python/botocore/botocore-1.19.57.ebuild
+++ /dev/null
@@ -1,59 +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="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-	# very unstable
-	sed -i -e 's:test_stress_test_token_bucket:_&:' \
-		tests/functional/retries/test_bucket.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# note: suites need to be run separately as one of the unit tests
-	# seems to be leaking mocks and breaking a few functional tests
-	nosetests -v tests/unit ||
-		die "unit tests failed under ${EPYTHON}"
-	nosetests -v tests/functional ||
-		die "functional tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/botocore/botocore-1.19.58.ebuild b/dev-python/botocore/botocore-1.19.58.ebuild
deleted file mode 100644
index 9d681f87244c..000000000000
--- a/dev-python/botocore/botocore-1.19.58.ebuild
+++ /dev/null
@@ -1,59 +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="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-	# very unstable
-	sed -i -e 's:test_stress_test_token_bucket:_&:' \
-		tests/functional/retries/test_bucket.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# note: suites need to be run separately as one of the unit tests
-	# seems to be leaking mocks and breaking a few functional tests
-	nosetests -v tests/unit ||
-		die "unit tests failed under ${EPYTHON}"
-	nosetests -v tests/functional ||
-		die "functional tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/botocore/botocore-1.19.59.ebuild b/dev-python/botocore/botocore-1.19.59.ebuild
deleted file mode 100644
index 9d681f87244c..000000000000
--- a/dev-python/botocore/botocore-1.19.59.ebuild
+++ /dev/null
@@ -1,59 +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="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-	# very unstable
-	sed -i -e 's:test_stress_test_token_bucket:_&:' \
-		tests/functional/retries/test_bucket.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# note: suites need to be run separately as one of the unit tests
-	# seems to be leaking mocks and breaking a few functional tests
-	nosetests -v tests/unit ||
-		die "unit tests failed under ${EPYTHON}"
-	nosetests -v tests/functional ||
-		die "functional tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/coverage/coverage-5.3.1.ebuild b/dev-python/coverage/coverage-5.3.1.ebuild
index a002d37ea87e..10004c2faad2 100644
--- a/dev-python/coverage/coverage-5.3.1.ebuild
+++ b/dev-python/coverage/coverage-5.3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc ~x86 ~x64-macos"
 #IUSE="test"
 # The tests are impossible to appease.  Please run them externally
 # via tox.  Or fix the ebuild if you have hours of time to spend
diff --git a/dev-python/cvxopt/cvxopt-1.2.5-r1.ebuild b/dev-python/cvxopt/cvxopt-1.2.5-r1.ebuild
index 97ce51843099..b5119064c300 100644
--- a/dev-python/cvxopt/cvxopt-1.2.5-r1.ebuild
+++ b/dev-python/cvxopt/cvxopt-1.2.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/funcy/funcy-1.14-r1.ebuild b/dev-python/funcy/funcy-1.14-r1.ebuild
index 9d04567a0959..693466b5f251 100644
--- a/dev-python/funcy/funcy-1.14-r1.ebuild
+++ b/dev-python/funcy/funcy-1.14-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/gevent/gevent-20.12.0.ebuild b/dev-python/gevent/gevent-20.12.0.ebuild
index ee3e7cdf62cc..80b76ed1c977 100644
--- a/dev-python/gevent/gevent-20.12.0.ebuild
+++ b/dev-python/gevent/gevent-20.12.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~mips ~ppc ppc64 s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/graphviz/Manifest b/dev-python/graphviz/Manifest
index ff6c67433ce8..64a7ab115a0e 100644
--- a/dev-python/graphviz/Manifest
+++ b/dev-python/graphviz/Manifest
@@ -1,2 +1 @@
-DIST graphviz-0.15.zip 183103 BLAKE2B 81d4a121ca2654e6c08570ede7a1f5ef580b6a281358bf32f4178898fc12cfae21b10ce8f4f6fba4644e3275162cc09dbf5ae287a114fb8503be98d6a2fbf728 SHA512 c2a77f0d52595a70b4f8ccd906907453b59622560f0ff84e267e874f5a1dc9a4b721192d236b0519ee7ec85bae9b225b9919ae51bcf599c93bd5816934afd6cc
 DIST graphviz-0.16.zip 193031 BLAKE2B abedbe170eaf9d3ad83f91b5ad13aa9fbda8669ac19ebbd1087aeab3f9401b0b8e6557313e04d791451ee501c75bc2843d89d1a0f789a219b0db771467b4b8bb SHA512 7896901decf712657d4cb16fad58eab8492e1476e60a32b1a7fa37ede2e9c47ed31c00b7dedcaafdee291e2cfe6b2e2affa352282665782829fd3fb2f30bdf92
diff --git a/dev-python/graphviz/graphviz-0.15.ebuild b/dev-python/graphviz/graphviz-0.15.ebuild
deleted file mode 100644
index f2208e89042d..000000000000
--- a/dev-python/graphviz/graphviz-0.15.ebuild
+++ /dev/null
@@ -1,34 +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="Simple Python interface for Graphviz"
-HOMEPAGE="https://graphviz.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="MIT"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-
-RDEPEND="media-gfx/graphviz"
-BDEPEND="
-	app-arch/unzip
-	test? ( ${RDEPEND}
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-1.8[${PYTHON_USEDEP}]
-		media-gfx/graphviz[gts,pdf]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -e 's:--cov --cov-report=term --cov-report=html::' \
-		-i setup.cfg || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/graphviz/graphviz-0.16.ebuild b/dev-python/graphviz/graphviz-0.16.ebuild
index 66f39b6bbef2..bf8425e85623 100644
--- a/dev-python/graphviz/graphviz-0.16.ebuild
+++ b/dev-python/graphviz/graphviz-0.16.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
@@ -12,7 +12,7 @@ HOMEPAGE="https://graphviz.readthedocs.io/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 
 RDEPEND="media-gfx/graphviz"
diff --git a/dev-python/jedi/Manifest b/dev-python/jedi/Manifest
index a83fc82dd24e..801972ab0d16 100644
--- a/dev-python/jedi/Manifest
+++ b/dev-python/jedi/Manifest
@@ -1,5 +1,4 @@
 DIST django-stubs-1.5.0.tar.gz 180400 BLAKE2B 0619a76f89fe4fad456a82e3048009f25fdfd8b8e3071fd5a0cc0eebd62b3e9e8b77d29c5e4e8d1e0297fc466cc7e0c49771750b609fff49516e2aa1499c198b SHA512 c3e89f02a22561b5446e1cc0f01be791767984b5791fe5bd362ec6128e2ba7b32e921f9ee719a80ace05f7f0c84a912731700b457761f64617c1415cd232c7da
-DIST jedi-0.17.1.tar.gz 472489 BLAKE2B 7486925cb307f6a25538c2f5d52763802222561cfc4beca1637e433f4450b06ef328204e75779b6b2ac4ca2cfcf5ab647daecd329941ca6fb0ae2a5dd2bd8b5f SHA512 0a9d552d2b4c45730c9cccf06ebb434b159b755acea0dbaddf5f628dccf8e9c752e03d151258e377b817f1a25fb9ca8e0289dbd2da290f55dc719883413b65cf
 DIST jedi-0.17.2.tar.gz 474372 BLAKE2B cd0bf217202e4413a7d4f1d4095fb22ad5c3de557993fd33e246a1fb516992a16a7382db9e18e0c0414ff5d927008c8148e9bbd8ee0dbd62368d01a31611c326 SHA512 cd96faa6f9cd6e8ad8b9a52ceaa6a84f30c8ced51b20d621932f0babf1b90bbc445fbe5ffd11a4f0e356bf20bdd1da756ccc3574e5fc978883de72dfdb519977
 DIST jedi-0.18.0.tar.gz 462786 BLAKE2B 35021ed1566fffc24056060f16b8a0aa6f8b6e382f716ff5978711fd66340e96f4e0b628463aadead5605db32cfc20df06a6c53a9b435658f1c455a6212da6e5 SHA512 fcee84496285a0b0b1cf1f3827593d0603bd87c84baf725cc7bdbf594979f49729b18a29b7465848413bdd3a5670fcc41187dd3eadbd9750d77788c5a9408dbf
 DIST typeshed-jedi_v0.16.0.tar.gz 497407 BLAKE2B d322d70d3c46d1abcedddbd10aed5c6f213698f4e9f9aec1b4bd7e7186ab7ce384ec6a95d6adc46c7459e3bbb748d6ff432115cae744a315aed60972d2390eee SHA512 1551082938b52717f90e28ffd25e838ab04798ea86ea719fa35975a9de006bcc063a00cc8c8babd994990cdff694d48490f4d8c898c322666450d7ef3be8688a
diff --git a/dev-python/jedi/jedi-0.17.1-r1.ebuild b/dev-python/jedi/jedi-0.17.1-r1.ebuild
deleted file mode 100644
index eee827f01f6a..000000000000
--- a/dev-python/jedi/jedi-0.17.1-r1.ebuild
+++ /dev/null
@@ -1,70 +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
-
-TYPESHED_P="typeshed-jedi_v0.16.0"
-DJANGO_STUBS_P="django-stubs-v1.5.0"
-
-DESCRIPTION="Autocompletion library for Python"
-HOMEPAGE="https://github.com/davidhalter/jedi"
-SRC_URI="
-	https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-	https://github.com/davidhalter/typeshed/archive/${TYPESHED_P#typeshed-}.tar.gz
-		-> ${TYPESHED_P}.tar.gz
-	https://github.com/davidhalter/django-stubs/archive/${DJANGO_STUBS_P#django-stubs-}.tar.gz
-		-> ${DJANGO_STUBS_P/v/}.tar.gz"
-
-LICENSE="MIT
-	test? ( Apache-2.0 )"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-
-RDEPEND="=dev-python/parso-0.7*[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# upstream includes these as submodules ...
-	rmdir "${S}"/jedi/third_party/{django-stubs,typeshed} || die
-	mv "${WORKDIR}/${DJANGO_STUBS_P/v/}" \
-		"${S}/jedi/third_party/django-stubs" || die
-	mv "${WORKDIR}/${TYPESHED_P}" \
-		"${S}/jedi/third_party/typeshed" || die
-
-	# don't run doctests, don't depend on colorama
-	sed -i "s:'docopt',:: ; s:'colorama',::" setup.py || die
-	sed -i "s: --doctest-modules::" pytest.ini || die
-
-	# speed tests are fragile
-	rm test/test_speed.py || die
-
-	# test_complete_expanduser relies on $HOME not being empty
-	touch "${HOME}"/somefile || die
-
-	# TODO: investigate
-	sed -e 's:test_local_import:_&:' \
-		-i test/test_utils.py || die
-	sed -e '/with sqlite3\.connect/,+2d' \
-		-i test/completion/stdlib.py || die
-	rm test/completion/django.py || die
-
-	# tests relying on pristine virtualenv
-	# this relies on test* not matching anything else
-	sed -e "/#\? \['test'\]/,+1d" \
-		-i test/completion/on_import.py || die
-	# this one's broken by 'path' module (dev-python/path-py)
-	sed -e 's:test_os_issues:_&:' \
-		-i test/test_inference/test_imports.py || die
-	sed -e 's:test_venv_and_pths:_&:' \
-		-i test/test_inference/test_sys_path.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/jedi/jedi-0.18.0.ebuild b/dev-python/jedi/jedi-0.18.0.ebuild
index 7ba3493dc927..4f9481f5005a 100644
--- a/dev-python/jedi/jedi-0.18.0.ebuild
+++ b/dev-python/jedi/jedi-0.18.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
@@ -23,7 +23,7 @@ SRC_URI="
 LICENSE="MIT
 	test? ( Apache-2.0 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
 
 RDEPEND="=dev-python/parso-0.8*[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/josepy/Manifest b/dev-python/josepy/Manifest
index 875b524a69cb..8c66dc4ae8df 100644
--- a/dev-python/josepy/Manifest
+++ b/dev-python/josepy/Manifest
@@ -1,2 +1,3 @@
 DIST josepy-1.4.0.tar.gz 54174 BLAKE2B 67117e7399422d0cfe2c47f9e5ed11a3b93617e673cf9ab1344334f7f11f0c884f45202e8e5e65ebacc00f527becfdbdda9ea246b8e96ba15e516bfc2fb33ba9 SHA512 a5038a4bb42c5a55d665a551743a976b209c24d8aa368d2b6acf0957e953bd4044d9dc41bf9d460283f44c14b7dd7ce2a860563fe107663d4a4deba0c7834e40
 DIST josepy-1.5.0.tar.gz 53979 BLAKE2B e08b3d7a9ce5b123ec8731de27bff63638e68a052f2e6c8715c77f6e4ea644eae1c8200d6d2135853f27eb8caa2e24a04cfc563bfbd01884eb247fcdcc4c9d4c SHA512 39ace649ae4fcefee3eb7fa749001645711de39dc17fd47f1ebf52981929e21bee9b6316d09c61b5478d3d652afc0659e7d5110d1e222e8dcbdc2bb831cb2d8d
+DIST josepy-1.6.0.tar.gz 54066 BLAKE2B 18afbcf47d97e9677a3b75be50a4e61dd7748326eca1a7b736c0c9edc3918b2082c1cac8b32481bb631bef106b0e9895b24be054600f22f38bb45401333a28f4 SHA512 d08eb731b1027cd0b57639ac0c3d987d99d78daa54a9fe22d86eca90c9c5ab73bd8193d3fee4f98a4c55392015d1c5ee32fbc6589f511a6951033377cc2e1168
diff --git a/dev-python/josepy/josepy-1.6.0.ebuild b/dev-python/josepy/josepy-1.6.0.ebuild
new file mode 100644
index 000000000000..ee3f4309e3aa
--- /dev/null
+++ b/dev-python/josepy/josepy-1.6.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="JOSE protocol implementation in Python"
+HOMEPAGE="https://github.com/certbot/josepy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	>=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
+BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Remove coverage/flake8 options
+	sed -i '/^addopts =/d' pytest.ini || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/m2crypto/metadata.xml b/dev-python/m2crypto/metadata.xml
index 2f794a478d31..2f7023a205a2 100644
--- a/dev-python/m2crypto/metadata.xml
+++ b/dev-python/m2crypto/metadata.xml
@@ -9,5 +9,5 @@
     <remote-id type="pypi">M2Crypto</remote-id>
     <remote-id type="gitlab">m2crypto/m2crypto</remote-id>
   </upstream>
-	<origin>gentoo-staging</origin>
+	<origin>libressl-overlay</origin>
 </pkgmetadata>
diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index e9dd7c92f81b..928f4865e077 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -1,4 +1,2 @@
-DIST notebook-6.1.3.tar.gz 13806042 BLAKE2B da63fdabd1a71e4247a9e340539e688410a84c58d94049dfb7e8e3fcdc53686a55eb855687df34ff48f599a0c5aececbd9a8e1aa1d2ff7baa2a6da1b4e1bcf24 SHA512 67a8feb01dfb665bb24f3ce1b28212e9bad5a188e8cef1d168c4edaf207cbc16d516f6024ca905f75f1c27ba4890da858c5278a3ee84a4c4ac1bdbf225afa351
-DIST notebook-6.1.5.tar.gz 13925632 BLAKE2B ce9d0ee110a158ba0ee3f3199a7cc1c8d53ecb72e8f77f43d2b1e5552b4a0378edca9a987634e12d8429c70595ec4cc226784248d196501b3a04c67e4ba88c85 SHA512 4b0893c805a0494c369b363b7d1c606a1b124869e601eafce1eb4c93ad1436b757c6149bc76c489aa26171412280d69e894b44d7d19141341fb1194a8e2f447b
 DIST notebook-6.1.6.tar.gz 13926673 BLAKE2B 944f92d468ade0f0d3fbe01d46cb2893866fca067b48c6a6cefe653b9941bbde0802c7d9ee17b493bcf6391d1b0a77e710f5b5c8f1d58ec692b40753ac0692e9 SHA512 d1271273ae9cc098d5937a3ac91dc8035b033bb8da799f31c5d71abe48b17579f2fadc8b0ff7134dedda72ac49cc29c5adafaa4ef6f347cc4f6698ab46d83040
 DIST notebook-6.2.0.tar.gz 13927515 BLAKE2B ca752f0cb316b46b71d8451c59c196c324008c296dfc7fbc4ee426ba5b3c1035e90170e46720547a9e3f2cf381ab5e0294185ee1a814d31ffbe6ecf546f229d6 SHA512 217392000ca2d0266137f937fc4d2a1b81ed19217fdbf6550b07453eede8b9a6e15c8fbb1c94f559a7f44ac73dfadcefeae815c186e56bb1e9a30120fe070f3a
diff --git a/dev-python/notebook/notebook-6.1.3.ebuild b/dev-python/notebook/notebook-6.1.3.ebuild
deleted file mode 100644
index b38026e52da7..000000000000
--- a/dev-python/notebook/notebook-6.1.3.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 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} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Jupyter Interactive Notebook"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="
-	>=dev-libs/mathjax-2.4
-	dev-python/argon2-cffi[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
-	>=www-servers/tornado-5.0[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-4.6.1[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-5.3.4[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	>=dev-python/nbconvert-4.2.0[${PYTHON_USEDEP}]
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	dev-python/send2trash[${PYTHON_USEDEP}]
-	dev-python/prometheus_client[${PYTHON_USEDEP}]"
-
-# sphinx 2+ seems to have a problem with its github plugin. temporarily adding
-# a version constraint.
-BDEPEND="
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/nose_warnings_filters[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
-	)
-	"
-
-PATCHES=(
-	"${FILESDIR}/${PN}"-5.7.0-no-mathjax.patch
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# disable bundled mathjax
-	sed -i 's/^.*MathJax.*$//' bower.json || die
-
-	# require geckodriver
-	rm -r notebook/tests/selenium || die
-	# trash doesn't seem to work for us
-	sed -e 's:test_delete:_&:' \
-		-i notebook/services/contents/tests/test_manager.py || die
-	sed -e 's:test_checkpoints_follow_file:_&:' \
-		-e 's:test_delete:_&:' \
-		-i notebook/services/contents/tests/test_contents_api.py || die
-	# network-sandbox?
-	sed -e 's:test_connections:_&:' \
-		-e 's:test_culling:_&:' \
-		-i notebook/services/kernels/tests/test_kernels_api.py || die
-
-	sed -i -e "/'bdist_egg':/d" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	distutils_install_for_testing
-	local -x PATH=${TEST_DIR}/scripts:${PATH}
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	ln -sf \
-		"${EPREFIX}/usr/share/mathjax" \
-		"${D}$(python_get_sitedir)/notebook/static/components/MathJax" || die
-}
-
-pkg_preinst() {
-	# remove old mathjax folder if present
-	rm -rf "${EROOT}"/usr/lib*/python*/site-packages/notebook/static/components/MathJax || die
-}
diff --git a/dev-python/notebook/notebook-6.1.5.ebuild b/dev-python/notebook/notebook-6.1.5.ebuild
deleted file mode 100644
index b38026e52da7..000000000000
--- a/dev-python/notebook/notebook-6.1.5.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 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} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Jupyter Interactive Notebook"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="
-	>=dev-libs/mathjax-2.4
-	dev-python/argon2-cffi[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
-	>=www-servers/tornado-5.0[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-4.6.1[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-5.3.4[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	>=dev-python/nbconvert-4.2.0[${PYTHON_USEDEP}]
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	dev-python/send2trash[${PYTHON_USEDEP}]
-	dev-python/prometheus_client[${PYTHON_USEDEP}]"
-
-# sphinx 2+ seems to have a problem with its github plugin. temporarily adding
-# a version constraint.
-BDEPEND="
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/nose_warnings_filters[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
-	)
-	"
-
-PATCHES=(
-	"${FILESDIR}/${PN}"-5.7.0-no-mathjax.patch
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# disable bundled mathjax
-	sed -i 's/^.*MathJax.*$//' bower.json || die
-
-	# require geckodriver
-	rm -r notebook/tests/selenium || die
-	# trash doesn't seem to work for us
-	sed -e 's:test_delete:_&:' \
-		-i notebook/services/contents/tests/test_manager.py || die
-	sed -e 's:test_checkpoints_follow_file:_&:' \
-		-e 's:test_delete:_&:' \
-		-i notebook/services/contents/tests/test_contents_api.py || die
-	# network-sandbox?
-	sed -e 's:test_connections:_&:' \
-		-e 's:test_culling:_&:' \
-		-i notebook/services/kernels/tests/test_kernels_api.py || die
-
-	sed -i -e "/'bdist_egg':/d" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	distutils_install_for_testing
-	local -x PATH=${TEST_DIR}/scripts:${PATH}
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	ln -sf \
-		"${EPREFIX}/usr/share/mathjax" \
-		"${D}$(python_get_sitedir)/notebook/static/components/MathJax" || die
-}
-
-pkg_preinst() {
-	# remove old mathjax folder if present
-	rm -rf "${EROOT}"/usr/lib*/python*/site-packages/notebook/static/components/MathJax || die
-}
diff --git a/dev-python/notebook/notebook-6.1.6.ebuild b/dev-python/notebook/notebook-6.1.6.ebuild
index 6b7ed50abe1b..e402f7efcfb7 100644
--- a/dev-python/notebook/notebook-6.1.6.ebuild
+++ b/dev-python/notebook/notebook-6.1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	>=dev-libs/mathjax-2.4
diff --git a/dev-python/pendulum/pendulum-2.1.2-r1.ebuild b/dev-python/pendulum/pendulum-2.1.2-r1.ebuild
index 5b12cfc14d9b..490bf4d2f72f 100644
--- a/dev-python/pendulum/pendulum-2.1.2-r1.ebuild
+++ b/dev-python/pendulum/pendulum-2.1.2-r1.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~x86"
 
 # Requires timezone information which is not installed by default
 # with dev-python/pytzdata, and otherwise approx. 50 out of 1600
-# tests are failing for now. Keeping the test dependencies 
+# tests are failing for now. Keeping the test dependencies
 # commented for future tests fixups
 RESTRICT="test"
 
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index a90ccb3d7790..2ad12cb43f55 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -2,3 +2,4 @@ DIST pikepdf-1.18.0.tar.gz 2351789 BLAKE2B b33b69f57fcd5293814ac880376627b7184ca
 DIST pikepdf-2.2.0.tar.gz 2363761 BLAKE2B d1a8873a2c41e280dc2880609424742f4454ee226ee30469df067ddf0f5ee98ba6ef2965df75e95c2576e3813bdea7cb6bebfc7a1a7d05696b9da8ec67ef981a SHA512 e80874ece09ce6381079f705ab031b121917485d0968578aeb07a83b70a14bb46d549498357acc4df62b51c33fd75a87f65b74ef64464dcaebba3ff84aaa1843
 DIST pikepdf-2.3.0.tar.gz 2366792 BLAKE2B 3e5d2f460702bbce8ddc22abfb67867b40f75bb59cd30966db9865c96240ef9ad990f295abcd8f5f325a9954500e587afab647da7de3909960859fa3825c4526 SHA512 056bd2e73a7915b42ea170061932e445fff614abd662d935c8735c5fb04fd95e196495bc11dcb3781270c966d94cb93cd972500e6ea4d3ea7333456be3b7dbb6
 DIST pikepdf-2.4.0.tar.gz 2367657 BLAKE2B c6b126f45baef8d3d4bea40851650f6ee2196e60618f490952f74491744b6536a01040de685c5114ec5aad2e8923092498594ae28b9e9f14f2da579816a198e0 SHA512 42af99ed5446171449d46d4dabf444623ce22b81819bbef992735e67a58ed82e343b46779f323b96b35e076014464e50ac0e4f5fd3553482c750488e091b6fd5
+DIST pikepdf-2.5.0.tar.gz 2368422 BLAKE2B c30fcd69dd5297b04c0b116355f14a8513ce0a0b8797f3d85672957302275bdb04b382a373d07d40ef3480dc395e51a899eda8e919a74070083fec0209dfaa3c SHA512 0c685985b17388a8d355486a5dc2ee5f4d855f1247977d96dd249744cea347f575770250b1a952fda7821a3f4c830d5e079e15642bc669b70f69f4f2c5bf4dae
diff --git a/dev-python/pikepdf/pikepdf-2.5.0.ebuild b/dev-python/pikepdf/pikepdf-2.5.0.ebuild
new file mode 100644
index 000000000000..6a19c07407cb
--- /dev/null
+++ b/dev-python/pikepdf/pikepdf-2.5.0.ebuild
@@ -0,0 +1,47 @@
+# 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 library to work with pdf files based on qpdf"
+HOMEPAGE="https://pypi.org/project/pikepdf/ https://github.com/pikepdf/pikepdf"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="app-text/qpdf:0="
+RDEPEND="${DEPEND}
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]"
+BDEPEND="
+	>=dev-python/pybind11-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-4.1[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-5[${PYTHON_USEDEP}]
+		>=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff]
+		>=dev-python/psutil-5[${PYTHON_USEDEP}]
+		>=dev-python/pytest-6[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
+		>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
+	)"
+
+#distutils_enable_sphinx docs \
+#	dev-python/ipython \
+#	dev-python/matplotlib \
+#	dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/wheel/d' setup.py || die
+	sed -i -e '/-n auto/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pybind11/Manifest b/dev-python/pybind11/Manifest
index 69ce5d98f5cc..85838cd0efd5 100644
--- a/dev-python/pybind11/Manifest
+++ b/dev-python/pybind11/Manifest
@@ -1,3 +1,4 @@
 DIST pybind11-2.5.0.tar.gz 573769 BLAKE2B e46d99f873f8266efc577d3e0ab1e8a78784a45c35995bc3486501d627698e0fb10205008e8cb82c84e971f20cd02a6d2f08390f3a3041fff1a21c45f11b197f SHA512 7f3a9c71916749436898d1844ef6b112baf0817a386308b5df8dec2a912ef4b6a932b94965e98f227c49fa77312f131972a6039f23b84a3daf6442a8ab0be7c2
 DIST pybind11-2.6.0.tar.gz 631925 BLAKE2B 6b7872182f52e035f2a86f0f2ad70b084e62fc20d5aae4903c13ff824f80f3815845f3206d740d17ae471fd979eca117d9d4ee011f9f96c319ca808e6304b07f SHA512 6a3f407c136d827243c0043c794c654ca267a1a4e3b7e0e45cc7629e29193156b0744d85e45222fab284a9af82cf7fa2008fbd977d2b5a7b947c8a6581456caf
 DIST pybind11-2.6.1.tar.gz 634179 BLAKE2B 33f057e88e45985a0475783b8931ec669a16efcad5d66ecb265744155e9941b2d618391a36bff1d8c1c2d74a7e0b41de50b26eae689215d4585542fbd4282cc1 SHA512 8730efec82eef8dc09a58ca3e3b28fca45880cef85d32aa5524a8fe64e23d5f6dff4ca1b48b3034a287199bd56f4db4d6806c5358bef66fde84ed0fbf80ec264
+DIST pybind11-2.6.2.tar.gz 647954 BLAKE2B e336d626d314538123a121d48998b15d9d16b80a6a513e85b4ef2b3179f73732ef23b85ab91d815f15c31f7e2c5091192e90b9ff8e727725882963a895367612 SHA512 1eb346ff6b8f827053265340925e2c8038b1e2a89c352fc09f15ebe86128e7ba1f48c4368b193941f034b30bee7f72a94343e05d4841fdbbd0e4d91ed3d32025
diff --git a/dev-python/pybind11/pybind11-2.6.2.ebuild b/dev-python/pybind11/pybind11-2.6.2.ebuild
new file mode 100644
index 000000000000..74b9ddbcec13
--- /dev/null
+++ b/dev-python/pybind11/pybind11-2.6.2.ebuild
@@ -0,0 +1,59 @@
+# 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} )
+
+inherit cmake distutils-r1
+
+DESCRIPTION="AST-based Python refactoring library"
+HOMEPAGE="https://pybind11.readthedocs.io/en/stable/"
+SRC_URI="https://github.com/pybind/pybind11/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+RDEPEND="
+	dev-cpp/eigen:3
+"
+
+distutils_enable_sphinx docs \
+	'<dev-python/sphinx-3' \
+	dev-python/breathe \
+	dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	export PYBIND11_USE_CMAKE=1
+
+	cmake_src_prepare
+	distutils-r1_python_prepare_all
+}
+
+python_configure() {
+	local mycmakeargs=(
+		# disable forced lto
+		-DPYBIND11_LTO_CXX_FLAGS=
+		-DPYBIND11_INSTALL=ON
+		-DPYBIND11_TEST=$(usex test)
+	)
+	cmake_src_configure
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	# Compilation only does anything for tests
+	use test && cmake_src_compile
+}
+
+python_test() {
+	cmake_build check
+}
+
+python_install() {
+	distutils-r1_python_install
+	cmake_src_install
+}
diff --git a/dev-python/pycryptodome/pycryptodome-3.9.9-r1.ebuild b/dev-python/pycryptodome/pycryptodome-3.9.9-r1.ebuild
index ae3b7464ece4..a5de744863b8 100644
--- a/dev-python/pycryptodome/pycryptodome-3.9.9-r1.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.9.9-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="BSD-2 Unlicense"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/pygame/pygame-2.0.1.ebuild b/dev-python/pygame/pygame-2.0.1.ebuild
index 268c1b775bb0..26eca5dd3021 100644
--- a/dev-python/pygame/pygame-2.0.1.ebuild
+++ b/dev-python/pygame/pygame-2.0.1.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc examples midi opengl test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/rebulk/Manifest b/dev-python/rebulk/Manifest
index 3f40831c0651..84de9254d1dc 100644
--- a/dev-python/rebulk/Manifest
+++ b/dev-python/rebulk/Manifest
@@ -1,3 +1 @@
-DIST rebulk-2.0.1.tar.gz 258115 BLAKE2B d19210911cf89cb7c371819e384da95c2159eb92abf9f027cbdf1803a18054c556e73364ae10c5bb0b5007cbdb2156b2118d22d6e278b6a02055bacbcbdbc322 SHA512 7d453b7ba952994dec3258aa95a3f6090e6f8afb5a674c1b5e54e036f41022b887d3d65d21f2023ae6e2596cce3baf52d33fc23708498a4f0aef26d3594c8289
-DIST rebulk-3.0.0.gh.tar.gz 252364 BLAKE2B 669f25fa4cf25d4de426552eafd1f3463c05e42eb6f587b8c15d0d319c9c81e515d8461c5c412bd89a483d619374af0a93849deb0ccb3af9ccd7617ebd908504 SHA512 eb474b8b8509f291938bc3c96ef591b8233a41b9eb28f7957f3d20e098140ac6d80a1337c6ff1c89eeea4c34f94eb37af811d2200a8f2a574fc93b8fa1ea3c5d
 DIST rebulk-3.0.1.gh.tar.gz 252585 BLAKE2B ff10847d9743972c65a6a5ae3efe77acf0364770c2998401ac08d22a829bc25caf1e0c2a7decd0c2546d2bceb05b094cbd9d9cfcc7127d433b8c30fd6084c5bb SHA512 21d022bb564a416885139aa673b3fc8b762817df12d8868a2a0e8d99cc813b781d04bad4372e5ac0dbbe6239d879c506639dd87c89f92faf078ff306239d6b6d
diff --git a/dev-python/rebulk/rebulk-2.0.1.ebuild b/dev-python/rebulk/rebulk-2.0.1.ebuild
deleted file mode 100644
index e2532983ce5e..000000000000
--- a/dev-python/rebulk/rebulk-2.0.1.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} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library that performs advanced searches in strings"
-HOMEPAGE="https://github.com/Toilal/rebulk https://pypi.org/project/rebulk/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Remove base64-encoded zip archive with pytest.
-	rm runtests.py || die
-
-	# Disable unconditional dependency on dev-python/pytest-runner.
-	sed -i -e "s|'pytest-runner'||g" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/rebulk/rebulk-3.0.0.ebuild b/dev-python/rebulk/rebulk-3.0.0.ebuild
deleted file mode 100644
index 0da0b17a9a3e..000000000000
--- a/dev-python/rebulk/rebulk-3.0.0.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} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library that performs advanced searches in strings"
-HOMEPAGE="https://github.com/Toilal/rebulk https://pypi.org/project/rebulk/"
-SRC_URI="
-	https://github.com/Toilal/rebulk/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Remove base64-encoded zip archive with pytest.
-	rm runtests.py || die
-
-	# Disable unconditional dependency on dev-python/pytest-runner.
-	sed -i -e "s|'pytest-runner'||g" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/rebulk/rebulk-3.0.1.ebuild b/dev-python/rebulk/rebulk-3.0.1.ebuild
index 0da0b17a9a3e..306264786865 100644
--- a/dev-python/rebulk/rebulk-3.0.1.ebuild
+++ b/dev-python/rebulk/rebulk-3.0.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
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="MIT Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/theano-pymc/theano-pymc-1.1.2.ebuild b/dev-python/theano-pymc/theano-pymc-1.1.2.ebuild
index 820118d4f297..842521a48460 100644
--- a/dev-python/theano-pymc/theano-pymc-1.1.2.ebuild
+++ b/dev-python/theano-pymc/theano-pymc-1.1.2.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 
 RDEPEND="
 	dev-python/filelock[${PYTHON_USEDEP}]
diff --git a/dev-python/whatever/whatever-0.6.ebuild b/dev-python/whatever/whatever-0.6.ebuild
index b903234d391e..2b7852ea0140 100644
--- a/dev-python/whatever/whatever-0.6.ebuild
+++ b/dev-python/whatever/whatever-0.6.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=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/xvfbwrapper/xvfbwrapper-0.2.9.ebuild b/dev-python/xvfbwrapper/xvfbwrapper-0.2.9.ebuild
index 00dac3e3e1ed..892fcb09d7c4 100644
--- a/dev-python/xvfbwrapper/xvfbwrapper-0.2.9.ebuild
+++ b/dev-python/xvfbwrapper/xvfbwrapper-0.2.9.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 
 inherit distutils-r1