Adding metadata

20 files changed, 173 insertions, 64 deletions

diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index fc1ff0242a8e..52c2f76a1b93 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -2,4 +2,5 @@ DIST boto3-1.20.14.tar.gz 449126 BLAKE2B b2ef8a101aaecb5d65a60fcbf7f83e899461810
 DIST boto3-1.20.23.tar.gz 456315 BLAKE2B 9f74a1822c631fdcc666db1d2cda5ab464b150ca01cfad807542a5db548910fda971cfb5b5d92bfa2be90680759cb4b9b368b44485228df99364c17b01150f6a SHA512 1cbbdac34f8174b153546f4b6a43f1317fbcb4556e058759c59f4aea23e8517f23d63dc581be776469f49c7e82378ac0a2657b211df70b29bbb94839e263005e
 DIST boto3-1.20.24.tar.gz 456338 BLAKE2B 4192f20a7a5c247a72b381506697034d744fd62c60d06402759942c3dc1ef0c136ea7b85ab80920831f876e098af549bcdff688ff287a0350ed00ed88aaf0adf SHA512 96a2d6dabaca0aa0d85efcbc2f98f8e41b568e2190352c00101c3df85623867036f64ad9935681ad2a104abd9f6aa9e79de8f7136a846e256185d065afed23a1
 DIST boto3-1.20.25.tar.gz 457371 BLAKE2B f1e6ab3add86f0ba25b22d92f58580e4ab86affdfb5c3b6f9a53938a2a647d0fc8cd23975cd60b909e5db339d442820e557497e232bda836ac9f2028b376afcf SHA512 2693134800ad3313785922c654296ca04a5b561e135fc60a45784e8190cdeb1dd525e6a81f314fda9f14f9dfddd5ffd8bde9af2d2be50b61921b9ec1248fee07
+DIST boto3-1.20.26.tar.gz 458382 BLAKE2B a2123120c07bc8e53004f6c76f6631f3363d5d8e58057a08d2edf914d3a7ea1d2d6a771529abf7031604ac1c366a5b8ee4934e6d34d27eb3dd0716bc16cd6d22 SHA512 5ad18954f8347f240031c2dfab2664bf760b334b12ae90f1d2613f53194843f500164e645445d17fd4e7e7061beb3e2fe34a5a2651a92fdef5efecb18324cd36
 DIST boto3-1.20.5.tar.gz 439166 BLAKE2B c140e15e497e6cdf6b4b77bb99e0a0f5ac01d5b5793f8bfb210b52bbc09e39e6fe06a957951375e0795210dc1c3b2a0afd2f498bc88e449d9e6846f2b357f016 SHA512 2823466e4851684253d4ce42a8c34e5cbdad6d04c823040fe2cebdf0cffb14d5d3f40e28d57ebec14533fab04ba74f27c25f078ddb8791b8f52d0424e11b39fc
diff --git a/dev-python/boto3/boto3-1.20.26.ebuild b/dev-python/boto3/boto3-1.20.26.ebuild
new file mode 100644
index 000000000000..397ed3e7a797
--- /dev/null
+++ b/dev-python/boto3/boto3-1.20.26.ebuild
@@ -0,0 +1,59 @@
+# 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="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 ~ppc ~ppc64 ~riscv ~sparc ~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 pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 583370d9dc59..e332781135d1 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -2,4 +2,5 @@ DIST botocore-1.23.14.tar.gz 8486875 BLAKE2B 93a3fd40b26d026dcee10172e560b4d59cd
 DIST botocore-1.23.23.tar.gz 8679727 BLAKE2B 89e54120caec616ffb539ef9df93923d9514ad29ba2430d36dbfa5392325be181d9c8c132983d062f120ce0629a411f3136e55fec5fa2c3e7299a9551652448d SHA512 a4e14b680fd71a6c5ec499ed9c75f55a51cffa1f6ea569e3a3d231646f90e4729a7fbacf9b6a0ee5ab0b5321b8078970a0db2a74087500991a65d164091b2ab2
 DIST botocore-1.23.24.tar.gz 8677151 BLAKE2B c12382994208f673cfcfa71e17fed028abfd299595734af7f604612fc6f1fc45dd67a1de17d36accf831d296a5eafedb75b6249e219fb3de75a6a4dbb6e41d59 SHA512 a03b64236c61fcfc7111d8218fa5cb6a305522c20f8eee28dc83983560cfd5a32c9bf5933e6005b49f188b7b673614389a9b79fd5f81701acb09b0816e5bac54
 DIST botocore-1.23.25.tar.gz 8685879 BLAKE2B 6eff15d35c66ded69a07ee0a276efe1e42dac9a3924a1d9735cf55ad89307a6a695e2ab6ee092e6454d1b6d682d329afdcf40644a8a6b89099dab1d53543adda SHA512 f09cb0564e0208816b05ec827d534bf866d4de827466ce53d91bcf21b08060934c937e38f756d02735412bc965bb831283f0c44a4c957af4271ba754215a6545
