update keystone for bug 498510

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

7 files changed, 146 insertions, 93 deletions

diff --git a/sys-auth/keystone/ChangeLog b/sys-auth/keystone/ChangeLog
index 25259a884638..77ffcd2fe535 100644
--- a/sys-auth/keystone/ChangeLog
+++ b/sys-auth/keystone/ChangeLog
@@ -1,6 +1,16 @@
 # 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.56 2014/01/18 06:34:12 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/ChangeLog,v 1.57 2014/01/20 05:58:14 prometheanfire Exp $
+
+*keystone-2013.2.1-r1 (20 Jan 2014)
+*keystone-2013.1.4-r2 (20 Jan 2014)
+
+  20 Jan 2014; Matthew Thode <prometheanfire@gentoo.org>
+  +keystone-2013.1.4-r2.ebuild, +keystone-2013.2.1-r1.ebuild,
+  -keystone-2013.1.4-r1.ebuild, -keystone-2013.2.1.ebuild,
+  keystone-2013.1.9999.ebuild, keystone-2013.2.9999.ebuild,
+  keystone-9999.ebuild:
+  update keystone for bug 498510
 
   18 Jan 2014; Matthew Thode <prometheanfire@gentoo.org>
   keystone-2013.2.9999.ebuild:
diff --git a/sys-auth/keystone/Manifest b/sys-auth/keystone/Manifest
index 9b50950702ae..8be3a65c8d7d 100644
--- a/sys-auth/keystone/Manifest
+++ b/sys-auth/keystone/Manifest
@@ -11,27 +11,27 @@ AUX keystone.initd.havana 1286 SHA256 0218d7abf00fe62cde4bfc1fdcdec9cd0784dad4c7
 AUX no_admin_token_auth-paste.ini 2646 SHA256 f98d9151f222d2143820bdc98727ce0cf3f4450a4dbdc54f1fb6e36bb63bf2df SHA512 c855dd2bb05e765c6594359f55b76f7f6e0649c8e8f4517b274c7432f136e51c408168ec24e0074f4ebc49eb641d658acfda205aef97fe68fe8fc016be4cb08d WHIRLPOOL faad0f98d0684cf206e2f2afb5fba6c6aab73f97bcf63e38038be49a2ae1303e8cb5434d8fab34492888c666462dcd751c678c04cd0039d9024fd42ddde30646
 DIST keystone-2013.1.4.tar.gz 799682 SHA256 3673f5d7c1c19fca7529934308e2d9a6efa55bf7d100d20de1aa85e431d259b2 SHA512 7b1d9d9ae0fc6b1cadef8eb0d85f6a71fcfab754f8908076d38b14c14c3eb46d2d3c6266ec7482a60d7ae8cf54d54ba604c4d903dde65ec1243f862423060c14 WHIRLPOOL dea8adbb504ee9e3cda416f6e5a12cb0e606b88db7c0fe9b83fb8487e6f18e313e7d53041fcdaab408ae4201e355b72324cf35585b113c8769f51daf1c3f4ea4
 DIST keystone-2013.2.1.tar.gz 1404077 SHA256 1e52362557e5641e0dad580a68654d7813ad11f7761ad42af15e4786aaad34da SHA512 f65e153d847ca897f54cedabdfb0f9baee60791927132486d2a9a371724a0282a851dacbfde7629430c26c50763199ee06c92909b66e2880d0010ec46fd21c86 WHIRLPOOL cc6f9e2eb7be7ffeb210f35b4ab4c5bbcd666a6363941b9774dc9733231748beab18d08a24ef1042afc984c4f40acb160b14e60adcdccf332f16327e602db220
