3 files changed, 5 insertions, 70 deletions
diff --git a/www-servers/tornado/ChangeLog b/www-servers/tornado/ChangeLog
index 289ba575c83b..bc117f58303b 100644
--- a/www-servers/tornado/ChangeLog
+++ b/www-servers/tornado/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-servers/tornado
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tornado/ChangeLog,v 1.13 2011/06/28 10:37:50 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tornado/ChangeLog,v 1.14 2011/06/28 10:39:44 djc Exp $
+
+  28 Jun 2011; Dirkjan Ochtman <djc@gentoo.org> -tornado-1.1.1.ebuild,
+  -tornado-1.2.ebuild:
+  Remove old versions.
 
 *tornado-2.0 (28 Jun 2011)
 
diff --git a/www-servers/tornado/tornado-1.1.1.ebuild b/www-servers/tornado/tornado-1.1.1.ebuild
deleted file mode 100644
index 91d315be524e..000000000000
--- a/www-servers/tornado/tornado-1.1.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tornado/tornado-1.1.1.ebuild,v 1.1 2011/02/12 22:46:21 arfrever Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit distutils
-
-DESCRIPTION="Scalable, non-blocking web server and tools"
-HOMEPAGE="http://www.tornadoweb.org/ http://pypi.python.org/pypi/tornado"
-SRC_URI="http://github.com/downloads/facebook/tornado/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/pycurl
-	|| ( dev-lang/python:2.7 dev-lang/python:2.6 dev-python/simplejson )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools"
-
-src_prepare() {
-	distutils_src_prepare
-
-	# Disable failing test.
-	sed -e "s/test_ssl/_&/" -i tornado/test/httpserver_test.py
-}
-
-src_test() {
-	testing() {
-		PYTHONPATH="." "$(PYTHON)" tornado/test/runtests.py
-	}
-	python_execute_function testing
-}
diff --git a/www-servers/tornado/tornado-1.2.ebuild b/www-servers/tornado/tornado-1.2.ebuild
deleted file mode 100644
index 91cd8a67e042..000000000000
--- a/www-servers/tornado/tornado-1.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tornado/tornado-1.2.ebuild,v 1.1 2011/02/20 22:06:20 arfrever Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit distutils
-
-DESCRIPTION="Scalable, non-blocking web server and tools"
-HOMEPAGE="http://www.tornadoweb.org/ http://pypi.python.org/pypi/tornado"
-SRC_URI="http://github.com/downloads/facebook/tornado/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/pycurl
-	|| ( dev-lang/python:2.7 dev-lang/python:2.6 dev-python/simplejson )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools"
-
-src_test() {
-	testing() {
-		PYTHONPATH="." "$(PYTHON)" tornado/test/runtests.py
-	}
-	python_execute_function testing
-}