diff --git a/net-misc/magic-wormhole/Manifest b/net-misc/magic-wormhole/Manifest
index 31e46ce..7ab2bec 100644
--- a/net-misc/magic-wormhole/Manifest
+++ b/net-misc/magic-wormhole/Manifest
@@ -1,4 +1,4 @@
 DIST magic-wormhole-0.12.0.tar.gz 274063 BLAKE2B 6a0cddd285169373926de9da26125b34457c76e456b1bfd910baed74090900a663435b0df78e5521fd91274b111d8fad56e923832cdd430b2eb27c31d8b510e3 SHA512 141244e746b0718f2c9417e8f7de6a714b0feb051aea8c7950ea0d1bc5d2e24e922bed29544fe76aa61b06aa2ce2b5f330824017af8c6030813415e6c004c716
-EBUILD magic-wormhole-0.12.0.ebuild 1114 BLAKE2B 5328abe6b6f2cd1d6a8e31921468433ee61d8364abeb073fe3e35a8bf96254b73f8338d54f5242e30d6b7cdd7ea0dfef3d11a061c8546e6a2cc41bd0365955e9 SHA512 d6828be81123dd7e3529414656b2ac7c387d1b924cd3b2e5e11b0ac001045fd619be13310abf894c745ba021b0db3df12104710b234f59a8ce5f55f3e444789b
-EBUILD magic-wormhole-9999.ebuild 1114 BLAKE2B 5328abe6b6f2cd1d6a8e31921468433ee61d8364abeb073fe3e35a8bf96254b73f8338d54f5242e30d6b7cdd7ea0dfef3d11a061c8546e6a2cc41bd0365955e9 SHA512 d6828be81123dd7e3529414656b2ac7c387d1b924cd3b2e5e11b0ac001045fd619be13310abf894c745ba021b0db3df12104710b234f59a8ce5f55f3e444789b
+EBUILD magic-wormhole-0.12.0.ebuild 1212 BLAKE2B f73072dadd8c34a09148ecd2a9417228f2ef909e094fe2dde19c66a372ff122be8c78c025a9a89e203863d463164497066f2eaeb79f8fd7536e7f0c46c9be559 SHA512 082282e9d217e1a83d5c86102dc2a35a2ae5d882be026ec94ed670ad8c6735047a5e7ed809628cdf89dc6556b04419723b84d4786bb559d5e61bb1bab96ca0ce
+EBUILD magic-wormhole-9999.ebuild 1212 BLAKE2B f73072dadd8c34a09148ecd2a9417228f2ef909e094fe2dde19c66a372ff122be8c78c025a9a89e203863d463164497066f2eaeb79f8fd7536e7f0c46c9be559 SHA512 082282e9d217e1a83d5c86102dc2a35a2ae5d882be026ec94ed670ad8c6735047a5e7ed809628cdf89dc6556b04419723b84d4786bb559d5e61bb1bab96ca0ce
 MISC metadata.xml 388 BLAKE2B 0e9ec00a89b6cd31655c524135d7ebf389fc1266a11203ecd785870eb70b1e9d215757032c5b9d71d78b32f7d44b2d5bf245b4f25132f685705ffe0a0da20a43 SHA512 c7714f8539c1c3964e5fa43a01244a9fe894a75606abd7fc527333399a522cc94f9831962b23be3433fe7912782ae77d0ed5e088e618246f70a12cb991b29087
diff --git a/net-misc/magic-wormhole/magic-wormhole-0.12.0.ebuild b/net-misc/magic-wormhole/magic-wormhole-0.12.0.ebuild
index 30e3cdf..830e9d8 100644
--- a/net-misc/magic-wormhole/magic-wormhole-0.12.0.ebuild
+++ b/net-misc/magic-wormhole/magic-wormhole-0.12.0.ebuild
@@ -1,32 +1,37 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{5..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=bdepend
 
 inherit distutils-r1
 
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="https://github.com/magic-wormhole/magic-wormhole/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-else
+if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/magic-wormhole/magic-wormhole.git"
+else
+	SRC_URI="https://github.com/magic-wormhole/magic-wormhole/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="Safe, simple file sharing"
 HOMEPAGE="https://github.com/magic-wormhole/magic-wormhole"
 LICENSE="MIT"
 SLOT="0"
+RESTRICT="test" # Requires magic-wormhole-mailbox-server
 
+DEPEND=""
 RDEPEND="
 	>=dev-python/spake2-0.8[${PYTHON_USEDEP}]
 	dev-python/pynacl[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/twisted-17.5.0[${PYTHON_USEDEP},crypt]
+	|| (
+		>=dev-python/twisted-22.4.0-r2[${PYTHON_USEDEP},ssl]
+		>=dev-python/twisted-17.5.0[${PYTHON_USEDEP},crypt]
+	)
 	>=dev-python/autobahn-0.14.1[${PYTHON_USEDEP}]
 	dev-python/automat[${PYTHON_USEDEP}]
 	dev-python/hkdf[${PYTHON_USEDEP}]
@@ -36,5 +41,3 @@ RDEPEND="
 	>=dev-python/txtorcon-18.0.2[${PYTHON_USEDEP}]
 "
 BDEPEND=""
-
-distutils_enable_tests setup.py
diff --git a/net-misc/magic-wormhole/magic-wormhole-9999.ebuild b/net-misc/magic-wormhole/magic-wormhole-9999.ebuild
index 30e3cdf..830e9d8 100644
--- a/net-misc/magic-wormhole/magic-wormhole-9999.ebuild
+++ b/net-misc/magic-wormhole/magic-wormhole-9999.ebuild
@@ -1,32 +1,37 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{5..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=bdepend
 
 inherit distutils-r1
 
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="https://github.com/magic-wormhole/magic-wormhole/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-else
+if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/magic-wormhole/magic-wormhole.git"
+else
+	SRC_URI="https://github.com/magic-wormhole/magic-wormhole/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="Safe, simple file sharing"
 HOMEPAGE="https://github.com/magic-wormhole/magic-wormhole"
 LICENSE="MIT"
 SLOT="0"
+RESTRICT="test" # Requires magic-wormhole-mailbox-server
 
+DEPEND=""
 RDEPEND="
 	>=dev-python/spake2-0.8[${PYTHON_USEDEP}]
 	dev-python/pynacl[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/twisted-17.5.0[${PYTHON_USEDEP},crypt]
+	|| (
+		>=dev-python/twisted-22.4.0-r2[${PYTHON_USEDEP},ssl]
+		>=dev-python/twisted-17.5.0[${PYTHON_USEDEP},crypt]
+	)
 	>=dev-python/autobahn-0.14.1[${PYTHON_USEDEP}]
 	dev-python/automat[${PYTHON_USEDEP}]
 	dev-python/hkdf[${PYTHON_USEDEP}]
@@ -36,5 +41,3 @@ RDEPEND="
 	>=dev-python/txtorcon-18.0.2[${PYTHON_USEDEP}]
 "
 BDEPEND=""
-
-distutils_enable_tests setup.py