Rename {www-servers → dev-python}/tornado

Closes: https://github.com/gentoo/gentoo/pull/27452
Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>

56 files changed, 79 insertions, 74 deletions

diff --git a/app-emacs/emacs-ipython-notebook/emacs-ipython-notebook-0.17.0_p20220419.ebuild b/app-emacs/emacs-ipython-notebook/emacs-ipython-notebook-0.17.0_p20220419.ebuild
index c920c630fbc1..e04873c402a4 100644
--- a/app-emacs/emacs-ipython-notebook/emacs-ipython-notebook-0.17.0_p20220419.ebuild
+++ b/app-emacs/emacs-ipython-notebook/emacs-ipython-notebook-0.17.0_p20220419.ebuild
@@ -32,7 +32,7 @@ RDEPEND="
 	app-emacs/with-editor
 	dev-python/ipython
 	dev-python/notebook
-	www-servers/tornado
+	dev-python/tornado
 "
 BDEPEND="
 	${RDEPEND}
diff --git a/dev-python/APScheduler/APScheduler-3.9.1.ebuild b/dev-python/APScheduler/APScheduler-3.9.1.ebuild
index 03e50a1598da..c531f16b1154 100644
--- a/dev-python/APScheduler/APScheduler-3.9.1.ebuild
+++ b/dev-python/APScheduler/APScheduler-3.9.1.ebuild
@@ -25,7 +25,7 @@ BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/sqlalchemy[${PYTHON_USEDEP}]
-		www-servers/tornado[${PYTHON_USEDEP}]
+		dev-python/tornado[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/httpretty/httpretty-1.1.4-r1.ebuild b/dev-python/httpretty/httpretty-1.1.4-r1.ebuild
index 3be1736725d2..9e3209dc9778 100644
--- a/dev-python/httpretty/httpretty-1.1.4-r1.ebuild
+++ b/dev-python/httpretty/httpretty-1.1.4-r1.ebuild
@@ -27,7 +27,7 @@ BDEPEND="
 		dev-python/freezegun[${PYTHON_USEDEP}]
 		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
 		dev-python/sure[${PYTHON_USEDEP}]
-		>=www-servers/tornado-2.2[${PYTHON_USEDEP}]
+		>=dev-python/tornado-2.2[${PYTHON_USEDEP}]
 	)
 "
 # These are optional test deps, that are used to test compatibility
diff --git a/dev-python/ipykernel/ipykernel-6.15.1.ebuild b/dev-python/ipykernel/ipykernel-6.15.1.ebuild
index 01c1b618e4b0..6f23f0b53b04 100644
--- a/dev-python/ipykernel/ipykernel-6.15.1.ebuild
+++ b/dev-python/ipykernel/ipykernel-6.15.1.ebuild
@@ -26,8 +26,8 @@ RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
 	dev-python/psutil[${PYTHON_USEDEP}]
 	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
 	>=dev-python/traitlets-5.1.0[${PYTHON_USEDEP}]
-	>=www-servers/tornado-6.1[${PYTHON_USEDEP}]
 "
 # RDEPEND seems specifically needed in BDEPEND, at least jupyter
 # bug #816486
diff --git a/dev-python/ipykernel/ipykernel-6.15.2.ebuild b/dev-python/ipykernel/ipykernel-6.15.2.ebuild
index 5526cde6276c..4485f7c332b0 100644
--- a/dev-python/ipykernel/ipykernel-6.15.2.ebuild
+++ b/dev-python/ipykernel/ipykernel-6.15.2.ebuild
@@ -26,8 +26,8 @@ RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
 	dev-python/psutil[${PYTHON_USEDEP}]
 	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
 	>=dev-python/traitlets-5.1.0[${PYTHON_USEDEP}]
-	>=www-servers/tornado-6.1[${PYTHON_USEDEP}]
 "
 # RDEPEND seems specifically needed in BDEPEND, at least jupyter
 # bug #816486
diff --git a/dev-python/ipykernel/ipykernel-6.15.3.ebuild b/dev-python/ipykernel/ipykernel-6.15.3.ebuild
index 5526cde6276c..4485f7c332b0 100644
--- a/dev-python/ipykernel/ipykernel-6.15.3.ebuild
+++ b/dev-python/ipykernel/ipykernel-6.15.3.ebuild
@@ -26,8 +26,8 @@ RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
 	dev-python/psutil[${PYTHON_USEDEP}]
 	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
 	>=dev-python/traitlets-5.1.0[${PYTHON_USEDEP}]
-	>=www-servers/tornado-6.1[${PYTHON_USEDEP}]
 "
 # RDEPEND seems specifically needed in BDEPEND, at least jupyter
 # bug #816486
diff --git a/dev-python/ipyparallel/ipyparallel-8.4.1.ebuild b/dev-python/ipyparallel/ipyparallel-8.4.1.ebuild
index 4569cb19656b..b88f0a324b5d 100644
--- a/dev-python/ipyparallel/ipyparallel-8.4.1.ebuild
+++ b/dev-python/ipyparallel/ipyparallel-8.4.1.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
 	dev-python/psutil[${PYTHON_USEDEP}]
 	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
 	dev-python/tqdm[${PYTHON_USEDEP}]
