Adding metadata

26 files changed, 107 insertions, 241 deletions

diff --git a/dev-python/GitPython/GitPython-3.1.24-r1.ebuild b/dev-python/GitPython/GitPython-3.1.24-r1.ebuild
index 175e722a3ef1..e28ff5b815ac 100644
--- a/dev-python/GitPython/GitPython-3.1.24-r1.ebuild
+++ b/dev-python/GitPython/GitPython-3.1.24-r1.ebuild
@@ -23,7 +23,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-vcs/git
diff --git a/dev-python/aioredis/aioredis-2.0.0.ebuild b/dev-python/aioredis/aioredis-2.0.0.ebuild
index c70e9a110a1d..b3ba1191573a 100644
--- a/dev-python/aioredis/aioredis-2.0.0.ebuild
+++ b/dev-python/aioredis/aioredis-2.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	dev-python/async_timeout[${PYTHON_USEDEP}]
diff --git a/dev-python/coverage/coverage-6.1.2.ebuild b/dev-python/coverage/coverage-6.1.2.ebuild
index 1b051f0babc3..51eaa011a63e 100644
--- a/dev-python/coverage/coverage-6.1.2.ebuild
+++ b/dev-python/coverage/coverage-6.1.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~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/fakeredis/Manifest b/dev-python/fakeredis/Manifest
index 5fc0952a2280..8e906a712b54 100644
--- a/dev-python/fakeredis/Manifest
+++ b/dev-python/fakeredis/Manifest
@@ -1,4 +1,2 @@
-DIST fakeredis-1.5.1.gh.tar.gz 67064 BLAKE2B 6eac029b7de6fb2c9b56a60655b6a224cdcba25fa86662a0423044ab97248984c4c6cfbaacbe4bbb2e3fc6826693791f232c6c55d7f15995d0e5bd00370a9ba8 SHA512 74a238573f9f911e9a39885b52d8c908d51d5620e346b8927c161111ce193566c315999f71d3edb1cb1326970985fd73d533b5483afe0c98ad76798a3c15e242
-DIST fakeredis-1.6.0.gh.tar.gz 70034 BLAKE2B 3e9526bf8a7bdafe2b471f0a9d488f0d654e93666863513444521eefd0ca31dbba7e589431b5dee64b27dbf9c2bcc05c1517f659942aa4491cae42b1d11f45b9 SHA512 7a3aefc161b2396e748b284152e088fc31a49a859259888cf8dcfd3a72045e84079977b0e8f11b571ab00d6c00fcf82dc28a1a50fa75633cf17215553bbd019b
 DIST fakeredis-1.6.1.gh.tar.gz 70171 BLAKE2B f10ac8aaec73871153ac7557a40984e6752b7e3720c1890380bda4aad828003403b6207c5e4f4ace18814e6ad33355acca08ff53cc33cb43acb5d9955ea6e5fc SHA512 1a8718d277d15a887901ed29691af83a2aea57605edf8cf2dbdc00c397a62ea8c1ed21440adadcda431a8ae8f33c85b549c5458a958b1fb74996e54ab612cd13
 DIST fakeredis-1.7.0.gh.tar.gz 71108 BLAKE2B 64b4c8aa2891ac6afd7789e5a8dce4d1a0ccd6a5083b410fd051d871d4ea9748e9d687eb27bbaeea646747f4bf170089d3ef711d6db0d6a88d8b7e755d165b6d SHA512 a8c67929e63196fea45b85097aaf6bf7402679510e471a8d13bdc0f7320e983107416d3e515fa85b1d6a6217fb82dbda7b4425c3c80ac54a1ac50eee875b0fbd
