removing argparse from requirements.txt

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

9 files changed, 291 insertions, 32 deletions

diff --git a/dev-python/python-cinderclient/ChangeLog b/dev-python/python-cinderclient/ChangeLog
index db5f423f735a..8c27223ec71d 100644
--- a/dev-python/python-cinderclient/ChangeLog
+++ b/dev-python/python-cinderclient/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/python-cinderclient
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-cinderclient/ChangeLog,v 1.18 2015/07/08 20:47:30 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-cinderclient/ChangeLog,v 1.19 2015/07/21 02:04:54 prometheanfire Exp $
+
+*python-cinderclient-1.2.1-r1 (21 Jul 2015)
+
+  21 Jul 2015; Matthew Thode <prometheanfire@gentoo.org>
+  +python-cinderclient-1.2.1-r1.ebuild:
+  removing argparse from requirements.txt
 
   08 Jul 2015; Mikle Kolyada <zlogene@gentoo.org>
   python-cinderclient-1.1.1.ebuild:
diff --git a/dev-python/python-cinderclient/Manifest b/dev-python/python-cinderclient/Manifest
index 5120d9c6bed8..d88acf19919a 100644
--- a/dev-python/python-cinderclient/Manifest
+++ b/dev-python/python-cinderclient/Manifest
@@ -6,15 +6,23 @@ DIST python-cinderclient-1.1.1.tar.gz 156853 SHA256 107ff53c9bb9403c4e751b9a949c
 DIST python-cinderclient-1.2.1.tar.gz 176466 SHA256 c9ccb89960b936ee261a9d6aac3895fde9b5c68e8c8e87d66ad3298a13bfd460 SHA512 ad27a7e32fc9da3c38abd5ca9f72f771229b00ab8a9f9f52c4001997afec194bda5270307ed2506747070f07e804952fef374fdb14ac75b646fb3dc6548aaea7 WHIRLPOOL afc4e2a6f5fa2917be408752f56215e5ee1c47dc6a952d5f6d294505a3c0843254136e5afd5370b9554bf6dfb97a47855e7b42122bdef0528d80a08f2feca6f6
 EBUILD python-cinderclient-1.0.9.ebuild 1701 SHA256 5c973c585e918d87c1e8427ea600f257d3be2b910411b6cd4b4d877f6d4542b5 SHA512 540a414ec7857ac50c4ceda7bd9bcb42e78b2ffddfe3141d11475560e15dcaeff338cd9a6736f9cf6d06e2e1abe848058850236a7f7c60b458973e0b891c2ac4 WHIRLPOOL 54a414faf6e7800f96a1f43ac92d688fc15db70f814b4c06d982e61f02ade398f41946fd0f982e62341cf9b6bd073f3b76e50d26b2597cee9e18201c9b0e2a98
 EBUILD python-cinderclient-1.1.1.ebuild 1859 SHA256 1e2d56a495aa0ff15c91b295cd55861fb189b9ec97d9845944ba3177dde714d7 SHA512 361b7e89e324c994ef7ab551f04af2556062ece6170a033f75bcc281e24d0096a08e923b777e956adae6d04c4879c2926908bd669d82d4c173d7263fcbcb9cb1 WHIRLPOOL fc1eca1f8b11aeb7f7d3344edf2c8d57e9a62850c9bb74483d67a3c90f1664898c082ac5807ac31dee14e4bee50f56a7b64fbc2bb1e925f63df77e42a8ba1788
