undoing some of upstreams stupid with the quantum->neutron thing

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0x2471EB3E40AC5AC3

5 files changed, 30 insertions, 26 deletions

diff --git a/sys-cluster/nova/ChangeLog b/sys-cluster/nova/ChangeLog
index d4ec3d3267d8..dcebe2f65c92 100644
--- a/sys-cluster/nova/ChangeLog
+++ b/sys-cluster/nova/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/nova
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/ChangeLog,v 1.21 2013/08/20 16:33:00 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/ChangeLog,v 1.22 2013/08/22 04:55:51 prometheanfire Exp $
+
+  22 Aug 2013; Matthew Thode <prometheanfire@gentoo.org>
+  nova-2012.2.4-r4.ebuild, nova-2013.1.3.ebuild, nova-2013.1.9999.ebuild:
+  undoing some of upstreams stupid with the quantum->neutron thing
 
   20 Aug 2013; Matthew Thode <prometheanfire@gentoo.org>
   nova-2012.2.4-r4.ebuild, nova-2013.1.3.ebuild, nova-2013.1.9999.ebuild,
diff --git a/sys-cluster/nova/Manifest b/sys-cluster/nova/Manifest
index a174eb411b68..a6bd397d29c9 100644
--- a/sys-cluster/nova/Manifest
+++ b/sys-cluster/nova/Manifest
@@ -8,26 +8,26 @@ AUX nova-folsom-4-CVE-2013-2096.patch 4545 SHA256 b7203f3d380b3d545259060872933e
 AUX nova-grizzly-1-CVE-2013-2096.patch 4019 SHA256 d20b89067fb63f4d37ebc5c258841c3d18bd9e4e59c455f247f8df1a25973be6 SHA512 e4b80eaf8260765534d1a69c1c3883c794e611ac17acf299443b519c09503f0f063bc2ea1b090e1519e30ef3afa84253ce0e2603a764001556e52c6b09bfc814 WHIRLPOOL 44215c9e48d06976ba372421b5de29083a72172f1f02a84649eecd1dff675ecbdde9be69851ca10fe194346ad750e900c1dafa0ea4be8799c4bf055126bd18e7
 DIST nova-2012.2.4.tar.gz 6286004 SHA256 883a44282514b484a1187c07875834b9c4648555bf20002aceb1d6731ebd0252 SHA512 c05705c7802035232921e7ca9cdcea05571f4771dae573f9364b740553e470d8e4b4e832bf04120c089bad48a75b8493921eefeb28383f70620495a935ad6ec3 WHIRLPOOL 9e8c56b1a66f15f5f6218413e1cd518a0e73f371baea774023a11ad38abccae3e172ec0894fd77f59848685d1993451499916b94c62289d16f57470005e7c123
 DIST nova-2013.1.3.tar.gz 5780115 SHA256 f7c25186920daccb16867c5fd272318beb8cc076e5a55f79b5906618ef2724f4 SHA512 3de29f1cf0789285c7600796588058f056d4196138584bb5ec13a0ea034bbc0569d116a668db67022e302b29995af5960093af1103996269d73dccd62a5dd238 WHIRLPOOL ebb06733a710764004f99da2a69d5479cdd50e35da6d0992233ab9ca0a7a5854a678c5d184d40f97a66fa3abd052b1e6de4629963dd58292f677707997e56239