-EBUILD keystone-2013.1.4-r1.ebuild 3153 SHA256 0a1ef5d65647f17dc70700d058d20cffc1379ca39f2a43d816ba9e260f9e686d SHA512 7b8288d4f205d2cd201ef6135aa1da527220d2b72896d24e0a99804091978adf88ca4a6a4d22f00acd3b199ffde73aa9ea259c253a582ccdfe0869c64a9151a9 WHIRLPOOL 94da411739945062ec72bb58cb78e718b673b7363e7999bd4be88f476aeedc9d0e66ab87fa6d8a116382c4e3bc8471defb5f7db4d389036bea56a78df2207839
-EBUILD keystone-2013.1.9999.ebuild 3101 SHA256 58a93657711e2bd7fdd7a54f4e641ee87ad29f39211fea04a4bdbcd18fda8807 SHA512 d2ab9ab6aad68f468eb2606a7a439d77f39ea85d9f2e69eb6308439a6824e76845b52ba6eb4df19205635b730a0233998ed3c9a75f28d1c20eb11018f56b22df WHIRLPOOL 5bdadbaca00e25e8b8f595fa23a10bdce18c764d9f960f7ba5bc45d791bfc4567eeee7d65c51e25a6119cb4505316b18f1de8b65d5f4f22bcae3d1b181bd6715
-EBUILD keystone-2013.2.1.ebuild 4818 SHA256 9af2916261db7765e8b1f0283d63d0d690509b8a133ab4d8ebebf97c0c831fb1 SHA512 a3c6132dd1f7646283a14a497dad7609a98ad2020508c778dc28db540da1db85a360117db168268a4ca50cbea8988b7f22df3c5c662665f79e85576ac97a93db WHIRLPOOL c5bfa14d1d157b1d9ae980fcf294cac3fb677812b8d6c05e8e2c26703aa6c3fdc4a17535e23968c09277d2b693c22f34cb31d8a7732af256a3d0d0f25d6b3e75
-EBUILD keystone-2013.2.9999.ebuild 4451 SHA256 5dbb66cb768ada1b5e51e48a59819d85a91d9cbc354bc71bcacc73040a2e7106 SHA512 8e9d8ba2a8f286ceda16d750414549df9640bb283e019ae68830484919e5c48539888d548ab7ea2c013a9d7eaaa0979e8a2fdd99d173859868ae0ac59ad15cc6 WHIRLPOOL 85c15dc2d375444ba966831789819c0bf304eaa19cc12fed7e2ddd4b8c2c3d7bff781edc753bf5cb3e2cde8fc4f1148482bbb39e5f8b2d1b2f153d8bc608aea7
-EBUILD keystone-9999.ebuild 3057 SHA256 935d2e365eed7feb2e33d644c6e3c9cd2987286bdba757a62e0295213b521245 SHA512 dcbb6315d118186b2e41ca83957aa11d72c2f264f96d6d7e82df6097a3c54388440ed4b4e38ca340b10c5f56a7f4a5385995a52e7cafe665512408144963a3bc WHIRLPOOL d5809a8a54d41d01b0ca93ba24407a65375ac34a93242d2278b4d056eb4f916442b6f7d54f193c5a907d0b957a7c17c237e83abb7d24210f11d57f3e6c73616b
-MISC ChangeLog 12115 SHA256 90fe8ee435fd9609a9b7c2712a1b366fdea25ae14bc5194d39be5f9a6f213599 SHA512 85b61cbe9cdf294a59e72a9528cbe89cbc7f828667e546b3b3b45814bc78ac2d558b98ec48f7067e899519829084c7331455f7209ab41f4b83eb7f827117ddf0 WHIRLPOOL bb97a538574ffdbbc6ba5a2a290cc19ccea240ab839299a047c06e665f421d8231fea5c2ad1c9b6bba1c2d815d82078bc37ca80636b45b70a93055aab2b5e1b3
+EBUILD keystone-2013.1.4-r2.ebuild 3129 SHA256 046159e9d8b576cff8eb8895eb5f4c70e882f07b98feb774309c3a255f305735 SHA512 4e47118b8f3de95cfd60f3e226bc263e53b4ef4bef00bfe2ab9810a3d58d211622766f23da25db6377d6704ccef2cbc1a2e05b22bcfa8b9cc7f6c3b5166e91a3 WHIRLPOOL 8ae7ba69003705514dc4929e361431744e2b14fe416586cdbfa4c88d4ad7ed6cc5273cd87bd1004db21f3e5cc446579ee686d60bcab0c7bbdb62b14a0da47311
+EBUILD keystone-2013.1.9999.ebuild 3077 SHA256 da4acfcb28df8bf2e599335ed88f42085e235acd4a8005efb4df876934ac38a1 SHA512 cd8211c1bda6b33ebba43a02ef80bddf5bec74680a8272abad92d87e937e8d252ce82941b64adafa9999832df6c1e688b68351e105aa9997ff2bcce2dc40b340 WHIRLPOOL c7fefd443501ebcca02e21d45b71893b4112a6df0f0eae00df4ca8712bea7b972dd7058865b5174fe386dedff74fd58fb450249f25c94ae4dadd1e4229af327b
+EBUILD keystone-2013.2.1-r1.ebuild 4788 SHA256 fb60a7402b7e56019062c1a000dc1ccf74790462440ac0d02098698f9e797a30 SHA512 7c2c9d068d8ceab82430d69020a9508c7a509ae2744a216d5198eb14f0aa87e66cbb9b3239902b74d1613c15a9b774aca4b2b2cb1f9d1ce3b754543988820690 WHIRLPOOL a1abd452dd84f5d67ab7ec5ca38ca44a0f57d0bdcecee2989cd67c5e421a01f3a21baee538501a5362b16f3adba22a4f1664245b503ebcdc850978f533111ce2
+EBUILD keystone-2013.2.9999.ebuild 4415 SHA256 106746caec8bfe0c755a7f08e1877dfc7469b053e2522e00f6a75f8c54e93c13 SHA512 221dfaa8edd079ec767b556229680eff5707d41871fea0235ea157d91bda5841169c431899cdf8480d22b76bc09f87cf3a220b90892283b95884e3be6bda92f7 WHIRLPOOL c134aee953b032e5beea895f0296a1736ead23d82cc2e1b9701d3e187237b4442af824cee3702f3ba2a67d89316ee55ef8d33e8d4224c876f080ad098cc31c81
+EBUILD keystone-9999.ebuild 4402 SHA256 522134285d25eae87cfb549db3160972e42e966efb8381ca43c1e280f662c964 SHA512 921a522e7d8ef01bffcb09744d10506ac6b6d49f8994419091d1a3065364775f905d60da822f53c3e401f56280113d671e9d3c770a8c8867fe9f606573f0593b WHIRLPOOL 39bfec9c30210644cced5dc2b2b8ef696db303854b5d25db52bd8694225df8593b81a2569110ac675265317624f65c36e3af105ccaa6719a9fa80ce88672138c
+MISC ChangeLog 12484 SHA256 dbecd01396ce96249d1d7eefb57b87b94c088c1a6588ccb2900bcbc6796dbfc0 SHA512 ac512f21f5494294c31ee296f720502487ce9deacd57780d36622c478db878536d34b423de9b6eb4c5f3729af74299b8819f28a69b5dab68bdaa92eb57593765 WHIRLPOOL 069640287aa96800f762bc57dedfd9994f457c5f24aa31dae054844f7663f589a6d8d0661cefb3afb5489e6c6557a050039559be32fa06c70e84b39939b74c84
 MISC metadata.xml 424 SHA256 c89c0232e90df5d811d17941c1594e4c4c45db48c2b6240a3c62b232caad4e84 SHA512 9d7fcca89a6f35a93f1a57790103249cdc25424cbdb374bf26b691e81b27182dc3380a8ff67b77e7aabf4ce944e4a813d619838d4bc97086b4208e5312d76f11 WHIRLPOOL 4ec9d4c5ff5c484c341b06fe77fcac8e6fdd0e0b651dbd58b6f2d5aecd05db5bf70218b94733eb749ced7436f9df5ba5c93496bae06c0ff9a62b91ecb53ab77a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS2iCTAAoJECRx6z5ArFrDUbIQAMnROOV2jNP9vx/NNM18WnxG
