Adding metadata

25 files changed, 148 insertions, 311 deletions

diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index 2f22980ec92c..7b103ad6bb25 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -1 +1,2 @@
 DIST cfn-lint-0.58.3.tar.gz 8779688 BLAKE2B 0964d477f61ec3dc4f80d59e3b05bc92cba27c0c9293a343bf15ee25df967643adf4d8aaa0c11d336a857957bc19dd1cc711b7fe9014c9c43ffd0171b197c4f5 SHA512 9f88f533a6533cf23ce9be83f61cc7418df7775e331ea932f469b391e136a370e5adef9a41a5378dc99d4aec352ababebc1eb59b15d19c0c0c6f19e12410ae06
+DIST cfn-lint-0.58.4.tar.gz 8838063 BLAKE2B 77caf931c79b90d44c09c7ad63ff928c5217fa3cb9474ce8d3a3151a4a804365293e4304484ae1a2c55acfb2718dddce9f0b26165d35a570c3a7baab3cf76290 SHA512 53c24e265eaa8064bc23740376668c4a640571e0e273fc475f70de468be51683f3eacbbce82dddb9e05a23049299b49e660f28d5ef93150a60260fa0f4b77a19
diff --git a/dev-python/cfn-lint/cfn-lint-0.58.4.ebuild b/dev-python/cfn-lint/cfn-lint-0.58.4.ebuild
new file mode 100644
index 000000000000..e156a80f5778
--- /dev/null
+++ b/dev-python/cfn-lint/cfn-lint-0.58.4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="CloudFormation Linter"
+HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-lint/"
+SRC_URI="
+	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.42.0[${PYTHON_USEDEP}]
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+	dev-python/junit-xml[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
+	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# TODO
+	test/unit/module/test_template.py::TestTemplate::test_build_graph
+	# requires git repo
+	test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
+	# Internet
+	test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
+	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_2
+	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
+)
+
+src_prepare() {
+	# unpin the deps
+	sed -e 's:~=[0-9.]*::' -i setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/flask-api/flask-api-3.0.ebuild b/dev-python/flask-api/flask-api-3.0.ebuild
index a4ead7ce20f9..b023c532e5f5 100644
--- a/dev-python/flask-api/flask-api-3.0.ebuild
+++ b/dev-python/flask-api/flask-api-3.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Browsable web APIs for Flask"
-HOMEPAGE="https://www.flaskapi.org/"
+HOMEPAGE="https://flask-api.github.io/flask-api/"
 # pypi mirror don't have docs folder
 SRC_URI="https://github.com/flask-api/flask-api/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-python/google-api-core/Manifest b/dev-python/google-api-core/Manifest
index 9d3423354314..e61c48d75451 100644
--- a/dev-python/google-api-core/Manifest
+++ b/dev-python/google-api-core/Manifest
@@ -1,4 +1,2 @@
-DIST google-api-core-2.3.1.tar.gz 156495 BLAKE2B fdc7f7d8457b96947181eee9992c5e51bbd18f9740a0415a32d4d0f45ade9c0c784e01f0aa78fe0dbbf3717ee860e78d6b4d1c5f154361afbf919abe033e5380 SHA512 ab1c333727e666f920d81186e6213d440052021d952efcb47eac487d10ab33a2e1116278925e54bfb3468de70c18837a0e241ba3426af09728ea59a725789a29
 DIST google-api-core-2.5.0.tar.gz 160336 BLAKE2B 5a3050dcb2e58c068c67cd6263b297ea84e4a47784c750e7ed87077bf46314730698eda2eaa8305a99a55b539b8886dfbbeeb9dc9838748fa941db6785212f36 SHA512 92b570195db21dded50b220e350e518c13101ab3e247bcbb3d3f5701e722c6dc81312443889360fdef1485edf1d5ef486bfeecf56092844cea81b61c7c527728
-DIST google-api-core-2.7.0.tar.gz 163847 BLAKE2B ba9b787736744fcbe73fde030b8efc88c01f818d3b8b83886116202354a3626b8ea15cac46f23a12191364098f74e2b9128774afd659dd4c4ce55af1c7ad2319 SHA512 9c00791a7412dab25b68785b3265a5654671a7865381d6d2cc8cdcb7e509d71968a0a654ecaaa6bb830b38f0cc838707baeedb545fcf5eea362bfa4bd8a9c53b
 DIST google-api-core-2.7.1.tar.gz 163942 BLAKE2B 0b28e8dd8607ed6a64a3715c14e321f74d18abc09bc2eee5c6d080936160ea9d6839f1acf9589667c86a688e4e02038cc204f25d0b7cab3e3ed3af2463f31abb SHA512 2264eec00309f272ecca278e8f310bca4be64cfcec94c05fa96a7a8ae350fce0ae9931fbb27aae71e89393289cdbef782631a6766e85d5aee449e903e70f0817
diff --git a/dev-python/google-api-core/google-api-core-2.3.1.ebuild b/dev-python/google-api-core/google-api-core-2.3.1.ebuild
deleted file mode 100644
index 2fd1241959c1..000000000000
--- a/dev-python/google-api-core/google-api-core-2.3.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Core Library for Google Client Libraries"
-HOMEPAGE="https://github.com/googleapis/python-api-core/
-	https://googleapis.dev/python/google-api-core/latest/index.html"
-SRC_URI="https://github.com/googleapis/${PN//google/python}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P//google/python}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	dev-python/googleapis-common-protos[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.25.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	<dev-python/requests-3[${PYTHON_USEDEP}]
-"
-# grpcio support is broken if grpcio-status is not installed,
-# and we do not package the latter
-BDEPEND="
-	test? (
-		!!dev-python/grpcio
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/rsa[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install pytest
-
-EPYTEST_DESELECT=(
-	# TODO: package proto-plus
-	tests/unit/test_protobuf_helpers.py::test_field_mask_ignore_trailing_underscore
-	tests/unit/test_protobuf_helpers.py::test_field_mask_ignore_trailing_underscore_with_nesting
-)
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/google-api-core/google-api-core-2.5.0.ebuild b/dev-python/google-api-core/google-api-core-2.5.0.ebuild
index 6d31f1725649..8bb10f8baa8a 100644
--- a/dev-python/google-api-core/google-api-core-2.5.0.ebuild
+++ b/dev-python/google-api-core/google-api-core-2.5.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P//google/python}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	dev-python/namespace-google[${PYTHON_USEDEP}]
diff --git a/dev-python/google-api-core/google-api-core-2.7.0.ebuild b/dev-python/google-api-core/google-api-core-2.7.0.ebuild
deleted file mode 100644
index 6d31f1725649..000000000000
--- a/dev-python/google-api-core/google-api-core-2.7.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Core Library for Google Client Libraries"
-HOMEPAGE="https://github.com/googleapis/python-api-core/
-	https://googleapis.dev/python/google-api-core/latest/index.html"
-SRC_URI="https://github.com/googleapis/${PN//google/python}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P//google/python}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	dev-python/googleapis-common-protos[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.25.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	<dev-python/requests-3[${PYTHON_USEDEP}]
-"
-# grpcio support is broken if grpcio-status is not installed,
-# and we do not package the latter
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/proto-plus[${PYTHON_USEDEP}]
-		dev-python/rsa[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# failing due to missing grpcio-status
-	tests/asyncio/test_grpc_helpers_async.py::test_wrap_unary_errors
-	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_raised
-	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_read
-	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_aiter
-	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_write
-	tests/unit/test_grpc_helpers.py::test_wrap_unary_errors
-	tests/unit/test_grpc_helpers.py::Test_StreamingResponseIterator::test___next___w_rpc_error
-	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_invocation
-	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_iterator_initialization
-	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_during_iteration
-	# TODO
-	tests/unit/test_operation.py::test_exception_with_error_code
-)
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
-
-python_test() {
-	epytest -p no:aiohttp -p no:trio
-}
diff --git a/dev-python/h2/h2-3.2.0.ebuild b/dev-python/h2/h2-3.2.0.ebuild
index f2b485ddbdae..63d032f55cdc 100644
--- a/dev-python/h2/h2-3.2.0.ebuild
+++ b/dev-python/h2/h2-3.2.0.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1
 
 MY_P=hyper-h2-${PV}
 DESCRIPTION="HTTP/2 State-Machine based protocol implementation"
-HOMEPAGE="https://python-hyper.org/h2/en/stable/ https://pypi.org/project/h2/"
+HOMEPAGE="https://python-hyper.org/projects/hyper-h2/en/stable/ https://pypi.org/project/h2/"
 SRC_URI="https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
 S=${WORKDIR}/${MY_P}
 
diff --git a/dev-python/hpack/hpack-3.0.0.ebuild b/dev-python/hpack/hpack-3.0.0.ebuild
index 3cfa20b25505..43376f895e11 100644
--- a/dev-python/hpack/hpack-3.0.0.ebuild
+++ b/dev-python/hpack/hpack-3.0.0.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1
 
 DESCRIPTION="Pure-Python HPACK header compression"
 HOMEPAGE="
-	https://python-hyper.org/hpack/en/latest/
+	https://python-hyper.org/projects/hpack/en/stable/
 	https://pypi.org/project/hpack/"
 SRC_URI="https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-python/priority/priority-1.3.0.ebuild b/dev-python/priority/priority-1.3.0.ebuild
index ef0d83d3a3c2..311f7e6aba10 100644
--- a/dev-python/priority/priority-1.3.0.ebuild
+++ b/dev-python/priority/priority-1.3.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="A pure-Python implementation of the HTTP/2 priority tree"
-HOMEPAGE="https://python-hyper.org/priority/en/latest/
+HOMEPAGE="https://python-hyper.org/projects/priority/en/stable/
 	https://github.com/python-hyper/priority
 	https://pypi.org/project/priority/"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/proto-plus/proto-plus-1.20.3.ebuild b/dev-python/proto-plus/proto-plus-1.20.3.ebuild
index a22015385e95..1dcfa0885576 100644
--- a/dev-python/proto-plus/proto-plus-1.20.3.ebuild
+++ b/dev-python/proto-plus/proto-plus-1.20.3.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${PN}-python-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	dev-python/protobuf-python[${PYTHON_USEDEP}]
diff --git a/dev-python/pyamg/pyamg-4.1.0.ebuild b/dev-python/pyamg/pyamg-4.1.0.ebuild
index e5522afee238..6bc2faac59c7 100644
--- a/dev-python/pyamg/pyamg-4.1.0.ebuild
+++ b/dev-python/pyamg/pyamg-4.1.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{7,8,9,10} )
 inherit distutils-r1
 
 DESCRIPTION="Algebraic multigrid solvers in Python"
-HOMEPAGE="https://pyamg.org"
+HOMEPAGE="https://github.com/pyamg/pyamg"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/pyamg/pyamg-4.2.1.ebuild b/dev-python/pyamg/pyamg-4.2.1.ebuild
index 07560faf642f..725323891903 100644
--- a/dev-python/pyamg/pyamg-4.2.1.ebuild
+++ b/dev-python/pyamg/pyamg-4.2.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{7,8,9,10} )
 inherit distutils-r1
 
 DESCRIPTION="Algebraic multigrid solvers in Python"
-HOMEPAGE="https://pyamg.org"
+HOMEPAGE="https://github.com/pyamg/pyamg"
 SRC_URI="
 	https://github.com/pyamg/pyamg/archive/v${PV}.tar.gz
 		-> ${P}.gh.tar.gz
diff --git a/dev-python/pyamg/pyamg-4.2.2.ebuild b/dev-python/pyamg/pyamg-4.2.2.ebuild
index 05a48d85d66c..316faf9618d2 100644
--- a/dev-python/pyamg/pyamg-4.2.2.ebuild
+++ b/dev-python/pyamg/pyamg-4.2.2.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{7,8,9,10} )
 inherit distutils-r1
 
 DESCRIPTION="Algebraic multigrid solvers in Python"
