gentoo auto-resync : 26:05:2023 - 15:09:32

19 files changed, 213 insertions, 56 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index e27f8f3f6cba..b23004e4e54d 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/hkdf/Manifest b/dev-python/hkdf/Manifest
deleted file mode 100644
index 934a22d7bf6a..000000000000
--- a/dev-python/hkdf/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST hkdf-0.0.3.gh.tar.gz 6784 BLAKE2B 3034db59d29c9e4ee9b0e94b7927a63df3691d927ac8dc61f7599b55ee4cd27bb3d08fff6cc5dc650e75db74a2fa67cc2004d960558519423fd747455a2874bc SHA512 6738bcebd6a8d48d7389340f0a30cf66114bf5dd4909fd5cfd09d61a39affb851f2cb4143eb9a7e9a4d27bd89797216ec51c635f57b9e3e3573b2719436bcab4
-EBUILD hkdf-0.0.3.ebuild 627 BLAKE2B 5de3cfca0569d4469eabb16279ffcd08044bf05d2d22eb05ee298963c3e179dfb3c2ad22c61e8cb0cd18c6bafc425c172f1825092607357f78b2824b95c1f814 SHA512 276989df322564ce126ba438fc90f13f7c5993013a176520c8169c562dbe12046f3ef5becd0a4284161db4b51411d456a7b2e9567dad0cea51aa6ceba8970568
-MISC metadata.xml 399 BLAKE2B 4172401161574756b94123bed650461a80124324474a17b6670e08220c939f36a6dc98f2fa4a1321b8ba4be69043ae24f5de18df37fc494821caf6021b97fb21 SHA512 e56409f4de1986df5b52f98a6ea2aa4ab5d8e08a57bdf3b7930cd13892f7c28c413002581a0a3d4cc4358a7efc238f1e01b3c7b026034c274e84ef29e0033c15
diff --git a/dev-python/hkdf/hkdf-0.0.3.ebuild b/dev-python/hkdf/hkdf-0.0.3.ebuild
deleted file mode 100644
index c08523596c1e..000000000000
--- a/dev-python/hkdf/hkdf-0.0.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-DISTUTILS_USE_PEP517=setuptools
-
-# corresponding to upstream version 0.0.3
-COMMIT_SHA1="cc3c9dbf0a271b27a7ac5cd04cc1485bbc3b4307"
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="HMAC-based Extract-and-Expand Key Derivation Function (HKDF)"
-HOMEPAGE="https://pypi.org/project/hkdf"
-SRC_URI="https://github.com/casebeer/python-hkdf/archive/${COMMIT_SHA1}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-S="${WORKDIR}/${P}.gh"
-
-distutils_enable_tests nose
diff --git a/dev-python/hkdf/metadata.xml b/dev-python/hkdf/metadata.xml
deleted file mode 100644
index 499864299082..000000000000
--- a/dev-python/hkdf/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>tamiko@gentoo.org</email>
-		<name>Matthias Maier</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="pypi">hkdf</remote-id>
-		<remote-id type="github">casebeer/python-hkdf</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/magic-wormhole-mailbox-server/Manifest b/dev-python/magic-wormhole-mailbox-server/Manifest
index 0061ff7a2a86..2e673481225a 100644
--- a/dev-python/magic-wormhole-mailbox-server/Manifest
+++ b/dev-python/magic-wormhole-mailbox-server/Manifest
@@ -1,3 +1,3 @@
 DIST magic-wormhole-mailbox-server-0.4.1_p20230525.gh.tar.gz 69218 BLAKE2B 10c85d41ebd3b9e4918ca6d85f7f69dfe945f3e3282fb83ab5c846d3a633b897a48ee3c91476292bf048fe56f39d3e7fc8b721a74ff56c060ef660d3b47ea122 SHA512 69ff60637092443fa458b4d5def9e99c4eb942046b6ea5023b63a85b4562a23fc0fc8e4137c1a59c0192e6820af60e75c27f616c70d75ee6e5afabcf52d81bd8
