gentoo auto-resync : 01:02:2024 - 23:44:31

14 files changed, 315 insertions, 7 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 8f29c102f13f..14a3ea746552 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/aiofiles/Manifest b/dev-python/aiofiles/Manifest
index b931eaabaff8..10f111a3c7bb 100644
--- a/dev-python/aiofiles/Manifest
+++ b/dev-python/aiofiles/Manifest
@@ -1,3 +1,3 @@
 DIST aiofiles-23.2.1.tar.gz 32072 BLAKE2B 9718fe7f4367b30ca295efb39ffeab0c77ca54ed1c4f556b0b39f5abb540d4f23c6e8a49aa5b6b76c0692e393bbab7c8d252de4b0f6f4f423b74e88c43483e08 SHA512 defc9d1ff5351c1812432db1849233b1f0aa661f6420c79a6eb17d84c0622ee4dd5102d50e9ef920c91adcc48914a39cd62701b340b01806a83773bf05900b6f
-EBUILD aiofiles-23.2.1.ebuild 501 BLAKE2B 26635dff4fb1052658b493e67086001a4d1e30f1f81fc31798b48826986d06d01ec4339d190247beb41cc1e046026f192dd28e70e8e0f2a43f18bb7c43b58c9d SHA512 0a5b54a81f35b2601818827e48ed05575684902c77780116cfe67b280f2d1ef1725f449beb67327f9f5dda82f8a4253a6c8963493b9b1ee1a9cb93db95495ff6
+EBUILD aiofiles-23.2.1.ebuild 506 BLAKE2B b6fb720cac67b45a895654e7e723606dfcd0a5419eebe167cb351889f24d6f48958d02ad72a5eabe7c922fa14ab4778c97470b3372fbb83fc6fe9600b85a0a6b SHA512 c31ca5ba1c4d8619ce76609b1c8b09805e8570c13eff4f3b509fe75de245d3f8ef9b2e39c0b9794ea61c76d48ce0fbcf6cac31b509304ed47e4d1e4feb9ec092
 MISC metadata.xml 454 BLAKE2B 5516af85de875687b19ad35cb505a841c473ba4ee26f1fca7ce343adfe832167560588db7dbe1342bf7eb507e2b0b0506fd4fae66011420a540c38274136dec9 SHA512 59bb734b77d80bee14a543cfbbd930b93a4de010f84862e0db3f381de52c75f5dedfef5e63b46bab8e5c4607645fbd3da84eb31a0bbcde3d83abc5dff9f2799b
diff --git a/dev-python/aiofiles/aiofiles-23.2.1.ebuild b/dev-python/aiofiles/aiofiles-23.2.1.ebuild
index 4c561a870757..2d1f7fa33fae 100644
--- a/dev-python/aiofiles/aiofiles-23.2.1.ebuild
+++ b/dev-python/aiofiles/aiofiles-23.2.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/pydevd/Manifest b/dev-python/pydevd/Manifest
index cbd59f2766af..d12e39a3faa0 100644
--- a/dev-python/pydevd/Manifest
+++ b/dev-python/pydevd/Manifest
@@ -1,5 +1,7 @@
 DIST PyDev.Debugger-pydev_debugger_2_10_0.gh.tar.gz 4019265 BLAKE2B e72c96576588ac3cbfcdd71a1a8e96d41b9d6757b3468c372b45a9c91a887c693f7309467fe8ea27d29c4775cc8df9ebd610b015cecabaaea43c8aa75229bc25 SHA512 a475e4f4cd9f883307d30b0bb2ebd5095de426b52f0f70b1a557095c06241149ad105ca4cbb31d311fa54e4387bbed27e5cf2712ba7447b19720d46dac21a101
