gentoo auto-resync : 16:02:2024 - 23:37:06

18 files changed, 285 insertions, 19 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 85157610a7a7..ae38a18f637e 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/confusable-homoglyphs/Manifest b/dev-python/confusable-homoglyphs/Manifest
index 35a3ce6b35c4..a2dbb3208011 100644
--- a/dev-python/confusable-homoglyphs/Manifest
+++ b/dev-python/confusable-homoglyphs/Manifest
@@ -2,4 +2,4 @@ DIST confusable_homoglyphs-3.2.0.tar.gz 161937 BLAKE2B ac2c66317b18dd73868b3cbe3
 DIST confusable_homoglyphs-3.3.1.tar.gz 325480 BLAKE2B 74a18d442832197cd6371721269ef6389fe2e82e96131656e1ba4d49cb2be9431f715125640c330babe3bce1b2eb34aaf9097a29b6743d2b1c90b5aa53f5dee3 SHA512 c6032479025caa779c79761fc6b34e5b5adab3d784bfe03282b7f5edc7701366ee7897bd4e8a4c264e7a06a59f075ac876bd47fa328accfe981944e70092d40d
 EBUILD confusable-homoglyphs-3.2.0-r2.ebuild 705 BLAKE2B 49ad1605179f09353632496ebc93702b61f026e355937408c651e777319e044c95244640315cc614d330a6b2525cabf07083558aaf3c71d7fa39af46e5c87994 SHA512 91f57ecc8140788fa0c5b1ec4f558179a4b4794d2b08f6b2554a1add21af01aef690379850dcdf45a39ce93f3cd357cb1acf5e2aed733c3f9da21b314c04771b
 EBUILD confusable-homoglyphs-3.3.1.ebuild 710 BLAKE2B 42954cd4efe75a005ebcafb7f1df304696f8e0f5fad0f638ac765118dcb488a1a55eaf49a6a95a9b20cfcc58c6998ebcb215e3ed46363d8256c82233e84652b3 SHA512 7620fc2b11f3b450fbb7df3f53d30f0ad4f0114d0f7db56e01aaf50fe05f00aa7013fe5d1c5be9ea70f3c3f3a9c5501723384e81c3e2d32e3e2f7f73752a6ccb
-MISC metadata.xml 507 BLAKE2B e09380059ead28a19b712bdd2e5095aca97be5b5400020a5229274f5cdf11b33de6a362d1be89023bf9e325db980d264afe242b82b13423ce498a040daccfaf6 SHA512 d4464ead72b9e16cfc760bd5eea9acf09467a4606deba25b3ff87abaf226e3f7078af89e5a306b7c3668bb1572d557ee16565f7bbb14d6cad5b7b3e2cba0c69c
+MISC metadata.xml 572 BLAKE2B 0e7e52bca29cbfb53bd0977506a114bd0fb58925137a25b7f2aa903db96a101afb364f1254bed3f684242d9bda5d405643d38eede9bcedfcf47137c372b5d721 SHA512 5f38ee195387d3efc3c4fc39c4528eaabd93b2aeee3212c54aae686707b1adafd655fc10892450add2e0faea83142066103e85a19c0b86fb53b76e5ff4b7b4be
diff --git a/dev-python/confusable-homoglyphs/metadata.xml b/dev-python/confusable-homoglyphs/metadata.xml
index 4dfb59ace990..947931a5ee82 100644
--- a/dev-python/confusable-homoglyphs/metadata.xml
+++ b/dev-python/confusable-homoglyphs/metadata.xml
@@ -12,5 +12,6 @@
 	<upstream>
 		<remote-id type="pypi">confusable-homoglyphs</remote-id>
 		<remote-id type="sourcehut">~valhalla/confusable_homoglyphs</remote-id>
+		<remote-id type="github">vhf/confusable_homoglyphs</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/github3-py/Manifest b/dev-python/github3-py/Manifest
index de46dc2f90b4..fe204b887768 100644
--- a/dev-python/github3-py/Manifest
+++ b/dev-python/github3-py/Manifest
@@ -1,3 +1,3 @@
 DIST github3.py-4.0.1.tar.gz 36214038 BLAKE2B 04647fd53b0ad236891bb0fab359a326d82f8fb90c186618459013ab32f7c7c148374ad0dfc891220b839b2d9be7231e15dac8048bd767c33a1513558b3b16d1 SHA512 a79f7e4c48405318bd61d03c7a8b2dc3629f6e2d8e954e316fba319115dd12c6e5e2fd69a00743e86078367b083841dbc494704e66ffda8582fb48c614ecf5b2