-HOMEPAGE="https://pyamg.org"
+HOMEPAGE="https://github.com/pyamg/pyamg"
 SRC_URI="
 	https://github.com/pyamg/pyamg/archive/v${PV}.tar.gz
 		-> ${P}.gh.tar.gz
diff --git a/dev-python/pygresql/pygresql-5.2.2.ebuild b/dev-python/pygresql/pygresql-5.2.2.ebuild
index bd4b260296d7..a6ed808efbdb 100644
--- a/dev-python/pygresql/pygresql-5.2.2.ebuild
+++ b/dev-python/pygresql/pygresql-5.2.2.ebuild
@@ -11,7 +11,7 @@ inherit distutils-r1 postgres
 MY_P="PyGreSQL-${PV}"
 
 DESCRIPTION="A Python interface for the PostgreSQL database"
-HOMEPAGE="https://pygresql.org/"
+HOMEPAGE="http://www.pygresql.org/"
 SRC_URI="mirror://pypi/P/PyGreSQL/${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-python/pygresql/pygresql-5.2.3.ebuild b/dev-python/pygresql/pygresql-5.2.3.ebuild
index cb74f93ff46f..369705bcc40b 100644
--- a/dev-python/pygresql/pygresql-5.2.3.ebuild
+++ b/dev-python/pygresql/pygresql-5.2.3.ebuild
@@ -12,7 +12,7 @@ inherit distutils-r1 postgres
 MY_P="PyGreSQL-${PV}"
 
 DESCRIPTION="A Python interface for the PostgreSQL database"
