diff --git a/dev-python/nose/metadata.xml b/dev-python/nose/metadata.xml
new file mode 100644
index 000000000..b0a936895
--- /dev/null
+++ b/dev-python/nose/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>bass_dr@hotmail.com</email>
+    <name>David Racine</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">nose</remote-id>
+    <remote-id type="github">nose-devs/nose</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/zha-quirks/Manifest b/dev-python/zha-quirks/Manifest
index 101024f6d..ff8c34563 100644
--- a/dev-python/zha-quirks/Manifest
+++ b/dev-python/zha-quirks/Manifest
@@ -11,5 +11,5 @@ EBUILD zha-quirks-0.0.115.ebuild 794 BLAKE2B efef9de3b51ed8a581770190cf355b852f9
 EBUILD zha-quirks-0.0.116.ebuild 794 BLAKE2B efef9de3b51ed8a581770190cf355b852f9a913272da3bb39efa985ead87fea181409205263d20cf98bf893af39695c023864e1bca0d216758f199cbd83bdbea SHA512 1136271bef94e3a2f5a01e69d610446b0905658bac90db1e068c5ff6ea11d0c708af4b71e21d5c251b826be7382ce20aec93c9e3fd0a83a234c51206d9a5030c
 EBUILD zha-quirks-0.0.117.ebuild 794 BLAKE2B efef9de3b51ed8a581770190cf355b852f9a913272da3bb39efa985ead87fea181409205263d20cf98bf893af39695c023864e1bca0d216758f199cbd83bdbea SHA512 1136271bef94e3a2f5a01e69d610446b0905658bac90db1e068c5ff6ea11d0c708af4b71e21d5c251b826be7382ce20aec93c9e3fd0a83a234c51206d9a5030c
 EBUILD zha-quirks-0.0.122.ebuild 794 BLAKE2B efef9de3b51ed8a581770190cf355b852f9a913272da3bb39efa985ead87fea181409205263d20cf98bf893af39695c023864e1bca0d216758f199cbd83bdbea SHA512 1136271bef94e3a2f5a01e69d610446b0905658bac90db1e068c5ff6ea11d0c708af4b71e21d5c251b826be7382ce20aec93c9e3fd0a83a234c51206d9a5030c
-EBUILD zha-quirks-0.0.124.ebuild 794 BLAKE2B efef9de3b51ed8a581770190cf355b852f9a913272da3bb39efa985ead87fea181409205263d20cf98bf893af39695c023864e1bca0d216758f199cbd83bdbea SHA512 1136271bef94e3a2f5a01e69d610446b0905658bac90db1e068c5ff6ea11d0c708af4b71e21d5c251b826be7382ce20aec93c9e3fd0a83a234c51206d9a5030c
+EBUILD zha-quirks-0.0.124.ebuild 794 BLAKE2B b99e5f6322e87e964a8d456fffbf0457c403aaf76abeef1f6535089f5b0294c46ff0c6695c51a0577d55160bf28006f00df4c3d9290623978436af46071ee7d9 SHA512 609541ed4a0596236412bfc9a21708defcf81485b25e7967a41831f54b76b27c98e23d251aa131ffb189b3b49bc5a9f9ce9f33c3c509168ce28ec9af4291880b
 MISC metadata.xml 534 BLAKE2B c49399b02f69326c0660ea44e5cb09450574f11eb3157a7fc795f3418b843e2bbe009f3437e737e5c4cfcf97fde075f0bc0cd28798ed56674d06cf57cc628c48 SHA512 61c787a75e289c4d83474b7cb83278c82f421d5046fd654d438dc6223883e20ae4fcc2d086889a4782b428e125d5775f121fd79caba3bf64115547d1d1dbba4b
diff --git a/dev-python/zha-quirks/zha-quirks-0.0.124.ebuild b/dev-python/zha-quirks/zha-quirks-0.0.124.ebuild
index 594fd696c..58e4da5e5 100644
--- a/dev-python/zha-quirks/zha-quirks-0.0.124.ebuild
+++ b/dev-python/zha-quirks/zha-quirks-0.0.124.ebuild
@@ -17,7 +17,7 @@ RESTRICT="!test? ( test )"
 
 DOCS="README.md"
 