-	>=www-servers/tornado-5.1[${PYTHON_USEDEP}]
+	>=dev-python/tornado-5.1[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	dev-python/flit_core[${PYTHON_USEDEP}]
diff --git a/dev-python/ipython/metadata.xml b/dev-python/ipython/metadata.xml
index eb1747e74a7a..3a2823a1514b 100644
--- a/dev-python/ipython/metadata.xml
+++ b/dev-python/ipython/metadata.xml
@@ -44,7 +44,7 @@
   <stabilize-allarches/>
   <use>
     <flag name="matplotlib">Add support for <pkg>dev-python/matplotlib</pkg></flag>
-    <flag name="notebook">Install requirements for the web notebook based on <pkg>www-servers/tornado</pkg></flag>
+    <flag name="notebook">Install requirements for the web notebook based on <pkg>dev-python/tornado</pkg></flag>
     <flag name="nbconvert">Enable support for converting notebooks to various formats using <pkg>app-text/pandoc</pkg></flag>
   </use>
   <upstream>
diff --git a/dev-python/jupyter_client/jupyter_client-7.3.4.ebuild b/dev-python/jupyter_client/jupyter_client-7.3.4.ebuild
index 4ee8e59fa00b..9cc24cba4825 100644
--- a/dev-python/jupyter_client/jupyter_client-7.3.4.ebuild
+++ b/dev-python/jupyter_client/jupyter_client-7.3.4.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 	>=dev-python/nest_asyncio-1.5.4[${PYTHON_USEDEP}]
 	>=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
 	>=dev-python/pyzmq-23.0[${PYTHON_USEDEP}]
-	>=www-servers/tornado-6.0[${PYTHON_USEDEP}]
+	>=dev-python/tornado-6.0[${PYTHON_USEDEP}]
 	dev-python/traitlets[${PYTHON_USEDEP}]
 "
 BDEPEND="
diff --git a/dev-python/jupyter_client/jupyter_client-7.3.5.ebuild b/dev-python/jupyter_client/jupyter_client-7.3.5.ebuild
index 4ee8e59fa00b..9cc24cba4825 100644
--- a/dev-python/jupyter_client/jupyter_client-7.3.5.ebuild
+++ b/dev-python/jupyter_client/jupyter_client-7.3.5.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 	>=dev-python/nest_asyncio-1.5.4[${PYTHON_USEDEP}]
 	>=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
 	>=dev-python/pyzmq-23.0[${PYTHON_USEDEP}]
-	>=www-servers/tornado-6.0[${PYTHON_USEDEP}]
+	>=dev-python/tornado-6.0[${PYTHON_USEDEP}]
 	dev-python/traitlets[${PYTHON_USEDEP}]
 "
 BDEPEND="
diff --git a/dev-python/jupyter_server/jupyter_server-1.18.1.ebuild b/dev-python/jupyter_server/jupyter_server-1.18.1.ebuild
index 248b7cd68bc2..0e0ef8e39a69 100644
--- a/dev-python/jupyter_server/jupyter_server-1.18.1.ebuild
+++ b/dev-python/jupyter_server/jupyter_server-1.18.1.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
 	dev-python/send2trash[${PYTHON_USEDEP}]
 	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
-	>=www-servers/tornado-6.1[${PYTHON_USEDEP}]
+	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
 	>=dev-python/traitlets-5.1[${PYTHON_USEDEP}]
 	dev-python/websocket-client[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/jupyterlab/jupyterlab-3.4.3.ebuild b/dev-python/jupyterlab/jupyterlab-3.4.3.ebuild
index 81758028c37a..468fce76111b 100644
--- a/dev-python/jupyterlab/jupyterlab-3.4.3.ebuild
+++ b/dev-python/jupyterlab/jupyterlab-3.4.3.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	>=dev-python/jupyter_server-1.16[${PYTHON_USEDEP}]
 	>=dev-python/nbclassic-0.2[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	>=www-servers/tornado-6.1[${PYTHON_USEDEP}]
+	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
 	net-libs/nodejs
 "
 
diff --git a/dev-python/jupyterlab/jupyterlab-3.4.5.ebuild b/dev-python/jupyterlab/jupyterlab-3.4.5.ebuild
index 97957acc4923..cb22fbf24c58 100644
--- a/dev-python/jupyterlab/jupyterlab-3.4.5.ebuild
+++ b/dev-python/jupyterlab/jupyterlab-3.4.5.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 	>=dev-python/nbclassic-0.2[${PYTHON_USEDEP}]
 	<dev-python/notebook-7[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	>=www-servers/tornado-6.1[${PYTHON_USEDEP}]
+	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
 	net-libs/nodejs
 "
 
diff --git a/dev-python/jupyterlab/jupyterlab-3.4.7.ebuild b/dev-python/jupyterlab/jupyterlab-3.4.7.ebuild
index 9d8ac6c3af51..614ce60951f0 100644
--- a/dev-python/jupyterlab/jupyterlab-3.4.7.ebuild
+++ b/dev-python/jupyterlab/jupyterlab-3.4.7.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 	>=dev-python/nbclassic-0.2[${PYTHON_USEDEP}]
 	<dev-python/notebook-7[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	>=www-servers/tornado-6.1[${PYTHON_USEDEP}]
+	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
 	dev-python/tomli[${PYTHON_USEDEP}]
 	net-libs/nodejs
 "
diff --git a/dev-python/livereload/livereload-2.6.3.ebuild b/dev-python/livereload/livereload-2.6.3.ebuild
index 276ed7291d94..d84061e801a8 100644
--- a/dev-python/livereload/livereload-2.6.3.ebuild
+++ b/dev-python/livereload/livereload-2.6.3.ebuild
@@ -20,7 +20,7 @@ IUSE="examples"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
+	dev-python/tornado[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/matplotlib/matplotlib-3.5.1-r2.ebuild b/dev-python/matplotlib/matplotlib-3.5.1-r2.ebuild
index ce449939b282..af0fa9dd9ef1 100644
--- a/dev-python/matplotlib/matplotlib-3.5.1-r2.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.5.1-r2.ebuild
@@ -69,7 +69,7 @@ RDEPEND="
 		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
 	)
 	webagg? (
-		>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
+		>=dev-python/tornado-6.0.4[${PYTHON_USEDEP}]
 	)
 	wxwidgets? (
 		dev-python/wxpython:*[${PYTHON_USEDEP}]
@@ -102,7 +102,7 @@ BDEPEND="
 		dev-python/flaky[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
 		>=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}]
-		>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
+		>=dev-python/tornado-6.0.4[${PYTHON_USEDEP}]
 		x11-libs/gtk+:3[introspection]
 	)
 "
diff --git a/dev-python/matplotlib/matplotlib-3.5.2-r3.ebuild b/dev-python/matplotlib/matplotlib-3.5.2-r3.ebuild
index 490ee1bc6338..841c96b346dd 100644
--- a/dev-python/matplotlib/matplotlib-3.5.2-r3.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.5.2-r3.ebuild
@@ -77,7 +77,7 @@ RDEPEND="
 		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
 	)
 	webagg? (
-		>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
+		>=dev-python/tornado-6.0.4[${PYTHON_USEDEP}]
 	)
 	wxwidgets? (
 		$(python_gen_cond_dep '
@@ -113,7 +113,7 @@ BDEPEND="
 		dev-python/psutil[${PYTHON_USEDEP}]
 		dev-python/pytest-xdist[${PYTHON_USEDEP}]
 		>=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}]
-		>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
+		>=dev-python/tornado-6.0.4[${PYTHON_USEDEP}]
 		x11-libs/gtk+:3[introspection]
 	)
 "
diff --git a/dev-python/matplotlib/matplotlib-3.5.3.ebuild b/dev-python/matplotlib/matplotlib-3.5.3.ebuild
index 8f209f888d35..161714fd0fee 100644
--- a/dev-python/matplotlib/matplotlib-3.5.3.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.5.3.ebuild
@@ -77,7 +77,7 @@ RDEPEND="
 		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
 	)
 	webagg? (
-		>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
+		>=dev-python/tornado-6.0.4[${PYTHON_USEDEP}]
 	)
 	wxwidgets? (
 		$(python_gen_cond_dep '
@@ -113,7 +113,7 @@ BDEPEND="
 		dev-python/psutil[${PYTHON_USEDEP}]
 		dev-python/pytest-xdist[${PYTHON_USEDEP}]
 		>=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}]
-		>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
+		>=dev-python/tornado-6.0.4[${PYTHON_USEDEP}]
 		x11-libs/gtk+:3[introspection]
 	)
 "
