update to 2013.2.1

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

5 files changed, 76 insertions, 129 deletions

diff --git a/sys-cluster/cinder/ChangeLog b/sys-cluster/cinder/ChangeLog
index f5ae3a7b17e0..2329c37cca97 100644
--- a/sys-cluster/cinder/ChangeLog
+++ b/sys-cluster/cinder/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/cinder
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/ChangeLog,v 1.25 2013/11/14 17:07:18 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/ChangeLog,v 1.26 2013/12/19 05:34:22 prometheanfire Exp $
+
+*cinder-2013.2.1 (19 Dec 2013)
+
+  19 Dec 2013; Matthew Thode <prometheanfire@gentoo.org>
+  +cinder-2013.2.1.ebuild, -cinder-2013.2-r1.ebuild, -cinder-2013.2.ebuild,
+  cinder-2013.2.9999.ebuild:
+  update to 2013.2.1
 
 *cinder-2013.2-r1 (14 Nov 2013)
 
diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest
index dfec2ab8da3b..bf74759f2f9a 100644
--- a/sys-cluster/cinder/Manifest
+++ b/sys-cluster/cinder/Manifest
@@ -6,19 +6,28 @@ AUX cinder-confd 75 SHA256 178148ecb30d9d1a03e4f5210dfa235be3028dc2af7d6f7a4c2e4
 AUX cinder-init 1436 SHA256 ef93804e171364da98232fca2bf25adfb16e062c8b4dd69ce12f280b08ca8154 SHA512 b6d9d5a949cd43669a28b4e2c54cf795c92f070d10b56130f5a024fcbf9934d9e4f910e78972f427c979e68ee71c55006ecc9008eacf5c8abbe4c81c7b0731bf WHIRLPOOL 5983f6cbf500359d4e03b89d240f7652bd22655c0edcb858052062c4886c4da1d72ded228dd79847f74c279d5592dab2945807f611db1bf847a2c6d2b9f8f619
 AUX cinder-sudoers 86 SHA256 a2c2b8f50b21deaceaa2184c00725492cd96db44736cb3fe4bf4aaecc0805b6f SHA512 c158be54e721abc6916db2e710092ca75aac65ac88b19849ccd0f3ebbb7c8879aab6b73aba36537e806abd5b8b5e8fbc24fca79d00015d3308198d5270e51fe1 WHIRLPOOL 52642c53b34b089fb9c82c1307c02cd611ea834492a2919a12902bc974a146348a3dcde3db6058eb417395acaff8131398e70fbfa74c7325abcd695102f372c3
 DIST cinder-2013.1.4.tar.gz 1702388 SHA256 b3466dbc2ea88eef67f73db2b12ec2e8b66047b2bfa0eea31392e155657bee00 SHA512 360d02852b185e21ab59a4006999a1210c23c44f143a2e32b2c9f1a1475b985d302c889a799ae3d1ace2b386c504a768c106bab27ae44715560cf14127133010 WHIRLPOOL 47e8eb85d52880eed8f3612e8784b53f9b760ca7c0a7937bb488bab3d4167d32b7d739f48751c3a582eac4473f71785e1ae459706c952866839302b8a2bf1a95