-RDEPEND=">=dev-python/zigpy-0.63.5[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/zigpy-0.70.0[${PYTHON_USEDEP}]"
 
 src_prepare() {
 	# remove dynamic-versioning
diff --git a/dev-python/zha/zha-0.0.34.ebuild b/dev-python/zha/zha-0.0.34.ebuild
index 14c224f48..d672f3f90 100644
--- a/dev-python/zha/zha-0.0.34.ebuild
+++ b/dev-python/zha/zha-0.0.34.ebuild
@@ -26,6 +26,8 @@ RDEPEND="~dev-python/zigpy-0.70.0[${PYTHON_USEDEP}]
 	~dev-python/zigpy-zigate-0.13.1[${PYTHON_USEDEP}]
 	~dev-python/zha-quirks-0.0.124[${PYTHON_USEDEP}]
 	~dev-python/pyserial-3.5[${PYTHON_USEDEP}]
-	dev-python/pyserial-asyncio-fast[${PYTHON_USEDEP}]"
+	dev-python/pyserial-asyncio-fast[${PYTHON_USEDEP}]
+	dev-python/voluptuous[${PYTHON_USEDEP}]
+"
 
 distutils_enable_tests pytest
diff --git a/dev-python/zigpy-znp/Manifest b/dev-python/zigpy-znp/Manifest
index dbbd9c4df..710b95807 100644
--- a/dev-python/zigpy-znp/Manifest
+++ b/dev-python/zigpy-znp/Manifest
@@ -5,5 +5,5 @@ DIST zigpy_znp-0.13.0.tar.gz 117268 BLAKE2B fe9cb2043deb6ff54bf0a7a4d9fdd1c292d5
 EBUILD zigpy-znp-0.12.1.ebuild 1307 BLAKE2B c744b6df8c0e35cd15ada25dbf3c1fc5f23fbb3d24283b524a55d712dafaa3cfd89573ba6443f68822113047d6b1d62b668998375c6585e74826718474a96da9 SHA512 63347746bacdeedb999a4a806cd9d5f3c62403fcd970137e75b207c71a77740e8259900e00181e604de3530f83a1acc85f040325639e48ab82a9b3e9a66833e7
 EBUILD zigpy-znp-0.12.2.ebuild 1325 BLAKE2B a3d9191a7dffc9ceeaf9dbfab8c6724b6faf44437ededf926e44d5d50043f96f224dcb986d25b0e3e5da5b5a5f4c27602feaf2dc01a13c16e8043bd648f644ea SHA512 e37d5bf0a641dc113f8488127a250800f363ef76635c9a968afce529daece363f0c9fa231351ece1df29357dd6c7d732ac7fe27de32d4f12ee718347851df7dc
 EBUILD zigpy-znp-0.12.4.ebuild 1287 BLAKE2B e9822df24725a5f2ebc9ac3cc11d5784d36aea4ef4e96e05e2c226bcffb4eaeed60dedf9e90ae516d46537445c6c3f4f04d234edae885d4a8129544efa679540 SHA512 965bc7f562ed3e28520514037d13b9d8d27b672c9b80125f4bcea6a2177a021c015f41772ade5261828a445381cf5e49b0edd45dbec5065cde8468beae3cc467
-EBUILD zigpy-znp-0.13.0.ebuild 1287 BLAKE2B 20d7bca0e6d29a0fbb4ee2e2e4b7cec69a68418bb180c99017ae9dca3ff34f5d692269f0da4a4d232f7e17160637d90876a29a85151ce38b31280a1b2238e18e SHA512 bbb3f6380b072c7e07dc32d117abfc076dcd7c7e67f825364db607fada09911e6327bd9cc6a38a667579696e987f441217877f66c35de255a4c050cc95856c9c
+EBUILD zigpy-znp-0.13.0.ebuild 1303 BLAKE2B e8cd73a7328edc8b41675190c550c9c322cd658f945d6d101e8ec0927b1012125b5967756efb59dd684bdc932b87cc401a5fc557329f654c029f4373d630880d SHA512 1dc82f037eb2aaaef288799029e0ee6180ad8391baef9db59babd30bc2a0ebd0206e0b09fcc9cbd699b765107f8526c0aea8b76dd48fe5b3eca1706fd44b1372
 MISC metadata.xml 519 BLAKE2B d6c1f99a4aa6bab7bcf09908aecd3c0912693da76815801656edfa7d84f1d2202077450be9a31937ce62ecbe6371249f5d41441e3846819a9a158a3cd000c541 SHA512 bdfae4a2621cd7fe444c7ced55703ffd01f510aca43e4e38756fa8aa84cb44a5abf86d718ab2bc70c50973122cda4ab3b915e1d1bdfae01a265aa91cdb73cef7
diff --git a/dev-python/zigpy-znp/zigpy-znp-0.13.0.ebuild b/dev-python/zigpy-znp/zigpy-znp-0.13.0.ebuild
index 995f640b2..9650b8a1e 100644
--- a/dev-python/zigpy-znp/zigpy-znp-0.13.0.ebuild
+++ b/dev-python/zigpy-znp/zigpy-znp-0.13.0.ebuild
@@ -19,10 +19,12 @@ RESTRICT="!test? ( test )"
 DOCS="README.md"
 
 RDEPEND=">=dev-python/zigpy-0.69.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/async-timeout[${PYTHON_USEDEP}]' python3_10)
 	dev-python/voluptuous[${PYTHON_USEDEP}]
 	dev-python/coloredlogs[${PYTHON_USEDEP}]
-	dev-python/jsonschema[${PYTHON_USEDEP}]"
+	dev-python/jsonschema[${PYTHON_USEDEP}]
+	dev-python/pyserial-asyncio[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+"
 BDEPEND="
 	test? (
 		dev-python/pytest-asyncio[${PYTHON_USEDEP}]