removing the old and jankey

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

5 files changed, 20 insertions, 328 deletions

diff --git a/sys-auth/keystone/ChangeLog b/sys-auth/keystone/ChangeLog
index 2163c9e6e6d3..ce43ccb700dc 100644
--- a/sys-auth/keystone/ChangeLog
+++ b/sys-auth/keystone/ChangeLog
@@ -1,6 +1,11 @@
 # 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.102 2015/07/29 23:28:49 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/ChangeLog,v 1.103 2015/08/05 02:39:41 prometheanfire Exp $
+
+  05 Aug 2015; Matthew Thode <prometheanfire@gentoo.org>
+  -files/CVE-2015-3646-2014.2.3.patch, -files/no_admin_token_auth-paste.ini,
+  -keystone-2014.2.9999.ebuild:
+  removing the old and jankey
 
   29 Jul 2015; Matthew Thode <prometheanfire@gentoo.org>
   keystone-2015.1.9999.ebuild:
diff --git a/sys-auth/keystone/Manifest b/sys-auth/keystone/Manifest
index 9cd529ab869b..b5dc444c25f4 100644
--- a/sys-auth/keystone/Manifest
+++ b/sys-auth/keystone/Manifest
@@ -1,31 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX CVE-2015-3646-2014.2.3.patch 1284 SHA256 6653753041b52661d1e8fd977d5e1359ede1fda48a877fb0fac2b90f606abd02 SHA512 8970b498673142f3d5b6ba7f8020d61b54ea3b44bf65c3104dd02b8f87c53cf9e1ac460cecb1014b051b0bb71bc3a02f69fba08a83872b04512cbe0745efe688 WHIRLPOOL a6b36f8c856b140dea18d7617764709d3d1f0da92c24ce99b128b625ee9d238e3534b5884991b7ffa40c3ceef8e283d97052fb5e481de28f7b98db129b4c3bc4
 AUX keystone.confd 124 SHA256 50daa09c5922190a6663e36a32e9b6e5c512672e5be776fcc9b0805da40b6e8d SHA512 1cf50ddcd55421481f8b34f91f35787299b2f9044bcc0a63c70ffff372d740cb84c399d31e52d708fdacad3455d77867d02b438ec2fb39b35ac2e106a2c9e0ad WHIRLPOOL e6c2b76131846cd0ce86e8d766d3f5bbd0d8cd0643de9100d7946afa44c3f13500719feca3ee4ea49644f6881fa34bdc17c08d65a001841ae8f40fc820d334fc
 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-2015.1.0.tar.gz 884362 SHA256 20ad170dcc727659f30003af16272d7685238d1ad069c91c542b6ac47d903d7a SHA512 d619a75a2f840fe49a66446c7b2436583a2ca6ea292252470b41817e7c7c34972ea7fbbb68a3b292699a4b2854a01db64be9f263b2dd56389cf6fd1e8d0f4f85 WHIRLPOOL 0f85ad09d13c32c591fa8ac5495de28234b79bb47f9b9f56409ed2f36adbcacbe2bd022fd568859ea82cfba735de96e1b6f32e07c78d5509507440ec52b1d534
 DIST keystone-2015.1.1.tar.gz 884979 SHA256 6c703f2d26c6a5f4fd4963dc11474b55cf87c5890d97361a4738df35eea258c5 SHA512 0c540f2a33729a539e68cb5d3e0b0b4ef0014829c274b0b92d982cd7d75110b14a3edc9db9c15794dd4c73f45a4982f47f99f75be6cbd8c91b0550ef24040848 WHIRLPOOL c20cc32d6043e9a2e9e5441a17e55431efabc3619156256c8fe8217bd876b07abb5860a48fc4bd761f505f022579d815a29b56d5c7a0536bafe89a2ad4b3b93a