-EBUILD github3-py-4.0.1.ebuild 951 BLAKE2B a387cf38f397f90d643256ac688131e1aaddfb9faf2be144df069216db0a3a2d17ab957868230df26ef43f4ca56e1552a857700cc27f2cf363351ad2f933c2b2 SHA512 546a7636abff830d784facb1ea1c9a07c1e00b5b11545d45e6897be9230a9d2bddd14f4caf135e89e0957b8a54c0656e01b1f6a666ebb114879eeed5669bcacd
+EBUILD github3-py-4.0.1.ebuild 1295 BLAKE2B 7fd276fb703573c4955f11ba8c280888ddb7a164f39c5f926a3680e72a8770c217ccf58abc9e6a0933b4446be131ef4375d83c00283bc92a93b1eecdf855061c SHA512 722a4b552d00a580559a10194cbc1d0ae383f9ac9e074728070776108c2832b54663821a347f345886e64fb5deb40df9950f4cd8a0b159fb8860eb9bf739ed27
 MISC metadata.xml 675 BLAKE2B aa0bec874cc285c1d5eb57c128188c8690eb572191465ac193e8df40836b4b27b1994916ee419c2d03e7fd95ad6ee2882d5b603702939663bedc9a0a27f7aeb0 SHA512 cc6cceaf8fb98df0ff61aa8ed7e45af8054cc20ea7e6697ff30d103d2dc5b479486374ad6f99e4de46cc37214701fbfaa4d3fd1a74923b9e7d7dfddae08ebcf8
diff --git a/dev-python/github3-py/github3-py-4.0.1.ebuild b/dev-python/github3-py/github3-py-4.0.1.ebuild
index beebe6da4fb9..a6a2528937e3 100644
--- a/dev-python/github3-py/github3-py-4.0.1.ebuild
+++ b/dev-python/github3-py/github3-py-4.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -41,5 +41,13 @@ BDEPEND="
 distutils_enable_tests pytest
 
 python_test() {
+	local EPYTEST_DESELECT=(
+		# betamax / urllib3 problem
+		# upstream marked these tests xfail...
+		# https://github.com/sigmavirus24/github3.py/commit/9d6124c09b0997b5e83579549bcf22b3e901d7e5
+		tests/integration/test_repos_repo.py::TestRepoCommit::test_{diff,patch}
+		tests/integration/test_repos_repo.py::TestComparison::test_{diff,patch}
+	)
+
 	epytest -o addopts=
 }
diff --git a/dev-python/libtmux/Manifest b/dev-python/libtmux/Manifest
index 7eb9d64426a7..66499ec25de7 100644
--- a/dev-python/libtmux/Manifest
+++ b/dev-python/libtmux/Manifest
@@ -1,7 +1,9 @@
 DIST libtmux-0.21.0.gh.tar.gz 267484 BLAKE2B 36d7af1bd90ff5a9639587d79f49643eec1e218d3b1839f5febdd9b6b402886e577b15c920cf458ecb14b4e6d532955b6d71ecf932060e6f8ba32193d6bb0162 SHA512 27000581396d79665e34b67a9e59bf639ca0fbd855ada9648750750e41e732cdcde15a05c6548993f08a8637783ddb478de24b75d5c18a198541c36b4b08b9cc
 DIST libtmux-0.27.0.gh.tar.gz 270128 BLAKE2B 330335e24ff5f1777d3a4ebd4746adcc391919a129c08c1bfe80d7ef61e962dc550690a68055390c58e8e6c539edcac74def8646d4b1055503496ac38f72fc0d SHA512 fd847524bf6b0742bac4eca2c1032e069be09081e9107a6403eebfce0f6ca4e624f717aae0794ece54065d50cc1eb6ef48327ef1e9aea794328c42a5d7bbb293
 DIST libtmux-0.28.0.gh.tar.gz 273309 BLAKE2B 9bc5b3068e64f09af0411f68f22cd23535b084175970338c827783741c8abde03548996cd573c6b58ce49298582f8e159dcab569fb6d19560229187a8da269b1 SHA512 8a6457c82cb06c72c0382c362e5d84d0a5498a01e8806adffd7e8c3a67c1b741fbd11892a3cca2156f940a954684e2d6f85ee7ad14f582f5727b977d433dd707
+DIST libtmux-0.30.1.gh.tar.gz 276505 BLAKE2B 508e9b15183ecf7c3c006145fbbc9580e7180fd39b453b8a9589f644f8fddcf14144e9989c92a581c7c10a95660d9c5b9f7f5544e51e202634407c0a1914c6a2 SHA512 9ec06901f978a631b9d8085806b71912f5b582d20e917ed4409f870ec2e873095044779b1d0db2cbe0285e11a043c44cd801fa60cb2f57d9d31fb95e3015daf8
 EBUILD libtmux-0.21.0.ebuild 1224 BLAKE2B 0c19dc33639ef451cfe4659aab6b3b1e38d96cb6899f6dbb85aa655a99010be3174ad43c7c7522d3c2d8e597e789048ae8feddc03836d4ab60fd9c5333c9b665 SHA512 9c9e4c7aa82223e54b12bfdd3c088954221f5794723d4766988654d99e3a349eb1928c664cd590021f1a30fc3a854e0811e8f993ffe431394c0fee3839a54b19
 EBUILD libtmux-0.27.0.ebuild 1308 BLAKE2B 6e562682cb8832a337d3f7b392b4c70e518d488ef590bd42a5db75b1f98bc6e907c0c57d0305a5efe6b8f968a82ca8feb8067dba98ab457f0023865f4757c557 SHA512 e2c21fc238656193b5e4a16c043dad1ef857ebefb65ef1655d4f536fefdf8d1c329d152cbcea882b781e58f79eeb968e60c159fed91ef8bbbb7eb5e730f495db
 EBUILD libtmux-0.28.0.ebuild 1308 BLAKE2B 6e562682cb8832a337d3f7b392b4c70e518d488ef590bd42a5db75b1f98bc6e907c0c57d0305a5efe6b8f968a82ca8feb8067dba98ab457f0023865f4757c557 SHA512 e2c21fc238656193b5e4a16c043dad1ef857ebefb65ef1655d4f536fefdf8d1c329d152cbcea882b781e58f79eeb968e60c159fed91ef8bbbb7eb5e730f495db