+DIST PyDev.Debugger-pydev_debugger_3_0_3.gh.tar.gz 4287855 BLAKE2B 2f9f9cc892a19e42a37190966f2d2897f3e5da477c88d76d4b61b3062b6482db4c4cf5672efe75a1c139aa42a6b017cb5b276cede1167d0e91ca50009706e7e7 SHA512 4a5d03ea69e9eb40ee09c8d9a2258655f1645076757fa02bf92c8ad1b4fbb0570c1ac55464d8dd44cea6187ad2fa858851e02a86dc18b2343411cd8c56dc0c6a
 DIST pydevd-2.9.5.gh.tar.gz 3982897 BLAKE2B 06f0712301b419c472bcef2443a2ed277eb477041ff2e40e41b57f61649d84a7559dcae82c30ac572b14e90b98c2b9b9542c7360deded087eec92aeb0372ad67 SHA512 9aa38bc9a238e6f2956883a6318536382726013ea9e4a9d902b36d60df0cf924c279545bcdf92afdb435bfe36598982edd5805725860798fb3970b105254ba1d
 EBUILD pydevd-2.10.0.ebuild 4031 BLAKE2B a3cf8ec94770baf402bae877bc33d96cc6305bf6c6b3facf5b727deb725f629e667275e9f04692fe80856686d0189a925a0f005d5dce57a9e739d90c096154c3 SHA512 4100da7309d494045ee017bc0fb1d566a4b02176498fd62d21502b5e99ac5ccacd923808113033248a65754883bf18aa9e6e665d196271eb595abdafc5edb024
 EBUILD pydevd-2.9.5.ebuild 2487 BLAKE2B 6280a4631cf006bed5e2ae84f07155cdd3372e36427f66ca77f6e99aeedfb137ad9080adadd2436077181db427917c25bf688058ab50a3042f0918e2f9ff972f SHA512 122916be19c8728c0c155b23dfa8818def24fdfb66bb1806e0da6475d9eb460bb596e00c7958c4c52753f94987d05b23357e0d03d5ae5917c83e756f3e8abc66
+EBUILD pydevd-3.0.3.ebuild 3674 BLAKE2B a7527a18708ae0ef42f0cb3cd8881bde4050b0ac83bfba3a908a3f901abfb5fb5a1aa42b5f9646c076d6ac8777e6ffb6f81dbe67bce7c73f3854129e5b65f125 SHA512 6684587ea44bddc8b6903fad8bda3e0cd38629398cf99930ef8d3c76f588caec343a2d751ba973691586c0e96b279ec48182e834699ecdf47e5d0bcc8da65393
 MISC metadata.xml 384 BLAKE2B 37a4caa01a28f98ec8d141129c08754e6ba4dee5910a81c26f3eafcd7ac832962e91d3e39783e4859ac7e5ae5754837c89e496c4c2c205d12626359adf7dddae SHA512 5cf80b2e0eaf21e900c83341e9bef5c74a36d3c0a7354e3b6a832184cc60c42eeef6a22236e4fd9d484dc8834e5d4f98facd2578c223da2cc187dd76f91db764