+DIST botocore-1.23.26.tar.gz 8688841 BLAKE2B eec8481bef3096d7173281138e072364fb2eebf0d22e7ef7edcd1fc7878b3c9888279f8bc063d57deb0e8410bd77da43a243c0fe57f3b34d3ddeabe1134a8d9a SHA512 050e0e63506b1d3161811c570c81e5d574f8f96ea000729453650fd3c5df9422d8a23959256f0867a17cfe4db426fb79b2f47e5875eb0c3574e6c6fa8d061e6c
 DIST botocore-1.23.5.tar.gz 8374467 BLAKE2B 467092e7d8aa5ccb756132669049865445a47205913964c1c944b20caaf100b1efdd1bf3af9c5416ff079b487e6d4d08ffe6208e2b352d09655cc5be21c88739 SHA512 6afca19b724f9019f21e5993ce970d605b95d31c1a4e969ec1b4080510a5a120b3fa0cfd5ade973a9203bd6b7983a3dbca2f7a03108a9167392efd60d5e2fe9b
diff --git a/dev-python/botocore/botocore-1.23.26.ebuild b/dev-python/botocore/botocore-1.23.26.ebuild
new file mode 100644
index 000000000000..62c8c402ae39
--- /dev/null
+++ b/dev-python/botocore/botocore-1.23.26.ebuild
@@ -0,0 +1,65 @@
+# 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="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 ~ppc ~ppc64 ~riscv ~sparc ~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/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 pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	distutils_install_for_testing --via-venv
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/httpx/httpx-0.21.1.ebuild b/dev-python/httpx/httpx-0.21.1.ebuild
index ba3ebf6d3e5c..0bd2daaa7c61 100644
--- a/dev-python/httpx/httpx-0.21.1.ebuild
+++ b/dev-python/httpx/httpx-0.21.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="cli"
 
 RDEPEND="
diff --git a/dev-python/identify/Manifest b/dev-python/identify/Manifest
index 2b80ccb03a9b..b70620a2532e 100644
--- a/dev-python/identify/Manifest
+++ b/dev-python/identify/Manifest
@@ -1,2 +1 @@
-DIST identify-2.3.7.tar.gz 101296 BLAKE2B 0facbd03d84c453e63133741fd688e195785a2ac79ee728bbe3a3e42e4d53a7d17cc935f7fdade37ac0329a52db4bd514be917c82a45bbe0c88f1999d0a248b6 SHA512 00ba94ac2b5d762b500a51a9de6ac6ee863235b5d928776d033317fe7b250360465b7fa011ce04a4f2c63d1e27b1b1b687f5e4e8b3c426ede71ebae91c172863
 DIST identify-2.4.0.tar.gz 101312 BLAKE2B 1ba4fcf235518427fba8a59eb30ceb0c20ed23f5a3c4f56d6039ab530aaaba6b83ee395626a7d086f193f57f00a8d34a659883d897a21dc0fae5018cb0a4e87a SHA512 f0806d3785ef5db9cb1b5354c146fc0d33b4a4f04b3ff899945e9e93273a0bf8e4c8ff07ace22b5d71721c953148c007630dc400b82849321e8399ecdfffbc85
diff --git a/dev-python/identify/identify-2.3.7.ebuild b/dev-python/identify/identify-2.3.7.ebuild
deleted file mode 100644
index 7f2fd6e35ed8..000000000000
--- a/dev-python/identify/identify-2.3.7.ebuild
+++ /dev/null
@@ -1,19 +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="File identification library for Python"
-HOMEPAGE="https://github.com/pre-commit/identify"
-SRC_URI="https://github.com/pre-commit/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~riscv x86"
-
-RDEPEND="dev-python/editdistance-s[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/identify/identify-2.4.0.ebuild b/dev-python/identify/identify-2.4.0.ebuild
index e9b550d2dfd0..122796602fa7 100644
--- a/dev-python/identify/identify-2.4.0.ebuild
+++ b/dev-python/identify/identify-2.4.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pre-commit/${PN}/archive/refs/tags/v${PV}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/ukkonen[${PYTHON_USEDEP}]"
diff --git a/dev-python/jc/Manifest b/dev-python/jc/Manifest
index eea86bc5b2aa..1b84e0209f9a 100644
--- a/dev-python/jc/Manifest
+++ b/dev-python/jc/Manifest
@@ -1,3 +1,4 @@
 DIST jc-1.16.0.tar.gz 2532019 BLAKE2B 583d52102a2e27a53171d300fb6e9ac094d5b09496193b359590322cab0f63582d14e0d27aacdd4f87e179cff1b0ffe0efc5bfc1982e64a7d053cf6210c2ed2a SHA512 a75c411d3f961061262b577e7a6611759f01df508e7d12e09cb364736dca343a098f9cbe4b2552ab2bd56fed925e7c11ba1f954808a11453380ba0ba0c32130b
 DIST jc-1.17.3.tar.gz 3814789 BLAKE2B 09134b85c881b2701d7db68f0a16eb6f696aeb5e4fa8b6a0b1aff148adbad302fcc9019944acc45b5830966f0ffae90ff4c006895d559ca47595347442e72a5c SHA512 6cc36abcb9d57eb95b36968647a0923f3d6d39aed478df83e9d4437b0ea4aba49a5f08d9f61ba88f3a76ce3b57c2e019e7cec5b89e71ce7be8186e9e18ab4ad7
 DIST jc-1.17.4.tar.gz 3818285 BLAKE2B 0761e923916c61125967451f3b4806e3080184106c84e2c85f5de8b37d03106bde98d1b4d99f4d00308b7d935898e81cd5c7d112ed611dd4707074019becc968 SHA512 b5fc437be425d60c5e859ed9107be8a3190bc5e1eb157b01cd3b4cdcf27ccab51b6d0299f0c462b1e595d741bf905c11b25d49568159f04aa4443f51889027b6