+EBUILD libtmux-0.30.1.ebuild 1275 BLAKE2B 8b6ad6a97825498b84b1bb5df7a0006e52786f315fa26677938e1b76321354d21bfe548835dff50f0c8f911ba55401d5b66c166e807232d835ade4eb60eec77a SHA512 c6444baa9738ffb3ded15531f607b9ebd06e153872785f4069a899604863cb824680c2340816b40c4cec3a7d9cfde96df2f3884a5e63e7a4d4e21fc5246fff6c
 MISC metadata.xml 403 BLAKE2B 68af7251349c8999bbdbfb7b55ca4632f8752468d7e478fd985097af86d00afe93b231667a25e3c997a3bc86b708d4e6d6ef5c35a783871cdc83519fc1db1ab1 SHA512 2a88df695e94f1da966bb72f7e90d00f2e343e40fe1924837f8c087dfc9a9a84fe0b2909a98f2f41ba72f6ba01796888a80cbac3f1bf9f05984a06385037d977
diff --git a/dev-python/libtmux/libtmux-0.30.1.ebuild b/dev-python/libtmux/libtmux-0.30.1.ebuild
new file mode 100644
index 000000000000..3347c96865a2
--- /dev/null
+++ b/dev-python/libtmux/libtmux-0.30.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{9..12} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Typed library that provides an ORM wrapper for tmux, a terminal multiplexer"
+HOMEPAGE="
+	https://libtmux.git-pull.com/
+	https://github.com/tmux-python/libtmux/
+	https://pypi.org/project/libtmux/
+"
+SRC_URI="
+	https://github.com/tmux-python/libtmux/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	>=app-misc/tmux-3.0a
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	local issues="https://github.com/tmux-python/libtmux/issues/"
+	sed -r -i "s|:issue:\`([[:digit:]]+)\`|\`issue \1 ${issues}\1\`|" CHANGES || die
+
+	# increase timeouts for tests
+	sed -e 's/0.01/0.1/' -i tests/test_test.py || die
+
+	sed -r -e '/addopts/s:--doctest-docutils-modules::' \
+		-e '/^[[:space:]]+"README\.md"/d' \
+		-i pyproject.toml || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -a EPYTEST_DESELECT=(
+		libtmux/pane.py::libtmux.pane.Pane.send_keys
+	)
+	epytest
+}
diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest
index f3e2d7b51e47..145500135a6b 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -20,5 +20,5 @@ EBUILD moto-4.2.7.ebuild 5602 BLAKE2B 652d910f9dcf9f2de0974aa1c3e9ff25487b4693aa
 EBUILD moto-4.2.8.ebuild 5490 BLAKE2B 7b20396b028362a9d3574c3195da23b0db482e85c02a858c843863f07f035650df03be200a42c91e4b960a2abaeb7e4eaa3b0b5ce24261378b14d5db3374ccbf SHA512 6826bc9b420815f5e5922d1cf83ff44ec9fdb9365d75999dc3e371f30c64b433c116e4b0221c17c417a7a6c8162ebd714d5fc708226a87f205322c2280baafd1
 EBUILD moto-4.2.9.ebuild 5686 BLAKE2B 04cc2c9889141fb1d54ed028e4046672901c7f1aeaa86a46798a54c0ea2372458ade16ac93d2d9fa74fd8b67555902c60f1b00e1557922d4ac370e43b4648073 SHA512 e7f0246caa5cb751a6b26c55c1309dbe17a1689e89924a0a3f5979262ddb6bb007d801f8ae3a5cc2893287240b430a2a7df90efc592e94baf8c20d5266e612d0
 EBUILD moto-5.0.0.ebuild 6626 BLAKE2B 957d9c398c87f73a83afd9feb358b6ce2965a7d046c84f98ab60bd1203a934cea160571c693d86c196d48944a970e70a8212e4434a4ab509bad34892f2fd602c SHA512 434aab010656345047b7c793be213b581fab6529f34b073d387518a5ab3e58bafe38b10bf4dd117d737701c0131126bd94f0fe1f8bbf6fb207172a5f2edf129c
