[gentoo-commits] repo/gentoo:master commit in: www-servers/tornado/

[Justin Lecher]

commit:     c29f532cbe5e11e32a9d487b766141d98c26447d
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 10 08:24:24 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Nov 10 10:54:09 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c29f532c

www-servers/tornado: Use virtual for module with mixed support

Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 www-servers/tornado/tornado-4.0.1.ebuild | 7 ++++---
 www-servers/tornado/tornado-4.2.1.ebuild | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/www-servers/tornado/tornado-4.0.1.ebuild 
b/www-servers/tornado/tornado-4.0.1.ebuild
index 0a1734d..472b0eb 100644
--- a/www-servers/tornado/tornado-4.0.1.ebuild
+++ b/www-servers/tornado/tornado-4.0.1.ebuild
@@ -17,9 +17,10 @@ SLOT="0"
 KEYWORDS="amd64 arm hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="curl test"
 
-RDEPEND="curl? ( $(python_gen_cond_dep 'dev-python/pycurl[${PYTHON_USEDEP}]' 
python2_7) )
-               dev-python/certifi[${PYTHON_USEDEP}]
-               $(python_gen_cond_dep 
'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' python2_7 pypy)"
+RDEPEND="
+       curl? ( $(python_gen_cond_dep 'dev-python/pycurl[${PYTHON_USEDEP}]' 
python2_7) )
+       dev-python/certifi[${PYTHON_USEDEP}]
+       $(python_gen_cond_dep 
'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' python2_7 pypy)"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
        test? ( ${RDEPEND}
                $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 
python2_7 pypy)

diff --git a/www-servers/tornado/tornado-4.2.1.ebuild 
b/www-servers/tornado/tornado-4.2.1.ebuild
index 9187a28..40d3840 100644
--- a/www-servers/tornado/tornado-4.2.1.ebuild
+++ b/www-servers/tornado/tornado-4.2.1.ebuild
@@ -23,9 +23,9 @@ CDEPEND="
        $(python_gen_cond_dep 
'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' 'python2_7')
        $(python_gen_cond_dep 'dev-python/certifi[${PYTHON_USEDEP}]' 
'python2_7' 'python3_3')
        $(python_gen_cond_dep 'dev-python/futures[${PYTHON_USEDEP}]' 'python2_7 
pypy')
-       $(python_gen_cond_dep 'dev-python/singledispatch[${PYTHON_USEDEP}]' 
'python2_7' 'python3_3')
        $(python_gen_cond_dep 'dev-python/twisted-names[${PYTHON_USEDEP}]' 
'python2_7')
        $(python_gen_cond_dep 'dev-python/twisted-web[${PYTHON_USEDEP}]' 
'python2_7')
+       virtual/python-singledispatch
 "
 # dev-python/twisted-* only supports python2_7 currently
 DEPEND="