bup

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x33ED3FD25AFC78BA

5 files changed, 93 insertions, 256 deletions

diff --git a/sys-cluster/cinder/ChangeLog b/sys-cluster/cinder/ChangeLog
index 579132593b04..fab8a2a2fa56 100644
--- a/sys-cluster/cinder/ChangeLog
+++ b/sys-cluster/cinder/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/cinder
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/ChangeLog,v 1.49 2015/01/13 03:31:44 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/ChangeLog,v 1.50 2015/02/08 02:15:29 prometheanfire Exp $
+
+*cinder-2014.2.2 (08 Feb 2015)
+
+  08 Feb 2015; Matthew Thode <prometheanfire@gentoo.org>
+  +cinder-2014.2.2.ebuild, -cinder-2014.2.1.ebuild, -cinder-9999.ebuild,
+  cinder-2014.2.9999.ebuild:
+  bup
 
   13 Jan 2015; Matthew Thode <prometheanfire@gentoo.org>
   -cinder-2014.1.3.ebuild, -cinder-2014.1.9999.ebuild, -cinder-2014.2.ebuild:
diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest
index cf045ccc5c04..6e37d49f2ec4 100644
--- a/sys-cluster/cinder/Manifest
+++ b/sys-cluster/cinder/Manifest
@@ -6,26 +6,25 @@ AUX cinder-init 1436 SHA256 ef93804e171364da98232fca2bf25adfb16e062c8b4dd69ce12f
 AUX cinder-sudoers 86 SHA256 a2c2b8f50b21deaceaa2184c00725492cd96db44736cb3fe4bf4aaecc0805b6f SHA512 c158be54e721abc6916db2e710092ca75aac65ac88b19849ccd0f3ebbb7c8879aab6b73aba36537e806abd5b8b5e8fbc24fca79d00015d3308198d5270e51fe1 WHIRLPOOL 52642c53b34b089fb9c82c1307c02cd611ea834492a2919a12902bc974a146348a3dcde3db6058eb417395acaff8131398e70fbfa74c7325abcd695102f372c3
 AUX cinder.initd 744 SHA256 187237abfa1bef35136a95d0e2addffdf2fc3cff0e7c4f05e3523c31a16d377d SHA512 473aa626026adbcc132753f620702fcbe1bedef2b122cf212994b3bc453c27d56a3be1bec7229944f9be0478776001dba80f7cb7498cb46f314d2ee06a39f5f5 WHIRLPOOL 3b1667b2a1e089ecef68d9fa5315266d486c462820ea2304c76a5954c0b718983293de9c6a955695ae4fa7d9faedf36490d3ceda49775b4b81a441f67b4875d7
 AUX cinder.sudoersd 86 SHA256 a2c2b8f50b21deaceaa2184c00725492cd96db44736cb3fe4bf4aaecc0805b6f SHA512 c158be54e721abc6916db2e710092ca75aac65ac88b19849ccd0f3ebbb7c8879aab6b73aba36537e806abd5b8b5e8fbc24fca79d00015d3308198d5270e51fe1 WHIRLPOOL 52642c53b34b089fb9c82c1307c02cd611ea834492a2919a12902bc974a146348a3dcde3db6058eb417395acaff8131398e70fbfa74c7325abcd695102f372c3