-EBUILD magic-wormhole-mailbox-server-0.4.1_p20230525.ebuild 854 BLAKE2B 36b0170f21031e668c82e0de104db008b8747c2cbdf4df9082d000afa81bd983e745876b5206be086d701c0f8a23f15723fb9d683512e60e2449a3a1e8d0b19f SHA512 aef29dd7e50767b84ec7463d68ed899eacffd25011e3acd60bd4bc7bd0a8ca76d5bf11d8fedbb7d5777e750348323d1dfb4a964d2c958ff302e74ef68da68f90
+EBUILD magic-wormhole-mailbox-server-0.4.1_p20230525.ebuild 915 BLAKE2B ebd35187a3bf92ba410363c992a34542c133098d8fbedf4b4e867f2945b70f163110e3336e351bfd5d55e6737102552d81558a4d333302668a46d880fbae190a SHA512 2155d25969dcf4514b0ccf225e791c0572e0c16af3375ae44090d6cded4b54c8cc5e7e8db9fe52030b2cd0a6c4fbdb09c942a2bce6b0ccb71f2f08d0aad85adc
 MISC metadata.xml 448 BLAKE2B 8f2c4215876c801058fcbe35e67d9f7e4645e0a03d5b2078a91d4c0f7b3c0afbdcf5a52a60a793a5f45ae111db856dad3903c21aebced71ba1404243c8ec140a SHA512 c11199eefe7aaae2197fa16744f4a0223e880f3d45f22b7e235d21c55be729e7723a43c24d8b7b80fbaefcb1ae54142e989fc958a7f5e098376721ec57dc4d72
diff --git a/dev-python/magic-wormhole-mailbox-server/magic-wormhole-mailbox-server-0.4.1_p20230525.ebuild b/dev-python/magic-wormhole-mailbox-server/magic-wormhole-mailbox-server-0.4.1_p20230525.ebuild
index f5769517ec9f..47035e89b80c 100644
--- a/dev-python/magic-wormhole-mailbox-server/magic-wormhole-mailbox-server-0.4.1_p20230525.ebuild
+++ b/dev-python/magic-wormhole-mailbox-server/magic-wormhole-mailbox-server-0.4.1_p20230525.ebuild
@@ -9,7 +9,7 @@ DISTUTILS_USE_PEP517=setuptools
 # Version 0.4.1 with additional upstream fixes for python 3.11 support
 COMMIT_SHA1="39672ae95a2635ba9daaba62f483aa75bfd80a22"
 
-inherit distutils-r1 vcs-snapshot
+inherit distutils-r1
 
 DESCRIPTION="Mailbox server for magic-wormhole"
 HOMEPAGE="https://magic-wormhole.readthedocs.io/en/latest/ https://pypi.org/project/magic-wormhole-mailbox-server/"
@@ -18,12 +18,15 @@ SRC_URI="https://github.com/magic-wormhole/${PN}/archive/${COMMIT_SHA1}.tar.gz -
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-S="${WORKDIR}/${P}.gh"
+S="${WORKDIR}/magic-wormhole-mailbox-server-${COMMIT_SHA1}"
 
 RDEPEND="
 	dev-python/autobahn[${PYTHON_USEDEP}]
 	dev-python/twisted[ssl,${PYTHON_USEDEP}]"
 
-BDEPEND="test? ( dev-python/treq[${PYTHON_USEDEP}] )"
+BDEPEND="test? (
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/treq[${PYTHON_USEDEP}]
+	)"
 
 distutils_enable_tests pytest
diff --git a/dev-python/magic-wormhole-transit-relay/Manifest b/dev-python/magic-wormhole-transit-relay/Manifest
index 33cc37d0bea9..82360fcbd422 100644
--- a/dev-python/magic-wormhole-transit-relay/Manifest
+++ b/dev-python/magic-wormhole-transit-relay/Manifest
@@ -1,5 +1,5 @@
 DIST magic-wormhole-transit-relay-0.2.1.gh.tar.gz 45936 BLAKE2B ffb05c716a35e688801150c3fd6de28cf557ed346091400f9eeb9335b6815425624e70d61f54be8f0a1e8bb15e874528f7cfcef1e8f0a2f8d3cd4285adb1db3a SHA512 dcc309de800d9023ff106ea7b67da4814006ee50e517570c046f2dff20573306b3d5f7c4e227186b2b6f8ff7cb71e02e41499766badf299d859a0e5628066162
 DIST magic-wormhole-transit-relay-0.2.1_p20230525.gh.tar.gz 55549 BLAKE2B 36184ce5034f8a5b684fb82a9e6debd1f945a119c9daa155e5bec0041dd986668573b7843efde8bbce2dbf2630774b7a195e28443c070760e234e0214c51dcc3 SHA512 c8270b8daebaf2d6403f0cbc6ff8a5c37fec6fd28ce0d441c834f5bcfcb1e0dedfb953acdf9711b6077c0e5fce3fba37447f2c29ed424ba64d8c2a9519b5eed8
 EBUILD magic-wormhole-transit-relay-0.2.1.ebuild 642 BLAKE2B 33274120a28e3797bd4cf29c99ffc24159b647d6877fcc0f2d6b6b113345a0ee24e6708812caac5bc488d9ae27e7208b010b2342055c7ac3b1ae823e2af782ec SHA512 46fd32be5f51d12e79e6a52d24ecff10cd66a6514c6697768ec6abd9b16156bcb88ffff5095802d0a7862afb32064cb8eeef04d2abbf9d853f83095dea332379