-HOMEPAGE="https://pygresql.org/"
+HOMEPAGE="http://www.pygresql.org/"
 SRC_URI="mirror://pypi/P/PyGreSQL/${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-python/pykka/pykka-3.0.2.ebuild b/dev-python/pykka/pykka-3.0.2.ebuild
index 3e8093fe1fa0..6ba8b002564d 100644
--- a/dev-python/pykka/pykka-3.0.2.ebuild
+++ b/dev-python/pykka/pykka-3.0.2.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 
 DESCRIPTION="A Python implementation of the actor model"
 HOMEPAGE="
-	https://www.pykka.org/en/latest/
+	
 	https://github.com/jodal/pykka/"
 SRC_URI="
 	https://github.com/jodal/pykka/archive/v${PV}.tar.gz
diff --git a/dev-python/pypy-exe/Manifest b/dev-python/pypy-exe/Manifest
index dacc54da215f..b22b36917ccc 100644
--- a/dev-python/pypy-exe/Manifest
+++ b/dev-python/pypy-exe/Manifest
@@ -1,4 +1,2 @@
-DIST pypy2.7-gentoo-patches-7.3.6.tar.xz 7904 BLAKE2B 6a809f8f1fd59c18627abaf81b47fa5948d39d5ece86fa416944c1c6585ec5d43b56f4228479a6afdca9788a0ecfdc83fceb4eeea25f289c1dc0b2dbda79b882 SHA512 01fe42cdf94b559ed787e253325f7df0add62e30e77c6b6e4c0301c81ff624a31167d95b39d24d72f28441468d571112f424957de38e7f26ecdbfe0f33617296
 DIST pypy2.7-gentoo-patches-7.3.8.tar.xz 7428 BLAKE2B 5362c34929e2053fc9a806e9894f35cce02ba1ebfad66cc64acc200ade4317934ee50dbc072194d19e201dea2a678abd609001ffe7e39bd6890a3b26c9d6d00e SHA512 6a7bfadac8f638e69419a6a1536af595a63bb2b4e3028da6423bd164d3df5399901b217468b1b374a5162ca8d2e5a61c4a19996f9e63109ed414a1aedcaac5d6