-DIST cinder-2014.2.1.tar.gz 1785395 SHA256 b1370c9349a1a6329b1f3fa1ae21cc3bfc35d665c978452d6bb4226c9b240d73 SHA512 04c7524e6e4ff24a83eeed3786c0ac830363d8c8538aa943e475ac9893d4377dde2dc68b6c99a2a4d81a8f83e42b817a38ab837c560060ce9a6aa285b0935223 WHIRLPOOL f64407703d590ee74ad3801a7f22e89fa786db44e1baaa7cc6ce93689bb1de9cabe372cd8510225017ed1777a0fcfe2358bd1193f9d5ba186b350197026b60da
-EBUILD cinder-2014.2.1.ebuild 5896 SHA256 6e1e2faf6fb5eeb8a30a8b699a9112f1fc23ac51e273cefe8f8a73fb7ec701e5 SHA512 4d57b4693a795690ea08f3a5721412af58649c4849085c4eaed195fdfd5e46b00180fc55801ad4e06667a3c48c0e96423c66f6838b7d3957eff9b1b587bed4f8 WHIRLPOOL 5fb8dd1ba7aaf7fd8c698e9bfd7d9600b4c7c4b2a83481e19138cbec40e635f32ec1c5e1eff21ecd6a21c00bb3fac7002f595c80f809c115e1665b46401cc3f4
-EBUILD cinder-2014.2.9999.ebuild 5906 SHA256 96bc25e68cd2d6ccb330b8ccecdeefc8069ac5aa415dbe5a31bcf215eda9c589 SHA512 bca4bdf1a8b9fd58cd94bfa5e5ba95c6cc5599a0e97c96403f3505f4bd291d53e34332afa56e9f8453f56ad8f5564777db1c5db3ae20a6ba9cc9525315d80bef WHIRLPOOL d826ade9cb2404d77e84ad0ffaeb3cc6e47eca546efea6c27f020002c3ec4764b40e1b77a110f4384fdedb895a3163d6e6a0310bc558231a77490634f01c8bc0
-EBUILD cinder-9999.ebuild 5056 SHA256 5389ad31eaad4f91ec8e471334a2f39d46ad782dc4b435ce9d62461374f2387f SHA512 72fa172d75d72c392770232b56344c048f3ab0c07702a912b18c5ac27bcc9ed24247554a68203e8c47dc508b49bac36bf47a242f71329fde8edb848d2a15fd18 WHIRLPOOL 6d7518d72bb3bb50d207e3a4ca7cfcafe5384a8a41e0b185d6a63cb3f8116975157abc094e5f89b46d39d6cf169bf4a444f8588cb60e0f5236ca5380a40c154b
-MISC ChangeLog 8973 SHA256 086c358be371754d4669f337aa9e8bc09daf29a3491a8edaef4ab017af1bc21c SHA512 c59d77cfdeefe359c38d35e8859ba7b676665350e0896c6ccf349c1b83a185b7f97742b7f883fc17415e4d16abcb6d265450a8dc9f5cafab543d3dc05a890df2 WHIRLPOOL 8ae607dd67615c040a2ad10ec69bf9e58a7ce92d1e554fe03656017b8693dd67909b6126dfb618466ab58e0f83c22db88738908e76bfe8ebaa20d1254a1654e5
+DIST cinder-2014.2.2.tar.gz 1792693 SHA256 2c779bf9d208163af6c425da9043bbdcb345cebc5c118198482b94062862a117 SHA512 69edbbafb23c2387e48c42340cd940d85e816bef4836f86e1112f20d14b46ec39daf44aa5621db64a469349314b174c4cb894b1bc21694ab8387e2122bb62f2a WHIRLPOOL 5352ca76344b553036e75bf3753fad603b1c46c220b973838b0f0e11d81339ab5a5ba1a0d9bf7806ce97e906bfdbf218414ad7d60e71d76bca6f37e13da33ff7
+EBUILD cinder-2014.2.2.ebuild 5656 SHA256 dfe0af6814c689c2c9feb6aed788744886aebb247482ee3cc4c07967d47def39 SHA512 84b33ea3b6def7b5743efd7064ed749b3f8b692869497da880927a9096fe92a70f0c8010ea7d0d5ef5af4a5d97ec9dc6f9d4b86991882eab3e49a0c6309b8a77 WHIRLPOOL 4eaef13127f28650a2df845aa897eea5ce89af23ba8c6a021ef65762acfd712eb5ec2a7c6f56be6c81701e163cdaf21b739c66bef4da8aec502862790ea13619
+EBUILD cinder-2014.2.9999.ebuild 5666 SHA256 053828277f1569823e02efd6efccf55a81088ab530f1519edef3893cc4cfa438 SHA512 c9b7b21a8b6be1771b2abb18080959a8bdc7084db54e7784996a495a93ee2388a92f8ee93ed34bf82f8b6831966bb5cebd7b87e537c59a15b848483145868839 WHIRLPOOL c4c6f8ae65aca04cdb6e6a6583611157e482aa0b6cf07ff17ae142d8046b06375c8779ce7d05c6b83ac4301f58a464f6b0a9c822c137ea5674ae56e58bad3608
+MISC ChangeLog 9171 SHA256 d299fe5dfbdf2e4f3b93ce16a1b0525d8ff1284ed923355f998365eaa18236ab SHA512 e1b3685cae80a75df47326af073f78a2adab86c46a3f5556954f0c2573ff834bedd9acc8d9d706b5937992c81a97d4014bc2f7094b6028c391a302f67013f4ae WHIRLPOOL 64c685375ab6935f63c6683203efb4ffd859901ac6cf50c79a304e44417f927bf8b676cf8a08b2eadb6bfa3bea8d20f89fd4d434ed48941bb40246c7503e14c7
 MISC metadata.xml 921 SHA256 33d8d60945d6b793447e7a377cc35069a01dab1c874c0dac417772e585fdb2ee SHA512 e05cc2f145099d8b9bac3f4b4298b6ae628ad328b4602181020828d39aa74ced949487388daef52c0cb2b66ea3e6c64662fc1d3dd0a0a6b2b2b513afb6fc7b41 WHIRLPOOL 7c97874b37719acdcc222ce15eab14fbbdbea628038e9ab56bc740a3476265d8cfa7108c94c5809eb995a5aca2ad596ef51d8340b0202c3d1a5ea937ce6d5dc7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUtJGoAAoJEGSje+quGaTovOMQAJHvl258Gl1nc0r1PEJWhAoI
