9 files changed, 702 insertions, 0 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index c302882f52f1..e2b7eaef874c 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index 730337377295..e557ba763ae7 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -6,8 +6,10 @@ AUX cython-3.0.0_beta3-const-iter.patch 7842 BLAKE2B af1097e3f3b9f22f2ad5b8416eb
 AUX cython-3.0.0_beta3-py312-long.patch 1397 BLAKE2B 194906e0df79df8c0b3e42d5c3c29200cf0277f38ea70aaa8cd654ccb1d3ce44c1ce63de3d12cb4939b5a3855afdbdea0995e5aecce118547dce6d7ce3ce9677 SHA512 692c4f9972b2d6fe50ca40f784cb9deb3ee7dc0dd73f6028996ee59ff50549d87cf930e126cb75629d31d057a794760cb00373f8ad56802dddb5aef0fea8ae2a
 DIST cython-0.29.34.gh.tar.gz 2114639 BLAKE2B c5f70fd3e6074d9030a1035bc98d71b703e0f391b61bd91f3ffba2c35a29a98b9ff8ef2047e7c75743ead280f0f06a924abe84ae8bf7696b65da662a3c58ee0c SHA512 51679d1304d0f87dfb51e60c753f1ce60027f855a91cf130a5dcf84353884a7dcf09c01701945ae2f9173f8f095890c377d5faac28c2f01d7f764609c0130411
 DIST cython-0.29.35.gh.tar.gz 2115190 BLAKE2B ac23abbd2b560ee52a79840d995a4cf36ddb3a8705b9327010f1ad6add8028185c15703efcc1d59b581d65b5de38e123c0f07c36fe6ffe54a6efee7512161344 SHA512 35d679d94e1f731e004b83fb4ae0d569703b0800c913012308146b1c54463ce12cb1cf3733e24162fb357f179444c5ca31108a37850e6c749ddebac5175119f5
+DIST cython-0.29.36.gh.tar.gz 2115333 BLAKE2B 6d43779c7222ff65d7de3a35ec18ef636480807d53480a8f94cc8c92d462fcc2f4d201a3bbf6e840a11fd33025e32c53f85626b05c131d10eed2859cdca7eb2d SHA512 a086fe1a11290cd3c870b891e61a0a0e2595bab9c26888024a758b6950c07059346d682fa9349e46c0af89805abbdd750059b3189960b8ce18007dfb5eb4391a
 DIST cython-3.0.0b3.gh.tar.gz 2688784 BLAKE2B 933bb48b2bf5169c973a36c877a36eae28b80409a7ff395b82a14ac0740247496df3c9f2d69884c823b7475069f0c75d6cbbb964b88de60b38082e6e36659bff SHA512 f1d0fdcec4bc6b0f6cb66078592424fdcb7a028b79c5b9d41280ae112235736d11c9f4f793e810007e880ae0def195ac25999db59065c7f7bdcfab84b06bf7d3
 EBUILD cython-0.29.34.ebuild 2053 BLAKE2B 23381f1aef8140eb5becd09cb5f39563d8d801665b7fb6f8674658d7c5923855c9124dc88c10b0bc024b5b8771a1ed25faa938b7380dbb556b84d10a34b9a081 SHA512 7dd4ea66bdcb44dc64be8d617eac48bf4f80a32db5c8e2423a94c2c7ebef2857f1a103f07f32e6281d0fc84f4d78e27e8582006bebfc4cb7deae1f1b8c1eb333
 EBUILD cython-0.29.35.ebuild 2228 BLAKE2B c80e9cedb151c7d971bb52118f67332bbcecc1e780dbef65d7965d3bac23dceeee1a189b84e3956770866dcb73a3b2f2917d4db9b3cd0f49bdf3f0e82c5f01de SHA512 be56773909d380c114bb15b40a6f2c778be66e29d465f976c64beafdba1d28f445ab63853a100f1c9e5247bfca8b86277d4fccaa72b54c889162b337cc7c9fb8
+EBUILD cython-0.29.36.ebuild 2240 BLAKE2B 951c47bc8110df60e659b7c1d94fcf0fa841064d2e47dc1883fcd681ea19e77310872b00b5e1ce0bc73e6862b9e42b0bff00407e9612fe0096c91269b9bd9898 SHA512 5112fbe372f04050e7aabf954950b37ba489f19eb5ad913dbb1addf60263edf8bb283fac608254d6ba70d560cc1e9ad5f3e2f312d5256a7ccbcf0444fea789fd
 EBUILD cython-3.0.0_beta3-r2.ebuild 2115 BLAKE2B 0cacc31bd5d8bd48abaa04d2e218a5d2c6649bef1245b2df20d2d37791120482c7a7db7e18870a5d4494f6170fc04396ec5652bfde2c9cd6242c4a24f6ff7957 SHA512 1ceb34f826a96112cb97f2ba203d49db5f99680155755844f72af0b9d3efd9d1399c3dd9d839e6f1cc4f4c040fa048513ae1a0fc12fb01f37057a38d21257dda
 MISC metadata.xml 606 BLAKE2B 1ee3fc75852383aa0618afeb7521c3ae0e95b518c85b2c58ff958905092cf68017d313a09d25031a50b649f9dd1b452e751036f2552df9d91447baaeff0a8f0b SHA512 b7917c2e417cee9e59c8011246f7223f5095c87f0294ea140dbfc8fda0b09cf61c9f055380a9d3f74a07e71bb49d75f219d6224ea95f1f4d4b451e5688c13f78