+EBUILD python-cinderclient-1.2.1-r1.ebuild 2022 SHA256 63230ea32fbe067ccdbd2567c225508976bc2c3d0e5574d1d5f32b4e6a78e87f SHA512 278b14d971ae9ade783c6a961ad80f04bf4f36104c290f4d02761c45847547467e0ba400ae017e2def980638a35d07a73c225019b9a54753e66e583bc1ebb993 WHIRLPOOL fbd263989c161431c6269aa1c0ef58f20ed6e39accd001de8196aaea6735cc861642ef17f29919ebc447647ca305d5d60198e2716dcb76c437c2cf088ea094b7
 EBUILD python-cinderclient-1.2.1.ebuild 1920 SHA256 ed4e2a58639df3a06b263d46d8760d6abb75669d8a471175a6ff66ad58ddc279 SHA512 aaf0fae6f6782dc36040f3f298f0ef325ce6402ffde76cc4202d9cdcda42a81f8fa2f8574f7480869e13a2902d6bdfc9a29f1a33190baa76f240cf139aec1020 WHIRLPOOL 89300686b4389612338238e2fac70bf7d4fb30345bf28ef150ef16bdd9da13364121dd401479aa5e17fe900d3e7090af90e25b745b79f931f631035a1ee4bf01
-MISC ChangeLog 3119 SHA256 78c8a5d03422eea479ae9368fb2f3218c4dc49a76d14f986474f93898b744a21 SHA512 0a0a0b571f1453883fe7c9e43a4064cdb7ad6f3e67a48e67f89876f03ea88ce3522e0a25cab5788d6139ee20415ea76d4c3a352ff998b7353e747052b62cae2d WHIRLPOOL f98f6164e64745d6c54a5f1b93625f758d880ba52e1eaaab01ac3bde89910f8f6d1d93d879d09dc166655347d67b29ed9f1d66395220ca5c56c02cded898ca1d
+MISC ChangeLog 3311 SHA256 fb16d2362f5cf23da42b8eb989a8b04b3ca22cf841b34585acea50ca919501e8 SHA512 70999964b931927f4feffa6a096999da36d32215e27a822d4d31a845045699ec2746a4631cdb49cf5b61ff348af0bc36f55e52747f5923f509094b23732da715 WHIRLPOOL d4b171e81e305165cc0a78d076388531dcff3deb808235527c71044250cd254332161c8d9ed6644e7ab1de94fb03e67a2948b88a16b8295aa0f97c6619a141d9
 MISC metadata.xml 509 SHA256 32b14001a39d7330c551011c29ea3f5ac35bc18459fd5b5b077a2bf61577b104 SHA512 775328368ea02b38bd863e4e61ec435de7c34a8eb5c314235a4228b234eec67628600b3ea1532f94eef013a952b6d6d3a2e9a77995880585260ffdd3bf298be3 WHIRLPOOL 7609a803d8409e24f47b1f076b798e9af12d581941e1d6721e0a329d56684a421b0e3d4ce07556eb3b01f7ac4ebb2ffd8ecb4865fbedd5035b14f2691b671898
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
 
-iJwEAQEIAAYFAlWdi9wACgkQG9wOWsQutdbJmgP/dx9MPKV7OzZSJkAidMWIsRiX
-xw9GpPH2VDve3kiFJL+3An7U7JeSxNCVDRzhT+S7TY58JPfoVq+Potw0svYpGsIb
-EbHUIVQYnuA2cTEHXRwIlkvp7u+O/oziDp/KTWjtfJFA4tHwVdCwkFRfEJI+auuw
-9N3216JRJDdcqywjwqw=
-=SyIb
+iQIcBAEBCAAGBQJVrakIAAoJEGSje+quGaToARkP/0PFlagQ11J5o03HpakytpSZ
+B/JoJuDnGUOGkvluce/eyY61onM5UM6EDKPB/cSJWfmFCZW/E0SmEa78retcDyis
+x6ZhNBJSufdqZJd8wIPHU1E19DUsV13eqs2wnFzD4SI8co1HLE3hw8hg43WOxhzc
+/1mpou5IXWL300kRAZU5DE6uv9ESLWlESI1DXqu1ODXGf4G4IPzIKxZldz4voMWw
+sqssT2MByEHnVHWhRz8jT5F01+qdqwdkJPjxG7JVS5Dw16Iv6SdB7Bb/xhPzZn24
+mReq7VXHIBsrYzrBQ+oMFBK9qKMb0ijPP5Mh9ZLfaPoePnTGFHdzjDelGgx8bkfD
+izuiJwtnYM8ZTpNP59Vgf46aaZ9/biOr62p05Fw3/DRGXnJ4XvpkJ24nfQlv+6Vq
+wq6BHr6HwRavTlA1cMxwyYfwZybmCtQmgoTBeeB5UE29SDf7NFWa2vo82uhTUKWu
+POJmsV2BHJedgsIsAL8ghCy1TnjKKAl95lYUVa+nAlLQfZfLfSRUxt6quE6Z694k
+XKxy5SyuhcnZww0qGLrFvh89j0ljb8LXxnm0cHPRD+O7OwHHvr6GX4+kmJ3uSQ7Z
+s01ObuREd9q9DwiLGlW1ESb9CDcBCqKdwKbg3eIviaBY9TBEsX86WTXTR+IJsb0k
+y6mwsPvG/ujaKpRXoLrp
+=gY/C
 -----END PGP SIGNATURE-----