-xQgkAasRHgtIFv8hggjbXVVAXplXNoR8eNPMSO+CKNfth9vE4shg+QVYptnxQFs4
-WEtCiqxC3OZcGk99zD8k+B43vu01fYGi1hpMcGKsljU+txrukxwNv4e4/wLsgllN
-VsELoC6YII6HvuKowTlJGZgWZwZZ8XwB1nb4BvkwgydMpO2NiQDS8X3NNb6i+jIr
-y4PepYCDIYjLnEiRNt6Ued0cBdueINbt4ay3l3yTkg6D3Qhngudn0qNi+lcrxDAo
-nHLNcugrqR0OUaL/Zp08lXeyZnaV24jAIpN59t8KCdMarhxUyln2lKDeB+Q8LYoT
-bE2cHqQvm5ZTzgz9F1UIfep5p4TbIU0VCLSefXpobiEJNqrKrD3gT54ANuIf3JtO
-0LVJxDXt9sduMbwOMDHy0Q2ok2llBBPYWxcztUlWHfW+rOA8CSPzR64KMv4H6Pwc
-0XeCfzI8MW306A7FMbVTd6P8k7TT0ryQf+IyuPG+MTAi3vTP397G6T7oY9a8BwFA
-kHnOrWyReseaZ+FH9XcFuBGDJ3A0m+8my5OZNnxAmh5t7T3ZlA2xME/R9ksuvndi
-4PsqLKxZBAWtF3aGJf4jKynOsJPTg+IIQ5l2tRvkPAiWDwLY4Ah6mzhmLZCI1SSh
-rfcZ7fjlM4pH1ZvWF/zo
-=qHMv
+iQIcBAEBCAAGBQJU1sbcAAoJEGSje+quGaTogB8P/2KlP0dpEc3ztB6P29o1lrHM
+mw7Jq1pUl1zv5pFROnd9Lx7JPno1+NKcTsstO2rVacONTWiaJyW1PJG3z2RzXQ1w
+cDsFjzuaUxw3bA/byGa2yjTOWDQyHpmZPkiP5USsh+hj4bjcenwIBN7YI0AaQdj5
+xo2wnvWGXqfTlRLXwQcjMulp8RoPbdN+yyuwFXAZsIf3Wyb+/Ukdh9hTdFHgNSCr
+Wp8J1UTM2d8Xyb/7LbiH9tUhaw5GgJEcGpE0BXBelBFVP00AdgNlO5Wa5U2GVjr3
+vN9SvLdoqfqCjni+20GEg5ijXueKJw102HWztHBqMBTHDp7GuJxypj2kW2wXfgjt
+H0fpEe8lX8Gf7xSo8VQC8oFq3ZESsnw4fcQyTM50Btgcse/FNuyIOHow8uZhvTyF
+2MNBzefftW+x9pExcV4uFlaoHnczFwq+iND7XzaK4vzbYeoD3pwyz76gWY++SEoj
+lOEf45nAH9LyEYDD2RqHw5u6QspuFTSEsQy+9A1UHyJZ+zmxcl0TpoDSCBzvbcqI
+czbZuqIVsDFSwTzVcJpAsnIqrPeSoj9PNL7tbY/tkKjQ2JKxkNpGBRAnvlp2Y76u
+ykPDcT6fL0ofuLsFQsw1RNTDTvzFFYD7tnAeKCcXUPdNqnhxDTO4A4bLyj9PyxeR
+Hmn+QWgk0gpAXWx9mOGC
+=//i0
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/cinder/cinder-2014.2.1.ebuild b/sys-cluster/cinder/cinder-2014.2.2.ebuild
index 640bd9c3a083..6cd2114cab23 100644
--- a/sys-cluster/cinder/cinder-2014.2.1.ebuild
+++ b/sys-cluster/cinder/cinder-2014.2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/cinder-2014.2.1.ebuild,v 1.1 2014/12/09 01:32:14 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/cinder-2014.2.2.ebuild,v 1.1 2015/02/08 02:15:29 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -22,27 +22,31 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
 		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
 		app-admin/sudo