-EBUILD moto-5.0.1.ebuild 7067 BLAKE2B ff2b57009c69420058a4e1854cc68b24e2ef0b393d2b2fd8952a71dc6e5d4595015746aaffa44a46dfc667c10ee32df4b65f05dd7de1b34436265bfd4a5a2614 SHA512 1ac9e24bcc8f8b9a46b947026c4e1228be5864022a64563113b2bd96ce76eafd7612e5e3bf241c65b17664556eba65c0707c58b842525ca0f03eabda170fd1f3
+EBUILD moto-5.0.1.ebuild 6137 BLAKE2B c3d04cdc36655ee8d3f02c9504842079cd4442d8b7d8cab81af7a5403f0efbf4326fe65f13a45235f755be028a91cf4a189e740e65d5e1f5cb335f1915ecbc60 SHA512 f8d233e0f3c5204ffde35993add831a8ba65814ca25681f5ded1855c0c62cd52cfabeb46d1ab6c6b3016b97adb57977d3dd8752ee46cff44c240e48f0282c80d
 MISC metadata.xml 553 BLAKE2B 1669d17d3e655aa3fb41a489229a5fbfa6a9cfb23c667e98fbbef931992c7e9645581b9ea12011601093586cba491a5557d68e5256edb9f387c4db362346edf9 SHA512 48ae3bd9be8c3bfb68f7022d0e7bb422c2a06157967809be302067facf91db825023859d18ccea89109931538b0e93181d54a31fcc967628df61a9a3112edd3d
diff --git a/dev-python/moto/moto-5.0.1.ebuild b/dev-python/moto/moto-5.0.1.ebuild
index 9c9b637a38ee..eec24c57da30 100644
--- a/dev-python/moto/moto-5.0.1.ebuild
+++ b/dev-python/moto/moto-5.0.1.ebuild
@@ -93,18 +93,6 @@ python_test() {
 		# require py_partiql_parser
 		tests/test_s3/test_s3_select.py
 		tests/test_dynamodb/test_dynamodb_statements.py
-		# broken by new urllib3
-		tests/test_moto_api/recorder/test_recorder.py::TestRecorder::test_s3_upload_data
-		tests/test_moto_api/recorder/test_recorder.py::TestRecorder::test_s3_upload_file_using_requests
-		tests/test_moto_api/recorder/test_recorder.py::TestThreadedMotoServer::test_server
-		tests/test_s3/test_s3.py::test_presigned_put_url_with_approved_headers
-		tests/test_s3/test_s3.py::test_presigned_put_url_with_custom_headers
-		tests/test_s3/test_s3.py::test_put_chunked_with_v4_signature_in_body
-		tests/test_s3/test_s3.py::test_upload_from_file_to_presigned_url
-		tests/test_s3/test_s3_bucket_policy.py::TestBucketPolicy::test_block_all_actions
-		tests/test_s3/test_s3_bucket_policy.py::TestBucketPolicy::test_block_all_with_different_principal
-		tests/test_s3/test_s3_bucket_policy.py::TestBucketPolicy::test_block_or_allow_get_object
-		tests/test_s3/test_s3_bucket_policy.py::TestBucketPolicy::test_block_put_object
 	)
 
 	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
diff --git a/dev-python/oslo-utils/Manifest b/dev-python/oslo-utils/Manifest
index eec323666c4b..0b8d6f7cf1d4 100644
--- a/dev-python/oslo-utils/Manifest
+++ b/dev-python/oslo-utils/Manifest
@@ -1,3 +1,3 @@
 DIST oslo.utils-7.0.0.tar.gz 103879 BLAKE2B d07af70592faac1821dc60f1ed0cd72fe948b1e105b515f18711b11152898fb2ab494d7eef2db965c43e961696b5f43eaca9d1c106f960d1ce91a9b5bb6ff924 SHA512 44202ec5de818b52b335026fdb24d1f771c24451422ad6b8328d4d14a4566b6c27b3cf04ba564d45686c9a4104ba1eec9a0874227498a707c5e9039b1d5c706c
-EBUILD oslo-utils-7.0.0.ebuild 1506 BLAKE2B fbb3f757ab1e34533a287a4c45a06a621d16996cfbe74bc02e563a46fbf8a058ea3ec57c918917494d346c6f602e5e2f6b1d2a821c5afa83a85ecff32b9eb347 SHA512 9907e938d6063271e872ece58912ff29c95d915d1000acd8d3dbb737acafcb03a367bdeb16fe62b63f5337eb7a94db382fd8b71d27a442b3cf02d4d22c1a8084
+EBUILD oslo-utils-7.0.0-r1.ebuild 1547 BLAKE2B 3552c7237b4294d62db4fc0d86cdd0d54417517b2a0bc1db53ce7352e2c55a2b798c4daf0d117ad55606c750a8a5d511a75157a834f5695dd5a3d0e42b22032a SHA512 d1c1dbdae90513fd70f3d3b526de89b8f12f26937182f34b2ac49d536728ba5185c37cd72920053bf72dd5b0b0ba1bd45184d627555b5bc4ce8878b1321a01e7
 MISC metadata.xml 667 BLAKE2B 2d3b1f3c01b74c3db8239b0711f6b10488cc17b214509a64607f3112e7100eb39f2d8774639d47a40cbad6786e7dee1430327a78b357b516325e5d06babcdee5 SHA512 e97a4a1f3718a69d39706d816f17018a7d57fd81702cd88ee01f9b849405f2f08769d381c5e41be84d8ae0c69a2a977b0dcb3ee1a481502ebf49f5ad6a5d6a95