-EBUILD magic-wormhole-transit-relay-0.2.1_p20230525.ebuild 832 BLAKE2B 0ed545187e9d2a9a94fd9dc53e96326efc67ca85863bf1c0cef8af780eff9e877c767dcf16cb410d4a05e0ca1fa531de3fcc2b3885fa4f0f4aa6528c39d1c00a SHA512 d550d8ee1892575ac434f69b76e314d7c48148b49482c18013d30d75e6f750925758423b73ecbef23a798de407edde94580517c6009d5cc0f4919e8c520dce61
+EBUILD magic-wormhole-transit-relay-0.2.1_p20230525.ebuild 1148 BLAKE2B 046a3b22283283c001a7bd865388211e2e010024cfa788b5baa1282b2c5c1955d6992b80005f7e31bc6ecec1af469ea08c156f397c937edd0058100f3c4163db SHA512 3ccc8fc36736d42dd538f171f4f43a4386602068833ef6717b1cf315d931edd20fd1200f0176424cd30ee6a39b24527363f46469c55affd31e5673d43dee95e1
 MISC metadata.xml 446 BLAKE2B 88fa3d71e7112501e2191db9b0732319120794aa1e54ee254a53f586c3f09ce1fa83c6ff3db972743bcc5fbf6d82b2a8eeeaabb1cd37165caecaff1b52c13152 SHA512 3804952a6724e4905a1ae823089ec2624ae193724324184bdbe2e9ec62b0f82d929036e1ba245035670dc53cc4a007149ee033ad8b4d2788bf406a56f5367cc2
diff --git a/dev-python/magic-wormhole-transit-relay/magic-wormhole-transit-relay-0.2.1_p20230525.ebuild b/dev-python/magic-wormhole-transit-relay/magic-wormhole-transit-relay-0.2.1_p20230525.ebuild
index aa0b710e9a36..910aee6cec11 100644
--- a/dev-python/magic-wormhole-transit-relay/magic-wormhole-transit-relay-0.2.1_p20230525.ebuild
+++ b/dev-python/magic-wormhole-transit-relay/magic-wormhole-transit-relay-0.2.1_p20230525.ebuild
@@ -10,7 +10,7 @@ DISTUTILS_USE_PEP517=setuptools
 # miscelleanous bufixes
 COMMIT_SHA1="db48e915311d1d10c748bb5299e2345c74e90a1b"
 
-inherit distutils-r1 vcs-snapshot
+inherit distutils-r1
 
 DESCRIPTION="Transit relay server for magic-wormhole"
 HOMEPAGE="https://magic-wormhole.readthedocs.io/en/latest/ https://pypi.org/project/magic-wormhole-transit-relay/"
@@ -19,10 +19,23 @@ SRC_URI="https://github.com/magic-wormhole/${PN}/archive/${COMMIT_SHA1}.tar.gz -
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-S="${WORKDIR}/${P}.gh"
+S="${WORKDIR}/magic-wormhole-transit-relay-${COMMIT_SHA1}"
 
 RDEPEND="
 	dev-python/autobahn[${PYTHON_USEDEP}]
 	dev-python/twisted[ssl,${PYTHON_USEDEP}]"
 
+BDEPEND="test? (
+	dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
 distutils_enable_tests pytest
+
+python_test() {
+	# deselect test_buff_fill test because it exhibits intermittent hangs,
+	# bug #907200
+	local EPYTEST_DESELECT=(
+		src/wormhole_transit_relay/test/test_backpressure.py::TransitWebSockets::test_buffer_fill
+	)
+	epytest
+}
diff --git a/dev-python/magic-wormhole/Manifest b/dev-python/magic-wormhole/Manifest
index 1ddca78ce3f5..ef266e080f5a 100644
--- a/dev-python/magic-wormhole/Manifest
+++ b/dev-python/magic-wormhole/Manifest
@@ -1,3 +1,3 @@
 DIST magic-wormhole-0.12.0_p20230525.gh.tar.gz 281332 BLAKE2B daf9e39c89d8591584b25f142de2e66757a31970179f38e2fb74e112295e637f94930127bd3c0c1cc1243ac559dc4885bab3e7892b112dbf174b0514b49051c0 SHA512 ef5be6396fb9d6e35c64baeeaaea269526f9f8127eaf1bdd7b7b693a0272885388c4d6dc9fac87f6355eff5e9fe94450aebeafd2009b7d74f6772922a2796cbd
