updating neutron for full distutils-r1 support

(Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key 0x2471eb3e40ac5ac3)

5 files changed, 58 insertions, 29 deletions

diff --git a/sys-cluster/neutron/ChangeLog b/sys-cluster/neutron/ChangeLog
index 2b3bc21f7b68..bbc936830898 100644
--- a/sys-cluster/neutron/ChangeLog
+++ b/sys-cluster/neutron/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-cluster/neutron
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/ChangeLog,v 1.6 2013/09/05 21:46:49 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/ChangeLog,v 1.7 2013/09/12 06:09:52 prometheanfire Exp $
+
+*neutron-2013.1.3-r2 (12 Sep 2013)
+*neutron-2012.2.4-r3 (12 Sep 2013)
+
+  12 Sep 2013; Matthew Thode <prometheanfire@gentoo.org>
+  +neutron-2012.2.4-r3.ebuild, +neutron-2013.1.3-r2.ebuild,
+  -neutron-2012.2.4-r2.ebuild, -neutron-2013.1.3-r1.ebuild,
+  neutron-2013.1.9999.ebuild, neutron-9999.ebuild:
+  updating neutron for full distutils-r1 support
 
 *neutron-2013.1.3-r1 (05 Sep 2013)
 *neutron-2012.2.4-r2 (05 Sep 2013)
diff --git a/sys-cluster/neutron/neutron-2012.2.4-r2.ebuild b/sys-cluster/neutron/neutron-2012.2.4-r3.ebuild
index b9645ca250a5..89a69995bbf8 100644
--- a/sys-cluster/neutron/neutron-2012.2.4-r2.ebuild
+++ b/sys-cluster/neutron/neutron-2012.2.4-r3.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-2012.2.4-r2.ebuild,v 1.1 2013/09/05 21:46:49 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2012.2.4-r3.ebuild,v 1.1 2013/09/12 06:09:52 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -17,7 +17,8 @@ S="${WORKDIR}/quantum-${PV}"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-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}]
@@ -29,11 +30,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/routes-1.12.3[${PYTHON_USEDEP}]
@@ -48,8 +49,12 @@ RDEPEND="=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
 		dev-python/netaddr[${PYTHON_USEDEP}]
 		>=dev-python/python-quantumclient-2.0[${PYTHON_USEDEP}]
 		dev-python/pyudev[${PYTHON_USEDEP}]
-		>dev-python/sqlalchemy-0.6.4
-		<=dev-python/sqlalchemy-0.7.9
+		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.0.8[${PYTHON_USEDEP}]
 		net-misc/openvswitch
 		dhcp? ( net-dns/dnsmasq )"
diff --git a/sys-cluster/neutron/neutron-2013.1.3-r1.ebuild b/sys-cluster/neutron/neutron-2013.1.3-r2.ebuild
index 61b06fcf043c..63d50611702b 100644
--- a/sys-cluster/neutron/neutron-2013.1.3-r1.ebuild
+++ b/sys-cluster/neutron/neutron-2013.1.3-r2.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-2013.1.3-r1.ebuild,v 1.1 2013/09/05 21:46:49 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2013.1.3-r2.ebuild,v 1.1 2013/09/12 06:09:52 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -17,7 +17,8 @@ S="${WORKDIR}/quantum-${PV}"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-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}]
@@ -29,11 +30,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,9 +53,13 @@ RDEPEND=">=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
 		dev-python/python-novaclient[${PYTHON_USEDEP}]
 		>=dev-python/python-quantumclient-2.2.0[${PYTHON_USEDEP}]
 		<=dev-python/python-quantumclient-3.0.0[${PYTHON_USEDEP}]
+		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/pyudev[${PYTHON_USEDEP}]
-		>dev-python/sqlalchemy-0.7.8
-		<=dev-python/sqlalchemy-0.7.99
 		>=dev-python/webob-1.2[${PYTHON_USEDEP}]
 		>=dev-python/oslo-config-1.1.0[${PYTHON_USEDEP}]
 		virtual/python-argparse[${PYTHON_USEDEP}]
diff --git a/sys-cluster/neutron/neutron-2013.1.9999.ebuild b/sys-cluster/neutron/neutron-2013.1.9999.ebuild
index 1ece438a080b..3b2218f14332 100644
--- a/sys-cluster/neutron/neutron-2013.1.9999.ebuild
+++ b/sys-cluster/neutron/neutron-2013.1.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-2013.1.9999.ebuild,v 1.5 2013/09/05 21:46:49 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2013.1.9999.ebuild,v 1.6 2013/09/12 06:09:52 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -17,7 +17,8 @@ EGIT_BRANCH="stable/grizzly"
 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}]
@@ -29,11 +30,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}]
@@ -53,8 +54,12 @@ RDEPEND=">=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
 		>=dev-python/python-quantumclient-2.2.0[${PYTHON_USEDEP}]
 		<=dev-python/python-quantumclient-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}]
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}]