-EBUILD nova-2012.2.4-r4.ebuild 2762 SHA256 ae4a79a2b1fafd5bc134cbcbc5555dd093e1d3fc2d0777bd42f0484dc4140d22 SHA512 fc25126ccd1c7de18466105d977ede6ecb14c17cf8e5f57e2d8380f7fdf5e9d261a1359314865b30c24dc2226a434c0f06388bb3d1dca3bf41c44e5173ebe896 WHIRLPOOL 893051495636b0bb44a9399e4c138abe5a9fe62b91adacceef226b1328c3e63a0d485a2cddf547392de9fb0a4eb11a13999293d438bc91b5576f895ea7fa524a
-EBUILD nova-2013.1.3.ebuild 2973 SHA256 7d289d1a8f4dc914e6802cf33fb3d9f2beb46cc2ecbe8ac4b45bf5fbc599835a SHA512 67e710d0f0ccaee01d21a8e5099cb5b3224b26595a0d1a3ab0bd9a048c3d8d17e46ea0381aecf0af430ed96923b92b915b3f483f23acbfa9d887c4c9244de05b WHIRLPOOL d382e104f8c127160751b8dc4f886b9d9de095660ff8cba6e620cd0ca354ed5585c933d433d6b22826f71fc955b817a17ab69a9deecb961483a881648b1274a9
-EBUILD nova-2013.1.9999.ebuild 3040 SHA256 d39bfb6d224262fddfaecd2b92d1f39ef1b85e1d754c45a5cccb79a41eb373f0 SHA512 d2465b02109b05e917292e62291adfede12e0a9c416d833a4390c7f1e24a7c76c6601798474f527d4e4c1c219dfaad67fe67b5fd990cdb845299852bbb56c7b7 WHIRLPOOL d45ffc57b974db2190928d4de58df14143ab5863b937291d73ebc26ca3fe811d791ce350a39585bf5af21b25759683f278aebc03098daae10c6ca0a79f4fb5f1
+EBUILD nova-2012.2.4-r4.ebuild 2762 SHA256 9ec14b819b78d8c3848cefbfa2aaf5d0c58eed9805bab9bf2ebf9ea2bec523aa SHA512 2ad3de9fb6bf85728c0271358ca3ccf3e33f67660ff62d14d082873de7932b372eb803394ef93a8c9f5f1e5703529fa802369878b7dd2019c2d2d42d33556eae WHIRLPOOL b003741acbdb009cce5ad5d4c0c268766eec361da187bb88eacae01678b72cd620334d64627f2cc2c31e75e7ef6dd2648673bf0edd5a40db2167e0d72611527c
+EBUILD nova-2013.1.3.ebuild 2973 SHA256 b9d1540049f2d7ce39347063da58d9fef43baf3d6193571ac9f42231cfcce2bb SHA512 76ae944189ec7b6550bcca43e65ee3cc56b323a36ebfbb747549e306a816b17357b70b33804330822c375112288a8588c3ca4573469ce2bf2e21fdd1ad4a9336 WHIRLPOOL ec73aed8a2b0c8e203932cde5c96d2d52079d775f648b7011d3997f3d9278cc3ce7c55dd35cae2db39e175fd7f1673a21d0b11afd3bb1845e7b92cbe0caee6a2
+EBUILD nova-2013.1.9999.ebuild 3040 SHA256 25c86046532cb36e0e7bcf98c37d15e0898d3d1f2705ce94f9dd55ede0734483 SHA512 c65728f3099b45b44d0485173963c08e7c07da625639c3fa4d09bf5f7d72800dd9d3414e9ba59ea2c55727a44a84a6f2ad9a8ac762d43b11b529e596eba17779 WHIRLPOOL 7bab298b5ab9d3c3f8f27d59ea9e0c446bf8edd229d9c6374847cf2ec6b56c3c47d130100ba535656807f45cfb2ca7f7bf1805c80dfcc05d64b25229800d9349
 EBUILD nova-9999.ebuild 3025 SHA256 fdff763ec40da91df1ce97f19db42f6544bed40f07ec0eb3211c187e27609f64 SHA512 18a84ae65e5ef2fa3ad241604e21ba18be4c08693e74af4323e75011c0d0c0c4538101e4c047be655a83c2fc87c73d653730be756ca1dab32d9661379b972036 WHIRLPOOL 9e543a299d501b637c4169f8bfc5bbde8ee6655ca0fc4495f4a73d77a4675503669ff1cd5f4d2bff70def607e0c19c99793c844c619bee4cb0e2287a7dba181d