diff --git a/dev-python/matplotlib/matplotlib-3.6.0.ebuild b/dev-python/matplotlib/matplotlib-3.6.0.ebuild
index 04f16eca8176..b2a3cf0ea028 100644
--- a/dev-python/matplotlib/matplotlib-3.6.0.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.6.0.ebuild
@@ -78,7 +78,7 @@ RDEPEND="
 		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
 	)
 	webagg? (
-		>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
+		>=dev-python/tornado-6.0.4[${PYTHON_USEDEP}]
 	)
 	wxwidgets? (
 		$(python_gen_cond_dep '
@@ -114,7 +114,7 @@ BDEPEND="
 		dev-python/psutil[${PYTHON_USEDEP}]
 		dev-python/pytest-xdist[${PYTHON_USEDEP}]
 		>=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}]
-		>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
+		>=dev-python/tornado-6.0.4[${PYTHON_USEDEP}]
 		x11-libs/gtk+:3[introspection]
 	)
 "
diff --git a/dev-python/matplotlib/metadata.xml b/dev-python/matplotlib/metadata.xml
index a175feb0f0c1..5792b1da5a09 100644
--- a/dev-python/matplotlib/metadata.xml
+++ b/dev-python/matplotlib/metadata.xml
@@ -18,7 +18,7 @@
 	<use>
 		<flag name="excel">Pull <pkg>dev-python/xlwt</pkg> for the exceltools toolkit</flag>
 		<flag name="gtk3">Enable <pkg>x11-libs/gtk+</pkg>:3 support</flag>
-		<flag name="webagg">Enable webagg backend that uses <pkg>www-servers/tornado</pkg></flag>
+		<flag name="webagg">Enable webagg backend that uses <pkg>dev-python/tornado</pkg></flag>
 	</use>
 	<upstream>
 		<remote-id type="pypi">matplotlib</remote-id>
