summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Thode <prometheanfire@gentoo.org>2013-09-12 06:09:53 +0000
committerMatthew Thode <prometheanfire@gentoo.org>2013-09-12 06:09:53 +0000
commitb8b2dfd7ff7eee7af0b574260e7cf438d6a1390d (patch)
tree92d2f3dae1203387ff9b1599e56ff2fba2968083 /sys-cluster/neutron/neutron-9999.ebuild
parentStable for amd64, wrt bug #484506 (diff)
downloadgentoo-2-b8b2dfd7ff7eee7af0b574260e7cf438d6a1390d.tar.gz
gentoo-2-b8b2dfd7ff7eee7af0b574260e7cf438d6a1390d.tar.bz2
gentoo-2-b8b2dfd7ff7eee7af0b574260e7cf438d6a1390d.zip
updating neutron for full distutils-r1 support
(Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key 0x2471eb3e40ac5ac3)
Diffstat (limited to 'sys-cluster/neutron/neutron-9999.ebuild')
-rw-r--r--sys-cluster/neutron/neutron-9999.ebuild19
1 files changed, 12 insertions, 7 deletions
diff --git a/sys-cluster/neutron/neutron-9999.ebuild b/sys-cluster/neutron/neutron-9999.ebuild
index 07015ead0967..8163dded538b 100644
--- a/sys-cluster/neutron/neutron-9999.ebuild
+++ b/sys-cluster/neutron/neutron-9999.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/sys-cluster/neutron/neutron-9999.ebuild,v 1.3 2013/09/05 21:46:49 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-9999.ebuild,v 1.4 2013/09/12 06:09:52 prometheanfire Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 )
@@ -16,7 +16,8 @@ EGIT_REPO_URI="https://github.com/openstack/neutron.git"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS=""
-IUSE="+dhcp +l3 +metadata +openvswitch +server test"
+IUSE="+dhcp +l3 +metadata +openvswitch +server test sqlite mysql postgres"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
#the cliff dep is as below because it depends on pyparsing, which only has 2.7 OR 3.2, not both
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
@@ -28,11 +29,11 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
~dev-python/mox-0.5.3[${PYTHON_USEDEP}]
dev-python/nose[${PYTHON_USEDEP}]
dev-python/nosehtmloutput[${PYTHON_USEDEP}]
- dev-python/nosexcover
+ dev-python/nosexcover[${PYTHON_USEDEP}]
dev-python/openstack-nose-plugin[${PYTHON_USEDEP}]
- ~dev-python/pep8-1.3.3
+ ~dev-python/pep8-1.4.5[${PYTHON_USEDEP}]
>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
- ~dev-python/webtest-1.3.3
+ ~dev-python/webtest-1.3.3[${PYTHON_USEDEP}]
virtual/python-unittest2[${PYTHON_USEDEP}]"
RDEPEND=">=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
>=dev-python/alembic-0.4.1[${PYTHON_USEDEP}]
@@ -52,8 +53,12 @@ RDEPEND=">=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
>=dev-python/python-neutronclient-2.3.0[${PYTHON_USEDEP}]
<=dev-python/python-neutronclient-3.0.0[${PYTHON_USEDEP}]
dev-python/pyudev[${PYTHON_USEDEP}]
- >dev-python/sqlalchemy-0.7.8
- <=dev-python/sqlalchemy-0.7.99
+ sqlite? ( >=dev-python/sqlalchemy-0.7.8[sqlite,${PYTHON_USEDEP}]
+ <dev-python/sqlalchemy-0.7.10[sqlite,${PYTHON_USEDEP}] )
+ mysql? ( >=dev-python/sqlalchemy-0.7.8[mysql,${PYTHON_USEDEP}]
+ <dev-python/sqlalchemy-0.7.10[mysql,${PYTHON_USEDEP}] )
+ postgres? ( >=dev-python/sqlalchemy-0.7.8[postgres,${PYTHON_USEDEP}]
+ <dev-python/sqlalchemy-0.7.10[postgres,${PYTHON_USEDEP}] )
>=dev-python/webob-1.2[${PYTHON_USEDEP}]
>=dev-python/oslo-config-1.1.0[${PYTHON_USEDEP}]
virtual/python-argparse[${PYTHON_USEDEP}]