-MISC ChangeLog 4715 SHA256 eb5f3e52098ebf59c23dec8a5dff4db33c170a3ea0c6a4c9cd7852257734bfc7 SHA512 8155199047582fa83fb2fa2d1b0e5e81e90662d2a9177cfbce323de574460b00e47d1d37dd5e514c7a175f2ea7917988f5e35626c65ed62a8f6530d2d48238c6 WHIRLPOOL 9dc4b1c183921036ad770f75aa2c267727b2f5ae1cf17fd2b930be3e5456c44dfbad05c7db78383066f3e4895afa997976bd7438c83a07a91a92729d3c5b964e
+MISC ChangeLog 4914 SHA256 93049e743f1eb4cc3def72bd7c7b8780b95474a1f64a944547f73827de49c2d8 SHA512 e30f65285b2283ef0e115dda0229053dcaf56af4316732e285a9e1c2665a3100f963214e2ff9f0c6913994491cf38ab5dec6b6f7802977ece155f86a795a047d WHIRLPOOL 45a580565978ca55945a120e5e0996d60d16240c59920ed98da1058cfa0fe033a2cd7d10e31c9b0f64eca1653a2197245b14f644133caa0b988dfd198dfc0cde
 MISC metadata.xml 407 SHA256 87ac581ad3af018ee16b2c5a8dbc98553ad93fc48bf5cfd62a6f929353049e77 SHA512 4ae00a6fc5411c1795249864317143787b31cb068fb1508f8a1455fd6194254961cca80256e0b437dc131560126cdf5a59d98a5a5064ac49c6e43c1651718a4a WHIRLPOOL 52b178c072593baea26fa3d7e9c06aac003d1a828ffa98de712306f60eeddba92271bc6061d7224a76ac35fa3c1da33213983e998160acf92a6d7027b284bcc0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSE5qAAAoJECRx6z5ArFrD0UEQAMWB2dMMH835PrkMgSh6d9/9
-/uG9dYVcVoI3zeW/FDR7585Hm6wc40mhxF09lmIPmVjG4JvFAmY2vLLWk0Gij4Lm
-ytsnPoysBZrJkJBfb61G5d1HPeyE4N7ybbWtoe3NpAIZjUVPShIbzi/9kOqzb/Ev
-GtNhT6iMIOSmEqzOPqoU6fkYeGdLdh7hnD86bmfbMIvpiWI9MmCWYnG0zE1e0qiw
-MfpcI+KNEdNUb8+n5QYsNyy1nbAZfc1xIn0v/ZOAT6rOsXysAG+/9is12BL8B7Ng
-OUaYb6j22jO8e+NKrBA4xmVW4ZEpSWbvaPWAsL16AQDyU9bCFbKBbVqYAx/UGIOt
-bIcp36eCYKixfPU5Q1p25V7EFdNXSxv28FKVlCk6pKNhtAPDUCWHX42Uysep0n/+
-cj3Lw7TugI7/oh17qu6O8sERBFQvCqxV+gKpXlSn8TQoAQvgc7dsUHOLvxluPaEk
-yzKJllSEk7kLtiklemMsEo9DTFUpk59Y2gnaOFolg4ExIEBC2uBnfcaZjjgEceT3
-foZunGo9bK4EJmieLq3G+uUd4pRnHNoLZuvAtebtnvVExf5Q06C9qgyVHB6wxigr
-zK2J4OR9FNyO4scOTiQEaDc7FOfH7LwXVO/ptol6rVkNfNi7EzTohaKshkB23rYM
-XPF5FPzc5IPxia5sM+U1
-=H7E1
+iQIcBAEBCAAGBQJSFZodAAoJECRx6z5ArFrDulUP/1sL5axCYPZQlv1xwJn4AWzU
+G0Ig1pABfsep214JClj7qINg46g+EB6r5mMQyidSewJJab09zY9/JPYnAYmK3omd
+Ts8fkq/M3U+B1oYYy2aSTE0g7/zCwcivU3/u2ebizZ0CEXZ/vzdD5GqE0ivgncDi
+yI0ghFebSgINYDK+hn+f/S72lbEgilph8E5wL+IQd6bX58s7s5J/dFcTRDOPpq0U
+vc518ZgK3EQJmlG0bXCN1VIbktTQoCvkR7Fqp92Uc1gp/hCHwbDewExU180+TbHR
+ZPSVkr/UdvBfVLDQ1vXRHzGJHZb7RAM6UCPcQ1N+oZX3QLKLkYQqLBsJWCSrZshF
+hNJqi3S/lI+kerITs58TufnyfV/kStZ5s2ZFL6cYbOJEJXTWBaMp36VrFEhrg0jD
+N4jkgIiiw2YmRbCORVBRPYXmrgpXnw2NRCXokSSN1zQlNRsrrHbzjQoMkz0Ub9f+
+QMUv48nyVdRdVQOjVBSS6bLEUc41f6RtsKSyRv+etkCmd5dK9nGEXQEQgZpU4paA
+30UavaYX+A0d9s/u9KuBuHlqz3xg1w6lzUnrgt0fuuL4iJQFN3LNFUEwq/QPkFvW
+pKATb7bm9ETzx9cgIWnI1KOiOuDzMTukohblF8JddA5ZmTHoeiqWqlQr8f/1Li3T
+vwQVnksAHu/LYpf3I3tx
+=nk9X
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/nova/nova-2012.2.4-r4.ebuild b/sys-cluster/nova/nova-2012.2.4-r4.ebuild
index e31fdc29698f..c6b90d561441 100644
--- a/sys-cluster/nova/nova-2012.2.4-r4.ebuild
+++ b/sys-cluster/nova/nova-2012.2.4-r4.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/nova/nova-2012.2.4-r4.ebuild,v 1.2 2013/08/20 16:33:00 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-2012.2.4-r4.ebuild,v 1.3 2013/08/22 04:55:51 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -41,7 +41,7 @@ RDEPEND="=dev-python/amqplib-0.6.1
 		>=dev-python/setuptools-git-0.4[${PYTHON_USEDEP}]
 		>=dev-python/python-glanceclient-0.5.0[${PYTHON_USEDEP}]
 		<dev-python/python-glanceclient-2[${PYTHON_USEDEP}]
