removing the old and jankey, adding the new hotness

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

5 files changed, 102 insertions, 142 deletions

diff --git a/dev-python/python-keystoneclient/ChangeLog b/dev-python/python-keystoneclient/ChangeLog
index 69900dfe64f0..ea513d84d111 100644
--- a/dev-python/python-keystoneclient/ChangeLog
+++ b/dev-python/python-keystoneclient/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/python-keystoneclient
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-keystoneclient/ChangeLog,v 1.32 2014/07/06 12:48:20 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-keystoneclient/ChangeLog,v 1.33 2014/08/01 04:50:27 prometheanfire Exp $
+
+*python-keystoneclient-0.10.1 (01 Aug 2014)
+
+  01 Aug 2014; Matthew Thode <prometheanfire@gentoo.org>
+  +python-keystoneclient-0.10.1.ebuild, -python-keystoneclient-0.7.1.ebuild,
+  -python-keystoneclient-0.8.0.ebuild, python-keystoneclient-9999.ebuild:
+  removing the old and jankey, adding the new hotness
 
   06 Jul 2014; Michał Górny <mgorny@gentoo.org>
   python-keystoneclient-0.7.1.ebuild, python-keystoneclient-0.8.0.ebuild,
diff --git a/dev-python/python-keystoneclient/Manifest b/dev-python/python-keystoneclient/Manifest
index c9e7cd86acae..d0aae6b314a1 100644
--- a/dev-python/python-keystoneclient/Manifest
+++ b/dev-python/python-keystoneclient/Manifest
@@ -2,29 +2,25 @@
 Hash: SHA256
 
 AUX sphinx_mapping.patch 612 SHA256 d262ebd8e9254f683333c7e349a291037a74d6b3cde23e5d984d9ff37d0f73ed SHA512 a2aeacf6bfdae22056a33be8ece54d64dff1206eadb7ab6988ced85b502ea64ce0ed35b3f55bbbe2d902a139b8939e1b76d48b3e85772f4729a5247fbf498af5 WHIRLPOOL 2f7e733736ef865af5398112a3b62ec164d5f7cdb6b35ede36d302f7c3f63527a62ca382bb352bed9173615122a9f9398dc14046b30cbae44d2337f02db3bed0