-DIST pypy2.7-v7.3.6-src.tar.bz2 21621891 BLAKE2B a2d18ae9d455747484de491df228e7f26af46fc3bc1fd1c16ceba79eba5a3a3272d48312c9da112ae9310722b5af33098f28a7dc15d7ff4760886a8c974692a2 SHA512 df914f5e1a1f5ae5c1ea11cd8e29482309af4dce041cf2ae6d7b35a35717fec903be70f56e5f1ddbc9fd370cbe29f6896d25eb2cd10c493c352c80b279070ba3
 DIST pypy2.7-v7.3.8-src.tar.bz2 23279006 BLAKE2B 7b2f5bfaffb99d3444f355039f743a21016dea22cc78cd5feca05eb12ce0e5ed39dafd22a8726994d0aff789e68b506197680e7181087313d2c5cd17b674ae4d SHA512 6ff90fad998c25aec5823e61d65266c169e89cba2ee2e3b6d0864d34d69a6b9fe7ad4d591bc8b38a48c5c22ea3dd468d3188cd34e03746c258752eaa24ac3ae2
diff --git a/dev-python/pypy-exe/pypy-exe-7.3.6.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.6.ebuild
deleted file mode 100644
index 40bf2a3631b8..000000000000
--- a/dev-python/pypy-exe/pypy-exe-7.3.6.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit check-reqs pax-utils python-any-r1 toolchain-funcs
-
-PYPY_PV=${PV%_p*}
-MY_P=pypy2.7-v${PYPY_PV/_}
-PATCHSET="pypy2.7-gentoo-patches-${PV/_}"
-
-DESCRIPTION="PyPy executable (build from source)"
-HOMEPAGE="https://www.pypy.org/"
-SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
-S="${WORKDIR}/${MY_P}-src"
-
-LICENSE="MIT"
-SLOT="${PYPY_PV}"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
-
-RDEPEND=">=sys-libs/zlib-1.1.3:0=
-	dev-libs/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	bzip2? ( app-arch/bzip2:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	!dev-python/pypy-exe-bin:${PYPY_PV}"
-# don't enforce the dep on pypy with USE=low-memory since it's going
-# to cause either collisions or circular dep on itself
-DEPEND="${RDEPEND}"
-BDEPEND="
-	!low-memory? (
-		|| (
-			dev-python/pypy
-			dev-lang/python:2.7
-		)
-	)"
-
-check_env() {
-	if use low-memory; then
-		if ! has_version -b dev-python/pypy &&
-				! has_version -b dev-python/pypy-bin
-		then
-			eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
-			eerror "being installed. Please install it using e.g.:"
-			eerror
-			eerror "  $ emerge -1v dev-python/pypy dev-python/pypy-exe-bin"
-			eerror
-			eerror "before attempting to build dev-python/pypy-exe[low-memory]."
-			die "dev-python/pypy needs to be installed for USE=low-memory"
-		fi
-
-		CHECKREQS_MEMORY="1750M"
-		use amd64 && CHECKREQS_MEMORY="3500M"
-	else
-		CHECKREQS_MEMORY="3G"
-		use amd64 && CHECKREQS_MEMORY="6G"
-	fi
-
-	check-reqs_pkg_pretend
-}
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && check_env
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		check_env
-
-		use low-memory && EPYTHON=
-		if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] &&
-				{ has_version -b dev-python/pypy ||
-				has_version -b dev-python/pypy-bin; }
-		then
-			einfo "Using already-installed PyPy to perform the translation."
-			EPYTHON=pypy
-		else
-			einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
-			einfo "recommends using PyPy for that. If you wish to do so, please unset"
-			einfo "the EPYTHON variable."
-			python-any-r1_pkg_setup
-		fi
-	fi
-}
-
-src_prepare() {
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-	default
-}
-
-src_configure() {
-	tc-export CC
-
-	local jit_backend
-	if use jit; then
-		jit_backend='--jit-backend='
-
-		# We only need the explicit sse2 switch for x86.
-		# On other arches we can rely on autodetection which uses
-		# compiler macros. Plus, --jit-backend= doesn't accept all
-		# the modern values...
-
-		if use x86; then
-			if use cpu_flags_x86_sse2; then
-				jit_backend+=x86
-			else
-				jit_backend+=x86-without-sse2
-			fi
-		else
-			jit_backend+=auto
-		fi
-	fi
-
-	local args=(
-		--no-shared
-		$(usex jit -Ojit -O2)
-
-		${jit_backend}
-
-		pypy/goal/targetpypystandalone
-	)
-
-	# Avoid linking against libraries disabled by use flags
-	local opts=(
-		bzip2:bz2
-		ncurses:_minimal_curses
-	)
-
-	local opt
-	for opt in "${opts[@]}"; do
-		local flag=${opt%:*}
-		local mod=${opt#*:}
-
-		args+=(
-			$(usex ${flag} --withmod --withoutmod)-${mod}
-		)
-	done
-
-	local interp=( "${EPYTHON}" )
-	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${EPYTHON}" --jit loop_longevity=300 )
-	fi
-
-	if [[ ${EPYTHON} != pypy ]]; then
-		# reuse bundled pycparser to avoid external dep
-		mkdir -p "${T}"/pymod/cffi || die
-		: > "${T}"/pymod/cffi/__init__.py || die
-		cp -r lib_pypy/cffi/_pycparser "${T}"/pymod/cffi/ || die
-		local -x PYTHONPATH=${T}/pymod:${PYTHONPATH}
-	fi
-
-	# translate into the C sources
-	# we're going to build them ourselves since otherwise pypy does not
-	# free up the unneeded memory before spawning the compiler
-	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "translation failed"
-}
-
-src_compile() {
-	emake -C "${T}"/usession*-0/testing_1
-}
-
-src_install() {
-	local dest=/usr/lib/pypy2.7
-	exeinto "${dest}"
-	newexe "${T}"/usession*-0/testing_1/pypy-c pypy-c-${PYPY_PV}
-	insinto "${dest}"/include/${PYPY_PV}
-	doins include/pypy_*
-	pax-mark m "${ED}${dest}/pypy-c-${PYPY_PV}"
-}
diff --git a/dev-python/pypy-exe/pypy-exe-7.3.8.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.8.ebuild
index 537878fc7d32..3fac7ffc5f2f 100644
--- a/dev-python/pypy-exe/pypy-exe-7.3.8.ebuild
+++ b/dev-python/pypy-exe/pypy-exe-7.3.8.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}-src"
 
 LICENSE="MIT"
 SLOT="${PYPY_PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0=