-DIST cinder-2013.2.tar.gz 3484314 SHA256 6a446dcdc603031074d52b77d357ef4a4497025ef36af9babdaeca14ce0705dd SHA512 cba78362e39728c529184b3397841da7097575c1795020dac59de0c28b9e9f676a8cfaa562dfcc55931bace4dd3bc20b0bc0a920d68cef4cbc2af7d94c087017 WHIRLPOOL 2dfb227468b5195f16644f08e2d10caf0289c857af954e0bf55e9c6487231d649d8c7c76c5ba1117e9e60432bb438157222b7dbb103bb7be212504af6472cd75
+DIST cinder-2013.2.1.tar.gz 3500112 SHA256 79ac0767343f8b11c444f775aec505fdaee4689539529d188204d4297d904013 SHA512 b1a38b7a01999d6837f81ad44983c18ac7b61591660f68cf53b2c5ce2a091acd93dfe5c8c1bcd1a0406d6e884c5a9f54a56ec417955cc0b06d68c60b30b7925f WHIRLPOOL 900b63ce0bcbf7fbb31e05c080e49ef7bc25b67ed0f787793ad0c23cc78379817f4a4b1b47c75a4531685432e6407b83e2b348ac9c93abd765cbbb6ce0992d25
 EBUILD cinder-2013.1.4.ebuild 3656 SHA256 8d641afd152ef604af40bb1a4cacd751ad89dac25b8271573f4c5153fb68442d SHA512 fd211cf2bde3d77d05a4b7a6cd73b7528f4819a56fc80febce16eddb8de000e41aea59daeb824d5e7aa0fa8001c31495f15ca8c41863b224f4aaee61ed483909 WHIRLPOOL bd3179aa3d6f3c30448678106f9a33ba53e98f8d8aabe49f3a15f59224ebabac836e50041b554fb8d77c27e769c914c10d65f94ae6994680339b94237175192a
 EBUILD cinder-2013.1.9999.ebuild 3602 SHA256 ad4785eddb810d4c2459e0f5cec5d4a996aba92f791f76fe14738fd23066df8b SHA512 f78c45a0e32894e3253ce4ff663495e2b88768c7d15c3276adaf512564bf1777bb38d756580fa8dc308cd0ee1c3a87787091457368c5e245d5a53ff8cc15ce90 WHIRLPOOL 8f6bb2d6c1caabcc9ca0395e1cd39bf032090811a97628ed38ca5a2bdda7b8d7eadc5f4a0ede4d0ac6a4ca8d4b2ee309fdb76458c933305422141512a1fd1b40
-EBUILD cinder-2013.2-r1.ebuild 4736 SHA256 c6af3d58b98e13dc287b890bb8263f6caa85b13c1e276781d431283a5256bc69 SHA512 e11457f241d3c5c7e2699449fba1fe7d0f77d196eb63bd601ecbf70be8b094dd3b57fb1a930bf7c10d183861bc98e318d85a86db19f24db7bc68d1cc98703c53 WHIRLPOOL bd8030e948a3ecc91137d9312fd95e3acb7b22d239f2405229ce40f21108a39ef790c270c64f2aa14e854e430c90d6db6270d58a71254b08ae45d85dafef1783
-EBUILD cinder-2013.2.9999.ebuild 3717 SHA256 8749c3dccb13f38b7fe53ce6b68601a45eb01b017e197c95d705eff1d5e07900 SHA512 ebb0b4816e9dc85d25a051432e6521cfab4b9094c9cefe2c242c24e0b981bd384b35fb159e33a4a924a23bf738a1f972e447eb0c472a31670a121ee6449abf2d WHIRLPOOL 9216201025d550355473bf54ec38a6d65b8ab6c19687825a51a7ab7077ed025856c156377614e366bbcd8fa82371ca36cee25b14b81177530ac0590411cf95c7
-EBUILD cinder-2013.2.ebuild 3705 SHA256 3b92f3b013599fe5144bfef70fab94744a5a77d5dfba0c1bcb70b937f2b33e30 SHA512 fa5f4ce04bc371286e093b1afd985f70d45207b117a9355184fcb970b529dc5c0b8f1991d1e70523fbb1b07ad726cee7821797d6e927e10310e0c12dd89c1781 WHIRLPOOL 2c181a78ba3a49db28c7aaa927caa5277376f5c5f194de71b4ebd25c7a1c99b6a5f83cb8f8ec350ff98bc7669f4c2a2294e7f7ba83b6833e00386fbf800be2e4
+EBUILD cinder-2013.2.1.ebuild 4751 SHA256 dc091f06d6882e25d30fa5713f14f2bfb826eca4b84494b62984569328b517e9 SHA512 3fd87ed1bcb610188bf239c023fb22df1596de47c92e5eadc6578a8dc76b6c56634d7ee89c2f772eb5247bb542208376dcc72bd6ae4941245e04119f72277a9f WHIRLPOOL f61a71fee94b250a0e8037f1e50d734d13681bc21f67e397466b98619fb88cb6651d740fa60f89a8826114af6fdb5df2fbe90e641295f8718e0cf190d0dead11
+EBUILD cinder-2013.2.9999.ebuild 4761 SHA256 063dffc9d1a941cc06b4b368d297deaf7b703c894a9ee376f4ca676449243fe6 SHA512 a3d0a768718cf04aef6e30191734c747fbcc0b79ba364f5becf999ef91a5f44d8ff5581c242466ac740b5ecf00d3c2b120fd1bc0371350f3039f244aeb0c55d0 WHIRLPOOL 81d8d1b10b0cb9143b63de114665b1bcef58ebf079cac1a3142ed46d271a809f159d66f4022a77ae3f142e12843ec6e4013f9b9032e4d2a3caa2ceaf8f84f0b5
 EBUILD cinder-9999.ebuild 3654 SHA256 1be67e5e04046a66dbc4270e41d1dff2728f5fb0e03c2f7dff678a7ef49d16fd SHA512 8a2f30b0f5fdf5c141697f7377b4cee3b92a04e9fa90c7a3f99298040fc3859c484b9924ec83d84d30b26ab253dcd31b6bf6fbaf89e53e52c6ff817e80ea519a WHIRLPOOL 44890289daf5963c0e80018bf90f99c77cc67539b81c6eb95c1ebf6db74b0421d0bd8345d9a75b02a8a921fa6a29e6592c62fb0a46c0059003ef712ef037d454