-DIST python-keystoneclient-0.7.1.tar.gz 242347 SHA256 176a5e2c28fd0513783b2c8a21b8540d73d7c49706aa3651fea28d0e5029a062 SHA512 9fc52a0d36fc3188adf4bf20fcac52ab6edee41a115c9a2e20b82d6cddf5b4f23887241bc656d2a5f0a3c4c5cea9ec145c8585f9dd36e28147ee946ac6b8b79c WHIRLPOOL 29b6d7e74a63719dea82872488b708975839bc1dae71b123fd89c69d5d15445bdcb3a6fa5cc9f84fd0401ad4f9d7668b5fe3f2a25f4ed50c38747e82bb76009f
-DIST python-keystoneclient-0.8.0.tar.gz 247616 SHA256 6a34e10e67f375c82fefbb787072767da976520b302021b5d7237bd78e93f8cf SHA512 81491d9a3ee7c98ac664e6a5850612eddc7aa890f519d3b81b607fe7e7c5f063013003f7b596e50445ac405e3480e736386e27cd2d23def82129205323640ae6 WHIRLPOOL 224b828f31c93f7750f8b7666bc1cdca78b2574855f49605414d86900ef1f552b68a8fcf64747ad3e9c6769193a1ed434e19d1b51b8f863e104d84a75e9b1a4d
-EBUILD python-keystoneclient-0.7.1.ebuild 2374 SHA256 e54f2e04441ec0c6c7a4ccfd3659f1457b9fd2b829cf99a71233cc0a0504a315 SHA512 83bfacdc51ef2c839a9edd826f8a129f0521c70020b8f3abb031dc7a6cc02c593b8134cf3ef547329607468d6c4d92776e01243ca31484e8b10847209b7e50e3 WHIRLPOOL 1774ec00f322b200f1dd1a5960a4b6684451f663ab16ae413c2a0d9ffa31cd913fe101d72283d50bdb13e02adcfb82b6729e33864a2186d25db1fb495a91115b
-EBUILD python-keystoneclient-0.8.0.ebuild 2417 SHA256 53a0058e007386a2ae59f75d5a64fa504e7ef537b618ffef7da722674dedccaa SHA512 c1489e927332e71d390ab56137a50b6d490748b140a25323f1b1a02350cff768b6ce6c83dca6593babb2c8b8dc4f9599774b1e4f1b96e4d046622ed7660b1320 WHIRLPOOL b0ddfba46bc757dc508deab760e11613e7a3647af90212f499cb7589961038cd54fd93f49f71d84e7bc8e22bd09059efb2b09f91126982c94d599c681c99a21e
-EBUILD python-keystoneclient-9999.ebuild 2011 SHA256 e59dc634d50d89efb523ac3ac8cc5f6919fc98cc2273d7938a29ec42133f1fe5 SHA512 94a55552e670cfb517d942f239d8f9a5368727d2a2dc04fb1fb663bdbb994b788a342f8155a4296ff32b6357884391642f62ca82363c2b8937e5c1aa431c754d WHIRLPOOL 5d4ee4e7959b0f83fcda7948928dbead4dad68cfeeaa938ac80b0d24bc73df1d984831635590fc3d412feff54ed11b0f47dd2aababa69404c5a0c0ea4e4dd3bb
-MISC ChangeLog 7453 SHA256 d61747ff73605b1671cdfa5c26872e0598cfca604365bbef46d510ff2643d03d SHA512 dad7c8ae232c5a206c5b4283fc67e3400062fb45b69bcb11bd6be996c3a07f58475742921bbc8da90f541740dd4fa1937d15cb48c30ae0857c72c2da6ffdb4b2 WHIRLPOOL d12d1955bdb2fc570cc72b0df3a03c4c913216927426d77af2cb04cd8ba055c0f473e5975ddb78e5304950cbd2805b2675a4fbc0955d9bfffa1c0c4331b523b8
+DIST python-keystoneclient-0.10.1.tar.gz 321149 SHA256 259ce783dadb69cb48bfb02ed26c7d1ce3d5ad504e9e53c326e958a1e4ddadde SHA512 363165bcd2790d8d6b79535f7bec2ab0f174b23e94815149553bc82a32a8c936853b8a430cf1e3b079390f2847bedb028e4ce4324381308f9147607bda3b0883 WHIRLPOOL e29e341ee94e166a8287bfc4dcb71dcb8ff8ec27a61d7ab4df1289b233c1a80bbf4fe38992a3de697d737c7a50f5b946fa4448654a2590263e5324b68747ae17
+EBUILD python-keystoneclient-0.10.1.ebuild 2647 SHA256 89a0e157b3a6a532fd9bf97d2ed8ca722d13cda89b17a28132219cfa845ddca5 SHA512 9cf5310120189306b6692905c4ae101c2d0c032edbfe8fa45f501d2a792af5d2dbb2ec1180b767091bbbd4c2cdebd650f5465a09b2c5a25ca62479594ae47aca WHIRLPOOL 579b8c4647a90cf29553ffd2e1ece803f696b888fd7964e96688830644574855a44ffad5c36401c53e5bc2dec1ee412643dba0c37b53ed21555b32a6253f82aa
+EBUILD python-keystoneclient-9999.ebuild 2671 SHA256 0c95695403bae5f1187a6c6987c5360b31eba4f987ed1cf76ddfc263dab41041 SHA512 4cf064dc4d23730029d829810555e7b3bd041906ce76d62029ec6ea9ea76f4c553000980dd6a78921bb1e09ae4998ac9e259801db08cc5ae4b8a48715e3cd92c WHIRLPOOL 1f6793cc8dae03e91155bcae98f6ed3f30858de966735adbb7f13cecc1ce802204af24a7d69e90bcd7a718224f6e8f1269225cc872dd12d0586ca768cd0ea992
+MISC ChangeLog 7769 SHA256 5b4d2803ef35872dce525d14950945a1db9b3d0ebd385385005afea029c72da7 SHA512 0a1661e1e2e27eb9c25dbf68758224db24165d848aa69b741abcb8888e43d924d0140ebce1f52afc6a305765e27d3100e8f5b8d8175a7ccbd2fa14c42f4a5b95 WHIRLPOOL 883681af9de3484dabb6f96180028357d3a4a714f6ac831a5928626c272432b768d02569e919c9f71710e2ea0c318e4f96ddba5d3dcc33f08453e7e50b35e4f9
 MISC metadata.xml 368 SHA256 a91cef59b9f9006441eae6ac81afcf9efd4382762bcb6300f16046ba2851ce8d SHA512 6035564d5afb3100400c97ba1671a2ca65387a1fd67a77145ed3968c2ccadaa28eec54afa03b9ae67b1e69843275adbe92646dad8ffb9995d2270c85f94ca679 WHIRLPOOL 858f1f68eb57ac301bfa5bcf8db0f01853c5c1a612570f2e45a867fd16fddf84da77bff85441dec22df18634c56018874675d056f200e8336da9709d49d0ad48
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJTuUWbXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOfDwP/j52oKl4W87bhPE244J4ozW4
-j0Pqu6yFYi6W9UYM5wt67Nz6yYZohGRk4QJmnrN8MhNskvqZn4wpU9//zEuNydkb
-LirlkF6aIkmKPMLKlfLSatsCnNpKTAHNtmaVL7UzxUbSyCya6IYxKJTQFfphmdcN
-7CvC0G4Uoix6rx12bhwGDs9ilwr/bwIm0l1ad9afdtolbQ+IJvJq4QkQCsR47Xnj
-G5LRF6d4ZeL7PPdb8RNqrBCtmDOKRjV04+D+LfVy54Ga5lruRBDxv0AVojYU9PoI
-h3fUAAqJkkoeK81wEbZg+nqUCn0sBIa4KG6qVL0DIYSc883R6Vecl8IU51LYTbuW
-c0FJQUFoxIJctsJ1CEsjCYIKyv/fxv+ftCSQeGegDU+hHVHopSW/NgHv3VhRSJ2p
-MkWB1C/lloFW/AvlWBUyGqeR3GRZqRzQ3l1sDHxcGqFMjOXNWTkF+gteZb6O6Mlb
-8ZnTyqZRWPNdgUiyXaVaRta5aFFFODoFj8hoHM/TU+jFx0ebMJwAZ+lbpsBuKkJj
-IXeUL4aLX6qM63KEAJs9wQXhfBBLzSyn7TBKPRixMW/aB+IxoqI6MMRvz4+yBqlf
-HTNLkzn6kWdCCOE8zrqu5K7/gAwHwLtgzgRyzev9kkH1yyDvIi2GDf90rhlGurJw
-DhqdggfOisddBgLgpxux
-=Qnap
+iQIcBAEBCAAGBQJT2xyyAAoJECRx6z5ArFrDMtQQAJwpof+XK3gj7PJOZqn/Xq8n
+E2b8zG1sw1ZOzHUqVRRDKeiQvsrFYIXcR/em2ZIHaGwQrfDjP1JPDu023eL4D0/N
+MbKRm5crM1b+rdLRpsKNrc11iwoF2lwsHAAQ8DUK2GgTTxobmVYsQRSgM8b11VKt
+OOzt7awE5QqJDMWhMcDhkmSAsKYvxCLHGHpISbrleyD5GUOzFQDIucq9cy3JFNJI
+LikRt/Z7U4ra7Dv95Y79I5ny191NJSd9Gt1FOHm5nGRIxT0VW46LXDvcg72reP3t
+gQ6uvaj4qmy4FfQsIJZEuO/biPTBp6vt3g6OqsgsrjAX3rpxJjuh7c9wexcuEIz/
+f0Tu21GWM+DRFUmvpJfOpL/ePN9+A0gDYyvxlnS0wlU4R7x0Uo5jr16FKSTfe3oR
+r2kHib83Spj8/BFFfFcL0z48CtyaMjlC6Fqp3PGhwNfx0GNKol5oMqiENfRoJ7oe
+7ehaza5lmqREtuvel2Nx4qzWbHvU2ym7EPzcm6WfAVv8P/umY2Ix6VMXpAPOt3tQ
+aPu7aNPIf0c3mnq/SHvJa+/0TIL9ELWV8QXjjgS9kF5XpankPJICjGc0LT0eMhMp
+13YtntSD/PklfwUPvIZQqjYKrcaIeH7xYyog6L6JqYMRA970bQe66eosdZ9un9wL
+WFDCYDCGjoYJt5tIOFUj
+=LE70
 -----END PGP SIGNATURE-----
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-0.8.0.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-0.10.1.ebuild
index 5fc07dda840b..7dc654db62f4 100644
--- a/dev-python/python-keystoneclient/python-keystoneclient-0.8.0.ebuild
+++ b/dev-python/python-keystoneclient/python-keystoneclient-0.10.1.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/dev-python/python-keystoneclient/python-keystoneclient-0.8.0.ebuild,v 1.2 2014/07/06 12:48:20 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-keystoneclient/python-keystoneclient-0.10.1.ebuild,v 1.1 2014/08/01 04:50:27 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -20,32 +20,38 @@ 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? ( >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-				>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-				>=dev-python/hacking-0.8[${PYTHON_USEDEP}]
-				<dev-python/hacking-0.9[${PYTHON_USEDEP}]
-				>=dev-python/httpretty-0.8.0[${PYTHON_USEDEP}]
-				>=dev-python/keyring-2.1[${PYTHON_USEDEP}]
-				>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-				>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-				>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-				>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-				<dev-python/sphinx-1.2[${PYTHON_USEDEP}]
-				>=dev-python/stevedore-0.14[${PYTHON_USEDEP}]
-				>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-				>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
-				>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
-				>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-			) "
+		test? (
+			>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+			>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+			>=dev-python/hacking-0.8[${PYTHON_USEDEP}]
+			<dev-python/hacking-0.9[${PYTHON_USEDEP}]
+			>=dev-python/httpretty-0.8.0[${PYTHON_USEDEP}]
+			!~dev-python/httpretty-0.8.1[${PYTHON_USEDEP}]
+			!~dev-python/httpretty-0.8.2[${PYTHON_USEDEP}]
+			>=dev-python/keyring-2.1[${PYTHON_USEDEP}]
+			>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+			>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
+			>=dev-python/oauthlib-0.6[${PYTHON_USEDEP}]
+			>=dev-python/pycrypto-2.6[${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/testrepository-0.0.18[${PYTHON_USEDEP}]
+			>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
+			>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
+			>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
+		)"
 
 RDEPEND=">=dev-python/Babel-1.3[${PYTHON_USEDEP}]
 		>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+		>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
 		>=dev-python/netaddr-0.7.6[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-config-1.2.1[${PYTHON_USEDEP}]
 		>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
 		<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
 		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-		>=dev-python/six-1.5.2[${PYTHON_USEDEP}]"
+		>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
+		>=dev-python/stevedore-0.14[${PYTHON_USEDEP}]"
 
 PATCHES=(
 	"${FILESDIR}"/sphinx_mapping.patch
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-0.7.1.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-0.7.1.ebuild
deleted file mode 100644
index e35671f073c7..000000000000
--- a/dev-python/python-keystoneclient/python-keystoneclient-0.7.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-keystoneclient/python-keystoneclient-0.7.1.ebuild,v 1.2 2014/07/06 12:48:20 mgorny Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Keystone API"
-HOMEPAGE="https://github.com/openstack/python-keystoneclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.6[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-		test? ( >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-				>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-				>=dev-python/hacking-0.8[${PYTHON_USEDEP}]
-				<dev-python/hacking-0.9[${PYTHON_USEDEP}]
-				>=dev-python/httpretty-0.8.0[${PYTHON_USEDEP}]
-				>=dev-python/keyring-1.6.1[${PYTHON_USEDEP}]
-				<dev-python/keyring-2.1[${PYTHON_USEDEP}]
-				>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-				>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-				>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-				>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-				<dev-python/sphinx-1.2[${PYTHON_USEDEP}]
-				>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-				>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
-				>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
-				>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-			) "
-
-RDEPEND=">=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-		>=dev-python/iso8601-0.1.8[${PYTHON_USEDEP}]
-		>=dev-python/netaddr-0.7.6[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-		<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-		>=dev-python/six-1.5.2[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}"/sphinx_mapping.patch
-)
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	# https://bugs.launchpad.net/python-keystoneclient/+bug/1243528
-	testr init
-	testr run || die "testsuite failed under python2.7"
-	flake8 ${PN/python-/}/tests || die "run over tests folder by flake8 drew error"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	use examples && local EXAMPLES=( examples/.)
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-9999.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-9999.ebuild
index 9c5aae489b43..79727e06704e 100644
--- a/dev-python/python-keystoneclient/python-keystoneclient-9999.ebuild
+++ b/dev-python/python-keystoneclient/python-keystoneclient-9999.ebuild
@@ -1,11 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-keystoneclient/python-keystoneclient-9999.ebuild,v 1.9 2014/07/06 12:48:20 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-keystoneclient/python-keystoneclient-9999.ebuild,v 1.10 2014/08/01 04:50:26 prometheanfire Exp $
 
 EAPI=5
-#restricted due to packages missing and bad depends in the test ==webob-1.0.8
-RESTRICT="test"
-#PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
 PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1 git-2
@@ -16,41 +13,63 @@ EGIT_REPO_URI="https://github.com/openstack/python-keystoneclient.git"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS=""
-IUSE="test"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		test? ( dev-python/Babel[${PYTHON_USEDEP}]
-			dev-python/coverage[${PYTHON_USEDEP}]
-			dev-python/fixtures[${PYTHON_USEDEP}]
-			dev-python/keyring[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/mox[${PYTHON_USEDEP}]
-			dev-python/nose[${PYTHON_USEDEP}]
-			dev-python/nose-exclude[${PYTHON_USEDEP}]
-			dev-python/nosehtmloutput[${PYTHON_USEDEP}]
-			dev-python/openstack-nose-plugin[${PYTHON_USEDEP}]
-			=dev-python/pep8-1.4.5[${PYTHON_USEDEP}]
+		>=dev-python/pbr-0.6[${PYTHON_USEDEP}]
+		!~dev-python/pbr-0.7[${PYTHON_USEDEP}]
+		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+		test? (
+			>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+			>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+			>=dev-python/hacking-0.8[${PYTHON_USEDEP}]
+			<dev-python/hacking-0.9[${PYTHON_USEDEP}]
+			>=dev-python/httpretty-0.8.0[${PYTHON_USEDEP}]
+			!~dev-python/httpretty-0.8.1[${PYTHON_USEDEP}]
+			!~dev-python/httpretty-0.8.2[${PYTHON_USEDEP}]
+			>=dev-python/keyring-2.1[${PYTHON_USEDEP}]
+			>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+			>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
+			>=dev-python/oauthlib-0.6[${PYTHON_USEDEP}]
+			>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
 			>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-			>=dev-python/testtools-0.9.22[${PYTHON_USEDEP}]
-			dev-python/unittest2[${PYTHON_USEDEP}]
-			>=dev-python/webob-1.0.8[${PYTHON_USEDEP}] )"
-RDEPEND=">=dev-python/d2to1-0.2.10[${PYTHON_USEDEP}]
-		<dev-python/d2to1-0.3[${PYTHON_USEDEP}]
-		>=dev-python/iso8601-0.1.4[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.5[${PYTHON_USEDEP}]
-		<dev-python/pbr-0.6[${PYTHON_USEDEP}]
-		>=dev-python/prettytable-0.6[${PYTHON_USEDEP}]
+			!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+			<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+			>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+			>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
+			>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
+			>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
+		)"
+
+RDEPEND=">=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+		>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+		>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
+		>=dev-python/netaddr-0.7.6[${PYTHON_USEDEP}]
+		>=dev-python/oslo-config-1.2.1[${PYTHON_USEDEP}]
+		>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
 		<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-		>=dev-python/requests-0.8.8[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]"
+		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
+		>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
+		>=dev-python/stevedore-0.14[${PYTHON_USEDEP}]"
 
 PATCHES=(
+	"${FILESDIR}"/sphinx_mapping.patch
 )
-#	"${FILESDIR}/0.2.3-CVE-2013-2104.patch"
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
 
 python_test() {
-	nosetests || die "testsuite failed"
+	# https://bugs.launchpad.net/python-keystoneclient/+bug/1243528
+	testr init
+	testr run || die "testsuite failed under python2.7"
+	flake8 ${PN/python-/}/tests || die "run over tests folder by flake8 drew error"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	use examples && local EXAMPLES=( examples/.)
+	distutils-r1_python_install_all
 }