syncing with stable/juno

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

3 files changed, 62 insertions, 32 deletions

diff --git a/sys-auth/keystone/ChangeLog b/sys-auth/keystone/ChangeLog
index 13edeb9f52d9..97254858b089 100644
--- a/sys-auth/keystone/ChangeLog
+++ b/sys-auth/keystone/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-auth/keystone
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/ChangeLog,v 1.89 2015/04/11 23:11:30 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/ChangeLog,v 1.90 2015/04/13 03:05:17 prometheanfire Exp $
+
+  13 Apr 2015; Matthew Thode <prometheanfire@gentoo.org>
+  keystone-2014.2.9999.ebuild:
+  syncing with stable/juno
 
   11 Apr 2015; Matthew Thode <prometheanfire@gentoo.org>
   keystone-2014.2.3.ebuild:
diff --git a/sys-auth/keystone/Manifest b/sys-auth/keystone/Manifest
index 943695394b38..c242ae640cef 100644
--- a/sys-auth/keystone/Manifest
+++ b/sys-auth/keystone/Manifest
@@ -6,23 +6,23 @@ AUX keystone.initd 674 SHA256 fc556365de7198de035ebf083b10f59043aa3266270d3ab708
 AUX no_admin_token_auth-paste.ini 2646 SHA256 f98d9151f222d2143820bdc98727ce0cf3f4450a4dbdc54f1fb6e36bb63bf2df SHA512 c855dd2bb05e765c6594359f55b76f7f6e0649c8e8f4517b274c7432f136e51c408168ec24e0074f4ebc49eb641d658acfda205aef97fe68fe8fc016be4cb08d WHIRLPOOL faad0f98d0684cf206e2f2afb5fba6c6aab73f97bcf63e38038be49a2ae1303e8cb5434d8fab34492888c666462dcd751c678c04cd0039d9024fd42ddde30646
 DIST keystone-2014.2.3.tar.gz 940147 SHA256 55e1376508c341ba1e58f30f3538550048e924d9c20aa2cae746df14f4193ba0 SHA512 82dded8e9176651a0d71aa2db45c84ba31b43a0eb6d07c8983853546e15af9cd8a54d092f3a82507ccf4ba2c40f7671d1df4b0294fae05618b5695aad87503be WHIRLPOOL 7210728e844952ad0545573ee4a05208fe3aed674ab88155bce584c0f6cf0391a5b717bc0c4e359e008ccd5e711fa826bf23d8f83ac35d5afa22e23bb96085c8
 EBUILD keystone-2014.2.3.ebuild 7318 SHA256 ac5b1f764efecb4e26d730d0400e32f4bf4c634065a1fbb401df8f2d106079d2 SHA512 9452996b251189cc1d6c26082e7ac639f349e7c9ffa4c4dd4df3d11627cabfe688d2bd41f44b7ae221b0af322bf0636a66ed7cfd7a6ad32048aeab16301fd53a WHIRLPOOL 6292c21bd35bd30f29dda196d69be07076dc227544b49a9336e7af1f199f33c73549fefdc6c64b78717335a717537c70370381bb5d4306243958ff59fc399feb
