Adding metadata

author: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2023-10-25 18:38:30 +0000
committer: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2023-10-25 18:38:30 +0000
commit: 9fec51ed1c26051f8714173ba91a558a09c4c856 (patch)
tree: 281bb1329b489c581860b913331e995b75911103 /dev-python
parent: 140978c7aeb9245ccf14b7c51447806bd6628474 (diff)
download: baldeagleos-repo-9fec51ed1c26051f8714173ba91a558a09c4c856.tar.gz
baldeagleos-repo-9fec51ed1c26051f8714173ba91a558a09c4c856.tar.xz
baldeagleos-repo-9fec51ed1c26051f8714173ba91a558a09c4c856.zip
89 files changed, 1288 insertions, 1891 deletions
diff --git a/dev-python/Babel/Babel-2.13.1.ebuild b/dev-python/Babel/Babel-2.13.1.ebuild
new file mode 100644
index 000000000000..1bbbae3f3338
--- /dev/null
+++ b/dev-python/Babel/Babel-2.13.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 pypi
+
+# see scripts/download_import_cldr.py
+CLDR_PV=42.0
+DESCRIPTION="Collection of tools for internationalizing Python applications"
+HOMEPAGE="
+	https://babel.pocoo.org/
+	https://pypi.org/project/Babel/
+	https://github.com/python-babel/babel/
+"
+SRC_URI+="
+	https://unicode.org/Public/cldr/${CLDR_PV%.*}/cldr-common-${CLDR_PV}.zip
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+# RDEPEND in BDEPEND for import_cldr.py usage, bug #852158
+BDEPEND="
+	app-arch/unzip
+	${RDEPEND}
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+src_prepare() {
+	rm babel/locale-data/*.dat || die
+	rm babel/global.dat || die
+	distutils-r1_src_prepare
+}
+
+python_configure() {
+	if [[ ! -f babel/global.dat ]]; then
+		"${EPYTHON}" scripts/import_cldr.py "${WORKDIR}"/common || die
+	fi
+}
+
+python_test() {
+	local EPYTEST_DESELECT=()
+	if [[ ${EPYTHON} == python3.12 ]]; then
+		EPYTEST_DESELECT+=(
+			# seems to be a corner case, might be a regression in cpython
+			# https://github.com/python-babel/babel/issues/1005
+			tests/messages/test_extract.py::ExtractPythonTestCase::test_utf8_message_with_utf8_bom
+			tests/messages/test_extract.py::ExtractPythonTestCase::test_utf8_message_with_utf8_bom_and_magic_comment
+			tests/messages/test_extract.py::ExtractPythonTestCase::test_utf8_raw_strings_match_unicode_strings
+			tests/messages/test_extract.py::ExtractTestCase::test_f_strings
+			tests/messages/test_extract.py::ExtractTestCase::test_f_strings_non_utf8
+		)
+	fi
+
+	local -x TZ=UTC
+	epytest
+}
diff --git a/dev-python/Babel/Manifest b/dev-python/Babel/Manifest
index a268d743f2f9..90bf16850e12 100644
--- a/dev-python/Babel/Manifest
+++ b/dev-python/Babel/Manifest
@@ -1,3 +1,4 @@
 DIST Babel-2.12.1.tar.gz 9906735 BLAKE2B d78838f9a2032eae998f1d751ad803fec81c03be498db934e34e0702d28e0815a7848e55af73ea4dff45e3cf063b9e45ab06c749b8d3f15b7742e209bf3d06ef SHA512 93c4bf343d99a1f47f43f8b828eb79098cb429bac1034d58b5aa49adff68116e458067f3784d997f34515828a7432fd18f7abbaeee59b47a4ee8ea744908b33b
 DIST Babel-2.13.0.tar.gz 9909829 BLAKE2B d30aa56a1aba0c3caaa8fdc9210ca3a21fd70b6687c86de23f63cc2af7e1c4d3d1f00a8fc5287480808b643c21dc997992fddfb9d038248d762137453f0bdb72 SHA512 43f4b5fdd8653639111a767c4b082333d89695507e92c3fca88262f23ee7531d4600ec794e908e78a64da1ec54020c7127df3deaf979e15c4e1067cdb839aa47
+DIST Babel-2.13.1.tar.gz 9909844 BLAKE2B f4e0cb6d19c2ecd24a8e67e7d77531248cb5a8d100a5da2a9fe147aef3c15339728c82d4fe9095563c0a0b83dede7c5e27f29281bc3bf0cac5deff7cce409335 SHA512 c27c76456094927bd43ae46cd3e08fcc729dd810a6092da6c86e863523c10746bb3759e7fc9f5396504ab914743ef013904b63b3aa63338602f23aaf83d42cba
 DIST cldr-common-42.0.zip 30178050 BLAKE2B 076e3eca12534feff8e0e54bdc1fa38fc0db0f78cac8b4e35b343763a8ac6787745aa36be165684f4d6dda423409c4431a8e4941c53ae7d340ead0b35edbca30 SHA512 315448fe6a9ac2d5a6a7fd1a27b38c5db30fed053654a803d50e3a8d06aa08ad153e8e57089fa094c561f41a54f37eecda0701b47a1813879902be71945aa38a
diff --git a/dev-python/Faker/Faker-19.12.0.ebuild b/dev-python/Faker/Faker-19.12.0.ebuild
new file mode 100644
index 000000000000..eefcf36cb4ef
--- /dev/null
+++ b/dev-python/Faker/Faker-19.12.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A Python package that generates fake data for you"
+HOMEPAGE="
+	https://github.com/joke2k/faker/
+	https://pypi.org/project/Faker/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+	!dev-ruby/faker
+"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},tiff]
+		dev-python/validators[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=faker.contrib.pytest.plugin
+	epytest
+}
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index 0ec9fb0fd012..9611d2410e95 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -1,5 +1,6 @@
 DIST Faker-19.10.0.tar.gz 1680833 BLAKE2B dcb8e630597f195f5a2e365f7fb362dffecde3828c899e844d6e2ec36f4a4451bac58f3f5ec7f349e81da2ba94f2f0229f061a3b9eb1bd3afbca726e33dd3a09 SHA512 6bd787d3c511e82081869486d36c4512af066736345f293a4b1bba4afa680084d5c9ed2099d6a20aa4dd93c0255cc0623bf3972744280dae7c8492641f1612fe
 DIST Faker-19.11.0.tar.gz 1694359 BLAKE2B 7e24dfa58136626e7dc82f458388749cb7d506a9a0ea14bccc13a302f4b89aad7eaf4703b5b59726588ef56e2f80de27496d53b8035ab27b5f0982d838ebbe0e SHA512 df1da4e1e02a612b755f5167941181df0e08d4701f31c52618915a0b5f3f92adbc05ba816d2e975d8123e1fe03ed8e1dbd600519ac7c37b1fa85c86022c39efa
+DIST Faker-19.12.0.tar.gz 1697656 BLAKE2B 630623b9563d1ac7d35977390b0ac6253af0d33833e96dca1abfe9e073bdeb2df522eca64b7aaead0d39ed98c7e4c9f09f1ba8f9bc3a2b31397505c0403f66b3 SHA512 c663f373bee5b435fb8b96c9bc089e4e924bfe3c31af90faa6007b74c7cd7de5d8fad9f22314c0712419b99057bafa97702d5aa3e14a72f212b784bad09f6547
 DIST Faker-19.6.1.tar.gz 1668966 BLAKE2B 48e1d0c658e7cd482660b797e5ac8e107c84e7d2be9ab86e55cb5f0da662ed742565c1f5a3176d1f2588b8ffafcc37e7dbd072c78e5b1ab94bea8678ea9f1d48 SHA512 1511f03cb41f70a22784a8dc1cdb5b58fdc19fc6f67d4a414a9b15619d019ec6b6564b7fa50db03535aaa3650ae93e4c948c732ae65e61652d7469d9ad83db36
 DIST Faker-19.6.2.tar.gz 1680331 BLAKE2B 3453c531a1860c3e1782e24ad2d892d8291e1fafc698483639f43e7bdd281cee6e5c8bf7e60181db72011c1434ca3bc1c7f2a877ce136bf6e4f00286249033b9 SHA512 8a7929135ad562fafc2c95408ed644e7b965215d3e9ea2f2682e2aa2a5bab9759ab42d67380c7f8c89cf099cb65ad0dd13f6575c028f20550ef157f7db90102b
 DIST Faker-19.7.0.tar.gz 1680303 BLAKE2B 80169d818749003b6961adb85969eb025c38b81d8d333466b304815396aaf646b1a9e1fb9457e68292600576fa6a91ae1851af85e2bc3403dfa383f223fe49ab SHA512 f9b47d0bf52f5ba3a300222d45ad087eedbdf9ed7b1cae11cb600834f8919247e9000211157811dc016be7040925ec7930a407e8ea497ca87cae382d1edd2a56
diff --git a/dev-python/aiostream/Manifest b/dev-python/aiostream/Manifest
index 8018bcc41fd5..9c90b2209360 100644
--- a/dev-python/aiostream/Manifest
+++ b/dev-python/aiostream/Manifest
@@ -1,3 +1,4 @@
 DIST aiostream-0.4.5.gh.tar.gz 39797 BLAKE2B 5aeb4da46158d949190af22133f1798831e14f8d8da231d3dc098caaace303061bfa49dfef1d52c533ce20201937bf5da33f36806634b2e73ccbc48c00962486 SHA512 ac1a67a6d27e18e290c5ae5b069de2e7f7205120bc747885261e23155019d5630c1f7b643df3a4fef12844d52cdfc0f1fcdcf5cb35a0061000d426c62dcffb1d
 DIST aiostream-0.5.0.gh.tar.gz 42508 BLAKE2B 44acb97c42aa7fbe56981e5d237fd28eb531e38255a3beca98f0c7fd33a019e1fa525938b6ff21d1c49df5424d1093417003bb280f6d9ee8609a0f475a347a25 SHA512 bcab27272cde42b8a09a41f9b818d8094514eeeab4b1c0304c6d2b908bcf1142d029882d51ab427b34db215dbaedf519c772be2e67a1d7f9ca5a3def0d04b7ae
 DIST aiostream-0.5.1.gh.tar.gz 42439 BLAKE2B fff62e73d0da156a18ec935051e46b2ec17b36b7541db4791083bd1873f53a1ce0576a11e8ca0071bb6194312f184c4eb3cf9c5fdbd37f86768b1111edc867b5 SHA512 a93f2969a19f5e9d0ce334a54be935092b26e2b621ef3fe27bb101fa812360349c77fc9c7dc41b56491b314c236622ab812e2ee0fd9c6c136e431781b3733a75
+DIST aiostream-0.5.2.gh.tar.gz 42945 BLAKE2B 36e4f3c7834df589da3e7ec8bafb6a5b6fe40a1e868fbe0b9b81233f6721852b0e31b12144775db8785835cd5a3a0ca0a88784f7955388efd55b6ce97311b10e SHA512 282139cda0f7d08dd11af88bc3a568054906c2e0e2708f72e0ce3a67d13a44822612e3989c398ab346f8c043f17ad2e5cd2f958b1461325ad9768affec8f63fc
diff --git a/dev-python/aiostream/aiostream-0.5.2.ebuild b/dev-python/aiostream/aiostream-0.5.2.ebuild
new file mode 100644
index 000000000000..c3fd9359ea01
--- /dev/null
+++ b/dev-python/aiostream/aiostream-0.5.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Generator-based operators for asynchronous iteration"
+HOMEPAGE="
+	https://pypi.org/project/aiostream/
+	https://github.com/vxgmichel/aiostream/
+"
+SRC_URI="
+	https://github.com/vxgmichel/aiostream/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e 's:--cov aiostream --cov-report html --cov-report term::' \
+		setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/apsw/Manifest b/dev-python/apsw/Manifest
index a8515ed4d534..3dcd42f6e307 100644
--- a/dev-python/apsw/Manifest
+++ b/dev-python/apsw/Manifest
@@ -2,3 +2,4 @@ DIST apsw-3.42.0.1.gh.tar.gz 881270 BLAKE2B a983aebe53f6baf419fb0fec6d87797d11c1
 DIST apsw-3.43.0.0.gh.tar.gz 887997 BLAKE2B ce74eaed990cdf4742ce39743abf0dc112ee3f588bfa0ccca102829d4e29fd38194ac42a85dee25e18f666bdbb2137c99440583996513ea27977374de945ffd7 SHA512 013ef8a45b556498192673c77d8de50136680d061087a80d7ce880137f1ca469812e9237b7336fbb8aacd8d3a775e819a42dc5e70e2d907cf6fea56b80534755
 DIST apsw-3.43.1.0.gh.tar.gz 901289 BLAKE2B 3f463896ce587326421ae78a26b5cccbc5c43a2c54b9502c166f599705fc9afe867c3be5f2ea4de8bc4d2da2f3bf09e034a27744d2114a5bc9b5c622bd852543 SHA512 a3343af87638f04786086c282cf50bfce3074e2a3165ebf172740be13021138a83356e594969791029879dfef12149775b48e0912eb14817358434b3b72ada67
 DIST apsw-3.43.1.1.gh.tar.gz 901590 BLAKE2B 0fb1942aebf60443c12901e1b21bb7b9fce1e90d406bca80580563cee2d8aaf45b9c2294317cf374484fccd8b595439e13df01b14512514f78ec60ae1e905990 SHA512 3121e594a9d4c358ecb2f90becadc06fe987a3e7d6897fd655d5ae9aff6c8d1521257c2a34a68a8e6114cf7a71479544433e599522bee93e3fb729ee9763a112
+DIST apsw-3.43.2.0.gh.tar.gz 908230 BLAKE2B e583cbb5c636b9d38762668d8cc664c7342e50a4330d3714a93679043e322ea03cf7c9bf09396ea5025e74ab66747fc509790e4f17fd722a654d6f8d1774949d SHA512 760ebef288bec4e08a06fc8e1e720e9c51ada19196efb7491988c7cab31dc54f9082c5cc668acf04d28818dbcd41a8a45df66c1fd78d2716862ec9a2faa022ed
diff --git a/dev-python/apsw/apsw-3.43.2.0.ebuild b/dev-python/apsw/apsw-3.43.2.0.ebuild
new file mode 100644
index 000000000000..ba100e11e586
--- /dev/null
+++ b/dev-python/apsw/apsw-3.43.2.0.ebuild
@@ -0,0 +1,51 @@
+# 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_{8,9,10,11,12} )
+
+inherit distutils-r1
+
+DESCRIPTION="APSW - Another Python SQLite Wrapper"
+HOMEPAGE="
+	https://github.com/rogerbinns/apsw/
+	https://pypi.org/project/apsw/
+"
+SRC_URI="
+	https://github.com/rogerbinns/apsw/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+IUSE="doc"
+
+DEPEND="
+	>=dev-db/sqlite-${PV%.*}:3
+"
+RDEPEND="
+	${DEPEND}
+"
+
+src_configure() {
+	cat >> setup.cfg <<-EOF || die
+		[build_ext]
+		enable=load_extension
+		use_system_sqlite_config=True
+	EOF
+}
+
+python_test() {
+	esetup.py build_test_extension
+	cd "${T}" || die
+	"${EPYTHON}" -m apsw.tests -v || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/argh/Manifest b/dev-python/argh/Manifest
index c21797e60428..2780e70dd451 100644
--- a/dev-python/argh/Manifest
+++ b/dev-python/argh/Manifest
@@ -1,3 +1,4 @@
 DIST argh-0.29.4.tar.gz 52694 BLAKE2B 6d2b75200ea7b570ac199139ba7bc92b5bfa41fa4e21d19eff17d8506c4a28c6043413a25679cab52f9d81b8bb9a1f35b77ffee3beaa98c43660ad9e5c6b8dfc SHA512 017346afb237429de1228f604a763f919528fd359edfabb7b5a5c3a48c5e5be5a5a385672d54299cd15e5bc82257d8c33816fbc463873ffb9b3c3a54b40fccfc
 DIST argh-0.30.0.tar.gz 59803 BLAKE2B 2e0a5d9dfbe5177ac434224b78b0575f4b2b4373abee8ba97cbb31617e855309ed152e83e84c03c3b5666705493011bc4a0c86396ed5891914e9af3436d9b058 SHA512 a16fa32cd1fdcd842335ebecdaefce48d248a0a6449b592a3e83dbeb02543123e36dc057f457d7bb097c1b4e118d11a800ecc40a3847e81533d8dcf1d292111d
 DIST argh-0.30.1.tar.gz 60275 BLAKE2B 24e80f51f2c2f76d605b4282045ffe98f274f3e4692a3dfc26e35aa32a97a79fdc78b795622a2cb593ed83657c1cb1ecef562b43f5b8dc3097f4909403aa98ce SHA512 a24bdc92180ebce217433842e223e958ef222dc81feba8ee22ba0b219b5c259f3d2e79f8ebdf7334b624f69c83814322aa1e768cc72f644c0b16fb2863910035
+DIST argh-0.30.2.tar.gz 61528 BLAKE2B f4ef544c67cecaeaba63ca7c97425be0924712c380081971cbe67fbcfeb4a723b5a3e9bca4c33db02fb6466a4a632d756282f8e49a2c69dad4589004c3f83acc SHA512 68950e521fb6c98dbef8c1df334c2a0ae8253f6874a64d8b891c94608ac959344bae0ba65d61379796f304197f5b7f55ab8444957d1b230aa2e4d19bb080953e
diff --git a/dev-python/argh/argh-0.30.2.ebuild b/dev-python/argh/argh-0.30.2.ebuild
new file mode 100644
index 000000000000..b39fbe43f5ea
--- /dev/null
+++ b/dev-python/argh/argh-0.30.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A simple argparse wrapper"
+HOMEPAGE="
+	https://pythonhosted.org/argh/
+	https://github.com/neithere/argh/
+	https://pypi.org/project/argh/
+"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+LICENSE="LGPL-3"
+
+BDEPEND="
+	test? (
+		dev-python/iocapture[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index 0d59c7608e49..d9ffb5932762 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,5 +1,2 @@
-DIST astroid-2.15.6.gh.tar.gz 462156 BLAKE2B f5df204a0b635d29165da1566afd9259ff26102fef3b56685ad9e10fe1cdae35aa90b1e1f81293e591c03122e980936dfd91b521dfe7a4c8cfacb8b40bcac9d6 SHA512 20c4d316176b84d61b5f44823026926e84c7de3c3a6febaa23cf9c8c5a9507ce65168804a61cb2db0ffcc7ec0ecb687282e6c794485135203cc25d30064e0047
-DIST astroid-2.15.7.gh.tar.gz 462906 BLAKE2B 7a984f9f7c67c2956958b23ee2ca94c1f86284d8a50aaedbe10b9dca887802189cba21f19ee66b394f347f415d61946aaff52e4d0448271edba77b6bd958fa0e SHA512 716665744915d8a635ac124f03ffe6f7aee6bde6d98c238551ea1c6468595d6c327bb2d5605f66e7ba6294ec1b79c85b861034acba8a4584095ba38e24f82ae9
 DIST astroid-2.15.8.gh.tar.gz 462922 BLAKE2B 6a4bf0a50333701aab9282ab126fc53d30621d4e7a54796ac93d1db30bc37098d5409f3ffe91ed279bce5866e2e381eafc7f54f18c86aa3a7fc835f0bf844d9a SHA512 d5d008df3e99c036fb38094c416c080745dad640d46e837b07336a23d5a929823b8b884564486600335791a1be0568cbe519b76e6bd3334e72725966af8cc5f5
-DIST astroid-3.0.0.gh.tar.gz 461185 BLAKE2B f6b5923f95f23fdc4731b75f5335d7e7ead6aa85b07c5d2a57bf2ce560774a5d85ad0dfba076e4f24bbc7a17050945956291f5a016867bee049913358f8fc3dd SHA512 c1dbc42a35f7eea9bd87bd1c5701086271f8d4974b6b0e45b301f0b1841f4936bff32cd26647d9e9d9a7636017b5930a290ece0a4001b04dcc50e01344b43acb
 DIST astroid-3.0.1.gh.tar.gz 461593 BLAKE2B de3458bcd9ba111020132e89b6e2fdf18b81b82cba68c986e84af91c910e6c70e7d13ff024b7947f3fa08e2491ba211a77a35421b3d5cd184b94e6a833c0da42 SHA512 2c8a4cf22959aef1eb9510430bcc55d00fcda76d022575786c9a59c093fe4196b67c0b9401f9226595a4cbf1fb9444bdfbb9ac2d83c115ec1d7d46cb7dd75dbd
diff --git a/dev-python/astroid/astroid-2.15.6.ebuild b/dev-python/astroid/astroid-2.15.6.ebuild
deleted file mode 100644
index b48734c94862..000000000000
--- a/dev-python/astroid/astroid-2.15.6.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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_{8,9,10,11,12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="
-	https://github.com/pylint-dev/astroid/
-	https://pypi.org/project/astroid/
-"
-SRC_URI="
-	https://github.com/pylint-dev/astroid/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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/wrapt-2[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/typing-extensions-4.0.0[${PYTHON_USEDEP}]
-	' 3.9 3.10)
-"
-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 they're broken
-		tests/test_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
-		tests/test_regrtest.py::NonRegressionTests::test_numpy_distutils
-		tests/brain/test_regex.py::TestRegexBrain::test_regex_pattern_and_match_subscriptable
-		# some problem with warnings (our options?)
-		tests/test_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_one_arg
-		tests/test_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_two_args
-		tests/test_scoped_nodes.py::test_deprecation_of_doc_attribute
-		# requires six bundled in urllib3, sigh
-		tests/test_modutils.py::test_file_info_from_modpath__SixMetaPathImporter
-		# requires pip, and looks suspicious anyway
-		tests/test_manager.py::IsolatedAstroidManagerTest::test_no_user_warning
-		# pydantic-2?
-		tests/brain/test_dataclasses.py::test_pydantic_field
-	)
-
-	# Faker causes sys.path_importer_cache keys to be overwritten
-	# with PosixPaths
-	epytest -p no:faker
-}
diff --git a/dev-python/astroid/astroid-2.15.7.ebuild b/dev-python/astroid/astroid-2.15.7.ebuild
deleted file mode 100644
index 6b53b64885af..000000000000
--- a/dev-python/astroid/astroid-2.15.7.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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_{8,9,10,11,12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="
-	https://github.com/pylint-dev/astroid/
-	https://pypi.org/project/astroid/
-"
-SRC_URI="
-	https://github.com/pylint-dev/astroid/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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/wrapt-2[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/typing-extensions-4.0.0[${PYTHON_USEDEP}]
-	' 3.9 3.10)
-"
-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 they're broken
-		tests/test_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
-		tests/test_regrtest.py::NonRegressionTests::test_numpy_distutils
-		tests/brain/test_regex.py::TestRegexBrain::test_regex_pattern_and_match_subscriptable
-		# some problem with warnings (our options?)
-		tests/test_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_one_arg
-		tests/test_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_two_args
-		tests/test_scoped_nodes.py::test_deprecation_of_doc_attribute
-		# requires six bundled in urllib3, sigh
-		tests/test_modutils.py::test_file_info_from_modpath__SixMetaPathImporter
-		# requires pip, and looks suspicious anyway
-		tests/test_manager.py::IsolatedAstroidManagerTest::test_no_user_warning
-		# pydantic-2?
-		tests/brain/test_dataclasses.py::test_pydantic_field
-	)
-
-	# Faker causes sys.path_importer_cache keys to be overwritten
-	# with PosixPaths
-	epytest -p no:faker
-}
diff --git a/dev-python/astroid/astroid-2.15.8.ebuild b/dev-python/astroid/astroid-2.15.8.ebuild
deleted file mode 100644
index db912c61a2e6..000000000000
--- a/dev-python/astroid/astroid-2.15.8.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# 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_{8,9,10,11,12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="
-	https://github.com/pylint-dev/astroid/
-	https://pypi.org/project/astroid/
-"
-SRC_URI="
-	https://github.com/pylint-dev/astroid/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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/wrapt-2[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/typing-extensions-4.0.0[${PYTHON_USEDEP}]
-	' 3.9 3.10)
-"
-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 they're broken
-		tests/test_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
-		tests/test_regrtest.py::NonRegressionTests::test_numpy_distutils
-		tests/brain/test_regex.py::TestRegexBrain::test_regex_pattern_and_match_subscriptable
-		# some problem with warnings (our options?)
-		tests/test_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_one_arg
-		tests/test_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_two_args
-		tests/test_scoped_nodes.py::test_deprecation_of_doc_attribute
-		# requires six bundled in urllib3, sigh
-		tests/test_modutils.py::test_file_info_from_modpath__SixMetaPathImporter
-		# requires pip, and looks suspicious anyway
-		tests/test_manager.py::IsolatedAstroidManagerTest::test_no_user_warning
-		# pydantic-2?
-		tests/brain/test_dataclasses.py::test_pydantic_field
-		# TODO
-		tests/test_manager.py::ClearCacheTest::test_clear_cache_clears_other_lru_caches
-	)
-
-	# Faker causes sys.path_importer_cache keys to be overwritten
-	# with PosixPaths
-	epytest -p no:faker
-}
diff --git a/dev-python/astroid/astroid-3.0.0-r1.ebuild b/dev-python/astroid/astroid-3.0.0-r1.ebuild
deleted file mode 100644
index 4260e40b17d3..000000000000
--- a/dev-python/astroid/astroid-3.0.0-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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_{8,9,10,11,12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="
-	https://github.com/pylint-dev/astroid/
-	https://pypi.org/project/astroid/
-"
-SRC_URI="
-	https://github.com/pylint-dev/astroid/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-# Version specified in pyproject.toml
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/typing-extensions-4.0.0[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/attrs[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.17.0[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/regex[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# no clue why they're broken
-		tests/test_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
-		tests/test_regrtest.py::NonRegressionTests::test_numpy_distutils
-#		tests/brain/test_regex.py::TestRegexBrain::test_regex_pattern_and_match_subscriptable
-#		# some problem with warnings (our options?)
-#		tests/test_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_one_arg
-#		tests/test_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_two_args
-#		tests/test_scoped_nodes.py::test_deprecation_of_doc_attribute
-#		# requires six bundled in urllib3, sigh
-#		tests/test_modutils.py::test_file_info_from_modpath__SixMetaPathImporter
-#		# requires pip, and looks suspicious anyway
-#		tests/test_manager.py::IsolatedAstroidManagerTest::test_no_user_warning
-		# pydantic-2?
-		tests/brain/test_dataclasses.py::test_pydantic_field
-#		# TODO
-#		tests/test_manager.py::ClearCacheTest::test_clear_cache_clears_other_lru_caches
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/astroid/astroid-3.0.0.ebuild b/dev-python/astroid/astroid-3.0.0.ebuild
deleted file mode 100644
index 76b2c80d026d..000000000000
--- a/dev-python/astroid/astroid-3.0.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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_{8,9,10,11,12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="
-	https://github.com/pylint-dev/astroid/
-	https://pypi.org/project/astroid/
-"
-SRC_URI="
-	https://github.com/pylint-dev/astroid/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-# Version specified in pyproject.toml
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/typing-extensions-4.0.0[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/attrs[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.17.0[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/regex[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# no clue why they're broken
-		tests/test_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
-		tests/test_regrtest.py::NonRegressionTests::test_numpy_distutils
-#		tests/brain/test_regex.py::TestRegexBrain::test_regex_pattern_and_match_subscriptable
-#		# some problem with warnings (our options?)
-#		tests/test_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_one_arg
-#		tests/test_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_two_args
-#		tests/test_scoped_nodes.py::test_deprecation_of_doc_attribute
-#		# requires six bundled in urllib3, sigh
-#		tests/test_modutils.py::test_file_info_from_modpath__SixMetaPathImporter
-#		# requires pip, and looks suspicious anyway
-#		tests/test_manager.py::IsolatedAstroidManagerTest::test_no_user_warning
-		# pydantic-2?
-		tests/brain/test_dataclasses.py::test_pydantic_field
-#		# TODO
-#		tests/test_manager.py::ClearCacheTest::test_clear_cache_clears_other_lru_caches
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/awxkit/Manifest b/dev-python/awxkit/Manifest
index 272a6f524f3c..245ccbe4c798 100644
--- a/dev-python/awxkit/Manifest
+++ b/dev-python/awxkit/Manifest
@@ -5,3 +5,4 @@ DIST awx-23.0.0.gh.tar.gz 17657491 BLAKE2B 0dbd00f45f4c5dfb0f1d74c81a726401375b9
 DIST awx-23.1.0.gh.tar.gz 70704479 BLAKE2B dc0e920b2036e71825afda5b65aa6e2326364589d82464d48ccc17e886fd9dfa1eebee005439cb6e628a50be65959208e3e9b02716881833b343e556fd90d8ca SHA512 85e4e8298789f6886b6e63eba90b0af30fe7c78804fe5df187c79af928c05637f4cdac6b69db511e5a37480488bc542b913fd73f2a5cbd0490b1b941fbd4dced
 DIST awx-23.2.0.gh.tar.gz 70711100 BLAKE2B 5159c7231f085c01d543cf3c8be9ad22428f158911ae1941fde71a6988dbdc9e7e57a5990c4d616f0ceb1f156a707913fb7c74198df1c4de7d655151e2c39f9f SHA512 9d100ee05130cab5da63272c2f7b2bf8d729a7c2ca4c77a68b12dd282c94c657c38b217985f12c566b3c360d0d9d5fec506dcb1c2b306ef6b7aa63154b6c9840
 DIST awx-23.3.0.gh.tar.gz 70716121 BLAKE2B 90172efb44e20287b4729bc9afa445d6d914b83c1c4c8c5c598ac74f3b89d8e91917ab10934973a88332590751cbfbc9ce8565f0c7ee84de6dea9d8a59ce9fa8 SHA512 4f25e56bf8b16fd5f1f1c4771c939c8604db3bf39a6110487ce95d5d0591a303771228776773eec78f917bf03a298d67ec475813aea97e7170ae09920f17cac5
+DIST awx-23.3.1.gh.tar.gz 70712836 BLAKE2B 54009dcd4b7e6baeadf04271e3b6945ea7488c32c543641d003ed531d2d8ba0b06463bc9acce87dbf95fcde15b5f7ead1f147dd8381ec5f69a993731875b43d2 SHA512 9a7f677773aea528c9742c2e20d0f4b0f9543fe903afc14043ed31f83fc776093f661665312ecac9ae76b1e74228e0c4a709cb5b7d77e1f78aa4b0c0c7bb840c
diff --git a/dev-python/awxkit/awxkit-23.3.1.ebuild b/dev-python/awxkit/awxkit-23.3.1.ebuild
new file mode 100644
index 000000000000..1c14f574a504
--- /dev/null
+++ b/dev-python/awxkit/awxkit-23.3.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+
+inherit distutils-r1
+
+MY_P=awx-${PV}
+DESCRIPTION="Command line interface for Ansible AWX"
+HOMEPAGE="
+	https://github.com/ansible/awx/
+	https://pypi.org/project/awxkit/
+"
+# no sdist, as of 22.0.0
+SRC_URI="
+	https://github.com/ansible/awx/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/awxkit"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/websocket-client[${PYTHON_USEDEP}]
+	dev-python/pyjwt[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+	printf '%s\n' "${PV}" > VERSION || die
+
+	sed -e 's|websocket-client==[[:digit:]\.]*|websocket-client|' \
+		-e "/'clean'/d" \
+		-i setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/beartype/beartype-0.16.4.ebuild b/dev-python/beartype/beartype-0.16.4.ebuild
index bdaf7f87a070..7801395bbc4f 100644
--- a/dev-python/beartype/beartype-0.16.4.ebuild
+++ b/dev-python/beartype/beartype-0.16.4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index c0ac3d3765d7..9e5dae2b2a23 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -2,3 +2,4 @@ DIST boto3-1.28.62.gh.tar.gz 712305 BLAKE2B 1d61f857143f9471a254e035cf532cab3869
 DIST boto3-1.28.63.gh.tar.gz 713769 BLAKE2B f2e300458934893bb6d2186e900c4ba9abbd51d2ffabdbcd3026394315653e64fdc486f3ed4e33b26bef160b00e75acea875278eab03b4eeb50b5ecc94d4c0fc SHA512 782c7bb48af31638899e8bcf8fc87f67ab793fe724392be90951ece61b165f55d1df47585bd5211d7ecf3c989e5316ff9db774c8f0f357d1afc2af3ca0e49879
 DIST boto3-1.28.68.gh.tar.gz 717553 BLAKE2B dd8ba562613456e30c0f8bfe2f3befa9601b091dacf1c19c6153ee98b81c74ed63ea1b54ce5cccfb5bcf0d67386d593276bcdd86ccb56083b54d5905042856cf SHA512 714ff8cbd52d8775bb1fc44792e21d4a93c951b9adc4ac09bacef4df2fabf0af7896edf19b6f3bd3cd9872efab1fe20f0cb07eaca51f688024a3a18515c5f371
 DIST boto3-1.28.69.gh.tar.gz 717978 BLAKE2B d7339e73fec81a8c8eb013b4136ab3961bb7c27cbf2b479abf12d814bb49f959dad91cc091b5ceabc01de9205b732b7df6c7fb7c37dfacc72a7d862f3e54a3f7 SHA512 2f6fa2192115367f8a899fe16308365509f543146c00be4e04c2aa323a188dedfe3e531b8d2a8b80fe9a143d101039a8a34babf5c3b1073f306f7946a45ec976
+DIST boto3-1.28.70.gh.tar.gz 718741 BLAKE2B 0d8c0f8e4ceda65f223a6b5151015182905e4c76dc34ceede2af78ee8e71bbda95a70add771cdb313f4f63d7ae83fdbcb1c505a0157219c06a4d2dbcac584b27 SHA512 aea9a1c957c3a184ed8f8472f245b822b27185aa9427b14fd5cd380282a5c6f4dbb831940b4b39b147093448d8889910a52e26fb790b1e3e18ae24d9b2ddca15
diff --git a/dev-python/boto3/boto3-1.28.70.ebuild b/dev-python/boto3/boto3-1.28.70.ebuild
new file mode 100644
index 000000000000..fc1e40c08394
--- /dev/null
+++ b/dev-python/boto3/boto3-1.28.70.ebuild
@@ -0,0 +1,68 @@
+# 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_{8,9,10,11,12} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/boto3/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="
+		https://github.com/boto/boto3/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.7.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest tests/{functional,unit} \
+		-p xdist -n "$(makeopts_jobs)" --dist=worksteal
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 9fd559335963..9b10ff35c210 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -2,3 +2,4 @@ DIST botocore-1.31.62.gh.tar.gz 11961556 BLAKE2B 315a1ba1543ba5b92c0a0394a4a21b1
 DIST botocore-1.31.63.gh.tar.gz 11975759 BLAKE2B 3e757c6303f3390d3d563187c47140042d09271b16022a7a633bf68dc7188d42ac5a73838d2ae0556c8eec63296bb3f3b3f1011889fa7c10d660654695cd70f1 SHA512 39f1b6cb5c61a55a6f01e41750f651baf16c6d66e0b9e30cff042f54d03c0e862ab91a8f918257df8da678b13e732c68e887b21aa00006778bafad5361f4edd2
 DIST botocore-1.31.68.gh.tar.gz 11989788 BLAKE2B d8d34511e3ef65f54e1b305cf60cdb98e43ed7f773da2d84abd2ba45277d0f244080dd9b86fb5ea75a1af3820f27e4255f5f78bf67415e18cff2be30cc625bd4 SHA512 7ec8bd1e2036f17dbaeec4b65e6100c0b5c163f3e05d7e4723f7f1bac75d561f1a2d76331021552cb08093c6e85858e6a76cb9846114adf9deacf97dd94135a0
 DIST botocore-1.31.69.gh.tar.gz 11993410 BLAKE2B 3bb478c0d0bb8add09f3659739000ca5df6a2aead9ae51a44adb1d409d700fd27005cf9a96bffd679a70058125396761c2d654a93009cf660d9b7864567eeb7c SHA512 334aa763eed79a479d8e8ca64eaf44919f3d9af7b637577e12eecc162c79235255ab6bd19ca9edd0698215fb11e198f38bf924db1590b6da3121ef5f7aa7f00e
+DIST botocore-1.31.70.gh.tar.gz 11998773 BLAKE2B 1843caf6976d066b1898a3721303c05a1075acd4cb59393adfa31542647d85d6b9fb3dc06e7710ff0249126bc464eea3bf47e3e484a242100facce7c545ef2d3 SHA512 4b2f0548cd3b223e30537b2ec6d3de2f417b2df0e5c9af00e9cee295483a50f66abcc2ca1d449aa4e85917f0157b249e594f8be7fb919069b97e49b174d53960
diff --git a/dev-python/botocore/botocore-1.31.70.ebuild b/dev-python/botocore/botocore-1.31.70.ebuild
new file mode 100644
index 000000000000..9588357367ec
--- /dev/null
+++ b/dev-python/botocore/botocore-1.31.70.ebuild
@@ -0,0 +1,68 @@
+# 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_{8,9,10,11,12} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="
+		https://github.com/boto/botocore/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	local -x EPYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest tests/{functional,unit} -p xdist -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/cfn-lint/cfn-lint-0.80.3.ebuild b/dev-python/cfn-lint/cfn-lint-0.80.3.ebuild
index b12f49765119..5c47bc38c589 100644
--- a/dev-python/cfn-lint/cfn-lint-0.80.3.ebuild
+++ b/dev-python/cfn-lint/cfn-lint-0.80.3.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
 	>=dev-python/regex-2021.7.1[${PYTHON_USEDEP}]
-	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/sarif-om-1.0.4[${PYTHON_USEDEP}]
 	>=dev-python/sympy-1.0.0[${PYTHON_USEDEP}]
 "
 
diff --git a/dev-python/cfn-lint/cfn-lint-0.80.4.ebuild b/dev-python/cfn-lint/cfn-lint-0.80.4.ebuild
index 85f8b21ab073..20b208edc210 100644
--- a/dev-python/cfn-lint/cfn-lint-0.80.4.ebuild
+++ b/dev-python/cfn-lint/cfn-lint-0.80.4.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
 	>=dev-python/regex-2021.7.1[${PYTHON_USEDEP}]
-	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/sarif-om-1.0.4[${PYTHON_USEDEP}]
 	>=dev-python/sympy-1.0.0[${PYTHON_USEDEP}]
 "
 
diff --git a/dev-python/cfn-lint/cfn-lint-0.81.0.ebuild b/dev-python/cfn-lint/cfn-lint-0.81.0.ebuild
index 9a1b87293100..16c7cc6740d5 100644
--- a/dev-python/cfn-lint/cfn-lint-0.81.0.ebuild
+++ b/dev-python/cfn-lint/cfn-lint-0.81.0.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
 	>=dev-python/regex-2021.7.1[${PYTHON_USEDEP}]
-	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/sarif-om-1.0.4[${PYTHON_USEDEP}]
 	>=dev-python/sympy-1.0.0[${PYTHON_USEDEP}]
 "
 
diff --git a/dev-python/cfn-lint/cfn-lint-0.82.0.ebuild b/dev-python/cfn-lint/cfn-lint-0.82.0.ebuild
index 9a1b87293100..16c7cc6740d5 100644
--- a/dev-python/cfn-lint/cfn-lint-0.82.0.ebuild
+++ b/dev-python/cfn-lint/cfn-lint-0.82.0.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
 	>=dev-python/regex-2021.7.1[${PYTHON_USEDEP}]
-	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/sarif-om-1.0.4[${PYTHON_USEDEP}]
 	>=dev-python/sympy-1.0.0[${PYTHON_USEDEP}]
 "
 
diff --git a/dev-python/cfn-lint/cfn-lint-0.82.1.ebuild b/dev-python/cfn-lint/cfn-lint-0.82.1.ebuild
index 9a1b87293100..16c7cc6740d5 100644
--- a/dev-python/cfn-lint/cfn-lint-0.82.1.ebuild
+++ b/dev-python/cfn-lint/cfn-lint-0.82.1.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
 	>=dev-python/regex-2021.7.1[${PYTHON_USEDEP}]
-	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/sarif-om-1.0.4[${PYTHON_USEDEP}]
 	>=dev-python/sympy-1.0.0[${PYTHON_USEDEP}]
 "
 
diff --git a/dev-python/cfn-lint/cfn-lint-0.82.2.ebuild b/dev-python/cfn-lint/cfn-lint-0.82.2.ebuild
index 9a1b87293100..16c7cc6740d5 100644
--- a/dev-python/cfn-lint/cfn-lint-0.82.2.ebuild
+++ b/dev-python/cfn-lint/cfn-lint-0.82.2.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
 	>=dev-python/regex-2021.7.1[${PYTHON_USEDEP}]
-	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/sarif-om-1.0.4[${PYTHON_USEDEP}]
 	>=dev-python/sympy-1.0.0[${PYTHON_USEDEP}]
 "
 
diff --git a/dev-python/cfn-lint/cfn-lint-0.83.0.ebuild b/dev-python/cfn-lint/cfn-lint-0.83.0.ebuild
index 6943af47dd43..2639a6f71b69 100644
--- a/dev-python/cfn-lint/cfn-lint-0.83.0.ebuild
+++ b/dev-python/cfn-lint/cfn-lint-0.83.0.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
 	>=dev-python/regex-2021.7.1[${PYTHON_USEDEP}]
-	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/sarif-om-1.0.4[${PYTHON_USEDEP}]
 	>=dev-python/sympy-1.0.0[${PYTHON_USEDEP}]
 "
 
diff --git a/dev-python/django-cacheops/Manifest b/dev-python/django-cacheops/Manifest
index 347d5b027944..1395befd31e1 100644
--- a/dev-python/django-cacheops/Manifest
+++ b/dev-python/django-cacheops/Manifest
@@ -1 +1,2 @@
 DIST django-cacheops-7.0.1.tar.gz 70830 BLAKE2B a90c5b145475f9942de5fee4403c5d237a6754026a0e581d1cab56a1b538cbb041fa50fcc67b0a7c922274c49b510d833e2924d8744e62e5a71149d6ddd6144d SHA512 a73b24acd668d9104b8b8f27859d643ea9b80bf53375389cb21b2bbd3d97ea508f826752df2fa5ed576e91a35ba5c6cfb0e8dded772b2c47babf739e6b26dd38
+DIST django-cacheops-7.0.2.tar.gz 71747 BLAKE2B ceb5a536b1ee25c2b25beb9bac4b193325d74b58f7abc6f8edf62a9327eeb25fe8fd68292d5887aa02655f14290e7430d18747ccd487a4f44cdad7fa991f458c SHA512 cd6ea11c54d0c49c52a912033b0ef5d1940c9f061b5a248b4238bf22efa17aefdc48c10a3724613401e9972226e0ad20cbd607b4b63812efc5ae78c35968b767
diff --git a/dev-python/django-cacheops/django-cacheops-7.0.2.ebuild b/dev-python/django-cacheops/django-cacheops-7.0.2.ebuild
new file mode 100644
index 000000000000..287b2d0881ce
--- /dev/null
+++ b/dev-python/django-cacheops/django-cacheops-7.0.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="ORM cache with automatic granular event-driven invalidation for Django"
+HOMEPAGE="
+	https://github.com/Suor/django-cacheops/
+	https://pypi.org/project/django-cacheops/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/django-3.2[${PYTHON_USEDEP}]
+	>=dev-python/redis-2.9.1[${PYTHON_USEDEP}]
+	>=dev-python/funcy-1.8[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-db/redis
+		dev-python/dill[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+src_prepare() {
+	# Remove test dependent on unpackaged before_after
+	sed -e 's/test_lock/_&/' -i tests/test_extras.py || die
+	# Remove upper bounds on dependencies
+	sed -i -e 's:,<[0-9]*::' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x DJANGO_SETTINGS_MODULE=tests.settings
+	local -x PYTHONPATH=.
+	django-admin test -v 2 || die
+}
+
+src_test() {
+	local redis_pid="${T}"/redis.pid
+	local redis_port=6379
+
+	einfo "Spawning Redis"
+	einfo "NOTE: Port ${redis_port} must be free"
+	"${EPREFIX}"/usr/sbin/redis-server - <<-EOF || die
+		daemonize yes
+		pidfile ${redis_pid}
+		port ${redis_port}
+		bind 127.0.0.1
+	EOF
+
+	# Run the tests
+	distutils-r1_src_test
+
+	# Clean up afterwards
+	kill "$(<"${redis_pid}")" || die
+}
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index be96065a7d0d..15787d94681c 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -3,3 +3,4 @@ DIST google-api-python-client-2.101.0.tar.gz 11765398 BLAKE2B c50c4266233eaef0d7
 DIST google-api-python-client-2.102.0.tar.gz 11915090 BLAKE2B bc88a590e1c14667ffbac5aa9233d303df2f0743f86de1236b091b3dad50ee77e1d51c2ca0b628b63197547855be911cbb8201773e516e9a0cd50e8451b5998a SHA512 894de3c6ec61ae1de16514f96682776665af897e128918504fb0c067a5dc1586ad53101ca03d3c826ceed7ed3de9a878123a3fed269618f4ca743f53dbeeb66b
 DIST google-api-python-client-2.103.0.tar.gz 12063767 BLAKE2B 7fa483cca8a957630c1c4662934aaf81c05145246ecb279a85761dc2a808d7b76921a18671006b8eabfba9543e747f396c850a81d42eb4db902a708c302905b3 SHA512 d8b4bea6e0643ebe5e2626ecde7086a17c34f469aadc9147d554040a3a3ac12bcbf3404b367c30b423aa6d5aaf6262df3349cd22ef2ab0d213c3a5e30b8fd11a
 DIST google-api-python-client-2.104.0.tar.gz 12080299 BLAKE2B ca6209454399db0a738758587b4ed2c7996dcbb1b7953ec7708b427e2bbeecf792db5fbb55f1d4e8c56b1df24352902ffb5e662c1b5a5337b8aaaccf0ae00934 SHA512 44318cee7702788fb824ccac462614d7465ae4493c91b4bb758906a88bc326c64e80452387d02b5d35037f42ad4de90ca38a4fce6c06eb89bbbe425b69e4a3cd
+DIST google-api-python-client-2.105.0.tar.gz 12113230 BLAKE2B d2401ca4ee47f7017e5644479644894cf704bbba6fa97fbe225577c3c10afcb374a52444b32fc5ecb2ea5a38d6f7cdb71055c2ef0873e39d277738d33a778873 SHA512 d610579b1fc5be6b47b9add52e1d39ef7f007869e17fb7f6dbdcdd78f01e1d7f8a8de208499f9c718b1ce567b8723a44a6a93ad22b94cebd33c47cf584e03118
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.105.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.105.0.ebuild
new file mode 100644
index 000000000000..f004eac09849
--- /dev/null
+++ b/dev-python/google-api-python-client/google-api-python-client-2.105.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Google API Client for Python"
+HOMEPAGE="
+	https://github.com/googleapis/google-api-python-client/
+	https://pypi.org/project/google-api-python-client/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
+	<dev-python/httplib2-1[${PYTHON_USEDEP}]
+	>=dev-python/google-api-core-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
+	<dev-python/uritemplate-5[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# require Internet access (and credentials)
+		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
+		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
+	)
+
+	epytest tests
+}
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index 7b300e2d7ae7..0230e452d8a4 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1 +1,2 @@
 DIST ipykernel-6.25.2.tar.gz 156247 BLAKE2B 796ed40dd5ef11dbe8a0bb330aafd1e51e40b1fa5a0b55bdb1a1aff4d89187b3c6b3831f3d44b131f5e8158d6035697f788877a8e682c4c0355da74825ee2200 SHA512 a6f5089cff8c297379ae840b49ad705d23db46aa04030c7a2598031d118b5c0dd64e091de4d66adfd876e8ef45abfcb6bc963c3311dd8e50f4e83236bfc4cfa3
+DIST ipykernel-6.26.0.tar.gz 157526 BLAKE2B 8ba5cf820cf03d7735a4dbcb613925b9f9f83d949e065d61f546f3b8ded17accdfdcb4d72718fa644f2233f0397afe8f77437fed1d219710ecac6c9db523e08e SHA512 8199f59ac0147e3b21a07f28d64bf73311ccbf6b48b060979a520ac798a058496e659d08a7b41b1321b4be7092e09fe793d80fb061fc2706b46aa17e93e142f8
diff --git a/dev-python/ipykernel/ipykernel-6.26.0.ebuild b/dev-python/ipykernel/ipykernel-6.26.0.ebuild
new file mode 100644
index 000000000000..3afd57b8ce80
--- /dev/null
+++ b/dev-python/ipykernel/ipykernel-6.26.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 pypi virtualx
+
+DESCRIPTION="IPython Kernel for Jupyter"
+HOMEPAGE="
+	https://github.com/ipython/ipykernel/
+	https://pypi.org/project/ipykernel/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+
+RDEPEND="
+	>=dev-python/comm-0.1.1[${PYTHON_USEDEP}]
+	!elibc_Darwin? ( >=dev-python/debugpy-1.6.5[${PYTHON_USEDEP}] )
+	>=dev-python/ipython-7.23.1[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-client-8[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-core-4.12[${PYTHON_USEDEP}]
+	>=dev-python/matplotlib-inline-0.1[${PYTHON_USEDEP}]
+	dev-python/nest-asyncio[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-20[${PYTHON_USEDEP}]
+	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.4.0[${PYTHON_USEDEP}]
+"
+# RDEPEND seems specifically needed in BDEPEND, at least jupyter
+# bug #816486
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/ipyparallel[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_compile() {
+	distutils-r1_python_compile
+	# Use python3 in kernel.json configuration, bug #784764
+	sed -i -e '/python3.[0-9]\+/s//python3/' \
+		"${BUILD_DIR}/install${EPREFIX}/usr/share/jupyter/kernels/python3/kernel.json" || die
+}
+
+src_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		tests/test_debugger.py::test_attach_debug
+		tests/test_debugger.py::test_breakpoint_in_cell_with_leading_empty_lines
+		tests/test_debugger.py::test_rich_inspect_at_breakpoint
+		tests/test_debugger.py::test_rich_inspect_not_at_breakpoint
+		tests/test_debugger.py::test_set_breakpoints
+		tests/test_debugger.py::test_stop_on_breakpoint
+		tests/test_debugger.py::test_copy_to_globals
+		# hangs?
+		tests/test_eventloop.py::test_tk_loop
+		# doesn't like pyside2?
+		tests/test_eventloop.py::test_qt_enable_gui
+	)
+
+	virtx distutils-r1_src_test
+}
diff --git a/dev-python/jupyter-client/Manifest b/dev-python/jupyter-client/Manifest
index 64525fba7371..9f912ec40bbf 100644
--- a/dev-python/jupyter-client/Manifest
+++ b/dev-python/jupyter-client/Manifest
@@ -1,2 +1,3 @@
 DIST jupyter_client-8.3.1.tar.gz 337007 BLAKE2B fdb0535ccda1ca13e2ead09c6df9f30c8c7d258dbfa4882a758b3923fd5bdf6afa80859f941bcc3e1a602de31c6ceef06b7a5d360d64ceab34e40de65dc65174 SHA512 ce600985ed9d36d4a96bbed6142b46988d46ea468d8f266fd3c9a7357f60d5e2a9bddb11c912a3c137079322e4363b975c4b43b1a53e65b5d649d367a098a52d
 DIST jupyter_client-8.4.0.tar.gz 338114 BLAKE2B 9588ec5a9155d008876819f6129e18799e78692056344f49556ca2aa815c2c22472520661527bdbbce6d8458cc34b01ef900d89939f1de667745e48e7a5ed4f5 SHA512 0853e15b68e4fe5d9b4811e664eb25e900ebc908902c8527f01f761f012ddb6aa928e825bd67894dbed8c62dc643d5451da0cc5907847839c832e49e15eb6027
+DIST jupyter_client-8.5.0.tar.gz 339190 BLAKE2B e102a457e5148199ac1b367cca1bb2f8e64b5fdda41c3e08ddc3e7d30992b53b8a228339151be9d63311e0c45a4487aefdf23785b773830631b3695bd3a7cabf SHA512 256fde7866b66e263d3b03afd8d8a0fddce23513c37375ab255398d1ed2cad5df87b753b577b8f6634ffe4ab4d55a82afd134444fc7714c4f3846d7d3a66f353
diff --git a/dev-python/jupyter-client/jupyter-client-8.5.0.ebuild b/dev-python/jupyter-client/jupyter-client-8.5.0.ebuild
new file mode 100644
index 000000000000..41fc8a4bbcbb
--- /dev/null
+++ b/dev-python/jupyter-client/jupyter-client-8.5.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Jupyter protocol implementation and client libraries"
+HOMEPAGE="
+	https://jupyter.org/
+	https://github.com/jupyter/jupyter_client/
+	https://pypi.org/project/jupyter-client/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+
+RDEPEND="
+	>=dev-python/jupyter-core-5.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-23.0[${PYTHON_USEDEP}]
+	>=dev-python/tornado-6.0[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib-metadata-4.8.3[${PYTHON_USEDEP}]
+	' 3.{8,9})
+"
+BDEPEND="
+	test? (
+		>=dev-python/ipykernel-6.14[${PYTHON_USEDEP}]
+		>=dev-python/pytest-asyncio-0.18[${PYTHON_USEDEP}]
+		>=dev-python/pytest-jupyter-0.4.1[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# TODO: times out
+	tests/test_client.py::TestAsyncKernelClient::test_input_request
+	# TODO
+	tests/test_multikernelmanager.py::TestKernelManager::test_tcp_cinfo
+)
diff --git a/dev-python/jupyter-server/Manifest b/dev-python/jupyter-server/Manifest
index c70ce5c8c839..33722f9a4de5 100644
--- a/dev-python/jupyter-server/Manifest
+++ b/dev-python/jupyter-server/Manifest
@@ -1,5 +1,3 @@
-DIST jupyter_server-2.5.0.tar.gz 694029 BLAKE2B bea1082709653617c812124378e1e2a639e90b1e0d7fedacd98628c415adad2daa5343b57a19a776c41820e6665c8591c8d2a652f8c791b605bc3a4b65400ef3 SHA512 7145f60a73bf3d9aceff37aaf56b3b3a54c94fd9f13f06659387909cb1727759a082d11e983df4e687cc508461d5afb6e552f3ac09e30bebb1eb5e863992ad14
-DIST jupyter_server-2.7.0.tar.gz 704548 BLAKE2B d328b3254143191627d3f743a2ceb1ef16216e04db714ee75bb7e0002c3cb238b8ec7c7f06599ebb1e9a0b000dcb00c7844bc2c894f450bdf3e99d209dbb9106 SHA512 e8d9ec3b65b25844fbd8e5353a6d1899c07d83ce446c70cae563652b35761d8cbba5d9f5dd52c390e8294dddd70710383e615a7ca07f5e6836ec69708496eb7c
-DIST jupyter_server-2.7.2.tar.gz 705360 BLAKE2B fc896756caccacba82a65dbaf68f2e2e3dac816e22360b0a24b495fb54958925b85b71be2fbd552654fd5d588739b42ad18495b4ff1df3ac7628fa6d7a970a98 SHA512 ea3b968a742c47e90451e4d701801895ec16304705d65d48609a803934a77143ccff21de697aef061c1e0b9829c122ace0d1d9bdd5889bebbb58a9e6cda35e1f
 DIST jupyter_server-2.7.3.tar.gz 705798 BLAKE2B d5655968f17b2a5536539858769124650f41985d5d99b782e70d99140a7e61820b913b525fc10041a56b6946ec4feb7e05015a10970786d024628e8c840fae94 SHA512 ad9be38208ef4196417561355a62889e34d657f3114b710f13f974f4b453b465b7d473ced46eba873ee980d631d2648e0d4b29267011ed444247a33325f959e9
 DIST jupyter_server-2.8.0.tar.gz 708394 BLAKE2B 2beaba510b0e841203c58316db8507c8c503fdeacfbe7de1287d1ecf0740334c02b430ad7111043e21da45669cc1bd13bb313b5cd45f999490fa07c9057b1bea SHA512 e2ec60994737a9979545aaba3de1f846eb68c809cb952bfba6ce22c061f1e644a712f4b7b069ebfc393e8dd7a7bf723b2c3530a7a1b103eb1dbf42a60a59e6e6
+DIST jupyter_server-2.9.0.tar.gz 709038 BLAKE2B 68569f323087c55427d2d0b5fe7df55082809a76b25102cf08f62393c1c943bf5527ed461e392f45751f6c4182fd6423056d3719aed6681cd85ca2f4e7fca0b7 SHA512 5d695f72cc02c73345a811739e2a7006313d37b5c05894b5da7792b0174537bfe962456d996605abc4f8ec2a4e1337b1d5817b667b4b5708c599e1a96452d597
diff --git a/dev-python/jupyter-server/jupyter-server-2.5.0.ebuild b/dev-python/jupyter-server/jupyter-server-2.5.0.ebuild
deleted file mode 100644
index b529ecfd465e..000000000000
--- a/dev-python/jupyter-server/jupyter-server-2.5.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Core services, APIs, and REST endpoints to Jupyter web applications"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyter-server/jupyter_server/
-	https://pypi.org/project/jupyter-server/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/anyio-3.1.0[${PYTHON_USEDEP}]
-	dev-python/argon2-cffi[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-client-7.4.4[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-core-5.1.0[${PYTHON_USEDEP}]
-	dev-python/jupyter-server-terminals[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-events-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/nbconvert-6.4.4[${PYTHON_USEDEP}]
-	>=dev-python/nbformat-5.3.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/prometheus-client[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-24[${PYTHON_USEDEP}]
-	dev-python/send2trash[${PYTHON_USEDEP}]
-	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
-	>=dev-python/tornado-6.2[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.6.0[${PYTHON_USEDEP}]
-	dev-python/websocket-client[${PYTHON_USEDEP}]
-
-"
-BDEPEND="
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# This fails if your terminal is zsh (and maybe other non-bash as well?)
-	tests/test_terminal.py
-	# Fails because above is ignored
-	tests/auth/test_authorizer.py
-	# Fails with additional extensions installed
-	tests/extension/test_app.py::test_stop_extension
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.1-skip-npm.patch"
-)
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest \
-		-p pytest_tornasync.plugin \
-		-p jupyter_server.pytest_plugin \
-		-p pytest_console_scripts \
-		-p pytest_timeout
-}
diff --git a/dev-python/jupyter-server/jupyter-server-2.7.0.ebuild b/dev-python/jupyter-server/jupyter-server-2.7.0.ebuild
deleted file mode 100644
index 09f891592613..000000000000
--- a/dev-python/jupyter-server/jupyter-server-2.7.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Core services, APIs, and REST endpoints to Jupyter web applications"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyter-server/jupyter_server/
-	https://pypi.org/project/jupyter-server/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~s390"
-
-RDEPEND="
-	>=dev-python/anyio-3.1.0[${PYTHON_USEDEP}]
-	dev-python/argon2-cffi[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-client-7.4.4[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-core-5.1.0[${PYTHON_USEDEP}]
-	dev-python/jupyter-server-terminals[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-events-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/nbconvert-6.4.4[${PYTHON_USEDEP}]
-	>=dev-python/nbformat-5.3.0[${PYTHON_USEDEP}]
-	dev-python/overrides[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/prometheus-client[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-24[${PYTHON_USEDEP}]
-	dev-python/send2trash[${PYTHON_USEDEP}]
-	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
-	>=dev-python/tornado-6.2[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.6.0[${PYTHON_USEDEP}]
-	dev-python/websocket-client[${PYTHON_USEDEP}]
-
-"
-BDEPEND="
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# This fails if your terminal is zsh (and maybe other non-bash as well?)
-	tests/test_terminal.py
-	# Fails because above is ignored
-	tests/auth/test_authorizer.py
-	# Fails with additional extensions installed
-	tests/extension/test_app.py::test_stop_extension
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.1-skip-npm.patch"
-)
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest \
-		-p pytest_tornasync.plugin \
-		-p jupyter_server.pytest_plugin \
-		-p pytest_console_scripts \
-		-p pytest_timeout
-}
diff --git a/dev-python/jupyter-server/jupyter-server-2.7.3.ebuild b/dev-python/jupyter-server/jupyter-server-2.7.3.ebuild
index 9c7340649b2b..39f8121de4d7 100644
--- a/dev-python/jupyter-server/jupyter-server-2.7.3.ebuild
+++ b/dev-python/jupyter-server/jupyter-server-2.7.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/anyio-3.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter-server/jupyter-server-2.7.2.ebuild b/dev-python/jupyter-server/jupyter-server-2.9.0.ebuild
index 0cdc3cf33689..2e97204a4ead 100644
--- a/dev-python/jupyter-server/jupyter-server-2.7.2.ebuild
+++ b/dev-python/jupyter-server/jupyter-server-2.9.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~s390"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/anyio-3.1.0[${PYTHON_USEDEP}]
@@ -68,6 +68,7 @@ PATCHES=(
 )
 
 python_test() {
+	# FIXME: tests seem to be affected by previously installed version
 	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
 	epytest \
 		-p pytest_tornasync.plugin \
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index a58f79e32b3b..a90d7b0650ac 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -1,4 +1,3 @@
-DIST lxml-4.9.2.gh.tar.gz 957365 BLAKE2B 201b3977da90386e413f1b89a4b7ee1e44d6bbea05e622e92feb1d67c637ce46ebf746f0648f034ed3bccd609233ccf7d8a7ee456f13b8d9ca8587ddf1ebd32a SHA512 816b2fe2eef2a97a0df66cbc39850c6dc3d6470e4033cc73edb40c80c0afbbe6c084d042d7c98b29497926e76f648caa42e1ebe5d83060af08af6972316077b0
 DIST lxml-4.9.3-patches-2.tar.xz 24288 BLAKE2B 47b7c486a1c1616c875111bd53b14d4211a1eee3f412985f4022e71b85b087abd71d36919fb025257f17de404329284898ddc639f85e8b15ade21778fa218d98 SHA512 713172b4c907db6479a0a803a842824825b212a9b645c1ca356f793658bd6c63113ea248278e7c46b512e22e3130696e9fc5127fea82a67372d920733fc160b0
 DIST lxml-4.9.3-patches.tar.xz 10544 BLAKE2B 407938d2f701400e919110c3bfe84e94621f39f8178850c466d41549ee0eff4f23e93cdd8ea684713e8276acfaa05d6f7b7af4d375c859b9fc5b2981d60983a3 SHA512 c2d5d2ffb035aed6d846de84885b87142b2be7a09ffe6927e7c032acab343730acfcbefd75e8141cf3b41b308c532869a7878b515f3d4eeefa7526a3d2599398
 DIST lxml-4.9.3.gh.tar.gz 958628 BLAKE2B ffdf3fe781a03815f7c026229d313721c93375ebafad9b4a20c5d8a380a631401e546d8701a94d8c49615fb6a71e84940d8ca0299b47a37c1c9596db36659113 SHA512 903bd4935c7708b459aee9befcf3f6e3e3aaa9adc122591ea923b6e3d8fd288f07cab3f5f0edb08e3bf9db80414324f0a1a8e5a5089f9cda82f6c50f5df59423
diff --git a/dev-python/lxml/files/lxml-4.6.0-tests-pypy.patch b/dev-python/lxml/files/lxml-4.6.0-tests-pypy.patch
deleted file mode 100644
index 51bcb8fe2e22..000000000000
--- a/dev-python/lxml/files/lxml-4.6.0-tests-pypy.patch
+++ /dev/null
@@ -1,452 +0,0 @@
-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
-
----
- src/lxml/tests/test_elementtree.py    |  3 +-
- src/lxml/tests/test_errors.py         |  3 +-
- src/lxml/tests/test_http_io.py        |  3 +-
- src/lxml/tests/test_nsclasses.py      |  3 +-
- src/lxml/tests/test_objectify.py      | 41 +++++++++++++++++++++++++--
- src/lxml/tests/test_xpathevaluator.py |  7 +++--
- src/lxml/tests/test_xslt.py           |  7 +++--
- 7 files changed, 56 insertions(+), 11 deletions(-)
-
-diff --git a/src/lxml/tests/test_elementtree.py b/src/lxml/tests/test_elementtree.py
-index 78d8964d..f3f28044 100644
---- 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):
-@@ -2956,6 +2956,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
-diff --git a/src/lxml/tests/test_errors.py b/src/lxml/tests/test_errors.py
-index c0aee744..33111429 100644
---- 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
-diff --git a/src/lxml/tests/test_http_io.py b/src/lxml/tests/test_http_io.py
-index f9eff39a..edf2bd81 100644
---- 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
- 
-diff --git a/src/lxml/tests/test_nsclasses.py b/src/lxml/tests/test_nsclasses.py
-index a0aa608d..5aa5dc48 100644
---- 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}
-diff --git a/src/lxml/tests/test_objectify.py b/src/lxml/tests/test_objectify.py
-index a12ae7e1..83ba4ced 100644
---- a/src/lxml/tests/test_objectify.py
-+++ b/src/lxml/tests/test_objectify.py
-@@ -9,7 +9,8 @@ from __future__ import absolute_import
- import unittest, operator
- 
- 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
-@@ -213,11 +214,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')
-@@ -374,6 +377,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", 
-@@ -809,6 +813,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
-@@ -838,6 +843,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
-@@ -871,6 +877,7 @@ class ObjectifyTestCase(HelperTestCase):
-         self.assertTrue(isinstance(value, objectify.BoolElement))
-         self.assertEqual(value, False)
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_str(self):
-         Element = self.Element
-         SubElement = self.etree.SubElement
-@@ -878,6 +885,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
-@@ -885,6 +893,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
-@@ -892,6 +901,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
-@@ -904,6 +914,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
-@@ -914,6 +925,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)
-@@ -979,6 +991,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
-@@ -986,6 +999,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
-@@ -993,6 +1007,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
-@@ -1000,6 +1015,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
-@@ -1012,6 +1028,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
-@@ -1037,6 +1054,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")
-@@ -1053,6 +1071,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
-@@ -1069,6 +1088,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'
-@@ -1088,6 +1108,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
-@@ -1169,6 +1190,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
-@@ -1331,6 +1353,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>'))
-@@ -1358,6 +1381,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>'))
-@@ -1380,6 +1404,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>'))
-@@ -2049,6 +2074,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):
-@@ -2519,46 +2545,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
-@@ -2573,6 +2608,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):
-@@ -2674,7 +2710,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__':
-diff --git a/src/lxml/tests/test_xpathevaluator.py b/src/lxml/tests/test_xpathevaluator.py
-index 13ee97ec..6d162c6d 100644
---- 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__':
-diff --git a/src/lxml/tests/test_xslt.py b/src/lxml/tests/test_xslt.py
-index cde23357..41f8d78b 100644
---- 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
-@@ -2085,8 +2087,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.25.0
-
-diff --git a/doc/element_classes.txt b/doc/element_classes.txt
-index 4b1e72e8..fda9ea07 100644
---- 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
-
diff --git a/dev-python/lxml/files/lxml-4.9.2-py3.12-backport-unicode-fix.patch b/dev-python/lxml/files/lxml-4.9.2-py3.12-backport-unicode-fix.patch
deleted file mode 100644
index d1ca31d1b909..000000000000
--- a/dev-python/lxml/files/lxml-4.9.2-py3.12-backport-unicode-fix.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Upstream: https://github.com/lxml/lxml/commit/a1f2231dfdd31a37f2c55bc9ae4ac33e92221227
-
-From a1f2231dfdd31a37f2c55bc9ae4ac33e92221227 Mon Sep 17 00:00:00 2001
-From: Stefan Behnel <stefan_ml@behnel.de>
-Date: Fri, 12 May 2023 09:49:34 +0200
-Subject: [PATCH] Adapt unicode parsing to Py3.12.
-
----
- src/lxml/includes/etree_defs.h | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/src/lxml/includes/etree_defs.h b/src/lxml/includes/etree_defs.h
-index e671fa85d..d42f2158c 100644
---- a/src/lxml/includes/etree_defs.h
-+++ b/src/lxml/includes/etree_defs.h
-@@ -120,6 +120,16 @@ static PyObject* PyBytes_FromFormat(const char* format, ...) {
- #  define _lx_PySlice_GetIndicesEx(o, l, b, e, s, sl) PySlice_GetIndicesEx(((PySliceObject*)o), l, b, e, s, sl)
- #endif
- 
-+#if PY_VERSION_HEX >= 0x030B00A1
-+/* Python 3.12 doesn't have wstr Unicode strings any more. */
-+#undef PyUnicode_GET_DATA_SIZE
-+#define PyUnicode_GET_DATA_SIZE(ustr)  (0)
-+#undef PyUnicode_AS_DATA
-+#define PyUnicode_AS_DATA(ustr)  (NULL)
-+#undef PyUnicode_IS_READY
-+#define PyUnicode_IS_READY(ustr)  (1)
-+#endif
-+
- #ifdef WITHOUT_THREADING
- #  undef PyEval_SaveThread
- #  define PyEval_SaveThread() (NULL)
-
diff --git a/dev-python/lxml/files/lxml-4.9.2-py3.12-drop-deprecated-imp.patch b/dev-python/lxml/files/lxml-4.9.2-py3.12-drop-deprecated-imp.patch
deleted file mode 100644
index a59a60e74822..000000000000
--- a/dev-python/lxml/files/lxml-4.9.2-py3.12-drop-deprecated-imp.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-https://github.com/lxml/lxml/commit/07db761f9f027d1814a43686cda6fca26e37a931
-https://github.com/lxml/lxml/commit/c6b7e621e4696c02bf8f6ea423ffbbf2109748ab
-
-From 07db761f9f027d1814a43686cda6fca26e37a931 Mon Sep 17 00:00:00 2001
-From: Stefan Behnel <stefan_ml@behnel.de>
-Date: Thu, 11 May 2023 10:29:02 +0200
-Subject: [PATCH] Avoid using the deprecated "imp" module.
-
-Closes https://bugs.launchpad.net/lxml/+bug/2018137
---- a/src/lxml/html/tests/test_html5parser.py
-+++ b/src/lxml/html/tests/test_html5parser.py
-@@ -1,5 +1,4 @@
- import os
--import imp
- try:
-     from StringIO import StringIO
- except ImportError:                     # python 3
-@@ -45,7 +44,10 @@ def find_module(self, fullname, path=None):
-             return None
- 
-         def load_module(self, fullname):
--            mod = sys.modules.setdefault(fullname, imp.new_module(fullname))
-+            fake_module = object()
-+            fake_module.__qualname__ = fullname
-+            fake_module.__name__ = fullname.rsplit('.', 1)[-1]
-+            mod = sys.modules.setdefault(fullname, fake_module)
-             mod.__file__, mod.__loader__, mod.__path__ = "<dummy>", self, []
-             mod.__dict__.update(self.mocks[fullname])
-             return mod
-
-From c6b7e621e4696c02bf8f6ea423ffbbf2109748ab Mon Sep 17 00:00:00 2001
-From: Stefan Behnel <stefan_ml@behnel.de>
-Date: Thu, 11 May 2023 10:30:15 +0200
-Subject: [PATCH] Avoid using the deprecated "imp" module.
-
-Closes https://bugs.launchpad.net/lxml/+bug/2018137
---- a/src/lxml/html/tests/test_html5parser.py
-+++ b/src/lxml/html/tests/test_html5parser.py
-@@ -44,7 +44,8 @@ def find_module(self, fullname, path=None):
-             return None
- 
-         def load_module(self, fullname):
--            fake_module = object()
-+            class Cls: pass
-+            fake_module = Cls()
-             fake_module.__qualname__ = fullname
-             fake_module.__name__ = fullname.rsplit('.', 1)[-1]
-             mod = sys.modules.setdefault(fullname, fake_module)
-
diff --git a/dev-python/lxml/lxml-4.9.2-r1.ebuild b/dev-python/lxml/lxml-4.9.2-r1.ebuild
deleted file mode 100644
index db6e5d7b03fa..000000000000
--- a/dev-python/lxml/lxml-4.9.2-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# 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_{8,9,10,11,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.9.12-r2
-	>=dev-libs/libxslt-1.1.28
-"
-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.6.0-tests-pypy.patch
-	"${FILESDIR}"/${P}-py3.12-drop-deprecated-imp.patch
-	"${FILESDIR}"/${P}-py3.12-backport-unicode-fix.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/lxml/lxml-4.9.2.ebuild b/dev-python/lxml/lxml-4.9.2.ebuild
deleted file mode 100644
index 2657813c18e8..000000000000
--- a/dev-python/lxml/lxml-4.9.2.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# 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_{8,9,10,11,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.9.12-r2
-	>=dev-libs/libxslt-1.1.28
-"
-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.6.0-tests-pypy.patch
-	"${FILESDIR}"/${P}-py3.12-drop-deprecated-imp.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/lxml/lxml-4.9.3.ebuild b/dev-python/lxml/lxml-4.9.3.ebuild
deleted file mode 100644
index 936ef5f72772..000000000000
--- a/dev-python/lxml/lxml-4.9.3.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# 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_{8,9,10,11,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 ~arm64-macos ~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/overrides/overrides-7.4.0.ebuild b/dev-python/overrides/overrides-7.4.0.ebuild
index b7740edb1abc..3bcfa5856fb0 100644
--- a/dev-python/overrides/overrides-7.4.0.ebuild
+++ b/dev-python/overrides/overrides-7.4.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index 04d602d090b9..d754b914ecd6 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -1,3 +1,2 @@
-DIST pillow-10.0.0.gh.tar.gz 50537667 BLAKE2B f0ce48e947363c16c0bb08881b42dcf845a142fe7d2162154f5ddce47bf909fc4c829dcb4365ee363680a41c247cea28eef37c879d22959ef69c9dc5adce91f4 SHA512 a963ae8398c609569e1b23d2362f6382cd888698492ba2349f9c931a04c463fbdc27a43e53d1dee8bbb1b5e88c0d5eb655f6f5e9df7d489c206b6acda0adec3a
 DIST pillow-10.0.1.gh.tar.gz 50539264 BLAKE2B 83c3bf4abc9c3eab210576dc28d6f8926ce0998ec344e792433afc05190bb248a926902ce7706e3569cd6cbf8deb640cafda86f102166cf6492ec00b66f9392f SHA512 27e2f0d86563c3b7f5a2e0ba2bbe98fc2cb2fa5871d0b6cbb5a0014e9d9eb03dde9969301419d806d1a22cd4881e624465a355ba9bc42b95746226e1f95712a9
 DIST pillow-10.1.0.gh.tar.gz 50798274 BLAKE2B a69be8187e7206b50350af399b73b5c43b29c249a4a5a6bb23438dae9967bb84f1d487f52b188811cb3d2e550245f8d5a765668d8d5de1375a84fcd96fc531d9 SHA512 01c97b68d4167d10539a2d29fb82676fb417ee5003f0acd9f602ed13d41b200579497cc0ef0949b2c1549b684f76f2d43895a52abdb1367345d2affd544c5b5a
diff --git a/dev-python/pillow/pillow-10.0.0.ebuild b/dev-python/pillow/pillow-10.0.0.ebuild
deleted file mode 100644
index 2bd8ed725d43..000000000000
--- a/dev-python/pillow/pillow-10.0.0.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-# setuptools wrapper
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-PYTHON_REQ_USE='tk?,threads(+)'
-
-inherit distutils-r1 toolchain-funcs virtualx
-
-MY_PN=Pillow
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python Imaging Library (fork)"
-HOMEPAGE="
-	https://python-pillow.org/
-	https://github.com/python-pillow/
-	https://pypi.org/project/Pillow/
-"
-SRC_URI="
-	https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
-IUSE="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
-REQUIRED_USE="test? ( jpeg jpeg2k lcms tiff truetype )"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	imagequant? ( media-gfx/libimagequant:= )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	lcms? ( media-libs/lcms:2= )
-	tiff? ( media-libs/tiff:=[jpeg,zlib] )
-	truetype? ( media-libs/freetype:2= )
-	webp? ( media-libs/libwebp:= )
-	xcb? ( x11-libs/libxcb )
-	zlib? ( sys-libs/zlib:= )
-"
-RDEPEND="
-	${DEPEND}
-	dev-python/olefile[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/wheel[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	test? (
-		${RDEPEND}
-		dev-python/defusedxml[${PYTHON_USEDEP}]
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		|| (
-			media-gfx/imagemagick[png]
-			media-gfx/graphicsmagick[png]
-		)
-	)
-"
-
-EPYTEST_DESELECT=(
-	# TODO; incompatible Qt version?
-	Tests/test_qt_image_qapplication.py::test_sanity
-)
-
-usepil() {
-	usex "${1}" enable disable
-}
-
-python_configure_all() {
-	# It's important that these flags are also passed during the install phase
-	# as well. Make sure of that if you change the lines below. See bug 661308.
-	cat >> setup.cfg <<-EOF || die
-		[build_ext]
-		disable_platform_guessing = True
-		$(usepil truetype)_freetype = True
-		$(usepil jpeg)_jpeg = True
-		$(usepil jpeg2k)_jpeg2000 = True
-		$(usepil lcms)_lcms = True
-		$(usepil tiff)_tiff = True
-		$(usepil imagequant)_imagequant = True
-		$(usepil webp)_webp = True
-		$(usepil webp)_webpmux = True
-		$(usepil xcb)_xcb = True
-		$(usepil zlib)_zlib = True
-	EOF
-
-	# setup.py won't let us add the right toolchain paths but it does
-	# accept additional ones from INCLUDE and LIB so set these. You
-	# wouldn't normally need these at all as the toolchain should look
-	# here anyway but it doesn't for this setup.py.
-	export \
-		INCLUDE="${ESYSROOT}"/usr/include \
-		LIB="${ESYSROOT}"/usr/$(get_libdir)
-
-	# We have patched in this env var.
-	tc-export PKG_CONFIG
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO (is clipboard unreliable in Xvfb?)
-		Tests/test_imagegrab.py::TestImageGrab::test_grabclipboard
-	)
-
-	"${EPYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
-	# no:relaxed: pytest-relaxed plugin make our tests fail. deactivate if installed
-	epytest -p no:relaxed || die "Tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	python_doheader src/libImaging/*.h
-	distutils-r1_python_install
-}
-
-python_install_all() {
-	if use examples ; then
-		docinto example
-		dodoc docs/example/*
-		docompress -x /usr/share/doc/${PF}/example
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pooch/Manifest b/dev-python/pooch/Manifest
index 00271ecfd23d..45a3c13fae4e 100644
--- a/dev-python/pooch/Manifest
+++ b/dev-python/pooch/Manifest
@@ -1 +1,2 @@
 DIST pooch-1.7.0.tar.gz 57457 BLAKE2B d85fc3cc707bfa639f46bf75b89dd31714f7a4f64a90ff7a6c92b792a8209e66a5fffb62912a336cd481330c37c0037df116d27ea06808bf02f1039e2aac930b SHA512 60126b893a9a1422aad12349143fbe72e485004f79b06da752f51ae374f375efae693304210c8d62b211433d7ce75fab53a50a6f267b1952df83fdccc2de13a7
+DIST pooch-1.8.0.tar.gz 59408 BLAKE2B 07ed7c17e98ef4627f347e9b71355e147f56970fe5f0d709269602796a5ba2d8ffd5ad0ad47a17114d32841b9a7fc3eeab978f8ca9f64d35c89ff35b0aa62279 SHA512 d97e3e1098d1eeee30108affc64ed5a12f679e9122d35494598a03f3a548bb83b57dc54ac5a2c85bc42e664cb90f713bdb55b47b430ff000a722ffad58010497
diff --git a/dev-python/pooch/pooch-1.8.0.ebuild b/dev-python/pooch/pooch-1.8.0.ebuild
new file mode 100644
index 000000000000..20513a8f8759
--- /dev/null
+++ b/dev-python/pooch/pooch-1.8.0.ebuild
@@ -0,0 +1,59 @@
+# 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_{8,9,10,11,12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Manage your Python library's sample data files"
+HOMEPAGE="
+	https://github.com/fatiando/pooch/
+	https://pypi.org/project/pooch/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+
+RDEPEND="
+	dev-python/appdirs[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.5.0[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/paramiko[${PYTHON_USEDEP}]
+		dev-python/pytest-httpserver[${PYTHON_USEDEP}]
+		dev-python/tqdm[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_DESELECT=(
+	# Needs network
+	pooch/tests/test_core.py::test_check_availability_invalid_downloader
+	pooch/tests/test_core.py::test_load_registry_from_doi
+	pooch/tests/test_core.py::test_load_registry_from_doi_zenodo_with_slash
+	# dev-python/pytest-localftpserver -> dev-python/pyftpdlib has py3.12 issues
+	# https://github.com/giampaolo/pyftpdlib/issues/560#issuecomment-971377238
+	pooch/tests/test_core.py::test_check_availability_on_ftp
+	pooch/tests/test_downloaders.py::test_invalid_doi_repository
+	pooch/tests/test_downloaders.py::test_doi_url_not_found
+	pooch/tests/test_downloaders.py::test_figshare_url_file_not_found
+	pooch/tests/test_downloaders.py::test_doi_downloader
+)
+
+### docs no included in pypi tarball
+# distutils_enable_sphinx doc \
+#	dev-python/sphinx-rtd-theme
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p pytest_httpserver -k "not network"
+}
diff --git a/dev-python/pygresql/Manifest b/dev-python/pygresql/Manifest
index de78ed54fed7..8d40af04a532 100644
--- a/dev-python/pygresql/Manifest
+++ b/dev-python/pygresql/Manifest
@@ -1,3 +1,2 @@
-DIST PyGreSQL-5.2.4.tar.gz 270319 BLAKE2B 6ec2bf9786dd97f8649585bd00b87569d2cd668e43e8cc28443126ec2ee00943f044775b756785002c32aef516c4141e126e7d458b232bf8bfa1413bfdbd2db0 SHA512 3dbb90391e0a12f1ce4676dd5fa89d586d33a4bcb710779583beb05ae71131fbcf0412e702b542d856f3fd6ceeb145952c2f7bdede25efd08fe61ffcf0296212
 DIST PyGreSQL-5.2.5.tar.gz 272605 BLAKE2B 6b3d63ee5d34bbe4eb3f482c7a6e6ef02f6087bf8799aeabf57e2bd7bc77ba46d3d741d1f1355336df7f76f6d23c6d2894d3e3fcfbaafbe6171978c7fc4db30b SHA512 e99a9776e92d812fcf06cf3f448b38aa39ccd108b28237e22dcb663293db41c92d78aa72ad0665552dd99a6a0a8bad518521cacf0b545b888132758f36488f88
 DIST PyGreSQL-6.0.tar.gz 271585 BLAKE2B 80e5dc9be955ac2b9a69b1cdbc6f164d11bd8f0386da340fc414340a7ebc7e857727f8b6570acf6696ac83daeb41ef80cc5875f4ae0ea766e838d54d96b33910 SHA512 a6ed1f252a40ae4c429c142cc408993bfe5ec7a4318cf219f977a440a3e3f823291b160843bc497e3375e5acc36b8043178f77c0f9cfd108e580e80b7a5c8eb9
diff --git a/dev-python/pygresql/pygresql-5.2.4.ebuild b/dev-python/pygresql/pygresql-5.2.4.ebuild
deleted file mode 100644
index 2ffd0bf904e4..000000000000
--- a/dev-python/pygresql/pygresql-5.2.4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYPI_PN="PyGreSQL"
-POSTGRES_COMPAT=( 9.6 {10..14} )
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 postgres pypi
-
-DESCRIPTION="A Python interface for the PostgreSQL database"
-HOMEPAGE="http://www.pygresql.org/"
-
-LICENSE="POSTGRESQL"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ~sparc x86"
-
-DEPEND="${POSTGRES_DEP}"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.2-CFLAGS.patch
-)
-
-distutils_enable_tests unittest
-
-src_test() {
-	local db="${T}/pgsql"
-	initdb --username=portage -D "${db}" || die
-	pg_ctl -w -D "${db}" start \
-		-o "-h '127.0.0.1' -p 5432 -k '${T}'" || die
-	psql -h "${T}" -U portage -d postgres \
-		-c "ALTER ROLE portage WITH PASSWORD 'postgres';" || die
-	createdb -h "${T}" -U portage unittest || die
-
-	cat > tests/LOCAL_PyGreSQL.py <<-EOF || die
-		dbhost = '${T}'
-	EOF
-
-	distutils-r1_src_test
-
-	pg_ctl -w -D "${db}" stop || die
-}
-
-python_install_all() {
-	local DOCS=( docs/*.rst docs/community/* docs/contents/tutorial.rst )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pylint-venv/Manifest b/dev-python/pylint-venv/Manifest
index 5d87e02ee949..21e85658ab37 100644
--- a/dev-python/pylint-venv/Manifest
+++ b/dev-python/pylint-venv/Manifest
@@ -1 +1,2 @@
 DIST pylint-venv-3.0.2.gh.tar.gz 15046 BLAKE2B 3c07e00739541c4b9b7c28c9b6cf91e8dee27885adcac8ec88b347f6c580ee0a0c905271eb5b5256ccf0ea975604bf98560ce271a27cbfd2d5790d1143ba6af4 SHA512 716491ffbb5e6642cd61cee62c720a594d85b4cf44feb2d53d3e120dbdea813234776a95341ac10acbdd64354cc3875659f1d3bbc5f45a87ac5232e1e7f89473
+DIST pylint-venv-3.0.3.gh.tar.gz 15432 BLAKE2B 2a0315967aa7ac9628a7633360249d3bf5904d2e9939fe1c962ad7066694fd5b073df71e89f0ff4a6c278c3ccf6b41cd70c0b2928b58bbaa19a7910f18f7b697 SHA512 83632d7063f8e14bcf9213a059e8e6e20222518e5cc3d19a7cc3761e11ece2aaea9b2e648f0cacdb37e6995fd85371920ed8bcc7a28545c571d12da8e8b3d795
diff --git a/dev-python/pylint-venv/pylint-venv-3.0.3.ebuild b/dev-python/pylint-venv/pylint-venv-3.0.3.ebuild
new file mode 100644
index 000000000000..99d7c394851a
--- /dev/null
+++ b/dev-python/pylint-venv/pylint-venv-3.0.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+
+inherit distutils-r1
+
+DESCRIPTION="Init-hook to use the same Pylint with different virtual environments"
+HOMEPAGE="
+	https://pypi.org/project/pylint-venv/
+	https://github.com/jgosmann/pylint-venv/
+"
+SRC_URI="
+	https://github.com/jgosmann/pylint-venv/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/pylint-2.14.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/pylint-2.14.0[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	# we need to set PYTHONPATH explicitly since the test runs installed
+	# pylint (i.e. starts outside the test venv)
+	local -x PYTHONPATH=${S}:${PYTHONPATH}
+	bash test/test.sh || die "Test failed with ${EPYTHON}"
+}
diff --git a/dev-python/pytest-xprocess/Manifest b/dev-python/pytest-xprocess/Manifest
index f9c2c41abdd7..8fd9164f72ec 100644
--- a/dev-python/pytest-xprocess/Manifest
+++ b/dev-python/pytest-xprocess/Manifest
@@ -1,2 +1 @@
-DIST pytest-xprocess-0.22.2.tar.gz 31346 BLAKE2B 07b9fdfea2ecd3d3aaf4115c2f7ecd41c864b4490694cedc54460d0f16397ebdda0ac88fd9bd1613dcaec1cb9c36571b8ab2febc8d151f8f6c4e19fe3abd0821 SHA512 2051be110dfda8063c31bb9555bff569f5d7a1332a62f8ce57fd799dfc7d8551ba1227df12f44fccc1ec62d9fcc0face104a77c9c5cc1abb583b74cd1d8a9ff7
 DIST pytest-xprocess-0.23.0.tar.gz 31350 BLAKE2B 71492aa1bbc438221c6ac2825bf2bd678a75c12e8b5a8654d333c1ba2ad5c66b21f85e572998f0e5f1835097483a4895942d664ef7d8f078cad7923a9ee2e962 SHA512 97aa2a8ba0bcca62d53c0a0523696f6ae5fec5eae29e3e2cfe1a3ec8f14622c2c31f0802b2e65b55aa16778dd6ea82951e15af768c9d84cfd13aa2d427f94c9e
diff --git a/dev-python/pytest-xprocess/pytest-xprocess-0.22.2.ebuild b/dev-python/pytest-xprocess/pytest-xprocess-0.22.2.ebuild
deleted file mode 100644
index cfa6e936aa7e..000000000000
--- a/dev-python/pytest-xprocess/pytest-xprocess-0.22.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Manage external processes across test runs"
-HOMEPAGE="
-	https://pypi.org/project/pytest-xprocess/
-	https://github.com/pytest-dev/pytest-xprocess/
-"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/py[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 6b06f8c532ef..fad24f911225 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -1,2 +1,2 @@
-DIST pytest-7.4.0.tar.gz 1349733 BLAKE2B 59b9e90ab226dd317a5beeb0b189d0e323379e781dcca3fc7aa37ab7ef6d623a25f6f50e4b648cd274bdbc202e914fd393749d093a4c9d8c2f19124403d6b4fe SHA512 48caca22c77e03cb3bca04d2f11695c48868433e6966b6f652f414b3b4405cb9dfba1ebdfd66060ba6add45609ec27b2eddd81d3739ef8e84a51b9da3c6f6099
 DIST pytest-7.4.2.tar.gz 1354640 BLAKE2B 3929631bae67c5bfa86c12850c48549b6e545512b3d37d821b48f69adaa8ef057d8cfac4426c047746d9c80e7e3515cc45018744f2155805b5381e7e43cd1b12 SHA512 6f68b7e2bf6a14fbe89a452706b25c4afda69de2c0f78da9c03cf8795d1795d9bdaaff26ba5bc93931c1a04c1472a4eba58bb9774f81116419526413eb1fed4f
+DIST pytest-7.4.3.tar.gz 1356179 BLAKE2B 2f4fd893aaf9867f20548eababc7aac6f4978253bcc4a35c50f7e2327a48458bc184f2340764ee7fed3dd02bc779ed03f084a0d8839a18f614d32245888c4f56 SHA512 1b80e9b7e0ba8fe966d6658aa72d49d101190f255acd9eb81d66142327535b7108c921055d8fe3e330e3ff4163aa03d7c67b2807d433dd9e1799be6a59b208c9
diff --git a/dev-python/pytest/pytest-7.4.0.ebuild b/dev-python/pytest/pytest-7.4.3.ebuild
index 3a8ff9824051..85cf5375cd37 100644
--- a/dev-python/pytest/pytest-7.4.0.ebuild
+++ b/dev-python/pytest/pytest-7.4.3.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 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"
+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="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/rtslib-fb/Manifest b/dev-python/rtslib-fb/Manifest
index de8e789d1d1a..c21f36c6e110 100644
--- a/dev-python/rtslib-fb/Manifest
+++ b/dev-python/rtslib-fb/Manifest
@@ -1,3 +1 @@
-DIST rtslib-fb-2.1.74.tar.gz 73919 BLAKE2B d16527ed1efae379aa976929d8e6dd8a13cb1d47eb8efe8897ee495b0864225f520b42bd27fe502a1fad11369d20690b9751e54ae7a328c60917144114358d24 SHA512 b0b0722a5a7e10af698ae0570a65b51d7f091bfcc370850dacb3087471ca98bd229b4a5ed73760b7ed5bbee1b53dae4781cc2b3d5e7a1ff8ce37c5c144477852
-DIST rtslib-fb-2.1.75.tar.gz 74188 BLAKE2B 13fbeffb0396fa39d17362c05973572feab86eaa6748d4043f7721f3b631e670266dfbaebc26afb70e83547c4a24f149399d7d77725ecb9e9f6ac4ef709306d4 SHA512 b20109fd40cd0d23621bb01f884e302432a1dde98d0147dbd7a2eaf7a724801c77759effb26717b0451c5fb2f75e67287d9c0364c3c7ee3072d08cce259ce616
 DIST rtslib-fb-2.1.76.tar.gz 78055 BLAKE2B df22093072a7e7b12a080db8253eff9e6aff1efb44a8bdb6c37a21601fd10beea03b665d1e1621904a9a0c1d1299e7f9e5f61682669f75a06f4e050c503da9a7 SHA512 fee3087702e44ede59b9635d7cbe7af06da104d6aeffc3fbb584ce6e8170b7856650a006ee574940448801a67e9f7d9610ccb9ad632dd6d0c378fe7c6cd1c159
diff --git a/dev-python/rtslib-fb/rtslib-fb-2.1.74.ebuild b/dev-python/rtslib-fb/rtslib-fb-2.1.74.ebuild
deleted file mode 100644
index db7620582a4e..000000000000
--- a/dev-python/rtslib-fb/rtslib-fb-2.1.74.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 systemd pypi
-
-DESCRIPTION="A Python object API for managing the Linux LIO kernel target"
-HOMEPAGE="https://github.com/open-iscsi/rtslib-fb"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-python/pyudev[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-
-src_install() {
-	distutils-r1_src_install
-	systemd_dounit "${FILESDIR}/target.service"
-}
diff --git a/dev-python/rtslib-fb/rtslib-fb-2.1.75.ebuild b/dev-python/rtslib-fb/rtslib-fb-2.1.75.ebuild
deleted file mode 100644
index e52d6db9e875..000000000000
--- a/dev-python/rtslib-fb/rtslib-fb-2.1.75.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 systemd pypi
-
-DESCRIPTION="A Python object API for managing the Linux LIO kernel target"
-HOMEPAGE="
-	https://github.com/open-iscsi/rtslib-fb/
-	https://pypi.org/project/rtslib-fb/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/pyudev[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-src_install() {
-	distutils-r1_src_install
-	systemd_dounit "${FILESDIR}/target.service"
-}
diff --git a/dev-python/ruamel-yaml/Manifest b/dev-python/ruamel-yaml/Manifest
index 8ad155f98ee2..c4b01e16a8c5 100644
--- a/dev-python/ruamel-yaml/Manifest
+++ b/dev-python/ruamel-yaml/Manifest
@@ -6,3 +6,4 @@ DIST ruamel.yaml-0.17.36.tar.xz 193148 BLAKE2B 20c7389b29a34a917049c1ef1081ac7d3
 DIST ruamel.yaml-0.17.39.tar.xz 192916 BLAKE2B 23553af89c3083837a54805097c2c59eb2bff96e200acd12fcc646bf346eab20d87f58e6c9553598615a750d408dc855886fe4251ba128e3325cecb953f18275 SHA512 ee534cff9a6b72b617faf3fb4044bff0ae2d3c29508ef8df948774db45d39c8f80362f7ed8c8091319718a221b9d462838d521d97603d9cb18c38a008ebec8e5
 DIST ruamel.yaml-0.17.40.tar.xz 193424 BLAKE2B 80405ef0c85af476ef0e996b1da5aba1a116e8c181d18f40fb4fd86093a512c09cf0da30d52d85946c524e86e10379cb11154cb08a7ea7b054ba9379996de4f4 SHA512 848af49430b9c028a6676a159915c66e29f4290374ba0863e4fd87527f3178bb303a80f4ba97139fc8cbcd01f7f7782a4b3112325237a39659e227afda61fcb8
 DIST ruamel.yaml-0.18.0.tar.xz 194448 BLAKE2B 5a8c0e1a8cdfcec743d7e9084d7a2df54b79fbca174a7d46629d64a4cea33bc15ec320813b6f4206fb04de8383e34b73a2c615f3e10afebe600f3c0bc02f5639 SHA512 99c84d7c8b66cd3db5a030b81449b0790df54912af1c01dfbae575f495b22c662f4a7187ba41554802bd760782a70554c6359fcc640a12b2f85b37755d4af32d
+DIST ruamel.yaml-0.18.2.tar.xz 194700 BLAKE2B 90eab45df1ae69b5089d953829350a2e580220dfe01cd5ef1bde3c13892bbf7998daab9326810dbe41645beca808c1557a8a35be52e4db600ecd9cc8372086e1 SHA512 9718a0a17f9a57ad4d99f9079dbd6257c647ba07a24d368507ea8c66ef35fbec5db97fc2944672cc94217b610508c210f5fe926e80d47b40f2b4270aa6b81fde
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.18.2.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.18.2.ebuild
new file mode 100644
index 000000000000..36154d7811ad
--- /dev/null
+++ b/dev-python/ruamel-yaml/ruamel-yaml-0.18.2.ebuild
@@ -0,0 +1,58 @@
+# 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_{8,9,10,11,12} pypy3 )
+
+inherit distutils-r1
+
+MY_P="${P/-/.}"
+DESCRIPTION="YAML parser/emitter that supports roundtrip comment preservation"
+HOMEPAGE="
+	https://pypi.org/project/ruamel.yaml/
+	https://sourceforge.net/projects/ruamel-yaml/
+"
+# PyPI tarballs do not include tests
+SRC_URI="mirror://sourceforge/ruamel-dl-tagged-releases/${MY_P}.tar.xz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]
+	!dev-python/namespace-ruamel
+"
+BDEPEND="
+	test? (
+		dev-python/ruamel-std-pathlib[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+python_test() {
+	local EPYTEST_DESELECT=()
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		_test/test_deprecation.py::test_collections_deprecation
+	)
+	local EPYTEST_IGNORE=(
+		# Old PyYAML tests from lib/ require special set-up and are
+		# invoked indirectly via test_z_olddata, tell pytest itself
+		# to leave the subdir alone.
+		_test/lib/
+	)
+
+	# this is needed to keep the tests working while
+	# dev-python/namespace-ruamel is still installed
+	distutils_write_namespace ruamel
+	epytest
+}
diff --git a/dev-python/sarif_om/Manifest b/dev-python/sarif-om/Manifest
index db4edf9f9a61..db4edf9f9a61 100644
--- a/dev-python/sarif_om/Manifest
+++ b/dev-python/sarif-om/Manifest
diff --git a/dev-python/sarif_om/metadata.xml b/dev-python/sarif-om/metadata.xml
index a0d4c5913ba0..a0d4c5913ba0 100644
--- a/dev-python/sarif_om/metadata.xml
+++ b/dev-python/sarif-om/metadata.xml
diff --git a/dev-python/sarif_om/sarif_om-1.0.4-r1.ebuild b/dev-python/sarif-om/sarif-om-1.0.4-r1.ebuild
index ab95bacefda8..ab95bacefda8 100644
--- a/dev-python/sarif_om/sarif_om-1.0.4-r1.ebuild
+++ b/dev-python/sarif-om/sarif-om-1.0.4-r1.ebuild
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 7699244fd9e9..774df5617f0f 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,2 +1,3 @@
 DIST sip-6.7.11.tar.gz 1165368 BLAKE2B 62ba38ca39544e7ed0935e91729ba6f82a5e613a4b26fbf27c3708a5cb38ba0fa583ceb6a45c0c7485579f4c318fc5ac910eee8477aee6d25d33d4ae07bf527b SHA512 a9247714fd6f6e6dffff2e6b53b35a7831ced55f0706e7c883d6700f22b814dc2cf1e56e681214759c90386ff2c77cb4ace6d07cd0c8b6da0ed65444f9857056
 DIST sip-6.7.12.tar.gz 1169656 BLAKE2B 07ae682e783da5bc6fc3109c62c7bff245faab795cc28f135758b1211fae1dfae79668e7e7c0de8b3bae5c8b10534d153cdd47969b34149c8f5598867d19f17c SHA512 885c32a051e882b82b59bf1365050933f8fc1c619b19f4bc03235edc5741a5e14aae8edf90479ad0283f74ba5c5233a2589c151ec865b130199a6db9800a2294
+DIST sip-6.8.0.dev2310230931.tar.gz 1126109 BLAKE2B 53efdb9722888645b9772c6080f34459b89c745a02cfb9842f7924870afa81d4ba06ec6ac730ee1d254f5252c1c495a4b4dfd51157d759d7334d2980145214f8 SHA512 8bac33c9ae87dc11669837e2b07d5016a7e16e743439dbf763c13a118476431058d2a6c4b0c29e4ce7a7f5f86602bb1c9f27ccf0d3f6c1a298b06256f820ceaa
diff --git a/dev-python/sip/sip-6.8.0_pre2310230931.ebuild b/dev-python/sip/sip-6.8.0_pre2310230931.ebuild
new file mode 100644
index 000000000000..87d82691e6e2
--- /dev/null
+++ b/dev-python/sip/sip-6.8.0_pre2310230931.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1 #pypi
+
+DESCRIPTION="Python bindings generator for C/C++ libraries"
+HOMEPAGE="https://www.riverbankcomputing.com/software/sip/"
+
+# drop this temporary block on bump, re-add pypi inherit, and restore keywords
+# (see also metadata.xml comment)
+SIP_P=sip-$(ver_cut 1-3).dev$(ver_cut 5)
+SRC_URI="https://www.riverbankcomputing.com/pypi/packages/sip/${SIP_P}.tar.gz"
+S=${WORKDIR}/${SIP_P}
+
+LICENSE="|| ( GPL-2 GPL-3 SIP )"
+SLOT="5"
+# unkeyworded pre-release for testing
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/tomli[${PYTHON_USEDEP}]' 3.10)
+"
+
+distutils_enable_sphinx doc --no-autodoc
diff --git a/dev-python/spdx-tools/spdx-tools-0.8.2.ebuild b/dev-python/spdx-tools/spdx-tools-0.8.2.ebuild
index 9ec772f0ca71..8e8e777ab2e4 100644
--- a/dev-python/spdx-tools/spdx-tools-0.8.2.ebuild
+++ b/dev-python/spdx-tools/spdx-tools-0.8.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="
 	dev-python/beartype[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-doxylink/Manifest b/dev-python/sphinxcontrib-doxylink/Manifest
index 295dc3e5ba45..42b518c7294b 100644
--- a/dev-python/sphinxcontrib-doxylink/Manifest
+++ b/dev-python/sphinxcontrib-doxylink/Manifest
@@ -1 +1,2 @@
 DIST sphinxcontrib-doxylink-1.12.2.gh.tar.gz 23556 BLAKE2B 8d71de83ec304bbf2a74f414c46d157367fc950dc52bab7f685fba24520985fb06daf8bf760d49d73d7a2418da346bf6c84a493b24edef4ab53c5c09799f7c2e SHA512 e90594031067eed0eec1c7aad9c7d2ba7d9a4ce2012a905f6631947a7135659483d52a6261b923d3fa21fcde59ae8bf24c168507c8e95296e0539595e9589ed2
+DIST sphinxcontrib-doxylink-1.12.3.gh.tar.gz 23632 BLAKE2B 4a80366f4beeb9715c69c221a8e5247c28179613b59fb7bdadb1f145b69e4afdc0c2c30affd9647ec9e56e892503a95d018fd97eda014980177282299b81d61f SHA512 d25003dab35c6877bc846552db3e663c660bd5cb6ac6d9077bf04eca32afe0f9559118390c5c884901ce8c5297e97d84f6089428e3173123da6e7869a606a05e
diff --git a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.12.3.ebuild b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.12.3.ebuild
new file mode 100644
index 000000000000..c8a07e59eb15
--- /dev/null
+++ b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.12.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+
+inherit distutils-r1
+
+DESCRIPTION="Extension to link to external Doxygen API documentation"
+HOMEPAGE="
+	https://pypi.org/project/sphinxcontrib-doxylink/
+	https://pythonhosted.org/sphinxcontrib-doxylink/
+	https://github.com/sphinx-contrib/doxylink/
+"
+SRC_URI="
+	https://github.com/sphinx-contrib/doxylink/archive/refs/tags/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/doxylink-${PV}"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/sphinx-1.6[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-3.0.8[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		app-doc/doxygen
+		>=dev-python/testfixtures-6.18.5[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc \
+	dev-python/sphinx-rtd-theme
+
+python_test() {
+	distutils_write_namespace sphinxcontrib
+	cd "${T}" || die
+	epytest "${S}"/tests
+}
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 5209f24d0580..008d28128097 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -1,4 +1,2 @@
 DIST SQLAlchemy-1.4.49.tar.gz 8536601 BLAKE2B 2133723380b157a76f4af6103a2c68099f78d7a49ad90793d682bd6015d61a06a72ba6f02922111b60716e311ddc2f6067153f7b4b1f80329775e0d6f27a0d92 SHA512 268751b09aebd9da10fd57b4b987fa57f3c61d18d5104bb308e405aa034c74e7d5441abd94368857fbe11b8d15bb5315634f64f3b1252e7318d24107ba1fe3ff
-DIST SQLAlchemy-2.0.20.tar.gz 9437690 BLAKE2B d0be093ec796f42868352339f70e64a1a0fbd4e96315ab91b370df79882138763228bc365dceaec736f7dce1d7c6991c7d20ca7dbccb766aec78b7039004dad2 SHA512 3bc463465248f28948a1004a3c18a5dbc02af81b18b4f89155aca6a03ab582010318c3d177c3b5c4caabd49945b426d7e0f23c482aefc75eb1a7252b57241e53
-DIST SQLAlchemy-2.0.21.tar.gz 9454220 BLAKE2B 67009f20349280b36c9b5664d5dc0c76ae35e5e2d8929cc8f848e862e4689dd695db5fc7fb10c1548a59f0a7f892f7573d969cdd4a6d400c89c23b35a5be3a31 SHA512 5fb0e3711445c6aa95d6facac098a05f0d20f9dacc4e9abe12057e0def7cfe07c73c2b43f1b8c7868e67e20e76f0b1da19eba10de87394db22d1d9a28ae23715
 DIST SQLAlchemy-2.0.22.tar.gz 9456107 BLAKE2B c4c5efd096c03550ce8f2adb944b97861a1f383f2c73dd096f4698428f88f80dba66bc22d209488c9ae3b0438ee6190377a36cc828ff411f99165cc41becc949 SHA512 76db680d80939235c17f2fbfe8f7dbc822a9299d52ab261ec76481e76de7bed80dbd4b5f9c7ed1d7c2d1b0651d035a47a8990691a128fd999a6a29c7c45b5459
diff --git a/dev-python/sqlalchemy/sqlalchemy-2.0.20.ebuild b/dev-python/sqlalchemy/sqlalchemy-2.0.20.ebuild
deleted file mode 100644
index 2af8770dbed2..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-2.0.20.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# 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_{8,9,10,11,12} pypy3 )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 optfeature pypi
-
-MY_PN="SQLAlchemy"
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="
-	https://www.sqlalchemy.org/
-	https://pypi.org/project/SQLAlchemy/
-	https://github.com/sqlalchemy/sqlalchemy/
-"
-SRC_URI="$(pypi_sdist_url --no-normalize "${MY_PN}")"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-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"
-IUSE="examples +sqlite test"
-
-RDEPEND="
-	>=dev-python/typing-extensions-4.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_impl_dep sqlite)
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/greenlet/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		test/ext/mypy/test_mypy_plugin_py3k.py
-		test/typing/test_mypy.py
-		# hardcode call counts specific to Python versions
-		test/aaa_profiling
-	)
-	local EPYTEST_DESELECT=(
-		# warning tests are unreliable
-		test/base/test_warnings.py
-	)
-	local sqlite_version=$(sqlite3 --version | cut -d' ' -f1)
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				test/ext/test_associationproxy.py::ProxyHybridTest::test_msg_fails_on_cls_access
-				test/ext/test_associationproxy.py::DictOfTupleUpdateTest::test_update_multi_elem_varg
-				test/ext/test_associationproxy.py::DictOfTupleUpdateTest::test_update_one_elem_varg
-				test/engine/test_processors.py::PyDateProcessorTest::test_date_invalid_string
-				test/engine/test_processors.py::PyDateProcessorTest::test_datetime_invalid_string
-				test/engine/test_processors.py::PyDateProcessorTest::test_time_invalid_string
-				"test/dialect/test_sqlite.py::TestTypes_sqlite+pysqlite_${sqlite_version//./_}::test_cant_parse_datetime_message"
-				"test/dialect/test_suite.py::ReturningGuardsTest_sqlite+pysqlite_${sqlite_version//./_}"::test_{delete,insert,update}_single
-				test/base/test_utils.py::ImmutableDictTest::test_pep584
-			)
-			;;
-	esac
-	if ! has_version "dev-python/greenlet[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_execution
-			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_run_sync
-			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[False-True]"
-			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[True-True]"
-			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[has_terminate-is_asyncio]"
-			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[not_has_terminate-is_asyncio]"
-			"test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True-_exclusions0]"
-			"test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True]"
-		)
-	fi
-
-	# upstream's test suite is horribly hacky; it relies on disabling
-	# the warnings plugin and turning warnings into errors;  this also
-	# means that any DeprecationWarnings from third-party plugins cause
-	# everything to explode
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=
-	# upstream automagically depends on xdist when it is importable
-	# note that we can't use xdist because it causes nodes to randomly
-	# crash on init
-	if has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]"; then
-		PYTEST_PLUGINS+=xdist.plugin
-	fi
-	epytest
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "asyncio support" dev-python/greenlet
-	optfeature "MySQL support" \
-		dev-python/mysqlclient \
-		dev-python/pymysql
-	optfeature "postgresql support" dev-python/psycopg:2
-}
diff --git a/dev-python/sqlalchemy/sqlalchemy-2.0.21.ebuild b/dev-python/sqlalchemy/sqlalchemy-2.0.21.ebuild
deleted file mode 100644
index e41b5ee664bf..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-2.0.21.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# 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_{8,9,10,11,12} pypy3 )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 multiprocessing optfeature pypi
-
-MY_PN="SQLAlchemy"
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="
-	https://www.sqlalchemy.org/
-	https://pypi.org/project/SQLAlchemy/
-	https://github.com/sqlalchemy/sqlalchemy/
-"
-SRC_URI="$(pypi_sdist_url --no-normalize "${MY_PN}")"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-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"
-IUSE="examples +sqlite test"
-
-RDEPEND="
-	>=dev-python/typing-extensions-4.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/greenlet/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		test/ext/mypy/test_mypy_plugin_py3k.py
-		test/typing/test_mypy.py
-		# hardcode call counts specific to Python versions
-		test/aaa_profiling
-	)
-	local EPYTEST_DESELECT=(
-		# warning tests are unreliable
-		test/base/test_warnings.py
-	)
-	local sqlite_version=$(sqlite3 --version | cut -d' ' -f1)
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				test/ext/test_associationproxy.py::ProxyHybridTest::test_msg_fails_on_cls_access
-				test/ext/test_associationproxy.py::DictOfTupleUpdateTest::test_update_multi_elem_varg
-				test/ext/test_associationproxy.py::DictOfTupleUpdateTest::test_update_one_elem_varg
-				test/engine/test_processors.py::PyDateProcessorTest::test_date_invalid_string
-				test/engine/test_processors.py::PyDateProcessorTest::test_datetime_invalid_string
-				test/engine/test_processors.py::PyDateProcessorTest::test_time_invalid_string
-				"test/dialect/test_sqlite.py::TestTypes_sqlite+pysqlite_${sqlite_version//./_}::test_cant_parse_datetime_message"
-				"test/dialect/test_suite.py::ReturningGuardsTest_sqlite+pysqlite_${sqlite_version//./_}"::test_{delete,insert,update}_single
-				test/base/test_utils.py::ImmutableDictTest::test_pep584
-			)
-			;;
-	esac
-	if ! has_version "dev-python/greenlet[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_execution
-			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_run_sync
-			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[False-True]"
-			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[True-True]"
-			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[has_terminate-is_asyncio]"
-			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[not_has_terminate-is_asyncio]"
-			"test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True-_exclusions0]"
-			"test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True]"
-		)
-	fi
-
-	# upstream's test suite is horribly hacky; it relies on disabling
-	# the warnings plugin and turning warnings into errors;  this also
-	# means that any DeprecationWarnings from third-party plugins cause
-	# everything to explode
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p rerunfailures --reruns=10 --reruns-delay=2 \
-		-p xdist -n "$(makeopts_jobs)" --dist=worksteal
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "asyncio support" dev-python/greenlet
-	optfeature "MySQL support" \
-		dev-python/mysqlclient \
-		dev-python/pymysql
-	optfeature "postgresql support" dev-python/psycopg:2
-}
diff --git a/dev-python/traitlets/Manifest b/dev-python/traitlets/Manifest
index 263dfbd0faff..ac2a751d7a9a 100644
--- a/dev-python/traitlets/Manifest
+++ b/dev-python/traitlets/Manifest
@@ -1 +1,2 @@
 DIST traitlets-5.11.2.tar.gz 157726 BLAKE2B 80354e3375ca50242222e3074a2e8ea9f836f4a828224b234bc6ecdd648bd3c8d3a526c2a4d1c003991e30bb229cd0e01ac0c0889f789788705cc78fb76a7303 SHA512 2194599110bef3f63f24a31331c4f823c5a31664f670198398519fbed0801904b8353aa1ff9458b2cc097fd0725bcba41135b72a001df2419dc5ab6c39b9685a
+DIST traitlets-5.12.0.tar.gz 158618 BLAKE2B f32a75222cdd0d69944f582c9d64833146905a2e8757651cdd17732463b39733f3639e23685f6d98120fef9d0c0b9f83d478da225772cb20565df5c00a82e05c SHA512 944b509d39246123e76d87b50c43421bed7d293ce3da15d46eb9c9bdd93fecc8b57ec457c11397f346839a79d6434dc381183926975e105a1f657f9e414d3ef0
diff --git a/dev-python/traitlets/traitlets-5.12.0.ebuild b/dev-python/traitlets/traitlets-5.12.0.ebuild
new file mode 100644
index 000000000000..92724ed213d0
--- /dev/null
+++ b/dev-python/traitlets/traitlets-5.12.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A configuration system for Python applications"
+HOMEPAGE="
+	https://github.com/ipython/traitlets/
+	https://pypi.org/project/traitlets/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+
+BDEPEND="
+	test? (
+		>=dev-python/argcomplete-2.0[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	dev-python/myst-parser \
+	dev-python/pydata-sphinx-theme
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		tests/test_typing.py
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p pytest_mock
+}
diff --git a/dev-python/trimesh/Manifest b/dev-python/trimesh/Manifest
index 027f23650977..756895073e36 100644
--- a/dev-python/trimesh/Manifest
+++ b/dev-python/trimesh/Manifest
@@ -1,2 +1,3 @@
 DIST trimesh-3.23.5.gh.tar.gz 12720153 BLAKE2B ef37eed712eb121529bf6bc724f96456a4dc86c7265b19d77a1bf578d2b5ffae043b5c3e0a03ad5be680125fcfced65ef933037defdc582e81d52b13ac11e9a9 SHA512 52783fe1c275aa121f412d5e2846d0d985e242a33e9c446e8bef538a53ba93b1f2e133e33e4f26390e1146ad8415c28fb146b2c74524c2aa20426819b1b875a0
 DIST trimesh-4.0.0.gh.tar.gz 12921048 BLAKE2B 7592ba10b57aa5cafd47311a430f881cc1ecc917f503e0cea75b38d350738d35c937e1006f80a0acc8a54a33e55f41af3d6cf280751b82a932bd2428af12e033 SHA512 1f5c1a3e92d6bda2ed37e5c6ece9fde798a2c2766c816cbb6a8bf9fdbf489f733ea3988429107eb92043f723bc222348ffe9286663a03562834ae83391793257
+DIST trimesh-4.0.1.gh.tar.gz 12922631 BLAKE2B 81cad4efea89c308f9cbb749b2515ed51f9fc87bbd37505ab94c08698f257c7f3a1b04e1b4a919bf529ee47d7531ecd605dd613c68b13fdaf853161811dfd1e6 SHA512 bfe56b3cfc94fcaa066b953e6df4c70da6fe9a99a6230d7201196a7df897a386c3425ad1da3cc7df75fa0d888fd05d07bf14e6b579a04dddab813c3858f904ef
diff --git a/dev-python/trimesh/trimesh-4.0.1.ebuild b/dev-python/trimesh/trimesh-4.0.1.ebuild
new file mode 100644
index 000000000000..77990cd6c677
--- /dev/null
+++ b/dev-python/trimesh/trimesh-4.0.1.ebuild
@@ -0,0 +1,65 @@
+# 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_{8,9,10,11,12} )
+
+inherit distutils-r1 multiprocessing optfeature
+
+DESCRIPTION="Python library for loading and using triangular meshes"
+HOMEPAGE="
+	https://trimesh.org/
+	https://github.com/mikedh/trimesh/
+	https://pypi.org/project/trimesh/
+"
+SRC_URI="
+	https://github.com/mikedh/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/colorlog[${PYTHON_USEDEP}]
+	dev-python/jsonschema[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pycollada[${PYTHON_USEDEP}]
+	dev-python/pyglet[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/shapely-1.8.2[${PYTHON_USEDEP}]
+	dev-python/svg-path[${PYTHON_USEDEP}]
+	dev-python/sympy[${PYTHON_USEDEP}]
+	dev-python/xxhash[${PYTHON_USEDEP}]
+	sci-libs/rtree[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/mapbox_earcut[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest -n "$(makeopts_jobs)" --dist=worksteal
+}
+
+pkg_postinst() {
+	optfeature_header "${PN} functionality can be extended by installing the following packages:"
+	optfeature "making GUI applications with 3D stuff" dev-python/glooey
+	optfeature "2D triangulations of polygons" dev-python/mapbox_earcut
+	optfeature "loading a number of additional mesh formats" dev-python/meshio
+	optfeature "figuring out how much memory we have" dev-python/psutil
+	optfeature "marching cubes and other nice stuff" sci-libs/scikit-image
+}
diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest
index d6ca72cb076e..be512990c63a 100644
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -1,2 +1,3 @@
+DIST twisted-23.10.0rc1.tar.gz 3496017 BLAKE2B 5e681b81f51d26cf48d7e5d16af4f5c0ea18aa7c45934efe3f8801a60a8ccf7a7a7a13e49d1c065540cda6571e872ed9fc90ac42c6610fbd2a6d0f0c9288baab SHA512 9122d87f1019a2bfdc1530f176e4c607b9a26bfce937d0436a3c260662599f1058ce04c037ecf71e88d17764df7d03399b5e0e353663e848cb8a8a79992d6260
 DIST twisted-23.8.0.tar.gz 3478691 BLAKE2B 44fa9da691456a2b1d97f54b95787abe3e162b5639ee7ab8779c6d9525eb2a878865f450aa6fd6c461c3eba84f95361d2423e241991f52f91a27b792b6d71123 SHA512 ef0a243a4c22dd31e57087f5b2c21a657b98e23cc486f08b9926a9ebe8c4b6fec137993aea71e6c60abc3d653d995da0f65ff10dfc6c3d2cb7fdae5db08e2532
 DIST twisted-regen-cache.gz 911 BLAKE2B ffd3fcda6c67ffe6fd3ef581c8d507548396b66ed0708e9a5c790095e579c0d5f0f71596acf05712989da2ddef2b8d437eca973bc4d80ef8a9fa852915f38305 SHA512 95a9b931c73017d16d1b5e6b41345dddffe62b6af1a8e93b5e40d06d3d15be17b0dd0181c767ffeeb791534d463764ef9e066fa6c2ee2ac4b53c86d1da8fce03
diff --git a/dev-python/twisted/twisted-23.10.0_rc1.ebuild b/dev-python/twisted/twisted-23.10.0_rc1.ebuild
new file mode 100644
index 000000000000..ed4e016b7aaf
--- /dev/null
+++ b/dev-python/twisted/twisted-23.10.0_rc1.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_TESTED=( python3_{8,9,10,11,12} pypy3 )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 pypi virtualx
+
+DESCRIPTION="An asynchronous networking framework written in Python"
+HOMEPAGE="
+	https://twisted.org/
+	https://github.com/twisted/twisted/
+	https://pypi.org/project/Twisted/
+"
+SRC_URI+="
+	https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+IUSE="conch http2 serial ssl test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/automat-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/constantly-15.1[${PYTHON_USEDEP}]
+	>=dev-python/hyperlink-17.1.1[${PYTHON_USEDEP}]
+	>=dev-python/incremental-22.10.0[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-4.2.0[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-5[${PYTHON_USEDEP}]
+	conch? (
+		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/bcrypt-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/cryptography-3.3[${PYTHON_USEDEP}]
+		dev-python/pyasn1[${PYTHON_USEDEP}]
+	)
+	http2? (
+		<dev-python/h2-5.0[${PYTHON_USEDEP}]
+		>=dev-python/h2-3.0.0[${PYTHON_USEDEP}]
+		<dev-python/priority-2.0[${PYTHON_USEDEP}]
+		>=dev-python/priority-1.1.0[${PYTHON_USEDEP}]
+	)
+	serial? (
+		>=dev-python/pyserial-3.0[${PYTHON_USEDEP}]
+	)
+	ssl? (
+		>=dev-python/pyopenssl-21.0.0[${PYTHON_USEDEP}]
+		>=dev-python/service-identity-18.1.0[${PYTHON_USEDEP}]
+		>=dev-python/idna-2.4[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	>=dev-python/hatch-fancy-pypi-readme-22.5.0[${PYTHON_USEDEP}]
+	>=dev-python/incremental-22.10.0[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		$(python_gen_cond_dep '
+			>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+			>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
+			<dev-python/cython-test-exception-raiser-2[${PYTHON_USEDEP}]
+			>=dev-python/cython-test-exception-raiser-1.0.2[${PYTHON_USEDEP}]
+			>=dev-python/idna-2.4[${PYTHON_USEDEP}]
+			>=dev-python/hypothesis-6.56[${PYTHON_USEDEP}]
+			dev-python/pyasn1[${PYTHON_USEDEP}]
+			>=dev-python/pyhamcrest-2[${PYTHON_USEDEP}]
+			>=dev-python/pyserial-3.0[${PYTHON_USEDEP}]
+			virtual/openssh
+			ssl? (
+				>=dev-python/pyopenssl-21.0.0[${PYTHON_USEDEP}]
+				>=dev-python/service-identity-18.1.0[${PYTHON_USEDEP}]
+			)
+		' "${PYTHON_TESTED[@]}")
+	)
+"
+
+python_prepare_all() {
+	# upstream test for making releases; not very useful and requires
+	# sphinx (including on py2)
+	rm src/twisted/python/test/test_release.py || die
+
+	# multicast tests fail within network-sandbox
+	sed -e 's:test_joinLeave:_&:' \
+		-e 's:test_loopback:_&:' \
+		-e 's:test_multiListen:_&:' \
+		-e 's:test_multicast:_&:' \
+		-i src/twisted/test/test_udp.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	# the test suite handles missing file & failing ioctl()s gracefully
+	# but not permission errors from sandbox
+	addwrite /dev/net/tun
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
+		einfo "Skipping tests on ${EPYTHON} (xfail)"
+		return
+	fi
+
+	"${EPYTHON}" -m twisted.trial twisted ||
+		die "Tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# own the dropin.cache so we don't leave orphans
+	> "${D}$(python_get_sitedir)"/twisted/plugins/dropin.cache || die
+
+	python_doscript "${WORKDIR}"/twisted-regen-cache
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newconfd "${FILESDIR}/twistd.conf" twistd
+	newinitd "${FILESDIR}/twistd.init" twistd
+}
+
+python_postinst() {
+	twisted-regen-cache || die
+}
+
+pkg_postinst() {
+	if [[ -z ${ROOT} ]]; then
+		python_foreach_impl python_postinst
+	fi
+}
+
+python_postrm() {
+	rm -f "${ROOT}$(python_get_sitedir)/twisted/plugins/dropin.cache" || die
+}
+
+pkg_postrm() {
+	# if we're removing the last version, remove the cache file
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		python_foreach_impl python_postrm
+	fi
+}
diff --git a/dev-python/unearth/Manifest b/dev-python/unearth/Manifest
index a78ba34f06bb..90599ba7c174 100644
--- a/dev-python/unearth/Manifest
+++ b/dev-python/unearth/Manifest
@@ -2,3 +2,4 @@ DIST unearth-0.10.0.tar.gz 270997 BLAKE2B 8b18df4616fc72025492aa187101bc1f338967
 DIST unearth-0.11.0.tar.gz 271154 BLAKE2B 405c97ef152afb241cb70d9b309fd1ac454be932c96f95b606bb6038ffb2369fbc55c6afabd86f6a15949182de276dcda035fdb17d4810933286a0fa0b567e42 SHA512 70a06a32f6f2ca74c16a55f9613b543d807e437bd99c0ebb02c0d721144cf45208df78940ee41911a8168c9181ec733b9aec2176038b2556d0e2ad5e8c2cc0d4
 DIST unearth-0.11.2.tar.gz 271479 BLAKE2B c3c3f6bfb3f207eb9a7d7667d966efb84e316579ebffc833e94664c089f0c92bc4915f62a07b53b79aa9f43098080231a3644808bf35172df407cd80a7be9096 SHA512 6ec961456640fe3ca8922e0ee83ecadb6b6fa3dd7b5977a228111ad3ad2d79782eb75d76d4a7066c29f53ce023471c2a38d9f587c35f8d04bb0704bdd6406f71
 DIST unearth-0.12.0.tar.gz 280152 BLAKE2B 34890189f34ae6c2fa25c4350f6b5f74da5f77be6c7000fdd15e33759eace10f3e5a269c21d59bb7c21593ff502a2a9142a8665338940da3a28946218a27bc57 SHA512 54cad14382c8218f8d0e69738ca0302cb9102cd5255fb6a90a303030c9f5da8c33b8527bd0e43aa7cc334740de06642e24dca75b2e092c8b85f7adba1f7e2ab8
+DIST unearth-0.12.1.tar.gz 280628 BLAKE2B 2f96c818f5744b228d11d81fac8fb69da4df685b221f3a77424a1eb1d584e154798974ad4548c6f4264faa98f52cddeb94249e1c7e21136c50c08d97446149b6 SHA512 f726562191a3f2b9c189d16223b86307d79f0ca9e251c155e7acbc92160bed834c78064fbc5d745cd90b84ccd6eb2a24c737018fd670474921db0c7d15480576
diff --git a/dev-python/unearth/unearth-0.12.1.ebuild b/dev-python/unearth/unearth-0.12.1.ebuild
new file mode 100644
index 000000000000..16c225b5a463
--- /dev/null
+++ b/dev-python/unearth/unearth-0.12.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=pdm-backend
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A utility to fetch and download python packages"
+HOMEPAGE="
+	https://pypi.org/project/unearth/
+	https://github.com/frostming/unearth/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-httpserver[${PYTHON_USEDEP}]
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/requests-wsgi-adapter[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p pytest_httpserver
+}
diff --git a/dev-python/werkzeug/Manifest b/dev-python/werkzeug/Manifest
index 06c55a5f5062..cb4f8167c0cb 100644
--- a/dev-python/werkzeug/Manifest
+++ b/dev-python/werkzeug/Manifest
@@ -1,2 +1,3 @@
 DIST werkzeug-2.3.7.gh.tar.gz 834304 BLAKE2B 331ffe1f7f079defbd639f391522facfd98cad704da0ed92235f111f401c40b3d06c40b2e0f5c0d0ac8d798335171870a6ce221d02810a8cf3d25f480ee7f7f8 SHA512 76daba77523f486a56f945f54b9f317589d72e36458d7dce975ae597835de8936242edd6ceafa8913d00021557a9da2acfe9619be562fe7b482858daf84dfd2f
 DIST werkzeug-3.0.0.gh.tar.gz 817103 BLAKE2B d606b5c8956b69f32fd944c1a55b2ea0815f97d02665e6fa430a66a8ca64021d6f1263262971f59e5d4f69ece36053138504c81d7392edc09ca4c8337be104be SHA512 d220a38e0fbc4e5da8f705f9d53fb9a22a7ff1643cfd4ba35101cb9c814fa31b0a6f58bb1f024108ff5c3571f4b0333e58fb6c1b331f5caf44d89fac03dd5ad7
+DIST werkzeug-3.0.1.gh.tar.gz 817317 BLAKE2B 670460cf48c8d06196cd34f117758508512d310b740bd188d8ba87779abd62f514c9909e5700b34c37e382925eabe3ffd722b753b76b498aff0dc8ebe1025c8b SHA512 125a5c7680cba726149198802efa90d06c6586daeafcd0960feda637b765356f602df83af7b14996994303c52d32bc6fa044b774f42f0b8991008d1396675033
diff --git a/dev-python/werkzeug/werkzeug-3.0.1.ebuild b/dev-python/werkzeug/werkzeug-3.0.1.ebuild
new file mode 100644
index 000000000000..7d964a40d4b4
--- /dev/null
+++ b/dev-python/werkzeug/werkzeug-3.0.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of various utilities for WSGI applications"
+HOMEPAGE="
+	https://palletsprojects.com/p/werkzeug/
+	https://pypi.org/project/Werkzeug/
+	https://github.com/pallets/werkzeug/
+"
+SRC_URI="
+	https://github.com/pallets/werkzeug/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test-rust"
+
+RDEPEND="
+	>=dev-python/markupsafe-2.1.1[${PYTHON_USEDEP}]
+"
+# NOTE: remove the loong mask after greenlet gains support for loong
+# see https://github.com/python-greenlet/greenlet/pull/257
+BDEPEND="
+	test? (
+		dev-python/ephemeral-port-reserve[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
+		>=dev-python/watchdog-2.3[${PYTHON_USEDEP}]
+		test-rust? (
+			dev-python/cryptography[${PYTHON_USEDEP}]
+		)
+		!hppa? ( !ia64? ( !loong? (
+			$(python_gen_cond_dep '
+				dev-python/greenlet[${PYTHON_USEDEP}]
+			' python3_{10..11})
+		) ) )
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=()
+	if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			"tests/test_serving.py::test_server[https]"
+			tests/test_serving.py::test_ssl_dev_cert
+			tests/test_serving.py::test_ssl_object
+		)
+	fi
+
+	# the default portage tempdir is too long for AF_UNIX sockets
+	local -x TMPDIR=/tmp
+	epytest -p no:django -p no:httpbin tests
+}
author	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2023-10-25 18:38:30 +0000
committer	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2023-10-25 18:38:30 +0000
commit	9fec51ed1c26051f8714173ba91a558a09c4c856 (patch)
tree	281bb1329b489c581860b913331e995b75911103 /dev-python
parent	140978c7aeb9245ccf14b7c51447806bd6628474 (diff)
download	baldeagleos-repo-9fec51ed1c26051f8714173ba91a558a09c4c856.tar.gz baldeagleos-repo-9fec51ed1c26051f8714173ba91a558a09c4c856.tar.xz baldeagleos-repo-9fec51ed1c26051f8714173ba91a558a09c4c856.zip