diff --git a/dev-python/cython/cython-0.29.36.ebuild b/dev-python/cython/cython-0.29.36.ebuild
new file mode 100644
index 000000000000..3db83925618c
--- /dev/null
+++ b/dev-python/cython/cython-0.29.36.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_TESTED=( python3_{10..11} )
+# 3.12 not tested yet for https://github.com/cython/cython/issues/5285.
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_12 pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 multiprocessing toolchain-funcs elisp-common
+
+DESCRIPTION="A Python to C compiler"
+HOMEPAGE="
+	https://cython.org/
+	https://github.com/cython/cython/
+	https://pypi.org/project/Cython/
+"
+SRC_URI="
+	https://github.com/cython/cython/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="emacs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	emacs? ( >=app-editors/emacs-23.1:* )
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/numpy[${PYTHON_USEDEP}]
+		' "${PYTHON_TESTED[@]}")
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.29.22-spawn-multiprocessing.patch"
+	"${FILESDIR}/${PN}-0.29.23-test_exceptions-py310.patch"
+	"${FILESDIR}/${PN}-0.29.23-pythran-parallel-install.patch"
+)
+
+SITEFILE=50cython-gentoo.el
+
+distutils_enable_sphinx docs
+
+python_compile() {
+	# Python gets confused when it is in sys.path before build.
+	local -x PYTHONPATH=
+
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use emacs && elisp-compile Tools/cython-mode.el
+}
+
+python_test() {
+	if ! has "${EPYTHON/./_}" "${PYTHON_TESTED[@]}"; then
+		einfo "Skipping tests on ${EPYTHON} (xfail)"
+		return
+	fi
+
+	tc-export CC
+	# https://github.com/cython/cython/issues/1911
+	local -x CFLAGS="${CFLAGS} -fno-strict-overflow"
+	"${PYTHON}" runtests.py -vv -j "$(makeopts_jobs)" --work-dir "${BUILD_DIR}"/tests ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt )
+	distutils-r1_python_install_all
+
+	if use emacs; then
+		elisp-install ${PN} Tools/cython-mode.*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index e1778aa97b1f..64c93ca0e9d4 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -1,7 +1,10 @@
 AUX lxml-4.6.0-tests-pypy.patch 18051 BLAKE2B 99d97fa2e874c9bec4a866c3303b54ea2ab1e6abddf148d142cb66ee035b1eab1e05eed924d34451c5db38dc37f77104539cbfc2fe45815c17445b6359dcb857 SHA512 f6c6c2b00a49e6ca19d8b9123c364003a682c2e8df0c42d8600085d1cb094ba5cedd162bfc794e7d9acfff93aac771953dca5a879c3b957af1e2e8bd1db05515
 AUX lxml-4.9.2-py3.12-backport-unicode-fix.patch 1178 BLAKE2B c1a09df02a77c0b0b7fbd2b72b54a0b6103f1426ce0ebb531c58f6a4342eb1801a1394e296d71843e031308107d026c506f90141c87f19a39da877aef69c2fd6 SHA512 0b26031eac3158a87f7ab822d480d58fbfba9f70f983caa7c2fce3000bfc994218ad0ae3fb5737afbb17aeb90b02b841ccb91ca53dd722072dd8ad6a4317fe94
 AUX lxml-4.9.2-py3.12-drop-deprecated-imp.patch 1985 BLAKE2B af705cb2092d6468ae556d79c14ca96d8491cf7a96dc1699d0f3e70113637f724876adaa051545c6a434ee9f54a1784ab5e24eefcf7eef61edfdca88980c0f62 SHA512 088428b9a9e103b4476f8bb45f318032126571f518cbeeb2e04e78289f5bd69ce59b7b058abe3957b59b5077160ef4e67cbb5005da92572437f1c27a6e497d83
+AUX lxml-4.9.3-tests-pypy.patch 16751 BLAKE2B d9df5e5a64e89999d58d6f3c927fa1a74bc2311abb75a458c94302dac7f4717976aede69eb62e8dad109740a69f18aa03fbae693343f78634c3bc61764c3b81b SHA512 24e92f38d278c369c94be062523d8360cec9ee1de636939dca9c2a966a007bf544e96001d59057299eb7df797b54822e79060735bd8fde4843da559fa75e7d20
 DIST lxml-4.9.2.gh.tar.gz 957365 BLAKE2B 201b3977da90386e413f1b89a4b7ee1e44d6bbea05e622e92feb1d67c637ce46ebf746f0648f034ed3bccd609233ccf7d8a7ee456f13b8d9ca8587ddf1ebd32a SHA512 816b2fe2eef2a97a0df66cbc39850c6dc3d6470e4033cc73edb40c80c0afbbe6c084d042d7c98b29497926e76f648caa42e1ebe5d83060af08af6972316077b0