-		>=dev-python/python-neutronclient-2.1[${PYTHON_USEDEP}]"
+		>=dev-python/python-quantumclient-2.1[${PYTHON_USEDEP}]"
 
 PATCHES=(
 	"${FILESDIR}/nova-folsom-4-CVE-2013-2030.patch"
diff --git a/sys-cluster/nova/nova-2013.1.3.ebuild b/sys-cluster/nova/nova-2013.1.3.ebuild
index 5aca1e44bf91..4705be447ab8 100644
--- a/sys-cluster/nova/nova-2013.1.3.ebuild
+++ b/sys-cluster/nova/nova-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/nova/nova-2013.1.3.ebuild,v 1.2 2013/08/20 16:33:00 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-2013.1.3.ebuild,v 1.3 2013/08/22 04:55:51 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -44,8 +44,8 @@ RDEPEND=">=dev-python/amqplib-0.6.1[${PYTHON_USEDEP}]
 		>=dev-python/python-cinderclient-1.0.1[${PYTHON_USEDEP}]
 		>=dev-python/python-glanceclient-0.5.0[${PYTHON_USEDEP}]
 		<dev-python/python-glanceclient-2[${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/python-keystoneclient-0.2.0[${PYTHON_USEDEP}]
 		>=dev-python/stevedore-0.7
 		<dev-python/websockify-0.4[${PYTHON_USEDEP}]
diff --git a/sys-cluster/nova/nova-2013.1.9999.ebuild b/sys-cluster/nova/nova-2013.1.9999.ebuild
index 6d3ad1b97b42..c2ce3e27c966 100644
--- a/sys-cluster/nova/nova-2013.1.9999.ebuild
+++ b/sys-cluster/nova/nova-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/nova/nova-2013.1.9999.ebuild,v 1.3 2013/08/20 16:33:00 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-2013.1.9999.ebuild,v 1.4 2013/08/22 04:55:51 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -45,8 +45,8 @@ RDEPEND=">=dev-python/amqplib-0.6.1[${PYTHON_USEDEP}]
 		>=dev-python/python-cinderclient-1.0.1[${PYTHON_USEDEP}]
 		>=dev-python/python-glanceclient-0.5.0[${PYTHON_USEDEP}]
 		<dev-python/python-glanceclient-2[${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/python-keystoneclient-0.2.0[${PYTHON_USEDEP}]
 		>=dev-python/stevedore-0.7
 		<dev-python/websockify-0.4[${PYTHON_USEDEP}]