app-admin/glance: adding caps to liberty

Package-Manager: portage-2.2.20.1

2 files changed, 104 insertions, 10 deletions

diff --git a/app-admin/glance/glance-11.0.0.ebuild b/app-admin/glance/glance-11.0.0.ebuild
index 83559e627de4..f835787f0646 100644
--- a/app-admin/glance/glance-11.0.0.ebuild
+++ b/app-admin/glance/glance-11.0.0.ebuild
@@ -25,27 +25,42 @@ DEPEND="
 	test? (
 		${RDEPEND}
 		>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+		<=dev-python/Babel-2.2.1[${PYTHON_USEDEP}]
 		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		<=dev-python/coverage-4.0[${PYTHON_USEDEP}]
 		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
+		<=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
 		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
+		<=dev-python/mox3-0.10.0[${PYTHON_USEDEP}]
 		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
+		<=dev-python/mock-1.3.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}]
 		>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
+		<=dev-python/requests-2.7.0[${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/testscenarios-0.4[${PYTHON_USEDEP}]
+		<=dev-python/testscenarios-0.5[${PYTHON_USEDEP}]
 		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		<=dev-python/testtools-1.8.0[${PYTHON_USEDEP}]
 		>=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.11.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}]
+		<=dev-python/psycopg-2.6.1[${PYTHON_USEDEP}]
 		>=dev-python/pysendfile-2.0.0[${PYTHON_USEDEP}]
-		dev-python/qpid-python[$(python_gen_usedep 'python2_7')]
+		<=dev-python/pysendfile-2.0.1[${PYTHON_USEDEP}]
+		<=dev-python/qpid-python-0.26[$(python_gen_usedep 'python2_7')]
 		>=dev-python/pyxattr-0.5.0[${PYTHON_USEDEP}]
 		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		<=dev-python/oslo-sphinx-3.2.0[${PYTHON_USEDEP}]
 	)"
 
 #note to self, wsgiref is a python builtin, no need to package it
@@ -67,51 +82,83 @@ RDEPEND="
 		>=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
 		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
 	)
-	>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
+	~dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
 	>=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
+	<=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
 	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	<=dev-python/pastedeploy-1.5.2[${PYTHON_USEDEP}]
 	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
 	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
 	!~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
+	<=dev-python/routes-2.2[${PYTHON_USEDEP}]
 	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
+	<=dev-python/webob-1.4.1[${PYTHON_USEDEP}]
 	>=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
+	<=dev-python/sqlalchemy-migrate-0.10.0[${PYTHON_USEDEP}]
 	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
+	<=dev-python/httplib2-0.9.2[${PYTHON_USEDEP}]
 	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+	<=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
 	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+	<=dev-python/iso8601-0.1.10[${PYTHON_USEDEP}]
 	>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-config-2.4.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-concurrency-2.3.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-concurrency-2.6.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-context-0.6.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-service-0.7.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-service-0.9.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-utils-2.5.0[${PYTHON_USEDEP}]
 	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
+	<=dev-python/stevedore-1.8.0[${PYTHON_USEDEP}]
 	>=dev-python/futurist-0.1.2[${PYTHON_USEDEP}]
+	<=dev-python/futurist-0.5.0[${PYTHON_USEDEP}]
 	>=dev-python/taskflow-1.16.0[${PYTHON_USEDEP}]
+	<=dev-python/taskflow-1.21.0[${PYTHON_USEDEP}]
 	>=dev-python/keystonemiddleware-2.0.0[${PYTHON_USEDEP}]
+	<=dev-python/keystonemiddleware-2.4.1[${PYTHON_USEDEP}]
 	>=dev-python/WSME-0.7[${PYTHON_USEDEP}]
-	dev-python/paste[${PYTHON_USEDEP}]
+	<=dev-python/WSME-0.8.0[${PYTHON_USEDEP}]
+	<=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
 	!~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[${PYTHON_USEDEP}]
 	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	<=dev-python/pyopenssl-0.15.1[${PYTHON_USEDEP}]
+	~dev-python/six-1.9.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-db-2.4.1[${PYTHON_USEDEP}]
+	<=dev-python/oslo-db-2.6.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-i18n-2.6.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-log-1.8.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-log-1.11.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.5.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-middleware-2.8.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-middleware-2.8.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-policy-0.5.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-policy-0.11.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-serialization-1.9.0[${PYTHON_USEDEP}]
 	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
 	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-0.3.0[${PYTHON_USEDEP}]
+	<=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
+	~dev-python/osprofiler-0.3.0[${PYTHON_USEDEP}]
 	>=dev-python/glance_store-0.7.1[${PYTHON_USEDEP}]
 	!~dev-python/glance_store-0.9.0[${PYTHON_USEDEP}]
+	<=dev-python/glance_store-0.9.1[${PYTHON_USEDEP}]
 	>=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/cryptography-1.0[${PYTHON_USEDEP}]