diff --git a/dev-python/nbconvert/nbconvert-6.5.0-r1.ebuild b/dev-python/nbconvert/nbconvert-6.5.0-r1.ebuild
index 548aa27d3dad..0a9ebc0e58e4 100644
--- a/dev-python/nbconvert/nbconvert-6.5.0-r1.ebuild
+++ b/dev-python/nbconvert/nbconvert-6.5.0-r1.ebuild
@@ -38,7 +38,7 @@ RDEPEND="
 	dev-python/pygments[${PYTHON_USEDEP}]
 	>=dev-python/traitlets-5.1.1[${PYTHON_USEDEP}]
 	dev-python/testpath[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
+	dev-python/tornado[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? (
diff --git a/dev-python/nbconvert/nbconvert-6.5.0-r2.ebuild b/dev-python/nbconvert/nbconvert-6.5.0-r2.ebuild
index fdd88a6b9676..52693ee1d0c2 100644
--- a/dev-python/nbconvert/nbconvert-6.5.0-r2.ebuild
+++ b/dev-python/nbconvert/nbconvert-6.5.0-r2.ebuild
@@ -39,7 +39,7 @@ RDEPEND="
 	dev-python/tinycss2[${PYTHON_USEDEP}]
 	>=dev-python/traitlets-5.1.1[${PYTHON_USEDEP}]
 	dev-python/testpath[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
+	dev-python/tornado[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? (
diff --git a/dev-python/nbconvert/nbconvert-6.5.2.ebuild b/dev-python/nbconvert/nbconvert-6.5.2.ebuild
index c906c6a98bbc..b5c2270cc569 100644
--- a/dev-python/nbconvert/nbconvert-6.5.2.ebuild
+++ b/dev-python/nbconvert/nbconvert-6.5.2.ebuild
@@ -40,7 +40,7 @@ RDEPEND="
 	dev-python/tinycss2[${PYTHON_USEDEP}]
 	>=dev-python/traitlets-5.1.1[${PYTHON_USEDEP}]
 	dev-python/testpath[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
+	dev-python/tornado[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? (
diff --git a/dev-python/nbconvert/nbconvert-6.5.3.ebuild b/dev-python/nbconvert/nbconvert-6.5.3.ebuild
index c906c6a98bbc..b5c2270cc569 100644
--- a/dev-python/nbconvert/nbconvert-6.5.3.ebuild
+++ b/dev-python/nbconvert/nbconvert-6.5.3.ebuild
@@ -40,7 +40,7 @@ RDEPEND="
 	dev-python/tinycss2[${PYTHON_USEDEP}]
 	>=dev-python/traitlets-5.1.1[${PYTHON_USEDEP}]
 	dev-python/testpath[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
+	dev-python/tornado[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? (
diff --git a/dev-python/nbdime/nbdime-3.1.1-r1.ebuild b/dev-python/nbdime/nbdime-3.1.1-r1.ebuild
index f4d2cdfa60ff..54632f0dad36 100644
--- a/dev-python/nbdime/nbdime-3.1.1-r1.ebuild
+++ b/dev-python/nbdime/nbdime-3.1.1-r1.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	dev-python/nbformat[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
+	dev-python/tornado[${PYTHON_USEDEP}]
 	webtools? ( net-libs/nodejs[npm] )"
 BDEPEND="
 	test? (
diff --git a/dev-python/notebook/notebook-6.4.12.ebuild b/dev-python/notebook/notebook-6.4.12.ebuild
index 3de25560fa62..98ff3257518f 100644
--- a/dev-python/notebook/notebook-6.4.12.ebuild
+++ b/dev-python/notebook/notebook-6.4.12.ebuild
@@ -22,7 +22,7 @@ RDEPEND="
 	dev-python/argon2-cffi[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]
 	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
-	>=www-servers/tornado-6.0[${PYTHON_USEDEP}]
+	>=dev-python/tornado-6.0[${PYTHON_USEDEP}]
 	dev-python/ipython_genutils[${PYTHON_USEDEP}]
 	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
 	>=dev-python/jupyter_core-4.6.1[${PYTHON_USEDEP}]
diff --git a/dev-python/pika/pika-1.3.0.ebuild b/dev-python/pika/pika-1.3.0.ebuild
index df253c49a033..9b54a2928c76 100644
--- a/dev-python/pika/pika-1.3.0.ebuild
+++ b/dev-python/pika/pika-1.3.0.ebuild
@@ -28,7 +28,7 @@ BDEPEND="
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/nose2[${PYTHON_USEDEP}]
 		dev-python/twisted[${PYTHON_USEDEP}]
-		www-servers/tornado[${PYTHON_USEDEP}]
+		dev-python/tornado[${PYTHON_USEDEP}]
 		net-misc/rabbitmq-server
 	)
 "
diff --git a/dev-python/pypugjs/pypugjs-5.9.11.ebuild b/dev-python/pypugjs/pypugjs-5.9.11.ebuild
index 9e4b4ca3d236..b2806c1c31a9 100644
--- a/dev-python/pypugjs/pypugjs-5.9.11.ebuild
+++ b/dev-python/pypugjs/pypugjs-5.9.11.ebuild
@@ -25,7 +25,7 @@ BDEPEND="
 		dev-python/django[${PYTHON_USEDEP}]
 		>=dev-python/jinja-3.1.1[${PYTHON_USEDEP}]
 		>=dev-python/mako-1.1.3[${PYTHON_USEDEP}]
-		>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
+		>=dev-python/tornado-6.0.4[${PYTHON_USEDEP}]
 	)
 "
 
@@ -41,5 +41,5 @@ pkg_postinst() {
 	optfeature "converting to Django output" dev-python/django
 	optfeature "converting to Jinja2 output" dev-python/jinja
 	optfeature "converting to Mako output" dev-python/mako
-	optfeature "converting to Tornado output" www-servers/tornado
+	optfeature "converting to Tornado output" dev-python/tornado
 }
diff --git a/dev-python/pypugjs/pypugjs-5.9.12.ebuild b/dev-python/pypugjs/pypugjs-5.9.12.ebuild
index 3e6a897c9a36..06a9bc7303e0 100644
--- a/dev-python/pypugjs/pypugjs-5.9.12.ebuild
+++ b/dev-python/pypugjs/pypugjs-5.9.12.ebuild
@@ -28,7 +28,7 @@ BDEPEND="
 		dev-python/django[${PYTHON_USEDEP}]
 		>=dev-python/jinja-3.1.1[${PYTHON_USEDEP}]
 		>=dev-python/mako-1.1.3[${PYTHON_USEDEP}]
-		>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
+		>=dev-python/tornado-6.0.4[${PYTHON_USEDEP}]
 	)
 "
 
@@ -44,5 +44,5 @@ pkg_postinst() {
 	optfeature "converting to Django output" dev-python/django
 	optfeature "converting to Jinja2 output" dev-python/jinja
 	optfeature "converting to Mako output" dev-python/mako
-	optfeature "converting to Tornado output" www-servers/tornado
+	optfeature "converting to Tornado output" dev-python/tornado
 }
diff --git a/dev-python/pytest-salt/pytest-salt-2020.1.27-r3.ebuild b/dev-python/pytest-salt/pytest-salt-2020.1.27-r3.ebuild
index 22e46b7878fb..3548c336d99d 100644
--- a/dev-python/pytest-salt/pytest-salt-2020.1.27-r3.ebuild
+++ b/dev-python/pytest-salt/pytest-salt-2020.1.27-r3.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 	dev-python/msgpack[${PYTHON_USEDEP}]
 	|| (
 		app-admin/salt[${PYTHON_USEDEP}]
-		www-servers/tornado[${PYTHON_USEDEP}]
+		dev-python/tornado[${PYTHON_USEDEP}]
 	)
 "
 #BDEPEND="
diff --git a/dev-python/pytest-tornado/pytest-tornado-0.8.1.ebuild b/dev-python/pytest-tornado/pytest-tornado-0.8.1.ebuild
index 65f1e345f8e8..da233a41fd81 100644
--- a/dev-python/pytest-tornado/pytest-tornado-0.8.1.ebuild
+++ b/dev-python/pytest-tornado/pytest-tornado-0.8.1.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/pytest-3.6[${PYTHON_USEDEP}]
-	>=www-servers/tornado-5[${PYTHON_USEDEP}]
+	>=dev-python/tornado-5[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests --install pytest
diff --git a/dev-python/pytest-tornasync/pytest-tornasync-0.6.0_p2.ebuild b/dev-python/pytest-tornasync/pytest-tornasync-0.6.0_p2.ebuild
index 729ab8e9b9f8..704beda689ac 100644
--- a/dev-python/pytest-tornasync/pytest-tornasync-0.6.0_p2.ebuild
+++ b/dev-python/pytest-tornasync/pytest-tornasync-0.6.0_p2.ebuild
@@ -22,7 +22,7 @@ RESTRICT="test"
 
 RDEPEND="
 	>=dev-python/pytest-3.0[${PYTHON_USEDEP}]
-	>=www-servers/tornado-5.0[${PYTHON_USEDEP}]
+	>=dev-python/tornado-5.0[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/python-engineio/python-engineio-4.3.2-r2.ebuild b/dev-python/python-engineio/python-engineio-4.3.2-r2.ebuild
index 60800b43a242..0ffd329ab1cf 100644
--- a/dev-python/python-engineio/python-engineio-4.3.2-r2.ebuild
+++ b/dev-python/python-engineio/python-engineio-4.3.2-r2.ebuild
@@ -35,8 +35,8 @@ BDEPEND="
 		' python3_{8,9} )
 
 		dev-python/gevent[${PYTHON_USEDEP}]
+		dev-python/tornado[${PYTHON_USEDEP}]
 		dev-python/websockets[${PYTHON_USEDEP}]
-		www-servers/tornado[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/python-engineio/python-engineio-4.3.3.ebuild b/dev-python/python-engineio/python-engineio-4.3.3.ebuild
index 3853dc3895da..11eb015d2d1d 100644
--- a/dev-python/python-engineio/python-engineio-4.3.3.ebuild
+++ b/dev-python/python-engineio/python-engineio-4.3.3.ebuild
@@ -36,8 +36,8 @@ BDEPEND="
 		' python3_{8,9} )
 
 		dev-python/gevent[${PYTHON_USEDEP}]
+		dev-python/tornado[${PYTHON_USEDEP}]
 		dev-python/websockets[${PYTHON_USEDEP}]
-		www-servers/tornado[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/python-engineio/python-engineio-4.3.4.ebuild b/dev-python/python-engineio/python-engineio-4.3.4.ebuild
index f9c4a5c25eb8..894a35d40699 100644
--- a/dev-python/python-engineio/python-engineio-4.3.4.ebuild
+++ b/dev-python/python-engineio/python-engineio-4.3.4.ebuild
@@ -36,8 +36,8 @@ BDEPEND="
 		' python3_{8,9} )
 
 		dev-python/gevent[${PYTHON_USEDEP}]
+		dev-python/tornado[${PYTHON_USEDEP}]
 		dev-python/websockets[${PYTHON_USEDEP}]
-		www-servers/tornado[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/pyzmq/pyzmq-23.2.1.ebuild b/dev-python/pyzmq/pyzmq-23.2.1.ebuild
index 1cbc07ae90f5..07cca1f5054e 100644
--- a/dev-python/pyzmq/pyzmq-23.2.1.ebuild
+++ b/dev-python/pyzmq/pyzmq-23.2.1.ebuild
@@ -41,7 +41,7 @@ BDEPEND="
 	' 'python*')
 	test? (
 		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		>=www-servers/tornado-5.0.2[${PYTHON_USEDEP}]
+		>=dev-python/tornado-5.0.2[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/pyzmq/pyzmq-24.0.1.ebuild b/dev-python/pyzmq/pyzmq-24.0.1.ebuild
index d68843bf062b..0219c53cc986 100644
--- a/dev-python/pyzmq/pyzmq-24.0.1.ebuild
+++ b/dev-python/pyzmq/pyzmq-24.0.1.ebuild
@@ -41,7 +41,7 @@ BDEPEND="
 	' 'python*')
 	test? (
 		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		>=www-servers/tornado-5.0.2[${PYTHON_USEDEP}]
+		>=dev-python/tornado-5.0.2[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.8.0-r1.ebuild b/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.8.0-r1.ebuild
index e4822f5f221d..e46606416ebe 100644
--- a/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.8.0-r1.ebuild
+++ b/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.8.0-r1.ebuild
@@ -31,7 +31,7 @@ BDEPEND="
 	test? (
 		dev-python/flask[${PYTHON_USEDEP}]
 		dev-python/bottle[${PYTHON_USEDEP}]
-		www-servers/tornado[${PYTHON_USEDEP}]
+		dev-python/tornado[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/spyder-terminal/spyder-terminal-1.2.2.ebuild b/dev-python/spyder-terminal/spyder-terminal-1.2.2.ebuild
index a0e0411785d2..bd6f33dc05fb 100644
--- a/dev-python/spyder-terminal/spyder-terminal-1.2.2.ebuild
+++ b/dev-python/spyder-terminal/spyder-terminal-1.2.2.ebuild
@@ -20,5 +20,5 @@ RDEPEND="
 	dev-python/requests[${PYTHON_USEDEP}]
 	>=dev-python/spyder-5.2.0[${PYTHON_USEDEP}]
 	>=dev-python/terminado-0.13.1[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
+	dev-python/tornado[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/tenacity/tenacity-8.0.1-r1.ebuild b/dev-python/tenacity/tenacity-8.0.1-r1.ebuild
index d868c572a81c..763a7ee97acb 100644
--- a/dev-python/tenacity/tenacity-8.0.1-r1.ebuild
+++ b/dev-python/tenacity/tenacity-8.0.1-r1.ebuild
@@ -22,7 +22,7 @@ KEYWORDS="amd64 ~arm64 ~riscv x86"
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	test? (
-		www-servers/tornado[${PYTHON_USEDEP}]
+		dev-python/tornado[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/tenacity/tenacity-8.1.0.ebuild b/dev-python/tenacity/tenacity-8.1.0.ebuild
index f26d4e37358c..052487637fd9 100644
--- a/dev-python/tenacity/tenacity-8.1.0.ebuild
+++ b/dev-python/tenacity/tenacity-8.1.0.ebuild
@@ -22,7 +22,7 @@ KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	test? (
-		www-servers/tornado[${PYTHON_USEDEP}]
+		dev-python/tornado[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/terminado/terminado-0.15.0.ebuild b/dev-python/terminado/terminado-0.15.0.ebuild
index 5c0f71ce8180..a8e9bd88c2a7 100644
--- a/dev-python/terminado/terminado-0.15.0.ebuild
+++ b/dev-python/terminado/terminado-0.15.0.ebuild
@@ -21,7 +21,7 @@ KEYWORDS="amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd
 
 RDEPEND="
 	dev-python/ptyprocess[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
+	dev-python/tornado[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/thriftpy2/thriftpy2-0.4.14-r1.ebuild b/dev-python/thriftpy2/thriftpy2-0.4.14-r1.ebuild
index d71392dd16a7..635c852ae836 100644
--- a/dev-python/thriftpy2/thriftpy2-0.4.14-r1.ebuild
+++ b/dev-python/thriftpy2/thriftpy2-0.4.14-r1.ebuild
@@ -20,7 +20,7 @@ BDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		www-servers/tornado[${PYTHON_USEDEP}]
+		dev-python/tornado[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/www-servers/tornado/Manifest b/dev-python/tornado/Manifest
index 76ef193658e1..76ef193658e1 100644
--- a/www-servers/tornado/Manifest
+++ b/dev-python/tornado/Manifest
diff --git a/www-servers/tornado/metadata.xml b/dev-python/tornado/metadata.xml
index 990b39b886fd..990b39b886fd 100644
--- a/www-servers/tornado/metadata.xml
+++ b/dev-python/tornado/metadata.xml
diff --git a/www-servers/tornado/tornado-6.2.ebuild b/dev-python/tornado/tornado-6.2.ebuild
index eb50d15d6c03..eb50d15d6c03 100644
--- a/www-servers/tornado/tornado-6.2.ebuild
+++ b/dev-python/tornado/tornado-6.2.ebuild
diff --git a/dev-python/urllib3/urllib3-1.26.12.ebuild b/dev-python/urllib3/urllib3-1.26.12.ebuild
index 9f87338afe5a..5a13659e40eb 100644
--- a/dev-python/urllib3/urllib3-1.26.12.ebuild
+++ b/dev-python/urllib3/urllib3-1.26.12.ebuild
@@ -40,8 +40,8 @@ BDEPEND="
 			dev-python/mock[\${PYTHON_USEDEP}]
 			dev-python/pytest[\${PYTHON_USEDEP}]
 			dev-python/pytest-freezegun[\${PYTHON_USEDEP}]
+			>=dev-python/tornado-4.2.1[\${PYTHON_USEDEP}]
 			>=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}]
-			>=www-servers/tornado-4.2.1[\${PYTHON_USEDEP}]
 		" python3_{8..11})
 	)
 "
diff --git a/dev-python/ws4py/ws4py-0.5.1-r1.ebuild b/dev-python/ws4py/ws4py-0.5.1-r1.ebuild
index dbf1c8a54b9f..7313ee949cf5 100644
--- a/dev-python/ws4py/ws4py-0.5.1-r1.ebuild
+++ b/dev-python/ws4py/ws4py-0.5.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 # We could depend on dev-python/cherrypy when USE=server, but
 # that is an optional component ...
-# Same for www-servers/tornado and USE=client ... so why not???
+# Same for dev-python/tornado and USE=client ... so why not???
 # pypy is viable but better with a cutdown set of deps
 
 EAPI=7
@@ -35,7 +35,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}]
 	>=dev-python/cython-0.19.1[${PYTHON_USEDEP}]
-	client? ( >=www-servers/tornado-3.1[${PYTHON_USEDEP}] )
+	client? ( >=dev-python/tornado-3.1[${PYTHON_USEDEP}] )
 	server? ( >=dev-python/cherrypy-3.2.4[${PYTHON_USEDEP}] )"
 
 DEPEND="test? (
diff --git a/dev-python/ws4py/ws4py-9999.ebuild b/dev-python/ws4py/ws4py-9999.ebuild
index d38a767a08cc..3818a848170e 100644
--- a/dev-python/ws4py/ws4py-9999.ebuild
+++ b/dev-python/ws4py/ws4py-9999.ebuild
@@ -3,7 +3,7 @@
 
 # We could depend on dev-python/cherrypy when USE=server, but
 # that is an optional component ...
-# Same for www-servers/tornado and USE=client ... so why not???
+# Same for dev-python/tornado and USE=client ... so why not???
 # pypy is viable but better with a cutdown set of deps
 
 EAPI=7
@@ -35,7 +35,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}]
 	>=dev-python/cython-0.19.1[${PYTHON_USEDEP}]
-	client? ( >=www-servers/tornado-3.1[${PYTHON_USEDEP}] )
+	client? ( >=dev-python/tornado-3.1[${PYTHON_USEDEP}] )
 	server? ( >=dev-python/cherrypy-3.2.4[${PYTHON_USEDEP}] )"
 
 DEPEND="test? (
diff --git a/dev-ros/rosbridge_server/rosbridge_server-0.11.10.ebuild b/dev-ros/rosbridge_server/rosbridge_server-0.11.10.ebuild
index d0bbe719c0ac..20b681b38250 100644
--- a/dev-ros/rosbridge_server/rosbridge_server-0.11.10.ebuild
+++ b/dev-ros/rosbridge_server/rosbridge_server-0.11.10.ebuild
@@ -11,7 +11,6 @@ inherit ros-catkin
 DESCRIPTION="A WebSocket interface to rosbridge"
 LICENSE="BSD"
 SLOT="0"
-IUSE=""
 
 RDEPEND="
 	dev-ros/rosbridge_library[${PYTHON_SINGLE_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
@@ -20,9 +19,11 @@ RDEPEND="
 	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/rosauth[${PYTHON_SINGLE_USEDEP}]
 
-	$(python_gen_cond_dep "www-servers/tornado[\${PYTHON_USEDEP}]")
-	$(python_gen_cond_dep "dev-python/autobahn[\${PYTHON_USEDEP}]")
-	$(python_gen_cond_dep "dev-python/twisted[\${PYTHON_USEDEP}]")
+	$(python_gen_cond_dep '
+		dev-python/autobahn[${PYTHON_USEDEP}]
+		dev-python/tornado[${PYTHON_USEDEP}]
+		dev-python/twisted[${PYTHON_USEDEP}]
+	')
 	"
 DEPEND="${RDEPEND}
 	test? ( dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] )
diff --git a/dev-ros/rosbridge_server/rosbridge_server-0.11.13.ebuild b/dev-ros/rosbridge_server/rosbridge_server-0.11.13.ebuild
index 435d72834277..90dab3669990 100644
--- a/dev-ros/rosbridge_server/rosbridge_server-0.11.13.ebuild
+++ b/dev-ros/rosbridge_server/rosbridge_server-0.11.13.ebuild
@@ -11,7 +11,6 @@ inherit ros-catkin
 DESCRIPTION="A WebSocket interface to rosbridge"
 LICENSE="BSD"
 SLOT="0"
-IUSE=""
 
 RDEPEND="
 	dev-ros/rosbridge_library[${PYTHON_SINGLE_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
@@ -20,10 +19,12 @@ RDEPEND="
 	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/rosauth[${PYTHON_SINGLE_USEDEP}]
 
-	$(python_gen_cond_dep "www-servers/tornado[\${PYTHON_USEDEP}]")
-	$(python_gen_cond_dep "dev-python/autobahn[\${PYTHON_USEDEP}]")
-	$(python_gen_cond_dep "dev-python/twisted[\${PYTHON_USEDEP}]")
-	"
+	$(python_gen_cond_dep '
+		dev-python/autobahn[${PYTHON_USEDEP}]
+		dev-python/tornado[${PYTHON_USEDEP}]
+		dev-python/twisted[${PYTHON_USEDEP}]
+	')
+"
 DEPEND="${RDEPEND}
 	test? ( dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] )
 "
diff --git a/dev-ros/rosbridge_server/rosbridge_server-0.11.9.ebuild b/dev-ros/rosbridge_server/rosbridge_server-0.11.9.ebuild
index d0bbe719c0ac..20b681b38250 100644
--- a/dev-ros/rosbridge_server/rosbridge_server-0.11.9.ebuild
+++ b/dev-ros/rosbridge_server/rosbridge_server-0.11.9.ebuild
@@ -11,7 +11,6 @@ inherit ros-catkin
 DESCRIPTION="A WebSocket interface to rosbridge"
 LICENSE="BSD"
 SLOT="0"
-IUSE=""
 
 RDEPEND="
 	dev-ros/rosbridge_library[${PYTHON_SINGLE_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
@@ -20,9 +19,11 @@ RDEPEND="
 	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/rosauth[${PYTHON_SINGLE_USEDEP}]
 
-	$(python_gen_cond_dep "www-servers/tornado[\${PYTHON_USEDEP}]")
-	$(python_gen_cond_dep "dev-python/autobahn[\${PYTHON_USEDEP}]")
-	$(python_gen_cond_dep "dev-python/twisted[\${PYTHON_USEDEP}]")
+	$(python_gen_cond_dep '
+		dev-python/autobahn[${PYTHON_USEDEP}]
+		dev-python/tornado[${PYTHON_USEDEP}]
+		dev-python/twisted[${PYTHON_USEDEP}]
+	')
 	"
 DEPEND="${RDEPEND}
 	test? ( dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] )
diff --git a/dev-ros/rosbridge_server/rosbridge_server-9999.ebuild b/dev-ros/rosbridge_server/rosbridge_server-9999.ebuild
index d0bbe719c0ac..93dafa4cbcb8 100644
--- a/dev-ros/rosbridge_server/rosbridge_server-9999.ebuild
+++ b/dev-ros/rosbridge_server/rosbridge_server-9999.ebuild
@@ -11,7 +11,6 @@ inherit ros-catkin
 DESCRIPTION="A WebSocket interface to rosbridge"
 LICENSE="BSD"
 SLOT="0"
-IUSE=""
 
 RDEPEND="
 	dev-ros/rosbridge_library[${PYTHON_SINGLE_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
@@ -20,10 +19,12 @@ RDEPEND="
 	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/rosauth[${PYTHON_SINGLE_USEDEP}]
 
-	$(python_gen_cond_dep "www-servers/tornado[\${PYTHON_USEDEP}]")
-	$(python_gen_cond_dep "dev-python/autobahn[\${PYTHON_USEDEP}]")
-	$(python_gen_cond_dep "dev-python/twisted[\${PYTHON_USEDEP}]")
-	"
+	$(python_gen_cond_dep '
+		dev-python/autobahn[${PYTHON_USEDEP}]
+		dev-python/tornado[${PYTHON_USEDEP}]
+		dev-python/twisted[${PYTHON_USEDEP}]
+	')
+"
 DEPEND="${RDEPEND}
 	test? ( dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] )
 "
diff --git a/dev-util/snakeviz/snakeviz-2.1.1.ebuild b/dev-util/snakeviz/snakeviz-2.1.1.ebuild
index 7cbb445fdab2..2378f50f7f9a 100644
--- a/dev-util/snakeviz/snakeviz-2.1.1.ebuild
+++ b/dev-util/snakeviz/snakeviz-2.1.1.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 
 RDEPEND="$(python_gen_cond_dep '
-		www-servers/tornado[${PYTHON_USEDEP}]
+		dev-python/tornado[${PYTHON_USEDEP}]
 	')"
 
 distutils_enable_tests pytest
diff --git a/net-proxy/mitmproxy/mitmproxy-8.1.1.ebuild b/net-proxy/mitmproxy/mitmproxy-8.1.1.ebuild
index 54154424466b..7eddc9ee7382 100644
--- a/net-proxy/mitmproxy/mitmproxy-8.1.1.ebuild
+++ b/net-proxy/mitmproxy/mitmproxy-8.1.1.ebuild
@@ -37,11 +37,11 @@ RDEPEND="
 	>=dev-python/pyperclip-1.6.0[${PYTHON_USEDEP}]
 	>=dev-python/ruamel-yaml-0.16[${PYTHON_USEDEP}]
 	>=dev-python/sortedcontainers-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
 	>=dev-python/urwid-2.1.1[${PYTHON_USEDEP}]
 	>=dev-python/wsproto-1.0.0[${PYTHON_USEDEP}]
 	>=dev-python/zstandard-0.11.0[${PYTHON_USEDEP}]
 	dev-libs/openssl:0
-	>=www-servers/tornado-6.1[${PYTHON_USEDEP}]
 "
 
 BDEPEND="
diff --git a/profiles/updates/3Q-2022 b/profiles/updates/3Q-2022
index 1a55dc36c036..fcad01107dc4 100644
--- a/profiles/updates/3Q-2022
+++ b/profiles/updates/3Q-2022
@@ -18,3 +18,4 @@ move app-office/gnome-todo app-office/endeavour
 move dev-python/python-levenshtein dev-python/Levenshtein
 move mail-mta/protonmail-bridge mail-mta/proton-mail-bridge
 move app-emulation/distrobox app-containers/distrobox
+move www-servers/tornado dev-python/tornado