summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /www-servers/tornado
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'www-servers/tornado')
-rw-r--r--www-servers/tornado/Manifest7
-rw-r--r--www-servers/tornado/files/4.1.0-drop-intersphinx.patch36
-rw-r--r--www-servers/tornado/files/drop-intersphinx.patch36
-rw-r--r--www-servers/tornado/files/tornado-3.1.1-py2_6-tests-fix.patch31
-rw-r--r--www-servers/tornado/files/unittest2-import-issue-1005.patch41
-rw-r--r--www-servers/tornado/metadata.xml12
-rw-r--r--www-servers/tornado/tornado-3.1.1-r1.ebuild48
-rw-r--r--www-servers/tornado/tornado-3.1.1.ebuild38
-rw-r--r--www-servers/tornado/tornado-4.0.1.ebuild32
-rw-r--r--www-servers/tornado/tornado-4.0.2.ebuild32
-rw-r--r--www-servers/tornado/tornado-4.1.0-r1.ebuild63
-rw-r--r--www-servers/tornado/tornado-4.1.0.ebuild61
-rw-r--r--www-servers/tornado/tornado-4.2.0_beta1.ebuild67
-rw-r--r--www-servers/tornado/tornado-4.2.1.ebuild65
-rw-r--r--www-servers/tornado/tornado-4.2.ebuild67
15 files changed, 636 insertions, 0 deletions
diff --git a/www-servers/tornado/Manifest b/www-servers/tornado/Manifest
new file mode 100644
index 000000000000..b1626bbfe037
--- /dev/null
+++ b/www-servers/tornado/Manifest
@@ -0,0 +1,7 @@
+DIST tornado-3.1.1.tar.gz 374086 SHA256 345904bfe4a0ce5d687203f783986a73cfd7dc3a9957ee3342cd43d4e310fdc6 SHA512 13f17166153a89ecf1a16a08f0d15cd342f5de7ad964e669e015c2226e2c18297306f47ffc560164ec9f8080489a5fb81cbf6b41f89f12fe1745b0cd73524207 WHIRLPOOL 689f4ba4dc4d98ac7b7de33b15288aa90683bc529364b02c0d5d1c9090b47c5178ef520cdcc93ae94e8886278cc4a16100c167e33a05f406c9431f4a0888087b
+DIST tornado-4.0.1.tar.gz 314852 SHA256 ae058668b276b1ec7383cfc911323e6d27b3b47e38a12d3d3eaf6b6577b99901 SHA512 a4e0231e77ebbc2885bab648b292b842cb15c84d66a1972de18cb00fcc611eae2794b872f070ab7d5af32dd0c6c1773527fe1332bd382c1821e1f2d5d76808fb WHIRLPOOL eafd8c3cf60c2aacdbdc495f21d4e677cf77ce5ad5ce17d8e13b66b79bb1e416f9837d1b2dfbbe6d24b6447507b71270f1abe533e260e4a960477f974623045a
+DIST tornado-4.0.2.tar.gz 315841 SHA256 900c5124ebdb6598ca8e8a0c5888f41a5f14117952d5515258e3d20222b21bfa SHA512 93591068dc63af8d50a7925d528bc0cccdd705232c529b6162619fe28dddaf115e8a460b1842877d35160bd7ed480c1bd0bdbec57d1f359085bd1814e0c1c242 WHIRLPOOL e00484208ec70c55ca7a0bfb383a5f26928882ce547c274de8597312e539296c29edbbfdcece40c161bcfc71b5b74c42653625310a7c7cd5d2b244faa6027692
+DIST tornado-4.1.0.tar.gz 427424 SHA256 bf00fe845576a729f57e86dc3a7e767bf101e018eebbc86bf8c0148094409733 SHA512 bbe79aed51a29d4868557ad1ccea391a0c28b9702c40bdad21665a53796650884de8621c0f4333e2edeed268e0cf97a7807086b1513c63257a8bf02ef98d261f WHIRLPOOL 0231e010a021bd2cba13cee1c108abfe4850b7753655b0dd6edf22b72f04e7ba9a723fa434bd64aeae41f6c4c14fd189563e795c4843ed6255b1b7975287f306
+DIST tornado-4.2.0_beta1.tar.gz 433456 SHA256 216e505f14978143248030e62c275853272316fbd20f3447e40c7295898a2a8e SHA512 ebd5c2a7ef3d99e24821de685560e5810d8d0986bb394897cb9bdd799b221a5c6e314bedd589b6e374e4cae5425372e13b25b932a4c701820952f260f8bc46f7 WHIRLPOOL 6b1dfb9df5d24363fd85c2ab2864106d637c97268b4a58342481d292baf2856604ae61d99bded9e259e7d2ef12647169c18392a474246f09a16b17f2f20df315
+DIST tornado-4.2.1.tar.gz 434304 SHA256 a16fcdc4f76b184cb82f4f9eaeeacef6113b524b26a2cb331222e4a7fa6f2969 SHA512 5bb391b05c8574c8ae5e315b7617e1259ab80e993f1230db611c5beef8058517cc588daf75fac2e0f7969668715470b06ed183c9832b22081be265beb6967e30 WHIRLPOOL 5230055b1d10c32968c1f400e3d1fffbde1cbf9b4578ec42835cb202234d24daf6d4e621622a2fc884d3db8e5b3f64d6e62d17841bb9d71ab8ab91928cd0dfe3
+DIST tornado-4.2.tar.gz 433734 SHA256 e8b1207da67dbdceebfb291292b4ef1b547d6171525bec1b366853f923456a5f SHA512 b9f27cf544b0743bd08687c3cea2882528786d4bb1158b1f1b97b6e1b8c170396c07032802f6daafec3be9a21975f73292a321a160a17bad1d215e40f2e9244e WHIRLPOOL 76070b3c9bed55232a8b36f0bb45f398c142a04d5bb7c11e8cf152eec68eaa54804e9452a8042f01710cd45b8e2bfdfddbcfe911854a158a93f47e201ae89f20
diff --git a/www-servers/tornado/files/4.1.0-drop-intersphinx.patch b/www-servers/tornado/files/4.1.0-drop-intersphinx.patch
new file mode 100644
index 000000000000..e7da6fbefea2
--- /dev/null
+++ b/www-servers/tornado/files/4.1.0-drop-intersphinx.patch
@@ -0,0 +1,36 @@
+diff --git a/docs/Makefile b/docs/Makefile
+index a491685..ba4888f 100644
+--- a/docs/Makefile
++++ b/docs/Makefile
+@@ -1,7 +1,7 @@
+ .PHONY: all
+ all: sphinx
+
+-SPHINXOPTS=-n -W -d build/doctrees .
++SPHINXOPTS=-n -d build/doctrees .
+
+ .PHONY: sphinx
+ sphinx:
+diff --git a/docs/conf.py b/docs/conf.py
+index d9b4761..4c11038 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -15,7 +15,6 @@ extensions = [
+ "sphinx.ext.autodoc",
+ "sphinx.ext.coverage",
+ "sphinx.ext.extlinks",
+- "sphinx.ext.intersphinx",
+ "sphinx.ext.viewcode",
+ ]
+
+@@ -94,10 +93,6 @@ extlinks = {
+ 'tornado-%s.tar.g' % version),
+ }
+
+-intersphinx_mapping = {
+- 'python': ('http://python.readthedocs.org/en/latest/', None),
+- }
+-
+ on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
+
+ # On RTD we can't import sphinx_rtd_theme, but it will be applied by
diff --git a/www-servers/tornado/files/drop-intersphinx.patch b/www-servers/tornado/files/drop-intersphinx.patch
new file mode 100644
index 000000000000..7502dc53b820
--- /dev/null
+++ b/www-servers/tornado/files/drop-intersphinx.patch
@@ -0,0 +1,36 @@
+diff --git a/docs/Makefile b/docs/Makefile
+index 7001b80..ab2ffdd 100644
+--- a/docs/Makefile
++++ b/docs/Makefile
+@@ -3,7 +3,7 @@ all: sphinx
+
+ # No -W for doctests because that disallows tests with empty output.
+ SPHINX_DOCTEST_OPTS=-n -d build/doctress .
+-SPHINXOPTS=-n -W -d build/doctrees .
++SPHINXOPTS=-n -d build/doctrees .
+
+ .PHONY: sphinx
+ sphinx:
+diff --git a/docs/conf.py b/docs/conf.py
+index 368e4e8..85a276d 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -16,7 +16,6 @@ extensions = [
+ "sphinx.ext.coverage",
+ "sphinx.ext.doctest",
+ "sphinx.ext.extlinks",
+- "sphinx.ext.intersphinx",
+ "sphinx.ext.viewcode",
+ ]
+
+@@ -91,10 +90,6 @@ extlinks = {
+ 'tornado-%s.tar.g' % version),
+ }
+
+-intersphinx_mapping = {
+- 'python': ('https://docs.python.org/3.4/', None),
+- }
+-
+ on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
+
+ # On RTD we can't import sphinx_rtd_theme, but it will be applied by
diff --git a/www-servers/tornado/files/tornado-3.1.1-py2_6-tests-fix.patch b/www-servers/tornado/files/tornado-3.1.1-py2_6-tests-fix.patch
new file mode 100644
index 000000000000..ea18df2393ac
--- /dev/null
+++ b/www-servers/tornado/files/tornado-3.1.1-py2_6-tests-fix.patch
@@ -0,0 +1,31 @@
+diff --git a/tornado/test/twisted_test.py b/tornado/test/twisted_test.py
+index b8d9c6f..998282c 100644
+--- a/tornado/test/twisted_test.py
++++ b/tornado/test/twisted_test.py
+@@ -22,6 +22,7 @@ from __future__ import absolute_import, division, print_function, with_statement
+ import os
+ import shutil
+ import signal
++import sys
+ import tempfile
+ import threading
+
+@@ -477,8 +478,6 @@ if have_twisted:
+ 'twisted.internet.test.test_fdset.ReactorFDSetTestsBuilder': [
+ "test_lostFileDescriptor", # incompatible with epoll and kqueue
+ ],
+- 'twisted.internet.test.test_process.ProcessTestsBuilder': [
+- ],
+ # Process tests appear to work on OSX 10.7, but not 10.6
+ #'twisted.internet.test.test_process.PTYProcessTestsBuilder': [
+ # 'test_systemCallUninterruptedByChildExit',
+@@ -519,6 +518,9 @@ if have_twisted:
+ ],
+ 'twisted.internet.test.test_unix.UNIXPortTestsBuilder': [],
+ }
++ if sys.version_info >= (2,7):
++ twisted_tests['twisted.internet.test.test_process.ProcessTestsBuilder'] = []
++
+ for test_name, blacklist in twisted_tests.items():
+ try:
+ test_class = import_object(test_name)
diff --git a/www-servers/tornado/files/unittest2-import-issue-1005.patch b/www-servers/tornado/files/unittest2-import-issue-1005.patch
new file mode 100644
index 000000000000..3ad5b9158c0a
--- /dev/null
+++ b/www-servers/tornado/files/unittest2-import-issue-1005.patch
@@ -0,0 +1,41 @@
+commit 79e29c62ce095984d0e9da5b7c5072eb9aa6e131
+Author: yac <yac@gentoo.org>
+Date: Sat Mar 8 00:32:09 2014 +0100
+
+ fixes #1005
+
+diff --git a/tornado/test/util.py b/tornado/test/util.py
+index 3604310..e4e37f0 100644
+--- a/tornado/test/util.py
++++ b/tornado/test/util.py
+@@ -3,6 +3,10 @@ from __future__ import absolute_import, division, print_function, with_statement
+ import os
+ import sys
+
++# Tornado's own test suite requires the updated unittest module
++# (either py27+ or unittest2) so tornado.test.util enforces
++# this requirement, but for other users of tornado.testing we want
++# to allow the older version if unitest2 is not available.
+ # Encapsulate the choice of unittest or unittest2 here.
+ # To be used as 'from tornado.test.util import unittest'.
+ if sys.version_info >= (2, 7):
+diff --git a/tornado/testing.py b/tornado/testing.py
+index 96fdd32..cd811d4 100644
+--- a/tornado/testing.py
++++ b/tornado/testing.py
+@@ -45,14 +45,7 @@ try:
+ except ImportError:
+ from io import StringIO # py3
+
+-# Tornado's own test suite requires the updated unittest module
+-# (either py27+ or unittest2) so tornado.test.util enforces
+-# this requirement, but for other users of tornado.testing we want
+-# to allow the older version if unitest2 is not available.
+-try:
+- import unittest2 as unittest
+-except ImportError:
+- import unittest
++from tornado.test.util import unittest
+
+ _next_port = 10000
+
diff --git a/www-servers/tornado/metadata.xml b/www-servers/tornado/metadata.xml
new file mode 100644
index 000000000000..62d0060337b8
--- /dev/null
+++ b/www-servers/tornado/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>python</herd>
+ <maintainer>
+ <email>alunduil@gentoo.org</email>
+ <name>Alex Brandt</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="pypi">tornado</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/www-servers/tornado/tornado-3.1.1-r1.ebuild b/www-servers/tornado/tornado-3.1.1-r1.ebuild
new file mode 100644
index 000000000000..7ee36fa86598
--- /dev/null
+++ b/www-servers/tornado/tornado-3.1.1-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Scalable, non-blocking web server and tools"
+HOMEPAGE="http://www.tornadoweb.org/ http://pypi.python.org/pypi/tornado"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 arm hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="curl test"
+
+RDEPEND="curl? ( dev-python/pycurl[$(python_gen_usedep python2_7)] )"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? (
+ dev-python/mock[${PYTHON_USEDEP}]
+ python_targets_python2_7? ( dev-python/twisted-names[python_targets_python2_7] )
+ )
+"
+
+REQUIRED_USE="curl? ( || ( $(python_gen_useflags python2_7) ) )"
+
+PATCHES=(
+ "${FILESDIR}/unittest2-import-issue-1005.patch"
+ "${FILESDIR}/${P}-py2_6-tests-fix.patch"
+)
+
+src_test() {
+ # The test server tries to bind at an unused port but suffers
+ # a race condition in it. Seems to be fixed already.
+ # https://github.com/facebook/tornado/blob/master/tornado/test/process_test.py#L64
+ local DISTUTILS_NO_PARALLEL_BUILD=1
+
+ distutils-r1_src_test
+}
+
+python_test() {
+ cd "${TMPDIR}" || die
+ "${PYTHON}" -m tornado.test.runtests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/www-servers/tornado/tornado-3.1.1.ebuild b/www-servers/tornado/tornado-3.1.1.ebuild
new file mode 100644
index 000000000000..3fa643a873d0
--- /dev/null
+++ b/www-servers/tornado/tornado-3.1.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Scalable, non-blocking web server and tools"
+HOMEPAGE="http://www.tornadoweb.org/ http://pypi.python.org/pypi/tornado"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="curl"
+
+RDEPEND="curl? ( dev-python/pycurl[$(python_gen_usedep 'python2*')] )"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]"
+
+REQUIRED_USE="curl? ( || ( $(python_gen_useflags python2*) ) )"
+
+src_test() {
+ # The test server tries to bind at an unused port but suffers
+ # a race condition in it. Seems to be fixed already.
+ # https://github.com/facebook/tornado/blob/master/tornado/test/process_test.py#L64
+ local DISTUTILS_NO_PARALLEL_BUILD=1
+
+ distutils-r1_src_test
+}
+
+python_test() {
+ cd "${TMPDIR}" || die
+ "${PYTHON}" -m tornado.test.runtests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/www-servers/tornado/tornado-4.0.1.ebuild b/www-servers/tornado/tornado-4.0.1.ebuild
new file mode 100644
index 000000000000..0a552b40f6dc
--- /dev/null
+++ b/www-servers/tornado/tornado-4.0.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Scalable, non-blocking web server and tools"
+HOMEPAGE="http://www.tornadoweb.org/ http://pypi.python.org/pypi/tornado"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+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)"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( ${RDEPEND}
+ $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+ $(python_gen_cond_dep 'dev-python/twisted-names[${PYTHON_USEDEP}]' python2_7)
+ dev-python/service_identity[${PYTHON_USEDEP}]
+ )"
+
+python_test() {
+ "${PYTHON}" -m tornado.test.runtests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/www-servers/tornado/tornado-4.0.2.ebuild b/www-servers/tornado/tornado-4.0.2.ebuild
new file mode 100644
index 000000000000..e87688f05e63
--- /dev/null
+++ b/www-servers/tornado/tornado-4.0.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Scalable, non-blocking web server and tools"
+HOMEPAGE="http://www.tornadoweb.org/ http://pypi.python.org/pypi/tornado"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+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)"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( ${RDEPEND}
+ $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+ $(python_gen_cond_dep 'dev-python/twisted-names[${PYTHON_USEDEP}]' python2_7)
+ dev-python/service_identity[${PYTHON_USEDEP}]
+ )"
+
+python_test() {
+ "${PYTHON}" -m tornado.test.runtests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/www-servers/tornado/tornado-4.1.0-r1.ebuild b/www-servers/tornado/tornado-4.1.0-r1.ebuild
new file mode 100644
index 000000000000..d89013523134
--- /dev/null
+++ b/www-servers/tornado/tornado-4.1.0-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 pypy )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Tornado is a Python web framework and asynchronous networking library, ... ."
+HOMEPAGE="http://www.tornadoweb.org/"
+SRC_URI="https://github.com/tornadoweb/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+
+CDEPEND="
+ $(python_gen_cond_dep 'dev-python/pycurl[${PYTHON_USEDEP}]' python2_7)
+ dev-python/certifi[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep 'dev-python/asyncio[${PYTHON_USEDEP}]' 'python3_3')
+ $(python_gen_cond_dep 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' python2_7 pypy)
+ $(python_gen_cond_dep 'dev-python/twisted-names[${PYTHON_USEDEP}]' python2_7)
+ $(python_gen_cond_dep 'dev-python/twisted-web[${PYTHON_USEDEP}]' python2_7)
+"
+# dev-python/twisted-* only supports python2_7 currently
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ doc? (
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+ )
+ test? (
+ ${CDEPEND}
+ $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+ )
+"
+RDEPEND="${CDEPEND}"
+
+python_prepare_all() {
+ local PATCHES=(
+ "${FILESDIR}"/${PV}-drop-intersphinx.patch
+ )
+
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ use doc && emake -C docs sphinx
+}
+
+python_test() {
+ "${PYTHON}" -m tornado.test.runtests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/build/html/. )
+ use examples && local EXAMPLES=( demos/. )
+
+ distutils-r1_python_install_all
+}
diff --git a/www-servers/tornado/tornado-4.1.0.ebuild b/www-servers/tornado/tornado-4.1.0.ebuild
new file mode 100644
index 000000000000..d480f5d72a14
--- /dev/null
+++ b/www-servers/tornado/tornado-4.1.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Tornado is a Python web framework and asynchronous networking library, ... ."
+HOMEPAGE="http://www.tornadoweb.org/"
+SRC_URI="https://github.com/tornadoweb/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="curl doc examples test"
+
+CDEPEND="
+ curl? ( dev-python/pycurl[${PYTHON_USEDEP}] )
+ dev-python/certifi[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep 'dev-python/asyncio[${PYTHON_USEDEP}]' 'python3_3' )
+ $(python_gen_cond_dep 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' python2_7 pypy)
+ $(python_gen_cond_dep 'dev-python/twisted-names[${PYTHON_USEDEP}]' python2_7)
+" # dev-python/twisted-names only supports python2_7 currently
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ doc? (
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+ )
+ test? (
+ ${CDEPEND}
+ dev-python/mock[${PYTHON_USEDEP}]
+ )
+"
+RDEPEND="${CDEPEND}"
+
+python_prepare_all() {
+ local PATCHES=(
+ "${FILESDIR}"/${PV}-drop-intersphinx.patch
+ )
+
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ use doc && emake -C docs sphinx
+}
+
+python_test() {
+ "${PYTHON}" -m tornado.test.runtests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/build/html/. )
+ use examples && local EXAMPLES=( demos/. )
+
+ distutils-r1_python_install_all
+}
diff --git a/www-servers/tornado/tornado-4.2.0_beta1.ebuild b/www-servers/tornado/tornado-4.2.0_beta1.ebuild
new file mode 100644
index 000000000000..d8de6ef0e316
--- /dev/null
+++ b/www-servers/tornado/tornado-4.2.0_beta1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1 vcs-snapshot
+
+MY_PV=${PV/.0_beta/b}
+
+DESCRIPTION="Tornado is a Python web framework and asynchronous networking library, ... ."
+HOMEPAGE="http://www.tornadoweb.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+
+CDEPEND="
+ dev-python/certifi[${PYTHON_USEDEP}]
+ >=dev-python/pycurl-7.18.2[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep 'dev-python/asyncio[${PYTHON_USEDEP}]' 'python3_3')
+ $(python_gen_cond_dep 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' 'python2_7')
+ $(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')
+"
+# dev-python/twisted-* only supports python2_7 currently
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ doc? (
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+ )
+ test? (
+ ${CDEPEND}
+ $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+ )
+"
+RDEPEND="${CDEPEND}"
+
+python_prepare_all() {
+ local PATCHES=(
+ "${FILESDIR}"/drop-intersphinx.patch
+ )
+
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ use doc && emake -C docs sphinx
+}
+
+python_test() {
+ "${PYTHON}" -m tornado.test.runtests || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/build/html/. )
+ use examples && local EXAMPLES=( demos/. )
+
+ distutils-r1_python_install_all
+}
diff --git a/www-servers/tornado/tornado-4.2.1.ebuild b/www-servers/tornado/tornado-4.2.1.ebuild
new file mode 100644
index 000000000000..f22d4e245d45
--- /dev/null
+++ b/www-servers/tornado/tornado-4.2.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Tornado is a Python web framework and asynchronous networking library, ... ."
+HOMEPAGE="http://www.tornadoweb.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+
+CDEPEND="
+ >=dev-python/pycurl-7.19.3.1[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep 'dev-python/asyncio[${PYTHON_USEDEP}]' 'python3_3')
+ $(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')
+"
+# dev-python/twisted-* only supports python2_7 currently
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ doc? (
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+ )
+ test? (
+ ${CDEPEND}
+ $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+ )
+"
+RDEPEND="${CDEPEND}"
+
+python_prepare_all() {
+ local PATCHES=(
+ "${FILESDIR}"/drop-intersphinx.patch
+ )
+
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ use doc && emake -C docs sphinx
+}
+
+python_test() {
+ "${PYTHON}" -m tornado.test.runtests || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/build/html/. )
+ use examples && local EXAMPLES=( demos/. )
+
+ distutils-r1_python_install_all
+}
diff --git a/www-servers/tornado/tornado-4.2.ebuild b/www-servers/tornado/tornado-4.2.ebuild
new file mode 100644
index 000000000000..d8de6ef0e316
--- /dev/null
+++ b/www-servers/tornado/tornado-4.2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1 vcs-snapshot
+
+MY_PV=${PV/.0_beta/b}
+
+DESCRIPTION="Tornado is a Python web framework and asynchronous networking library, ... ."
+HOMEPAGE="http://www.tornadoweb.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+
+CDEPEND="
+ dev-python/certifi[${PYTHON_USEDEP}]
+ >=dev-python/pycurl-7.18.2[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep 'dev-python/asyncio[${PYTHON_USEDEP}]' 'python3_3')
+ $(python_gen_cond_dep 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' 'python2_7')
+ $(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')
+"
+# dev-python/twisted-* only supports python2_7 currently
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ doc? (
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+ )
+ test? (
+ ${CDEPEND}
+ $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+ )
+"
+RDEPEND="${CDEPEND}"
+
+python_prepare_all() {
+ local PATCHES=(
+ "${FILESDIR}"/drop-intersphinx.patch
+ )
+
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ use doc && emake -C docs sphinx
+}
+
+python_test() {
+ "${PYTHON}" -m tornado.test.runtests || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/build/html/. )
+ use examples && local EXAMPLES=( demos/. )
+
+ distutils-r1_python_install_all
+}