-EBUILD keystone-2014.2.9999.ebuild 6094 SHA256 585166d7583cbb2afdbf3f4ee930cafbb87b51f189929a7f033dc00936580c2a SHA512 35518b35bf871519ba771e85947efedbe5a6f374360cc1aae910838ef869c450b114521843b42f65872095ea1c790ec21550468071637702940bad3d42c65286 WHIRLPOOL cf4587c9c113b3b67901b79942028b1c6fa9adb56d8c94118f9f4a0f4cd6304c6d450505f0a3fc09c3436b6cc32bef2c288ed9b8efcfbed1d5b716d55b6cd415
-MISC ChangeLog 18643 SHA256 853236b888370894fb5a73cf5d5ffbff2bf9f8066a7f126b062f0b8afefc77df SHA512 046dfd5fadc2f648be56d72af1b98c5b3996b1b89c6ecc866ff74a5d25ee2822b63b929ee25a57cafa405a73a4950bb73492b5a08bba6b00441b96b6da7968b2 WHIRLPOOL dd7eff46e7997841189ad4ad15e319a0ee3e6d20bb43d1cecc9a8fa84e23d9c748e05c3275d2c40b39e354306fe43fd6e60bc55eb55c3fd32bf10270ccb36a30
+EBUILD keystone-2014.2.9999.ebuild 7330 SHA256 79881e49f0926366ee297abb151042c5049889a46a795754f0dcd639793a97c8 SHA512 2d1062f5df7f52d7cfdd35e7c9c504ae7cfda626bd41058dcd75378040deaca6bd71632d7c4b4045affbc04337cabbcaa6134f6c47a22c7452ca18ff83ece357 WHIRLPOOL fd43cb450173a1dce0add1df9aba1e23e3ae10e9b12a728885c8b39f736422152c900e7a00658e93ab12a8476cf98fe3548620932deb15ded72f19bd93acf76b
+MISC ChangeLog 18759 SHA256 37148cddd55425b6f9a22adb8935635d3251690b539a86a1a227788251fcdfbe SHA512 23bd2afba25dd51559328d74601699098703e1ed71645b09a8f9000b82b7ab84a885b021b9fe6a69f81f71177c2a44be2fb84b87f64fb24919ce050c2083c041 WHIRLPOOL 6645754cd51cc3324e20ec51b532695d4d8c061bb26c828ca9057ac7f4158e926258a90b245a4a39c9592d6407d3ed6922031751fdcb276765b97953e87cebb3
 MISC metadata.xml 424 SHA256 c89c0232e90df5d811d17941c1594e4c4c45db48c2b6240a3c62b232caad4e84 SHA512 9d7fcca89a6f35a93f1a57790103249cdc25424cbdb374bf26b691e81b27182dc3380a8ff67b77e7aabf4ce944e4a813d619838d4bc97086b4208e5312d76f11 WHIRLPOOL 4ec9d4c5ff5c484c341b06fe77fcac8e6fdd0e0b651dbd58b6f2d5aecd05db5bf70218b94733eb749ced7436f9df5ba5c93496bae06c0ff9a62b91ecb53ab77a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVKaorAAoJEGSje+quGaToX+kQAIjJeV1HGvh6wx3ZYoSA7wpI