diff --git a/dev-python/oslo-utils/oslo-utils-7.0.0.ebuild b/dev-python/oslo-utils/oslo-utils-7.0.0-r1.ebuild
index 3ddb625b174f..7073d5a58e39 100644
--- a/dev-python/oslo-utils/oslo-utils-7.0.0.ebuild
+++ b/dev-python/oslo-utils/oslo-utils-7.0.0-r1.ebuild
@@ -25,6 +25,7 @@ RDEPEND="
 	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
 	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
 	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+	<dev-python/netaddr-1[${PYTHON_USEDEP}]
 	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
 	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
 	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index 258c04b5d817..830e7ea2fa63 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -1,3 +1,5 @@
+AUX urllib3-2.2.0-pytest-8.patch 4439 BLAKE2B 5f67936952395f46e5732579a9e8bbb051d76f136f93912c3b355b7dfe15df6490c7bca702dc74184e33dc729f31aa73297729075bd2d28d895473998e5506b7 SHA512 a8249f76754df1b94e66cef679622734968e02911607ee5b86386b4f3e98a3d90c8b4410d9ec54da994695b0bca30a51e84ea923d36634c0e6ca1e785044e876
+AUX urllib3-2.2.0-revert.patch 1984 BLAKE2B 8cd784e62d797e2bb256ac0a4f64b6e738113486bc3a691823f7e0376662b26d05218d40bc71cc9c6a8641868457026992a3e2b7233b6329a090af662a3cb799 SHA512 c1a33b9ae738cf9269224937bd8531e4bb97b6f8cf9a21da4598c4ae3fa5eb470d0f4d54dbea2706f9fdab6073151cb7607170204de4e8ac07a4efa930693ac3
 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
@@ -6,5 +8,5 @@ DIST urllib3-2.2.0.tar.gz 287152 BLAKE2B 126949265c6558e8743f8e2e05e80fd211845c6
 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
-EBUILD urllib3-2.2.0.ebuild 2849 BLAKE2B 03b8677acd813b4be94e3ef766d19afb529ca38be7f8e09c61870851de46b66bd1b1ccd0ef89e392926d09f6bd819877e82d9917c503a2915f45250e24cf8be4 SHA512 8d3f7edb37096aadabbdf2cf94d6cec47e9a344bf1cc4ca500cdf04230995febcf857611ce91c145e88a0b52b9c9476c5fa8ee54464b7ef25d408db2ddb6c429
+EBUILD urllib3-2.2.0-r1.ebuild 3114 BLAKE2B 7c6f0f27381c8058dc4bf97b4fc60517fd612a6b6d54b76ee81c8d4f0b99cdaf8848ed84c097f4b77c9566ea68457ca8c003f3e6ac9b53cf75e770c16d38bacf SHA512 8491d260e6b7f32646e4beef876dd481ab5d6843b96ddd3221bc3d500d8aee9417e2ed82d0fdf1f0e31fe4ccb9d404ff2eead22651cc88102808de10ed3d04a6
 MISC metadata.xml 449 BLAKE2B 45df5a0e80d7b229058be52fd8feb3ba2efe8d981b5b34216e4b9cb35d332588c4b3efade8e8d06bdf1f13159dfcd937458e5cf4d0cea5e07b6c1011cc8592cb SHA512 312b41031a9cbf6341f537fef94137420ca49ab609e7d4c325a998e328be415b381aa50e7b5600483d1a7583b72675a044b5dd80cb84a52539ab23271f1b096c