diff --git a/dev-python/pyspnego/Manifest b/dev-python/pyspnego/Manifest
index 4340a7e374d7..ae385ec44c3d 100644
--- a/dev-python/pyspnego/Manifest
+++ b/dev-python/pyspnego/Manifest
@@ -1,3 +1,4 @@
 DIST pyspnego-0.3.1.tar.gz 308888 BLAKE2B 23d77718bcb3deb807764ef3098c8f25b487c18b022ba9e48bc46bbab8f77de82ddc4a2bd66485041b1012958304d77236f54e9f87150e68631045bd50ca2a0a SHA512 2f46c727dbb29e1b9a7e4912c14fe49f47595ef7134358eae03e0645cce927e69e3612d11b1b5986fbb945f684e87d6eddf08bc6153af9d29325718a6207e3a1
 DIST pyspnego-0.4.0.tar.gz 324322 BLAKE2B 97ef46ba072df46f873a9f2bdf4dd440a37395a87856da92b5438af8ed05aad381189eb86b6fe031ab77158c482f91a3fb12dde69082decfbe328c150d8210f0 SHA512 e110bffebf746e7ef1c1bd74e071ec7b224c30cf7be12f6c1101feb58d85fa6f4fa48e946e1a620115b2857dcad07c77986800d623cc1a94b24a253d3205b9ea
 DIST pyspnego-0.5.0.tar.gz 325693 BLAKE2B 7674f498624e9b3c463db9ee60e9c5edf84cefd3642c9fe2cf0df58364c96b0643cf962d00edf1a6be9d8452e344e920cc1edec70bc39e8f65a6428204c36328 SHA512 4abb5726f9432366453069d32344b2be2169301cb0a6f96bcaac3f49f807c2ba819ad85a50f7979e920ddf3a4dcd13f6fc868e8d72c3c00cd3b9ffc97692b4c8