-EBUILD keystone-2014.2.9999.ebuild 7215 SHA256 55fe43bcf8b5d59a4ad48ae581cf43d71c32b934484b1807bba656a2aa838e32 SHA512 510b134fac94166ab903139b7a5845cb2dcc5e1ab911630e0f8f13bd478c8a807f474205f596101ce3866a89a050fe17f947abd0dad5299005c44a89b0763da0 WHIRLPOOL edccb61f3fafa612dfc3a9e4eee39099cdd46ce4e6cf15d1e624a9af89bc4eac73e6c4e9532e63fa99ddb89c34672f40565bef2271a19c35ccbd37f05fe7cb37
 EBUILD keystone-2015.1.0.ebuild 6555 SHA256 a1c695ea8ef208fec5be79cb760fc0d1766485d682c46f812cf15ebe8e51a8a0 SHA512 a4004cc1ad626884ad2afecc3f905ff503b064ccbfdece370e4453328c7b0826f74f44e619d5205841b30ffc398d3af57f0103404bd19f7c26880b4b3eecf710 WHIRLPOOL a53728c364d727ee307a95ccf635a52d6742cbad13ba0f220d87e70ac3b146ef93f3ade934db235b866f2829d7549b7117e189c4c8e9f9c7392a1e9fae06e1b8
 EBUILD keystone-2015.1.1.ebuild 6761 SHA256 d237a701499c181698b958d35c01d5952e6dca1ceee3f64334de55aa6a04af5d SHA512 5893f5a250bba142bfe5b4a1437486f46c45fc50be856b251a54d6851adf30b228203ba01af78624f2fe5551a7465b482e80abc4761b0a4d454ecf0f7e563b35 WHIRLPOOL b13c56c29fbc07610bbb3a8f226599389bd384ee6e68e71dd55121227744b18e8eee8cd551433afa9a740dcaed29ba9e574ba1beb65558e3c4248b43711e4160
 EBUILD keystone-2015.1.9999.ebuild 6773 SHA256 4384d57e0ee4bf8978416ac6e1ce920cd74fe68adcd943bf8d102901996aa8ee SHA512 874fb2b08938e75c6e93980f83e248015d4e6d9037cc2b42b0b57e844a47304d05db9ded4748c642e66071626ed2be6fb6606e961ed6a8a8a1e6cca219fc2f61 WHIRLPOOL 43a2786553126606dbe874de34545922a6aaab987c29343256a68c0f3e35f1f1cd14bae8d39333cfe288982ac76d441eced775b98c669eb522e8b72feaf95ab2
-MISC ChangeLog 20453 SHA256 e081cc30735680aefd6df43353e750466ecc89c5c20b147812597e6e42545d30 SHA512 90592ebd67cf3679fc49bb580b68772e86d6bd480f6a741ad33521f1d3708fbc2a8413066166ede4e1fd20194af3985b72fffc829c8555b0c6da7beb687cada8 WHIRLPOOL 00f082522dab6e932e04a515458e4d7d16b63b43eb7f0cfd35b135f8ca4f8c817fcbee9f01c168b8557b653277c9efac00b67bb1371d1f8e04fb6ec51e138607
+MISC ChangeLog 20650 SHA256 d48ae7dc48725af18da9d4cd43ba70b1b2f088be6f0fa79c81501a4e91cff168 SHA512 da42f7d98c6e07b9600807b2bc6e341c598ab2a98fd689c29ec58f96e6816fab549ab5ac25c58b4a6f0243b4e3d3b8541caa58ac7fc6532e005f81a1fc0e4a06 WHIRLPOOL 2887330061afad1f3c7fd4ff7ffa7e141001e336eb3d3ae3f9db11785470105abc3afcc0bb3c515ce5000af7d5de7d928c8c05e669d993a3d06f5a9b114217a3
 MISC metadata.xml 704 SHA256 0c2a4a929b46ce48d8be8de2c69890b7a0445a7c0b88d3ae3fa845302abc1b9c SHA512 4604503954c7e0aa84c5605eca062e353854fa5d23d18d0ed615ea55364f5cc526ba9175a06c1333e2a1c961dbca3e5d428e55b3457c60a0d3b365a47cb056d7 WHIRLPOOL 29ed17f40c66145d6e49d4b2fc39c37bf78ae0c8841e065e97d9122c10b4290f00b75da205602335bb8546331e5df09f52b95377b8ce77398ab9771d4be3fc4d
 -----BEGIN PGP SIGNATURE-----
 
