summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2013-05-01 00:41:34 +0000
committerMike Gilbert <floppym@gentoo.org>2013-05-01 00:41:34 +0000
commit7ae2e06f154b5a0c42987dc289e86f9c9cb47726 (patch)
treeebd1844c4e71824727ebafff082afe48f71b4006 /dev-python
parentVersion bump. (diff)
downloadgentoo-2-7ae2e06f154b5a0c42987dc289e86f9c9cb47726.tar.gz
gentoo-2-7ae2e06f154b5a0c42987dc289e86f9c9cb47726.tar.bz2
gentoo-2-7ae2e06f154b5a0c42987dc289e86f9c9cb47726.zip
Drop sql use flag and tidy-up python2 deps.
(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'dev-python')
-rw-r--r--dev-python/celery/ChangeLog5
-rw-r--r--dev-python/celery/celery-3.0.19.ebuild18
2 files changed, 14 insertions, 9 deletions
diff --git a/dev-python/celery/ChangeLog b/dev-python/celery/ChangeLog
index 8f9c1b8f11b8..90adace9742f 100644
--- a/dev-python/celery/ChangeLog
+++ b/dev-python/celery/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-python/celery
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/celery/ChangeLog,v 1.22 2013/04/29 11:24:24 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/celery/ChangeLog,v 1.23 2013/05/01 00:41:34 floppym Exp $
+
+ 01 May 2013; Mike Gilbert <floppym@gentoo.org> celery-3.0.19.ebuild:
+ Drop sql use flag and tidy-up python2 deps.
*celery-3.0.19 (29 Apr 2013)
diff --git a/dev-python/celery/celery-3.0.19.ebuild b/dev-python/celery/celery-3.0.19.ebuild
index e70e4248a90b..a7f760150fc5 100644
--- a/dev-python/celery/celery-3.0.19.ebuild
+++ b/dev-python/celery/celery-3.0.19.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/dev-python/celery/celery-3.0.19.ebuild,v 1.1 2013/04/29 11:24:24 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/celery/celery-3.0.19.ebuild,v 1.2 2013/05/01 00:41:34 floppym Exp $
EAPI=5
@@ -15,7 +15,10 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="doc examples sql test"
+IUSE="doc examples test"
+
+# sqlalchemy deps should be replaced once a version supporting py3k is committed
+PY2_USEDEP=$(python_gen_usedep python2_7)
RDEPEND="<dev-python/kombu-3
>=dev-python/kombu-2.5.10[${PYTHON_USEDEP}]
@@ -23,18 +26,17 @@ RDEPEND="<dev-python/kombu-3
>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
virtual/pyparsing[${PYTHON_USEDEP}]
>=dev-python/billiard-2.7.3.28[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- sql? ( dev-python/sqlalchemy[$(python_gen_usedep python2_7)] )"
+ dev-python/pytz[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]
test? (
- dev-python/gevent[$(python_gen_usedep python2_7)]
+ dev-python/gevent[${PY2_USEDEP}]
>=dev-python/mock-0.7.0[${PYTHON_USEDEP}]
virtual/python-unittest2[${PYTHON_USEDEP}]
dev-python/pyopenssl[${PYTHON_USEDEP}]
dev-python/nose-cover3[${PYTHON_USEDEP}]
- dev-python/sqlalchemy[$(python_gen_usedep python2_7)]
- dev-python/pymongo[$(python_gen_usedep python2_7)]
+ dev-python/sqlalchemy[${PY2_USEDEP}]
+ dev-python/pymongo[${PY2_USEDEP}]
dev-python/redis-py[${PYTHON_USEDEP}]
dev-db/redis
)
@@ -43,7 +45,7 @@ DEPEND="${RDEPEND}
dev-python/sphinx[${PYTHON_USEDEP}]
dev-python/jinja[${PYTHON_USEDEP}]
dev-python/sphinxcontrib-issuetracker
- dev-python/sqlalchemy[$(python_gen_usedep python2_7)]
+ dev-python/sqlalchemy[${PY2_USEDEP}]
)"
PATCHES=( "${FILESDIR}"/celery-docs.patch )