undoing some of the quantum->neutron stuff because upstream is....

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

4 files changed, 20 insertions, 15 deletions

diff --git a/sys-cluster/neutron/ChangeLog b/sys-cluster/neutron/ChangeLog
index ef7a6113ccac..3ec575865013 100644
--- a/sys-cluster/neutron/ChangeLog
+++ b/sys-cluster/neutron/ChangeLog
@@ -1,6 +1,11 @@
 # 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.3 2013/08/20 19:36:07 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/ChangeLog,v 1.4 2013/08/22 04:54:22 prometheanfire Exp $
+
+  22 Aug 2013; Matthew Thode <prometheanfire@gentoo.org>
+  neutron-2012.2.4-r1.ebuild, neutron-2013.1.3.ebuild,
+  neutron-2013.1.9999.ebuild:
+  undoing some of the quantum->neutron stuff because upstream is....
 
   20 Aug 2013; Matthew Thode <prometheanfire@gentoo.org>
   neutron-2012.2.4-r1.ebuild, neutron-2013.1.3.ebuild,
diff --git a/sys-cluster/neutron/neutron-2012.2.4-r1.ebuild b/sys-cluster/neutron/neutron-2012.2.4-r1.ebuild
index a8a02594e989..22541d0a5ed2 100644
--- a/sys-cluster/neutron/neutron-2012.2.4-r1.ebuild
+++ b/sys-cluster/neutron/neutron-2012.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/sys-cluster/neutron/neutron-2012.2.4-r1.ebuild,v 1.3 2013/08/20 19:36:07 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2012.2.4-r1.ebuild,v 1.4 2013/08/22 04:54:22 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -44,7 +44,7 @@ RDEPEND="=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
 		=dev-python/kombu-1.0.4-r1[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/netaddr
-		>=dev-python/python-neutronclient-2.0[${PYTHON_USEDEP}]
+		>=dev-python/python-quantumclient-2.0[${PYTHON_USEDEP}]
 		dev-python/pyudev
 		>dev-python/sqlalchemy-0.6.4
 		<=dev-python/sqlalchemy-0.7.9
@@ -53,8 +53,8 @@ RDEPEND="=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
 
 python_install() {
 	distutils-r1_python_install
-	keepdir /etc/neutron
-	insinto /etc/neutron
+	keepdir /etc/quantum
+	insinto /etc/quantum
 
 	doins "etc/api-paste.ini"
 	doins "etc/dhcp_agent.ini"
diff --git a/sys-cluster/neutron/neutron-2013.1.3.ebuild b/sys-cluster/neutron/neutron-2013.1.3.ebuild
index 6ce6a85ee2e3..e582ab3b0470 100644
--- a/sys-cluster/neutron/neutron-2013.1.3.ebuild
+++ b/sys-cluster/neutron/neutron-2013.1.3.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.ebuild,v 1.3 2013/08/20 19:36:07 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2013.1.3.ebuild,v 1.4 2013/08/22 04:54:22 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -48,8 +48,8 @@ RDEPEND=">=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
 		=dev-python/pyparsing-1.5.7[${PYTHON_USEDEP}]
 		>=dev-python/python-keystoneclient-0.2.0[${PYTHON_USEDEP}]
 		dev-python/python-novaclient[${PYTHON_USEDEP}]
-		>=dev-python/python-neutronclient-2.2.0[${PYTHON_USEDEP}]
-		<=dev-python/python-neutronclient-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/python-quantumclient-2.2.0[${PYTHON_USEDEP}]
+		<=dev-python/python-quantumclient-3.0.0[${PYTHON_USEDEP}]
 		dev-python/pyudev
 		>dev-python/sqlalchemy-0.7.8
 		<=dev-python/sqlalchemy-0.7.99
@@ -60,8 +60,8 @@ RDEPEND=">=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
 
 python_install() {
 	distutils-r1_python_install
-	keepdir /etc/neutron
-	insinto /etc/neutron
+	keepdir /etc/quantum
+	insinto /etc/quantum
 
 	doins "etc/api-paste.ini"
 	doins "etc/dhcp_agent.ini"
diff --git a/sys-cluster/neutron/neutron-2013.1.9999.ebuild b/sys-cluster/neutron/neutron-2013.1.9999.ebuild
index b1021c2f38f6..4e01cb84c96a 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.2 2013/08/20 19:36:07 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2013.1.9999.ebuild,v 1.3 2013/08/22 04:54:22 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -48,8 +48,8 @@ RDEPEND=">=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
 		=dev-python/pyparsing-1.5.7[${PYTHON_USEDEP}]
 		>=dev-python/python-keystoneclient-0.2.0[${PYTHON_USEDEP}]
 		dev-python/python-novaclient[${PYTHON_USEDEP}]
-		>=dev-python/python-neutronclient-2.2.0[${PYTHON_USEDEP}]
-		<=dev-python/python-neutronclient-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/python-quantumclient-2.2.0[${PYTHON_USEDEP}]
+		<=dev-python/python-quantumclient-3.0.0[${PYTHON_USEDEP}]
 		dev-python/pyudev
 		>dev-python/sqlalchemy-0.7.8
 		<=dev-python/sqlalchemy-0.7.99
@@ -60,8 +60,8 @@ RDEPEND=">=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
 
 python_install() {
 	distutils-r1_python_install
-	keepdir /etc/neutron
-	insinto /etc/neutron
+	keepdir /etc/quantum
+	insinto /etc/quantum
 
 	doins "etc/api-paste.ini"
 	doins "etc/dhcp_agent.ini"