-EBUILD magic-wormhole-0.12.0_p20230525.ebuild 1637 BLAKE2B 5b7b56e7efafe63f0e05331c9b0356e73d846e125c33f2acb4ade9828e161b58e00f36d2511317383bbbb799f213978fece189d7203e997539d6d572044f7d16 SHA512 ec85a0e720a51285df02a4b66cd99b98e028a8c48ba5c6affa50e5c9e228a610f52fbcd4e1a26cd18e0a27e34a6c22115484fa086f16b9d5c6ea108747c28197
+EBUILD magic-wormhole-0.12.0_p20230525.ebuild 1646 BLAKE2B def94939c61a465aa74fedda2202c369c3230eccce8dea06d19c4ba0e66fe10f260a80c785d3b5b5ab0e90f714f6b9a64a58230ae6e5b7b30bb55bab2125827f SHA512 919b1443d6e2d5b6be996c8e9a30d8c9ae0d686113c5eb8d69b01359dcbb596170805de5de80f585db5c2b10de56e49d03f25780a7473c1aba21b2f60cc32198
 MISC metadata.xml 418 BLAKE2B 9f9b20483a6ce46113cc6307621122f2a5d36355ca9c8290af95b88c6ed6bb9320810da1eccf9c53d310fd8faea3796094b1c1260032406aa9adff37dc95ce51 SHA512 ef39741b0b041bf889d138efea1f784453dce8cf982d170dbfe26ace415bb186672a7bf56b1c4a586c0820997522a45f92fa40b37936f4c90ec731498c3c7b69
diff --git a/dev-python/magic-wormhole/magic-wormhole-0.12.0_p20230525.ebuild b/dev-python/magic-wormhole/magic-wormhole-0.12.0_p20230525.ebuild
index 6a6c99bff5a9..4afc806872fe 100644
--- a/dev-python/magic-wormhole/magic-wormhole-0.12.0_p20230525.ebuild
+++ b/dev-python/magic-wormhole/magic-wormhole-0.12.0_p20230525.ebuild
@@ -10,7 +10,7 @@ DISTUTILS_USE_PEP517=setuptools
 # miscellanous improvements
 COMMIT_SHA1="8af8888d171791943b9fab036f0e0067b87c9b59"
 
-inherit distutils-r1 vcs-snapshot
+inherit distutils-r1
 
 DESCRIPTION="Get Things From One Computer To Another, Safely"
 HOMEPAGE="https://magic-wormhole.readthedocs.io/en/latest/ https://pypi.org/project/magic-wormhole/"
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT_SHA1}.tar.gz -> ${P}.gh
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-S="${WORKDIR}/${P}.gh"
+S="${WORKDIR}/magic-wormhole-${COMMIT_SHA1}"
 
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
diff --git a/dev-python/pebble/Manifest b/dev-python/pebble/Manifest
index 5333cb31daad..4cb14893a194 100644
--- a/dev-python/pebble/Manifest
+++ b/dev-python/pebble/Manifest
@@ -1,4 +1,4 @@
 AUX pebble-5.0.3-backport-pr112.patch 1192 BLAKE2B 1630a12af47942ebba938b9e0e7fa50d1a3363d2eaa25f98f3adcb5c17823cf2ed0bd1d385c8fab8c776521f270954ba5f1211d04ba4200401de096f96896bb8 SHA512 47c24197b6cfbc6b6474c2f2bf6389d227d618e4610e07e91afed6a29db551ff26e6de89b368ce6486ac3023d702e11abc56d78aabfbf208e4374a2775b7aebe
 DIST Pebble-5.0.3.tar.gz 29076 BLAKE2B d140cc0abd08cb5d6031a3fb8ba6f573e273f865d23e8854e9e540e115b030cabd07d8517f94b542216294abd742960b3addda592f0e7d31662bd10b224c8d7b SHA512 324cba58905b0be76b2cd56e0ee5d3e51a36d46a7754fbccb1f9307af0747c2f02b81d137e2c4bce1c766706b70ce1a909c3b287676db147c202cab7445fc764
-EBUILD pebble-5.0.3.ebuild 621 BLAKE2B e2c8f8ecfd25ec8f964a4efcee8f64abe8bcc10367907877228bd05807791eaa3a7071324049caafa7b5ae0c47845d1827f95dba4144b7a065f1d98cb2df38e8 SHA512 5aa62496962df3b006f15e9695848065f0f6255596d180141181c7e185d9bc499937c78bf9f24a976f884f4a8a2ab611cc71dd2c53dc499eb52ff5be599d70bc
+EBUILD pebble-5.0.3.ebuild 622 BLAKE2B 9e9b95724906b83b78bc5bce4e9905916d9ca7e4c2d86a5612f69ba78adfa68181860363d484976374cfa8d189cac63802876ed87f86919b988222fd9fd2d9ff SHA512 e83336343b94a64a8adfac6c674e6e0f3643715be7e9fbadb799907b9b743cae54c4e3b8add9c0516ca2b5124781a605ad59b468d5259d71b080dfb9711db8e1
 MISC metadata.xml 367 BLAKE2B 587e93606cf39400151b413a1d1ee5446e6c6dfbde19bf2b9cd8e9a7226c1d4df53c8849625fba7c61a84ebc8939803cda5c1250c3068cb8cd61ef9db901ab6f SHA512 8f50888f29afc88c791f54078d4120eb26a0217ad76fd72f311bea4bfb769cd37adcf657bff4949fc9360b701b44d0736cd294101ce9838db538b6a34e103dd3