+DIST lxml-4.9.3.gh.tar.gz 958614 BLAKE2B 885ed89a7fbf3fedbcdf510652cd44a106d2be8eaf7c19f59ad13f0ded986bb40837894af5d31ea5d046fec56752891baacdef6249dbc62319191b9b2930e2a2 SHA512 74d40cbd02fc0329b789274b544af296edcb99e4c1a544dfbb7a90fdbe3e23b2621c5dfe7be3970f43c98cdd3d9bef9d5792c68db4648c2a12884b8104e1e1dc
 EBUILD lxml-4.9.2-r1.ebuild 2986 BLAKE2B b81bf7d96bb990acedfbfddf8556ccbe7d07bd7f38d6043eedb8add00ed196ab4f7d9494b958cc280ee64483fcae9423c4130a13026b63528f8bfbd9aea3d43d SHA512 80559e7b85c8180f337c5ac8fa2012096f7a60afd3dbb801047eb0ff99edf6179d84b20873137b508fc9485ab709060329afca021650623686f0bba94aac4732
 EBUILD lxml-4.9.2.ebuild 2924 BLAKE2B 9ce8ec0fd2fc1f58b0175d44d4e955bf26a2dd16b0282f7e7b5912f82ba57fa09d3e8c2befef52a9594504e32249cab9299441b76f04c6b87c47b412c755139f SHA512 db8b7cf3e8968ec2108b4dba41c1a0b5f72e5493d2e1b17434264d1b9d14a0361faac3440cb515e06178319b43fcbce76b939227786d161d70d6de1ade8e032a
+EBUILD lxml-4.9.3.ebuild 2876 BLAKE2B c625378331c4dfc34225cc29889324defbf9b5c4fda4586dd55646e7ddcff908363eeb59f50f6f818adb5f049128c827c0cb85eb20379f34617511cd7a73caa8 SHA512 c3f8039dded238a667bb9f464eb79fe7bdc695cb2d494458208f8fbf2b0a1986ce5d0a98d0e5c888e9c383c16b313bbdbcdefbe713ab8e6ab66d55b907418106
 MISC metadata.xml 463 BLAKE2B 9bcd092b61568f5d467230617b101f36245c41078e6a66c7ff63b22a6b4095de2ba3a59e48ce8b7842ce58d1255fa293995652daa3fab4c3af988498eaa30e97 SHA512 2ba5e340b59e0de4e472380e9c19b1f6f573e86e5c3c2e075f6151d369e94eea70e3ce36bfb5ece4da3fa69459e3ff83368f1df8302aa5754ae52f13c8f2312e
