sys-cluster/cinder: bup

Package-Manager: portage-2.2.24

1 files changed, 50 insertions, 35 deletions

diff --git a/sys-cluster/cinder/cinder-2015.2.9999.ebuild b/sys-cluster/cinder/cinder-2015.2.9999.ebuild
index f80614929cd0..c01d9497eb1e 100644
--- a/sys-cluster/cinder/cinder-2015.2.9999.ebuild
+++ b/sys-cluster/cinder/cinder-2015.2.9999.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1 eutils git-2 linux-info user
 
@@ -26,9 +26,9 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		${RDEPEND}
 		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		<=dev-python/coverage-4.0.2[${PYTHON_USEDEP}]
+		<=dev-python/coverage-4.0.3[${PYTHON_USEDEP}]
 		>=dev-python/ddt-0.7.0[${PYTHON_USEDEP}]
-		<=dev-python/ddt-1.0.0[${PYTHON_USEDEP}]
+		<=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
 		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
 		<=dev-python/fixtures-1.4.0-r9999[${PYTHON_USEDEP}]
 		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
@@ -40,7 +40,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		>=dev-python/psycopg-2.5[${PYTHON_USEDEP}]
 		<=dev-python/psycopg-2.6.1[${PYTHON_USEDEP}]
 		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		<=dev-python/oslotest-1.12.0[${PYTHON_USEDEP}]
+		<=dev-python/oslotest-2.0.0[${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}]
@@ -51,17 +51,18 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
 		<=dev-python/testrepository-0.0.20[${PYTHON_USEDEP}]
 		>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
-		<=dev-python/testresources-0.2.7-r9999[${PYTHON_USEDEP}]
+		<=dev-python/testresources-1.0.0-r9999[${PYTHON_USEDEP}]
 		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
 		<=dev-python/testscenarios-0.5[${PYTHON_USEDEP}]
 		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		<=dev-python/oslo-sphinx-3.3.1[${PYTHON_USEDEP}]
+		<=dev-python/oslo-sphinx-4.1.0[${PYTHON_USEDEP}]
 		>=dev-python/os-testr-0.1.0[${PYTHON_USEDEP}]
 		<=dev-python/os-testr-0.4.2[${PYTHON_USEDEP}]
 		>=dev-python/tempest-lib-0.8.0[${PYTHON_USEDEP}]
 		<=dev-python/tempest-lib-0.11.0[${PYTHON_USEDEP}]
 		>=dev-python/bandit-0.13.2[${PYTHON_USEDEP}]
-		<=dev-python/bandit-0.16.1[${PYTHON_USEDEP}]
+		<=dev-python/bandit-0.16.2[${PYTHON_USEDEP}]
+		>=dev-python/reno-0.1.1[${PYTHON_USEDEP}]
 	)"
 
 RDEPEND="
@@ -69,7 +70,7 @@ RDEPEND="
 	~dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
 	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
 	<=dev-python/Babel-2.1.1[${PYTHON_USEDEP}]
-	<=dev-python/enum34-1.0.4[$(python_gen_usedep 'python2_7')]
+	<=dev-python/enum34-1.1.1[$(python_gen_usedep 'python2_7')]
 	>=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
 	<=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
 	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
@@ -77,44 +78,53 @@ RDEPEND="
 	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
 	<=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
 	>=dev-python/keystonemiddleware-2.0.0[${PYTHON_USEDEP}]
-	<=dev-python/keystonemiddleware-3.0.0[${PYTHON_USEDEP}]
+	!~dev-python/keystonemiddleware-2.4.0[${PYTHON_USEDEP}]
+	<=dev-python/keystonemiddleware-4.0.0[${PYTHON_USEDEP}]
 	>=dev-python/kombu-3.0.7[${PYTHON_USEDEP}]
-	<=dev-python/kombu-3.0.29[${PYTHON_USEDEP}]
+	<=dev-python/kombu-3.0.30[${PYTHON_USEDEP}]
 	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
 	<=dev-python/lxml-3.5.0[${PYTHON_USEDEP}]
 	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
 	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
 	<=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
 	>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-config-2.6.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-config-3.1.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-concurrency-2.3.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-concurrency-2.8.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-concurrency-3.1.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-context-0.8.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-context-1.0.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-db-2.4.1[${PYTHON_USEDEP}]
-	<=dev-python/oslo-db-3.1.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-db-4.1.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-log-1.8.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-log-1.13.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-log-2.1.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-messaging-1.16.0[${PYTHON_USEDEP}]
 	!~dev-python/oslo-messaging-1.17.0[${PYTHON_USEDEP}]
 	!~dev-python/oslo-messaging-1.17.1[${PYTHON_USEDEP}]