diff --git a/dev-python/python-cinderclient/python-cinderclient-1.2.1-r1.ebuild b/dev-python/python-cinderclient/python-cinderclient-1.2.1-r1.ebuild
new file mode 100644
index 000000000000..361405007358
--- /dev/null
+++ b/dev-python/python-cinderclient/python-cinderclient-1.2.1-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-cinderclient/python-cinderclient-1.2.1-r1.ebuild,v 1.1 2015/07/21 02:04:54 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Cinder API"
+HOMEPAGE="https://launchpad.net/python-cinderclient"
+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="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
+		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+		test? ( >=dev-python/hacking-0.8[${PYTHON_USEDEP}]
+				<dev-python/hacking-0.9[${PYTHON_USEDEP}]
+				>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+				>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+				>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+				>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+				>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+				>=dev-python/requests-mock-0.6.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/tempest-lib-0.5.0[${PYTHON_USEDEP}]
+				>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
+				>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		)"
+RDEPEND=">=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
+		<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+		>=dev-python/python-keystoneclient-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
+		>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+		>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	sed -i '/^argparse/d' requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	testr init
+	testr run --parallel || die "tests failed under python2.7"
+	flake8 cinderclient/tests || die "run by flake8 over tests folder yielded error"
+}
diff --git a/dev-python/python-glanceclient/ChangeLog b/dev-python/python-glanceclient/ChangeLog
index d1ff7c64721b..4283bef745c3 100644
--- a/dev-python/python-glanceclient/ChangeLog
+++ b/dev-python/python-glanceclient/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/python-glanceclient
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-glanceclient/ChangeLog,v 1.22 2015/07/17 19:24:43 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-glanceclient/ChangeLog,v 1.23 2015/07/21 02:08:45 prometheanfire Exp $
+
+*python-glanceclient-0.19.0-r1 (21 Jul 2015)
+
+  21 Jul 2015; Matthew Thode <prometheanfire@gentoo.org>
+  +python-glanceclient-0.19.0-r1.ebuild:
+  removing argparse from requirements.txt
 
 *python-glanceclient-0.17.2 (17 Jul 2015)
 