-		test? ( >=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
-				<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-				>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-				>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-				>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-				>=dev-python/mox-0.5.3[${PYTHON_USEDEP}]
-				mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
-				postgres? ( dev-python/psycopg[${PYTHON_USEDEP}] )
-				>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-				!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-				<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-				>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-				>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
-				!~dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-				>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-				>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}] )"
+		test? (
+			${RDEPEND}
+			>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
+			<dev-python/hacking-0.10[${PYTHON_USEDEP}]
+			>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+			>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+			>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+			>=dev-python/mox-0.5.3[${PYTHON_USEDEP}]
+			mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+			postgres? ( dev-python/psycopg[${PYTHON_USEDEP}] )
+			>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+			!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+			<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+			>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+			>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
+			!~dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+			>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+			>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
+		)"
 
 RDEPEND="
 	>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
 	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
 	>=dev-python/eventlet-0.15.1[${PYTHON_USEDEP}]
+	<dev-python/eventlet-0.16.0[${PYTHON_USEDEP}]
 	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
 	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
 	>=dev-python/keystonemiddleware-1.0.0[${PYTHON_USEDEP}]
@@ -51,8 +55,10 @@ RDEPEND="
 	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
 	>=dev-python/oslo-config-1.4.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-db-1.0.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-db-1.1.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-messaging-1.4.0[${PYTHON_USEDEP}]
 	!~dev-python/oslo-messaging-1.5.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-messaging-1.6.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-rootwrap-1.3.0[${PYTHON_USEDEP}]
 	>=dev-python/osprofiler-0.3.0[${PYTHON_USEDEP}]
 	>=dev-python/paramiko-1.13.0[${PYTHON_USEDEP}]
@@ -60,6 +66,7 @@ RDEPEND="
 	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
 	>=dev-python/python-barbicanclient-2.1.0[${PYTHON_USEDEP}]
 	!~dev-python/python-barbicanclient-3.0.0[${PYTHON_USEDEP}]
+	<dev-python/python-barbicanclient-3.0.2[${PYTHON_USEDEP}]
 	>=dev-python/python-glanceclient-0.14.0[${PYTHON_USEDEP}]
 	>=dev-python/python-novaclient-2.18.0[${PYTHON_USEDEP}]
 	>=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
@@ -68,48 +75,24 @@ RDEPEND="
 	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
 	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
 	>=dev-python/taskflow-0.4[${PYTHON_USEDEP}]
+	<dev-python/taskflow-0.7.0[${PYTHON_USEDEP}]
 	>=dev-python/rtslib-fb-2.1.39[${PYTHON_USEDEP}]
 	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
 	sqlite? (
-		|| (
-			(
-				>=dev-python/sqlalchemy-0.8.4[sqlite,${PYTHON_USEDEP}]
-				<=dev-python/sqlalchemy-0.8.99[sqlite,${PYTHON_USEDEP}]
-			)
-			(
-				>=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
-				<=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
-			)
-		)
+		>=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
+		<=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
 	)
 	mysql? (
 		dev-python/mysql-python
-		|| (
-			(
-				>=dev-python/sqlalchemy-0.8.4[${PYTHON_USEDEP}]
-				<=dev-python/sqlalchemy-0.8.99[${PYTHON_USEDEP}]
-			)
-			(
-				>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
-				<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-			)
-		)
+		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
 	)
 	postgres? (
 		dev-python/psycopg:2
-		|| (
-			(
-				>=dev-python/sqlalchemy-0.8.4[${PYTHON_USEDEP}]
-				<=dev-python/sqlalchemy-0.8.99[${PYTHON_USEDEP}]
-			)
-			(
-				>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
-				<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-			)
-		)
+		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
 	)