diff --git a/dev-python/pebble/pebble-5.0.3.ebuild b/dev-python/pebble/pebble-5.0.3.ebuild
index 3706c6e86b6c..77045f98ae3a 100644
--- a/dev-python/pebble/pebble-5.0.3.ebuild
+++ b/dev-python/pebble/pebble-5.0.3.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYPI_NO_NORMALIZE=1
 PYPI_PN=${PN^}
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1 pypi
 
diff --git a/dev-python/spake2/Manifest b/dev-python/spake2/Manifest
index 713e65a50125..2a6b57ef5652 100644
--- a/dev-python/spake2/Manifest
+++ b/dev-python/spake2/Manifest
@@ -1,3 +1,4 @@
+AUX spake2-0.8-do_not_use_hkdf_package.patch 4380 BLAKE2B afc8222c1c562947c4b9ae6be90b7cb0f6f441f0d02677160f54c7c88b0752f2bdd09599ba04ba131cca4c8481c5abb44079ab63ec36788d5937d18cb2c82fcc SHA512 41156d8b43570158b042802c951ab74a84f618c4dc6ed9edc31c3c28dee972a2b80166b9fcae29ca9aa5a5596ca352f42e58f9c6834cfb2bfd5ba2ce093bd82c
 DIST spake2-0.8.gh.tar.gz 62425 BLAKE2B 64215362af26fff0785fdabf4282f7111a4cc917750827075b616f009cb1fa6373fc2325382c26b43c051aa5b94e414ca2a5223d9ab666289eb2d04723b15cb5 SHA512 908c377c831f4a11551973ca917b113d51a66c533d35fd19b2692fdb7e575ed2a5045d9b632bc55c37b68ad092f01dff5da191e9dfbfb5599b72844788438d68
-EBUILD spake2-0.8.ebuild 635 BLAKE2B 51a609794569458dffe2f3c288d26a19bb4efc12d5f9b8b91509be35495ac334ff03acad560a1424f180dd5e0da943b22120a1ff7a452934a97a44a53ecf9179 SHA512 c38a16bb40a5cd7dca004c2f4cac7cb26c5f62e8ca63444a3701cdae3a1c27aac49d6dcb4ad695b62ea101c5841a6dcffa472f690f7b7516e84e784eda124e65
+EBUILD spake2-0.8-r1.ebuild 706 BLAKE2B fd6666eae0ac5ac41ba406ee8c70c3268b15b9b3ecca06f63556641d308efb65ec9e68d7848f161995d49978bfabb8aa5fa514673731a1da21f3c67033f99006 SHA512 97cf1ef487b6e5d9af080f9d65e13eb741da884ac89fd3a23963d65420ee601e50d8501da8bf68d8ae24071434dfb33b7afac58f51cf0d87005436251a0249f6
 MISC metadata.xml 401 BLAKE2B a80b9d771ec1251af6e16f012257a7d1150644cdba64052ff5b70d282c6f27fa57685f675409a3edf30b2c2bc24c85f74b3dd8460999f8497a72e93653183abc SHA512 ecfbcd80d35348bbb1a5469bcca1b06a86ca6fe736d443707e00859400318e5c9bb399e5acf2faaf2771301518741ec93124277f6bf1834454b4406392cf0ea4
