summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2013-05-20 15:51:14 +0000
committerMichał Górny <mgorny@gentoo.org>2013-05-20 15:51:14 +0000
commit54fed333de01102784b38ce34d5fad15e06b9218 (patch)
tree830f1254d8b95607782b1e0543079e848afb2c8e /www-servers/tornado
parentapp-misc/when: Drop old (diff)
downloadgentoo-2-54fed333de01102784b38ce34d5fad15e06b9218.tar.gz
gentoo-2-54fed333de01102784b38ce34d5fad15e06b9218.tar.bz2
gentoo-2-54fed333de01102784b38ce34d5fad15e06b9218.zip
Add missing || to PYTHON_USEDEP. Bug #469258.
(Portage version: 2.2.0_alpha176/cvs/Linux x86_64, signed Manifest commit with key 9627F456F9DA7643!)
Diffstat (limited to 'www-servers/tornado')
-rw-r--r--www-servers/tornado/ChangeLog6
-rw-r--r--www-servers/tornado/tornado-2.4-r1.ebuild4
-rw-r--r--www-servers/tornado/tornado-2.4.1.ebuild4
3 files changed, 9 insertions, 5 deletions
diff --git a/www-servers/tornado/ChangeLog b/www-servers/tornado/ChangeLog
index b1708681aa04..cd3d6df260e4 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.34 2013/05/09 17:13:31 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tornado/ChangeLog,v 1.35 2013/05/20 15:51:14 mgorny Exp $
+
+ 20 May 2013; Michał Górny <mgorny@gentoo.org> tornado-2.4-r1.ebuild,
+ tornado-2.4.1.ebuild:
+ Add missing || to PYTHON_USEDEP. Bug #469258.
*tornado-2.4.1 (09 May 2013)
diff --git a/www-servers/tornado/tornado-2.4-r1.ebuild b/www-servers/tornado/tornado-2.4-r1.ebuild
index 146af97191f9..14b4f7cd2c8c 100644
--- a/www-servers/tornado/tornado-2.4-r1.ebuild
+++ b/www-servers/tornado/tornado-2.4-r1.ebuild
@@ -1,6 +1,6 @@
# 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.3 2013/03/30 13:10:10 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tornado/tornado-2.4-r1.ebuild,v 1.4 2013/05/20 15:51:14 mgorny Exp $
EAPI=5
@@ -23,7 +23,7 @@ RDEPEND="curl? ( dev-python/pycurl[$(python_gen_usedep 'python2*')] )
DEPEND="${RDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]"
-REQUIRED_USE="curl? ( $(python_gen_useflags python2*) )"
+REQUIRED_USE="curl? ( || ( $(python_gen_useflags python2*) ) )"
src_test() {
# The test server tries to bind at an unused port but suffers
diff --git a/www-servers/tornado/tornado-2.4.1.ebuild b/www-servers/tornado/tornado-2.4.1.ebuild
index b73adcea8355..306950865043 100644
--- a/www-servers/tornado/tornado-2.4.1.ebuild
+++ b/www-servers/tornado/tornado-2.4.1.ebuild
@@ -1,6 +1,6 @@
# 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.1 2013/05/09 17:13:31 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tornado/tornado-2.4.1.ebuild,v 1.2 2013/05/20 15:51:14 mgorny Exp $
EAPI=5
@@ -23,7 +23,7 @@ RDEPEND="curl? ( dev-python/pycurl[$(python_gen_usedep 'python2*')] )
DEPEND="${RDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]"
-REQUIRED_USE="curl? ( $(python_gen_useflags python2*) )"
+REQUIRED_USE="curl? ( || ( $(python_gen_useflags python2*) ) )"
src_test() {
# The test server tries to bind at an unused port but suffers