diff --git a/dev-python/python-glanceclient/Manifest b/dev-python/python-glanceclient/Manifest
index 3a6b90fe0b3a..0b2971d1947d 100644
--- a/dev-python/python-glanceclient/Manifest
+++ b/dev-python/python-glanceclient/Manifest
@@ -14,23 +14,23 @@ EBUILD python-glanceclient-0.17.0.ebuild 2416 SHA256 d369989e358af787ba70050b7d2
 EBUILD python-glanceclient-0.17.1.ebuild 2663 SHA256 979681e55ff247ba1abb17aed82ff76792926405945c66b338a4bf8f1f95c5d6 SHA512 7422ba514b1c547a0695c4101e7d53334c01b530f024b3a82fe61e16f62ddefa8a0ba5a6da88c33c61c4f1001c049b089d15c11c2c9b741a95a1581bca12ee25 WHIRLPOOL 01476789cf6b7635bd2d912de5e839e4ec1eb24d1184ab894599c4c8015e07f83316d33b114b9544859324f5b82b7f0933d38e0ade5bebc5bb997c55d8788d8b
 EBUILD python-glanceclient-0.17.2.ebuild 2767 SHA256 69e0de0a41096b110f6b2989e191ca4857b9fe6df3cff0ca6eb36c5c4620116e SHA512 8b3059c7fc1116c0c032503712ee32175ceefc18cb8c8022b86a310aae430324b9b1d8cb1f394bbe0163a98a4d507f03a3eef5472047e637aeb7c081c04be5d1 WHIRLPOOL a0dbbc9a5be653492b5e30d2cd58a6978184a88fd1e466c1356bb5d3c28879bf3aaea7f371708b17cde4d68987e21a8174cc351037a452c1f8aa94dfe0d1d6fe
 EBUILD python-glanceclient-0.18.0.ebuild 2520 SHA256 8950f2c51778b4224233cc2efb023671bac878aacb50dbf7c7931ea0da129b99 SHA512 8bf59ba0ced828d2379dd9362239007c5b61178f190fc877345b190edf320992e9f90c8cb971a9d768140551e6e5cdc220d06d99a729607827b145f1564e62d5 WHIRLPOOL 5909fe988b54e2d08c1f0630a98223762a992ebeec7d5f69a1c72d5253473bdaef830c1b4169851377ddaf12ddbdff150453a2da4f16521d982c380f0212aa42
+EBUILD python-glanceclient-0.19.0-r1.ebuild 2578 SHA256 17ec5a3a01130ca61c682cbdac04ec9d135c621c6090c5c5ef0f97909265595d SHA512 873988d460342236c78b59bab19630d07e2baa805500ebb147347f2504c2ea66244ed6aeb28985798e95c363e647575ab0ccd6f35b4c0eb497cafb90bbf85664 WHIRLPOOL 0982659ea64c812fe1a0f816be061f28854a41417fdb136c02a0a1ab525d6913a025b868c125eff59ef6aeda8c15014f71c0909446d1f7a52a4ed5d994be6890
 EBUILD python-glanceclient-0.19.0.ebuild 2528 SHA256 2beb9558c4a1b1f2af3d22a97f1c60ca635d80b061e572c96de155506f89913c SHA512 c10acf18d158e6e8b460238dc2a8aa95dd2b34098abd6a37f6741c40f25985c200ffec46f58b7aa1d3940ec5d59a13801bbad8785c7fe2cb5463054cd684663e WHIRLPOOL 13c3c890099670eaaf151e4b99a30bb11b24a421a5a5a062eef9bb9f1c4ed5ab967955d6857c9da8c8fde48d52f8e5333a84c635b53c1a0cf41a846dbc481130