diff --git a/dev-python/fakeredis/fakeredis-1.5.1.ebuild b/dev-python/fakeredis/fakeredis-1.5.1.ebuild
deleted file mode 100644
index 327af242d52b..000000000000
--- a/dev-python/fakeredis/fakeredis-1.5.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Fake implementation of redis API for testing purposes"
-HOMEPAGE="
-	https://github.com/jamesls/fakeredis/
-	https://pypi.org/project/fakeredis/"
-SRC_URI="
-	https://github.com/jamesls/fakeredis/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND="
-	dev-python/redis-py[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/sortedcontainers[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local excludes=(
-		# tests for use with aioredis, not packaged in ::gentoo
-		--ignore test/test_aioredis.py
-		# tests requiring lupa (lua support)
-		-k 'not test_eval and not test_lua and not test_script'
-	)
-
-	epytest "${excludes[@]}"
-}
diff --git a/dev-python/fakeredis/fakeredis-1.6.0.ebuild b/dev-python/fakeredis/fakeredis-1.6.0.ebuild
deleted file mode 100644
index 0484e5f7c25b..000000000000
--- a/dev-python/fakeredis/fakeredis-1.6.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 2020-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 optfeature
-
-DESCRIPTION="Fake implementation of redis API for testing purposes"
-HOMEPAGE="
-	https://github.com/jamesls/fakeredis/
-	https://pypi.org/project/fakeredis/"
-SRC_URI="
-	https://github.com/jamesls/fakeredis/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/redis-py[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/sortedcontainers[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-db/redis
-		dev-python/aioredis[${PYTHON_USEDEP}]
-		dev-python/async_generator[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	test/test_aioredis2.py::test_blocking_unblock
-	test/test_aioredis2.py::test_pubsub
-	"test/test_aioredis2.py::test_repr[fake]"
-	test/test_hypothesis.py::TestJoint::test
-	test/test_hypothesis.py::TestFuzz::test
-)
-
-python_test() {
-	local args=(
-		# tests requiring lupa (lua support)
-		-k 'not test_eval and not test_lua and not test_script'
-	)
-	epytest "${args[@]}"
-}
-
-src_test() {
-	local redis_pid="${T}"/redis.pid
-	local redis_port=6379
-	local redis_test_config="
-		daemonize yes
-		pidfile ${redis_pid}
-		port ${redis_port}
-		bind 127.0.0.1
-	"
-
-	elog "Spawning Redis"
-	elog "NOTE: Port ${redis_port} must be free"
-	"${EPREFIX}"/usr/sbin/redis-server - <<< "${redis_test_config}" || die
-
-	# Run the tests
-	distutils-r1_src_test
-
-	# Clean up afterwards
-	kill "$(<"${redis_pid}")" || die
-}
-
-pkg_postinst() {
-	optfeature "Mock aioredis" dev-python/aioredis
-}
diff --git a/dev-python/fakeredis/fakeredis-1.6.1.ebuild b/dev-python/fakeredis/fakeredis-1.6.1.ebuild
index 7834c3cf7b64..e2e2c3a21642 100644
--- a/dev-python/fakeredis/fakeredis-1.6.1.ebuild
+++ b/dev-python/fakeredis/fakeredis-1.6.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	dev-python/redis-py[${PYTHON_USEDEP}]
diff --git a/dev-python/gitdb/gitdb-4.0.8.ebuild b/dev-python/gitdb/gitdb-4.0.8.ebuild
index 4bcbf70863a2..50ed90878bb6 100644
--- a/dev-python/gitdb/gitdb-4.0.8.ebuild
+++ b/dev-python/gitdb/gitdb-4.0.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/smmap-3.0.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index c5689f6d0f01..af5ebe5e966d 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -11,3 +11,4 @@ DIST hypothesis-python-6.28.1.tar.gz 9175083 BLAKE2B c5ecd2e62696a57643ca7043a90
 DIST hypothesis-python-6.29.0.tar.gz 9175657 BLAKE2B 0e558e6562f6ed258384209bf5a8268b65bb6caaa590b87dce8b609030c6f25f520e094a269d08bfa39dc97411f75f0465508b176c785c7009b48eb2c864f9cb SHA512 dc54d541dc4d3b2d67adc553f0482bcd41d4102ee1b297d7a45bf8098af147c8ef12816ab13e105f990994dfe8ee23572a71e43e4b80ae8d04e7a6950f413651
 DIST hypothesis-python-6.29.1.tar.gz 9175987 BLAKE2B c12691eb1ff9221ba03799f6848d3c17ec7915f34881fcd7c809dbf5041b2ec203d1189ca425215fa06a3500df622797fe38e77dbca29c10cc707e3c9c96d664 SHA512 b9d05838711a587594ca767e3d9226b69b9deedb2e586719ea6f5a2b8acfc70ae48fcea184b5418a1072d089d3b14eb0b99b2b257515e47f175770a8e10f9f28
 DIST hypothesis-python-6.29.3.tar.gz 9176581 BLAKE2B d013c6dd2ddb8dfddf7f856c9358157ff4fa22aa19d40c4057952a2e136e8618cfd2bf8c80f0d606147b91efaed03c710cc2a993f9b8658e25669691e3df22f3 SHA512 4226683702b8be568073167ec6e5681a4ea2416c9e2baebb04bc549164e88c3e0d14d8ea525c64d571c8dc1446626f93809bc75b2a1c3f4c50ece97ee791446f
+DIST hypothesis-python-6.30.0.tar.gz 9180275 BLAKE2B f65ff5477054d37f7f7cdc463811dbf94d2a3adc7399cc9015b0088185c31027463e994ecdc6d2274141fb44cc75beca3e783c40b764bddc7430ca0cabcdd545 SHA512 23137db516b04b59f1dfe187998424ce326f82780047b1ebd189a552263beb221d8af0cf43f82656766903f4b2999205f013e6c9ae12ea48114af7c0ca7ade37
diff --git a/dev-python/hypothesis/hypothesis-6.30.0.ebuild b/dev-python/hypothesis/hypothesis-6.30.0.ebuild
new file mode 100644
index 000000000000..8b48444a4699
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.30.0.ebuild
@@ -0,0 +1,62 @@
+# 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 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
+SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' python3_{7..9})
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+distutils_enable_tests --install pytest
+
+python_prepare() {
+	if ! use cli || ! has "${EPYTHON}" python3.{7..9}; then
+		sed -i -e '/console_scripts/d' setup.py || die
+	fi
+}
+
+python_test() {
+	distutils_install_for_testing
+	epytest tests/cover tests/pytest tests/quality \
+		-p no:pytest-describe \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/identify/identify-2.4.0.ebuild b/dev-python/identify/identify-2.4.0.ebuild
index 41622b55ca7c..85ab72285f4c 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 ~ppc ~ppc64 ~riscv"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	dev-python/ukkonen[${PYTHON_USEDEP}]"
diff --git a/dev-python/jc/Manifest b/dev-python/jc/Manifest
index 986eb7a3c4a9..599b6e54fd81 100644
--- a/dev-python/jc/Manifest
+++ b/dev-python/jc/Manifest
@@ -1 +1,2 @@
 DIST jc-1.16.0.tar.gz 2532019 BLAKE2B 583d52102a2e27a53171d300fb6e9ac094d5b09496193b359590322cab0f63582d14e0d27aacdd4f87e179cff1b0ffe0efc5bfc1982e64a7d053cf6210c2ed2a SHA512 a75c411d3f961061262b577e7a6611759f01df508e7d12e09cb364736dca343a098f9cbe4b2552ab2bd56fed925e7c11ba1f954808a11453380ba0ba0c32130b
+DIST jc-1.17.3.tar.gz 3814789 BLAKE2B 09134b85c881b2701d7db68f0a16eb6f696aeb5e4fa8b6a0b1aff148adbad302fcc9019944acc45b5830966f0ffae90ff4c006895d559ca47595347442e72a5c SHA512 6cc36abcb9d57eb95b36968647a0923f3d6d39aed478df83e9d4437b0ea4aba49a5f08d9f61ba88f3a76ce3b57c2e019e7cec5b89e71ce7be8186e9e18ab4ad7
diff --git a/dev-python/jc/jc-1.17.3.ebuild b/dev-python/jc/jc-1.17.3.ebuild
new file mode 100644
index 000000000000..091f58eee777
--- /dev/null
+++ b/dev-python/jc/jc-1.17.3.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/peewee/Manifest b/dev-python/peewee/Manifest
index 1eba0b007027..bd00f7f2a7d9 100644
--- a/dev-python/peewee/Manifest
+++ b/dev-python/peewee/Manifest
@@ -1,3 +1 @@
-DIST peewee-3.14.4.tar.gz 882123 BLAKE2B e20848eaa7cd93ea5fcea152ffbfdbab694d9fea7ee8b945c029fee8d6c4a263317fbb0506df31d490611a2b2ac0718b0fdbea875f0013eb1f3f71941f12a26b SHA512 261856f4b691b8f5610d041a049148f213c22348a7e50514f7792932c1f4e8735b4dddb8a29c42e583c38e89551df2f05951d81bda0c47a80dc1eeeb0345f30f
-DIST peewee-3.14.7.tar.gz 891167 BLAKE2B eb8e095fc76ac8984f43fe57ea691eb570551fe07e43092a1d7acb023fbcf9cb1f3e921a428695c8e88d959cdf306c426a8fd3f3a58443a752521e161caa31ee SHA512 ea416fda8c39f08236d2f3b440ac6229a40b37caba7d487e1be34a75a05ff880eabb9423033043dfbfe25ab887fad8dcc8fcf2a3778836f19ae2c1ad8df77d96
 DIST peewee-3.14.8.tar.gz 891123 BLAKE2B 67c64ad5c8ca52987c329592dc436e3c27db5b3baa7f7c68ee4fcb06e338e38a71bfce30dcd62b7562d85a3ab7fa554f1ba8093e9a59536ffb4289c186852853 SHA512 d736e5dfc139656cba7caf488d68907683893d5a2537f96269af9ed693ec79c089d2822d355be4a9c6136b5cd813b0cccf774afd585f9bd420d57a8700cabfbe
diff --git a/dev-python/peewee/peewee-3.14.4.ebuild b/dev-python/peewee/peewee-3.14.4.ebuild
deleted file mode 100644
index 0a3d0463691b..000000000000
--- a/dev-python/peewee/peewee-3.14.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="Small Python ORM"
-HOMEPAGE="https://github.com/coleifer/peewee/"
-SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? ( dev-python/psycopg[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_sphinx docs
-
-python_test() {
-	"${EPYTHON}" ./runtests.py -v 2 || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use examples && DOCS=( examples/ )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/peewee/peewee-3.14.7.ebuild b/dev-python/peewee/peewee-3.14.7.ebuild
deleted file mode 100644
index 0f35a057c153..000000000000
--- a/dev-python/peewee/peewee-3.14.7.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} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="Small Python ORM"
-HOMEPAGE="https://github.com/coleifer/peewee/"
-SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? ( dev-python/psycopg[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_sphinx docs
-
-python_test() {
-	"${EPYTHON}" ./runtests.py -v 2 || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use examples && DOCS=( examples/ )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/peewee/peewee-3.14.8.ebuild b/dev-python/peewee/peewee-3.14.8.ebuild
index d93e3ee0dc07..11df2bacbefe 100644
--- a/dev-python/peewee/peewee-3.14.8.ebuild
+++ b/dev-python/peewee/peewee-3.14.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pydot/pydot-1.4.2.ebuild b/dev-python/pydot/pydot-1.4.2-r1.ebuild
index 292ea300db3c..65a683d66dec 100644
--- a/dev-python/pydot/pydot-1.4.2.ebuild
+++ b/dev-python/pydot/pydot-1.4.2-r1.ebuild
@@ -17,8 +17,9 @@ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc
 IUSE="test"
 RESTRICT="!test? ( test )"
 
+# See https://github.com/pydot/pydot/issues/277 for pyparsing dep
 RDEPEND="
-	>=dev-python/pyparsing-2.1.4[${PYTHON_USEDEP}]
+	<dev-python/pyparsing-3[${PYTHON_USEDEP}]
 	media-gfx/graphviz"
 BDEPEND="
 	test? (
diff --git a/dev-python/pyicu/Manifest b/dev-python/pyicu/Manifest
index cccd750bd899..dce4d2a1abbd 100644
--- a/dev-python/pyicu/Manifest
+++ b/dev-python/pyicu/Manifest
@@ -1,2 +1 @@
-DIST pyicu-v2.7.4.tar.bz2 241794 BLAKE2B b76455809704b417a42a60f002b1bfcc0fdf03dd4934b514464b06c4c53d1afa2f99645d9b69a131c3c9218f36a18a4412a6742a912450ce47f856dfc088e568 SHA512 bc68d94d2bd070cd1b7a2f214f998831d2f75a3f4528ad5b1d3394b343d357c24daa6b29443d35a7c984ab0bbafd3b45949d1ccbf89b061423329efa08181fc0
 DIST pyicu-v2.8.tar.bz2 242791 BLAKE2B 0492b1fbbb97a92fb90620fb720cf82ddb2e404d4ce4d20d4204c271ae0c32c526e5832f5658205893381c074f6b1e2a3274f1935efac094241fe2afbc7b9c07 SHA512 c8ecc11322de79d42aa0f0336cdc47637af203bbf2782107132d3c194cef3725114ba6fc40bbd2bffc26ce168d6d4e39f069904aa268d0d095c506ddca292051
diff --git a/dev-python/pyicu/pyicu-2.7.4.ebuild b/dev-python/pyicu/pyicu-2.7.4.ebuild
deleted file mode 100644
index cbab54bf8d9b..000000000000
--- a/dev-python/pyicu/pyicu-2.7.4.ebuild
+++ /dev/null
@@ -1,29 +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/-/-v}
-DESCRIPTION="Python bindings for dev-libs/icu"
-HOMEPAGE="
-	https://gitlab.pyicu.org/main/pyicu/
-	https://pypi.org/project/PyICU/"
-SRC_URI="
-	https://gitlab.pyicu.org/main/pyicu/-/archive/v${PV}/${MY_P}.tar.bz2"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-libs/icu:="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? ( dev-python/six[${PYTHON_USEDEP}] )"
-
-DOCS=( CHANGES CREDITS README.md )
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyicu/pyicu-2.8.ebuild b/dev-python/pyicu/pyicu-2.8.ebuild
index a94407c370fb..cbab54bf8d9b 100644
--- a/dev-python/pyicu/pyicu-2.8.ebuild
+++ b/dev-python/pyicu/pyicu-2.8.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-libs/icu:="
 DEPEND="${RDEPEND}"
diff --git a/dev-python/pylint/pylint-2.12.1.ebuild b/dev-python/pylint/pylint-2.12.1.ebuild
index f361a3219593..35571655197f 100644
--- a/dev-python/pylint/pylint-2.12.1.ebuild
+++ b/dev-python/pylint/pylint-2.12.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="examples"
 
 # Make sure to check https://github.com/PyCQA/pylint/blob/main/setup.cfg#L43 on bumps
diff --git a/dev-python/smmap/smmap-5.0.0.ebuild b/dev-python/smmap/smmap-5.0.0.ebuild
index 7245c78fea9f..61c3c826fa2d 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 ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 SLOT="0"
 
 distutils_enable_tests unittest
diff --git a/dev-python/ukkonen/ukkonen-1.0.0.ebuild b/dev-python/ukkonen/ukkonen-1.0.0.ebuild
index c27e35ba5ebf..72d77dfa6b84 100644
--- a/dev-python/ukkonen/ukkonen-1.0.0.ebuild
+++ b/dev-python/ukkonen/ukkonen-1.0.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/zstd/Manifest b/dev-python/zstd/Manifest
index c3b64f748b58..03a0f6b95d64 100644
--- a/dev-python/zstd/Manifest
+++ b/dev-python/zstd/Manifest
@@ -1,2 +1,2 @@
 DIST zstd-1.5.0.2.tar.gz 528892 BLAKE2B 9aaa0beba1a6703d881daf5c5e10d93a8c67923d07773bce5eda3eba652f50c4cb4aa18d2ea9bea304a8742a7e8501568679837aa8bb1e71fe6eff5a5d08d193 SHA512 a7a6033e743c5bc0fa5256dfd256c2a9417c200cda5d5c02c6c7a5d5553d188637e21908658a4a948e565b16bb03f85f57c74d51c63a3ae7eb160f8b3bdbd3c3
-DIST zstd-1.5.0.3.tar.gz 535958 BLAKE2B b8f08d8d0fab22112cd2ed565da747013027349fe8fabcaa882b8e15a1dabd14f8e8797b6b45910bfe4c9f7c94256ea7203084eb6d30b117d2d03745ec441886 SHA512 fb13f05e930fa78f24252e24cd65ea24971e4e6a6f4684a291ddb1e682bd2fe9bbc037c87acbc832ec84ffd0dc51df63c1deb9647eb5b8123c510fe92c7b9f3c
+DIST zstd-1.5.0.4.tar.gz 535965 BLAKE2B 6b0440676952f4a50ac23aa3e0c137486a1d9b822ec661510a18882e97aac7c38039d449748a9c029409ae1cdb5275905f0c58a12d151f31f7b99e9d501da533 SHA512 aa74b4a60bcbf138b337b13111489212b28b599fbfbfcc7e058ed03a6d6ba539fed8742babae3d37a1790b26e987d9f111fb6430bfb3f72c3de7794b1f23539b
diff --git a/dev-python/zstd/zstd-1.5.0.3.ebuild b/dev-python/zstd/zstd-1.5.0.4.ebuild
index 1608db206218..00e27f98f0ad 100644
--- a/dev-python/zstd/zstd-1.5.0.3.ebuild
+++ b/dev-python/zstd/zstd-1.5.0.4.ebuild
@@ -14,16 +14,17 @@ LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
 
-RDEPEND="
+DEPEND="
 	app-arch/zstd:=
+"
+RDEPEND="${DEPEND}
 	!dev-python/zstandard[${PYTHON_USEDEP}]
 "
-DEPEND=${RDEPEND}
 
 distutils_enable_tests unittest
 
 src_configure() {
-	mydistutilsargs=( --external )
+	DISTUTILS_ARGS=( --external )
 
 	# for tests
 	export ZSTD_EXTERNAL=1