From 118e133c02d12331eb9c9855cb6b75738fd1bd23 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Mon, 16 Mar 2020 19:23:37 +0100 Subject: [PATCH] www-servers/tornado: Replace virtuals with conditional deps MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- www-servers/tornado/tornado-4.5.3.ebuild | 8 +++++--- www-servers/tornado/tornado-5.1-r1.ebuild | 8 +++++--- www-servers/tornado/tornado-6.0.3.ebuild | 3 --- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/www-servers/tornado/tornado-4.5.3.ebuild b/www-servers/tornado/tornado-4.5.3.ebuild index 1fbfe5ab004f..2daf907e25da 100644 --- a/www-servers/tornado/tornado-4.5.3.ebuild +++ b/www-servers/tornado/tornado-4.5.3.ebuild @@ -28,9 +28,11 @@ CDEPEND=" $(python_gen_cond_dep 'dev-python/twisted-web[${PYTHON_USEDEP}]' 'python2_7') ) ) - virtual/python-backports_abc[${PYTHON_USEDEP}] - virtual/python-futures[${PYTHON_USEDEP}] - virtual/python-singledispatch[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/backports-abc[${PYTHON_USEDEP}] + dev-python/futures[${PYTHON_USEDEP}] + dev-python/singledispatch[${PYTHON_USEDEP}] + ' -2) " DEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] diff --git a/www-servers/tornado/tornado-5.1-r1.ebuild b/www-servers/tornado/tornado-5.1-r1.ebuild index 4f08262de075..11bf422e43d5 100644 --- a/www-servers/tornado/tornado-5.1-r1.ebuild +++ b/www-servers/tornado/tornado-5.1-r1.ebuild @@ -22,9 +22,11 @@ CDEPEND=" $(python_gen_cond_dep 'dev-python/futures[${PYTHON_USEDEP}]' 'python2_7') >=dev-python/pycurl-7.19.3.1[${PYTHON_USEDEP}] >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] - virtual/python-backports_abc[${PYTHON_USEDEP}] - virtual/python-futures[${PYTHON_USEDEP}] - virtual/python-singledispatch[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/backports-abc[${PYTHON_USEDEP}] + dev-python/futures[${PYTHON_USEDEP}] + dev-python/singledispatch[${PYTHON_USEDEP}] + ' -2) " DEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] diff --git a/www-servers/tornado/tornado-6.0.3.ebuild b/www-servers/tornado/tornado-6.0.3.ebuild index 1350ccb79461..c2f2a4a7b4ba 100644 --- a/www-servers/tornado/tornado-6.0.3.ebuild +++ b/www-servers/tornado/tornado-6.0.3.ebuild @@ -21,9 +21,6 @@ RESTRICT="!test? ( test )" CDEPEND=" >=dev-python/pycurl-7.19.3.1[${PYTHON_USEDEP}] >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] - virtual/python-backports_abc[${PYTHON_USEDEP}] - virtual/python-futures[${PYTHON_USEDEP}] - virtual/python-singledispatch[${PYTHON_USEDEP}] " DEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] -- 2.26.2