-PB2gIifXRPKsn/w4Kc0F3mSFuT13dRB98jlyp7R5/Dyb9sxgwVoLUpjl/qkwwUih
-ZnvgeKlV6+23u/x76/Z3rDZWNeXnyGt98OAgrkHTPUF2j54Ll+pBgCSvHVRorGZD
-WJBmaqyG9cEQ5GMaTpHuHlU542rqQiNpgNbXKFlgGoRQi4k2AHvjdFnR/QYE4ZMC
-R7w7cws0NIc1586u/OSn7lFYr/9K0a/8I3i1ZWBnESqy/CK31Byu1mUQ59rJ/QYt
-UqORxZpdIWKu5OcVMMdDjLzc4t1PjdRiWT2CiydEq9huY+Zd2hURUNwqD4Aizk/y
-UAJ0Ot7VmbOs1vXisO19c9kCELBjDsZZs1uNvvdmdniup4Gz8HomXN0FyCB2nG4U
-n1+qFz4ARAopDcYsZUU48ol/PWHZKBYa6nAxCjpg/lLSI12srF6ao3ZeQvN0GBKT
-MQCmhGai6iI/+YPdZ0OHsktOga5mCzopr5yMXPALhD71LesDdbjjf0m6LdCwOnMO
-n7Nc/y3/CKqGpclVjxDj2vcfN2hbNuqxvjzY01xtqRomHX/JCMB6toNojtsrsMHc
-Krwt6eFrALyBJKz0rwW16wvK6Li6oUq7t+IHdNhXP/6jgftfQqoAg26JejcNy57M
-PhliL3moqJCC6IVDd2Xk
-=hEeS
+iQIcBAEBCAAGBQJVKzJ2AAoJEGSje+quGaToOS8QAIXCjg6je17g4mj0H1MlxLrL
+B6hCENSqqCa5eF5CwWiKwQaso8MetZ2qXZw15Yzjk6779UTZZADakBzSRJ3dT8Ws
+mtzqYDPVn5SThKMQiOWgVQ2x1K1vaAId6WvXL5rmi8MMIDgDpwOqyhBOOostdjMs
+qdh6WIeoHZkJWNKTOG5316/p2E+m1wyO3kiT1j5kCb60AC2CYutDLAo1U44BdrjO
+qd/2P94fpxtA5390a0J9jM/ctVemXyttg2au0LMJ4KMDC0RLzzbGhGAaem/04RMH
+7ajhEszgcdVEWZK2LReu6RHktNpvEfjdjwEBuOpTwXD5T6D2OkcdTzHliFXZKH2A
+hS+GH5ZTQBUenRRQ+g5Enet9LqAmRLUEHxltKTfw8bRhW/Mec/IVGelrF+ziLzq4
+RQtao6XU8UeqwqQYW/lQgX0Uq1DLOwUG8NLmPLtNpEdY8506/holU6vFWFUSSjE2
+brDv3UwPaVRlgnWpocMspq//hnx89qE6+Oz1hpu2F3T60vSMykCEwc2lShFqUjNz
+ZWIGjVK5bfXInXKovbcLYGEJX0KwR7dwawtqOPil7/oL8wmaUCEf3bN49j9CctlQ
+ch16ozi+sOBwDyRVBBqhKYrO5zKJ/XSW0mjTW1pDAUM88c9GLMMOJ6iqkYuLbZQV
++DGzRAYVUc+HSeGMq4PR
+=R5WQ
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/keystone/keystone-2014.2.9999.ebuild b/sys-auth/keystone/keystone-2014.2.9999.ebuild
index 1349eea1b2c9..dc61128cecc0 100644
--- a/sys-auth/keystone/keystone-2014.2.9999.ebuild
+++ b/sys-auth/keystone/keystone-2014.2.9999.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-2014.2.9999.ebuild,v 1.4 2015/02/08 01:59:11 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-2014.2.9999.ebuild,v 1.5 2015/04/13 03:05:17 prometheanfire Exp $
 
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit git-2 distutils-r1 user
+inherit distutils-r1 git-2 user
 
-DESCRIPTION="The Openstack authentication, authorization, and service catalog written in Python"
+DESCRIPTION="The Openstack authentication, authorization, and service catalog"
 HOMEPAGE="https://launchpad.net/keystone"
 EGIT_REPO_URI="https://github.com/openstack/keystone.git"
 EGIT_BRANCH="stable/juno"
@@ -21,8 +21,7 @@ REQUIRED_USE="|| ( mysql postgres sqlite )"
 
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.6[${PYTHON_USEDEP}]
-	!~dev-python/pbr-0.7[${PYTHON_USEDEP}]
+	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
 	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
 	test? (
 		${RDEPEND}
@@ -31,47 +30,65 @@ DEPEND="
 		>=dev-python/bashate-0.2[${PYTHON_USEDEP}]
 		dev-lang/python[sqlite]
 		>=dev-python/python-memcached-1.48[${PYTHON_USEDEP}]
-		>=dev-python/pymongo-2.4[${PYTHON_USEDEP}]
+		>=dev-python/pymongo-2.5[${PYTHON_USEDEP}]
+		<dev-python/pymongo-3.0[${PYTHON_USEDEP}]
 		ldap? (
 			dev-python/python-ldap[${PYTHON_USEDEP}]
 			>=dev-python/ldappool-1.0[${PYTHON_USEDEP}]
 		)
 		dev-python/pysaml2[${PYTHON_USEDEP}]
 		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		<dev-python/coverage-3.7.2[${PYTHON_USEDEP}]
 		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+		<dev-python/fixtures-1.0.1[${PYTHON_USEDEP}]
 		>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
+		<dev-python/lxml-3.5[${PYTHON_USEDEP}]
 		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+		<dev-python/mock-1.0.2[${PYTHON_USEDEP}]
 		>=dev-python/oslotest-1.1.0[${PYTHON_USEDEP}]
+		<dev-python/oslotest-1.4.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/webtest-2.0[${PYTHON_USEDEP}]
+		<dev-python/webtest-2.0.19[${PYTHON_USEDEP}]
 		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		<dev-python/subunit-1.0.1[${PYTHON_USEDEP}]
 		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		<dev-python/testrepository-0.0.21[${PYTHON_USEDEP}]
 		>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
 		!~dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		<dev-python/testtools-1.5.1[${PYTHON_USEDEP}]
+		~dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
 		>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
 		>=dev-python/requests-1.2.1[${PYTHON_USEDEP}]
 		!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
 		>=dev-python/keyring-2.1[${PYTHON_USEDEP}]
 		!~dev-python/keyring-3.3[${PYTHON_USEDEP}]
 		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
+		<dev-python/oslo-sphinx-2.5.1[${PYTHON_USEDEP}]
 		>=dev-python/kombu-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/lockfile-0.8[${PYTHON_USEDEP}]
-		>=dev-python/stevedore-1.0.0[${PYTHON_USEDEP}]
+		<dev-python/kombu-3.0.24[${PYTHON_USEDEP}]
+		<dev-python/lockfile-0.10[${PYTHON_USEDEP}]
+		<dev-python/stevedore-1.2.1[${PYTHON_USEDEP}]
 	)"
 RDEPEND="
 	>=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
+	<dev-python/webob-1.5[${PYTHON_USEDEP}]
 	>=dev-python/eventlet-0.15.1[${PYTHON_USEDEP}]
-	<dev-python/eventlet-0.16.0[${PYTHON_USEDEP}]
+	<dev-python/eventlet-0.15.3[${PYTHON_USEDEP}]
 	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+	<dev-python/greenlet-0.4.3[${PYTHON_USEDEP}]
 	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
+	<dev-python/netaddr-0.7.14[${PYTHON_USEDEP}]
 	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	dev-python/paste[${PYTHON_USEDEP}]
+	<dev-python/pastedeploy-1.5.3[${PYTHON_USEDEP}]
+	<dev-python/paste-1.7.5.2[${PYTHON_USEDEP}]
 	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
 	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
+	<dev-python/routes-2.2[${PYTHON_USEDEP}]
 	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
+	<dev-python/six-1.9.1[${PYTHON_USEDEP}]
 	sqlite? (
 		>=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
 		<=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
@@ -87,26 +104,35 @@ RDEPEND="
 		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
 	)
 	~dev-python/sqlalchemy-migrate-0.9.1[${PYTHON_USEDEP}]
-	dev-python/passlib[${PYTHON_USEDEP}]
+	<dev-python/passlib-1.6.3[${PYTHON_USEDEP}]
 	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+	<dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
 	>=dev-python/python-keystoneclient-0.10.0[${PYTHON_USEDEP}]
+	<dev-python/python-keystoneclient-1.1.1[${PYTHON_USEDEP}]
 	>=dev-python/keystonemiddleware-1.0.0[${PYTHON_USEDEP}]
+	<dev-python/keystonemiddleware-1.4.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-config-1.4.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-config-1.6.1[${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-messaging-1.5.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-db-1.0.0[${PYTHON_USEDEP}]
 	<dev-python/oslo-db-1.1.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-i18n-1.0.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-i18n-1.3.2[${PYTHON_USEDEP}]
 	>=dev-python/oslo-serialization-1.0.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-serialization-1.2.1[${PYTHON_USEDEP}]
 	>=dev-python/oslo-utils-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	<dev-python/oslo-utils-1.2.2[${PYTHON_USEDEP}]
+	~dev-python/Babel-1.3[${PYTHON_USEDEP}]
 	>=dev-python/oauthlib-0.6.0[${PYTHON_USEDEP}]
+	<dev-python/oauthlib-0.7.3[${PYTHON_USEDEP}]
 	>=dev-python/dogpile-cache-0.5.3[${PYTHON_USEDEP}]
+	<dev-python/dogpile-cache-0.5.7[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
 	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
 	>=dev-python/pycadf-0.6.0[${PYTHON_USEDEP}]
-	dev-python/posix_ipc[${PYTHON_USEDEP}]"
+	<dev-python/pycadf-0.7.0[${PYTHON_USEDEP}]
+	<dev-python/posix_ipc-0.9.10[${PYTHON_USEDEP}]"
 
 PATCHES=(
 )