-sgHs+mxozv/HYtiQBk2swCPQiXD7Y3E1lE+BpflMODY0gIS/Bw2Xi8pHYvlNtpM2
-4Bb0AVFlLhaSgKiPMxb4VwhNfQ/TB6Z6MqjlJPiONtY58xrPbV1FFODYxfPj+9jF
-LbKVQQ4B7lgK3ccZLbQMShE/lSiQE9kJIgMx5l8YqwBAuQ5rFu+y4CLkOyeksPFc
-vbEN9q7zwgpVnt5mUdILtiNXvGdHcvxYXMG7rMmPA8HPDij0jYzvPzM6reX0TAm7
-P4+D1G5lPT/DJihkct7FWqT9/FccDbQD6RTZjD4izF2ZrtKBzNQ9sJXJcZ+Vk8VR
-9T9Y2LVm74U4fWexNZnnnoCF0qHJbNd3hQ7dRFojDGWF2a0AAajvg6+om0/7C5Wj
-ZePWtKbLEYEqSXhZ/j5KEfIZFo9HN9Q4QGjzOeDahRoUX4/o+pe2SrMCrjSJxSRR
-usY9gZ1ycNSvBK5KYFc8kbDqIqzrQkfKGlBSbiGO2cT07Xf+hJr0eboruJmLMuQj
-8vctbgMpQZDmPI0G4Vbj79mHHr9QktWZbQLrUo/dZ31chwtH12eSsFp0QUKS2EsD
-+COjlcYaeLPLE4dG8WsPtwhw2nKLg4RuXfJ8PrW+Iel9JTrmkPHJCBVXp/85J5Xd
-m4Xe+YNKq7RcGhQvAu/m
-=VEMf
+iQIcBAEBCAAGBQJS3LtLAAoJECRx6z5ArFrDiRMP/jMqSxbRFiRcCZgWIStMacrP
+vKq4lz+EZfiORQgfU8OZsms0kaMrne8aNX3/3niXhzVOE0EmWXwyMJaC5bXPFH3W
++VhsAoR4cuyYDXVG4Gft3yb0WI+0PSeHhhT0NJ+BN+9NmJOAWf+f4Nd8+MLG5J1F
+3+I0PYaFkIX3mJ3TzZ5baHzQ6wrSBKnh9HA7EFpxrrkvgKeSzMHfTw7TuiAcXDoD
+GrLUyax/A0+UcEw2khGWYPtMxhwTh/buVKkT/tOJmYDp/2KyciNe2QiZwACcZ8mJ
+MH2G7Iqkgyn+33mNGIMMtk/lhsLPpI+wuAcZDL0Y6XkpFdGaLbUVn4dc1zbBXHPv
+6MjAOtDfKS/dG8J6NIK3qR7Nu0Ov6PEVBmesXEH9BBjQWPRB7/3jTikx512MwmP3
+mKyPJjpJvcCgco45XZ8kztRMLAB9pMC0d6pERWeec97DfozLa2y7evpw7XyGFSHu
+Jz13UbPLblZt12d9qJoRYernEdPbSkMsRgYJasaqMBBdhvzFZidj2Okx3CMoe7EA
+5ENpNtE+AgigYrK1WQbX5BiV+2ESrtZeuGkjJ2XiuC8wvaJpZAPhDYmj2vWYu8rD
+Jvt9QpgyvjiQE51arFciAVxhL4aT8MBsJHQB2XJOc2bk6dIPSbUcRDdValnf4eXb
+HFGptV0/vLK4r2xPhnGO
+=dBVB
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/keystone/keystone-2013.1.4-r1.ebuild b/sys-auth/keystone/keystone-2013.1.4-r2.ebuild
index 536b0ec305fe..15c1edbefefa 100644
--- a/sys-auth/keystone/keystone-2013.1.4-r1.ebuild
+++ b/sys-auth/keystone/keystone-2013.1.4-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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-2013.1.4-r1.ebuild,v 1.1 2013/11/18 03:24:30 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-2013.1.4-r2.ebuild,v 1.1 2014/01/20 05:58:14 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -12,7 +12,7 @@ HOMEPAGE="https://launchpad.net/keystone"
 SRC_URI="http://launchpad.net/${PN}/grizzly/${PV}/+download/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