diff --git a/dev-python/spake2/files/spake2-0.8-do_not_use_hkdf_package.patch b/dev-python/spake2/files/spake2-0.8-do_not_use_hkdf_package.patch
new file mode 100644
index 000000000000..40e9e17a6843
--- /dev/null
+++ b/dev-python/spake2/files/spake2-0.8-do_not_use_hkdf_package.patch
@@ -0,0 +1,113 @@
+From 930bfabc17748ea3772e6a40b04e84fc4aafcf04 Mon Sep 17 00:00:00 2001
+From: meejah <meejah@meejah.ca>
+Date: Wed, 9 Nov 2022 23:42:33 -0700
+Subject: [PATCH 1/2] use cryptography's HKDF implementation
+
+---
+ setup.py                       |  2 +-
+ src/spake2/ed25519_basic.py    |  2 +-
+ src/spake2/groups.py           | 21 ++++++++++++++-------
+ src/spake2/test/test_compat.py |  9 +++++----
+ 4 files changed, 21 insertions(+), 13 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 660f055..ba3cc28 100755
+--- a/setup.py
++++ b/setup.py
+@@ -79,5 +79,5 @@ def abbrev(t):
+           "Programming Language :: Python :: 3.6",
+           "Topic :: Security :: Cryptography",
+           ],
+-      install_requires=["hkdf"],
++      install_requires=["cryptography"],
+       )
+diff --git a/src/spake2/ed25519_basic.py b/src/spake2/ed25519_basic.py
+index 1890be7..dbab56d 100644
+--- a/src/spake2/ed25519_basic.py
++++ b/src/spake2/ed25519_basic.py
+@@ -273,7 +273,7 @@ def arbitrary_element(seed): # unknown DL
+     # oversized string (128 bits more than the field size), then reducing
+     # down to Q. But it's comforting, and it's the same technique we use for
+     # converting passwords/seeds to scalars (which *does* need uniformity).
+-    hseed = expand_arbitrary_element_seed(seed, (256/8)+16)
++    hseed = expand_arbitrary_element_seed(seed, int((256/8)+16))
+     y = int(binascii.hexlify(hseed), 16) % Q
+ 
+     # we try successive Y values until we find a valid point
+diff --git a/src/spake2/groups.py b/src/spake2/groups.py
+index de4f75d..66b08e7 100644
+--- a/src/spake2/groups.py
++++ b/src/spake2/groups.py
+@@ -1,6 +1,7 @@
+ from __future__ import division
+ import hashlib
+-from hkdf import Hkdf
++from cryptography.hazmat.primitives.kdf import hkdf
++from cryptography.hazmat.primitives import hashes
+ from .six import integer_types
+ from .util import (size_bits, size_bytes, unbiased_randrange,
+                    bytes_to_number, number_to_bytes)
+@@ -63,9 +64,12 @@
+ 
+ 
+ def expand_password(data, num_bytes):
+-    h = Hkdf(salt=b"", input_key_material=data, hash=hashlib.sha256)
+-    info = b"SPAKE2 pw"
+-    return h.expand(info, num_bytes)
++    return hkdf.HKDF(
++        algorithm=hashes.SHA256(),
++        length=num_bytes,
++        salt=b"",
++        info=b"SPAKE2 pw"
++    ).derive(data)
+ 
+ def password_to_scalar(pw, scalar_size_bytes, q):
+     assert isinstance(pw, bytes)
+@@ -77,9 +81,12 @@ def password_to_scalar(pw, scalar_size_bytes, q):
+     return i % q
+ 
+ def expand_arbitrary_element_seed(data, num_bytes):
+-    h = Hkdf(salt=b"", input_key_material=data, hash=hashlib.sha256)
+-    info = b"SPAKE2 arbitrary element"
+-    return h.expand(info, num_bytes)
++    return hkdf.HKDF(
++        algorithm=hashes.SHA256(),
++        length=num_bytes,
++        salt=b"",
++        info=b"SPAKE2 arbitrary element"
++    ).derive(data)
+ 
+ class _Element:
+     def __init__(self, group, e):
+diff --git a/src/spake2/test/test_compat.py b/src/spake2/test/test_compat.py
+index 3c636be..1c1340c 100644
+--- a/src/spake2/test/test_compat.py
++++ b/src/spake2/test/test_compat.py
+@@ -1,7 +1,8 @@
+ import unittest
+ from binascii import hexlify, unhexlify
+ from hashlib import sha256
+-from hkdf import Hkdf
++from cryptography.hazmat.primitives.kdf import hkdf
++from cryptography.hazmat.primitives import hashes
+ from .myhkdf import HKDF as myHKDF
+ from spake2 import groups, ed25519_group
+ from spake2.spake2 import (SPAKE2_A, SPAKE2_B, SPAKE2_Symmetric,
+@@ -213,14 +214,14 @@ def test_vectors(self):
+     {"salt": "00", "IKM": "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f", "info": "", "L": 4, "OKM": "37ad2910"},
+     ]
+ 
+-class HKDF(unittest.TestCase):
++class TestHKDF(unittest.TestCase):
+     def test_vectors(self):
+         for vector in HKDF_TEST_VECTORS:
+             salt = unhexlify(vector["salt"].encode("ascii"))
+             IKM = unhexlify(vector["IKM"].encode("ascii"))
+             info = unhexlify(vector["info"].encode("ascii"))
+-            h = Hkdf(salt=salt, input_key_material=IKM, hash=sha256)
+-            digest = h.expand(info, vector["L"])
++            h = hkdf.HKDF(algorithm=hashes.SHA256(), length=vector["L"], salt=salt, info=info)
++            digest = h.derive(IKM)
+             self.assertEqual(digest, myHKDF(IKM, vector["L"], salt, info))
+             #print(hexlify(digest))
+             expected = vector["OKM"].encode("ascii")
diff --git a/dev-python/spake2/spake2-0.8.ebuild b/dev-python/spake2/spake2-0.8-r1.ebuild
index 8fa00484e842..ddda85a403a6 100644
--- a/dev-python/spake2/spake2-0.8.ebuild
+++ b/dev-python/spake2/spake2-0.8-r1.ebuild
@@ -18,7 +18,11 @@ KEYWORDS="~amd64 ~x86"
 S="${WORKDIR}/python-${P}"
 
 RDEPEND="
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	dev-python/hkdf[${PYTHON_USEDEP}]"
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-do_not_use_hkdf_package.patch
+)
 
 distutils_enable_tests pytest
