app-admin/glance: bup

Package-Manager: portage-2.2.24

1 files changed, 40 insertions, 26 deletions

diff --git a/app-admin/glance/glance-2015.2.9999.ebuild b/app-admin/glance/glance-2015.2.9999.ebuild
index d44d287f516e..a523853d80d2 100644
--- a/app-admin/glance/glance-2015.2.9999.ebuild
+++ b/app-admin/glance/glance-2015.2.9999.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1 git-r3 user
 
@@ -27,7 +27,7 @@ DEPEND="
 		>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
 		<=dev-python/Babel-2.1.1[${PYTHON_USEDEP}]
 		>=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/fixtures-1.3.1[${PYTHON_USEDEP}]
 		<=dev-python/fixtures-1.4.0-r9999[${PYTHON_USEDEP}]
 		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
@@ -38,11 +38,12 @@ DEPEND="
 		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
 		<dev-python/sphinx-1.3[${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/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/testtools-1.4.0[${PYTHON_USEDEP}]
@@ -50,7 +51,7 @@ DEPEND="
 		>=dev-python/psutil-1.1.1[${PYTHON_USEDEP}]
 		<dev-python/psutil-2.0.0[${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/pymysql-0.6.2[${PYTHON_USEDEP}]
 		<=dev-python/pymysql-0.6.7[${PYTHON_USEDEP}]
 		>=dev-python/psycopg-2.5[${PYTHON_USEDEP}]
@@ -59,8 +60,11 @@ DEPEND="
 		<=dev-python/pysendfile-2.0.1[${PYTHON_USEDEP}]
 		<=dev-python/qpid-python-0.32[$(python_gen_usedep 'python2_7')]
 		>=dev-python/pyxattr-0.5.0[${PYTHON_USEDEP}]
+		>=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
+		<=dev-python/python-swiftclient-2.7.0[${PYTHON_USEDEP}]
 		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		<=dev-python/oslo-sphinx-3.2.0[${PYTHON_USEDEP}]
+		<=dev-python/oslo-sphinx-4.1.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-0.1.1[${PYTHON_USEDEP}]
 	)"
 
 #note to self, wsgiref is a python builtin, no need to package it
@@ -70,17 +74,17 @@ RDEPEND="
 	${CDEPEND}
 	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[${PYTHON_USEDEP}]
 		>=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/anyjson-0.3.3[${PYTHON_USEDEP}]
 	~dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
@@ -101,23 +105,25 @@ RDEPEND="
 	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
 	<=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
 	>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-config-2.4.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-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/stevedore-1.5.0[${PYTHON_USEDEP}]
-	<=dev-python/stevedore-1.9.0[${PYTHON_USEDEP}]
+	<=dev-python/stevedore-1.10.0[${PYTHON_USEDEP}]
 	>=dev-python/futurist-0.1.2[${PYTHON_USEDEP}]
 	<=dev-python/futurist-0.8.0[${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/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/WSME-0.7[${PYTHON_USEDEP}]
 	<=dev-python/WSME-0.8.0[${PYTHON_USEDEP}]
 	<=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
@@ -125,27 +131,35 @@ RDEPEND="
 	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
 	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
 	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
-	<=dev-python/python-keystoneclient-1.8.1-r9999[${PYTHON_USEDEP}]
+	!~dev-python/python-keystoneclient-1.8.0[${PYTHON_USEDEP}]
+	<=dev-python/python-keystoneclient-2.0.0-r9999[${PYTHON_USEDEP}]
 	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
 	<=dev-python/pyopenssl-0.15.1[${PYTHON_USEDEP}]
 	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
 	<=dev-python/six-1.10.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-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-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-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/retrying-1.2.3[${PYTHON_USEDEP}]
 	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
 	<=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
@@ -157,9 +171,9 @@ RDEPEND="
 	>=dev-python/semantic_version-2.3.1[${PYTHON_USEDEP}]
 	<=dev-python/semantic_version-2.4.2[${PYTHON_USEDEP}]
 	>=dev-python/castellan-0.2.0[${PYTHON_USEDEP}]
-	<=dev-python/castellan-0.2.1[${PYTHON_USEDEP}]
+	<=dev-python/castellan-0.3.1[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
-	<=dev-python/cryptography-1.1-r9999[${PYTHON_USEDEP}]
+	<=dev-python/cryptography-1.1.2-r9999[${PYTHON_USEDEP}]
 "
 
 PATCHES=(