-iQIcBAEBCAAGBQJVuWH/AAoJEGSje+quGaToaNoQAIo3qBDWYI6FxQ76CLQHJITr
-RtA0Qf7AA3ZqZINmJYBlSOjJan0KZCb+cEGbuPDjLkqrVSDvmFF2b85z3xLtCCIQ
-AV4eAqFNsvRoHvCo4u5U9b71dVg+y9VPhCQDD+Fa2xYTsi0auN9g3KysjlTqS4lk
-SjvLE86wyKAsAob6rMdijz+3CA8g/NNjXWU8YocGg4Q+dTRaXQfrrDoRWp7umguF
-lYwfKzRssu/SSOci3ZiGxixb23Ay7kq5eubdFnXTk0QPzLjrXbHC84CaX/VFuaqW
-Ug/CcFixZ3GA9ilZTGEqdESgTqQVl36s7sqYX3aOpccZOstcmdF2WMdclxzX70oe
-UhlyADLHuXKKIvp2wkhEFA0UxunS7gxnMfNviA8dxzYjz/HrxCC8c77sOdDFckId
-jrobnbZ/xjAwaVrkU37f5whl1ledaw36/Q4hy6lelTqlhc0kssDpL/76n7qVMAe9
-o97fZ8R3XfDhRyLHNQz+w+BFbM4h7GMo+PaxDWXMOyRKX+l5bkSrG7E7+dlha0Ra
-8XJbDWiyUudefngXXuEn2K+LL4fOyk0pqe/LbAZZxTLe3BEEby96fmSBrmtuYOHU
-n0xVP9UDYhKFqqpiATLuokhKC7xHcPUINu8QsmM9ibhJ2/DLQMh+5wdVE67lZRG5
-EkpZb9cC24rGD2ogFH4b
-=TqN+
+iQIcBAEBCAAGBQJVwXfDAAoJEGSje+quGaToH80P/0+ZNNtfsE+CU4XMqnzpCemV
+oC4hTMAMrjKa/YpqF1UCpJfNx+pzMWG1tOkyIUwoQUAJzzYEqXkrWjVdt9k8U6VJ
+LrUP4DZv2gzN8fiGshoD8OOvLSybM27Nyv/H271yKRK+EIaFelA3LpiHvFsRiJdw
+WkJdUK24gYBgvUmPfmkh5PihoTfEGOnxb3jiR72UDuNefvKo4qTh9oHC9oX+aFfx
+n5bhEd937Xh9Lm3H1fo9JdcBrNTcr+g0wyGGWLi2PhtJaF6p/amRPjs2vWlUfsmX
+8lbsrLG97wp79uGtBkfBZwo9qEN/5dR3k2Vt70ctUzZpaus8HzOXsxi3CRYX4Pmh
+bwhaRPznZyH76qHaLY108FeHIPXkdP5KKRHxwXChmpPjzrWUNeuyuImIDV6ra5Pi
+/mRMga3iPmEUuLIfv0wOF79Fq+yZEXf6nb8nD2DS+5I8yrE9yrc8p97btdh/A1pQ
+4ijosh9foeZWFdJIXtafQDV5gVn55GqWWgoNNhUNRVLZpF6qZuXeAkr9pGUU5crD
+x4/fTlSI8GBjstagd3KfA055NDxNqK6Smil0uaNiGfAa85nYa5IXAf/QXzqTpfHE
+2LEZeoipnZR5TvKIEaqN7cVvaodccrvgkU9YqoFAIcxOFaEa3Wqk2ks7ryHXnrKe
+TNGLVa9gbDW1cqqHsY6m
+=sgy0
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/keystone/files/CVE-2015-3646-2014.2.3.patch b/sys-auth/keystone/files/CVE-2015-3646-2014.2.3.patch
deleted file mode 100644
index 411ee2a78753..000000000000
--- a/sys-auth/keystone/files/CVE-2015-3646-2014.2.3.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 695153a523faa9310e2e20d0333c33a47334208a Mon Sep 17 00:00:00 2001
-From: Eric Brown <browne@vmware.com>
-Date: Mon, 13 Apr 2015 11:37:53 -0700
-Subject: [PATCH] backend_argument should be marked secret
-
-Since the backend_argument can potentially contain a password,
-it should be marked secret to avoid leakage into the logs.
-
-Closes-Bug: #1443598
-
-Change-Id: I55663db4cf2df84a66de8f64fba4b4f129ae827d
-(cherry picked from commit f9db1a65bd4d83d12c572ba4d5807845996ef410)
----
- keystone/common/config.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/keystone/common/config.py b/keystone/common/config.py
-index d7f9dd8..d953e49 100644
---- a/keystone/common/config.py
-+++ b/keystone/common/config.py
-@@ -313,7 +313,7 @@
-                         'deployments.  Small workloads (single process) '
-                         'like devstack can use the dogpile.cache.memory '
-                         'backend.'),
--        cfg.MultiStrOpt('backend_argument', default=[],
-+        cfg.MultiStrOpt('backend_argument', default=[], secret=True,
-                         help='Arguments supplied to the backend module. '
-                              'Specify this option once per argument to be '
-                              'passed to the dogpile.cache backend. Example '
diff --git a/sys-auth/keystone/files/no_admin_token_auth-paste.ini b/sys-auth/keystone/files/no_admin_token_auth-paste.ini
deleted file mode 100644
index 1c2fafd2ab2e..000000000000
--- a/sys-auth/keystone/files/no_admin_token_auth-paste.ini
+++ /dev/null
@@ -1,88 +0,0 @@
-# Keystone PasteDeploy configuration file.
-
-[filter:debug]
-paste.filter_factory = keystone.common.wsgi:Debug.factory
-
-[filter:token_auth]
-paste.filter_factory = keystone.middleware:TokenAuthMiddleware.factory
-
-[filter:admin_token_auth]
-paste.filter_factory = keystone.middleware:AdminTokenAuthMiddleware.factory
-
-[filter:xml_body]
-paste.filter_factory = keystone.middleware:XmlBodyMiddleware.factory
-
-[filter:json_body]
-paste.filter_factory = keystone.middleware:JsonBodyMiddleware.factory
-
-[filter:user_crud_extension]
-paste.filter_factory = keystone.contrib.user_crud:CrudExtension.factory
-
-[filter:crud_extension]
-paste.filter_factory = keystone.contrib.admin_crud:CrudExtension.factory
-
-[filter:ec2_extension]
-paste.filter_factory = keystone.contrib.ec2:Ec2Extension.factory
-
-[filter:s3_extension]
-paste.filter_factory = keystone.contrib.s3:S3Extension.factory
-
-[filter:url_normalize]
-paste.filter_factory = keystone.middleware:NormalizingFilter.factory
-
-[filter:sizelimit]
-paste.filter_factory = keystone.middleware:RequestBodySizeLimiter.factory
-
-[filter:stats_monitoring]
-paste.filter_factory = keystone.contrib.stats:StatsMiddleware.factory
-
-[filter:stats_reporting]
-paste.filter_factory = keystone.contrib.stats:StatsExtension.factory
-
-[filter:access_log]
-paste.filter_factory = keystone.contrib.access:AccessLogMiddleware.factory
-
-[app:public_service]
-paste.app_factory = keystone.service:public_app_factory
-
-[app:service_v3]
-paste.app_factory = keystone.service:v3_app_factory
-
-[app:admin_service]
-paste.app_factory = keystone.service:admin_app_factory
-
-[pipeline:public_api]
-pipeline = access_log sizelimit url_normalize token_auth admin_token_auth xml_body json_body 
-ec2_extension user_crud_extension public_service
-
-[pipeline:admin_api]
-pipeline = access_log sizelimit url_normalize token_auth admin_token_auth xml_body json_body 
-ec2_extension s3_extension crud_extension admin_service
-
-[pipeline:api_v3]
-pipeline = access_log sizelimit url_normalize token_auth admin_token_auth xml_body json_body 
-ec2_extension s3_extension service_v3
-
-[app:public_version_service]
-paste.app_factory = keystone.service:public_version_app_factory
-
-[app:admin_version_service]
-paste.app_factory = keystone.service:admin_version_app_factory
-
-[pipeline:public_version_api]
-pipeline = access_log sizelimit url_normalize xml_body public_version_service
-
-[pipeline:admin_version_api]
-pipeline = access_log sizelimit url_normalize xml_body admin_version_service
-
-[composite:main]
-use = egg:Paste#urlmap
-/v2.0 = public_api
-/v3 = api_v3
-/ = public_version_api
-
-[composite:admin]
-use = egg:Paste#urlmap
-/v2.0 = admin_api
-/v3 = api_v3
-/ = admin_version_api
diff --git a/sys-auth/keystone/keystone-2014.2.9999.ebuild b/sys-auth/keystone/keystone-2014.2.9999.ebuild
deleted file mode 100644
index ba917ce29c32..000000000000
--- a/sys-auth/keystone/keystone-2014.2.9999.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# 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.7 2015/04/14 16:10:06 prometheanfire Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 git-2 user
-
-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"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS=""
-IUSE="+sqlite mysql postgres ldap test"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.8[${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.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/testtools-1.5.1[${PYTHON_USEDEP}]
-		~dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
-		>=dev-python/requests-2.1.0[${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/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.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/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}]
-	)
-	mysql? (
-		dev-python/mysql-python
-		>=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.9.7[${PYTHON_USEDEP}]
-		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-	)
-	~dev-python/sqlalchemy-migrate-0.9.1[${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/keystonemiddleware-1.0.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-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/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/pycadf-0.7.0[${PYTHON_USEDEP}]
-	<dev-python/posix_ipc-0.9.10[${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
-}