-	<=dev-python/oslo-messaging-2.8.1[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-2.6.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-2.6.1[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-2.7.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-2.8.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-2.8.1[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-2.9.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-3.1.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-messaging-3.0.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-middleware-2.8.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-middleware-2.10.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-middleware-3.3.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-policy-0.5.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-policy-0.12.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-policy-1.1.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-reports-0.1.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-reports-0.8.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-reports-1.1.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-rootwrap-2.0.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-rootwrap-2.5.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-rootwrap-3.1.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-serialization-1.11.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-serialization-2.1.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-service-0.7.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-service-0.12.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-service-1.1.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-utils-2.7.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-utils-2.6.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-utils-3.2.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-versionedobjects-0.9.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-versionedobjects-0.12.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-versionedobjects-1.1.0[${PYTHON_USEDEP}]
 	>=dev-python/osprofiler-0.3.0[${PYTHON_USEDEP}]
 	<=dev-python/osprofiler-0.3.1[${PYTHON_USEDEP}]
 	>=dev-python/paramiko-1.13.0[${PYTHON_USEDEP}]
@@ -128,12 +138,17 @@ RDEPEND="
 	<=dev-python/pyparsing-2.0.6[${PYTHON_USEDEP}]
 	~dev-python/python-barbicanclient-3.3.0[${PYTHON_USEDEP}]
 	>=dev-python/python-glanceclient-0.18.0[${PYTHON_USEDEP}]
-	<=dev-python/python-glanceclient-1.1.0[${PYTHON_USEDEP}]
+	<=dev-python/python-glanceclient-1.2.0[${PYTHON_USEDEP}]
 	>=dev-python/python-novaclient-2.28.1[${PYTHON_USEDEP}]
+	!~dev-python/python-novaclient-2.33.0[${PYTHON_USEDEP}]
 	<=dev-python/python-novaclient-2.35.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
+	!~dev-python/python-keystoneclient-1.8.0[${PYTHON_USEDEP}]
+	<=dev-python/python-keystoneclient-2.0.0[${PYTHON_USEDEP}]
 	>=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
-	<=dev-python/python-swiftclient-2.6.0[${PYTHON_USEDEP}]
+	<=dev-python/python-swiftclient-2.7.0[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.8.0[${PYTHON_USEDEP}]
 	<=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
 	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
 	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
@@ -143,38 +158,38 @@ RDEPEND="
 	!~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
 	<=dev-python/routes-2.2[${PYTHON_USEDEP}]
 	>=dev-python/taskflow-1.16.0[${PYTHON_USEDEP}]
-	<=dev-python/taskflow-1.23.0[${PYTHON_USEDEP}]
+	<=dev-python/taskflow-1.25.0[${PYTHON_USEDEP}]
 	>=dev-python/rtslib-fb-2.1.41[${PYTHON_USEDEP}]
-	<=dev-python/rtslib-fb-2.1.57[${PYTHON_USEDEP}]
+	<=dev-python/rtslib-fb-2.1.58[${PYTHON_USEDEP}]
 	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
 	<=dev-python/six-1.10.0[${PYTHON_USEDEP}]
 	sqlite? (
 		>=dev-python/sqlalchemy-0.9.9[sqlite,${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
 	)
 	mysql? (
 		dev-python/mysql-python
 		>=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
 	)
 	postgres? (
 		dev-python/psycopg:2
 		>=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
 	)
 	>=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
 	<=dev-python/sqlalchemy-migrate-0.10.0[${PYTHON_USEDEP}]
 	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
-	<=dev-python/stevedore-1.9.0[${PYTHON_USEDEP}]
+	<=dev-python/stevedore-1.10.0[${PYTHON_USEDEP}]
 	~dev-python/suds-0.6[${PYTHON_USEDEP}]
 	>=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
 	<=dev-python/webob-1.5.1[${PYTHON_USEDEP}]
 	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-i18n-2.7.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-i18n-3.1.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-vmware-0.16.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-vmware-1.23.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-vmware-2.1.0[${PYTHON_USEDEP}]
 	>=dev-python/os-brick-0.4.0[${PYTHON_USEDEP}]
-	<=dev-python/os-brick-0.5.0[${PYTHON_USEDEP}]
+	<=dev-python/os-brick-0.6.0[${PYTHON_USEDEP}]
 	iscsi? (
 		sys-block/tgt
 		sys-block/open-iscsi