-MISC ChangeLog 3951 SHA256 a340ca804249dd4134e743d50440a6ef10445dd06d97aaeb64d5d57e6f9df851 SHA512 c081c0c33bdd74a63d043d32b6faefa61210238eaefa70c1bef607937bbc0c47c8f641366ad6b1a63da2bb62f3a0ea4d2086ba103242debb61a09d394af4d7f9 WHIRLPOOL 1979fa2805661f2acbd0bfe77135cb69812d2b7c3a4ad711ae89a44b65a6be2a68c3b7fff84eb160910a1ad9773a28e32cef31dc83b38a2702cb8317bdf24188
+MISC ChangeLog 4138 SHA256 d1a691aad26c25ed099dfc711fcae06d3d8533ace4a6344dcdd1aab9491d2f8f SHA512 fef8c742330473e71d8fcdb5db6ee95f54cef94e399ac21317485dc10f37d8b91a5159a20b0c73c86fe89280fd9698c0c70754bfbf7f0c2dfbff1c787d97d9ac WHIRLPOOL aeda1abc6fd23c678bbe4a1442f82f60c5d31cbd329d55e84e90a9fd5e5148884c07e4d5661fd571704777ec3a582fa61804e9d1e6be8cea71f93eb903d904ec
 MISC metadata.xml 530 SHA256 50412b46914b2808f4630a91f761a702a89b6e12349f53dd90817efa29c8dc3f SHA512 cbe9726dfcfe3ccec4fbda6f622b0ef77cc070ad61a63e264c8f5a293ba86b9dbb07db972b868c89e72606033d546f063394e41de90851ced773aea6b695a075 WHIRLPOOL e0303724ebd8972483621e75b3e47cb19a08f06cf3f1a10b3b1ba2b7ce3b35fc088909e7ac47797bad2131aba39fc0a7b5dc63e4cb1598494a882ac61cbbe815
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVqVaCAAoJEGSje+quGaToreAQAMiC+G4jNoC1wWwokgfDHnCZ
-aZImX5TrPOl7jMADbBgxSFX1VBh/kIHWTP/8UeIfeCHjQsBFQAkhcVwTFVzbATv/
-ITAdmUKKYNbQxZPFvSEpqtaM3PLGXTlfe1c4kUBpayI92IvWsnrt3kG08SnbwFu2
-5fPOMC3YJzk4thyiac9niIKf19CI9LxKA26zn5jWay+RPIWFZ7vkeXVz+v+NI271
-w97yUMo/XR7TR0OPEiHhqY6l8fT+bJq928YDSBJXVFpa29UW2udFnd5xyGSzZVK1
-NXXQXEaFe89DNEiCILgyfyKB+owU1oawmwoQwlGximcV1+R7xI+Xi4pbmzUu5jrm
-NJyuBKK1vqLaUXtTqVLhqa/35YKefx4S3VxnbqtEW+BhFXzM4D7llN91wxmr9s91
-MyCIpdiJbd9rXP6h4pHFE+ZlpxYW+kycTWmeV2BDmGa8U+Rl5DR+WbDwQ9tOjLBv
-fAR5OSjsut8xdpdGo+F1TadvEmRA6pYTFem+cZsxK5+UhWZZvZuAUJjAWkvOp0Vn
-t871N61AksTFTdBbEBOxcRCSYtJJWu7NGo99jiM7vkjych+xNPUvZH/zM4eN8+VW
-a5npif6muBpWvAhQXEMw0pmEOL5jEZOd8yYZ5B8ZrdoyRyq7D76jZkfkJd7DGM+P
-F4y62f73Nn+LpgkJDJ9T
-=KFx3
+iQIcBAEBCAAGBQJVranvAAoJEGSje+quGaToW70QAKrKZ0AMCLh+5GIAeVkOO5ib
+ilXoybiUKoHFsWAdMkFxvC81LPTpyB2C35mJhmmeWhDeEb7bMRS1KyctTbLc8WoV
+kcE1vh9HDC01cu22vSPkxi4pBwBpjN7Brw9l00NQiFdswejh6GC7zhnads8ynuq1
+xRGae4duVt1IXrBF1dXts2g4GB2EtKHsICv74jC18hMa8cJZwmHNvREAeMDC+0cr
+JDMLbY3NkobG7p5g2aVWbDHn54H7EJfj1dH8/8N/Xh/pObUH+rqG030jsPVcvVU0
+MRMd+CiEP0tzrgzb4prutPXunceVZtPy0UxSbKOm8kYROtWXHDOx5J+AKUxR5gyY
+GKEj6WVxGAAgMOr0rHwl0bv4sjEFuJVkmV3xEL5JMnSOmcV5E04lI9jQXnjHZMm2
+0MoqKaMzLzloGn1m1Ekk5+2BjZEjzDQdoHoR0cnCx9vMT5s5euR0sg1a4zAQiRJf
+RSpMLcJUp1MESU4R51VHsYyncRSDPkbGAi2inVlAxDatgF+RMQgwtOvr5K4Do9J9
+mzLxb1BfcSSuQi1TrQRG3VGSgYRsPrbFJfLpq0ScNSmtbrIMIAOs46FbIC9d/woT
+eRBGv1jVIxvWc5Z/F1e4wSPWR28TlAne9197BbiP6Ds/RbbtZRM0DP2BAkg8C+u4
+a22AAB697LL7QvSwnj1y
+=x/VQ
 -----END PGP SIGNATURE-----
