updates

Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64
Manifest-Sign-Key: 0x2471EB3E40AC5AC3

4 files changed, 214 insertions, 17 deletions

diff --git a/sys-auth/keystone/ChangeLog b/sys-auth/keystone/ChangeLog
index 854224c64c65..7184f531b066 100644
--- a/sys-auth/keystone/ChangeLog
+++ b/sys-auth/keystone/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-auth/keystone
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/ChangeLog,v 1.82 2014/11/21 00:07:57 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/ChangeLog,v 1.83 2014/12/09 01:16:29 prometheanfire Exp $
+
+*keystone-2014.2.1 (09 Dec 2014)
+
+  09 Dec 2014; Matthew Thode <prometheanfire@gentoo.org>
+  +keystone-2014.2.1.ebuild, keystone-2014.2.9999.ebuild:
+  updates
 
   21 Nov 2014; Matthew Thode <prometheanfire@gentoo.org>
   keystone-2014.2.9999.ebuild, keystone-2014.2.ebuild:
diff --git a/sys-auth/keystone/Manifest b/sys-auth/keystone/Manifest
index b1971eefb15b..6a9c34505944 100644
--- a/sys-auth/keystone/Manifest
+++ b/sys-auth/keystone/Manifest
@@ -5,28 +5,30 @@ AUX keystone.confd 124 SHA256 50daa09c5922190a6663e36a32e9b6e5c512672e5be776fcc9
 AUX keystone.initd 674 SHA256 fc556365de7198de035ebf083b10f59043aa3266270d3ab708d613311f1a719a SHA512 10066c2197973aeee2444ae1bff0ffc3d2a7360a632b55b9c2f66bf064285491e698721ec1525a22b18c0b74a8a6c5c4b84d2cf73812a0f93b2dbfffba799718 WHIRLPOOL 7969003cec68ca8017de003e6a5cfb4bd239a149b06dd9304c9ba8200b4fedfe8ae7e8d3c443e741d1c19cedc5d67150f1d236eef565685a64aa4a998c1ec509
 AUX no_admin_token_auth-paste.ini 2646 SHA256 f98d9151f222d2143820bdc98727ce0cf3f4450a4dbdc54f1fb6e36bb63bf2df SHA512 c855dd2bb05e765c6594359f55b76f7f6e0649c8e8f4517b274c7432f136e51c408168ec24e0074f4ebc49eb641d658acfda205aef97fe68fe8fc016be4cb08d WHIRLPOOL faad0f98d0684cf206e2f2afb5fba6c6aab73f97bcf63e38038be49a2ae1303e8cb5434d8fab34492888c666462dcd751c678c04cd0039d9024fd42ddde30646
 DIST keystone-2014.1.3.tar.gz 1439869 SHA256 19edd558718518e9d1bedc70d1ea643cf05f965ed1dfe4c95202bfb5825a3272 SHA512 9762d06f58534203cc696c6ce2f39743db0437c7f9805cca3253dc69dbe0fb18b1fd985afb5637de69aa91590647b7d7bef9f55e8de7acf94b1a958a5d8689a8 WHIRLPOOL af7d07a585fd041049ab94e0499a9c0ccd828bfe7dbf227aa2fc2ee511d5a6693b1b8afddbf0831987660661e4e06f543ee78b821faf9f10ea71d9fbb1b65295