+	<=dev-python/cryptography-1.0.2[${PYTHON_USEDEP}]
 "
 
 PATCHES=(
diff --git a/app-admin/glance/glance-2015.2.9999.ebuild b/app-admin/glance/glance-2015.2.9999.ebuild
index 3fd700a213de..d0ffae0d5873 100644
--- a/app-admin/glance/glance-2015.2.9999.ebuild
+++ b/app-admin/glance/glance-2015.2.9999.ebuild
@@ -26,27 +26,42 @@ DEPEND="
 	test? (
 		${RDEPEND}
 		>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+		<=dev-python/Babel-2.2.1[${PYTHON_USEDEP}]
 		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		<=dev-python/coverage-4.0[${PYTHON_USEDEP}]
 		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
+		<=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
 		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
+		<=dev-python/mox3-0.10.0[${PYTHON_USEDEP}]
 		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
+		<=dev-python/mock-1.3.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}]
 		>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
+		<=dev-python/requests-2.7.0[${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/testscenarios-0.4[${PYTHON_USEDEP}]
+		<=dev-python/testscenarios-0.5[${PYTHON_USEDEP}]
 		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		<=dev-python/testtools-1.8.0[${PYTHON_USEDEP}]
 		>=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.11.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}]
+		<=dev-python/psycopg-2.6.1[${PYTHON_USEDEP}]
 		>=dev-python/pysendfile-2.0.0[${PYTHON_USEDEP}]
-		dev-python/qpid-python[$(python_gen_usedep 'python2_7')]
+		<=dev-python/pysendfile-2.0.1[${PYTHON_USEDEP}]
+		<=dev-python/qpid-python-0.26[$(python_gen_usedep 'python2_7')]
 		>=dev-python/pyxattr-0.5.0[${PYTHON_USEDEP}]
 		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		<=dev-python/oslo-sphinx-3.2.0[${PYTHON_USEDEP}]
 	)"
 
 #note to self, wsgiref is a python builtin, no need to package it
@@ -68,51 +83,83 @@ RDEPEND="
 		>=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
 		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
 	)
-	>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
+	~dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
 	>=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
+	<=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
 	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	<=dev-python/pastedeploy-1.5.2[${PYTHON_USEDEP}]
 	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
 	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
 	!~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
+	<=dev-python/routes-2.2[${PYTHON_USEDEP}]
 	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
+	<=dev-python/webob-1.4.1[${PYTHON_USEDEP}]
 	>=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
+	<=dev-python/sqlalchemy-migrate-0.10.0[${PYTHON_USEDEP}]
 	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
+	<=dev-python/httplib2-0.9.2[${PYTHON_USEDEP}]
 	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+	<=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
 	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+	<=dev-python/iso8601-0.1.10[${PYTHON_USEDEP}]
 	>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-config-2.4.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-concurrency-2.3.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-concurrency-2.6.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-context-0.6.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-service-0.7.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-service-0.9.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-utils-2.5.0[${PYTHON_USEDEP}]
 	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
+	<=dev-python/stevedore-1.8.0[${PYTHON_USEDEP}]
 	>=dev-python/futurist-0.1.2[${PYTHON_USEDEP}]
+	<=dev-python/futurist-0.5.0[${PYTHON_USEDEP}]
 	>=dev-python/taskflow-1.16.0[${PYTHON_USEDEP}]
+	<=dev-python/taskflow-1.21.0[${PYTHON_USEDEP}]
 	>=dev-python/keystonemiddleware-2.0.0[${PYTHON_USEDEP}]
+	<=dev-python/keystonemiddleware-2.4.1[${PYTHON_USEDEP}]
 	>=dev-python/WSME-0.7[${PYTHON_USEDEP}]
-	dev-python/paste[${PYTHON_USEDEP}]
+	<=dev-python/WSME-0.8.0[${PYTHON_USEDEP}]
+	<=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
 	!~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[${PYTHON_USEDEP}]
 	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	<=dev-python/pyopenssl-0.15.1[${PYTHON_USEDEP}]
+	~dev-python/six-1.9.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-db-2.4.1[${PYTHON_USEDEP}]
+	<=dev-python/oslo-db-2.6.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-i18n-2.6.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-log-1.8.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-log-1.11.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.5.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-middleware-2.8.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-middleware-2.8.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-policy-0.5.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-policy-0.11.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-serialization-1.9.0[${PYTHON_USEDEP}]
 	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
 	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-0.3.0[${PYTHON_USEDEP}]
+	<=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
+	~dev-python/osprofiler-0.3.0[${PYTHON_USEDEP}]
 	>=dev-python/glance_store-0.7.1[${PYTHON_USEDEP}]
 	!~dev-python/glance_store-0.9.0[${PYTHON_USEDEP}]
+	<=dev-python/glance_store-0.9.1[${PYTHON_USEDEP}]
 	>=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/cryptography-1.0[${PYTHON_USEDEP}]
+	<=dev-python/cryptography-1.0.2[${PYTHON_USEDEP}]
 "
 
 PATCHES=(