diff --git a/dev-python/urllib3/files/urllib3-2.2.0-pytest-8.patch b/dev-python/urllib3/files/urllib3-2.2.0-pytest-8.patch
new file mode 100644
index 000000000000..9baa3379a7c9
--- /dev/null
+++ b/dev-python/urllib3/files/urllib3-2.2.0-pytest-8.patch
@@ -0,0 +1,112 @@
+From aa8d3dd2535cc125e123e5c2bca38738d6864b2a Mon Sep 17 00:00:00 2001
+From: Ruben Laguna <ruben.laguna@gmail.com>
+Date: Mon, 5 Feb 2024 15:29:35 +0100
+Subject: [PATCH] Fix ssl_version tests for upcoming migration to pytest 8
+
+---
+ dev-requirements.txt                |  2 +-
+ test/contrib/test_pyopenssl.py      |  1 -
+ test/with_dummyserver/test_https.py | 35 ++++++++++++++++++++---------
+ 3 files changed, 26 insertions(+), 12 deletions(-)
+
+diff --git a/test/contrib/test_pyopenssl.py b/test/contrib/test_pyopenssl.py
+index b4799ce802..eaca77ba6f 100644
+--- a/test/contrib/test_pyopenssl.py
++++ b/test/contrib/test_pyopenssl.py
+@@ -38,7 +38,6 @@ def teardown_module() -> None:
+ from ..test_ssl import TestSSL  # noqa: E402, F401
+ from ..test_util import TestUtilSSL  # noqa: E402, F401
+ from ..with_dummyserver.test_https import (  # noqa: E402, F401
+-    TestHTTPS,
+     TestHTTPS_IPV4SAN,
+     TestHTTPS_IPV6SAN,
+     TestHTTPS_TLSv1,
+diff --git a/test/with_dummyserver/test_https.py b/test/with_dummyserver/test_https.py
+index aa22f11879..b8353d758b 100644
+--- a/test/with_dummyserver/test_https.py
++++ b/test/with_dummyserver/test_https.py
+@@ -65,7 +65,7 @@
+ CLIENT_CERT = CLIENT_INTERMEDIATE_PEM
+ 
+ 
+-class TestHTTPS(HTTPSHypercornDummyServerTestCase):
++class BaseTestHTTPS(HTTPSHypercornDummyServerTestCase):
+     tls_protocol_name: str | None = None
+ 
+     def tls_protocol_not_default(self) -> bool:
+@@ -83,11 +83,17 @@ def tls_version(self) -> ssl.TLSVersion:
+     def ssl_version(self) -> int:
+         if self.tls_protocol_name is None:
+             return pytest.skip("Skipping base test class")
+-        attribute = f"PROTOCOL_{self.tls_protocol_name.replace('.', '_')}"
+-        ssl_version = getattr(ssl, attribute, None)
+-        if ssl_version is None:
+-            return pytest.skip(f"ssl.{attribute} isn't available")
+-        return ssl_version  # type: ignore[no-any-return]
++
++        if self.tls_protocol_name == "TLSv1.3" and ssl.HAS_TLSv1_3:
++            return ssl.PROTOCOL_TLS_CLIENT
++        if self.tls_protocol_name == "TLSv1.2" and ssl.HAS_TLSv1_2:
++            return ssl.PROTOCOL_TLSv1_2
++        if self.tls_protocol_name == "TLSv1.1" and ssl.HAS_TLSv1_1:
++            return ssl.PROTOCOL_TLSv1_1
++        if self.tls_protocol_name == "TLSv1" and ssl.HAS_TLSv1:
++            return ssl.PROTOCOL_TLSv1
++        else:
++            return pytest.skip(f"{self.tls_protocol_name} isn't available")
+ 
+     @classmethod
+     def setup_class(cls) -> None:
+@@ -797,6 +803,10 @@ def test_tls_protocol_name_of_socket(self) -> None:
+     def test_ssl_version_is_deprecated(self) -> None:
+         if self.tls_protocol_name is None:
+             pytest.skip("Skipping base test class")
++        if self.ssl_version() == ssl.PROTOCOL_TLS_CLIENT:
++            pytest.skip(
++                "Skipping because ssl_version=ssl.PROTOCOL_TLS_CLIENT is not deprecated"
++            )
+ 
+         with HTTPSConnectionPool(
+             self.host, self.port, ca_certs=DEFAULT_CA, ssl_version=self.ssl_version()
+@@ -964,6 +974,11 @@ def test_default_ssl_context_ssl_min_max_versions(self) -> None:
+         assert ctx.maximum_version == expected_maximum_version
+ 
+     def test_ssl_context_ssl_version_uses_ssl_min_max_versions(self) -> None:
++        if self.ssl_version() == ssl.PROTOCOL_TLS_CLIENT:
++            pytest.skip(
++                "Skipping because ssl_version=ssl.PROTOCOL_TLS_CLIENT is not deprecated"
++            )
++
+         with pytest.warns(
+             DeprecationWarning,
+             match=r"'ssl_version' option is deprecated and will be removed in "
+@@ -977,25 +992,25 @@ def test_ssl_context_ssl_version_uses_ssl_min_max_versions(self) -> None:
+ 
+ 
+ @pytest.mark.usefixtures("requires_tlsv1")
+-class TestHTTPS_TLSv1(TestHTTPS):
++class TestHTTPS_TLSv1(BaseTestHTTPS):
+     tls_protocol_name = "TLSv1"
+     certs = TLSv1_CERTS
+ 
+ 
+ @pytest.mark.usefixtures("requires_tlsv1_1")
+-class TestHTTPS_TLSv1_1(TestHTTPS):
++class TestHTTPS_TLSv1_1(BaseTestHTTPS):
+     tls_protocol_name = "TLSv1.1"
+     certs = TLSv1_1_CERTS
+ 
+ 
+ @pytest.mark.usefixtures("requires_tlsv1_2")
+-class TestHTTPS_TLSv1_2(TestHTTPS):
++class TestHTTPS_TLSv1_2(BaseTestHTTPS):
+     tls_protocol_name = "TLSv1.2"
+     certs = TLSv1_2_CERTS
+ 
+ 
+ @pytest.mark.usefixtures("requires_tlsv1_3")
+-class TestHTTPS_TLSv1_3(TestHTTPS):
++class TestHTTPS_TLSv1_3(BaseTestHTTPS):
+     tls_protocol_name = "TLSv1.3"
+     certs = TLSv1_3_CERTS
+ 
diff --git a/dev-python/urllib3/files/urllib3-2.2.0-revert.patch b/dev-python/urllib3/files/urllib3-2.2.0-revert.patch
new file mode 100644
index 000000000000..14175ecec58b
--- /dev/null
+++ b/dev-python/urllib3/files/urllib3-2.2.0-revert.patch
@@ -0,0 +1,42 @@
+From 49b2ddaf07ec9ef65ef12d0218117f20e739ee6e Mon Sep 17 00:00:00 2001
+From: Quentin Pradet <quentin.pradet@gmail.com>
+Date: Fri, 16 Feb 2024 11:35:30 +0400
+Subject: [PATCH] Stop casting request headers to HTTPHeaderDict (#3344)
+
+While this was done to fix a mypy error, we did not notice the
+consequences:
+
+ * This breaks boto3 that subclasses HTTPConnection because
+   HTTPHeaderDict does not support bytes values yet.
+ * When proxying, headers are still a dictionary by default.
+
+We can decide to reintroduce a forced conversion to HTTPHeaderDict in
+urllib3 3.0 if the above issues are fixed.
+---
+ changelog/3343.bugfix.rst     | 1 +
+ src/urllib3/connectionpool.py | 4 ++--
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+ create mode 100644 changelog/3343.bugfix.rst
+
+diff --git a/changelog/3343.bugfix.rst b/changelog/3343.bugfix.rst
+new file mode 100644
+index 0000000000..4f2df9e7a4
+--- /dev/null
++++ b/changelog/3343.bugfix.rst
+@@ -0,0 +1 @@
++Fixed ``HTTPConnectionPool.urlopen`` to stop automatically casting non-proxy headers to ``HTTPHeaderDict``. This change was premature as it did not apply to proxy headers and ``HTTPHeaderDict`` does not handle byte header values correctly yet.
+diff --git a/src/urllib3/connectionpool.py b/src/urllib3/connectionpool.py
+index 1036f0d718..bd58ff14dd 100644
+--- a/src/urllib3/connectionpool.py
++++ b/src/urllib3/connectionpool.py
+@@ -751,8 +751,8 @@ def urlopen(  # type: ignore[override]
+         # have to copy the headers dict so we can safely change it without those
+         # changes being reflected in anyone else's copy.
+         if not http_tunnel_required:
+-            headers = HTTPHeaderDict(headers)
+-            headers.update(self.proxy_headers)
++            headers = headers.copy()  # type: ignore[attr-defined]
++            headers.update(self.proxy_headers)  # type: ignore[union-attr]
+ 
+         # Must keep the exception bound to a separate variable or else Python 3
+         # complains about UnboundLocalError.
diff --git a/dev-python/urllib3/urllib3-2.2.0.ebuild b/dev-python/urllib3/urllib3-2.2.0-r1.ebuild
index eb55415eb52a..c8abe317fa22 100644
--- a/dev-python/urllib3/urllib3-2.2.0.ebuild
+++ b/dev-python/urllib3/urllib3-2.2.0-r1.ebuild
@@ -66,6 +66,13 @@ BDEPEND="
 "
 
 src_prepare() {
+	local PATCHES=(
+		# https://github.com/urllib3/urllib3/commit/49b2ddaf07ec9ef65ef12d0218117f20e739ee6e
+		"${FILESDIR}/${P}-revert.patch"
+		# https://github.com/urllib3/urllib3/commit/aa8d3dd2535cc125e123e5c2bca38738d6864b2a
+		"${FILESDIR}/${P}-pytest-8.patch"
+	)
+
 	# 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
diff --git a/dev-python/vcrpy/Manifest b/dev-python/vcrpy/Manifest
index c8a6bb76aa45..b80fb2cb101d 100644
--- a/dev-python/vcrpy/Manifest
+++ b/dev-python/vcrpy/Manifest
@@ -1,3 +1,4 @@
+AUX vcrpy-6.0.1-httpbin-compat.patch 1921 BLAKE2B 7ac8e0fa08f38b2b1f3bf78f80485a32d2ca2a56bff4c9c70b42049a6ed37dadd25f25fedd77b578d7452b87bf74825b0bd062186f74c9cc6a7017be6fe189f7 SHA512 81b87869bf8af2b853ff5a336c45ac1b26ed8f49729e2da94859b621d1110a07081d280dfb541fab0a8bb2ad48c26be48a3966f17a7455242da0b150a569c0c8
 DIST vcrpy-6.0.1.gh.tar.gz 337497 BLAKE2B a00571d7ed0dd895cc120e3e2615e8e6ea3e86344813e87f836a182be45389b200925ae2a02dc754b0b77db642d3be453b3b8c909b26197222b84fa95c6da804 SHA512 79ba9ea29db20ddc3db5676d7bdb05da17848eb126ed63d813a1d2b0de80573fff3afaec2ffe1af491a0310ce922c7545c4569035d0f5868f171db25965c217f
-EBUILD vcrpy-6.0.1.ebuild 1647 BLAKE2B d087ff5d409691f23d13059e9530cf317aeb7376d820aba82d0669c68c0386e933128e6c07b302109dda6bb3dc65053d296721d50d2e4827a54cf4d40b5db471 SHA512 867354a621ba19e5f1605591bc40d98d0509f95e534edee4c5c99dc5ca06fa8b05f7ba15efd4366c8e5d7f9e005d24bc4a234c01ef35fbb508817660ae83382a
+EBUILD vcrpy-6.0.1.ebuild 1748 BLAKE2B ef578ea72d3b54a75e3d986932d1d170b6abbc14d42df5304e796c92853f95cfd1a0ae722adff5a063babc0dd53aa63e26e24d9c69bc19a4353fc8e62d653b86 SHA512 af5de06049c920f8ebfd13a11378667dddb87d6ab12e42bca8893443d42f680261c95d4c798d4f42ca9bf458e4350eae96439aead717b5d51382b39519078ee0
 MISC metadata.xml 388 BLAKE2B fd31293bd6085e6a93816a1813a8c3a9d046ed3d932fba5b32b454a71e7535606ba92815699b7ca10fc837b07a5335df54d5fae8c860a7ea88c6ea72891d0620 SHA512 0360ac6f113035ffd1991d2a42000f290c9d0a3fa8c4dac9abfde0eecafd23e1ff9929d8ee521f83a924c523992fabc5cb4353079bf7c52dac9f906a31d4da55
diff --git a/dev-python/vcrpy/files/vcrpy-6.0.1-httpbin-compat.patch b/dev-python/vcrpy/files/vcrpy-6.0.1-httpbin-compat.patch
new file mode 100644
index 000000000000..4e2a91cb4bac
--- /dev/null
+++ b/dev-python/vcrpy/files/vcrpy-6.0.1-httpbin-compat.patch
@@ -0,0 +1,40 @@
+From e60dafb8dce589e7deb63fec552f5c05bd19ac6d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Fri, 16 Feb 2024 19:33:41 +0100
+Subject: [PATCH] Improve test compatibility with legacy httpbin index
+
+Make the tests slightly more flexible to match both the flasgger-based
+and legacy httpbin index.  This is needed for compatibility with
+https://github.com/psf/httpbin/pull/44 when flasgger is not installed
+(e.g. on architectures that are not supported by Rust).
+---
+ tests/integration/test_basic.py              | 2 +-
+ tests/integration/test_register_persister.py | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/integration/test_basic.py b/tests/integration/test_basic.py
+index bfad6153..99121456 100644
+--- a/tests/integration/test_basic.py
++++ b/tests/integration/test_basic.py
+@@ -39,7 +39,7 @@ def test_basic_json_use(tmpdir, httpbin):
+     test_fixture = str(tmpdir.join("synopsis.json"))
+     with vcr.use_cassette(test_fixture, serializer="json"):
+         response = urlopen(httpbin.url).read()
+-        assert b"A simple HTTP Request &amp; Response Service." in response
++        assert b"HTTP Request &amp; Response Service" in response
+ 
+ 
+ def test_patched_content(tmpdir, httpbin):
+diff --git a/tests/integration/test_register_persister.py b/tests/integration/test_register_persister.py
+index e904197c..375f14be 100644
+--- a/tests/integration/test_register_persister.py
++++ b/tests/integration/test_register_persister.py
+@@ -66,7 +66,7 @@ def test_load_cassette_with_custom_persister(tmpdir, httpbin):
+ 
+     with my_vcr.use_cassette(test_fixture, serializer="json"):
+         response = urlopen(httpbin.url).read()
+-        assert b"A simple HTTP Request &amp; Response Service." in response
++        assert b"HTTP Request &amp; Response Service" in response
+ 
+ 
+ def test_load_cassette_persister_exception_handling(tmpdir, httpbin):
diff --git a/dev-python/vcrpy/vcrpy-6.0.1.ebuild b/dev-python/vcrpy/vcrpy-6.0.1.ebuild
index 6e8afec2a509..257bac69d0b4 100644
--- a/dev-python/vcrpy/vcrpy-6.0.1.ebuild
+++ b/dev-python/vcrpy/vcrpy-6.0.1.ebuild
@@ -38,6 +38,11 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
+PATCHES=(
+	# https://github.com/kevin1024/vcrpy/pull/823
+	"${FILESDIR}/${P}-httpbin-compat.patch"
+)
+
 python_test() {
 	local EPYTEST_DESELECT=(
 		# these tests are failing with recent dev-python/werkzeug; losely related: