juno bup

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

5 files changed, 430 insertions, 64 deletions

diff --git a/sys-auth/keystone/ChangeLog b/sys-auth/keystone/ChangeLog
index 34beb54bd00f..f4e8720651b9 100644
--- a/sys-auth/keystone/ChangeLog
+++ b/sys-auth/keystone/ChangeLog
@@ -1,6 +1,13 @@
 # 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.80 2014/10/11 22:07:23 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/ChangeLog,v 1.81 2014/11/10 07:07:34 prometheanfire Exp $
+
+*keystone-2014.2 (10 Nov 2014)
+*keystone-2014.2.9999 (10 Nov 2014)
+
+  10 Nov 2014; Matthew Thode <prometheanfire@gentoo.org>
+  +keystone-2014.2.9999.ebuild, +keystone-2014.2.ebuild, keystone-9999.ebuild:
+  juno bup
 
 *keystone-2014.1.3 (11 Oct 2014)
 
diff --git a/sys-auth/keystone/Manifest b/sys-auth/keystone/Manifest
index 5cdea9818fea..fa02c80ee4fb 100644
--- a/sys-auth/keystone/Manifest
+++ b/sys-auth/keystone/Manifest
@@ -5,25 +5,28 @@ 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.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-9999.ebuild 4688 SHA256 c1fc32ab0fe5c1ee6dbd0d4cae9c0fc65c11b6274e24f88683b1368c29129561 SHA512 8c9428f8692ec0fdc980cbe74d4871e12fa70adb70828f615ddf9d11012cfc2a8461ddb0afd0140427e209d4b28742e2bb41446e472370112b45890410fa9ba3 WHIRLPOOL 120b8146e44eb1d31f9515978f2cacab478faeae7d2c880f515e1b9f50049503ca4bc75589c3b628ba0dc4ce856f0d872930fc5a98c0469d9283234eee276d00
-MISC ChangeLog 17256 SHA256 4d8e06452ae6fe0771221c107356911d1025277c7ceb70657887f86a921d9801 SHA512 ca689c8990ffbed7a4300d348d93753bf01e18fb0c7f4cb1c2ade69b15a9885baefe30fc6f44cb0b3f77e37128e386cfe94994b61f2cfab2bebaf3136d514a94 WHIRLPOOL 8889b19243e7ae57ba9a4b8b5a5f73a9a541efe5def5feb4265e27446655c9eb4f9a9f84ac407638b0b0c5909aba56251441af11b1721e3bb7e7af579d1b4997
+EBUILD keystone-2014.2.9999.ebuild 6232 SHA256 679694d6c989550588dee41a5ad96f3d7ac97f82bfa018f501a7492ae3f5e11f SHA512 c36cc8c309f0a0ab5a1984c8d4f81d6c3820249652b47980e8d501748e270c04b8e2fdcad821520c6ed2e50d3dcc3e929fa679297c7910a0f37fc80216bed8af WHIRLPOOL 33a8059f452599939dbe7863069f442575e0b4c65793bf54c30a97bba14b24651f0caf05ed004019f8e4903581e56d527bb5d9e43a7390bae1d04dd36831123f
+EBUILD keystone-2014.2.ebuild 6218 SHA256 31012894c541a464bf02df032bb554d4eb1ddd560aff0b228b2eeab64215b375 SHA512 dc4500703474d5d774fec35e9520d6cdfaf8040f92cd487ac72914e699f0d20d8c58b69dcfe9d1f0051b394f6f5613a0c6c6053d60c4b526b4ad36c887288134 WHIRLPOOL 2d5e0f6246fea92b60212f8cd47e99341d5f07e053c863c3cb39a22b6e007bab526e59cb25ee61358a43c4110191cc8214e4cc420b965d2a30167d54acae2cc4
+EBUILD keystone-9999.ebuild 6221 SHA256 43e52aca0fd2d106005fd0a668af717d3fcf592b8fecfa426a11f77e6bc92399 SHA512 8793eba2625b889ea507e9b1c037961b3258ec2d58e8e920d579ca4986da5042d72c5c4732f10a3ea4a216a859d7029df67748d187c5c9c05018eb3cbb01e702 WHIRLPOOL 7b8d035dfae545de6f70f621d8279d816cc00371e359a26f377860a13dcae101e743997d3200fd03fc350ad5e3a2baeb02fc21dfc1a5a5e63c0b2842f6494736
+MISC ChangeLog 17472 SHA256 728681811d3a5ac1d178ae8aa91992c5a4dcbaf80af632effdb9047036a9119d SHA512 a6c9b9d8b0afba00e6f89527571bd2f3190577f696502d19475234ae48aee7b2763bcae93f79b5e17625b0d46b61d9bbb54b27409f0598c27865ba7db04f106d WHIRLPOOL be026d2dde774f7bed03bc314c8ddfe0d922fdf288b2c8f1eaf9f6f3ff2e001d5a5f0b09b5b658958f92901a7b86d3ed65f2a877af243e44b875435856b07839
 MISC metadata.xml 424 SHA256 c89c0232e90df5d811d17941c1594e4c4c45db48c2b6240a3c62b232caad4e84 SHA512 9d7fcca89a6f35a93f1a57790103249cdc25424cbdb374bf26b691e81b27182dc3380a8ff67b77e7aabf4ce944e4a813d619838d4bc97086b4208e5312d76f11 WHIRLPOOL 4ec9d4c5ff5c484c341b06fe77fcac8e6fdd0e0b651dbd58b6f2d5aecd05db5bf70218b94733eb749ced7436f9df5ba5c93496bae06c0ff9a62b91ecb53ab77a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUOao2AAoJECRx6z5ArFrDxLwP/1qCo0sRBQuKTKXZmCSgCQQs