-	>=dev-python/sqlalchemy-migrate-0.9.1[${PYTHON_USEDEP}]
-	!~dev-python/sqlalchemy-migrate-0.9.2[${PYTHON_USEDEP}]
+	~dev-python/sqlalchemy-migrate-0.9.1[${PYTHON_USEDEP}]
 	>=dev-python/stevedore-1.0.0[${PYTHON_USEDEP}]
 	>=dev-python/suds-0.4[${PYTHON_USEDEP}]
 	>=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
@@ -118,8 +101,7 @@ RDEPEND="
 		|| ( >=sys-block/iscsitarget-1.4.20.2_p20130821 sys-block/tgt )
 		sys-block/open-iscsi )
 	lvm? ( sys-fs/lvm2 )
-	sys-fs/sysfsutils
-"
+	sys-fs/sysfsutils"
 
 PATCHES=( )
 
diff --git a/sys-cluster/cinder/cinder-2014.2.9999.ebuild b/sys-cluster/cinder/cinder-2014.2.9999.ebuild
index eb1fe20e22fc..8c2f834ca502 100644
--- a/sys-cluster/cinder/cinder-2014.2.9999.ebuild
+++ b/sys-cluster/cinder/cinder-2014.2.9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/cinder-2014.2.9999.ebuild,v 1.3 2014/12/09 01:32:14 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/cinder-2014.2.9999.ebuild,v 1.4 2015/02/08 02:15:29 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -23,27 +23,31 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
 		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
 		app-admin/sudo
-		test? ( >=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
-				<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-				>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-				>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-				>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-				>=dev-python/mox-0.5.3[${PYTHON_USEDEP}]
-				mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
-				postgres? ( dev-python/psycopg[${PYTHON_USEDEP}] )
-				>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-				!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-				<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-				>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-				>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
-				!~dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-				>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-				>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}] )"
+		test? (
+			${RDEPEND}
+			>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
+			<dev-python/hacking-0.10[${PYTHON_USEDEP}]
+			>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+			>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+			>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+			>=dev-python/mox-0.5.3[${PYTHON_USEDEP}]
+			mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+			postgres? ( dev-python/psycopg[${PYTHON_USEDEP}] )
+			>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+			!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+			<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+			>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+			>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
+			!~dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+			>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+			>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
+		)"
 
 RDEPEND="
 	>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
 	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
 	>=dev-python/eventlet-0.15.1[${PYTHON_USEDEP}]
+	<dev-python/eventlet-0.16.0[${PYTHON_USEDEP}]
 	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
 	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
 	>=dev-python/keystonemiddleware-1.0.0[${PYTHON_USEDEP}]
@@ -52,8 +56,10 @@ RDEPEND="
 	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
 	>=dev-python/oslo-config-1.4.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-db-1.0.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-db-1.1.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-messaging-1.4.0[${PYTHON_USEDEP}]
 	!~dev-python/oslo-messaging-1.5.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-messaging-1.6.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-rootwrap-1.3.0[${PYTHON_USEDEP}]
 	>=dev-python/osprofiler-0.3.0[${PYTHON_USEDEP}]
 	>=dev-python/paramiko-1.13.0[${PYTHON_USEDEP}]
@@ -61,6 +67,7 @@ RDEPEND="
 	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
 	>=dev-python/python-barbicanclient-2.1.0[${PYTHON_USEDEP}]
 	!~dev-python/python-barbicanclient-3.0.0[${PYTHON_USEDEP}]
+	<dev-python/python-barbicanclient-3.0.2[${PYTHON_USEDEP}]
 	>=dev-python/python-glanceclient-0.14.0[${PYTHON_USEDEP}]
 	>=dev-python/python-novaclient-2.18.0[${PYTHON_USEDEP}]
 	>=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
@@ -69,48 +76,24 @@ RDEPEND="
 	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
 	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
 	>=dev-python/taskflow-0.4[${PYTHON_USEDEP}]