+DIST keystone-2014.2.1.tar.gz 937822 SHA256 581cb19756716334d71852ca71344037b7872018f7a56787012c2a8d8e51817e SHA512 5044279048fbbea598243d63e26b05ba2259f412708aae0e9a7c7b28bacf374f0522478c81d1ff73d289388a773d130dbb757c320f803e81056415c389b32877 WHIRLPOOL f1f5102368a33327c2fef803c61518f0db5024bfc48808c8be763e7c682e2f3b86914d1507d56d9cbb467136b4653f4a84e1e7f836c287985d74b0b1480fb1f7
 DIST keystone-2014.2.tar.gz 938026 SHA256 b92767f56599622590431b4606b843e888ddc8fceb8d84c5eb8490eb33e5920b SHA512 1108d462e7f8f9d219188cd95027e6067cd17780b80481522e783fdf56f9ec95d5740c2b90cb80871dd6bfd28e445afacd9680dbd7b5c3e39768aeb34734ba43 WHIRLPOOL ca796d37027e26e5f296c61ef42c9670c5893faedeee7d6992944e6ba2dbbe1616121574b5ad6c819db48cc4fcd47d23dfc7e69634f05ab6a04737f86b6447d6
 EBUILD keystone-2014.1.3.ebuild 5593 SHA256 de06de53e8f9d369687f25c66ee4f909ae8ce613b2f8447bcd32aa2c45370b3f SHA512 7e462f6607e96eff9b02f3bb026aabd6431c456d85dc72bd166dbd57e735acf76e35e37a5dd93cf51586a58220e51374ccf4c4bfc4ee1144c6f6502d70ff73cd WHIRLPOOL 0ec2d940167c2d310c89501407db7ea04006fec2356d295f89b76f50db4474e1e3bf8ff8ba9e79bdf297a0a3ec29e010f0df246f88db0e2cbc914c33cf168b31
 EBUILD keystone-2014.1.9999.ebuild 5452 SHA256 24e4350808a84ce2119676d58fb20295cea722c9090521b11c9ec8e313e3018e SHA512 9817e8c414ab772a889b27404cd0deccd31171ca2224591940ea3866188cd37491bc9fdc9ffa8caf1f1349e6529a279dc415a108c1e5ecbd356ffe62c59e4307 WHIRLPOOL 4042bdd031e95506b79b13e7c2572f72de90a3432103c8f63e060eda41648e250380ee51769879156bea10e948d86cae72b6561e22d41dc866e830f6ebd0b4e0
-EBUILD keystone-2014.2.9999.ebuild 6349 SHA256 61f70a8fcbed72c47b80837bdaca59970d6fb555569d34dd5b394da10f8a2c39 SHA512 ea762e958ecf89de4714a8687889db915063878a05e2413cbd695abed99c902216fa936a28931de907842794e301868585397bf3f3135b3ac2548507dbbadf2d WHIRLPOOL cb833883f485498ec2e388920dc58ebd96669aeef0b01f96bf252db35ef0b88e4aecb9810b4a2f74febbcf9ec57368e8a0984a60a41b7470b926fb1d3892f834
+EBUILD keystone-2014.2.1.ebuild 6497 SHA256 bf656ad87b4d385e496a4c1a27eb528aee7964fa899337d77225e4d7bef2fb9e SHA512 915986c588a49698aa78ae7675245f7bca451e4e2f2708cbd22ccfa819ba52bd619f3d24764f22990891356bf1777373cd089cf3fa0f98a9257dd4c823b79518 WHIRLPOOL fdefcf85cc9d2b4dbd93544942b0f4e51a33af1b37c36ce0027d2122c96165797b9d7ce2e5814b51d1e2471c256bc4d029a124f00a78f20fe7b9a015dd5c68ac
+EBUILD keystone-2014.2.9999.ebuild 6459 SHA256 7409255a6de367e0fe77bb6b5b81ab5e37b0028126454e46e3923e3c1fda9efe SHA512 2bd5c75ce81d9244bd6fcee9ca3aee1102331600a6f8918f6fb4e5ebf638734e590502e2a180242138e242580d82eddbc6a2c860285bfe7af11bbb8016dc1df7 WHIRLPOOL 159d8ad6261441cf2af13f4eab4007d2209bc562a299fd31ccfb3696f8bdfc22cabd83c704447ad0b113fbe83452a9c1a209235616fcff2b855ca12ce3fe0e2b
 EBUILD keystone-2014.2.ebuild 6335 SHA256 62abbfc0cafbf3c017740e23183d0ab92876a1020a24442509bc5e92d3104f07 SHA512 b51fb88e2feebe8a7149a0a630515f93bd1e114c9eb863e685cac67df9211b30a49f880aef73d484f6882147a596c2c970aca0cd399b1247a691add0d62324d1 WHIRLPOOL d1c2346d2d7b9a2bc5a5420aaf7b45e376486d7ba83fae4ff03b57addcdc3da79c443725122efc37653f936983dc1832394f4b176bdcb2668cfef166a6499a01
 EBUILD keystone-9999.ebuild 6221 SHA256 43e52aca0fd2d106005fd0a668af717d3fcf592b8fecfa426a11f77e6bc92399 SHA512 8793eba2625b889ea507e9b1c037961b3258ec2d58e8e920d579ca4986da5042d72c5c4732f10a3ea4a216a859d7029df67748d187c5c9c05018eb3cbb01e702 WHIRLPOOL 7b8d035dfae545de6f70f621d8279d816cc00371e359a26f377860a13dcae101e743997d3200fd03fc350ad5e3a2baeb02fc21dfc1a5a5e63c0b2842f6494736