diff --git a/dev-python/lxml/files/lxml-4.9.3-tests-pypy.patch b/dev-python/lxml/files/lxml-4.9.3-tests-pypy.patch
new file mode 100644
index 000000000000..939e26e51242
--- /dev/null
+++ b/dev-python/lxml/files/lxml-4.9.3-tests-pypy.patch
@@ -0,0 +1,424 @@
+From 1804702b5e3c85c1a16014d62365a29d0a6d0c75 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Thu, 30 Jan 2020 06:15:27 +0100
+Subject: [PATCH] Skip tests failing on PyPy
+
+--- a/doc/element_classes.txt
++++ b/doc/element_classes.txt
+@@ -576,10 +576,10 @@ subclasses for elements of this namespace:
+ 
+   >>> print(honk_element[0].honk())
+   HONK
+-  >>> print(honk_element[0].honking)
++  >>> print(honk_element[0].honking)  # doctest: +ELLIPSIS
+   Traceback (most recent call last):
+   ...
+-  AttributeError: 'HonkNSElement' object has no attribute 'honking'
++  AttributeError: 'HonkNSElement' object has no attribute 'honking'...
+ 
+   >>> print(honk_element[1].text)  # uses fallback for non-elements
+   comment
+--- a/src/lxml/tests/test_elementtree.py
++++ b/src/lxml/tests/test_elementtree.py
+@@ -26,7 +26,7 @@ from .common_imports import (
+     BytesIO, etree, HelperTestCase,
+     ElementTree, cElementTree, ET_VERSION, CET_VERSION,
+     filter_by_version, fileInTestDir, canonicalize, tmpfile,
+-    _str, _bytes, unicode, IS_PYTHON2
++    _str, _bytes, unicode, IS_PYTHON2, IS_PYPY
+ )
+ 
+ if cElementTree is not None and (CET_VERSION <= (1,0,7) or sys.version_info[0] >= 3):
+@@ -2734,6 +2734,7 @@ class _ETreeTestCaseBase(HelperTestCase):
+         self.assertEqual('TEST', root2[0].get('{%s}a' % ns_href))
+ 
+     required_versions_ET['test_register_namespace'] = (1,3)
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_register_namespace(self):
+         # ET 1.3+
+         Element = self.etree.Element
+--- a/src/lxml/tests/test_errors.py
++++ b/src/lxml/tests/test_errors.py
+@@ -11,7 +11,7 @@ import unittest
+ import sys, gc, os.path
+ from lxml import etree
+ 
+-from .common_imports import HelperTestCase
++from .common_imports import HelperTestCase, IS_PYPY
+ 
+ 
+ class ErrorTestCase(HelperTestCase):
+@@ -25,6 +25,7 @@ class ErrorTestCase(HelperTestCase):
+     def test_empty_parse(self):
+         self.assertRaises(etree.XMLSyntaxError, etree.fromstring, '')
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_element_cyclic_gc_none(self):
+         # test if cyclic reference can crash etree
+         Element = self.etree.Element
+--- a/src/lxml/tests/test_http_io.py
++++ b/src/lxml/tests/test_http_io.py
+@@ -11,10 +11,11 @@ import textwrap
+ import sys
+ import gzip
+ 
+-from .common_imports import etree, HelperTestCase, BytesIO, _bytes
++from .common_imports import etree, HelperTestCase, BytesIO, _bytes, IS_PYPY
+ from .dummy_http_server import webserver, HTTPRequestCollector
+ 
+ 
++@unittest.skipIf(IS_PYPY, "broken on pypy")
+ class HttpIOTestCase(HelperTestCase):
+     etree = etree
+ 
+--- a/src/lxml/tests/test_nsclasses.py
++++ b/src/lxml/tests/test_nsclasses.py
+@@ -9,7 +9,7 @@ from __future__ import absolute_import
+ 
+ import unittest
+ 
+-from .common_imports import etree, HelperTestCase, _bytes, make_doctest
++from .common_imports import etree, HelperTestCase, _bytes, make_doctest, IS_PYPY
+ 
+ class ETreeNamespaceClassesTestCase(HelperTestCase):
+     
+@@ -46,6 +46,7 @@ class ETreeNamespaceClassesTestCase(HelperTestCase):
+         self.Namespace('ns02').clear()
+         self.Namespace('ns03').clear()
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_ns_classes(self):
+         bluff_dict = {'bluff' : self.bluff_class}
+         maeh_dict  = {'maeh'  : self.maeh_class}
+--- a/src/lxml/tests/test_objectify.py
++++ b/src/lxml/tests/test_objectify.py
+@@ -11,7 +11,8 @@ import random
+ import unittest
+ 
+ from .common_imports import (
+-    etree, HelperTestCase, fileInTestDir, doctest, make_doctest, _bytes, _str, BytesIO
++    etree, HelperTestCase, fileInTestDir, doctest, make_doctest, _bytes, _str, BytesIO,
++    IS_PYPY
+ )
+ 
+ from lxml import objectify
+@@ -215,11 +216,13 @@ class ObjectifyTestCase(HelperTestCase):
+         expected.update(DEFAULT_NSMAP)
+         self.assertEqual(root.value.nsmap, expected)
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_date_element_efactory_text(self):
+         # ObjectifiedDataElement can also be used as E-Factory
+         value = objectify.ObjectifiedDataElement('test', 'toast')
+         self.assertEqual(value.text, 'testtoast')
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_date_element_efactory_tail(self):
+         # ObjectifiedDataElement can also be used as E-Factory
+         value = objectify.ObjectifiedElement(objectify.ObjectifiedDataElement(), 'test', 'toast')
+@@ -376,6 +379,7 @@ class ObjectifyTestCase(HelperTestCase):
+         self.assertEqual("4", getattr(root.c1, "{}c2").text)
+         self.assertEqual("0", getattr(root.c1, "c2").text)
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_setattr(self):
+         for val in [
+             2, 2**32, 1.2, "Won't get fooled again", 
+@@ -811,6 +815,7 @@ class ObjectifyTestCase(HelperTestCase):
+         self.assertEqual(3, len(root.findall(".//b")))
+         self.assertEqual(2, len(root.findall("b")))
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_build_tree(self):
+         root = self.Element('root')
+         root.a = 5
+@@ -840,6 +845,7 @@ class ObjectifyTestCase(HelperTestCase):
+         self.assertEqual(value, None)
+         self.assertEqual(value.get(XML_SCHEMA_NIL_ATTR), "true")
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_bool(self):
+         Element = self.Element
+         SubElement = self.etree.SubElement
+@@ -877,6 +883,7 @@ class ObjectifyTestCase(HelperTestCase):
+         self.assertEqual(objectify.DataElement(False).text, "false")
+         self.assertEqual(objectify.DataElement(True).text, "true")
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_str(self):
+         Element = self.Element
+         SubElement = self.etree.SubElement
+@@ -884,6 +891,7 @@ class ObjectifyTestCase(HelperTestCase):
+         root.s = "test"
+         self.assertTrue(isinstance(root.s, objectify.StringElement))
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_str_intliteral(self):
+         Element = self.Element
+         SubElement = self.etree.SubElement
+@@ -891,6 +899,7 @@ class ObjectifyTestCase(HelperTestCase):
+         root.s = "3"
+         self.assertTrue(isinstance(root.s, objectify.StringElement))
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_str_floatliteral(self):
+         Element = self.Element
+         SubElement = self.etree.SubElement
+@@ -898,6 +907,7 @@ class ObjectifyTestCase(HelperTestCase):
+         root.s = "3.72"
+         self.assertTrue(isinstance(root.s, objectify.StringElement))
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_str_mul(self):
+         Element = self.Element
+         SubElement = self.etree.SubElement
+@@ -910,6 +920,7 @@ class ObjectifyTestCase(HelperTestCase):
+         self.assertRaises(TypeError, operator.mul, root.s, "honk")
+         self.assertRaises(TypeError, operator.mul, "honk", root.s)
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_str_add(self):
+         Element = self.Element
+         SubElement = self.etree.SubElement
+@@ -920,6 +931,7 @@ class ObjectifyTestCase(HelperTestCase):
+         self.assertEqual("test" + s, root.s + s)
+         self.assertEqual(s + "test", s + root.s)
+             
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_str_mod(self):
+         s = "%d %f %s %r"
+         el = objectify.DataElement(s)
+@@ -985,6 +997,7 @@ class ObjectifyTestCase(HelperTestCase):
+         self.assertTrue(isinstance(value, objectify.StringElement))
+         self.assertEqual(value, "3.20")
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_ustr(self):
+         Element = self.Element
+         SubElement = self.etree.SubElement
+@@ -992,6 +1005,7 @@ class ObjectifyTestCase(HelperTestCase):
+         root.s = _str("test")
+         self.assertTrue(isinstance(root.s, objectify.StringElement))
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_ustr_intliteral(self):
+         Element = self.Element
+         SubElement = self.etree.SubElement
+@@ -999,6 +1013,7 @@ class ObjectifyTestCase(HelperTestCase):
+         root.s = _str("3")
+         self.assertTrue(isinstance(root.s, objectify.StringElement))
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_ustr_floatliteral(self):
+         Element = self.Element
+         SubElement = self.etree.SubElement
+@@ -1006,6 +1021,7 @@ class ObjectifyTestCase(HelperTestCase):
+         root.s = _str("3.72")
+         self.assertTrue(isinstance(root.s, objectify.StringElement))
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_ustr_mul(self):
+         Element = self.Element
+         SubElement = self.etree.SubElement
+@@ -1018,6 +1034,7 @@ class ObjectifyTestCase(HelperTestCase):
+         self.assertRaises(TypeError, operator.mul, root.s, _str("honk"))
+         self.assertRaises(TypeError, operator.mul, _str("honk"), root.s)
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_ustr_add(self):
+         Element = self.Element
+         SubElement = self.etree.SubElement
+@@ -1043,6 +1060,7 @@ class ObjectifyTestCase(HelperTestCase):
+         self.assertTrue(isinstance(value, objectify.StringElement))
+         self.assertEqual(value, _str("3.20"))
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_int(self):
+         Element = self.Element
+         root = Element("{objectified}root")
+@@ -1059,6 +1077,7 @@ class ObjectifyTestCase(HelperTestCase):
+         value = objectify.DataElement(123)
+         self.assertEqual(hash(value), hash(123))
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_float(self):
+         Element = self.Element
+         SubElement = self.etree.SubElement
+@@ -1075,6 +1094,7 @@ class ObjectifyTestCase(HelperTestCase):
+         value = objectify.DataElement(5.5)
+         self.assertEqual(hash(value), hash(5.5))
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_float_precision(self):
+         # test not losing precision by shortened float str() value
+         # repr(2.305064300557): '2.305064300557'
+@@ -1094,6 +1114,7 @@ class ObjectifyTestCase(HelperTestCase):
+         s = "2.305064300557"
+         self.assertEqual(objectify.FloatElement(s), float(s))
+   
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_float_precision_consistency(self):
+         # test consistent FloatElement values for the different instantiation
+         # possibilities
+@@ -1180,6 +1201,7 @@ class ObjectifyTestCase(HelperTestCase):
+         self.assertEqual(value.text, None)
+         self.assertEqual(value.pyval, None)
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_unregistered(self):
+         Element = self.Element
+         SubElement = self.etree.SubElement
+@@ -1342,6 +1364,7 @@ class ObjectifyTestCase(HelperTestCase):
+         self.assertEqual(["why", "try"],
+                           strs)
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_str_cmp(self):
+         XML = self.XML
+         root = XML(_bytes('<root><b>test</b><b>taste</b><b></b><b/></root>'))
+@@ -1369,6 +1392,7 @@ class ObjectifyTestCase(HelperTestCase):
+         self.assertEqual(root.b, "")
+         self.assertEqual("", root.b)
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_int_cmp(self):
+         XML = self.XML
+         root = XML(_bytes('<root><b>5</b><b>6</b></root>'))
+@@ -1391,6 +1415,7 @@ class ObjectifyTestCase(HelperTestCase):
+         
+     # float + long share the NumberElement implementation with int
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_bool_cmp(self):
+         XML = self.XML
+         root = XML(_bytes('<root><b>false</b><b>true</b></root>'))
+@@ -2060,6 +2085,7 @@ class ObjectifyTestCase(HelperTestCase):
+                           before = [objectify.getRegisteredTypes()[0].name],
+                           after  = [objectify.getRegisteredTypes()[1].name])
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_registered_type_stringify(self):
+         from datetime import datetime
+         def parse_date(value):
+@@ -2530,46 +2556,55 @@ class ObjectifyTestCase(HelperTestCase):
+ 
+     # E-Factory tests, need to use sub-elements as root element is always
+     # type-looked-up as ObjectifiedElement (no annotations)
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_efactory_int(self):
+         E = objectify.E
+         root = E.root(E.val(23))
+         self.assertTrue(isinstance(root.val, objectify.IntElement))
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_efactory_float(self):
+         E = objectify.E
+         root = E.root(E.val(233.23))
+         self.assertTrue(isinstance(root.val, objectify.FloatElement))
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_efactory_str(self):
+         E = objectify.E
+         root = E.root(E.val("what?"))
+         self.assertTrue(isinstance(root.val, objectify.StringElement))
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_efactory_unicode(self):
+         E = objectify.E
+         root = E.root(E.val(_str("blöödy häll", encoding="ISO-8859-1")))
+         self.assertTrue(isinstance(root.val, objectify.StringElement))
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_efactory_bool(self):
+         E = objectify.E
+         root = E.root(E.val(True))
+         self.assertTrue(isinstance(root.val, objectify.BoolElement))
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_efactory_none(self):
+         E = objectify.E
+         root = E.root(E.val(None))
+         self.assertTrue(isinstance(root.val, objectify.NoneElement))
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_efactory_value_concatenation(self):
+         E = objectify.E
+         root = E.root(E.val(1, "foo", 2.0, "bar ", True, None))
+         self.assertTrue(isinstance(root.val, objectify.StringElement))
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_efactory_attrib(self):
+         E = objectify.E
+         root = E.root(foo="bar")
+         self.assertEqual(root.get("foo"), "bar")
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_efactory_nested(self):
+         E = objectify.E
+         DataElement = objectify.DataElement
+@@ -2584,6 +2619,7 @@ class ObjectifyTestCase(HelperTestCase):
+         self.assertTrue(isinstance(root.value[0], objectify.IntElement))
+         self.assertTrue(isinstance(root.value[1], objectify.FloatElement))
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_efactory_subtype(self):
+         class Attribute(objectify.ObjectifiedDataElement):
+             def __init__(self):
+@@ -2739,7 +2775,8 @@ def test_suite():
+     suite = unittest.TestSuite()
+     suite.addTests([unittest.makeSuite(ObjectifyTestCase)])
+     suite.addTests(doctest.DocTestSuite(objectify))
+-    suite.addTests([make_doctest('../../../doc/objectify.txt')])
++    if not IS_PYPY:
++        suite.addTests([make_doctest('../../../doc/objectify.txt')])
+     return suite
+ 
+ if __name__ == '__main__':
+--- a/src/lxml/tests/test_xpathevaluator.py
++++ b/src/lxml/tests/test_xpathevaluator.py
+@@ -8,7 +8,7 @@ from __future__ import absolute_import
+ 
+ import unittest, sys
+ 
+-from .common_imports import etree, HelperTestCase, _bytes, BytesIO, doctest, make_doctest
++from .common_imports import etree, HelperTestCase, _bytes, BytesIO, doctest, make_doctest, IS_PYPY
+ 
+ 
+ class ETreeXPathTestCase(HelperTestCase):
+@@ -740,8 +740,9 @@ def test_suite():
+         suite.addTests([unittest.makeSuite(ETreeXPathExsltTestCase)])
+     suite.addTests([unittest.makeSuite(ETreeETXPathClassTestCase)])
+     suite.addTests([doctest.DocTestSuite()])
+-    suite.addTests(
+-        [make_doctest('../../../doc/xpathxslt.txt')])
++    if not IS_PYPY:
++        suite.addTests(
++            [make_doctest('../../../doc/xpathxslt.txt')])
+     return suite
+ 
+ if __name__ == '__main__':
+--- a/src/lxml/tests/test_xslt.py
++++ b/src/lxml/tests/test_xslt.py
+@@ -17,6 +17,8 @@ from textwrap import dedent
+ from tempfile import NamedTemporaryFile, mkdtemp
+ 
+ is_python3 = sys.version_info[0] >= 3
++is_pypy = (getattr(sys, 'implementation', None) == 'pypy' or
++           getattr(sys, 'pypy_version_info', None) is not None)
+ 
+ try:
+     unicode
+@@ -2098,8 +2100,9 @@ def test_suite():
+         suite.addTests([unittest.makeSuite(Py3XSLTTestCase)])
+     suite.addTests(
+         [make_doctest('../../../doc/extensions.txt')])
+-    suite.addTests(
+-        [make_doctest('../../../doc/xpathxslt.txt')])
++    if not is_pypy:
++        suite.addTests(
++            [make_doctest('../../../doc/xpathxslt.txt')])
+     return suite
+ 
+ if __name__ == '__main__':
+-- 
+2.41.0
diff --git a/dev-python/lxml/lxml-4.9.3.ebuild b/dev-python/lxml/lxml-4.9.3.ebuild
new file mode 100644
index 000000000000..207b59bada90
--- /dev/null
+++ b/dev-python/lxml/lxml-4.9.3.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+
+inherit distutils-r1 optfeature toolchain-funcs
+
+DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
+HOMEPAGE="
+	https://lxml.de/
+	https://pypi.org/project/lxml/
+	https://github.com/lxml/lxml/
+"
+SRC_URI="
+	https://github.com/lxml/lxml/archive/${P}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S=${WORKDIR}/lxml-${P}
+
+LICENSE="BSD ElementTree GPL-2 PSF-2"
+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 ~x64-solaris"
+IUSE="doc examples +threads test"
+RESTRICT="!test? ( test )"
+
+# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
+DEPEND="
+	>=dev-libs/libxml2-2.10.3
+	>=dev-libs/libxslt-1.1.38
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	virtual/pkgconfig
+	<dev-python/cython-3[${PYTHON_USEDEP}]
+	>=dev-python/cython-0.29.29[${PYTHON_USEDEP}]
+	doc? (
+		$(python_gen_any_dep '
+			dev-python/docutils[${PYTHON_USEDEP}]
+			dev-python/pygments[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
+		')
+	)
+	test? (
+		dev-python/cssselect[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.9.3-tests-pypy.patch
+)
+
+python_check_deps() {
+	use doc || return 0
+	python_has_version -b "dev-python/docutils[${PYTHON_USEDEP}]" &&
+	python_has_version -b "dev-python/pygments[${PYTHON_USEDEP}]" &&
+	python_has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" &&
+	python_has_version -b "dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]"
+}
+
+python_prepare_all() {
+	# avoid replacing PYTHONPATH in tests.
+	sed -i -e '/sys\.path/d' test.py || die
+
+	# don't use some random SDK on Darwin
+	sed -i -e '/_ldflags =/s/=.*isysroot.*darwin.*None/= None/' \
+		setupinfo.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	tc-export PKG_CONFIG
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use doc && emake html
+}
+
+python_test() {
+	local dir=${BUILD_DIR}/test$(python_get_sitedir)/lxml
+	local -x PATH=${BUILD_DIR}/test/usr/bin:${PATH}
+
+	cp -al "${BUILD_DIR}"/{install,test} || die
+	cp -al src/lxml/tests "${dir}/" || die
+	cp -al src/lxml/html/tests "${dir}/html/" || die
+	ln -rs "${S}"/doc "${dir}"/../../ || die
+
+	"${EPYTHON}" test.py -vv --all-levels -p || die "Test ${test} fails with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use doc; then
+		local DOCS=( README.rst *.txt doc/*.txt )
+		local HTML_DOCS=( doc/html/. )
+	fi
+	if use examples; then
+		dodoc -r samples
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "Support for BeautifulSoup as a parser backend" dev-python/beautifulsoup4
+	optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect
+}
diff --git a/dev-python/pyflakes/Manifest b/dev-python/pyflakes/Manifest
index 1f21df77b761..2f77b6d71012 100644
--- a/dev-python/pyflakes/Manifest
+++ b/dev-python/pyflakes/Manifest
@@ -1,3 +1,5 @@
+AUX pyflakes-3.0.1-python3.11.patch 1531 BLAKE2B c68512c3bf6c1d3eebbaead6bf47274731de46c73a830b8ad48655a7fbf1f5420ce3a9f2d5638c459979d94d2ede38b3f07d00cfd2c4b25ce9d44b78ded33fb7 SHA512 d1ff78e686be4c4222ace7cf0af950f9926a3d2185fdb46f7294fce4779c062016c5a0a20ac2d025c329c24dc4a55482a1298565e4331240b8baab9bbc6c529b
 DIST pyflakes-3.0.1.tar.gz 63554 BLAKE2B 992dc4c81204c9ae2fd44744452e76a11209552edaef930edb14b7ba4763720cd1c0c0cd148fa7edd474b33aa529d8ec28f7f35a2b02b707d58cf70243fc13a9 SHA512 10ffe2b92f3885d40578452423a93609f8546b2392997bdbc3f64ca0094516ce6b8449e5d3675bda5fdbc16190c89be23609559fc4cd4f1c97e6af032226d7b7
+EBUILD pyflakes-3.0.1-r1.ebuild 620 BLAKE2B b82e38a4db8a3c344d6d9b81577f572b5b2df518ec3a3d9d5b25bee74c6bfadb0793e79a0931085a5905142fdc9e4d14ae414c1e48d9e8c5d2fcffcd59dec690 SHA512 6531711e4c4df49f9bcff4898f166fbc6b76e13bdacad6c5b0632c1e10eb6f2c953cfb52641f6b114aaa853f4ac7bc322c0e0527fa993d7dd6c9ff6328fa77e4
 EBUILD pyflakes-3.0.1.ebuild 561 BLAKE2B ee64e82d9a6bf6cb081e54290e49206fb08c608a144e1d4edebc11f60a15ff78939e05867bf7a9a134e4a3c716030224cde1938f5294b17d3e2a4b6711f6fa74 SHA512 d92be6b250b56ebeafc396eb18eaef2d4d065f3dda7a2d5d53f3c0125b52d6742232afe5f38bb3cc5ff67ebcd3b72c66eb200767085e5513dbd85297a0b25192
 MISC metadata.xml 763 BLAKE2B e15bc4240e0cc54bd0d7ecca523bcc43c5ae6ebd4f195815f7b2c3494e0366f1cc6feadbc63fce82390ed414e8f52a7bdf15f5c56909ab39879814ff1b178558 SHA512 bb8e0b6f746c99e5185a8bca736f0af36068ae0de45d1bde9663f0e732770366ac20f2116ddd9d7a85239146cf5d7b8fbbfc5c225d7bca4650001f86468a0142
diff --git a/dev-python/pyflakes/files/pyflakes-3.0.1-python3.11.patch b/dev-python/pyflakes/files/pyflakes-3.0.1-python3.11.patch
new file mode 100644
index 000000000000..db804f42c775
--- /dev/null
+++ b/dev-python/pyflakes/files/pyflakes-3.0.1-python3.11.patch
@@ -0,0 +1,38 @@
+https://github.com/PyCQA/pyflakes/commit/836631f2f73d45baa4021453d89fc9fd6f52be58
+https://bugs.gentoo.org/909554
+
+From 836631f2f73d45baa4021453d89fc9fd6f52be58 Mon Sep 17 00:00:00 2001
+From: Anthony Sottile <asottile@umich.edu>
+Date: Mon, 12 Jun 2023 21:00:45 -0400
+Subject: [PATCH] fix error reporter and testsuite in 3.11.4+ (#775)
+
+--- a/pyflakes/reporter.py
++++ b/pyflakes/reporter.py
+@@ -56,8 +56,9 @@ def syntaxError(self, filename, msg, lineno, offset, text):
+         else:
+             line = text.splitlines()[-1]
+ 
++        # lineno might be None if the error was during tokenization
+         # lineno might be 0 if the error came from stdin
+-        lineno = max(lineno, 1)
++        lineno = max(lineno or 0, 1)
+ 
+         if offset is not None:
+             # some versions of python emit an offset of -1 for certain encoding errors
+--- a/pyflakes/test/test_api.py
++++ b/pyflakes/test/test_api.py
+@@ -621,8 +621,12 @@ def test_misencodedFileUTF16(self):
+ x = "%s"
+ """ % SNOWMAN).encode('utf-16')
+         with self.makeTempFile(source) as sourcePath:
+-            self.assertHasErrors(
+-                sourcePath, [f"{sourcePath}: problem decoding source\n"])
++            if sys.version_info < (3, 11, 4):
++                expected = f"{sourcePath}: problem decoding source\n"
++            else:
++                expected = f"{sourcePath}:1: source code string cannot contain null bytes\n"  # noqa: E501
++
++            self.assertHasErrors(sourcePath, [expected])
+ 
+     def test_checkRecursive(self):
+         """
diff --git a/dev-python/pyflakes/pyflakes-3.0.1-r1.ebuild b/dev-python/pyflakes/pyflakes-3.0.1-r1.ebuild
new file mode 100644
index 000000000000..cbe9dae91c15
--- /dev/null
+++ b/dev-python/pyflakes/pyflakes-3.0.1-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Passive checker for Python programs"
+HOMEPAGE="
+	https://github.com/PyCQA/pyflakes/
+	https://pypi.org/project/pyflakes/
+"
+
+LICENSE="MIT"
+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 ~x64-solaris"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-python3.11.patch
+)
+
+distutils_enable_tests unittest