-SLOT="grizzly"
+SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+sqlite mysql postgres ldap test"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
@@ -82,7 +82,7 @@ python_install() {
 	newinitd "${FILESDIR}/keystone.initd" keystone
 
 	diropts -m 0750
-	dodir /var/run/keystone /var/log/keystone /etc/keystone
+	dodir /var/log/keystone /etc/keystone
 	keepdir /etc/keystone
 	insinto /etc/keystone
 	doins etc/keystone.conf.sample etc/logging.conf.sample
diff --git a/sys-auth/keystone/keystone-2013.1.9999.ebuild b/sys-auth/keystone/keystone-2013.1.9999.ebuild
index f9621d0fac56..e87e8c0362b4 100644
--- a/sys-auth/keystone/keystone-2013.1.9999.ebuild
+++ b/sys-auth/keystone/keystone-2013.1.9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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-2013.1.9999.ebuild,v 1.8 2013/09/27 01:43:20 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-2013.1.9999.ebuild,v 1.9 2014/01/20 05:58:14 prometheanfire Exp $
 
 EAPI=5
 #test restricted becaues of bad requirements given (old webob for instance)
@@ -16,7 +16,7 @@ EGIT_REPO_URI="https://github.com/openstack/keystone.git"
 EGIT_BRANCH="stable/grizzly"
 
 LICENSE="Apache-2.0"
-SLOT="grizzly"
+SLOT="0"
 KEYWORDS=""
 IUSE="+sqlite mysql postgres ldap"
 #IUSE="+sqlite mysql postgres ldap test"
@@ -82,7 +82,7 @@ python_install() {
 	newinitd "${FILESDIR}/keystone.initd" keystone
 
 	diropts -m 0750
-	dodir /var/run/keystone /var/log/keystone /etc/keystone
+	dodir /var/log/keystone /etc/keystone
 	keepdir /etc/keystone
 	insinto /etc/keystone
 	doins etc/keystone.conf.sample etc/logging.conf.sample
diff --git a/sys-auth/keystone/keystone-2013.2.1.ebuild b/sys-auth/keystone/keystone-2013.2.1-r1.ebuild
index 029b7ff30905..73018da07da3 100644
--- a/sys-auth/keystone/keystone-2013.2.1.ebuild
+++ b/sys-auth/keystone/keystone-2013.2.1-r1.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-2013.2.1.ebuild,v 1.5 2014/01/08 06:14:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-2013.2.1-r1.ebuild,v 1.1 2014/01/20 05:58:14 prometheanfire Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ HOMEPAGE="https://launchpad.net/keystone"
 SRC_URI="http://launchpad.net/${PN}/havana/${PV}/+download/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
-SLOT="havana"
+SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+sqlite mysql postgres ldap test"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
@@ -98,14 +98,14 @@ python_install() {
 	newinitd "${FILESDIR}/keystone.initd" keystone
 
 	diropts -m 0750
-	dodir /var/run/keystone /var/log/keystone /etc/keystone
+	dodir /var/log/keystone /etc/keystone
 	keepdir /etc/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 /var/run/keystone /var/log/keystone /etc/keystone
+	fowners keystone:keystone /var/log/keystone /etc/keystone
 }
 
 pkg_postinst() {
diff --git a/sys-auth/keystone/keystone-2013.2.9999.ebuild b/sys-auth/keystone/keystone-2013.2.9999.ebuild
index c2cd99ae1275..157787829944 100644
--- a/sys-auth/keystone/keystone-2013.2.9999.ebuild
+++ b/sys-auth/keystone/keystone-2013.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-2013.2.9999.ebuild,v 1.8 2014/01/18 06:34:12 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-2013.2.9999.ebuild,v 1.9 2014/01/20 05:58:13 prometheanfire Exp $
 
 EAPI=5
 
@@ -100,14 +100,14 @@ python_install() {
 	newinitd "${FILESDIR}/keystone.initd" keystone
 
 	diropts -m 0750
-	dodir /var/run/keystone /var/log/keystone /etc/keystone
+	dodir /var/log/keystone /etc/keystone
 	keepdir /etc/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 /var/run/keystone /var/log/keystone /etc/keystone
+	fowners keystone:keystone /var/log/keystone /etc/keystone
 }
 
 pkg_postinst() {
diff --git a/sys-auth/keystone/keystone-9999.ebuild b/sys-auth/keystone/keystone-9999.ebuild
index c723a0e4bb8c..e6314486675b 100644
--- a/sys-auth/keystone/keystone-9999.ebuild
+++ b/sys-auth/keystone/keystone-9999.ebuild
@@ -1,78 +1,98 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.12 2013/11/28 04:51:37 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-9999.ebuild,v 1.13 2014/01/20 05:58:13 prometheanfire Exp $
 
 EAPI=5
-#test restricted becaues of bad requirements given (old webob for instance)
-RESTRICT="test"
+
 PYTHON_COMPAT=( python2_7 )
 
-inherit git-2 distutils-r1
+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="master"
 
 LICENSE="Apache-2.0"
-SLOT="git-head"
-KEYWORDS=""
-IUSE="+sqlite mysql postgres ldap"
-#IUSE="+sqlite mysql postgres ldap test"
+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}]"
-RDEPEND="${DEPEND}
-	dev-python/eventlet[${PYTHON_USEDEP}]
-	dev-python/greenlet[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.4[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-0.2.1[${PYTHON_USEDEP}]
-	<=dev-python/python-keystoneclient-0.3[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-1.2.0[${PYTHON_USEDEP}]
-	dev-python/passlib[${PYTHON_USEDEP}]
+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/greenlet-0.3.2[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
 	dev-python/paste[${PYTHON_USEDEP}]
-	dev-python/pastedeploy[${PYTHON_USEDEP}]
-	dev-python/python-daemon[${PYTHON_USEDEP}]
-	>=dev-python/python-pam-0.1.4[${PYTHON_USEDEP}]
-	dev-python/routes[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.7.2[${PYTHON_USEDEP}]
-	=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
-	virtual/python-argparse[${PYTHON_USEDEP}]
+	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
 	sqlite? ( >=dev-python/sqlalchemy-0.7.8[sqlite,${PYTHON_USEDEP}]
-	          <dev-python/sqlalchemy-0.7.10[sqlite,${PYTHON_USEDEP}] )
+	          <dev-python/sqlalchemy-0.7.99[sqlite,${PYTHON_USEDEP}] )
 	mysql? ( >=dev-python/sqlalchemy-0.7.8[mysql,${PYTHON_USEDEP}]
-	         <dev-python/sqlalchemy-0.7.10[mysql,${PYTHON_USEDEP}] )
+	         <dev-python/sqlalchemy-0.7.99[mysql,${PYTHON_USEDEP}] )
 	postgres? ( >=dev-python/sqlalchemy-0.7.8[postgres,${PYTHON_USEDEP}]
-	            <dev-python/sqlalchemy-0.7.10[postgres,${PYTHON_USEDEP}] )
-	ldap? ( dev-python/python-ldap[${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
-#			)
-#PATCHES=( "${FILESDIR}"/keystone_test-requires.patch )
-#
-#python_test() {
-#	"${PYTHON}" setup.py nosetests || die
-#}
+	            <dev-python/sqlalchemy-0.7.99[postgres,${PYTHON_USEDEP}] )
+	>=dev-python/sqlalchemy-migrate-0.7.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}]
+	virtual/python-argparse[${PYTHON_USEDEP}]
+	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+	>=dev-python/pbr-0.5.21[${PYTHON_USEDEP}]
+	<dev-python/pbr-1.0[${PYTHON_USEDEP}]"
+
+PATCHES=(
+)
+
+pkg_setup() {
+	enewgroup keystone
+	enewuser keystone -1 -1 /var/lib/keystone keystone
+}
+
+python_prepare_all() {
+	cp etc/keystone-paste.ini ${PN}/tests/tmp/ || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Ignore (naughty) test_.py files & 1 test that connect to the network
+	nosetests -I 'test_keystoneclient*' \
+		-e test_import || die "testsuite failed under python2.7"
+}
 
 python_install() {
 	distutils-r1_python_install
@@ -80,9 +100,32 @@ python_install() {
 	newinitd "${FILESDIR}/keystone.initd" keystone
 
 	diropts -m 0750
-	dodir /var/run/keystone /var/log/keystone /etc/keystone
+	dodir /var/log/keystone /etc/keystone
 	keepdir /etc/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 /var/log/keystone /etc/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
 }