-MISC ChangeLog 17610 SHA256 9c1c3fb3ef22ca57499363ee1a31a7e4b82c88cf49f95d0e86e828b8f2cb2a01 SHA512 6cb1c6b5b554ed2feba06a0b0ca71573157339a5b6fb8980de4b6fe157fcb852cc2c7f69c4c398e148af9867046ab09ab6af697f0d9915cb0f822b90e642b3db WHIRLPOOL 3f771ba4383a576af1603d0273c04ee64e06b91da54242e149d90158fa5f8f07e49bb7578368897e5ee5c1c99283f8672b06b2fb9bd88d21fe4bb442b84dfce8
+MISC ChangeLog 17770 SHA256 c71b96249fea6bb3f8a4ad951074fa8e09249e212cb7187ce841d7dc2285a362 SHA512 faaf67908f7e3ab28fcbd02f711cf81f60bef62d2b616a4efd94a37b260fa9bf908ca27789768d4ea5e24eb2ce9a17276e14e411a670110375dc8ea16a7a4db1 WHIRLPOOL c76359329b255b7921a9899b319cc6ebaeeafa82552803fb92ccaa950db16d34e5a0d603846d755caa603f23db83a2749394ed54988e191a296140d88bd43432
 MISC metadata.xml 424 SHA256 c89c0232e90df5d811d17941c1594e4c4c45db48c2b6240a3c62b232caad4e84 SHA512 9d7fcca89a6f35a93f1a57790103249cdc25424cbdb374bf26b691e81b27182dc3380a8ff67b77e7aabf4ce944e4a813d619838d4bc97086b4208e5312d76f11 WHIRLPOOL 4ec9d4c5ff5c484c341b06fe77fcac8e6fdd0e0b651dbd58b6f2d5aecd05db5bf70218b94733eb749ced7436f9df5ba5c93496bae06c0ff9a62b91ecb53ab77a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUboKPAAoJECRx6z5ArFrD+VwQAM69pT7pdUpFSClB5SAZRFE2
