diff options
| -rw-r--r-- | www-servers/tornado/ChangeLog | 6 | ||||
| -rw-r--r-- | www-servers/tornado/tornado-2.4-r1.ebuild | 8 | ||||
| -rw-r--r-- | www-servers/tornado/tornado-2.4.1.ebuild | 8 |
3 files changed, 11 insertions, 11 deletions
diff --git a/www-servers/tornado/ChangeLog b/www-servers/tornado/ChangeLog index cd3d6df260e4..c7b8a38d1373 100644 --- a/www-servers/tornado/ChangeLog +++ b/www-servers/tornado/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-servers/tornado # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tornado/ChangeLog,v 1.35 2013/05/20 15:51:14 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tornado/ChangeLog,v 1.36 2013/09/05 14:14:28 mgorny Exp $ + + 05 Sep 2013; Michał Górny <mgorny@gentoo.org> tornado-2.4-r1.ebuild, + tornado-2.4.1.ebuild: + Drop stale conditionals after py2.5 removal. 20 May 2013; Michał Górny <mgorny@gentoo.org> tornado-2.4-r1.ebuild, tornado-2.4.1.ebuild: diff --git a/www-servers/tornado/tornado-2.4-r1.ebuild b/www-servers/tornado/tornado-2.4-r1.ebuild index 14b4f7cd2c8c..661e93baeee7 100644 --- a/www-servers/tornado/tornado-2.4-r1.ebuild +++ b/www-servers/tornado/tornado-2.4-r1.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tornado/tornado-2.4-r1.ebuild,v 1.4 2013/05/20 15:51:14 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tornado/tornado-2.4-r1.ebuild,v 1.5 2013/09/05 14:14:28 mgorny Exp $ EAPI=5 -PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} ) +PYTHON_COMPAT=( python{2_6,2_7} pypy{1_9,2_0} ) inherit distutils-r1 @@ -17,9 +17,7 @@ SLOT="0" KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" IUSE="curl" -RDEPEND="curl? ( dev-python/pycurl[$(python_gen_usedep 'python2*')] ) - python_targets_python2_5? ( - dev-python/simplejson[python_targets_python2_5] )" +RDEPEND="curl? ( dev-python/pycurl[$(python_gen_usedep 'python2*')] )" DEPEND="${RDEPEND} dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/www-servers/tornado/tornado-2.4.1.ebuild b/www-servers/tornado/tornado-2.4.1.ebuild index 306950865043..88ffab236723 100644 --- a/www-servers/tornado/tornado-2.4.1.ebuild +++ b/www-servers/tornado/tornado-2.4.1.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tornado/tornado-2.4.1.ebuild,v 1.2 2013/05/20 15:51:14 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tornado/tornado-2.4.1.ebuild,v 1.3 2013/09/05 14:14:28 mgorny Exp $ EAPI=5 -PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} ) +PYTHON_COMPAT=( python{2_6,2_7} pypy{1_9,2_0} ) inherit distutils-r1 @@ -17,9 +17,7 @@ SLOT="0" KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" IUSE="curl" -RDEPEND="curl? ( dev-python/pycurl[$(python_gen_usedep 'python2*')] ) - python_targets_python2_5? ( - dev-python/simplejson[python_targets_python2_5] )" +RDEPEND="curl? ( dev-python/pycurl[$(python_gen_usedep 'python2*')] )" DEPEND="${RDEPEND} dev-python/setuptools[${PYTHON_USEDEP}]" |