diff --git a/dev-python/tzlocal/Manifest b/dev-python/tzlocal/Manifest
index 37ff437a8d08..5e0d8ecb5ae8 100644
--- a/dev-python/tzlocal/Manifest
+++ b/dev-python/tzlocal/Manifest
@@ -1,5 +1,5 @@
 DIST tzlocal-4.3.gh.tar.gz 24147 BLAKE2B 41ed6338b97f1f6c4a5cb64b82f6a93c4e68f275c2d593c774592998a7c63d1c8470fcd5babc13679092da4f92edeb798bfe80186628cb6c34b7fa595a21daf7 SHA512 b93541951c90ef59a0d9b224c75170a0857723ee0f50782980a78a003b1040b7ceef3bbadd2cabde2a8599cecdd7644ccd1431eb8e4d33cd9e4e9d980c048736
 DIST tzlocal-5.0.1.gh.tar.gz 25032 BLAKE2B a1b0d2d2d6422c91752332d789efddad5f14e02e0097deaea1b8df2de20686d1e73dddb1864c5c643b20f8cfce56ff28adb741f7ae74b58409a60bf0eb172057 SHA512 b89293180e82334e3c1627845516ac25d8862c799d6d56a9eff13549bfafef2e4e4b0a624e9455e4310429f50b9d82fa984b7dfe8cdd9ed3dc7325ea89c0c5b1
 EBUILD tzlocal-4.3.ebuild 798 BLAKE2B 847a27a4eb2728cd966330135ce2e6bca0e4529122924cbe3e828412d923560042ce5ebb973969270635c22c261b32dde7e43fb511bb9225823f9ee4e44b5049 SHA512 2d203736837f391ecaef2621e37a2a8e3cc1ba6e7445e212abbec71ce07f6d3803ac90a7630e2b63904a59a57d32e5d812204d2ac25985932d7edd7b313222ab
-EBUILD tzlocal-5.0.1.ebuild 810 BLAKE2B b0782bee16609e3ef977779561636c2d552c94f8508819470b2efe2814ee2df75a45802fd80d08b1724ef619a74b976135495249ba31d846ef2d8076a98e8f38 SHA512 8bbd4ee8d7287aca4c6ea6da0b2dccc00f75585837d6750de1748c308abbcbfec210cd91db6146a78a28ed2494d72e368e396a79429c4e72c6de699fb335feb1
+EBUILD tzlocal-5.0.1.ebuild 810 BLAKE2B 3a68ebfccd0a2c17fcba83b6afe1563a6bdcdede0ec4ff9a322da0da3144ed5e4b55ac1d63d80cf9be7c12d16278f1b735ce99c76e21390ed7bf46b43e975329 SHA512 dae481e30934f355d9765e414c7c0478bbb95d557ac0348e93f405e9346c9cc3dc03b04577140717dbf5eee8c42a8401c47cf69a5fa0ed3c18775ca9b9886ed2
 MISC metadata.xml 403 BLAKE2B c2fbd81151ee69075c53b7c7d353ac2eb207e92b5bee234591f839c751c54e20abfeb10a8ef1c7cf074d5b94c4745dd23ca1e935b41619dfdc551d2fbb955ac5 SHA512 73c29b14ace10a0b23ef59f9a10abf5f9367dfecc89743cd29a01ece71689c08f83a14612fd3a4779fcbe5382e4e33f6ffbae183c498cba8ba7776d2afbea8ab
diff --git a/dev-python/tzlocal/tzlocal-5.0.1.ebuild b/dev-python/tzlocal/tzlocal-5.0.1.ebuild
index cb2fc8a0b84b..544981524d6d 100644
--- a/dev-python/tzlocal/tzlocal-5.0.1.ebuild
+++ b/dev-python/tzlocal/tzlocal-5.0.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} pypy3 )
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/vcrpy/Manifest b/dev-python/vcrpy/Manifest
index f7268afdd6c2..8254f4033de5 100644
--- a/dev-python/vcrpy/Manifest
+++ b/dev-python/vcrpy/Manifest
@@ -1,4 +1,6 @@
 DIST vcrpy-4.2.1.gh.tar.gz 331180 BLAKE2B 345e4c148963e2109d02be4e96986083236bd29fa8049c7cc54483f12d0506cde5c116b6f2fe80e099599b22a73e2f6240f7bb91e4a7d8af7f4e8e741097160d SHA512 59231e5164cda3099b18d099f0ef97e062e6401e52e5dfc4022aa89ca02881e9e6e3c782f12c288f5281b3b3bf175dc33a267bc6d2b40791582a1221f5d7aaab