diff --git a/dev-python/pydevd/pydevd-3.0.3.ebuild b/dev-python/pydevd/pydevd-3.0.3.ebuild
new file mode 100644
index 000000000000..10a71edeee13
--- /dev/null
+++ b/dev-python/pydevd/pydevd-3.0.3.ebuild
@@ -0,0 +1,134 @@
+# 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=( python3_{10..12} )
+
+inherit distutils-r1 toolchain-funcs
+
+TAG="pydev_debugger_${PV//./_}"
+MY_P="PyDev.Debugger-${TAG}"
+DESCRIPTION="PyDev.Debugger (used in PyDev, PyCharm and VSCode Python)"
+HOMEPAGE="
+	https://github.com/fabioz/PyDev.Debugger/
+	https://pypi.org/project/pydevd/
+"
+SRC_URI="
+	https://github.com/fabioz/PyDev.Debugger/archive/${TAG}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-debug/gdb
+"
+BDEPEND="
+	test? (
+		dev-python/untangle[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	# Drop -O3 and -flto compiler args
+	sed -i \
+		-e 's/extra_link_args = extra_compile_args\[\:\]/pass/g' \
+		-e '/extra_compile_args/d' \
+		setup.py || die
+
+	# Disable tests incompatible with new package versions
+	sed -e '/TEST_\(DJANGO\|FLASK\)/s:True:False:' \
+		-i tests_python/debug_constants.py || die
+
+	# Clean up some prebuilt files
+	rm -r third_party || die
+	cd pydevd_attach_to_process || die
+
+	# Remove these Windows files
+	rm attach_{amd64,x86}.dll || die
+	rm inject_dll_{amd64,x86}.exe || die
+	rm run_code_on_dllmain_{amd64,x86}.dll || die
+	rm -r windows winappdbg || die
+
+	# Remove these MacOS files
+	rm attach_x86_64.dylib || die
+
+	# Remove these prebuilt linux files
+	rm attach_linux_{amd64,x86}.so || die
+
+	cd linux_and_mac || die
+	rm compile_mac.sh || die
+}
+
+src_compile() {
+	pushd pydevd_attach_to_process/linux_and_mac || die
+	# recompile removed file (extracted from compile_linux.sh)
+	$(tc-getBUILD_CXX) ${CXXFLAGS} ${CPPFLAGS} \
+		-o "../attach_linux_${ARCH}.so" \
+		${LDFLAGS} -nostartfiles attach.cpp -ldl || die
+	popd || die
+
+	distutils-r1_src_compile
+
+	# C extensions
+	rm -r _pydevd* || die
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		# NB: upstream seems to run tests via runfiles.py but that script
+		# is a horror and it seems broken for us anyway
+		tests_python/test_debugger.py::test_attach_to_pid_halted
+		tests_python/test_debugger.py::test_attach_to_pid_no_threads
+		'tests_python/test_debugger.py::test_path_translation[False]'
+		tests_python/test_debugger_json.py::test_attach_to_pid
+		tests_python/test_debugger_json.py::test_evaluate_exception_trace
+		tests_python/test_debugger_json.py::test_gui_event_loop_custom
+		tests_python/test_debugger_json.py::test_path_translation_and_source_reference
+		tests_python/test_utilities.py::test_tracing_basic
+		tests_python/test_utilities.py::test_tracing_other_threads
+		# incompatible with xdist
+		tests_python/test_utilities.py::test_is_main_thread
+	)
+
+	case ${EPYTHON} in
+		python3.10)
+			EPYTEST_DESELECT+=(
+				tests_python/test_debugger.py::test_frame_eval_limitations
+			)
+			;&
+		python3.11)
+			EPYTEST_DESELECT+=(
+				tests_python/test_debugger.py::test_remote_debugger_threads
+			)
+			;;
+	esac
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	# this is only used to compare against getpid() to detect that xdist
+	# is being used
+	local -x PYDEV_MAIN_PID=1
+	epytest -p rerunfailures --reruns=5
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	# Remove this duplicate that is installed directly to /usr/
+	# These files are also correctly installed to the python site-packages dir
+	rm -r "${ED}/usr/pydevd_attach_to_process" || die
+}
diff --git a/dev-python/pyopencl/Manifest b/dev-python/pyopencl/Manifest
index 964a0f9d195c..eea43c4251c2 100644
--- a/dev-python/pyopencl/Manifest
+++ b/dev-python/pyopencl/Manifest
@@ -1,3 +1,5 @@
 DIST pyopencl-2023.1.4.tar.gz 473899 BLAKE2B 7d836d77b14f89b6dbf0dd2a189f3cb9442f224ff5c9c9db902aa93dc582278450b3d47576885bbe3738ee25f979a260d5c6f906366279adc30be7d3cc3545e1 SHA512 2508d21856d9b846bce14bcd11d007eedddc1cc5c1ce9f8d2ac18743ab9aa5d673c85792b535779b2f414caf47e39ed53c07d7ee8a061bcfa020a15f59463861
+DIST pyopencl-2024.1.tar.gz 473860 BLAKE2B 803c92418a609f3ad9249c81e93af0bd2e9125ee56dc88af8ee6ae9c4a275c7ab37befddd575914eb9f0b295aaef4f135358669e384a55c04b3938b02572724d SHA512 abf27d67f8c3633c71e662938a919c88a34b0b66cc3c213644f92a8733aed3c9b7593542dd9b45a080941976dadeb4f49a23a986482110824b554e3a0d317176
 EBUILD pyopencl-2023.1.4.ebuild 2023 BLAKE2B 6c4b917ea87686fb82954e8a0e86827fde43b106982b91bc4cbb35e0825b6896cc4c2bfc50248e20bbab909a6f6e75e1ebfe68341e3d32253749cd56b619c787 SHA512 c8b68a2c9761f64e49786df1613c6547596ed5624249a5413565d3a64487dee97fb911b2411fd30b58af8b81e49709a6c1d5e9d30b251b3f6a60fc17201c4b20
+EBUILD pyopencl-2024.1.ebuild 2024 BLAKE2B 946bafdb521ffd1fa0dbd96841f076796947b76847a4e0283c1de86adec783a4a741cec44e2b992ea52fc3393a92b9b45ebb05869488dd7c9dcffbb79b8e8c3b SHA512 45e5d18bbd7ad25aee16285ef5e952d87aa072d02b297b9829166e7e55d03d09f125ea604b5dab0067625e1559f6cac522951010c573508576eaaffeb2fb77fa
 MISC metadata.xml 373 BLAKE2B 0de89cb91a5dba1c34bacf04a95d4e2eb9e903bfb55e291f2ed20d579b9736a9a25f27620eed05d19c903c117e0dfbf410f408e9ff4008ce8c93f7b1b004141e SHA512 4ff5643089e5590d1ae4ef413a1ab0fa2772f71922a9da2c8b43ae375ba2e6e3d95ab90a13d51d22fdea49663c112c36352df609eceebd520fdc06590907b0e7