-ZD5SPUyDabzjxieXxtVnUzZzSPIivEo7eXcEyN2JeF9n0N+eUpcj1XjdufUrSLEi
-VL3+jB4iRvixC32keLUNOYndsv6NWdA21iCNQqmFBLb4Ysc+Cke6Z1vpkojkx/61
-FoORGhV/VgfuiarCSke1VIkAwGDdQ35b7tX4cSp0hQ6lwoQA6jO7GeF1EjoJ8mpL
-fh5zvDjSUluUqhCDYvdi7ZPA2RRYghJPs4CMzHg3vCVb1URCM4+MsfAPsppXtMST
-RhYdTYjUXOwY1E3zuZlhsZaEgY4EXDMSf+ML4Pl90K9VeqNiQCEtHN7+MwB1aUFx
-NUHg0l7aLIIt013GlrgjPkfu/IFRjsPkE4GszYfEBO66iTv6eMHLfcP112Kstlgt
-NDrRWamy3reLPjCY92iDCieigRRbBkO0Fss0/quzJNFAwUIyjFBD0iHNrrdRJJ38
-TDAsclN6HDm6ZFduoEz4bdLsNUNFEd6sJ6e66KMSgFvkVX+Do8hlm2Y7jgKhyCXO
-4WEvgpvXj6lfZlnAUKnPcKtdJhOqo2vaK9RmVoeG/JOBQWgqBYzTajHKwIey97/g
-BvqaZbhxA12oSvRSt5JCmDF0uOYNpCnXTAzX0H55/MSl0368j4+JD9DpP4hf0xT1
-Efihr/0PkoIkszW5dYUX
-=St/5
+iQIcBAEBCAAGBQJUYGRhAAoJECRx6z5ArFrDm+oQAJJPdmcaHKiAAs16GsaVvcvo
+Dif4j80DDOQiGH2gtVi2UlYUTC/KzJzZlaVmLzlTax7aE58PDDkKC6EfVev0x8rv
+IBYZisi4gFPQMl+5xuGWlverDft8dkJwA0MbE2e5YbK+Ws+aOePOVY067BXLOwnC
+6RDJNd6a++xq7wXq6MUtkUIil7lVU1QEA0IkvGLwoJ2nQepcHuxtgDRJj5ne/4Jr
+Myuul8Taf/v+f4i9m+Di3VQERbvyDfKK+x1oClc5BEUTDIY+pMgym4OA7eMe78zV
+HEyfDarzfcJ3Uz5mAHnP7hLJGHEvhtytaFEy7unb10TRIEyK8aLUXbOg7s74a2Fr
+npXTeNROeMY2rhmVAtjSHrZKGYgUYX4VZPRDxwSayjplr2RmlUn+bMvCNW07uwnT
+3MYoTO2WdLLqZckXozXGhiwJe89YrhoL1Z75FpbJ/uaTDsTQigwnrt1DUYNfeaxj
+YgQT2vtUe8LuwHnsAGUDyqqPe8n/Xnb6yIWWr2R4AeIRII83Dt0Y0GI+SlCtnPzd
+8NvAmalIghy7FNLMkwe5puPvg8vMKWe3GX3XnDcpjaq6uXQnQ364BRwsALR2K23i
+SyEpjOLct/HK6/CpZxJusUfLaHPeHEDBeTgticLZUrOp65GRHkRsaID/I/0kwyFT
+/edc9JpN83mDA1HT5I4e
+=5Tsq
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/keystone/keystone-2014.2.9999.ebuild b/sys-auth/keystone/keystone-2014.2.9999.ebuild
new file mode 100644
index 000000000000..740df872b716
--- /dev/null
+++ b/sys-auth/keystone/keystone-2014.2.9999.ebuild
@@ -0,0 +1,167 @@
+# 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.1 2014/11/10 07:07:34 prometheanfire Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit git-2 distutils-r1 user
+
+DESCRIPTION="The Openstack authentication, authorization, and service catalog written in Python"
+HOMEPAGE="https://launchpad.net/keystone"
+EGIT_REPO_URI="https://github.com/openstack/keystone.git"
+EGIT_BRANCH="stable/juno"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS=""
+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/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-db-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-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.ebuild b/sys-auth/keystone/keystone-2014.2.ebuild
new file mode 100644
index 000000000000..2a4ee25b0a8b
--- /dev/null
+++ b/sys-auth/keystone/keystone-2014.2.ebuild
@@ -0,0 +1,166 @@
+# 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.ebuild,v 1.1 2014/11/10 07:07:34 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/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-db-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-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-9999.ebuild b/sys-auth/keystone/keystone-9999.ebuild
index 1b02c57adc1c..be7ae9490e09 100644
--- a/sys-auth/keystone/keystone-9999.ebuild
+++ b/sys-auth/keystone/keystone-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-9999.ebuild,v 1.19 2014/08/10 20:21:57 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-9999.ebuild,v 1.20 2014/11/10 07:07:34 prometheanfire Exp $
 
 EAPI=5
 