-spocqP5RPNGTYjEUi5lypcFpOKvFNdFnL7mRyoBd7Y0zsBpuEcNf+lIHakgLM/fK
-a46+wFRThftCWh+wCSiCpHhY4Zkb2Ry/XWqXIPu00JAKMniMvopwiY4uSVbcJ2fT
-A16uQ+l+lJam1+3z+3dLmMy1KcQA9gZ344gZIrTnWMHk0K1CnBxciuttemPYfieg
-yugdBlkN99dBVjIQff+BsKDCIA8pzkfa6bljPG6f71pgbqcV4BttsPsUJbfR9UaP
-TLaLqpUONNRYPfR5Nu2BkNwIGwu2rfXi1KKhIrMqD/+UHS/MwbBXuewjGJGzpsUd
-acOn3nvIZpmhhhj+t5OZtNbdmBRE/6DxIEfB+zJpyXdENbhGWEkUoAQFk5KLJRUx
-RedxkrypiO/qOhluoGa83oWYjUQ4p3R/eab6aUz1Xl6qjmym/bih+8Ai4aFj3+1W
-B4xr145gax4vU7t4VSlIwxnjSeZR8B20oC2pSV2kb8c/QakxEjTF/I+0aA+RUn8v
-+l/zBPhO6qIhU/x1lrDhV3DHnnIxBobcIYqdCtLPape6DsbAjluqBuP+zx63Nslz
-2jFXBJXdgYq12mh73eXP6jkPn/ylXmJ662a0r2nssJtgR/5muqiFEppMThN/gzH3
-omIXNkz6N5IH5B8Xjiyg
-=zdq6
+iQIcBAEBCAAGBQJUhk2uAAoJECRx6z5ArFrDG00QANDpJbho1NinQKUde0YvKJcg
+zouIRcU5p9WaUZDuiRBRFQ50LMkjfskAUos6Lq/6NVMKEzBXEs8f/KavKxpJf2Wr
+GxqYCWFO+WOdBN170apPDoe2YzZpl/CoD0s45ZB7kQ3FHixUOmGYFESyNLQry5eY
+Pie2gjHBUQ/ADO2x2hyi6YKUZ4pCsC5OODqoTs+c7bkeHR/fU08e6yWxMxG09ONj
+u0M7xTGNjWtvyVRnD11cfo6KSjXrdxAFPmgE63pr9g6a2Jb1hZol7C8PwSMZlajw
+tjKQI28IqNXlONDgKd/nsjD7Bpyooy5dxB3qYEjXEAwehkrJubNT3tHQCpRbVmjA
+zcRnJlP3OAs5kJOJY6FS5OTQCLQ9mP/DqQkiY1/vMlCKoh8KNKRhtvgSGD27R+Dj
+gZf5h/2IT+mcwgcqIyLFJtVPhf/dDI1wsNe/XxiqBfi8JdEmvgMNc+0E4BArq6zx
+2gpKnlmfC5zRKQ+Isw+ARkMwVy90J5oJ7fnjr4CMnhEdpA7kx9xwPpSigPyI7Jc7
+v8j3AO2gPwZVY3Q1T7z092bwApjP3b3p3bldOUAOPDg85vwKzYCZRfU+oYp+NBq8
+zfKc1BMAG4mNT6fPuUDEW9wipItYn10vUeEXPaMKF2HkU8KlDRXZvBto80Tk3Phb
+ftYTlkH6NWz1FElMuHIQ
+=YRU8
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/keystone/keystone-2014.2.1.ebuild b/sys-auth/keystone/keystone-2014.2.1.ebuild
new file mode 100644
index 000000000000..8426ca9f176b
--- /dev/null
+++ b/sys-auth/keystone/keystone-2014.2.1.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-2014.2.1.ebuild,v 1.1 2014/12/09 01:16:29 prometheanfire Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 user
+
+DESCRIPTION="The Openstack authentication, authorization, and service catalog written in Python"
+HOMEPAGE="https://launchpad.net/keystone"
+SRC_URI="http://launchpad.net/${PN}/juno/${PV}/+download/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+sqlite mysql postgres ldap test"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+#todo, seperate out rdepend via use flags
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pbr-0.6[${PYTHON_USEDEP}]
+	!~dev-python/pbr-0.7[${PYTHON_USEDEP}]
+	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+			>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
+			<dev-python/hacking-0.10[${PYTHON_USEDEP}]
+			>=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}]
+			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/fixtures-0.3.14[${PYTHON_USEDEP}]
+			>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
+			>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+			>=dev-python/oslotest-1.1.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/subunit-0.0.18[${PYTHON_USEDEP}]
+			>=dev-python/testrepository-0.0.18[${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/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/kombu-2.5.0[${PYTHON_USEDEP}]
+			>=dev-python/lockfile-0.8[${PYTHON_USEDEP}]
+			>=dev-python/stevedore-1.0.0[${PYTHON_USEDEP}]
+	)"
+RDEPEND=">=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.15.1[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	dev-python/paste[${PYTHON_USEDEP}]
+	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
+	!~dev-python/routes-2.0[${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}]
+			)
+		)
+	)
+	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}]
+			)
+		)
+	)
+	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-migrate-0.9.1[${PYTHON_USEDEP}]
+	!~dev-python/sqlalchemy-migrate-0.9.2[${PYTHON_USEDEP}]
+	dev-python/passlib[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-0.10.0[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-1.4.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/oauthlib-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/dogpile-cache-0.5.3[${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}]"
+
+PATCHES=(
+)
+
+pkg_setup() {
+	enewgroup keystone
+	enewuser keystone -1 -1 /var/lib/keystone keystone
+}
+
+python_prepare_all() {
+	# it's in git, but not in the tarball.....
+	mkdir -p ${PN}/tests/tmp/ || die
+	cp etc/keystone-paste.ini ${PN}/tests/tmp/ || die
+	distutils-r1_python_prepare_all
+}
+
+# Ignore (naughty) test_.py files & 1 test that connect to the network
+#-I 'test_keystoneclient*' \
+python_test() {
+	nosetests -I 'test_keystoneclient*' \
+		-e test_static_translated_string_is_Message \
+		-e test_get_token_id_error_handling \
+		-e test_provider_token_expiration_validation \
+		-e test_import --process-restartworker --process-timeout=60 || die "testsuite failed under python2.7"
+}
+
+python_install() {
+	distutils-r1_python_install
+	newconfd "${FILESDIR}/keystone.confd" keystone
+	newinitd "${FILESDIR}/keystone.initd" keystone
+
+	diropts -m 0750
+	keepdir /etc/keystone /var/log/keystone
+	insinto /etc/keystone
+	doins etc/keystone.conf.sample etc/logging.conf.sample
+	doins etc/default_catalog.templates etc/policy.json
+	doins etc/policy.v3cloudsample.json etc/keystone-paste.ini
+
+	fowners keystone:keystone /etc/keystone /var/log/keystone
+}
+
+pkg_postinst() {
+	elog "You might want to run:"
+	elog "emerge --config =${CATEGORY}/${PF}"
+	elog "if this is a new install."
+	elog "If you have not already configured your openssl installation"
+	elog "please do it by modifying /etc/ssl/openssl.cnf"
+	elog "BEFORE issuing the configuration command."
+	elog "Otherwise default values will be used."
+}
+
+pkg_config() {
+	if [ ! -d "${ROOT}"/etc/keystone/ssl ] ; then
+		einfo "Press ENTER to configure the keystone PKI, or Control-C to abort now..."
+		read
+		"${ROOT}"/usr/bin/keystone-manage pki_setup --keystone-user keystone --keystone-group keystone
+	else
+		einfo "keystone PKI certificates directory already present, skipping configuration"
+	fi
+}
diff --git a/sys-auth/keystone/keystone-2014.2.9999.ebuild b/sys-auth/keystone/keystone-2014.2.9999.ebuild
index 9d41b0a61675..12b4d88741cb 100644
--- a/sys-auth/keystone/keystone-2014.2.9999.ebuild
+++ b/sys-auth/keystone/keystone-2014.2.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.2 2014/11/21 00:07:57 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-2014.2.9999.ebuild,v 1.3 2014/12/09 01:16:29 prometheanfire Exp $
 
 EAPI=5
 
@@ -113,8 +113,10 @@ RDEPEND=">=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
 	>=dev-python/keystonemiddleware-1.0.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-config-1.4.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-messaging-1.4.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-1.5.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-db-1.0.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-i18n-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.0.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-utils-1.0.0[${PYTHON_USEDEP}]
 	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
 	>=dev-python/oauthlib-0.6.0[${PYTHON_USEDEP}]