+DIST jc-1.17.5.tar.gz 3851890 BLAKE2B 86b6c1b9786bbe30138cb7ba5171fd14682b420c3ff11716ab5d1bd4e4cc3d95067ca836c6217040799607933037b3cd6dc49e6395831140c10906e8be530685 SHA512 6e7207af158be41cf55ac7f9400c1a676075e85de0fecd63d9ddcffeed5d903a9619ac52b955d10e0db354f97e73fb9766b96e51c5648104907426000ecd1594
diff --git a/dev-python/jc/jc-1.17.5.ebuild b/dev-python/jc/jc-1.17.5.ebuild
new file mode 100644
index 000000000000..091f58eee777
--- /dev/null
+++ b/dev-python/jc/jc-1.17.5.ebuild
@@ -0,0 +1,25 @@
+# Copyright 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="Converts the output of popular command-line tools and file-types to JSON"
+HOMEPAGE="https://github.com/kellyjonbrazil/jc"
+SRC_URI="
+	https://github.com/kellyjonbrazil/jc/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
diff --git a/dev-python/matplotlib/matplotlib-3.5.1.ebuild b/dev-python/matplotlib/matplotlib-3.5.1.ebuild
index 6ab1ce09d40c..7f378db69057 100644
--- a/dev-python/matplotlib/matplotlib-3.5.1.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.5.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 sparc ~x86"
 IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets"
 
 # internal copy of pycxx highly patched
diff --git a/dev-python/pyamg/Manifest b/dev-python/pyamg/Manifest
index d4fd0a1ff161..4fa01624f567 100644
--- a/dev-python/pyamg/Manifest
+++ b/dev-python/pyamg/Manifest
@@ -1,2 +1,2 @@
 DIST pyamg-4.1.0.tar.gz 749906 BLAKE2B 31c05d64317b32cbdbd616e982557f0a94bc17b2fce3d982fe93e629d56ad526516603032b3cba9785bf5ebed038481ae641f55a5a1ad621442dde08791981cb SHA512 311642cbbe8dca621cb58bebb1bb05b7dc7b2364713886df96937ba56575137bcb4fb7006a232d2c14380cd41f4337f6f09a8a9794e279a155f27287497d2b08
-DIST pyamg-4.2.0.gh.tar.gz 3900381 BLAKE2B df556553f74ebbc3b83d5a9479af25a54a4fd999edeadaeb0951893612abdb7c2aa79909f6eb4196322752ae87c5636e23c8c9b7dcdbb1f8d515651526e8aff4 SHA512 71e8e1937437888fec275e8522a30f9eb35cb79cc07d6da8032b653ed58e086285701ebb40dbe3b9fe82b53dc6e112e18cf62d42b18233326639417cf808b7c1
+DIST pyamg-4.2.1.gh.tar.gz 3900395 BLAKE2B ad4427eb297f044b4782274ce55799bd9da4abec108267c4c0aaedab38e2fb4d89c4c365eca90e4045c411254640ead667fa0e511d9597ff00081c0ebacde9b2 SHA512 933f5f1da808cb02ff5fa91df54a48a971bb3b017582f5a829cf71c94f698469476b9f0306962140dc38f7265266c9b53f98dc7aaa99945b45bfa83003d26df9
diff --git a/dev-python/pyamg/pyamg-4.2.0.ebuild b/dev-python/pyamg/pyamg-4.2.1.ebuild
index 3154074d4795..19eec055809e 100644
--- a/dev-python/pyamg/pyamg-4.2.0.ebuild
+++ b/dev-python/pyamg/pyamg-4.2.1.ebuild
@@ -20,15 +20,19 @@ KEYWORDS="~amd64 ~x86"
 RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/scipy[${PYTHON_USEDEP}]"