+DIST pyspnego-0.5.1.tar.gz 325941 BLAKE2B b6acb16ff91dc5c0e4b738d729096e60346e8fc74c153d567f8d766a027b96733a00c6d26104fc9fe871974d92079e89ac899f79b7920ff87fba0475e399ef8f SHA512 d5632783103359d056f2c6597d06b134147705c42a63d52c71c6007542c0fc2a8e8255872944e8153b605fe231d26f80af79f17fd5cb19ffb7b2ee560a931aa5
diff --git a/dev-python/pyspnego/pyspnego-0.5.1.ebuild b/dev-python/pyspnego/pyspnego-0.5.1.ebuild
new file mode 100644
index 000000000000..e203c081a8e2
--- /dev/null
+++ b/dev-python/pyspnego/pyspnego-0.5.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Library to handle SPNEGO and CredSSP authentication"
+HOMEPAGE="https://pypi.org/project/pyspnego/ https://github.com/jborean93/pyspnego"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/cryptography[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/gssapi[${PYTHON_USEDEP}]
+		>=dev-python/krb5-0.3.0[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# https://github.com/jborean93/pyspnego/issues/33
+	'tests/test_auth.py::test_kerberos_auth_keytab[negotiate-False]'
+	'tests/test_auth.py::test_kerberos_auth_keytab[negotiate-True]'
+	'tests/test_auth.py::test_kerberos_auth_ccache[negotiate-False]'
+	'tests/test_auth.py::test_kerberos_auth_env_cache[negotiate-False]'
+)
+
+pkg_postinst() {
+	optfeature "Kerberos authentication" "dev-python/gssapi >=dev-python/krb5-0.3.0"
+	optfeature "YAML output support" "dev-python/ruamel-yaml"
+}
diff --git a/dev-python/python-dbusmock/Manifest b/dev-python/python-dbusmock/Manifest
index d36ecacb5a0b..bb8c17b5ee23 100644
--- a/dev-python/python-dbusmock/Manifest
+++ b/dev-python/python-dbusmock/Manifest
@@ -1,2 +1,3 @@
 DIST python-dbusmock-0.25.0.tar.gz 86674 BLAKE2B 9a9f5aefece0f48725f8a453d298fde78e86c86901f5dd3c67032be41cbc52753b8b0da8e8ba3845772e68ba6dcf0938af405f961fc5425808017dd8b30e1419 SHA512 5d7c2f4ea75c7a0f2c6bf63b673c180f3a468239082e0248778441d8f07b78fa3786c1d37498f758954a4727bdb24dc83ffc0671bfc4b2956402aee52c363045
 DIST python-dbusmock-0.26.1.tar.gz 87707 BLAKE2B 9f4761ab5f227e78dd5343f3ddd4b83d0494e77d3b381f719890447998baab8096b3bf817259b080dda78619f8407ad532044cb60aaf7a5280459f423754df0f SHA512 dcb46f6dbd17471e2135c0d8fb63cbaecbc9445ae7bf74691abb03b93d5283ab41ea71071ece03870aaac19eaedd546f01c0839116421047f1ac77619f2c73f3
+DIST python-dbusmock-0.27.0.tar.gz 89469 BLAKE2B b6fcdb5ded2b4f50d4c3edafecf028df57c3aae6e2a1e87d78c41f879f495d06ab097be0996b7b1781aebd4235a5ce7c6b58f48f5c74e2d4c2b49a3439ce9cae SHA512 4f3a7326b27d7b86d9a77019c419209077021a88994b8e5ae302686fcaa8b7c7736644ab26d9e3b5a2157634eb56a0b2dbe304a092d93104c94a13a43d53b5a1
diff --git a/dev-python/python-dbusmock/python-dbusmock-0.27.0.ebuild b/dev-python/python-dbusmock/python-dbusmock-0.27.0.ebuild
new file mode 100644
index 000000000000..5f76b17147fd
--- /dev/null
+++ b/dev-python/python-dbusmock/python-dbusmock-0.27.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Easily create mock objects on D-Bus for software testing"
+HOMEPAGE="https://github.com/martinpitt/python-dbusmock"
+SRC_URI="
+	https://github.com/martinpitt/python-dbusmock/releases/download/${PV}/${P}.tar.gz
+"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# needed for unittest discovery
+	> tests/__init__.py || die
+	# linter tests, fragile to newer linter versions
+	rm tests/test_code.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.1.ebuild b/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.1.ebuild
index 80ba3aaa8c0b..8739ad706b24 100644
--- a/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.1.ebuild
+++ b/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.1.ebuild
@@ -13,7 +13,7 @@ MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="Zope support for i18nmessageid (tagging source of i18n strings)"
 HOMEPAGE="https://github.com/zopefoundation/zope.i18nmessageid"
-HOMEPAGE+=" http://docs.zope.org/zope.i18nmessageid/"
+HOMEPAGE+=" "
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"