+	<dev-python/taskflow-0.7.0[${PYTHON_USEDEP}]
 	>=dev-python/rtslib-fb-2.1.39[${PYTHON_USEDEP}]
 	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
 	sqlite? (
-		|| (
-			(
-				>=dev-python/sqlalchemy-0.8.4[sqlite,${PYTHON_USEDEP}]
-				<=dev-python/sqlalchemy-0.8.99[sqlite,${PYTHON_USEDEP}]
-			)
-			(
-				>=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
-				<=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
-			)
-		)
+		>=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
+		<=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
 	)
 	mysql? (
 		dev-python/mysql-python
-		|| (
-			(
-				>=dev-python/sqlalchemy-0.8.4[${PYTHON_USEDEP}]
-				<=dev-python/sqlalchemy-0.8.99[${PYTHON_USEDEP}]
-			)
-			(
-				>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
-				<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-			)
-		)
+		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
 	)
 	postgres? (
 		dev-python/psycopg:2
-		|| (
-			(
-				>=dev-python/sqlalchemy-0.8.4[${PYTHON_USEDEP}]
-				<=dev-python/sqlalchemy-0.8.99[${PYTHON_USEDEP}]
-			)
-			(
-				>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
-				<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-			)
-		)
+		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
 	)
-	>=dev-python/sqlalchemy-migrate-0.9.1[${PYTHON_USEDEP}]
-	!~dev-python/sqlalchemy-migrate-0.9.2[${PYTHON_USEDEP}]
+	~dev-python/sqlalchemy-migrate-0.9.1[${PYTHON_USEDEP}]
 	>=dev-python/stevedore-1.0.0[${PYTHON_USEDEP}]
 	>=dev-python/suds-0.4[${PYTHON_USEDEP}]
 	>=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
@@ -119,8 +102,7 @@ RDEPEND="
 		|| ( >=sys-block/iscsitarget-1.4.20.2_p20130821 sys-block/tgt )
 		sys-block/open-iscsi )
 	lvm? ( sys-fs/lvm2 )
-	sys-fs/sysfsutils
-"
+	sys-fs/sysfsutils"
 
 PATCHES=( )
 
diff --git a/sys-cluster/cinder/cinder-9999.ebuild b/sys-cluster/cinder/cinder-9999.ebuild
deleted file mode 100644
index 6d4e3a618af4..000000000000
--- a/sys-cluster/cinder/cinder-9999.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/cinder-9999.ebuild,v 1.10 2014/08/10 20:20:15 slyfox Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils git-2 user
-
-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"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS=""
-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.6[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-		app-admin/sudo
-		test? ( >=dev-python/hacking-0.8.0[${PYTHON_USEDEP}]
-				<dev-python/hacking-0.9[${PYTHON_USEDEP}]
-				>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-				>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-				>=dev-python/hp3parclient-3.0[${PYTHON_USEDEP}]
-				<dev-python/hp3parclient-4.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-0.0.18[${PYTHON_USEDEP}]
-				>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
-				>=dev-python/testrepository-0.0.18[${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}]
-		>=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.9[${PYTHON_USEDEP}]
-		>=dev-python/kombu-2.4.8[${PYTHON_USEDEP}]
-		>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-		>=dev-python/netaddr-0.7.6[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-messaging-1.3.0[${PYTHON_USEDEP}]
-		dev-python/oslo-rootwrap[${PYTHON_USEDEP}]
-		>=dev-python/paramiko-1.9.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.7.0[${PYTHON_USEDEP}]
-		>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]
-		>=dev-python/python-swiftclient-1.6[${PYTHON_USEDEP}]
-		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-		>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-		>=dev-python/taskflow-0.1.3[${PYTHON_USEDEP}]
-		<dev-python/taskflow-0.2[${PYTHON_USEDEP}]
-		>=dev-python/rtslib-fb-2.1.39[${PYTHON_USEDEP}]
-		>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
-		sqlite? (
-			>=dev-python/sqlalchemy-0.8.0[sqlite,${PYTHON_USEDEP}]
-			!~dev-python/sqlalchemy-0.9.5[sqlite,${PYTHON_USEDEP}]
-			<=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
-		)
-		mysql? (
-			dev-python/mysql-python
-			>=dev-python/sqlalchemy-0.8.0[${PYTHON_USEDEP}]
-			!~dev-python/sqlalchemy-0.9.5[${PYTHON_USEDEP}]
-			<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-		)
-		postgres? (
-			dev-python/psycopg:2
-			>=dev-python/sqlalchemy-0.8.0[${PYTHON_USEDEP}]
-			!~dev-python/sqlalchemy-0.9.5[${PYTHON_USEDEP}]
-			<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-		)
-		>=dev-python/sqlalchemy-migrate-0.9[${PYTHON_USEDEP}]
-		>=dev-python/stevedore-0.14[${PYTHON_USEDEP}]
-		>=dev-python/suds-0.4[${PYTHON_USEDEP}]
-		>=dev-python/webob-1.2.3-r1[${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_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
-	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
-}