diff --git a/dev-python/pyopencl/pyopencl-2024.1.ebuild b/dev-python/pyopencl/pyopencl-2024.1.ebuild
new file mode 100644
index 000000000000..30bcf1530b3a
--- /dev/null
+++ b/dev-python/pyopencl/pyopencl-2024.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1 multiprocessing pypi
+
+DESCRIPTION="Python wrapper for OpenCL"
+HOMEPAGE="
+	https://mathema.tician.de/software/pyopencl/
+	https://pypi.org/project/pyopencl/
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~riscv"
+IUSE="examples opengl"
+
+# Running tests on GPUs requires both appropriate hardware and additional permissions
+# having been granted to the user running them. Testing on CPUs with dev-libs/pocl
+# is in theory possible but has been found to be very fragile, see e.g. Bug #872308.
+RESTRICT="test"
+
+COMMON=">=virtual/opencl-2"
+# libglvnd is only needed for the headers
+DEPEND="${COMMON}
+	opengl? ( media-libs/libglvnd )"
+RDEPEND="${COMMON}
+	>=dev-python/mako-0.3.6[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pytools-2021.2.7[${PYTHON_USEDEP}]"
+BDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/pybind11-2.5.0[${PYTHON_USEDEP}]
+	test? ( dev-libs/pocl )"
+
+distutils_enable_tests pytest
+
+python_configure_all() {
+	local myconf=()
+	if use opengl; then
+		myconf+=(--cl-enable-gl)
+	fi
+
+	"${EPYTHON}" configure.py \
+		"${myconf[@]}"
+}
+
+python_test() {
+	# Use dev-libs/pocl for testing; ignore any other OpenCL devices that might be present
+	local -x PYOPENCL_TEST="portable:pthread"
+	# Set the number of threads to match MAKEOPTS
+	local -x POCL_MAX_PTHREAD_COUNT=$(makeopts_jobs)
+	# Change to the 'test' directory so that python does not try to import pyopencl from the source directory
+	# (Importing from the source directory fails, because the compiled '_cl' module is only in the build directory)
+	pushd test >/dev/null || die
+	epytest
+	popd >/dev/null || die
+}
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/quart-trio/Manifest b/dev-python/quart-trio/Manifest
index 23dff14ccaa8..55b0102fe6c6 100644
--- a/dev-python/quart-trio/Manifest
+++ b/dev-python/quart-trio/Manifest
@@ -1,3 +1,3 @@
 DIST quart-trio-0.11.1.gh.tar.gz 18568 BLAKE2B faabf4204a82dcc70e41d1d1ec7171c89386f2e40979c20501890d9bc27eb2af693bc791a9015a9c4c676a5e25ec69dc4975a0cd09987cd14f699a04442d54da SHA512 8ea20c36c772eff3e2b0a83a4c325cd223c19b3d7e1e51e7378897bd11479db2c8015d2e8c4713721070fc413f42b19f844a3966a0d06d299439cf514b0b3291
-EBUILD quart-trio-0.11.1.ebuild 906 BLAKE2B f411fbbe5502cb9830d7638c966510016aca11384009c8b1cf4b03da56405510c0161ee933953180a5fd7d7f9472f1a7f5546f1ac1a3fbd279e75e49f75e237a SHA512 306d7781b333797f5d706ababb67e7d8128d1dd653b7c4434161356205e6404258ed7bc62018d0155bfaa256c1e0676c9c92a7bcda56d424721457eb5c950ef8
+EBUILD quart-trio-0.11.1.ebuild 918 BLAKE2B 07caa3604c8eaf7124772c75a6ff4c814e74fba6ec10723aee59bb5ab3cfa4c54e3580efb3a51ef8b696c26f344f0245c88b0d0cd1d6aa680e613b5ab25454b5 SHA512 8b5047d436ffb0518646aeed47d36700fad0aa0262827952598e61efdb62f416c48a7b71231b0cebf33c47c3d988b567e7b9b6d2591858fd3534c6b3e8f3ef85
 MISC metadata.xml 427 BLAKE2B fade855b0fc05b078dec5432d1e5cff22bdc4fc23bb97aecca815b7c031b67881f291afae0d5abf42fc115f405cf528683d992447d372a154015c40b1eb8f36c SHA512 2738f87b35ee3ca112096727054730fe90af48a3f77afff7aed8198a43bf505e984ec0f2d810fcd183507be58a8586c6f3dd4dcd26f40c6ba11008d7745aa714
diff --git a/dev-python/quart-trio/quart-trio-0.11.1.ebuild b/dev-python/quart-trio/quart-trio-0.11.1.ebuild
index fff0e201a851..ae7a617ef175 100644
--- a/dev-python/quart-trio/quart-trio-0.11.1.ebuild
+++ b/dev-python/quart-trio/quart-trio-0.11.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~arm64"
 
 RDEPEND="
 	>=dev-python/exceptiongroup-1.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/quart/Manifest b/dev-python/quart/Manifest
index 71f88e2b11cc..2320263d2183 100644
--- a/dev-python/quart/Manifest
+++ b/dev-python/quart/Manifest
@@ -1,3 +1,3 @@
 DIST quart-0.19.4.gh.tar.gz 493787 BLAKE2B 8a754687cc2e8321ed6b2243cfe519d95e955869a1a12c89a22aa3e304466a4a496531e7ca8e819c0daee88a6b077e7b54dbef02de84abd6f6dbf7b8988e139f SHA512 d6673a43733b8f1caa2180c545cea99eb9670d802b29f123e6c499345bc33cc5f36c9146757e0eea9def811043a9b0e7d59e5e7012ee965b425ec32620cd383a
-EBUILD quart-0.19.4.ebuild 1199 BLAKE2B 7d38aa0688f7ae3a0e44eab487668ae29ae0da9ecf62beb191f8e7f11585873bff26bd69e5040d3e27f839bfeb0c05b5582ca3a63773cc96fb7a0cdfe8ae5c94 SHA512 c84995815d892b3800424186f59941a36b92d0536fa87b790cb0821321aa1a27bb004fd6f8780cbf501a16f47a5411d4cd634cf1575ac6d394bf1def140397bf
+EBUILD quart-0.19.4.ebuild 1211 BLAKE2B 00ae33ae491c0977532fa60d84bc35d7e80afba8ef270ce69b699d8ac9d1f0d0eee344ac9aa1e7c5e22bf6c1509d8794f9ea31543f5cb3d6b8ee73ecdc524d4f SHA512 c98429c75eecb9dd6a10154db53386b0af35d4a7bbb60f10da76d4f671eb017ee43be443a74e4085d55305451e2be8b926263f48aec11c4f191b560e765644f9
 MISC metadata.xml 364 BLAKE2B 207d3328ae2624ec61834adc055ca2b01ee1a587c2b6ef8cfde8c72d7370f4bb912dbc5fefdb5432959dcf273b9ebabc394dfd163dab7be00413daa85a0b6162 SHA512 8fc752b94e06ea29021c7e73c67a488f17fbbd6b8dab79c58f8647989e9c613071b539e626bf122e6693b8b670cc57bea115581801d57d3212c037d0f91df7d2
diff --git a/dev-python/quart/quart-0.19.4.ebuild b/dev-python/quart/quart-0.19.4.ebuild
index cef50a9a7061..78af8cedce19 100644
--- a/dev-python/quart/quart-0.19.4.ebuild
+++ b/dev-python/quart/quart-0.19.4.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~arm64"
 
 RDEPEND="
 	dev-python/aiofiles[${PYTHON_USEDEP}]
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index cdbdd093c103..099c35ad9bf7 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -1,7 +1,10 @@
+DIST hypercorn-d1719f8c1570cbd8e6a3719ffdb14a4d72880abb.gh.tar.gz 156216 BLAKE2B fcb5f49653401e6e4079e1c770d3cd407602d4d6764437b735bd4ec04191dec59cdc930822fa2aff726ee25cddd0f71fd457dedf31026bff1da121d93af8b768 SHA512 62d6787d88a2e716f0ac04fc49f6cdc586e473a660ee754ff66961922ae78bcc75d1f78b091e78557dd60f006e8e480114738c7b4ff71beac804e4fc9603240b
 DIST urllib3-1.26.18.tar.gz 305687 BLAKE2B f2f673761a8d80eee715a8726ba36ab6b09800fd4a4f03f27438553c36072e2abb5ff26cff71dcf30fd114f4d28c4ad9907533965b83c8a0581d3d4661904b70 SHA512 c89e93a032bf6b11375c06ef7c5abc1868f93e7655cfdca09e9bd939ad415d206ea159fe151ecd2e5f725e0e18a831c7a5382ad01dbc32264154fc8af7aec156
 DIST urllib3-2.0.7.tar.gz 282546 BLAKE2B d4fbb9e1d0b6d1f3c3d71efc3fc479c7b1c49f87ca849c387701fb0c8b4124082de6d83d958c8b2afc225a84b80e7665df857e7b0918ba50e4ad1431f8facc4d SHA512 ca21dd330cfc7f53e6f00a92be1df1d24acbe61b6ca31c52a272dccd6f50d1bb797eece9132860adc84c21a9bebc3030a12816081451fcb8384c11a6cd2d1e8b
 DIST urllib3-2.1.0.tar.gz 263900 BLAKE2B 9e0438a11b7178c5004c1253179bb6bfcb1fa8711db47084377bb14c5834f7b88b04a5560b99bf6fff5f1f4622d4b1998d19dd517ab6b7453fd53c832ee7fefa SHA512 33d6eafd9b6ecd97ee2dca8a4f1612a6fcc584961bcfd3a0a188f557a73f4c1576f98dc525c3b2feecb2d676f4bf4364aafeef093d6686e4b3ef2043726561a8
+DIST urllib3-2.2.0.tar.gz 287152 BLAKE2B 126949265c6558e8743f8e2e05e80fd211845c67436db096796f453ed248d348dcc73d3822c77bb94b55b711eb4b10899b60808be1f4981159f772a2066d5e39 SHA512 8fa2735ff623ec549802290a2317d3d24cdd18e43b8b0702dcee03ecba31428bd0dd12e5b8e129135a3f254bcf5bcd6a8b608c3a43192b50e3a815c73906f6cd
 EBUILD urllib3-1.26.18.ebuild 2312 BLAKE2B 9c1155aa93102ea0b118b2980142c07b9bb98b08ebb779861ecf182ffcedd542bb816e1f9a1976cdd09760ad2d0c931bc1d4fe8050ab2a93d9ded82ba0b4966d SHA512 9c4d385c148f5ba5e1a2f0792e1059aece3aff14baf2236edeee36e31fc6f83ff7b6401b6100d3d3f35ad631eb2bbbe4eec95e31dfb0948e2a4833c38c234a73
 EBUILD urllib3-2.0.7.ebuild 3297 BLAKE2B aa93e50875380bda0b91543451be2d3425d0ab8c77650a9c84fff90c889ddf812ae66b78fed95ef820a68a510eb952716fea459f7dcef8b41db8156e0b5d3cb0 SHA512 790d5c7d1fb6838be75ecb3802cda5975ffe5a45c57cd67d6fe264de4bf47b9511b897233f8057298721665366f1da5bb89fbb58bf255b4659b8afc4f95224d4
 EBUILD urllib3-2.1.0.ebuild 3297 BLAKE2B aa93e50875380bda0b91543451be2d3425d0ab8c77650a9c84fff90c889ddf812ae66b78fed95ef820a68a510eb952716fea459f7dcef8b41db8156e0b5d3cb0 SHA512 790d5c7d1fb6838be75ecb3802cda5975ffe5a45c57cd67d6fe264de4bf47b9511b897233f8057298721665366f1da5bb89fbb58bf255b4659b8afc4f95224d4
-MISC metadata.xml 449 BLAKE2B 45df5a0e80d7b229058be52fd8feb3ba2efe8d981b5b34216e4b9cb35d332588c4b3efade8e8d06bdf1f13159dfcd937458e5cf4d0cea5e07b6c1011cc8592cb SHA512 312b41031a9cbf6341f537fef94137420ca49ab609e7d4c325a998e328be415b381aa50e7b5600483d1a7583b72675a044b5dd80cb84a52539ab23271f1b096c
+EBUILD urllib3-2.2.0.ebuild 2829 BLAKE2B d05655d92f18e3bf2a8daabb20952ba0b55962152d8428d957f245c206944c9a3df31fe74d62ffda626845dd561ce0c0ec67a5d4f4528b1b333ae7f51b5920f3 SHA512 3f77d4f75ebda24115d44ed089cf8cca10d616bf3433cb9f3b467686bc0777999099af2102dc37b25ff94784314c266798bc770e946bf1ac16c4337a6930c941
+MISC metadata.xml 517 BLAKE2B dc83f0a8a82237c4b4627060b12b2e39dd1ed3550b0b76b5b2d8a91be9fed2e9a5af48ec0b9a981a04ed6ec83b3f9a3cc0a0fb333fcd5f6e01e66b1b325daef5 SHA512 f8235269abc564086f2ba87cbeb45c3dceaa7bedc68e298830bb1ca4de5f570697c634a042c054bb433993b501b3809a223d2ccc39fa9a14c5fe8c2d14938d81
diff --git a/dev-python/urllib3/metadata.xml b/dev-python/urllib3/metadata.xml
index e27c6550e713..fb30a3f274c4 100644
--- a/dev-python/urllib3/metadata.xml
+++ b/dev-python/urllib3/metadata.xml
@@ -11,4 +11,7 @@
 		<remote-id type="cpe">cpe:/a:urllib3:urllib3</remote-id>
 		<remote-id type="github">urllib3/urllib3</remote-id>
 	</upstream>
+	<use>
+		<flag name="http2">Enable HTTP/2.0 support.</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-python/urllib3/urllib3-2.2.0.ebuild b/dev-python/urllib3/urllib3-2.2.0.ebuild
new file mode 100644
index 000000000000..4f043620722c
--- /dev/null
+++ b/dev-python/urllib3/urllib3-2.2.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_TESTED=( python3_{10..12} pypy3 )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
+PYTHON_REQ_USE="ssl(+)"
+
+inherit distutils-r1 pypi
+
+# The package has a test dependency on their own hypercorn fork.
+HYPERCORN_COMMIT=d1719f8c1570cbd8e6a3719ffdb14a4d72880abb
+DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
+HOMEPAGE="
+	https://github.com/urllib3/urllib3/
+	https://pypi.org/project/urllib3/
+"
+SRC_URI+="
+	test? (
+		https://github.com/urllib3/hypercorn/archive/${HYPERCORN_COMMIT}.tar.gz
+			-> hypercorn-${HYPERCORN_COMMIT}.gh.tar.gz
+	)
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+IUSE="brotli http2 test zstd"
+RESTRICT="!test? ( test )"
+
+# [secure] extra is deprecated and slated for removal, we don't need it:
+# https://github.com/urllib3/urllib3/issues/2680
+RDEPEND="
+	>=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
+	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
+	brotli? ( >=dev-python/brotlicffi-0.8.0[${PYTHON_USEDEP}] )
+	http2? (
+		<dev-python/h2-5[${PYTHON_USEDEP}]
+		>=dev-python/h2-4[${PYTHON_USEDEP}]
+	)
+	zstd? ( >=dev-python/zstandard-0.18.0[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep "
+			${RDEPEND}
+			dev-python/brotlicffi[\${PYTHON_USEDEP}]
+			dev-python/freezegun[\${PYTHON_USEDEP}]
+			dev-python/h2[\${PYTHON_USEDEP}]
+			dev-python/httpx[\${PYTHON_USEDEP}]
+			dev-python/pytest[\${PYTHON_USEDEP}]
+			dev-python/pytest-rerunfailures[\${PYTHON_USEDEP}]
+			dev-python/pytest-timeout[\${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[\${PYTHON_USEDEP}]
+			dev-python/quart[\${PYTHON_USEDEP}]
+			dev-python/quart-trio[\${PYTHON_USEDEP}]
+			dev-python/trio[\${PYTHON_USEDEP}]
+			>=dev-python/tornado-4.2.1[\${PYTHON_USEDEP}]
+			>=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}]
+			>=dev-python/zstandard-0.18.0[\${PYTHON_USEDEP}]
+		" "${PYTHON_TESTED[@]}")
+	)
+"
+
+src_prepare() {
+	# upstream considers 0.5 s to be "long" for a timeout
+	# we get tons of test failures on *fast* systems because of that
+	sed -i -e '/LONG_TIMEOUT/s:0.5:5:' test/__init__.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x PYTHONPATH=${WORKDIR}/hypercorn-${HYPERCORN_COMMIT}/src
+	local -x CI=1
+	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
+		einfo "Skipping tests on ${EPYTHON}"
+		return
+	fi
+
+	local EPYTEST_DESELECT=(
+		# TODO: timeouts
+		test/contrib/test_pyopenssl.py::TestSocketClosing::test_timeout_errors_cause_retries
+		test/with_dummyserver/test_socketlevel.py::TestSocketClosing::test_timeout_errors_cause_retries
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local EPYTEST_XDIST=1
+	epytest -p timeout -p rerunfailures --reruns=10 --reruns-delay=2
+}