-# cannot be enabled by "distutils_enable_tests pytest"
 BDEPEND="
 	dev-python/pybind11[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
 	test? (
 		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
 	)"
 
-distutils_enable_tests setup.py
+distutils_enable_tests pytest
 
 export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	cp -r -l -n pyamg "${BUILD_DIR}/lib" || die
+	cd "${BUILD_DIR}/lib" || die
+	epytest
+}
diff --git a/dev-python/rich/rich-10.16.1.ebuild b/dev-python/rich/rich-10.16.1.ebuild
index e1227a01a7ca..785700016a82 100644
--- a/dev-python/rich/rich-10.16.1.ebuild
+++ b/dev-python/rich/rich-10.16.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/willmcgugan/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	dev-python/colorama[${PYTHON_USEDEP}]
diff --git a/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1-r4.ebuild b/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1-r4.ebuild
index 47e645e9ac30..7684bd309804 100644
--- a/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1-r4.ebuild
+++ b/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/Changaco/setuptools_scm_git_archive/archive/${PV}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/sphinx-jinja/sphinx-jinja-1.2.1.ebuild b/dev-python/sphinx-jinja/sphinx-jinja-1.2.1-r1.ebuild
index 15e77f51fdcf..a32c92bb89ae 100644
--- a/dev-python/sphinx-jinja/sphinx-jinja-1.2.1.ebuild
+++ b/dev-python/sphinx-jinja/sphinx-jinja-1.2.1-r1.ebuild
@@ -21,3 +21,9 @@ KEYWORDS="~amd64"
 RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
 
 distutils_enable_tests pytest
+
+python_install() {
+	# Avoid namespace collision: bug #829747
+	rm "${BUILD_DIR}"/lib/sphinxcontrib/__init__.py || die
+	distutils-r1_python_install
+}
diff --git a/dev-python/sphinx_rtd_theme/Manifest b/dev-python/sphinx_rtd_theme/Manifest
index 37d58481f12a..36c2ba7770a6 100644
--- a/dev-python/sphinx_rtd_theme/Manifest
+++ b/dev-python/sphinx_rtd_theme/Manifest
@@ -1,2 +1 @@
-DIST sphinx_rtd_theme-0.5.2.tar.gz 7606638 BLAKE2B c104121b36c89f4d2b7c2fc12433ffd1a7cba9b9d532358dafd53061b2ca9ead4bb93b7b596394c244a9da51c0b9299f2fe0ec8d4ca102015b6c7dfb92081813 SHA512 dd46bfeb05b433970d8130c06cad6dfa9dbc4e9db2d9a8190b80232d75b4d0a86590c17d64b9b1dcd2cb1d042033f4d2c2ce2e5cac0239c6b86899628b94b274
 DIST sphinx_rtd_theme-1.0.0.tar.gz 2780623 BLAKE2B 02e72ddade0632423d21e512ab86fbdcc9f18eddbef328ba766f1b06a49c838808af4ee000e57c8f0f40112569b35c1b62c9c0c8853c237fd2ddb6de76d48a21 SHA512 06025445e1358c994bf0c15a382ec8f8f3f2114dfac19f340585a3660d91a279100c2d16ef665d9eb8d38b0e4ed264e96d3ac6814dd01b9430d2f8a0d8275178
diff --git a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.5.2.ebuild b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.5.2.ebuild
deleted file mode 100644
index 884f1e86be42..000000000000
--- a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.5.2.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} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="ReadTheDocs.org theme for Sphinx"
-HOMEPAGE="https://github.com/readthedocs/sphinx_rtd_theme"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE=""
-
-PDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
-RDEPEND="<dev-python/docutils-0.17[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		${PDEPEND}
-		dev-python/readthedocs-sphinx-ext[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_configure() {
-	# CI=1 disables rebuilding webpack that requires npm use
-	# yes, that surely makes sense
-	export CI=1
-}
diff --git a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-1.0.0.ebuild b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-1.0.0.ebuild
index 7d76664c224a..c6bce27408f2 100644
--- a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-1.0.0.ebuild
+++ b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-1.0.0.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 hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE=""
 
 PDEPEND=">=dev-python/sphinx-1.6[${PYTHON_USEDEP}]"
diff --git a/dev-python/ukkonen/ukkonen-1.0.1.ebuild b/dev-python/ukkonen/ukkonen-1.0.1.ebuild
index 047e13bbcd56..6d4223fa83a9 100644
--- a/dev-python/ukkonen/ukkonen-1.0.1.ebuild
+++ b/dev-python/ukkonen/ukkonen-1.0.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '