gentoo auto-resync : 27:05:2024 - 00:07:23

18 files changed, 312 insertions, 233 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 3fa41ebbd2d8..ef7f82093863 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/bitstring/Manifest b/dev-python/bitstring/Manifest
index 1dc1796f3a66..1682af2d6fbb 100644
--- a/dev-python/bitstring/Manifest
+++ b/dev-python/bitstring/Manifest
@@ -1,7 +1,9 @@
 DIST bitstring-4.1.4.tar.gz 232014 BLAKE2B fad74a1a2931504b44c7d95c4e88b058c17ee189ab7b4ec6987d1284c273329b7850cd1aff8e93eb6badf7d52284db006f1f1118ee5f871694f2bd5b4b10e449 SHA512 e05d983ac340565b193c4b4d5f7f5fceea3ba68f04c348ab42cd1d783ac64e1b1adb0ce9bcaac20335137f103d51df198421c7cfee1e5c1ad9f3c9b89b77b679
 DIST bitstring-4.2.1.tar.gz 249982 BLAKE2B f13212c3e4a6a516d045e5c6da3a2a943b05e5fa8f406b74d81972fc553d5032bec285766b7057bbaef5fc66aedcdb3f6efbbe72b89711dad7a451182801f419 SHA512 e54f5941b357d783e2951da8673cf38f6498d4e51949ab3200a05ce590208ca35ab7a300075013b6b2d6dfe6422cd81aa2d29b55c6a8088d9417d8c7a58f4716
 DIST bitstring-4.2.2.tar.gz 249409 BLAKE2B ff9d9eb6d789a13632f00e1a7361ad03e8c21e74f2b5b9158fab3ee336aafa884cfe90a30f56cba97f81ee9aed023a974f35571e47640c0bebc7bd2d116db2d0 SHA512 4700b45c9a56c21a09d61c464a4b2de899bb1cbdb1c5057e5c0f7c388adbda8feb260bdd56f073e53e256c39825cf7cd4b105bf9f57dd6d9d4916717941ff4bf
+DIST bitstring-4.2.3.tar.gz 250537 BLAKE2B 81902038a0b422533b5fe863a4dc71ec7b828d55a45e9edabb632ffc4682e1bf5d5620edce69c245b877d0ee93dff474533db3d46ddd57435a7a4c0b0bd71f9a SHA512 caf53aeb746f4c132d7b91e2c0983bc96f33cb240033872e9d6fc15318f3ced2638427ccc6fc5bfbac05d221fbb4cad4791213b32f97d8a1f8d57e8841a3e176
 EBUILD bitstring-4.1.4.ebuild 570 BLAKE2B f65b1094d3bbf01563f8cba6286eb341c940e769e15a4c6b6c8741e0bc27dd61ebb30f86f61be98aacdbcac9c939998804085f0a97236df9d8018cb62379e367 SHA512 e4310fd394ec0121b1451f918a57a1902be6d3e25162ba8d91d14f63afaef0867849e1ff223668262a2286c777beedd1a57a7ceaac4622bd417612e17d89c32f
 EBUILD bitstring-4.2.1-r1.ebuild 664 BLAKE2B d4350a037a9ffe7aec1bebdcaeba2b2d173f1a5d2ae34a342b7ce500207b49be85d64acb08c3e5eb4ff3861f95c275c7945faf2a7201b519056ad854d5d90034 SHA512 6c5a8d7b799638a5a00bd6ede0347c726987418ae98effb5793629261200548238a33e37a58ca6670abaf9eb4bbdea49a5cdebb191fae0563e3beb9747e66a88
 EBUILD bitstring-4.2.2.ebuild 672 BLAKE2B 5042fe4467c5387f474a202291e1c5aadc5b92658b19c68d02027a493f016f1f2faf777d222e0f8c65e12b9b4bb611f2e9f7f70d994f1e54e861f10035ff1f49 SHA512 9d3e39f068c6ce7b39d220f9b28f42eb1a983bff10b5fe6eaccfc2f36727d3ca8feb5655c8232147ab34a5b57b275c8dbeac1aa5d9abc3c6e76e83bf843c9a2a
+EBUILD bitstring-4.2.3.ebuild 718 BLAKE2B 5400def44ca6d74558100020bbcb5a796cacbfb42e41d056f32a4285be71e3ad53efb4b34100169547b91dc238fb36f41df6774812d4766d3071357d8295e6e0 SHA512 1a447506e9f047079b418c86c1def8e388c4fded943399cd07ffe45c9f2a9727c60d537350e3a528d80eb114e968247665b7880f1a1e1dd40ce1e41c59f07d47
 MISC metadata.xml 733 BLAKE2B 5d978fb3a90e33422df3c35986386d83e38b7760a2cac0708894c8c58c41002b8c7e1fe16bc1e9c707d8009afd0613d4afccf459770d40ec7c9223ede6a34e05 SHA512 ba4a8fb544c13bce8b31eb1dc3c4c5f5beff5f883f922479ccf809d81532719353ef322a26cdf16a0ef499dcdfb300b4a3fd0812edcb62651f8b617f0e391930
diff --git a/dev-python/bitstring/bitstring-4.2.3.ebuild b/dev-python/bitstring/bitstring-4.2.3.ebuild
new file mode 100644
index 000000000000..7aa2e31192ca
--- /dev/null
+++ b/dev-python/bitstring/bitstring-4.2.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A pure Python module for creation and analysis of binary data"
+HOMEPAGE="
+	https://github.com/scott-griffiths/bitstring/
+	https://pypi.org/project/bitstring/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND="
+	<dev-python/bitarray-3[${PYTHON_USEDEP}]
+	>=dev-python/bitarray-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/gfloat-0.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	tests/test_benchmarks.py
+)
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index a682fb7b3595..34cc9e479c7f 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,14 +1,13 @@
 AUX numpy-1.26.1-more-arches.patch 683 BLAKE2B dcf9cd87747981a010be254a49569108ddca41c9ccfebaa04694e832aced6f717bd5edd7a9e5853d6c89eea02fb46c48a534a13d9021d655fc82cc2bda40e7be SHA512 4ca8fafbe15d8f68090283ca1e60d23ccdc3a4ba6f607d9f83533dff44a229a8c92ef9acf886673a57438c6bb6b0e0e21b86de8ae9eba31be5599a9807ab24be
+AUX numpy-2.0.0_rc2-gcc14.patch 892 BLAKE2B 32e2faa0c5979960a7293d9d709ee75d57b7ee182a043ecb942b93b3b0c4e49837b3302ff2dbfafbfa01ac6a1578aa74a0f0d16222218326efc7d8dc96328bd2 SHA512 d2d184e94140652ce42a53d3b1c146dd2ae0844a3f2607238403450690b2023029ff243343b6f5fb2a05e12ed220961002681cedba526be44858285934db328b
 DIST numpy-1.26.1.tar.gz 15651806 BLAKE2B 2b7fe13675b6f11b8f19c2dc671c84418fa959f403ff32c15ae6da37ae8137d062bb47db0180031c90f54451d69d640ec4ebfad0a4eefb32afc55df45c6824ab SHA512 abe5919029fc66961e8f44fdd503b54c291ce75b0d95e3f8bb61ee39a25d62142fbece5734fd7e9cbf65511f9d746fa61796f0d68e6dc2816c0e7747e286e505
 DIST numpy-1.26.2.tar.gz 15664248 BLAKE2B 006e511e27c009f27bf4bf6c8c30c84a4bf0e8b1ff53f4e031089f28c1cfd168ec0d037952fe8f377f9a1d6e1ab642a84c095edeee5696b18053fd5cb7550586 SHA512 9986cd34dda921fbc152c3be0e39f003035787ea1e055452b9259d02c423d413080a0c7e4e19fd38d9e28f66d428719d6ebe784c24ae17249ff56494950daf4b
 DIST numpy-1.26.3.tar.gz 15679696 BLAKE2B 4c063e1a495b187049b5604686c0411b056fd03a69b5044cff10693694a7f055c87a017334cf8d05aa4a4cb87896fdf9203f51742d3cf83dbaf611b0e6e4091a SHA512 25556b41e2db9cfc52c1dfa61b05e4fc1b7b6df3b169f365375575d1146857fdb5ff91ca1508b968c296b7a06e5c6d95e82c41cdc3561587a46d3aa178f6305d
 DIST numpy-1.26.4.tar.gz 15786129 BLAKE2B ee759d3a857111bc494d5e989a7b005375d942b2a89cda69be4a3bd7c6cb195003fd2a8a0535f1858d8977ff688b0ec36360dcba9c3160206eedce5e28f191ef SHA512 f7121ab4099fa0686f9c095d456baa4a5869d651d7b7a06385f885f329cf08f11024b5df5e7b4ee705970062a8102ec4f709512eabbfd5c9fccce4ef83b9c208
-DIST numpy-2.0.0rc1.tar.gz 18314779 BLAKE2B 5f304986330356418302d755d2a94edabbb62b7d88f4637b9f3fa633925174a8d5044f686635ff97dc81a5b464f2a66246ef4c3ede12a2c0441778acd2380927 SHA512 1f3bef3fd51f074b137099921ab0bc0f1af46c9e27993f315b8a7af2cab948de9f91af341a6976d54fae099ba1aa9e0e917eecd520c3721c1ba8e17c28d40be8
 DIST numpy-2.0.0rc2.tar.gz 18323588 BLAKE2B e2d5d03594d0cba360d4e85207818d15a0761f37cc3fb366f8f9f8bdd97743fe0cf0d09a34319c8b6af29b2bc1fc32a7f5be30a5fa2bdebffe455baff05caf7e SHA512 f86b27264c5274823aa11cbedf17c08f81f9acd05430bf40cccbbe8dcff523410629795ca5927d7f8e6c152272b274d777b64f547d23f50d11ae9fd656fd773d
 EBUILD numpy-1.26.1.ebuild 4493 BLAKE2B 7f588777822396538c2004ce566575508aa65dae01afde32bfd40ac74955fbba98758d2cdaafbd51070b073bf216a528cc2c930970ed7de018b2def0e2b15722 SHA512 2e55c6c7e80864b031a834cbbe5862f608d9d77ddcfb6f868504951889e639f4d39bc1097c1d5a34a145d44511450de0fe38a3299de69d4f059c65b0456a9720
 EBUILD numpy-1.26.2.ebuild 4769 BLAKE2B 0185c924c3348ab96eb83c2ec6d766994c0ea325c5d7287caa5a8e1cc3be6401b35eaf0bc5d6703e74f4ee8a4de6ef4e1514deae3ea904cf9b083aea7ed8da9a SHA512 d18013696e917b2a7841fc2bf6a122cf6ba400f1d109878ada6abee0640fd06fd91ab2480eb6b429e014891fa96cfab3c090964d149a6e3d1dd0859fc36aa041
 EBUILD numpy-1.26.3.ebuild 4787 BLAKE2B 22d76498a5fe1340594347ec1780140b8d5e20a33fc74c04defe02365e16d3c82ecc2de8f3a9ed205aee754865ee7109003ad62eebac5d7c99f662729bef2c4f SHA512 829d0fa1472cfc0e509e091c5889d2eb1c0cdb132f329774d088d6ee4cbd4d44b209eb304fbb8e3716a7e284773b52a0247ca0187979fad38b6287d5b4c206f8
-EBUILD numpy-1.26.4.ebuild 4789 BLAKE2B 61b429d317f69ad02e9abb6aa79ea0f5704115fa5d0771ea723f723fff7d0d807c9248ae54864bfbc2efb81ba9b92233e15f903641606d60c1a85f13d619abbf SHA512 19c54b7a33cbb0f7cc97de623424de4ece26b86337a7826fabee84615f9ceb2618b00463f7998c35ada16f9a9fe1e79d5fc61caa4ecd6293085d3a4d62d19697
-EBUILD numpy-2.0.0_rc1.ebuild 4757 BLAKE2B 10d5c245fdb63a95bc076692b3c38f280f45b998257474bf7bfc66cfc485748fe8f1f205da8bd9eb34ece469b13dc42d97805a18331953ac5c9ac4880cd217ed SHA512 5a73ffd2c0e173b512ad9c32a19410d98315ceb3b967c7c4d268c212476e5799824013644d955c4d3b18088ad27dc9453a2c5023591065ce8a287a3560654400
-EBUILD numpy-2.0.0_rc2.ebuild 4937 BLAKE2B 221b3e9338e8a81028c4aae23d6902ddc39f10c1bee3c22a88a8f7f04d6753abc7f6ecb96c9b707ea744291c8cc79ca983a73203d19984b45e26301ed0b8a7f4 SHA512 5741b5dd65137f94dda774755047bbce91b03a4d6dbca77ef5404c701240ad1c5f8663c8558fbb993263d073993de7c000498cb5f31ee6e51e91ace2a6aa6d52
+EBUILD numpy-1.26.4.ebuild 5018 BLAKE2B f1bada06db35ed3df250171892ae378811dc6c52e85c5c5484160c92d5bd222dca93affed01e5b18c0daa105e97a42741b8f512451c0dcbeb3d0780ef08ef19b SHA512 cb1cb571d9bf6dbc9f0fb987ffb10887af79a6e16ff57d2e0b922a48e999f730a4741a09e2e1f99aec57406dbf5912087b5d1876fafe640b15fbed1d659fcb4d
+EBUILD numpy-2.0.0_rc2-r1.ebuild 3055 BLAKE2B 6775c0f4269ee6012dd603c1cc1c71951422609a7e99e5cc0ddad41a6832de0cd4000e266b5a9c9bace1a81e54e66fcfb591c94722b38c97f84c1c14796b32de SHA512 9f02c462f8d2878739dbab11e3a1f8d6a7a7b45151a0a9852a35bdcbb7f4ef44513e041c5d9d10f1abecea369fd9dff088e6fe691d4e2ed530cec1d5d6191405
 MISC metadata.xml 932 BLAKE2B 7a4af31f613bab05ff542da48bf6ff1484d9df2459f559516e71329451dd739d3df0fead507c8033d94ab9ed516b68efe7f21819a8cd6ca303643d8c8bc34e86 SHA512 32cb8c1ab61521a02cbec38f6ea383f074e50d46aa3462ddcb85710f9d348e8e628cf2a5725e3cd921cc32f02885a1b5f02125639f0ec885384eeeff7f468a06
diff --git a/dev-python/numpy/files/numpy-2.0.0_rc2-gcc14.patch b/dev-python/numpy/files/numpy-2.0.0_rc2-gcc14.patch
new file mode 100644
index 000000000000..f3ed3727520d
--- /dev/null
+++ b/dev-python/numpy/files/numpy-2.0.0_rc2-gcc14.patch
@@ -0,0 +1,23 @@
+From f3bc38235bf39a630035920e29f2f883cae5fffe Mon Sep 17 00:00:00 2001
+From: Matti Picus <matti.picus@gmail.com>
+Date: Sun, 26 May 2024 11:25:43 +0300
+Subject: [PATCH 1/3] BUG: cast missing in PyPy-specific f2py code
+
+---
+ numpy/f2py/cb_rules.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/numpy/f2py/cb_rules.py b/numpy/f2py/cb_rules.py
+index 721e075b6c73..faf8dd401301 100644
+--- a/numpy/f2py/cb_rules.py
++++ b/numpy/f2py/cb_rules.py
+@@ -122,7 +122,7 @@
+ #setdims#
+ #ifdef PYPY_VERSION
+ #define CAPI_ARGLIST_SETITEM(idx, value) PyList_SetItem((PyObject *)capi_arglist_list, idx, value)
+-    capi_arglist_list = PySequence_List(capi_arglist);
++    capi_arglist_list = PySequence_List((PyObject *)capi_arglist);
+     if (capi_arglist_list == NULL) goto capi_fail;
+ #else
+ #define CAPI_ARGLIST_SETITEM(idx, value) PyTuple_SetItem((PyObject *)capi_arglist, idx, value)
+
diff --git a/dev-python/numpy/numpy-1.26.4.ebuild b/dev-python/numpy/numpy-1.26.4.ebuild
index 113fbc6526eb..5d2c12a8438a 100644
--- a/dev-python/numpy/numpy-1.26.4.ebuild
+++ b/dev-python/numpy/numpy-1.26.4.ebuild
@@ -24,7 +24,7 @@ SLOT="0"
 # is barely supported anyway, see bug #914358.
 IUSE="+lapack"
 if [[ ${PV} != *_[rab]* ]] ; then
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 RDEPEND="
@@ -113,6 +113,14 @@ python_test() {
 			random/tests/test_generator_mt19937.py::TestRandomDist::test_pareto
 			# more precision problems
 			core/tests/test_einsum.py::TestEinsum::test_einsum_sums_int16
+			# https://github.com/numpy/numpy/issues/24548
+			f2py/tests/test_kind.py::TestKind::test_int
+		)
+	fi
+
+	if use ppc64 ; then
+		EPYTEST_DESELECT+=(
+			core/tests/test_cpu_features.py::TestEnvPrivation::test_impossible_feature_enable
 		)
 	fi
 
diff --git a/dev-python/numpy/numpy-2.0.0_rc1.ebuild b/dev-python/numpy/numpy-2.0.0_rc1.ebuild
deleted file mode 100644
index 9b86ed057d7a..000000000000
--- a/dev-python/numpy/numpy-2.0.0_rc1.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=meson-python
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-FORTRAN_NEEDED=lapack
-
-inherit distutils-r1 flag-o-matic fortran-2 pypi toolchain-funcs
-
-DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="
-	https://numpy.org/
-	https://github.com/numpy/numpy/
-	https://pypi.org/project/numpy/
-"
-
-LICENSE="BSD"
-SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-# +lapack because the internal fallbacks are pretty slow. Building without blas
-# is barely supported anyway, see bug #914358.
-IUSE="+lapack"
-
-RDEPEND="
-	lapack? (
-		>=virtual/cblas-3.8
-		>=virtual/lapack-3.8
-	)
-"
-BDEPEND="
-	${RDEPEND}
-	>=dev-build/meson-1.1.0
-	>=dev-python/cython-3.0.6[${PYTHON_USEDEP}]
-	lapack? (
-		virtual/pkgconfig
-	)
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/cffi-1.14.0[${PYTHON_USEDEP}]
-		' 'python*')
-		dev-python/charset-normalizer[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}]
-		>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	append-flags -fno-strict-aliasing
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	DISTUTILS_ARGS=(
-		-Dallow-noblas=$(usex !lapack true false)
-		-Dblas=$(usev lapack cblas)
-		-Dlapack=$(usev lapack lapack)
-		# TODO: cpu-* options
-	)
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Very disk-and-memory-hungry
-		lib/tests/test_io.py::TestSaveTxt::test_large_zip
-		lib/tests/test_io.py::TestSavezLoad::test_closing_fid
-		lib/tests/test_io.py::TestSavezLoad::test_closing_zipfile_after_load
-
-		# Precision problems
-		_core/tests/test_umath_accuracy.py::TestAccuracy::test_validate_transcendentals
-
-		# Runs the whole test suite recursively, that's just crazy
-		core/tests/test_mem_policy.py::test_new_policy
-
-		typing/tests/test_typing.py
-		# Uses huge amount of memory
-		core/tests/test_mem_overlap.py
-		'core/tests/test_multiarray.py::TestDot::test_huge_vectordot[complex128]'
-
-		# TODO: crashes
-		lib/tests/test_histograms.py::TestHistogram::test_big_arrays
-
-		# likely a test problem
-		# https://github.com/numpy/numpy/issues/25135
-		core/tests/test_cython.py::test_conv_intp
-
-		# flaky
-		f2py/tests/test_crackfortran.py
-		f2py/tests/test_data.py::TestData{,F77}::test_crackedlines
-	)
-
-	if use arm && [[ $(uname -m || echo "unknown") == "armv8l" ]] ; then
-		# Degenerate case of arm32 chroot on arm64, bug #774108
-		EPYTEST_DESELECT+=(
-			core/tests/test_cpu_features.py::Test_ARM_Features::test_features
-		)
-	fi
-
-	if use x86 ; then
-		EPYTEST_DESELECT+=(
-			# https://github.com/numpy/numpy/issues/18388
-			core/tests/test_umath.py::TestRemainder::test_float_remainder_overflow
-			# https://github.com/numpy/numpy/issues/18387
-			random/tests/test_generator_mt19937.py::TestRandomDist::test_pareto
-			# more precision problems
-			core/tests/test_einsum.py::TestEinsum::test_einsum_sums_int16
-		)
-	fi
-
-	if use hppa ; then
-		EPYTEST_DESELECT+=(
-			# TODO: Get selectedrealkind updated!
-			# bug #907228
-			# https://github.com/numpy/numpy/issues/3424 (https://github.com/numpy/numpy/issues/3424#issuecomment-412369029)
-			# https://github.com/numpy/numpy/pull/21785
-			f2py/tests/test_kind.py::TestKind::test_real
-			f2py/tests/test_kind.py::TestKind::test_quad_precision
-		)
-	fi
-
-	if [[ $(tc-endian) == "big" ]] ; then
-		# https://github.com/numpy/numpy/issues/11831 and bug #707116
-		EPYTEST_DESELECT+=(
-			'f2py/tests/test_return_character.py::TestFReturnCharacter::test_all_f77[s1]'
-			'f2py/tests/test_return_character.py::TestFReturnCharacter::test_all_f90[t1]'
-			'f2py/tests/test_return_character.py::TestFReturnCharacter::test_all_f90[s1]'
-			'f2py/tests/test_return_character.py::TestFReturnCharacter::test_all_f77[t1]'
-			f2py/tests/test_kind.py::TestKind::test_int
-		)
-	fi
-
-	case "${ABI}" in
-		alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86)
-			EPYTEST_DESELECT+=(
-				# too large for 32-bit platforms
-				core/tests/test_ufunc.py::TestUfunc::test_identityless_reduction_huge_array
-				'core/tests/test_multiarray.py::TestDot::test_huge_vectordot[float64]'
-				'core/tests/test_multiarray.py::TestDot::test_huge_vectordot[complex128]'
-			)
-			;;
-		*)
-			;;
-	esac
-
-	if ! has_version -b "~${CATEGORY}/${P}[${PYTHON_USEDEP}]" ; then
-		# depends on importing numpy.random from system namespace
-		EPYTEST_DESELECT+=(
-			'random/tests/test_extending.py::test_cython'
-		)
-	fi
-
-	rm -rf numpy || die
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest --pyargs numpy
-}
-
-python_install_all() {
-	local DOCS=( LICENSE.txt README.md THANKS.txt )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/numpy/numpy-2.0.0_rc2.ebuild b/dev-python/numpy/numpy-2.0.0_rc2-r1.ebuild
index 0d97ca09f939..7d3724a3aaa3 100644
--- a/dev-python/numpy/numpy-2.0.0_rc2.ebuild
+++ b/dev-python/numpy/numpy-2.0.0_rc2-r1.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{10..13} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 FORTRAN_NEEDED=lapack
 
-inherit distutils-r1 flag-o-matic fortran-2 pypi toolchain-funcs
+inherit distutils-r1 flag-o-matic fortran-2 pypi
 
 DESCRIPTION="Fast array and numerical python library"
 HOMEPAGE="
@@ -52,6 +52,11 @@ EPYTEST_XDIST=1
 distutils_enable_tests pytest
 
 python_prepare_all() {
+	local PATCHES=(
+		# https://github.com/numpy/numpy/pull/26534
+		"${FILESDIR}/${P}-gcc14.patch"
+	)
+
 	append-flags -fno-strict-aliasing
 
 	distutils-r1_python_prepare_all
@@ -83,17 +88,6 @@ python_test() {
 		# Uses huge amount of memory
 		core/tests/test_mem_overlap.py
 		'core/tests/test_multiarray.py::TestDot::test_huge_vectordot[complex128]'
-
-		# TODO: crashes
-		lib/tests/test_histograms.py::TestHistogram::test_big_arrays
-
-		# likely a test problem
-		# https://github.com/numpy/numpy/issues/25135
-		core/tests/test_cython.py::test_conv_intp
-
-		# flaky
-		f2py/tests/test_crackfortran.py
-		f2py/tests/test_data.py::TestData{,F77}::test_crackedlines
 	)
 
 	if use arm && [[ $(uname -m || echo "unknown") == "armv8l" ]] ; then
@@ -103,52 +97,6 @@ python_test() {
 		)
 	fi
 
-	if use x86 ; then
-		EPYTEST_DESELECT+=(
-			# https://github.com/numpy/numpy/issues/18388
-			core/tests/test_umath.py::TestRemainder::test_float_remainder_overflow
-			# https://github.com/numpy/numpy/issues/18387
-			random/tests/test_generator_mt19937.py::TestRandomDist::test_pareto
-			# more precision problems
-			core/tests/test_einsum.py::TestEinsum::test_einsum_sums_int16
-		)
-	fi
-
-	if use hppa ; then
-		EPYTEST_DESELECT+=(
-			# TODO: Get selectedrealkind updated!
-			# bug #907228
-			# https://github.com/numpy/numpy/issues/3424 (https://github.com/numpy/numpy/issues/3424#issuecomment-412369029)
-			# https://github.com/numpy/numpy/pull/21785
-			f2py/tests/test_kind.py::TestKind::test_real
-			f2py/tests/test_kind.py::TestKind::test_quad_precision
-		)
-	fi
-
-	if [[ $(tc-endian) == "big" ]] ; then
-		# https://github.com/numpy/numpy/issues/11831 and bug #707116
-		EPYTEST_DESELECT+=(
-			'f2py/tests/test_return_character.py::TestFReturnCharacter::test_all_f77[s1]'
-			'f2py/tests/test_return_character.py::TestFReturnCharacter::test_all_f90[t1]'
-			'f2py/tests/test_return_character.py::TestFReturnCharacter::test_all_f90[s1]'
-			'f2py/tests/test_return_character.py::TestFReturnCharacter::test_all_f77[t1]'
-			f2py/tests/test_kind.py::TestKind::test_int
-		)
-	fi
-
-	case "${ABI}" in
-		alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86)
-			EPYTEST_DESELECT+=(
-				# too large for 32-bit platforms
-				core/tests/test_ufunc.py::TestUfunc::test_identityless_reduction_huge_array
-				'core/tests/test_multiarray.py::TestDot::test_huge_vectordot[float64]'
-				'core/tests/test_multiarray.py::TestDot::test_huge_vectordot[complex128]'
-			)
-			;;
-		*)
-			;;
-	esac
-
 	case ${EPYTHON} in
 		python3.13)
 			EPYTEST_DESELECT+=(
diff --git a/dev-python/pyrqlite/Manifest b/dev-python/pyrqlite/Manifest
index 1b2209162b14..06b4f915a89e 100644
--- a/dev-python/pyrqlite/Manifest
+++ b/dev-python/pyrqlite/Manifest
@@ -1,3 +1,5 @@
 DIST pyrqlite-2.2.2.gh.tar.gz 21302 BLAKE2B 8a16155287f4a4698ca63d4643c9fde0dbf4fc8238b4259f194b66a30846bab9b6420df0cc8049b2ea16d8ffdcd8c99f2b7e49a135af458e2b239b52e3ac4f5b SHA512 6faf6d5b1a264a85247ee5a790bc4e718d0632ee4d4bcd16aed2bce65216f23c0cb44d7c367ae73874bdb618d9c56bbefdaeebb40322f228e0ee50d78e03b91b
+DIST pyrqlite-2.2.3.gh.tar.gz 21554 BLAKE2B 1a3c09eaee20a19ab06a4f91a5b12659eafe425f796599ef9abf85f99563a62b40f1f82488611e0bbd1fb18853e2b1e310ecd7f94cb89f5840e34c51a4bd42ef SHA512 063a9072846c31fd34ea5261fe97f1023a95122c39c58292c7ab08ba148e01ab5001adda28c2856f0e29b67be553a8bae011d274edfdd3028aacd22179d309d7
 EBUILD pyrqlite-2.2.2.ebuild 544 BLAKE2B 0b0d6f6cf6a0f0d49334beb3944511924dc364a2fa32d94132ba9cb3c70bde8167f23853806a1f7daeaf262747fd9893d624c517720e40210a383f72244363c9 SHA512 7d8e6f8f02a18847ae5c8028c8de9455c0dac51db02614f2d4c338a496c70c8453d42e0dea64939a4dbf4f320b7f98a72aff5d75014758c61da679bb27fec296
+EBUILD pyrqlite-2.2.3.ebuild 544 BLAKE2B 0b0d6f6cf6a0f0d49334beb3944511924dc364a2fa32d94132ba9cb3c70bde8167f23853806a1f7daeaf262747fd9893d624c517720e40210a383f72244363c9 SHA512 7d8e6f8f02a18847ae5c8028c8de9455c0dac51db02614f2d4c338a496c70c8453d42e0dea64939a4dbf4f320b7f98a72aff5d75014758c61da679bb27fec296
 MISC metadata.xml 357 BLAKE2B 449eff24c8febb1ff5a30b6ceab4786f1b85aded9e3dfb10dd89c116e7b740ca30377a0404dee72988d884298c7e378291a2eccc40bdc1b56a65031dcaea1887 SHA512 2168a2d8f948b9d8e29561931469cb4b4a708d2068c5c1767bdae45046b8ad138e0eac8379003f50a933e488c2bb624a9f2e0e10702e096b1ff486cbfba994e1
diff --git a/dev-python/pyrqlite/pyrqlite-2.2.3.ebuild b/dev-python/pyrqlite/pyrqlite-2.2.3.ebuild
new file mode 100644
index 000000000000..ec12bed1b7aa
--- /dev/null
+++ b/dev-python/pyrqlite/pyrqlite-2.2.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+inherit distutils-r1
+
+DESCRIPTION="Python client for rqlite"
+HOMEPAGE="
+	https://github.com/rqlite/pyrqlite/
+	https://pypi.org/project/pyrqlite/
+"
+SRC_URI="
+	https://github.com/rqlite/pyrqlite/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		>=dev-db/rqlite-6.7.0
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pyzmq/Manifest b/dev-python/pyzmq/Manifest
index 427949012329..234a62d36c71 100644
--- a/dev-python/pyzmq/Manifest
+++ b/dev-python/pyzmq/Manifest
@@ -1,8 +1,9 @@
 AUX pyzmq-23.2.0-libdir.patch 510 BLAKE2B cb7884416d3e15f735412d69a7ae0decbbf8eca14ae909b23e68231a65b3ad36d021b5c6f5315a3cb982cd571913ce021cc5df60509d90b28d4353dd7bd316e8 SHA512 f268d03de45971d50a89210366b4aef0e79e652a45d650fc3e4a6711558ee186ee558a2808b7c9f5c5a64ce8b9282adf024ab21a782ba614900a4813e8b6d6ca
+AUX pyzmq-26.0.3-gcc14.patch 1443 BLAKE2B 94e7f84b5f3e29a7e72d33b810d44fcd2cc8a4d14a10fe624e405e24c7ba15a1a4bfa8f96b11583434135d1fa9730b97f566e9c612152a5d11a9c55f50d39a0e SHA512 4db9ceb343425069fdcb8cb4551c21e26dba396519678ecff3a4ae8f337343242fef9b5ee40fb94e2aad7b5b3052af0e8d6287c3230a1e994b3d41a31297b7df
 DIST pyzmq-25.1.2.gh.tar.gz 391272 BLAKE2B 80814704e7ea08d407859c1d71338f6ea283efcd1f3994155334aa5b60c4b6cd89167de8c78d19f8efdbeb5f4071f7b5954ea911eb6e7fbb48a0087b86579cab SHA512 b146a6dbce7cbbe2eb1da7ebd64e463067354f1566cdb4ff634b59bbb6d65e16263b6acb2d101a4ea53f870be5c753c9a12f9cc37bc5a81236681ea4fda6c56b
 DIST pyzmq-26.0.2.gh.tar.gz 267895 BLAKE2B c71a0149cb6c596dfcbc760376aa14afa69bd927fcc739698f7d2ea44579dc8437ae605745b383a9b317ff66c092a4f963671e7933cf19f3f73acac16ac06daa SHA512 5772743e71810f9a0c332dcf16f04237eeb0a34ef2efdd22b63258ebe93e6b493a79845090e677a33582a9a80e7bee773160ec7ecfdaf240b655f3819e5b67a5
 DIST pyzmq-26.0.3.gh.tar.gz 268927 BLAKE2B 7504a45776e8c618833702563b50f672a3ecabb3353551ea61d2d2343dd9e955d1d2938046c2f90d115255482b9b6b2c0f1817b238e591b9319ac92a4341c04a SHA512 f4a32164daf9d9521be83008a94089406078779b9e0e56812a826df1fb295cc03781566825697313aa0c2b36b85b0bb760b8fb90959a856a0542b9072cde78c9
 EBUILD pyzmq-25.1.2.ebuild 2307 BLAKE2B 518a210ee7f2b29debae65a154c954e299e433a490808aac7169b5955341db1b371949f3a18c256ac9aff30669eafd42c027140a3219e9b15b7b01dccd56b1b2 SHA512 e97f310487ff3b94e1476b9af92437f639e20751b93ad54dc6955c4bf58d2f9d1c02fa36603bdd470d4da1f78712d31c998c909d1c36da73d4a97236b2a1c379
 EBUILD pyzmq-26.0.2.ebuild 2119 BLAKE2B d1c3334be13d7fbb8d500b8512f0cec65473dff05b1ea3f63e1a2b03b63c585e1c26b7442bb445fb7b3e42ee425030b0de291fc01f226cccb9b4c9bc23f53f80 SHA512 c4d6477b68d4deb123dc20f93b0978c01b4318f52a9d032aebf6836cc29ad83dc25b7c3515dd99889d31eea0a5ab240c120a1f41b6afcbfebe365c3ca5c7e902
-EBUILD pyzmq-26.0.3.ebuild 2116 BLAKE2B 2249b703b1c462a28028a5e592123c14b0c0d2c9c23499778999bad78195fa19d53ef325f3c7fabb62d1132940f20625a02755de1e7ddb95ee2253faf4b95010 SHA512 7f65eb108c0311beb9281f88309c34eebcf366a9d87c2a3c31dc65dfe3a3197e6e845edca624fe7bb8e9371fac0d438a5e12f002a0df77d159ff8a3a378784d4
+EBUILD pyzmq-26.0.3.ebuild 2206 BLAKE2B 8c03a9700b8010e5de3784f329dde526a805dd5246a2002da608202f3c56f06fa3aa6a04fd24c36ede2d425cb88e9994c3a6cca63f2a9dabbbb1405dbde1fbcc SHA512 a314d8d61a0b3ce7601ef047dcd38fc0ff4e7ef21d464d7365d38e8de5f0245285438ec7085934585deb642c5a56bf46710c515879f23b52e34da369bdfdb405
 MISC metadata.xml 549 BLAKE2B 46a9a1476f68f05c71bb4f849a9e0822c58142ac036da635454f57781dcea81687accfbf9563273d4f8672a8479b098c9f03cec64e5e7f456e50ad8c7ffba9d3 SHA512 3765c31f1b0048a60d5ccf90aa1fa5416c92addb7b01c62e529419e53a4e29746d0e4434d4d4fbd5918413e7521144c8758cdef9eacf5298108c2287783908c1
diff --git a/dev-python/pyzmq/files/pyzmq-26.0.3-gcc14.patch b/dev-python/pyzmq/files/pyzmq-26.0.3-gcc14.patch
new file mode 100644
index 000000000000..8d87af8b7289
--- /dev/null
+++ b/dev-python/pyzmq/files/pyzmq-26.0.3-gcc14.patch
@@ -0,0 +1,53 @@
+From bc5e214e957eb96c7e23b2c46a075e3850805ff1 Mon Sep 17 00:00:00 2001
+From: Min RK <benjaminrk@gmail.com>
+Date: Thu, 16 May 2024 08:34:51 +0200
+Subject: [PATCH 1/2] cffi: fix type of hint mutex pointer
+
+---
+ zmq/backend/cffi/_cdefs.h | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/zmq/backend/cffi/_cdefs.h b/zmq/backend/cffi/_cdefs.h
+index 6c9a06558..cf27f5b4e 100644
+--- a/zmq/backend/cffi/_cdefs.h
++++ b/zmq/backend/cffi/_cdefs.h
+@@ -75,13 +75,14 @@ void * malloc(size_t sz);
+ void free(void *p);
+ int get_ipc_path_max_len(void);
+ 
++typedef ... mutex_t;
++
+ typedef struct _zhint {
+     void *sock;
+-    void *mutex;
++    mutex_t *mutex;
+     size_t id;
+ } zhint;
+ 
+-typedef ... mutex_t;
+ mutex_t* mutex_allocate();
+ 
+ int zmq_wrap_msg_init_data(zmq_msg_t *msg,
+
+From b180ebc07fc04b0576fef50c3969fd48fa58694d Mon Sep 17 00:00:00 2001
+From: Min RK <benjaminrk@gmail.com>
+Date: Sun, 26 May 2024 00:29:06 +0200
+Subject: [PATCH 2/2] maybe it needs to specify struct
+
+---
+ zmq/backend/cffi/_cdefs.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/zmq/backend/cffi/_cdefs.h b/zmq/backend/cffi/_cdefs.h
+index cf27f5b4e..7833b9b26 100644
+--- a/zmq/backend/cffi/_cdefs.h
++++ b/zmq/backend/cffi/_cdefs.h
+@@ -75,7 +75,7 @@ void * malloc(size_t sz);
+ void free(void *p);
+ int get_ipc_path_max_len(void);
+ 
+-typedef ... mutex_t;
++typedef struct { ...; } mutex_t;
+ 
+ typedef struct _zhint {
+     void *sock;
diff --git a/dev-python/pyzmq/pyzmq-26.0.3.ebuild b/dev-python/pyzmq/pyzmq-26.0.3.ebuild
index 15cac8e4fcbe..bb7ea1838d2b 100644
--- a/dev-python/pyzmq/pyzmq-26.0.3.ebuild
+++ b/dev-python/pyzmq/pyzmq-26.0.3.ebuild
@@ -53,6 +53,11 @@ distutils_enable_tests pytest
 # 	dev-python/sphinx-rtd-theme \
 # 	dev-python/myst-parser
 
+PATCHES=(
+	# https://github.com/zeromq/pyzmq/pull/1990
+	"${FILESDIR}/${P}-gcc14.patch"
+)
+
 src_configure() {
 	DISTUTILS_ARGS=(
 		-DZMQ_DRAFT_API="$(usex drafts)"
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index a853d852e708..d761c967da4f 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -1,7 +1,9 @@
+AUX sqlalchemy-2.0.30-py313.patch 508 BLAKE2B 6658d6f71291018461fea34397082adfa289d6ee3e24fb4daed866693455cfbea09520096659b8e7cb3f03e9f20f5b9f5ec60c89669aa48564fd5d7fc33bd121 SHA512 28cd85729b9b5019e95de89cb51efa39c1066a8a23c51de8931c335e97eafb6ab8734405ec7e1970d3569359588b743cdc28be956e300fe19b40052cb77ecdd4
 DIST SQLAlchemy-1.4.52.tar.gz 8514200 BLAKE2B b41fccb885ce6761e29621a654c97537610a1875d66302ba56fac560f5c85db35b14595efd903aebfd0186ee39b75a8666e1304cdee6a6ec6eb9923bc602b9e5 SHA512 afda6a3503c9d2baba8c1dd9e7216d5ac1561f52f5f11009c41a1a98ac998643c980c60cf8ba4d84c4af8808be26ead9fd2e7a2c8bf15b2fdb521b4e5de7748e
 DIST SQLAlchemy-2.0.29.tar.gz 9543967 BLAKE2B 04425618b6e0bcf98a7a32a4a6b1c092120a9f3eb55761879b072ac3a3e08c8f1b97fb4d2df4b35b2fd810e11146f4d83cf67cd8ec23fb4d96c5d6cfff7657af SHA512 d1143c65fb26335d652083b9a90afaecf78ed312cea5c26f989380204e909c341c1bc3bb1e07274353e1c409d21737fad4d7391f186b2d2373814582d3baaf78
 DIST SQLAlchemy-2.0.30.tar.gz 9579500 BLAKE2B 3c1711ee72a355eb5e6a71d6581d951ffe3ddab459ac4bb4c36a8640ed5f6298a80847e9bb66dd700622fa9275bf77c4c18be5e324092a576d1b35983371730a SHA512 b39275a7312609fd0a78ac5bb4fb0f29f2948d7fc81007587c01f38849ff28bff273182a06c8ec830b7e1ba4cd30aea2cd7214bbf971a61125c9b56c6ddbbe52
 EBUILD sqlalchemy-1.4.52.ebuild 3436 BLAKE2B 60b2e39902de5052fefb003514f3fb232cfd23ade139e8c5fc4d2b625d8fd65a40b22d6ae2593c7ee6ea12d1ce1dd4b192dc95cde3485671f292d96e3bd8999f SHA512 1c3c8bbd5459690c689ada1cfa9c89cf58298c6ade58117b9331ce99f3a7df8307f8976baaf03911ba3c828da05cd6c8b743cd2bd5120a7dbcf9e42b35fcc7a1
 EBUILD sqlalchemy-2.0.29.ebuild 3954 BLAKE2B 9bce2efb81f5909ecb56762d4ab38fa16384109148131c76389b5bdf4f7644e1a6ed01a388d11a1cc975d7b55380e17cc7256bd38237f3b1cfe3c4634067ae97 SHA512 b655ead9dbfd58766b379a9f6f546185fd497ef478de0e323a5d87d8d5bd5698e5d503cb151a5c57c3b60241800826d53ec9779a38a2f4ac629b567809379c33
+EBUILD sqlalchemy-2.0.30-r1.ebuild 4283 BLAKE2B 1372c8201d45c50f92d44227f0d2856212662fe2e79784a7695403b6be5923f5c3b33414d9abfea1ae8a79a53dcc83957ce35ef0447b2c0697047cebedd5bc80 SHA512 3aeef3b614fdb9ae005ec496aaf0ec9a3223cfbdf92fbbdbdf311964541ce05901e5db231efbe09239bb4191618dd638f7a19d4e7758fb66be9d4ef6053c75ee
 EBUILD sqlalchemy-2.0.30.ebuild 3956 BLAKE2B 01d72250a83d544ef96c9ea05355b95e4ef1d7cd64c7928e6ab7882fa606e71afded6df48013cf1f197be63c70884579ca072185f820411e47f49103ca524bd5 SHA512 3452f9405125767ae7a51aa0d0c344589e60446aeb68c5f9775e2289d5e7948081eb875c41e65be33a71f4b3a21b424025a54bfb094b2f8954642b639fbfd61d
 MISC metadata.xml 444 BLAKE2B 5fbfcf8f16e52ab5bb691b0b33a8491d94e42a80409114cd9b306af7d4b0eb8b6660fabc663adee53080c635217961301b78df536995b91afe9288d255f73d62 SHA512 b432b65ed3033d34ac0784d007909eb838b309b6a4785eebb1a3f808e43dfc41c786cd55e4dd048776c65127aac170bdd9fb9e5a8ae63accb5f65e300bca9676
diff --git a/dev-python/sqlalchemy/files/sqlalchemy-2.0.30-py313.patch b/dev-python/sqlalchemy/files/sqlalchemy-2.0.30-py313.patch
new file mode 100644
index 000000000000..6c519d2a205e
--- /dev/null
+++ b/dev-python/sqlalchemy/files/sqlalchemy-2.0.30-py313.patch
@@ -0,0 +1,13 @@
+diff --git a/lib/sqlalchemy/util/langhelpers.py b/lib/sqlalchemy/util/langhelpers.py
+index c97fa7d..9a02e7d 100644
+--- a/lib/sqlalchemy/util/langhelpers.py
++++ b/lib/sqlalchemy/util/langhelpers.py
+@@ -1657,6 +1657,8 @@
+         items: List[symbol]
+         cls._items = items = []
+         for k, v in dict_.items():
++            if re.match(r"^__.*__$", k):
++                continue
+             if isinstance(v, int):
+                 sym = symbol(k, canonical=v)
+             elif not k.startswith("_"):
diff --git a/dev-python/sqlalchemy/sqlalchemy-2.0.30-r1.ebuild b/dev-python/sqlalchemy/sqlalchemy-2.0.30-r1.ebuild
new file mode 100644
index 000000000000..27e045450701
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-2.0.30-r1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+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.6.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() {
+	local PATCHES=(
+		# https://gerrit.sqlalchemy.org/c/sqlalchemy/sqlalchemy/+/5308
+		"${FILESDIR}/${P}-py313.patch"
+	)
+
+	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
+			)
+			;;
+		python3.13)
+			EPYTEST_DESELECT+=(
+				# deprecated and broken with py3.13
+				test/ext/test_serializer.py
+				# TODO
+				test/orm/test_mapper.py::MapperTest::test_synonym_nonexistent_attr
+			)
+			;;
+	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/ujson/Manifest b/dev-python/ujson/Manifest
index ffa335789550..239a6234796e 100644
--- a/dev-python/ujson/Manifest
+++ b/dev-python/ujson/Manifest
@@ -1,5 +1,5 @@
 DIST ujson-5.10.0.tar.gz 7154885 BLAKE2B 5cb09e7b8576b837f19e604eda2f498d5cf479c9b0018d948e011a53c5b91fcaf869d8b8f0babf6c1d725e1ba000f107f767a7c2f74c52121bce95a2082938a7 SHA512 29aeb2f57c607c382deb2825f6262b73d11f1edff0545338819d081f223dabb66b2967744cc11b9f4c0b7f042d51688f04bf07fb9b2cdb6adfec439a3d8aea32
 DIST ujson-5.9.0.tar.gz 7154214 BLAKE2B a13eda1c967b8ad39265caf28f97ef302a0b320653cde3ac927dc8119861aa468cfe267980c18b71172f5b766b2e6bc61bb86f18695528934902867ae3a42d37 SHA512 9940bc0c892341a6d2b85cfe592888866f02f054f1367812c39395eaee946f7c66a0197b2791bbb765ae38a06dcd871145effefbc06c71a87f7d24be105cda1f
-EBUILD ujson-5.10.0.ebuild 896 BLAKE2B 209b3d7467c33959268e719193219e5f72792a1ec6d576536111bc95a5007ef10db23f0a031aa3a2f5f90f13bed2e6b8c90aba5fc56a0d31ec58843f71aaf70e SHA512 bc902ec87d6517c6485d3fc901ed62b695df84d759ca9421b1a51c84cdff81ffc9f3057a47e6e40b82a02dfc7331f892a3e1fcfd9475727d06b63f6c87e8f4a4
+EBUILD ujson-5.10.0.ebuild 896 BLAKE2B 3ec628bd9df3b04cea078fa2d9b3cd5b6384d6118f98194692e262d3aebb82fb89147feb075880e676f4ec454ccc7fc7017ae65505cd81a97e6a1f2b7179456d SHA512 b44f8641e730c563cae8fa31ecfa6abd0b1e850c1e900aff34203961dfa9c73d6abba6d37611390d2449f84833d0e37632b4a8ed87de36205f9ad64fbd7824cd
 EBUILD ujson-5.9.0.ebuild 888 BLAKE2B 0d125e92f4c44c4909c43020789b41484e325f407adae0a204382ea64800c81f9c27b09faa8579dbecba644cabbd23e151af8589bf13f2c3255e77d71a5594c1 SHA512 fcdf13706b07d8b425afcc65db891cf39bd8df4b3617ed4e3aac5cde612d2b06073e417adec2e920b3c893b8a815c2cef50d5d783829f3968ee87cbbae24f5cf
 MISC metadata.xml 494 BLAKE2B 8e20150926d62643e7ff2110cba22313db0c0e3112290ce08302d57103aa35c42a56921d0b46e0acca2ef83756eb4f7384f23ddb06fe41ef6c4a28921f11ec33 SHA512 d9c0a59f916b84d50e51a21152c1815fea90a909dc9bd44ea620b2a33ca6a92ee237aafe29debcc9d1a2bf63c84112300845309eb0ab1265e5d2b0c05dd313f0
diff --git a/dev-python/ujson/ujson-5.10.0.ebuild b/dev-python/ujson/ujson-5.10.0.ebuild
index 426df23f2c32..8e2a288c3955 100644
--- a/dev-python/ujson/ujson-5.10.0.ebuild
+++ b/dev-python/ujson/ujson-5.10.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
 
 inherit distutils-r1 pypi