diff --git a/dev-python/python-glanceclient/python-glanceclient-0.19.0-r1.ebuild b/dev-python/python-glanceclient/python-glanceclient-0.19.0-r1.ebuild
new file mode 100644
index 000000000000..2e89b7f274b0
--- /dev/null
+++ b/dev-python/python-glanceclient/python-glanceclient-0.19.0-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-glanceclient/python-glanceclient-0.19.0-r1.ebuild,v 1.1 2015/07/21 02:08:45 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Glance API"
+HOMEPAGE="https://github.com/openstack/python-glanceclient"
+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 test"
+REQUIRED_USE="test? ( doc )"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		test? (
+			>=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
+			<dev-python/hacking-0.11[${PYTHON_USEDEP}]
+			>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+			>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
+			>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+			>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+			>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+			>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
+			!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
+			>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+			>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
+			>=dev-python/tempest-lib-0.5.0[${PYTHON_USEDEP}]
+		)
+		doc? (
+			>=dev-python/oslo-sphinx-2.5.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}]
+		)
+	"
+RDEPEND="
+	>=dev-python/pbr-0.11[${PYTHON_USEDEP}]
+	<dev-python/pbr-2.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.11[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
+	>=dev-python/warlock-1.0.1[${PYTHON_USEDEP}]
+	<dev-python/warlock-2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -e 's:intersphinx_mapping:_&:' -i doc/source/conf.py || die
+	sed -i '/^argparse/d' requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	testr init
+	testr run || die "testsuite failed under python2.7"
+	flake8 tests && einfo "run flake8 over tests folder passed" || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-keystoneclient/ChangeLog b/dev-python/python-keystoneclient/ChangeLog
index bdff5ac4dc95..edd3ab24f091 100644
--- a/dev-python/python-keystoneclient/ChangeLog
+++ b/dev-python/python-keystoneclient/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/python-keystoneclient
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-keystoneclient/ChangeLog,v 1.62 2015/07/08 20:44:43 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-keystoneclient/ChangeLog,v 1.63 2015/07/21 02:11:48 prometheanfire Exp $
+
+*python-keystoneclient-1.6.0-r1 (21 Jul 2015)
+
+  21 Jul 2015; Matthew Thode <prometheanfire@gentoo.org>
+  +python-keystoneclient-1.6.0-r1.ebuild:
+  removing argparse from requirements.txt
 
   08 Jul 2015; Mikle Kolyada <zlogene@gentoo.org>
   python-keystoneclient-1.3.1.ebuild:
diff --git a/dev-python/python-keystoneclient/Manifest b/dev-python/python-keystoneclient/Manifest
index d469f78d3692..73d4b9099069 100644
--- a/dev-python/python-keystoneclient/Manifest
+++ b/dev-python/python-keystoneclient/Manifest
@@ -15,15 +15,23 @@ EBUILD python-keystoneclient-1.3.1.ebuild 3062 SHA256 b1d2ec29796a7373855674d32e
 EBUILD python-keystoneclient-1.3.2.ebuild 3465 SHA256 3d024d6349cc51fc29fc2a2105ce8b2e0774e3e2b12ca5908a3c21930a869475 SHA512 2d9fc070151df163690e1121de42ecc184ec3d87f03029ea2a0d22e65874321a1a8d7a8a0d4f2aa3f1c515d0c59f9fa830355ff2a0e2e7f6479b77f9f6ef01e0 WHIRLPOOL b267702b6e086bd2fd6a107aafd89b7857795a7f8dfb8a1b2a58c35bad76c0180d846ae484ce514f3a23f2f24f035aff681cc0e327358c4ad844486fd2d9ff80
 EBUILD python-keystoneclient-1.4.0.ebuild 3117 SHA256 e4706886d4a6ec292899e59c6dfdfc82895b5f40a4e6292df303872001c35a7f SHA512 b9e6d2bd60e5b44444d738c4395ae186e43ed7b14639693524f07bd710a0fb3af67373249af2619549dc36633e2ee256f6bea3018cec0e127de8667e57dba035 WHIRLPOOL 42eec63efe889914faa65e8b3e2a365990ad728bea34ed53fe1d7c5cc187d4667d9ef438a8e997dd139e684dd4647c884193c4ca8db178cc1d312acf0c2c2c13
 EBUILD python-keystoneclient-1.5.0.ebuild 3072 SHA256 629cf26741f91e0993c4c01d2de87cc077b47110368557edfe56920bdd151c10 SHA512 a245b03f39048693e93dea1252521b9238fe7deb8efffb0287813699fd6daaf94acd9183622a24739a1618ef8a2f99ab4342a094dfcf04c0564b091d8ee79b30 WHIRLPOOL 62823f1ce6a7c115925d78fcf7d5950fa7b9b24a7873362bbce0a884c705b2cf4a159be974cae1432ba86963c0ae99cf09d511992223b415847e6d984b38268a
+EBUILD python-keystoneclient-1.6.0-r1.ebuild 3122 SHA256 f2281822370e3eed98b00029bf1b6662a827b73c2a02c454715e0fdb0f54ddac SHA512 e9a9e335bfc488f52bd492f629faecd721bc38ac76a1c6d8a9180ae6299ea988ec9fc3aa0180a720d3d82c8006459471ae6308159c123e1b4bc27741587d19d0 WHIRLPOOL eb301fb8f92853efef068b9e0551c2f6455eb9bdfb8fef88e61166ac1d7062865d39ceea38743defab9b7bcf718c53c24e6aea20c93a2f9d9f29a3fa2371c320
 EBUILD python-keystoneclient-1.6.0.ebuild 3072 SHA256 fbd38e1bbd6ad35c4e03ea654a15aefa95c630ea24f5e3ad084c8bf52f2bdeab SHA512 7fc8225e70d27301fe1e901834320910b882095bfad8a8b896ac94726438bff591d15ba68fb0341c6af078384cd363b717298108109c1ada7ce09fd956e89e5c WHIRLPOOL d50b8fa022535f7e42bcfd70aa69a7cf2062e5d1d26ecd2b255fe5301a0d9b53f81fa8169267884955daaf1b688b9d080f8114c7afd00697bb3e535d6ff108ab
-MISC ChangeLog 12597 SHA256 84f0344caee5e88af3bc9f290719eeb09fd3ea1356e6c60fb6105b75822c36be SHA512 00775ccd8118e0f857ae659740a118e881a4f3cfd516f8c4c276c6c722016df6b770a0b97eecacbadf95518cc2c2febc5a9f00b368d43fb109342d8de0956948 WHIRLPOOL bb706ee83962ccc0d690d1427ca3127e966fce60e474711ff8099e870868c634cf77e0262d86ebaf114abf8a43a2213ca7daaae82530e5734ae1cbf35a50a9de
+MISC ChangeLog 12793 SHA256 55e64037509c91e714a0a0789e1353a4dee77e882566743c563db84293111381 SHA512 d568842542df79f10e728d003d75f35987da6beeb63ab4df21ab9db1eb0f655a2d3bd968d05b82ee82442de0f03a021ec8fee16824d5e926d618bce574331929 WHIRLPOOL d1b783b1a7a8b7b30e5e03360443af2335700e1d69cd78f5039c6ced689aa96a6a7e552d5c8908705734a689498280231d68e035b0250b1064fc934c23406868
 MISC metadata.xml 455 SHA256 6274083930e25fc8e5f9e37eee92f060abb259de750d3b1dee8d73e7fca2c0f3 SHA512 19010f656304e96ba5cd78d90146d6cf678809eae36c41550f101c78513327f17c440bdcdd50051efa7e9ff992078d922b0fb74bdf3efbd2f4525d5a2e7661b7 WHIRLPOOL 389f932151ca37b45643644b137092c210628734c54df38e979ccab3940cc887658052b3c30c10096b5c4b8b75bdd3d7e3bbd91b211a490452c87858168f4447
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
 
-iJwEAQEIAAYFAlWdizYACgkQG9wOWsQutdY1CQP+JxF6Cm4c5UVpQNNsa+NW5+Cq
-r2O3Nx+xBlu9NLRqqOPkFmep1xz5FQs+ixpB8QyyGERJzt99jed9x6o4D21gLNaV
-jaT6N+AxGdhDY/D0DW4TlfuTIzHAvDCZfQsrQN6bVq2tPlq/5KgmeUztY468O0X+
-K1P3yNRY75NXnv0CSYI=
-=FzCU
+iQIcBAEBCAAGBQJVraqmAAoJEGSje+quGaTo45gP/34e0MghqjHeEkCzuqaOcCDz
+aNo6OnpPygLNSryvI+ycPCXb5S3OfwD25t7Fc/O4kZyF3xdNkYtSOnRU6ycOxxep
+to5NXeNtAbP0+C86JfK/RU0w4prJg/qh5c//rLkvmMigwkst07jFdKjKuqx0ykcu
+L1uA7BtiSnsSW1iLRfakLCO9gbu+BuuHrOdhOOqJKpQjr1xgUAMIKn/fw6t2vi3Y
+AB2jL+QINCcXM2+dIHH5wuBduLizz0HSWCO3Oku1ZqNNobuXJcKBBsMhIDhzvOd9
+YuOxc0ketWjrXl/TGRSkvnMJF43IFqn3JzJyz7mnTde5r2NuN/F9+z8DkeYegC2k
+nJNl/WAwrwtGftfjefftnudsSa39n47E2/9ZZ5Yag8Ujq9emWX1Ye7FWMZLMx2EP
+h78DR7ed0ONK/JjQy7gEwjtfifNu8oFqYJ6bB4zkNVYd6G3UBrgRye/lRI3JE+LZ
+vxKPVHjvTZg2U46zRGAR+yRFIOrZnhk+H4CO5uBCzaiesCkVE5I+JTNm3/CB0CHJ
+bUSWHz2/1dW3/CZVleJ2EmcAqlobVzLfgaq4Q0PhSdhu8taNO/c0Qv8hYPA5aVBi
+bC8aBTIcnhTp9WkCtoolqZR1NSXcRotONk3uQsx5szX3vNPAAAJnoS2BTjc+uIjH
+0MFAN9Bo9lCz+oQMJIz9
+=Akf/
 -----END PGP SIGNATURE-----
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-1.6.0-r1.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-1.6.0-r1.ebuild
new file mode 100644
index 000000000000..1cf7b6e9a44b
--- /dev/null
+++ b/dev-python/python-keystoneclient/python-keystoneclient-1.6.0-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-keystoneclient/python-keystoneclient-1.6.0-r1.ebuild,v 1.1 2015/07/21 02:11:48 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Client Library for OpenStack Identity"
+HOMEPAGE="http://www.openstack.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux ~x86 ~x86-linux"
+IUSE="doc examples test"
+
+# Note: blacklist version not in portage:
+#doc? ( !~dev-python/sphinx-1.3_preb1[${PYTHON_USEDEP}] )
+
+TCDEPEND="
+	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
+	>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+	>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/tempest-lib-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pbr-0.11[${PYTHON_USEDEP}]
+	<dev-python/pbr-2.0[${PYTHON_USEDEP}]
+	test? (
+		${TCDEPEND}
+		>=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
+		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/keyring-2.1[${PYTHON_USEDEP}]
+		!~dev-python/keyring-3.3[${PYTHON_USEDEP}]
+		>=dev-python/oauthlib-0.6[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
+		>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
+		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
+	)
+	doc? (
+		${TCDEPEND}
+		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.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}]
+	)
+"
+RDEPEND="
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-1.11.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
+"
+PATCHES=(
+)
+
+python_prepare_all() {
+	use doc && esetup.py build_sphinx
+	sed -i '/^argparse/d' requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	use examples && local EXAMPLES=( examples/. )
+
+	distutils-r1_python_install_all
+}