+DIST vcrpy-4.3.0.gh.tar.gz 331605 BLAKE2B 92f995d21d986c20445ca6200778e9097fce7d4e44e8812018d5bf04b5f8f93bacf922f5332af59d3e147d6f43d8e3ab4afbbd65ba1314b760479029a64d01bd SHA512 772eb9cf23336ff961fc381a878a4e3e7a1cd81bbd6282f5a945536fd1c6b6d866fecfcfa582c9305de045e953186fea857a18d9f66012be36833d3a489b52ec
 EBUILD vcrpy-4.2.1-r1.ebuild 1667 BLAKE2B 9d68df0c82ddbfdf803a38bc83e65407a606259e9f9f5ae3a2b70da57c0bfd42144358e4e9ccfa5677e7b1bc6b36f024e31574d5751f5c0c0b36a60c22a949c0 SHA512 da8149b41c165462c6a4059a8687b87aba162d0ff12df138fb9c686b64ddc18ce320f7531701e41b4c1d2ec1d7d4de841c0113eff218f345a539117d5162be8c
 EBUILD vcrpy-4.2.1.ebuild 1592 BLAKE2B 916cf1b8db402859ea682ae08d02eec1310a222a4ed349082f7ce73cddc330c50db73e18beda03e0ff0c54e9242180c192df6bd8e6e1fe4164b381c19ac6bd09 SHA512 704a4edbacef601d7015c12fb1a70a5d64be413d3404e7f79d459ae404a4663bea3b48117b91751a42e046d7595b1cef985c841814a67df3426a7bbd7207368f
+EBUILD vcrpy-4.3.0.ebuild 1742 BLAKE2B 91d5763d7ead9d22d8f17deb7a095ce38640c3f4e8e8a501a6603c2f8ee3e9955179f690f9044ea26fa6f71ad7028f845d350e6bbf8aecccf5195eba1c1c0b14 SHA512 0fda527e1c72c290554ca9328fd461001182bd4f2d09ae8ccaf16a6ca2bd31eb5b17d73f6dfcede0efd1d5d635df563933b21623f9f4be047f39e1d74fb10c35
 MISC metadata.xml 388 BLAKE2B fd31293bd6085e6a93816a1813a8c3a9d046ed3d932fba5b32b454a71e7535606ba92815699b7ca10fc837b07a5335df54d5fae8c860a7ea88c6ea72891d0620 SHA512 0360ac6f113035ffd1991d2a42000f290c9d0a3fa8c4dac9abfde0eecafd23e1ff9929d8ee521f83a924c523992fabc5cb4353079bf7c52dac9f906a31d4da55
diff --git a/dev-python/vcrpy/vcrpy-4.3.0.ebuild b/dev-python/vcrpy/vcrpy-4.3.0.ebuild
new file mode 100644
index 000000000000..619447a5d035
--- /dev/null
+++ b/dev-python/vcrpy/vcrpy-4.3.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Automatically mock your HTTP interactions to simplify and speed up testing"
+HOMEPAGE="
+	https://github.com/kevin1024/vcrpy/
+	https://pypi.org/project/vcrpy/
+"
+SRC_URI="
+	https://github.com/kevin1024/vcrpy/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+# <urllib3-2 for https://github.com/kevin1024/vcrpy/issues/688.
+RDEPEND="
+	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	>=dev-python/six-1.5[${PYTHON_USEDEP}]
+	<dev-python/urllib3-2[${PYTHON_USEDEP}]
+	dev-python/wrapt[${PYTHON_USEDEP}]
+	dev-python/yarl[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# these tests require Internet
+		tests/integration/test_aiohttp.py
+		tests/integration/test_boto.py
+		tests/integration/test_httplib2.py::test_effective_url
+		tests/integration/test_httpx.py
+                tests/integration/test_record_mode.py::test_new_episodes_record_mode_two_times
+		tests/integration/test_urllib2.py
+		tests/integration/test_urllib3.py::test_redirects
+		tests/integration/test_wild.py::test_amazon_doctype
+		tests/integration/test_wild.py::test_flickr_should_respond_with_200
+		tests/unit/test_stubs.py::TestVCRConnection::testing_connect
+	)
+
+	local -x REQUESTS_CA_BUNDLE=$("${EPYTHON}" -m pytest_httpbin.certs)
+	epytest
+}