@@ -21,69 +21,90 @@ REQUIRED_USE="|| ( mysql postgres sqlite )"
 
 #todo, seperate out rdepend via use flags
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/Babel
-			dev-python/decorator
-			dev-python/eventlet
-			dev-python/greenlet
-			dev-python/httplib2
-			dev-python/iso8601
-			dev-python/lxml
-			dev-python/netifaces
-			dev-python/nose
-			dev-python/nosexcover
-			dev-python/passlib
-			dev-python/paste
-			dev-python/pastedeploy
-			dev-python/python-pam
-			dev-python/repoze-lru
-			dev-python/routes
-			dev-python/sphinx
-			>=dev-python/sqlalchemy-migrate-0.7
-			dev-python/tempita
-			>=dev-python/webob-1.0.8
-			dev-python/webtest
-			dev-python/python-memcached )
-	>=dev-python/pbr-0.5.21[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]"
-RDEPEND=">=dev-python/python-pam-0.1.4[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
-	<dev-python/webob-1.3[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.13.0[${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/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[${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.0[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-0.9.5[sqlite,${PYTHON_USEDEP}]
+		>=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.0[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-0.9.5[${PYTHON_USEDEP}]
+		>=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.0[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-0.9.5[${PYTHON_USEDEP}]
+		>=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.7.2[${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/lxml-2.3[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.4[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-0.9.6[${PYTHON_USEDEP}]
-	dev-python/oauth2[${PYTHON_USEDEP}]
-	>=dev-python/dogpile-cache-0.5.0[${PYTHON_USEDEP}]
-	dev-python/python-daemon[${PYTHON_USEDEP}]
-	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
-	>=dev-python/pbr-0.5.21[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${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-db-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-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=(
 )
@@ -94,6 +115,8 @@ pkg_setup() {
 }
 
 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
 }