Adding metadata

40 files changed, 612 insertions, 532 deletions

diff --git a/dev-python/PyPDF2/Manifest b/dev-python/PyPDF2/Manifest
index b32dd701ede2..384dae569c62 100644
--- a/dev-python/PyPDF2/Manifest
+++ b/dev-python/PyPDF2/Manifest
@@ -1,3 +1,4 @@
 DIST PyPDF2-2.4.1.gh.tar.gz 5121207 BLAKE2B 387085ea028d7fcbcfd5fa4e5373b655e647548093638db66fa92d44b8771bb5342f8086ebca82e205cf56f1865778bc604f49a49b39af16d8d9e3466a51653d SHA512 430e73ee6965fd6b8dac9ce8b6ee232e8ea829a7dbdfe87aafd29ae24ab182cd3e568b447030a0c199aab9049a79ce2a5518ce7fe59b1d8ce533b1313a568fc2
 DIST PyPDF2-2.4.2.gh.tar.gz 5327738 BLAKE2B 5343d5b7c2efe2ed664f896b030a60ad8570ae8f481376e4ad9c865144b66d912633e4f83294d7f6399230963c02dea262cc247b10ca3c146ab24f823c0d57f3 SHA512 84a13d5b624ca8ca2dc4c474309ffa47d1770e1681ccb527f7fc1df37698037c224939dd062da004cbf7b983744afd3ab9adc9a610bea3f2f297e1ed5b708dd2
+DIST PyPDF2-2.5.0.gh.tar.gz 5597332 BLAKE2B 40d4fa812f1a70c18d3b2907d83185cd79af3d722e762ec8dec9709cb5c70246c21fa124e419d8b12142b0ae22b1f13958835eaaa23e9f4cc9efbd05793db7ce SHA512 ec7560b4bb3737fe4c830f058f5303cb70c9ff660c3f40637b4b86c8c79bf11a246a3fcc425aa54b5ca160548311c7f93248a1001c75a7e1dbf3119245e3262f
 DIST PyPDF2-sample-files-4d24ff93dcddf21d55d028d9675d5b5bf9d7a350.gh.tar.gz 5443819 BLAKE2B 6eb440a2db3b58f7e195b8f24438552b2b414296b887cf44d75b14bda367e37ffef75b870152ac3b38e20e5a6f2c6a4cf374087b70daa9036821dd3ebdce2128 SHA512 de631f650098b6fe15830e5a816158d7f352c7a25d0c743b9e4bdf146e1ef2e3a6ea1751ed5d68f34e9a339a793bfb9dc217934595c7a8dffb854c0a4111b963