-MISC ChangeLog 4996 SHA256 ff99c7c9dbb335ddd00899c5a1efa0ad53fd174823e4c8d05c6ea9b9324701d9 SHA512 d23e24994f7bd2c46d058e839d28e67278f2dc450f71619f726345209ae6425781aad244a483b9978729f93d973989dae4c1cf25df43ceb2e46e37fc40f96e77 WHIRLPOOL 7c0a3b0116a646f55bd9cfc9a54216473660e6be1706062e499733374e299514351c32555856cc86b39d9f569a360204bac12ac1630b4a818b5c428972ea2e69
+MISC ChangeLog 5219 SHA256 b1addf74d401ad7a25ad76104f0d82445da7768a75a71cd7d506df210508a0c7 SHA512 509143beecb2df21fd8d4862a2f1b8a16cf631fb21afe7a1d668209998f77cff26ec417f013664d01bd9a6012e3a12e7a579375f647a5aa7c576749819bb247b WHIRLPOOL 5612cea756530228da883281c544810d5bff8c337c36e77f3b0a681f6a949ad1adc35c95035442f9a644dbe00cab0226a70969bef416952c026c9866f5fa9f2e
 MISC metadata.xml 661 SHA256 9621b252596847dcd9bb85787c8659a9724f082a4fbbae416fee6109a32ed379 SHA512 50232b02941c021dd6400937eb2d74e4813f576abdd7923b622b84af0d04dcf0367e6de9d829f457988ef57732975d1662c35eaca9e0226cd99cb9d52ce06df9 WHIRLPOOL ac55bae82fb59b42cdd9a09a71789a2b19eed96f65a795fedcad5718e5bf26161f2eb3ce133a4316487088eddd58ea0533eaac87679ca88ed1dfca3ccace3c66
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlKFA1MACgkQso7CE7gHKw2nqwCgpx5F1hWnwZ4rBxdkOkUqFVHC
-NUQAoI1PnFwyf/znv253KgFmqyaK/M17
-=CI1W
+iQIcBAEBCAAGBQJSsoVsAAoJECRx6z5ArFrDKAAQALAM24LSHM+4ofYpVcUkCDWL
+L07z7n7ClVmsPXey1ks+XGzOWAB12fWmy1UJBwaR3SGs0Km5k3XzuJlPyHx+ZKQy
+N9zCPbjC6+TFaHpLO0uRsCBf2gHJYFJMNKWtS45bV9Lyf4SmECmTn7Z5eJSDHlt3
+ueLR+626dwJznPhFx0ettFTA9IPMYNvV/dIK7qwKooSqLSQFlQ/xj0eRmyw3PdHX
+6mONpdeXia44kCS+RRHQeWj6XVFi10QJJNjOoZv3ECi5fQDCMwI+52KZA+0rQLoZ
++knvcy++wWoP7+R/MIvFwxABxkF3U5DEJlaAza08lq7C325xpDGIxqqN/8qg/QLN
+xq+4ibkdQuBMQ0NVQYBlIh6W/G0RuJ5Qqno/BOdwc3DjDCujcs/mQ/vYhL4TIl+t
+k5DrYdooxGRlnmTuWNd1oxeXYuPH7nDP4ZCKxvaHZZGOPBoDPpLFtuzfqR5FAiwg
+9KsM+mWNWn4a7c8skS6YRdDeBS7qNgCnKLqZe6NyqKDlz2Vhg1gfUWK1Wwfrnev1
+YAEcwvRWpb6Kei+12IYajJCWkIBQM+m7D0E5aEr828q01mT46S0y4t5hyPHJyIWw
+07+osc9MBziqH4iR/hH7XLq+yuGGgi83L2E3A8dKYtBzoBwMTbB16U4WJw9+iayP
+KTXjNYcbTX2CbPUXqeNu
+=rOuf
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/cinder/cinder-2013.2-r1.ebuild b/sys-cluster/cinder/cinder-2013.2.1.ebuild
index 896e0c9b1db0..22fb6d29898a 100644
--- a/sys-cluster/cinder/cinder-2013.2-r1.ebuild
+++ b/sys-cluster/cinder/cinder-2013.2.1.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/cinder/cinder-2013.2-r1.ebuild,v 1.1 2013/11/14 17:07:18 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/cinder-2013.2.1.ebuild,v 1.1 2013/12/19 05:34:22 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -19,8 +19,7 @@ REQUIRED_USE="|| ( mysql postgres sqlite )"
 
 #sudo is a build dep because I want the sudoers.d directory to exist, lazy.
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.5.21[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+		dev-python/pbr[${PYTHON_USEDEP}]
 		app-admin/sudo
 		test? ( >=dev-python/jsonschema-0.7[${PYTHON_USEDEP}]
 			<=dev-python/jsonschema-1.0[${PYTHON_USEDEP}]
@@ -35,6 +34,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 			dev-python/mysql-python[${PYTHON_USEDEP}]
 			dev-python/psycopg[${PYTHON_USEDEP}]
 			>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+			<dev-python/sphinx-1.2[${PYTHON_USEDEP}]
 			dev-python/subunit[${PYTHON_USEDEP}]
 			>=dev-python/testtools-0.9.32[${PYTHON_USEDEP}]
 			>=dev-python/testrepository-0.0.17[${PYTHON_USEDEP}]
@@ -46,27 +46,27 @@ RDEPEND="=dev-python/amqplib-0.6.1-r1[${PYTHON_USEDEP}]
 		>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
 		>=dev-python/eventlet-0.13.0[${PYTHON_USEDEP}]
 		>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-		>=dev-python/iso8601-0.1.4[${PYTHON_USEDEP}]
+		>=dev-python/iso8601-0.1.8[${PYTHON_USEDEP}]
 		>=dev-python/kombu-2.4.8[${PYTHON_USEDEP}]
 		>=dev-python/lockfile-0.8[${PYTHON_USEDEP}]
 		>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
 		dev-python/netaddr[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-config-1.2.0[${PYTHON_USEDEP}]
 		>=dev-python/paramiko-1.8.0[${PYTHON_USEDEP}]
 		dev-python/paste[${PYTHON_USEDEP}]
 		>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
 		>=dev-python/python-glanceclient-0.9.0[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-0.3.0[${PYTHON_USEDEP}]
+		>=dev-python/python-keystoneclient-0.3.2[${PYTHON_USEDEP}]
 		>=dev-python/python-novaclient-2.15.0[${PYTHON_USEDEP}]
 		>=dev-python/python-swiftclient-1.5[${PYTHON_USEDEP}]
 		>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
+		>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
 		sqlite? ( >=dev-python/sqlalchemy-0.7.8[sqlite,${PYTHON_USEDEP}]
 			<dev-python/sqlalchemy-0.7.99[sqlite,${PYTHON_USEDEP}] )
 		mysql? ( >=dev-python/sqlalchemy-0.7.8[mysql,${PYTHON_USEDEP}]
-	        	<dev-python/sqlalchemy-0.7.99[mysql,${PYTHON_USEDEP}] )
+			<dev-python/sqlalchemy-0.7.99[mysql,${PYTHON_USEDEP}] )
 		postgres? ( >=dev-python/sqlalchemy-0.7.8[postgres,${PYTHON_USEDEP}]
-	        	<dev-python/sqlalchemy-0.7.99[postgres,${PYTHON_USEDEP}] )
+			<dev-python/sqlalchemy-0.7.99[postgres,${PYTHON_USEDEP}] )
 		>=dev-python/sqlalchemy-migrate-0.7.2[${PYTHON_USEDEP}]
 		>=dev-python/stevedore-0.10[${PYTHON_USEDEP}]
 		>=dev-python/suds-0.4[${PYTHON_USEDEP}]
@@ -74,7 +74,8 @@ RDEPEND="=dev-python/amqplib-0.6.1-r1[${PYTHON_USEDEP}]
 		<dev-python/webob-1.3[${PYTHON_USEDEP}]
 		>=sys-block/iscsitarget-1.4.20.2_p20130821
 		sys-fs/lvm2
-		sys-block/open-iscsi"
+		sys-block/open-iscsi
+		sys-fs/sysfsutils"
 
 PATCHES=( )
 
diff --git a/sys-cluster/cinder/cinder-2013.2.9999.ebuild b/sys-cluster/cinder/cinder-2013.2.9999.ebuild
index 9e68dd80b062..ca72d4440f6e 100644
--- a/sys-cluster/cinder/cinder-2013.2.9999.ebuild
+++ b/sys-cluster/cinder/cinder-2013.2.9999.ebuild
@@ -1,14 +1,13 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/cinder-2013.2.9999.ebuild,v 1.2 2013/11/14 04:20:23 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/cinder-2013.2.9999.ebuild,v 1.3 2013/12/19 05:34:22 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1 eutils git-2
 
-DESCRIPTION="Cinder is the OpenStack Block storage service. This is a spin out
-of nova-volumes."
+DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes."
 HOMEPAGE="https://launchpad.net/cinder"
 EGIT_REPO_URI="https://github.com/openstack/cinder.git"
 EGIT_BRANCH="stable/havana"
@@ -16,14 +15,31 @@ EGIT_BRANCH="stable/havana"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS=""
-IUSE="+api +scheduler +volume mysql postgres sqlite"
+IUSE="+api +scheduler +volume mysql postgres sqlite test"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
 #sudo is a build dep because I want the sudoers.d directory to exist, lazy.
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.5.21[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-		app-admin/sudo"
+		dev-python/pbr[${PYTHON_USEDEP}]
+		app-admin/sudo
+		test? ( >=dev-python/jsonschema-0.7[${PYTHON_USEDEP}]
+			<=dev-python/jsonschema-1.0[${PYTHON_USEDEP}]
+			<dev-python/hacking-0.8[${PYTHON_USEDEP}]
+			>=dev-python/hacking-0.5.6[${PYTHON_USEDEP}]
+			>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+			>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+			>=dev-python/hp3parclient-2.0[${PYTHON_USEDEP}]
+			<dev-python/hp3parclient-3.0[${PYTHON_USEDEP}]
+			>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+			>=dev-python/mox-0.5.3[${PYTHON_USEDEP}]
+			dev-python/mysql-python[${PYTHON_USEDEP}]
+			dev-python/psycopg[${PYTHON_USEDEP}]
+			>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+			<dev-python/sphinx-1.2[${PYTHON_USEDEP}]
+			dev-python/subunit[${PYTHON_USEDEP}]
+			>=dev-python/testtools-0.9.32[${PYTHON_USEDEP}]
+			>=dev-python/testrepository-0.0.17[${PYTHON_USEDEP}]
+			dev-python/oslo-sphinx[${PYTHON_USEDEP}] )"
 
 RDEPEND="=dev-python/amqplib-0.6.1-r1[${PYTHON_USEDEP}]
 		>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
@@ -31,27 +47,27 @@ RDEPEND="=dev-python/amqplib-0.6.1-r1[${PYTHON_USEDEP}]
 		>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
 		>=dev-python/eventlet-0.13.0[${PYTHON_USEDEP}]
 		>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-		>=dev-python/iso8601-0.1.4[${PYTHON_USEDEP}]
+		>=dev-python/iso8601-0.1.8[${PYTHON_USEDEP}]
 		>=dev-python/kombu-2.4.8[${PYTHON_USEDEP}]
 		>=dev-python/lockfile-0.8[${PYTHON_USEDEP}]
 		>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
 		dev-python/netaddr[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-config-1.2.0[${PYTHON_USEDEP}]
 		>=dev-python/paramiko-1.8.0[${PYTHON_USEDEP}]
 		dev-python/paste[${PYTHON_USEDEP}]
 		>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
 		>=dev-python/python-glanceclient-0.9.0[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-0.3.0[${PYTHON_USEDEP}]
+		>=dev-python/python-keystoneclient-0.3.2[${PYTHON_USEDEP}]
 		>=dev-python/python-novaclient-2.15.0[${PYTHON_USEDEP}]
 		>=dev-python/python-swiftclient-1.5[${PYTHON_USEDEP}]
 		>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
+		>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
 		sqlite? ( >=dev-python/sqlalchemy-0.7.8[sqlite,${PYTHON_USEDEP}]
-	          <dev-python/sqlalchemy-0.7.99[sqlite,${PYTHON_USEDEP}] )
+			<dev-python/sqlalchemy-0.7.99[sqlite,${PYTHON_USEDEP}] )
 		mysql? ( >=dev-python/sqlalchemy-0.7.8[mysql,${PYTHON_USEDEP}]
-	         <dev-python/sqlalchemy-0.7.99[mysql,${PYTHON_USEDEP}] )
+			<dev-python/sqlalchemy-0.7.99[mysql,${PYTHON_USEDEP}] )
 		postgres? ( >=dev-python/sqlalchemy-0.7.8[postgres,${PYTHON_USEDEP}]
-	            <dev-python/sqlalchemy-0.7.99[postgres,${PYTHON_USEDEP}] )
+			<dev-python/sqlalchemy-0.7.99[postgres,${PYTHON_USEDEP}] )
 		>=dev-python/sqlalchemy-migrate-0.7.2[${PYTHON_USEDEP}]
 		>=dev-python/stevedore-0.10[${PYTHON_USEDEP}]
 		>=dev-python/suds-0.4[${PYTHON_USEDEP}]
@@ -69,6 +85,15 @@ pkg_setup() {
 	enewuser cinder -1 -1 /var/lib/cinder cinder
 }
 
+#python_compile_all() { leave for next attempt
+#	use doc && emake -C doc html
+#}
+
+python_test() {
+	# Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727	
+	nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7"
+}
+
 python_install() {
 	distutils-r1_python_install
 	keepdir /etc/cinder
diff --git a/sys-cluster/cinder/cinder-2013.2.ebuild b/sys-cluster/cinder/cinder-2013.2.ebuild
deleted file mode 100644
index 2e0c828d7e1a..000000000000
--- a/sys-cluster/cinder/cinder-2013.2.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/cinder-2013.2.ebuild,v 1.2 2013/11/14 04:20:23 prometheanfire Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Cinder is the OpenStack Block storage service. This is a spin out
-of nova-volumes."
-HOMEPAGE="https://launchpad.net/cinder"
-SRC_URI="http://launchpad.net/${PN}/havana/${PV}/+download/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+api +scheduler +volume mysql postgres sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-#sudo is a build dep because I want the sudoers.d directory to exist, lazy.
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.5.21[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-		app-admin/sudo"
-
-RDEPEND="=dev-python/amqplib-0.6.1-r1[${PYTHON_USEDEP}]
-		>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
-		virtual/python-argparse[${PYTHON_USEDEP}]
-		>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-		>=dev-python/eventlet-0.13.0[${PYTHON_USEDEP}]
-		>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-		>=dev-python/iso8601-0.1.4[${PYTHON_USEDEP}]
-		>=dev-python/kombu-2.4.8[${PYTHON_USEDEP}]
-		>=dev-python/lockfile-0.8[${PYTHON_USEDEP}]
-		>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-		dev-python/netaddr[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/paramiko-1.8.0[${PYTHON_USEDEP}]
-		dev-python/paste[${PYTHON_USEDEP}]
-		>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-		>=dev-python/python-glanceclient-0.9.0[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-0.3.0[${PYTHON_USEDEP}]
-		>=dev-python/python-novaclient-2.15.0[${PYTHON_USEDEP}]
-		>=dev-python/python-swiftclient-1.5[${PYTHON_USEDEP}]
-		>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		sqlite? ( >=dev-python/sqlalchemy-0.7.8[sqlite,${PYTHON_USEDEP}]
-	          <dev-python/sqlalchemy-0.7.99[sqlite,${PYTHON_USEDEP}] )
-		mysql? ( >=dev-python/sqlalchemy-0.7.8[mysql,${PYTHON_USEDEP}]
-	         <dev-python/sqlalchemy-0.7.99[mysql,${PYTHON_USEDEP}] )
-		postgres? ( >=dev-python/sqlalchemy-0.7.8[postgres,${PYTHON_USEDEP}]
-	            <dev-python/sqlalchemy-0.7.99[postgres,${PYTHON_USEDEP}] )
-		>=dev-python/sqlalchemy-migrate-0.7.2[${PYTHON_USEDEP}]
-		>=dev-python/stevedore-0.10[${PYTHON_USEDEP}]
-		>=dev-python/suds-0.4[${PYTHON_USEDEP}]
-		>=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
-		<dev-python/webob-1.3[${PYTHON_USEDEP}]
-		>=sys-block/iscsitarget-1.4.20.2_p20130821
-		sys-fs/lvm2
-		sys-block/open-iscsi
-		sys-fs/sysfsutils"
-
-PATCHES=( )
-
-pkg_setup() {
-	enewgroup cinder
-	enewuser cinder -1 -1 /var/lib/cinder cinder
-}
-
-python_install() {
-	distutils-r1_python_install
-	keepdir /etc/cinder
-	dodir /etc/cinder/rootwrap.d
-	newinitd "${FILESDIR}/cinder-init" "cinder"
-	newconfd "${FILESDIR}/cinder-confd" "cinder"
-	use api && dosym /etc/init.d/cinder /etc/init.d/cinder-api
-	use scheduler && dosym /etc/init.d/cinder /etc/init.d/cinder-scheduler
-	use volume && dosym /etc/init.d/cinder /etc/init.d/cinder-volume
-
-	insinto /etc/cinder
-	newins "${S}/etc/cinder/cinder.conf.sample" "cinder.conf"
-	newins "${S}/etc/cinder/api-paste.ini" "api-paste.ini"
-	newins "${S}/etc/cinder/logging_sample.conf" "logging_sample.conf"
-	newins "${S}/etc/cinder/policy.json" "policy.json"
-	newins "${S}/etc/cinder/rootwrap.conf" "rootwrap.conf"
-	insinto /etc/cinder/rootwrap.d
-	newins "${S}/etc/cinder/rootwrap.d/volume.filters" "volume.filters"
-
-	#add sudoers definitions for user nova
-	insinto /etc/sudoers.d/
-	doins "${FILESDIR}/cinder-sudoers"
-	dodir /var/log/cinder
-	fowners cinder:cinder /var/log/cinder
-}