diff --git a/dev-python/PyPDF2/PyPDF2-2.5.0.ebuild b/dev-python/PyPDF2/PyPDF2-2.5.0.ebuild
new file mode 100644
index 000000000000..c41da01d319c
--- /dev/null
+++ b/dev-python/PyPDF2/PyPDF2-2.5.0.ebuild
@@ -0,0 +1,115 @@
+# 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
+
+SAMPLE_COMMIT=4d24ff93dcddf21d55d028d9675d5b5bf9d7a350
+DESCRIPTION="Python library to work with PDF files"
+HOMEPAGE="
+	https://pypi.org/project/PyPDF2/
+	https://github.com/py-pdf/PyPDF2/
+"
+SRC_URI="
+	https://github.com/py-pdf/PyPDF2/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	test? (
+		https://github.com/py-pdf/sample-files/archive/${SAMPLE_COMMIT}.tar.gz
+			-> ${PN}-sample-files-${SAMPLE_COMMIT}.gh.tar.gz
+	)
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
+BDEPEND="
+	dev-python/pillow[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# Needs network access
+	tests/test_cmap.py
+	tests/test_filters.py::test_decompress_zlib_error
+	tests/test_filters.py::test_lzw_decode_neg1
+	tests/test_generic.py::test_dict_read_from_stream
+	tests/test_generic.py::test_parse_content_stream_peek_percentage
+	tests/test_generic.py::test_read_inline_image_no_has_q
+	tests/test_generic.py::test_read_inline_image_loc_neg_1
+	tests/test_generic.py::test_text_string_write_to_stream
+	tests/test_generic.py::test_name_object_read_from_stream_unicode_error
+	tests/test_generic.py::test_bool_repr
+	tests/test_generic.py::test_issue_997
+	tests/test_merger.py::test1
+	tests/test_merger.py::test_bookmark
+	tests/test_merger.py::test_sweep_indirect_list_newobj_is_None
+	tests/test_merger.py::test_sweep_recursion1
+	tests/test_merger.py::test_sweep_recursion2
+	tests/test_merger.py::test_trim_outline
+	tests/test_merger.py::test_trim_outline_list
+	tests/test_merger.py::test_zoom
+	tests/test_merger.py::test_zoom_xyz_no_left
+	tests/test_page.py::test_extract_text_operator_t_star
+	tests/test_page.py::test_extract_text_page_pdf
+	tests/test_page.py::test_extract_text_page_pdf_impossible_decode_xform
+	tests/test_page.py::test_extract_text_single_quote_op
+	'tests/test_page.py::test_page_operations[https://arxiv.org/pdf/2201.00029.pdf-None]'
+	tests/test_reader.py::test_extract_text_pdf15
+	tests/test_reader.py::test_extract_text_xref_issue_2
+	tests/test_reader.py::test_extract_text_xref_issue_3
+	tests/test_reader.py::test_extract_text_xref_table_21_bytes_clrf
+	tests/test_reader.py::test_get_fields
+	tests/test_reader.py::test_get_fields_read_else_block
+	tests/test_reader.py::test_get_fields_read_else_block2
+	tests/test_reader.py::test_get_fields_read_else_block3
+	tests/test_reader.py::test_get_fields_read_write_report
+	tests/test_reader.py::test_iss925
+	tests/test_reader.py::test_metadata_is_none
+	tests/test_reader.py::test_read_form_416
+	tests/test_reader.py::test_unexpected_destination
+	tests/test_reader.py::test_unexpected_destination
+	tests/test_reader.py::test_xfa_non_empty
+	tests/test_utils.py::test_deprecate_no_replacement
+	tests/test_workflows.py::test_compress
+	tests/test_workflows.py::test_extract_text
+	tests/test_workflows.py::test_extract_textbench
+	tests/test_workflows.py::test_get_fields
+	tests/test_workflows.py::test_get_metadata
+	tests/test_workflows.py::test_image_extraction
+	tests/test_workflows.py::test_merge
+	tests/test_workflows.py::test_merge_with_warning
+	tests/test_workflows.py::test_overlay
+	tests/test_workflows.py::test_scale_rectangle_indirect_object
+	tests/test_writer.py::test_sweep_indirect_references_nullobject_exception
+	tests/test_writer.py::test_write_bookmark_on_page_fitv
+	tests/test_xmp.py::test_custom_properties
+	tests/test_xmp.py::test_dc_creator
+	tests/test_xmp.py::test_dc_description
+	tests/test_xmp.py::test_dc_subject
+	tests/test_xmp.py::test_issue585
+	tests/test_xmp.py::test_xmpmm
+
+	# Broken test
+	tests/test_utils.py::test_deprecate_no_replacement
+)
+
+src_unpack() {
+	default
+	if use test; then
+		mv "sample-files-${SAMPLE_COMMIT}"/* "${P}"/sample-files/ || die
+	fi
+}
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index 32e0d7e97d4b..24bce9b181a8 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,2 +1,3 @@
 DIST astroid-2.11.6.gh.tar.gz 414842 BLAKE2B 3300037aad912be25d99cc20576f472b907c064c2cb434d9a40a9014df44749760cd8921411f3abdf8e08bd08e612cf6aec13d73ca38ec8ac31cd1ed007282bb SHA512 2276385d74d9bbfd0d99c786d2598105161b2c71c96ca73183b6e2672f8b61c31667c337a1d3967956ef5fdbb54392d604a84da5ac456354d04fb4ad37b11f61
 DIST astroid-2.12.0.gh.tar.gz 429498 BLAKE2B 4daf36a96c1f47446558ef223210becd78db1ee8dc76247f9e8d4c16622f777cd9f5d70ed863de9f893b9427b479057f72f24c4c8c7b1468c566eda85ee829b0 SHA512 3a5a104a98268f61bf852f7565ef7a4f3d6ded4e8cfa0a6d5dea08e045d3fc0067633618311d82fc2f330e56ffd11d02a81c2493222eeffadf2d333b24b5aa58
+DIST astroid-2.12.1.gh.tar.gz 429733 BLAKE2B fe55fb38ed5bdaa70371425f8e7bf11d52d0cbb70cc94d568614f507bf716b66d7c54e98ddca6b2508384234b330ef880c4847826d9e0907bf724e1a06aaeefd SHA512 586c094b577f1d06c5cfe90b54a220ca331657a2c5f9daf3fadc26795a631b8edfdafbd4ac7988aa3fbdc4527ca0ea3392cd38fe15c9444f5471d9bee4bf90d4
diff --git a/dev-python/astroid/astroid-2.12.1.ebuild b/dev-python/astroid/astroid-2.12.1.ebuild
new file mode 100644
index 000000000000..cd9a4873f0ea
--- /dev/null
+++ b/dev-python/astroid/astroid-2.12.1.ebuild
@@ -0,0 +1,59 @@
+# 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="Abstract Syntax Tree for logilab packages"
+HOMEPAGE="
+	https://github.com/PyCQA/astroid/
+	https://pypi.org/project/astroid/"
+SRC_URI="
+	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# Version specified in pyproject.toml
+RDEPEND="
+	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-3.10[${PYTHON_USEDEP}]
+	<dev-python/wrapt-2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# no clue why it's broken
+		tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
+		tests/unittest_brain_dataclasses.py::test_pydantic_field
+		tests/unittest_brain.py::SixBrainTest::test_from_imports
+		tests/unittest_regrtest.py::NonRegressionTests::test_numpy_distutils
+		# some problem with warnings (our options?)
+		tests/unittest_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_one_arg
+		tests/unittest_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_two_args
+		tests/unittest_scoped_nodes.py::test_deprecation_of_doc_attribute
+	)
+
+	# Faker causes sys.path_importer_cache keys to be overwritten
+	# with PosixPaths
+	epytest -p no:faker
+}
diff --git a/dev-python/axisregistry/axisregistry-0.3.2.ebuild b/dev-python/axisregistry/axisregistry-0.3.2.ebuild
index 9a265350cd99..cb2789320fbc 100644
--- a/dev-python/axisregistry/axisregistry-0.3.2.ebuild
+++ b/dev-python/axisregistry/axisregistry-0.3.2.ebuild
@@ -18,7 +18,10 @@ LICENSE="Apache-2.0"
 KEYWORDS="~amd64"
 SLOT="0"
 
-RDEPEND="dev-python/protobuf-python[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/fonttools[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+"
 DEPEND="
 	${RDEPEND}
 	>=dev-python/setuptools_scm-4[${PYTHON_USEDEP}]
diff --git a/dev-python/cherrypy/Manifest b/dev-python/cherrypy/Manifest
index 910f688327a5..8c0d50144fb1 100644
--- a/dev-python/cherrypy/Manifest
+++ b/dev-python/cherrypy/Manifest
@@ -1 +1,2 @@
 DIST CherryPy-18.6.1.tar.gz 692730 BLAKE2B 44cef7ed54a090df396691001b794bf13be2c61003bf80b63223e3a42914ce50fcfe43c06626fb881105e3ed6fbf587df7024bbf7cfde00a8263c432f4cc7ae4 SHA512 186a0992a443e1ffc1a2924b3351dcb0e6cc6c88b39ac32330d6365fe1b0a35c2008a3a18e1a57f61ffd1901ea6134333bb6288024d8ffbb1fd8e8dcd3145007
+DIST CherryPy-18.7.0.tar.gz 621794 BLAKE2B d60cd21d0b0bacbb18bcaeb525be143c3639f462978e9835e5c77ba8ce732a3af4662e4c37e2d20e1ad19760900775dee4a3cd98db53e70a19611d30c8329bce SHA512 321771a3e3cda16090bfb7a79c297defd67655ba5453e440e09e85fec41cba850544bebac7203206c95e38d79b3bce22368ea19c0fb1fbedbb00d76a4ab59c8b
diff --git a/dev-python/cherrypy/cherrypy-18.7.0.ebuild b/dev-python/cherrypy/cherrypy-18.7.0.ebuild
new file mode 100644
index 000000000000..8f18f31b929c
--- /dev/null
+++ b/dev-python/cherrypy/cherrypy-18.7.0.ebuild
@@ -0,0 +1,69 @@
+# 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} pypy3 )
+
+inherit distutils-r1
+
+MY_PN="CherryPy"
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="CherryPy is a pythonic, object-oriented HTTP framework"
+HOMEPAGE="
+	https://cherrypy.dev/
+	https://github.com/cherrypy/cherrypy/
+	https://pypi.org/project/CherryPy/
+"
+SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="ssl test"
+
+RDEPEND="
+	>=dev-python/cheroot-8.2.1[${PYTHON_USEDEP}]
+	>=dev-python/portend-2.1.1[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	dev-python/zc-lockfile[${PYTHON_USEDEP}]
+	dev-python/jaraco-collections[${PYTHON_USEDEP}]
+	ssl? (
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/routes[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+		dev-python/objgraph[${PYTHON_USEDEP}]
+		dev-python/path-py[${PYTHON_USEDEP}]
+		dev-python/requests-toolbelt[${PYTHON_USEDEP}]
+		dev-python/pytest-services[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -i -e '/cov/d' pytest.ini || die
+	# upstream has been using xfail to mark flaky tests, then added
+	# xfail_strict... not a good idea
+	sed -i -e '/xfail_strict/d' pytest.ini || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local EPYTEST_DESELECT=()
+	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
+		# broken by changes in traceback output
+		cherrypy/test/test_request_obj.py::RequestObjectTests::testErrorHandling
+		cherrypy/test/test_tools.py::ToolTests::testHookErrors
+	)
+
+	epytest
+}
diff --git a/dev-python/docutils/Manifest b/dev-python/docutils/Manifest
index c8668c1751d2..db3f34cd45fc 100644
--- a/dev-python/docutils/Manifest
+++ b/dev-python/docutils/Manifest
@@ -1,2 +1,3 @@
 DIST docutils-0.17.1.tar.gz 2016138 BLAKE2B aa0b6525ba2e3eaebc17010806952ed5f40919876fcb813f50cc05b628dfd22e6073a9a4b2bfe989089ae68d9b7111ae3a97dda2bde5c0536f8fb76c0942fe29 SHA512 5ec2087116bd5356fdffc54f07f6b0355aac5fa9d6caeefa77e8d201fd4706c0d419193c4d9a3964ae493da3091fe2c7dc36b74f81a1e1b9282173658b06e71b
 DIST docutils-0.18.1.tar.gz 2043249 BLAKE2B 3959199236baade9601d61c3f6d7b6f840fbefdd46d9ea05869fde2cd2c800356a01faba891f51e220c85e66f3029f49f616f2046b85041b674c64825a4242ec SHA512 44404a6cc9d4c1e79c73a6ffee2898e459c9925ab9661e5d41394e13b3d861334cf0c5efcd18e87eb03041374e326cfd00539a6b2ec5979678889e8a536c9542
+DIST docutils-0.19.tar.gz 2056383 BLAKE2B 9983a905642de4e81ca118578671b503ddfda4bef1afcc0524de40543e1f9617fd8d768ef467da49d2f01076683400bad6a0fe15f6b5a3a1e202c42b2e34ab1b SHA512 fb904a899f2b6f3c07c5079577bd7c52a3182cb85f6a4149391e523498df15bfa317f0c04095b890beeb3f89c2b444875a2a609d880ac4d7fbc3125e46b37ea5
diff --git a/dev-python/docutils/docutils-0.19.ebuild b/dev-python/docutils/docutils-0.19.ebuild
new file mode 100644
index 000000000000..6a0bff3604f4
--- /dev/null
+++ b/dev-python/docutils/docutils-0.19.ebuild
@@ -0,0 +1,73 @@
+# 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} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python Documentation Utilities (reference reStructuredText impl.)"
+HOMEPAGE="
+	https://docutils.sourceforge.io/
+	https://pypi.org/project/docutils/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2 GPL-3 public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	dev-python/pygments[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+"
+
+python_compile_all() {
+	# Generate html docs from reStructured text sources.
+
+	# Place html4css1.css in base directory to ensure that the generated reference to it is correct.
+	cp docutils/writers/html4css1/html4css1.css . || die
+
+	cd tools || die
+	"${EPYTHON}" buildhtml.py --input-encoding=utf-8 \
+		--stylesheet-path=../html4css1.css, --traceback ../docs || die
+}
+
+src_test() {
+	cd test || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	"${EPYTHON}" alltests.py -v || die "Testing failed with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# Install tools.
+	python_doscript tools/{buildhtml,quicktest}.py
+}
+
+install_txt_doc() {
+	local doc="${1}"
+	local dir="txt/$(dirname ${doc})"
+	docinto "${dir}"
+	dodoc "${doc}"
+}
+
+python_install_all() {
+	local DOCS=( *.txt )
+	local HTML_DOCS=( docs tools docutils/writers/html4css1/html4css1.css )
+
+	distutils-r1_python_install_all
+
+	local doc
+	while IFS= read -r -d '' doc; do
+		install_txt_doc "${doc}"
+	done < <(find docs tools -name '*.txt' -print0)
+}
diff --git a/dev-python/hatchling/Manifest b/dev-python/hatchling/Manifest
index c888e2fa2c6e..745a07a6de7a 100644
--- a/dev-python/hatchling/Manifest
+++ b/dev-python/hatchling/Manifest
@@ -1,3 +1,4 @@
 DIST hatch-hatchling-v1.3.1.gh.tar.gz 220023 BLAKE2B db336126d8c5235eab57ca53e2f8832b9590513f40215ff4b51d1b60c43b0d971b472dc4434cfcf77406143a4ed3172a2fcd95d4c7d11a6f39ccd937f9eff9e6 SHA512 21fa8bd4ffe0bec5ae9f8b9716ce3b7ece45c6a62bc74f0cd49f759baaa5b21343bcc9f2a8e505f0b724b7d73a4c1f84c863a29e064e95f4aa1a288098adc8d3
 DIST hatch-hatchling-v1.4.0.gh.tar.gz 229007 BLAKE2B 5a288a9de356fb06646ebb3eab95aee319d3e7d15a67d4a36cf52d0865a4ecd7ddd1e18db203c55136e950221f79572b152f9edf9398f52ecc927819e5a2f2fd SHA512 a104e092b2078eaeadfd6ea70b65bd8aabc91044e4e9fef4e1a54a61c138629e2a3963f26773e303f3cca0839ea63530849260b2d8c51b50fe67a3cdc5707029
 DIST hatch-hatchling-v1.4.1.gh.tar.gz 229194 BLAKE2B 9d7b11244ce67d64a05f4a737966a8f037031275ae5b2ecde395c172232eb5bbf0f38df4f0048c6732641bafbf524670bc1e6dd9d441cc4297ef74126b56971b SHA512 b8dc8dfdc7e251cad4161f59acc724122f8f7083a1ce170722b7b5c31ccf22488e3871be76ea3fad058be2cce263752099c9b548759e16ba644daaba0eca63ba
+DIST hatch-hatchling-v1.5.0.gh.tar.gz 232265 BLAKE2B 4fd57f7610831a025b9b0dddb89c4fe484d32d0b76a2d0cdafb76730b37c54af42ef27dc1c4d73061d888ce75806bd8f0fc70f5d39a077bd534716cf4e4a4db8 SHA512 9e5498b9da3a1f756e0f3e40daa63e45017588332da4197ac83b8402219bb9501b9c498dd881c5812b2b8903af591e4c6146aaf6dea8cc7b6bc664a85dee74e6
diff --git a/dev-python/hatchling/hatchling-1.5.0.ebuild b/dev-python/hatchling/hatchling-1.5.0.ebuild
new file mode 100644
index 000000000000..114864373972
--- /dev/null
+++ b/dev-python/hatchling/hatchling-1.5.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_TESTED=( python3_{7,8,9,10} pypy3 )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
+
+inherit distutils-r1
+
+TAG=${P/-/-v}
+MY_P=hatch-${TAG}
+DESCRIPTION="Modern, extensible Python build backend"
+HOMEPAGE="
+	https://pypi.org/project/hatchling/
+	https://github.com/pypa/hatch/
+"
+SRC_URI="
+	https://github.com/pypa/hatch/archive/${TAG}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}/backend
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/editables-0.2[${PYTHON_USEDEP}]
+	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
+	>=dev-python/pathspec-0.9[${PYTHON_USEDEP}]
+	>=dev-python/pluggy-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/tomli-1.2.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/atomicwrites[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+			dev-python/httpx[${PYTHON_USEDEP}]
+			dev-python/platformdirs[${PYTHON_USEDEP}]
+			dev-python/rich[${PYTHON_USEDEP}]
+			dev-python/tomli-w[${PYTHON_USEDEP}]
+			dev-python/virtualenv[${PYTHON_USEDEP}]
+		' "${PYTHON_TESTED[@]}")
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
+		einfo "Skipping tests on ${EPYTHON}"
+		return
+	fi
+
+	local -x EPYTEST_DESELECT=(
+		# these run pip to install stuff
+		tests/backend/dep/test_core.py::test_dependency_found
+		tests/backend/dep/test_core.py::test_extra_met
+		tests/backend/dep/test_core.py::test_extra_no_dependencies
+		tests/backend/dep/test_core.py::test_extra_unmet
+		tests/backend/dep/test_core.py::test_unknown_extra
+		tests/backend/dep/test_core.py::test_version_unmet
+	)
+
+	# top-level "tests" directory contains tests both for hatch
+	# and hatchling
+	cd "${WORKDIR}/${MY_P}" || die
+	local -x PYTHONPATH="src:${PYTHONPATH}"
+	epytest tests/backend
+}
diff --git a/dev-python/huawei-lte-api/Manifest b/dev-python/huawei-lte-api/Manifest
index 881e6024214b..58acc4b3d6e8 100644
--- a/dev-python/huawei-lte-api/Manifest
+++ b/dev-python/huawei-lte-api/Manifest
@@ -1 +1,2 @@
+DIST huawei-lte-api-1.6.1.gh.tar.gz 32963 BLAKE2B f159e1dc4cb759c09a88bb763c6ba5f43043eacf025e7ada871c816e0e72a238f9e7536dbc043f8596bef390ecfc2ee137c1a4c079ca33db6c3a3198147c9f98 SHA512 2a6a330c419af0d2b8eeff9d8b93a11cdf8050db04e609cb1d86a33ab770d7102c8e40652482c2500ce4bf4152b66b98ee1fc77be104db8ab9a9bbeec871ce20
 DIST huawei-lte-api-1.6.tar.gz 32617 BLAKE2B 194d2d983e7bd5bd456d3557b16795cda350ea157545c1ce37aa6d4dd0bace8a8a0c724b9d0ae4315e6f95585598b147a03acb77d84837bf879fa9b83737cafc SHA512 62f70853bba0fbd863e07e2d91309fc15c41508857486d01a02ec30ed513567d0880551744eed5a61517cc33a2f56583df892d22cca45124e95e24605ab23678
diff --git a/dev-python/huawei-lte-api/huawei-lte-api-1.6.1.ebuild b/dev-python/huawei-lte-api/huawei-lte-api-1.6.1.ebuild
new file mode 100644
index 000000000000..4c1a76ce3fc5
--- /dev/null
+++ b/dev-python/huawei-lte-api/huawei-lte-api-1.6.1.ebuild
@@ -0,0 +1,40 @@
+# 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} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="API For huawei LAN/WAN LTE Modems"
+HOMEPAGE="
+	https://github.com/Salamek/huawei-lte-api/
+	https://pypi.org/project/huawei-lte-api/
+"
+SRC_URI="
+	https://github.com/Salamek/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	# make cryptodome-friendly
+	sed -i -e 's:pycryptodomex:pycryptodome:' setup.py || die
+	find -name '*.py' -exec \
+		sed -i -e 's:Cryptodome:Crypto:g' {} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+distutils_enable_tests pytest
diff --git a/dev-python/numpy/numpy-1.22.4.ebuild b/dev-python/numpy/numpy-1.22.4.ebuild
index 0c518dd736ca..db7137fcf929 100644
--- a/dev-python/numpy/numpy-1.22.4.ebuild
+++ b/dev-python/numpy/numpy-1.22.4.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack"
 
 RDEPEND="
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index 6ec55ba19e9f..f681ea98d899 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -1,6 +1,2 @@
-DIST pikepdf-5.1.3.tar.gz 2356111 BLAKE2B 5a9ec1d06f91be44b4eacc68d7d9449a2bb74b59214ce3d1b10d3cdf81533d38450a2150834d0008cf81475e07e4de241ea16e438450dff6dadd5c15da533223 SHA512 d38a6203b9a4150e4daf4980517b72b0e8e797c57bd82009d6f95a1275c0e6f767e415e14fe6d1614bd51edaf660febafd0f0b85cc46482125aeced8f6912285
-DIST pikepdf-5.1.4.gh.tar.gz 2356865 BLAKE2B 7ebeedd7a2bb29371325b0cd6cb89cd56843eee1847cb26f0487d0114a3268e9a15171769abc16502c48684bb1bbe59050a2c692e17857f161ccd10a4663eeb0 SHA512 390c8f07bb5602715a061bf26b272cc8301dbb610ea06b8e5e5560282b7256c03e87717ab62a657c662ef51f549f5d52f0133f3806ff536451664ac93add625a
-DIST pikepdf-5.1.5.gh.tar.gz 2356890 BLAKE2B e08f311ad2714f856eb29510e847ca2ddf2b3919cc372d4bedb59c7449be69574a32ea6cd23f51c34d56096bb8d2936f70c52a6a948d513277ff2a5d13e35725 SHA512 e6da0471abdd2a8133fb5789f72eb948e32eae24ee61956fb71f5e279151bc6df5d18ac9b6d73987fd9b891739892111df8c5f93c90ba8ae022dbb2821858350
 DIST pikepdf-5.2.0.gh.tar.gz 2359546 BLAKE2B 953a5268eb7dc52934967b593237bb3006ee35e7a1657c0721ef4cdc874c9c51d7920fbdb7e38f67e221b01536166b8811a95021668491e8c783f51a08f49144 SHA512 f36ec09017aeac547c2b4ef17de7513293e8bf243707cb9c0c03826973be266847d8514002be546ac958a735e29765df94efdaecde6ad5f901c329dadc3e9451
-DIST pikepdf-5.3.0.gh.tar.gz 2360722 BLAKE2B 1be449661deb3e57f097e0a95fcd099c1652e0700077077e299c88ae131487e6f2bb89cc07ffc06bdf15f46bc6aa613ed823b9dcc6ef55f100f37451be7c2488 SHA512 ef82703447d20edc497fcac287b4eddb48f1901aa060dc5f57301469741bb15ce367d0eac4ec27431740707f0e56975dc36d8e7eb3897c879663d56134c14fb1
 DIST pikepdf-5.3.1.gh.tar.gz 2360816 BLAKE2B 02b36814144acbf05cf50d8bca6542271208af0ed7548dd8f41493b6e95183851033a3d4f3335f10d4bf6798606e9031aa2b38d28a9e824692fe8f78f1e68077 SHA512 b0256533011dae384ce657200db69b6e3ac93b4364fe55a2e0fb8fb2d993550dcfe4e05b723b81d62ed1db3cd544023e81a9e70fd807bcfb618f125ae5a35117
diff --git a/dev-python/pikepdf/pikepdf-5.1.3.ebuild b/dev-python/pikepdf/pikepdf-5.1.3.ebuild
deleted file mode 100644
index b901b27953dc..000000000000
--- a/dev-python/pikepdf/pikepdf-5.1.3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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
-
-MY_P=${P/_p/.post}
-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/_p/.post}.tar.gz
-		-> ${MY_P}.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-DEPEND="
-	>=app-text/qpdf-10.6.2:0=
-"
-RDEPEND="
-	${DEPEND}
-	<dev-python/pillow-10[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.0[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20[${PYTHON_USEDEP}]
-	>=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-6.4[${PYTHON_USEDEP}]
-	dev-python/tomli[${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 '/-n auto/d' pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/pikepdf/pikepdf-5.1.4.ebuild b/dev-python/pikepdf/pikepdf-5.1.4.ebuild
deleted file mode 100644
index 5d81334a2ca6..000000000000
--- a/dev-python/pikepdf/pikepdf-5.1.4.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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
-
-MY_P=${P/_p/.post}
-DESCRIPTION="Python library to work with pdf files based on qpdf"
-HOMEPAGE="
-	https://github.com/pikepdf/pikepdf/
-	https://pypi.org/project/pikepdf/
-"
-SRC_URI="
-	https://github.com/${PN}/${PN}/archive/v${PV/_p/.post}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	>=app-text/qpdf-10.6.2:0=
-"
-RDEPEND="
-	${DEPEND}
-	>=dev-python/pillow-9[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.0[${PYTHON_USEDEP}]
-	>=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-6.4[${PYTHON_USEDEP}]
-	dev-python/tomli[${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_tests pytest
-
-src_prepare() {
-	sed -i -e '/-n auto/d' pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/pikepdf/pikepdf-5.1.5.ebuild b/dev-python/pikepdf/pikepdf-5.1.5.ebuild
deleted file mode 100644
index b2fdd139b01a..000000000000
--- a/dev-python/pikepdf/pikepdf-5.1.5.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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
-
-MY_P=${P/_p/.post}
-DESCRIPTION="Python library to work with pdf files based on qpdf"
-HOMEPAGE="
-	https://github.com/pikepdf/pikepdf/
-	https://pypi.org/project/pikepdf/
-"
-SRC_URI="
-	https://github.com/${PN}/${PN}/archive/v${PV/_p/.post}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	>=app-text/qpdf-10.6.2:0=
-"
-RDEPEND="
-	${DEPEND}
-	>=dev-python/lxml-4.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pillow-9[${PYTHON_USEDEP}]
-	>=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-6.4[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
-	dev-python/tomli[${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_tests pytest
-
-src_prepare() {
-	sed -i -e '/-n auto/d' pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/pikepdf/pikepdf-5.3.0.ebuild b/dev-python/pikepdf/pikepdf-5.3.0.ebuild
deleted file mode 100644
index 1422766e810c..000000000000
--- a/dev-python/pikepdf/pikepdf-5.3.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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
-
-MY_P=${P/_p/.post}
-DESCRIPTION="Python library to work with pdf files based on qpdf"
-HOMEPAGE="
-	https://github.com/pikepdf/pikepdf/
-	https://pypi.org/project/pikepdf/
-"
-SRC_URI="
-	https://github.com/${PN}/${PN}/archive/v${PV/_p/.post}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	>=app-text/qpdf-10.6.2:0=
-"
-RDEPEND="
-	${DEPEND}
-	dev-python/deprecation[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pillow-9[${PYTHON_USEDEP}]
-	>=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-6.4[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
-	dev-python/tomli[${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_tests pytest
-
-src_prepare() {
-	sed -i -e '/-n auto/d' pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
index 3eb2db15fdad..321c8a649dd9 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -1,4 +1,2 @@
-DIST psycopg-3.0.14.gh.tar.gz 381063 BLAKE2B cc63bda476bd7f5b53698349d893f42e300395cb604ef458d75aa40d0c7f7ac3f89e734534a2df0710fedd6ae63ec1426174c0e78d57680fb63156a2e2aad60f SHA512 3abbe947bddbb1ccc47ce9a5d18351311ca4729e3f25a6dfc5238aac821e69223078beccc30366e375026eee04645fa336b4ad579a91c8ff9d5f852b8c5584be
 DIST psycopg-3.0.15.gh.tar.gz 384815 BLAKE2B feed19f8482767de12a549530b8fbef5cd374636f1b1e84b2746f23379760bf3b75fbbaed64b8d45d120b84a1e56b4ce6fe26bf29fb13e6fd20eb39e4aebad9a SHA512 65c0e081821ca580f56495073ca69fa38e98888ff3531dc55faacec647cfeafcc74767c53a7d3edbeea1e5bbc557ba08fbc089be8b6bc73963cbb459b029e313
-DIST psycopg2-2.8.6.tar.gz 383797 BLAKE2B da0e3f1e143c51c940ba1f51d3e457b492d880ab71267dacd4747444bc767711ccd6c2f54d9e10ce5ad8fae0c3206fb4b6199f267e9bbaf12eb654227f59c2b0 SHA512 1e1d5d8755c6d1a153d84210bf29902afafe853659d709e13abc6bc5772def13779d2394690af1c544384c9c607edc0fe5cf2763244fb346febf9a9e0032b45f
 DIST psycopg2-2.9.3.tar.gz 380611 BLAKE2B 78099da7378dcfa8b7f28aae4d533a7e890cdb7ae4c0cc718a9411e630fd07b56f074760fc29de8fe08fe727328cca39414a5f297fb92ed2f7471a24e633d18d SHA512 048184d1d162a371fc0fba711448a6fa8a6aac193421f4484c7f7b91c39065d5b632fa34fc15a901eca055d597302b1f9e38330b248ed0e4653dcdc544b0d660
diff --git a/dev-python/psycopg/psycopg-2.8.6-r1.ebuild b/dev-python/psycopg/psycopg-2.8.6-r1.ebuild
deleted file mode 100644
index 97e353191031..000000000000
--- a/dev-python/psycopg/psycopg-2.8.6-r1.ebuild
+++ /dev/null
@@ -1,55 +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 distutils-r1 flag-o-matic
-
-MY_PN="${PN}2"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="PostgreSQL database adapter for Python"
-HOMEPAGE="https://www.psycopg.org https://pypi.org/project/psycopg2/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="LGPL-3+"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="debug test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-db/postgresql-8.1:*"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? ( >=dev-db/postgresql-8.1[server] )"
-
-python_prepare_all() {
-	if use debug; then
-		sed -i 's/^\(define=\)/\1PSYCOPG_DEBUG,/' setup.cfg || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	initdb -D "${T}"/pgsql || die
-	# TODO: random port
-	pg_ctl -w -D "${T}"/pgsql start \
-		-o "-h '' -k '${T}'" || die
-	createdb -h "${T}" psycopg2_test || die
-
-	local -x PSYCOPG2_TESTDB_HOST="${T}"
-	distutils-r1_src_test
-
-	pg_ctl -w -D "${T}"/pgsql stop || die
-}
-
-python_test() {
-	"${EPYTHON}" -c "
-import tests
-tests.unittest.main(defaultTest='tests.test_suite')
-" --verbose || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/psycopg/psycopg-3.0.14.ebuild b/dev-python/psycopg/psycopg-3.0.14.ebuild
deleted file mode 100644
index 7008eef40317..000000000000
--- a/dev-python/psycopg/psycopg-3.0.14.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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="PostgreSQL database adapter for Python"
-HOMEPAGE="
-	https://www.psycopg.org/psycopg3/
-	https://github.com/psycopg/psycopg/
-	https://pypi.org/project/psycopg/
-"
-SRC_URI="
-	https://github.com/psycopg/psycopg/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S=${WORKDIR}/${P}/psycopg
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-
-DEPEND="
-	>=dev-db/postgresql-8.1:*
-"
-RDEPEND="
-	${DEPEND}
-	$(python_gen_cond_dep '
-		>=dev-python/backports-zoneinfo-0.2.0[${PYTHON_USEDEP}]
-	' 3.8)
-	$(python_gen_cond_dep '
-		>=dev-python/typing-extensions-3.10[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-"
-BDEPEND="
-	test? (
-		>=dev-db/postgresql-8.1[server]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# tests for the psycopg_pool package
-	tests/pool
-	# some broken mypy magic
-	tests/test_module.py::test_version
-	tests/test_module.py::test_version_c
-	tests/test_typing.py
-	# TODO, relying on undefined ordering in Python?
-	tests/test_dns_srv.py::test_srv
-)
-
-src_test() {
-	# tests are lurking in top-level directory
-	cd .. || die
-
-	initdb -D "${T}"/pgsql || die
-	# TODO: random port
-	pg_ctl -w -D "${T}"/pgsql start \
-		-o "-h '' -k '${T}'" || die
-	createdb -h "${T}" test || die
-
-	local -x PSYCOPG_TEST_DSN="host=${T} dbname=test"
-	distutils-r1_src_test
-
-	pg_ctl -w -D "${T}"/pgsql stop || die
-}
diff --git a/dev-python/psycopg/psycopg-3.0.15.ebuild b/dev-python/psycopg/psycopg-3.0.15.ebuild
index 1aebda51469d..fb1eb200344e 100644
--- a/dev-python/psycopg/psycopg-3.0.15.ebuild
+++ b/dev-python/psycopg/psycopg-3.0.15.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${P}/psycopg
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 
 DEPEND="
 	>=dev-db/postgresql-8.1:*
diff --git a/dev-python/pyspnego/Manifest b/dev-python/pyspnego/Manifest
index 348ca37b23ba..3837973bb196 100644
--- a/dev-python/pyspnego/Manifest
+++ b/dev-python/pyspnego/Manifest
@@ -1 +1,2 @@
 DIST pyspnego-0.5.2.tar.gz 328222 BLAKE2B 7c811948d1d3890e2d03f4a532b9c0158195684b0cdee915811b1ee3bfa791b84632edb6d098562aa7b9f4c36eb00f244e249340b4de557999ec2a0f176ebd1e SHA512 805da232d138edaf4094614df0ebc4840f0c1b9deb9586026bffe0ec17d54553e4d3876ffc53d87b13687b741951a68334369f0f2475cf2f12359f072dc6a0c8
+DIST pyspnego-0.5.3.tar.gz 389939 BLAKE2B 236151d9d9f37137d46b06a99f037922563b4d43931288129492aa7173f166d24c3086297e30a0f05158773101df9868f88efffe00864b1bd5deb0a99a496b61 SHA512 41ca9f785a7dcc99818da351e0a020ffaed72d65cd67b0f19ad4a462a6a1fe739d040acec85052133a19aed06066dae9a9e8f0b469713b331f6ddc52cd3b4c0a
diff --git a/dev-python/pyspnego/pyspnego-0.5.3.ebuild b/dev-python/pyspnego/pyspnego-0.5.3.ebuild
new file mode 100644
index 000000000000..cd9c4b619ae1
--- /dev/null
+++ b/dev-python/pyspnego/pyspnego-0.5.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+# py3.11: https://github.com/jborean93/pyspnego/issues/42
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Library to handle SPNEGO and CredSSP authentication"
+HOMEPAGE="
+	https://github.com/jborean93/pyspnego/
+	https://pypi.org/project/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
+
+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/pytest-sugar/Manifest b/dev-python/pytest-sugar/Manifest
index 69354e873cf4..f69d56569e43 100644
--- a/dev-python/pytest-sugar/Manifest
+++ b/dev-python/pytest-sugar/Manifest
@@ -1 +1,2 @@
 DIST pytest-sugar-0.9.4.tar.gz 12727 BLAKE2B 898692fc4083871d707fad44c7dd0c1298c28c190d705ef4525d4ba68d77bd37bb2634e43795ea553041317dc2f014d9be8ef52cfe40383ee75af36e5780cb98 SHA512 bbe375f0ae934d132457d698c9e09994a9a96a31860397f1b5e50b32139e5018f0137ddc0d3dd84bec29fc2b4c16592f59a38933c53fb8acec714c64689c4c76
+DIST pytest-sugar-0.9.5.tar.gz 13545 BLAKE2B 37c5241b951b3167c73537ca7bbb93f679673e57c84a13b74caacfcb8d5510b5e5ad215aa4aa33f722efffa54d30ff73d521bce412214857d11c25c255596bdc SHA512 4451d09181b6130591c504b2825a86777f5daa6972a6be7f2bc51139cf3ef2e57dfc1b8ea1972220a1c84866ed2584c684cc83c8052cb9105c0c3a9ea19922fe
diff --git a/dev-python/pytest-sugar/pytest-sugar-0.9.5.ebuild b/dev-python/pytest-sugar/pytest-sugar-0.9.5.ebuild
new file mode 100644
index 000000000000..76e0371f63ca
--- /dev/null
+++ b/dev-python/pytest-sugar/pytest-sugar-0.9.5.ebuild
@@ -0,0 +1,33 @@
+# 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} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="py.test plugin that changes the default look and feel of py.test"
+HOMEPAGE="
+	https://github.com/Teemu/pytest-sugar/
+	https://pypi.org/project/pytest-sugar/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/termcolor[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pyu2f/pyu2f-0.1.5.ebuild b/dev-python/pyu2f/pyu2f-0.1.5.ebuild
deleted file mode 100644
index 479e752675f1..000000000000
--- a/dev-python/pyu2f/pyu2f-0.1.5.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_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python based U2F host library"
-HOMEPAGE="https://github.com/google/pyu2f"
-SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( CONTRIBUTING.md README.md )
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyzmq/pyzmq-23.2.0.ebuild b/dev-python/pyzmq/pyzmq-23.2.0.ebuild
index 0a39297ee5af..ea074bb8c2ad 100644
--- a/dev-python/pyzmq/pyzmq-23.2.0.ebuild
+++ b/dev-python/pyzmq/pyzmq-23.2.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~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"
 IUSE="+draft"
 
 DEPEND="
diff --git a/dev-python/readability-lxml/Manifest b/dev-python/readability-lxml/Manifest
index 1fa7d079cd6a..50da2ee3e0b9 100644
--- a/dev-python/readability-lxml/Manifest
+++ b/dev-python/readability-lxml/Manifest
@@ -1 +1,2 @@
 DIST readability-lxml-0.6.1.tar.gz 13741 BLAKE2B 8bae46033e6eb3c171869746291a856267bc8f64ae088969405c5920229447fa470b6e14ea8b32b380c43d30e83ad9371149181d293bbfca6ff13fa271da3d74 SHA512 f7bead871dc84e2cc6dac18ced3f9fa223cd3961204330064e338b2e822ba9af58beb43be42b7f61a7cfb761f7c1d7a339d428c310d6be34b7546328f1eeb276
+DIST readability-lxml-0.8.1.gh.tar.gz 78871 BLAKE2B ef179d8bb727c0630e3af763a18170c1956be5cd3b8ad1cfe614b233964225e2e73b814c4ad628780eaffca21881d1ed276f45248a656b8c37ef1e6ccb121e85 SHA512 c5b296a35606f65643f72e7d9ee07d6820a7a6a36ce97350673ea6076b704f7ed72f92ded47dac56690cdf3776eb8fadbb02ea234355a9982d4127976b2e6c6e
diff --git a/dev-python/readability-lxml/metadata.xml b/dev-python/readability-lxml/metadata.xml
index 8c8101bcdb2c..ddb5b0f1787e 100644
--- a/dev-python/readability-lxml/metadata.xml
+++ b/dev-python/readability-lxml/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="project">
-  <email>core@liguros.net</email>
-  <name>Development</name>
+ <maintainer type="person">
+  <email>cyber+gentoo@sysrq.in</email>
+  <name>Anna</name>
  </maintainer>
  
  <origin>gentoo-guru-overlay</origin>
diff --git a/dev-python/readability-lxml/readability-lxml-0.8.1.ebuild b/dev-python/readability-lxml/readability-lxml-0.8.1.ebuild
new file mode 100644
index 000000000000..ccd04436773e
--- /dev/null
+++ b/dev-python/readability-lxml/readability-lxml-0.8.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+MY_PN="python-readability"
+DESCRIPTION="fast html to text parser (article readability tool)"
+HOMEPAGE="
+	https://pypi.org/project/readability-lxml/
+	https://github.com/buriy/python-readability
+"
+SRC_URI="https://github.com/buriy/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/cssselect[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	|| ( ( $(python_gen_cond_dep \
+			'dev-python/cchardet[${PYTHON_USEDEP}]' python3_{8..10}) )
+		dev-python/chardet[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep \
+			'dev-python/timeout-decorator[${PYTHON_USEDEP}]' python3_{8..11})
+	)
+"
+
+distutils_enable_tests unittest
+
+distutils_enable_sphinx doc/source \
+	dev-python/recommonmark \
+	dev-python/sphinx_rtd_theme
+
+python_test() {
+	[[ ${EPYTHON} == pypy3 ]] && \
+		return 0  # unsatisfied dep
+
+	distutils-r1_python_test
+}
diff --git a/dev-python/shapely/Manifest b/dev-python/shapely/Manifest
index 0145b67b8f00..e0d2a0642263 100644
--- a/dev-python/shapely/Manifest
+++ b/dev-python/shapely/Manifest
@@ -1,2 +1 @@
-DIST shapely-1.7.1.tar.gz 293368 BLAKE2B 14d9cb0c2b486a3a20b71c0cde7260ec357287ea020352c0320eea07b91674605bdcd22512b33c5ac5a71b89c3d811946f8dd6d3b90c61398203a4c68f30d067 SHA512 72070437960a8c1cf6504b5f4ccc8ec509f87fb6a90178e291aff14889f5add89f9ed4f7e9a19799ce0835c1aea3f0241eaa6efd4d8ea5b879f2167f7c1de50a
 DIST shapely-1.8.2.gh.tar.gz 322064 BLAKE2B f21f91eb58818aa30464c719b1079d382c5a00f13eda70c532e4a12f1612284240e5c8c110a867c74eaa4aac5f3a21fd10b23c7ce781808d4adc871d038b8b2b SHA512 c85323f180622235257aed28c85640c63bb43cbcb2bd7ed9b354a0f23a92e0ca8becf7a94e85edea3a90cfd01017ddfc6f268f4bb2945639c2cae29a73292bd6
diff --git a/dev-python/shapely/files/shapely-1.7.1-tests-support-geos-3.9.patch b/dev-python/shapely/files/shapely-1.7.1-tests-support-geos-3.9.patch
deleted file mode 100644
index 18b6c5ad9a46..000000000000
--- a/dev-python/shapely/files/shapely-1.7.1-tests-support-geos-3.9.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/tests/test_svg.py b/tests/test_svg.py
---- a/tests/test_svg.py	(revision 56c0f97a80e75308cf62e0bc4883238c10f56fdf)
-+++ b/tests/test_svg.py	(date 1615044742785)
-@@ -174,7 +174,8 @@
-         self.assertSVG(GeometryCollection(), '<g />')
-         # Valid
-         self.assertSVG(
--            Point(7, 3).union(LineString([(4, 2), (8, 4)])),
-+            GeometryCollection(
-+                [Point(7, 3), LineString([(4, 2), (8, 4)])]),
-             '<g><circle cx="7.0" cy="3.0" r="3.0" stroke="#555555" '
-             'stroke-width="1.0" fill="#66cc99" opacity="0.6" />'
-             '<polyline fill="none" stroke="#66cc99" stroke-width="2.0" '
---- a/tests/test_wkb.py	(revision 56c0f97a80e75308cf62e0bc4883238c10f56fdf)
-+++ b/tests/test_wkb.py	(date 1615044817079)
-@@ -1,6 +1,11 @@
-+import binascii
-+
-+import pytest
-+
-+from shapely import wkt
- from shapely.wkb import dumps, loads
- from shapely.geometry import Point
--import binascii
-+from shapely.geos import geos_version
-
-
- def bin2hex(value):
-@@ -49,3 +54,20 @@
-     # replace geometry srid with another
-     result = dumps(geom, srid=27700)
-     assert bin2hex(result) == "0101000020346C0000333333333333F33F3333333333330B40"
-+
-+
-+requires_geos_39 = pytest.mark.xfail(
-+    geos_version < (3, 9, 0), reason="GEOS >= 3.9.0 is required", strict=True)
-+
-+
-+@requires_geos_39
-+def test_point_empty():
-+    g = wkt.loads("POINT EMPTY")
-+    assert g.wkb_hex == "0101000000000000000000F87F000000000000F87F"
-+
-+
-+@requires_geos_39
-+def test_point_z_empty():
-+    g = wkt.loads("POINT Z EMPTY")
-+    assert g.wkb_hex == \
-+        "0101000080000000000000F87F000000000000F87F000000000000F87F"
-diff --git a/shapely/geos.py b/shapely/geos.py
---- a/shapely/geos.py	(revision 56c0f97a80e75308cf62e0bc4883238c10f56fdf)
-+++ b/shapely/geos.py	(date 1615044673942)
-@@ -84,7 +84,7 @@
-             'libgeos_c.so.1',
-             'libgeos_c.so',
-         ]
--        _lgeos = load_dll('geos_c', fallbacks=alt_paths)
-+        _lgeos = load_dll('libgeos_c', fallbacks=alt_paths)
-     # Necessary for environments with only libc.musl
-     c_alt_paths = [
-         'libc.musl-x86_64.so.1'
diff --git a/dev-python/shapely/shapely-1.7.1-r1.ebuild b/dev-python/shapely/shapely-1.7.1-r1.ebuild
deleted file mode 100644
index f1ca05469384..000000000000
--- a/dev-python/shapely/shapely-1.7.1-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Geometric objects, predicates, and operations"
-HOMEPAGE="https://pypi.org/project/Shapely/ https://github.com/Toblerity/Shapely"
-SRC_URI="https://github.com/Toblerity/Shapely/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P^}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-DEPEND=">=sci-libs/geos-3.9"
-RDEPEND="${DEPEND}
-	dev-python/numpy[${PYTHON_USEDEP}]
-"
-BDEPEND="${DEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-tests-support-geos-3.9.patch"
-)
-
-distutils_enable_tests --install pytest
-distutils_enable_sphinx docs dev-python/matplotlib
diff --git a/dev-python/thrift/Manifest b/dev-python/thrift/Manifest
index 45af747b5be9..4e5bde988056 100644
--- a/dev-python/thrift/Manifest
+++ b/dev-python/thrift/Manifest
@@ -1,2 +1 @@
-DIST thrift-0.14.1.tar.gz 4311458 BLAKE2B 00c0b77c3d722b0db833f03848df0b74ee64712ed1ff06e0b63b926eb493f43ffd9c316422b6044f74685471cdbd2ccea7c6305fd8dbbc10614f2151a3e16237 SHA512 e09e53b2ea3cad01ef81ab4b5a87bfed443cfda849a13c4f00ba0ed1cd1a1f9742faf95adb07f279506cc5f866c13fdce57149de1bc9e71ab5c40238037e8b22
 DIST thrift-0.16.0.tar.gz 4085114 BLAKE2B 17c35096f6848fb0795e4cb125fed3068c8e1e53f67f404f4dcab67df7a42fc049a7d615591c861eb9e59e3333e21f185e8615663008bc7c846a03722ea8b834 SHA512 468fff6be2def85959fdf8adac92a0cfa7f786083b3bafb2c31427dfe5725f4d10962052d13ea960828f6a317778d35e66b602744a570212352bfc637ae586e0
diff --git a/dev-python/thrift/thrift-0.14.1.ebuild b/dev-python/thrift/thrift-0.14.1.ebuild
deleted file mode 100644
index e93afb5ae2ee..000000000000
--- a/dev-python/thrift/thrift-0.14.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python implementation of Thrift"
-HOMEPAGE="https://pypi.org/project/thrift/ https://thrift.apache.org/"
-SRC_URI="https://downloads.apache.org/${PN}/${PV}//${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${P}/lib/py"
-
-python_install() {
-	distutils-r1_python_install
-	python_optimize
-}
diff --git a/dev-python/thrift/thrift-0.16.0.ebuild b/dev-python/thrift/thrift-0.16.0.ebuild
index f523248e1803..2055f091bf60 100644
--- a/dev-python/thrift/thrift-0.16.0.ebuild
+++ b/dev-python/thrift/thrift-0.16.0.ebuild
@@ -14,5 +14,5 @@ S="${WORKDIR}/${P}/lib/py"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~riscv x86 ~amd64-linux ~x86-linux"
 RESTRICT="test"
diff --git a/dev-python/xdoctest/Manifest b/dev-python/xdoctest/Manifest
index 763c097d4ac4..15fcae8bf6f0 100644
--- a/dev-python/xdoctest/Manifest
+++ b/dev-python/xdoctest/Manifest
@@ -1 +1,2 @@
 DIST xdoctest-1.0.0.gh.tar.gz 193294 BLAKE2B 95725757faafd2a15652557e07753ad8c4a8ee57b545169ba29b6e8f0ef5c7a021eff3c092cfe123da91311db98ef7700b29d52b1418a8160869402fb4ecfcab SHA512 8c77fbd8fcd1a3030b33651d35567dd4506ece3aa2c6155223d5cdea6e16510b59bcbd5b9ebb6dc13e20af92c5d07dc205485566b836874e835b18a53cbe7355
+DIST xdoctest-1.0.1.gh.tar.gz 200921 BLAKE2B 29d4947e8a49b11721c2ab8500e12334c9937d892519154267ad1ff3f98e3a35767eb770ed40d34c253e282e09e90de2567b92fd7b3167f7d8a58dcd762bc43d SHA512 c853f0b673ebc8b1f6fc6305a8688bffdf33cabab734a53f4ed1668d4f94d0431dd6e867b30a1c4588a86f3552e9b94ceaf540c3ed8e66f80bd9ce45ddbae690
diff --git a/dev-python/xdoctest/xdoctest-1.0.1.ebuild b/dev-python/xdoctest/xdoctest-1.0.1.ebuild
new file mode 100644
index 000000000000..720312c4496b
--- /dev/null
+++ b/dev-python/xdoctest/xdoctest-1.0.1.ebuild
@@ -0,0 +1,39 @@
+# 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="A rewrite of Python's builtin doctest module but without all the weirdness"
+HOMEPAGE="https://github.com/Erotemic/xdoctest/"
+SRC_URI="
+	https://github.com/Erotemic/xdoctest/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+"
+# dev-python/nbformat-5.1.{0..2} did not install package data
+BDEPEND="
+	test? (
+		>=dev-python/nbformat-5.1.2-r1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+#distutils_enable_sphinx docs/source \
+#	dev-python/autoapi \
+#	dev-python/sphinx_rtd_theme
+
+python_test() {
+	epytest --pyargs tests xdoctest
+}