fixing CVE-2015-1852

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

diff --git a/dev-python/python-keystoneclient/ChangeLog b/dev-python/python-keystoneclient/ChangeLog
index eea1d0be22898111aa5a93b8aa8d40c38b5751dd..db6e310bb02be5fceec5362ee543bebe77febc97 100644 (file)
--- a/dev-python/python-keystoneclient/ChangeLog
+++ b/dev-python/python-keystoneclient/ChangeLog
@@ -1,6 +1,16 @@
 # 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.47 2015/04/02 19:56:39 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-keystoneclient/ChangeLog,v 1.48 2015/04/14 16:17:32 prometheanfire Exp $
+
+*python-keystoneclient-1.3.0-r2 (14 Apr 2015)
+
+  14 Apr 2015; Matthew Thode <prometheanfire@gentoo.org>
+  +files/cve-2015-1852-master-keystoneclient.patch,
+  +python-keystoneclient-1.3.0-r2.ebuild, -python-keystoneclient-0.11.0.ebuild,
+  -python-keystoneclient-0.11.1.ebuild, -python-keystoneclient-0.11.2.ebuild,
+  -python-keystoneclient-1.0.0.ebuild, -python-keystoneclient-1.1.0.ebuild,
+  -python-keystoneclient-1.2.0.ebuild, -python-keystoneclient-1.3.0-r1.ebuild:
+  fixing CVE-2015-1852
 
 *python-keystoneclient-1.3.0-r1 (02 Apr 2015)
 

diff --git a/dev-python/python-keystoneclient/Manifest b/dev-python/python-keystoneclient/Manifest
index a598fb60e266a5b4d6b25a953f839b9a5480e998..80cdfad4cc69177b80ce63421ebc865e7977635e 100644 (file)
--- a/dev-python/python-keystoneclient/Manifest
+++ b/dev-python/python-keystoneclient/Manifest
@@ -1,36 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST python-keystoneclient-0.11.0.tar.gz 326504 SHA256 99f99bd1a6b886e4655e414d82515a3c7ea0788fa80a3e33463778e13e576fe4 SHA512 540963583c73178e193576d9ffed6aaae49572017c97aaee7b85844dac9c91828355552c16ef27f8996bcf328cee069459436cd58b5ffec7597458f3b356e823 WHIRLPOOL 7d9e54173a37eac4e596a49db28012513469c2c5aa96bca7131e0e83902216fb5dc8368dea9e2e82fcd73cc77e00d23474ecac462677fc09b6ce297483a23505
-DIST python-keystoneclient-0.11.1.tar.gz 325416 SHA256 263f274ac5c04f94442b5f85b0119673ba4cf21030a5accc8f4692e168b6a301 SHA512 19c3b015ab2875f09698bf13757312cbc82d19804ca353f55e3baca59052e6d4e86777bedf4f98c59f58160034ea89c956832c14a45ac07a56eb2dc39694ab7a WHIRLPOOL b959262da5358db75dcad4a994b2fdfb61fd19b0ea9f55f2e791d75f87ea1dce2fd6eb31bcc99b87731df6758f9a8e3ebd88ef08643a32788e342c786a5adc58
-DIST python-keystoneclient-0.11.2.tar.gz 325055 SHA256 3e074f64ba2b85dfa430ccfcf207376ba105cf8177e74f5cc227a7332e135796 SHA512 04e8f808cb1ab416122c7b839dc791ecf1e807dc02ebc85abe7564d5059e5b948f021cb6b70a1192d05cd9e2942002001d3925e8185f78d6f2199ffd755df712 WHIRLPOOL 30d46d75f4e676b4d539aefa6d8118631ab9dd28ca614421c9bf194baaac22dd7969342da400370b2266b993e2aebcedc3952cec22db88fde3012aee15db6bd1
-DIST python-keystoneclient-1.0.0.tar.gz 314308 SHA256 6d960d2196efc7a181519a77f757a27ceeeac71f41f624318ae7f1088d2e6db4 SHA512 331d1f634c06f142628c6c641e49a75ca721eb6a37e11827b12db293eeef3e39e9565b38db27d9e39464ef80f5a6d1da2b4e0365dc2eba2b22f63abe0b2992fc WHIRLPOOL abd1173e4caf31ffdef01e7a5f13869dcea4d8c053805ec995b675a46350f2c2a8d5c6d692127a048690b018c3785dc005d6c752df86277dc04873a4daa19525
-DIST python-keystoneclient-1.1.0.tar.gz 325072 SHA256 30224d92f8e3cdadbd8b07326eee527b292c3881e311a202eb538bcfffeeb74d SHA512 29942c7aae184ae15ec90b034b968e64f055a1d71f801a3ecc5a312e4d7b2aded4fc7a7f90c3256969f7e86ddfffe3b239bf7a4ef3fca3ec3c55be5524211b80 WHIRLPOOL bbbce14bd6327c49d6b54cd11c8f566f0dedddb4d5f2a065ab4838fb3c9ae3f9abb0ad3189e5657b36f61603afc5c20e80d18410fbe118c079fd98ce2125bf11
-DIST python-keystoneclient-1.2.0.tar.gz 331325 SHA256 c2776f59b79202e7ad5d709021fecce541bec53dbf2e652fffe8406b0019c054 SHA512 9447a5caa1fd4c932efdc8ddb3ba9607d74dde58debe1e00e64674fabed2782c0c1810a70ceffffe2135e6b2abd45f11fe5f9c451a910f8115bf447cb592820a WHIRLPOOL f6d0f9b22aa5b1387883a28d87c1f05ab0fa7f7d853f889706ec3737d03db13ffb2f5b14bb130e5db19a6fc7cf27c3b5bcc2002a035179921e7ff68aa330569e
+AUX cve-2015-1852-master-keystoneclient.patch 3303 SHA256 e1f742aff5e763f0061672c1329f699cc9120c9a03467b40658f3c3460c25a0a SHA512 ff65dd7d9da92e4d58a158177a370c9c8c2d60c9e54bc78184d1587667f4609325bf0185e3f1ea137ef9084f98c3cbd379b7def215eb4f70d72be65424d13a27 WHIRLPOOL 4631705c1fb320dfe337dd8eeed95818b8926564da148fb4a4773912574f7a4a23f083ea20f066e2369ce2158848d9e181d9c366290febbcecb8d6803c82e781
 DIST python-keystoneclient-1.3.0.tar.gz 338528 SHA256 c009445d9a36fa788a14b093f67501091b246fefccb30fb63925e6e4fbeaac04 SHA512 51fd09419479ed00a9bd1785c0bf08cd7ee5393cb2eabba02558cf9828cbd9070f671377d759ff3dda0b675846f22dc8bb7419443e0b850c26f3263cd3b9b533 WHIRLPOOL 4f134aaefe9353382ab78a74109c139df55f9275cc2d932eae5cd8764e74f3b608fcf5bcfb659ac14504d87e944494b6a0221051dcf82a21bec109ddefeda7bf
-EBUILD python-keystoneclient-0.11.0.ebuild 2611 SHA256 79146d87ee05a3fb62f27d8fc2323d815c9fa0578c38e78f1410291ada35077f SHA512 3505a2880a7889ab5423b2c098d6f7cc14cf95c6604ad6a801c8dca0fb9511ddb63066750243f087e68faf89f69d701789fd9fb7d777955f1c75b06137c3f176 WHIRLPOOL 3259ee2aaa17a25f7175eb2164e58145030c3c8b3109faa6bf7f878c735be0c34b4e72e892aada8e00abbfbd752d8e271458255b044c4e9c9f90f066b68ac5b6
-EBUILD python-keystoneclient-0.11.1.ebuild 2686 SHA256 62cc538d37f33995fa53e29678adb3319b7d25d8bf4322f1bcd84439199ec6d3 SHA512 53430f51ba5be8619de670368b672769e37960f4ffbd76410581cfa90464907ab46a5d2d0cbd46365e53eeba7d00aabbd35e9118b4043934664828a246320e3f WHIRLPOOL 01241ea2155d2c36a9465c1cff2a98d4f8c3c059f4618ea574c6a9f89beaa6fa37a6bf1a01888b9eec9b9728918ec408e6a7ea95e5f92e3e82d88a1bedaa2f92
-EBUILD python-keystoneclient-0.11.2.ebuild 2909 SHA256 9b3ff6245c447b8304c5115508324d138eb79bdcf73b4e87233eafa9a48057ee SHA512 7542b9093eaedbf6b5238ba1093e671917302d18f399031ea5edc4ca5e6168682bdefafe1b73094dea20a24eedf379b780dc6d5b45df5aa5a823a026e75101cf WHIRLPOOL d512313f5ba04fe5a8cfecba3dc1581f76dc2e24060f71526e1ff0b3cfa4ac5890b498084aad5311473668f39bd716ee2ba8a818cc89e4f9bb5f3b68e26ebb97
-EBUILD python-keystoneclient-1.0.0.ebuild 3089 SHA256 d67aec23521077c99880b7780d7876d8c949b049ddc827982ef6d18aa452ad74 SHA512 9912e2dce4e9ca0314c0ff389e1aab843995f82a536cfdd2dd1d086e9c6f750e3e652429bbe7b869cdcb805def50467737c58b075fb132b79240b1adba2c6ad5 WHIRLPOOL dc3d93b5b53c7db120d5e8848221c2eb6fa6f5c50bdbfa02391a19565ea3f761d48c706bfa96e26c5521ddba32bea6f4ae047a788a906134b7c0c0061a0c5424
-EBUILD python-keystoneclient-1.1.0.ebuild 3036 SHA256 83f5825a44df46ff5271fb63eeacfa5e27b2408c55890d90e9958cbc1dacc133 SHA512 0b0ff7e14be6c11f49399f5c9fbdd3f106dbe42f63ff719a001f07c80cba5db21e53b6b86c7f493aaf2e350dd408458d65917c290a1d82bf28e0b9449cbe8223 WHIRLPOOL e2fe45bb35b2c90efacf6452e6d349aad7d95e2e5e2aa7e7ca9f032fb3032283b3a0eaee6ee911db551be1412e2e367efd38b9c5bcf2c0d176b66fa98f3ebda5
-EBUILD python-keystoneclient-1.2.0.ebuild 3056 SHA256 6be820957f571d0fe6db8b2027cd5a296e26c6eb1112a17cdd8ddcab47df7ab2 SHA512 9d4056dc44c3643f7b403e1a32524462288af038b16f7aa45438eb3b3373f19b115455452bf8f4055277bb678d7dd6cca9b5de57ef1331f71a60d59166830c4a WHIRLPOOL f0bec6488cfeeed40ca309d3aa9a69f2ccd6a5ff738c8326192a675b1a63904b5d1a33700446a892974bd0a7a9a0d120d4d696a17cfcfa5fa0fd89307bfa5e72
-EBUILD python-keystoneclient-1.3.0-r1.ebuild 3029 SHA256 2cebf498869ac968712cf0030b055f5568a33ad5e491adb0099273821507ee65 SHA512 2c035d8399e17d3412cb1621014f7d2d7031553a5da9a98c43ec729805bc759926da1ffeeec17d363cbe0fc784d3cea9578bb813e900b2fc5661e6612752a0c9 WHIRLPOOL 6c4ff7d92175545cba5f3604da1b21d04d6b5262c9eca7208ddb775f6d35debd565f1f78fdc3c947e7611b795ccc1de779f80636877049482bafb019c51aaf31
-MISC ChangeLog 9910 SHA256 cbebf93bf650752f1e131e71dea8554dc6f0cf817adfcb9b6ec308518813b904 SHA512 a77768c497ef1a78feff4b3962c774bbc842ced2428ad06b26f714a23860a547f5e7816f6da1b595d0e27236525ea5323cc1cfcb7e4287ab414317325056ad57 WHIRLPOOL f2d4c73ed22b440e3ab373bfa9cfefb52ebb3a086771ff779a3d1ffa3af37ee181b8ead47bdbc9b74c43a30e881f7e0e9bc78cecb88994b987219fc456a064d3
+EBUILD python-keystoneclient-1.3.0-r2.ebuild 3130 SHA256 81ae36d6bb1f5771d16f91a80999c0de63c3776316f2cfdd0cc32b58f49fc30c SHA512 36f6c0e18f14c2231085c63cd94f695767089a2a510d2e79c9017cbf8da93cd3ee82f94bdd6eda5e8c8bef6207db8aabb2663c1c2436c676648ff491959aedb1 WHIRLPOOL c6ba85116c8b6b4b8ec9ac6b704eb968559be8edb847c46365ae7ccc5ad1159281446d5a066dbdadf3d1014f299c323138f8bf64534c33d9056eeadf68ea8a12
+MISC ChangeLog 10403 SHA256 5b34f96c7e7503764355bce7d9f3a2319440b0d9d547b110a971f553ebe7b64d SHA512 b20bee6ce0fb9342e273af520da52f9a91e7c04927d44ba0f61a12cc8ff572a05c8b9846d9dd79838b51a90f6edfdb18fb2f2e58e88e759e163f7b5c68b1041b WHIRLPOOL aab2d76ef2e5d80e8208d9cf49e4182c1da06c693e854f25b19f5a05e58a897afe9ea898314ee45e3bbb13a103dce1cbc02f5a68584ba1bd874f374837a9c079
 MISC metadata.xml 368 SHA256 a91cef59b9f9006441eae6ac81afcf9efd4382762bcb6300f16046ba2851ce8d SHA512 6035564d5afb3100400c97ba1671a2ca65387a1fd67a77145ed3968c2ccadaa28eec54afa03b9ae67b1e69843275adbe92646dad8ffb9995d2270c85f94ca679 WHIRLPOOL 858f1f68eb57ac301bfa5bcf8db0f01853c5c1a612570f2e45a867fd16fddf84da77bff85441dec22df18634c56018874675d056f200e8336da9709d49d0ad48
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVHZ7+AAoJEGSje+quGaTojKMQALfQZkgI8GAwL+1l7Yk0RvRl
-DGdIZEzN1yXsy6T0S37qXoCGllwhfMkp1jGnpd+zlfInmuNqVUjm6y1bOru20DEk
-1c5C0Ugg/qLs5smNqUbzZ+cfjE2xlmIJwc61QWg0scLnlgqdT9DnS3JRUEc0xVEi
-4iSqFJ2xaBGLMpwCSybRisYcS5Rq79xlB1n19V9MVbLmSOBPyuZSS2eAOrSO5bfj
-76vgx3rC+rsCgGHkGBQ7xRTVzD5+LwsQdXycWRB1t5ATvfyGc0mjz6TEpP84h1Rl
-ROS9Ssqchlfc4avU3SG9zCFZksS576YQDZiDuWxfGmRE1ZJegXwnytxDnHrswPGK
-V3+8YtpxMh52pnUneB31RxH1Gb9eK0LKcJ0vpCvJJiCIn1kHvnyEgiDITghtvkp0
-5vFprOXOnz6f2WZWp+n8OjNdFERnhHMcj/m+vwlSrxj5BMu9kvuMmoZZQUnBDXA0
-wbUMf8JfLwcHQ3k5DI8RDdOEYBPmbf/0V6DwSMN9Z30ibv7E3lv1Jf2oPkR52tGf
-4YmU2PNIdsOyDAX78iKAf86JJQbLkMQAtcD7X+EgQC78HSGgKSA45W5cJzJBr8XN
-RSUfpc/FXIxpkL465ulseBa23HfTNkb8KKGtvkagvUBKcr/+vS5LydiL3KgrFz/5
-DxATN6Vl8KbaLaxD90MX
-=+nNW
+iQIcBAEBCAAGBQJVLT2nAAoJEGSje+quGaTor/IP/jTnhwHdlxtOk8sQIgTurhQj
+d+P+zERGQOBZCwmGgz9eFaqO2Mv2i+eWUDqfpT2yha9Tc/Zrjm4esO0zSlW7msqc
+jinxnm1MqzXLSN74HrOsTUvMVXB4Yv+SDrUm/D7RGNN+P6/Oxla9a5mxZg+yiwN5
+z9/4fuYxTHcjQZOiIkFZ/RezKVbS5SqgObxrg3RJbg94Q3w62kjeK2oQ4C07+nUp
++ktNpa/zr0qO+CILK/3Je9wSXtAOOBdc942CleDui7zGOuDNdny/5ZZvUZN3O1Cv
+YwE0lSpA906dPAGSMM8t8P+cENuYUo1gmULMabjCUlTdfywF+Z77bAEhIqqqH8dr
+sPbrJxYFLNfGI/vqOGNFZgsnxdmQ2TQ8alAIxtGrvRV/Xjo+8a6XkX4ox/2REPHx
+EBzm8W9hHTzb40vNxmV+82MULZK9lX923oJpQkQ/fyv7qNdIW3xO9aYxBQgWwU7Y
+UIYs8phZNpxtdhSf2l6alEDgOnpHvVnur0BDEfBcBH+BEKSCgfcnJRcJ17Bp4OOT
+y0Wr4QWQSH8m96W0gXufsf+E1JorSvsx+m78vDcvVZhXkTHj32J6eHEWymhjVvFR
+9UUYhYJQxjE7EXlPbAbdRlAgpuNnyOF/j3gnaAFEv/EgmGqUEbW/OLPMXcvu6RCD
+G8GLO0CD9Q8IN33ZmLyo
+=iUTJ
 -----END PGP SIGNATURE-----

diff --git a/dev-python/python-keystoneclient/files/cve-2015-1852-master-keystoneclient.patch b/dev-python/python-keystoneclient/files/cve-2015-1852-master-keystoneclient.patch
new file mode 100644 (file)
index 0000000..82897fe
--- /dev/null
+++ b/dev-python/python-keystoneclient/files/cve-2015-1852-master-keystoneclient.patch
@@ -0,0 +1,84 @@
+From 46f8d86c197376b0cdd9589310f2e66ef7af027a Mon Sep 17 00:00:00 2001
+From: Brant Knudson <bknudson@us.ibm.com>
+Date: Tue, 7 Apr 2015 19:38:29 +0000
+Subject: [PATCH] Fix s3_token middleware parsing insecure option
+
+The "insecure" option was being treated as a bool when it was
+actually provided as a string. The fix is to parse the string to
+a bool.
+
+Closes-Bug: 1411063
+Change-Id: I508dae8d7bedfc903e476cdefac43d05cbd7fbe1
+---
+ keystoneclient/middleware/s3_token.py              |  3 ++-
+ .../tests/unit/test_s3_token_middleware.py         | 24 +++++++++++++++++++++-
+ 2 files changed, 25 insertions(+), 2 deletions(-)
+
+diff --git a/keystoneclient/middleware/s3_token.py b/keystoneclient/middleware/s3_token.py
+index 7552893..f8d1ce0 100644
+--- a/keystoneclient/middleware/s3_token.py
++++ b/keystoneclient/middleware/s3_token.py
+@@ -34,6 +34,7 @@ This WSGI component:
+ import logging
+ 
+ from oslo_serialization import jsonutils
++from oslo_utils import strutils
+ import requests
+ import six
+ from six.moves import urllib
+@@ -116,7 +117,7 @@ class S3Token(object):
+         self.request_uri = '%s://%s:%s' % (auth_protocol, auth_host, auth_port)
+ 
+         # SSL
+-        insecure = conf.get('insecure', False)
++        insecure = strutils.bool_from_string(conf.get('insecure', False))
+         cert_file = conf.get('certfile')
+         key_file = conf.get('keyfile')
+ 
+diff --git a/keystoneclient/tests/unit/test_s3_token_middleware.py b/keystoneclient/tests/unit/test_s3_token_middleware.py
+index d5a62e8..dfb4406 100644
+--- a/keystoneclient/tests/unit/test_s3_token_middleware.py
++++ b/keystoneclient/tests/unit/test_s3_token_middleware.py
+@@ -124,7 +124,7 @@ class S3TokenMiddlewareTestGood(S3TokenMiddlewareTestBase):
+     @mock.patch.object(requests, 'post')
+     def test_insecure(self, MOCK_REQUEST):
+         self.middleware = (
+-            s3_token.filter_factory({'insecure': True})(FakeApp()))
++            s3_token.filter_factory({'insecure': 'True'})(FakeApp()))
+ 
+         text_return_value = jsonutils.dumps(GOOD_RESPONSE)
+         if six.PY3:
+@@ -142,6 +142,28 @@ class S3TokenMiddlewareTestGood(S3TokenMiddlewareTestBase):
+         mock_args, mock_kwargs = MOCK_REQUEST.call_args
+         self.assertIs(mock_kwargs['verify'], False)
+ 
++    def test_insecure_option(self):
++        # insecure is passed as a string.
++
++        # Some non-secure values.
++        true_values = ['true', 'True', '1', 'yes']
++        for val in true_values:
++            config = {'insecure': val, 'certfile': 'false_ind'}
++            middleware = s3_token.filter_factory(config)(FakeApp())
++            self.assertIs(False, middleware.verify)
++
++        # Some "secure" values, including unexpected value.
++        false_values = ['false', 'False', '0', 'no', 'someweirdvalue']
++        for val in false_values:
++            config = {'insecure': val, 'certfile': 'false_ind'}
++            middleware = s3_token.filter_factory(config)(FakeApp())
++            self.assertEqual('false_ind', middleware.verify)
++
++        # Default is secure.
++        config = {'certfile': 'false_ind'}
++        middleware = s3_token.filter_factory(config)(FakeApp())
++        self.assertIs('false_ind', middleware.verify)
++
+ 
+ class S3TokenMiddlewareTestBad(S3TokenMiddlewareTestBase):
+     def setUp(self):
+-- 
+1.9.1
+
+
+

diff --git a/dev-python/python-keystoneclient/python-keystoneclient-0.11.0.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-0.11.0.ebuild
deleted file mode 100644 (file)
index c118917..0000000
--- a/dev-python/python-keystoneclient/python-keystoneclient-0.11.0.ebuild
+++ /dev/null
@@ -1,74 +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.11.0.ebuild,v 1.1 2014/09/21 21:26:32 prometheanfire 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-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/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-1.1[${PYTHON_USEDEP}]
-               >=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-               >=dev-python/stevedore-0.14[${PYTHON_USEDEP}]"
-
-PATCHES=(
-)
-
-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-0.11.1.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-0.11.1.ebuild
deleted file mode 100644 (file)
index 5f45414..0000000
--- a/dev-python/python-keystoneclient/python-keystoneclient-0.11.1.ebuild
+++ /dev/null
@@ -1,80 +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.11.1.ebuild,v 1.1 2014/09/27 20:16:02 alunduil Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Client Library for OpenStack Identity"
-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 ~amd64-linux ~x86 ~x86-linux"
-IUSE="examples test"
-
-# NOTE: docs to not install due to pbr configuration issues
-
-# NOTE: dev-python/discover not actually used
-# dev-python/discover[${PYTHON_USEDEP}]
-
-CDEPEND="
-       >=dev-python/pbr-0.6[${PYTHON_USEDEP}]
-       !~dev-python/pbr-0.7[${PYTHON_USEDEP}]
-       <dev-python/pbr-1.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-       dev-python/setuptools[${PYTHON_USEDEP}]
-       ${CDEPEND}
-       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/keyring-2.1[${PYTHON_USEDEP}]
-               !~dev-python/keyring-3.3[${PYTHON_USEDEP}]
-               >=dev-python/lxml-2.3[${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/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-               >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-               >=dev-python/requests-mock-0.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/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="
-       ${CDEPEND}
-       >=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.4.0[${PYTHON_USEDEP}]
-       >=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-       <dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-       >=dev-python/requests-1.2.1[${PYTHON_USEDEP}]
-       !~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
-       >=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-       >=dev-python/stevedore-1.0.0[${PYTHON_USEDEP}]
-"
-
-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 examples && local EXAMPLES=( examples/.)
-
-       distutils-r1_python_install_all
-}

diff --git a/dev-python/python-keystoneclient/python-keystoneclient-0.11.2.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-0.11.2.ebuild
deleted file mode 100644 (file)
index 78dce98..0000000
--- a/dev-python/python-keystoneclient/python-keystoneclient-0.11.2.ebuild
+++ /dev/null
@@ -1,91 +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.11.2.ebuild,v 1.1 2014/11/11 02:12:05 alunduil Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Client Library for OpenStack Identity"
-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 ~amd64-linux ~x86 ~x86-linux"
-IUSE="doc examples test"
-
-# Note: blacklist version not in portage:
-#doc? ( !~dev-python/sphinx-1.3_preb1[${PYTHON_USEDEP}] )
-
-CDEPEND="
-       >=dev-python/pbr-0.6[${PYTHON_USEDEP}]
-       !~dev-python/pbr-0.7[${PYTHON_USEDEP}]
-       <dev-python/pbr-1.0[${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.4.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}]
-       test? (
-               ${CDEPEND}
-               ${TCDEPEND}
-               >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-               <dev-python/hacking-0.10[${PYTHON_USEDEP}]
-               >=dev-python/hacking-0.9.2[${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/pycrypto-2.6[${PYTHON_USEDEP}]
-               >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-               >=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
-       )
-       doc? (
-               ${TCDEPEND}
-               >=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-               >=dev-python/oslo-sphinx-2.2.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="
-       ${CDEPEND}
-       >=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.4.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-serialization-1.0.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-utils-1.0.0[${PYTHON_USEDEP}]
-       >=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-       <dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-       >=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
-       !~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
-       >=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-       >=dev-python/stevedore-1.0.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-       use doc && esetup.py build_sphinx
-}
-
-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
-}

diff --git a/dev-python/python-keystoneclient/python-keystoneclient-1.0.0.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-1.0.0.ebuild
deleted file mode 100644 (file)
index 45f660f..0000000
--- a/dev-python/python-keystoneclient/python-keystoneclient-1.0.0.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# 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.0.0.ebuild,v 1.3 2015/03/09 00:03:42 pacho Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Client Library for OpenStack Identity"
-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"
-
-# Note: blacklist version not in portage:
-#doc? ( !~dev-python/sphinx-1.3_preb1[${PYTHON_USEDEP}] )
-
-CDEPEND="
-       >=dev-python/pbr-0.6[${PYTHON_USEDEP}]
-       !~dev-python/pbr-0.7[${PYTHON_USEDEP}]
-       <dev-python/pbr-1.0[${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.5.1[${PYTHON_USEDEP}]
-       >=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
-       >=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-"
-DEPEND="
-       dev-python/setuptools[${PYTHON_USEDEP}]
-       ${CDEPEND}
-       test? (
-               ${TCDEPEND}
-               >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-               <dev-python/hacking-0.10[${PYTHON_USEDEP}]
-               >=dev-python/hacking-0.9.2[${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.2.0[${PYTHON_USEDEP}]
-               >=dev-python/pycrypto-2.6[${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.2.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="
-       ${CDEPEND}
-       >=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.4.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-i18n-1.0.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-serialization-1.0.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-utils-1.1.0[${PYTHON_USEDEP}]
-       >=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-       <dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-       >=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
-       !~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
-       >=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-       >=dev-python/stevedore-1.1.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-       use doc && esetup.py build_sphinx
-}
-
-python_test() {
-       local DISTUTILS_NO_PARALLEL_BUILD=TRUE
-
-       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
-}

diff --git a/dev-python/python-keystoneclient/python-keystoneclient-1.1.0.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-1.1.0.ebuild
deleted file mode 100644 (file)
index dd4fa1b..0000000
--- a/dev-python/python-keystoneclient/python-keystoneclient-1.1.0.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# 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.1.0.ebuild,v 1.1 2015/02/24 04:48:08 alunduil Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 )
-
-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}] )
-
-CDEPEND="
-       >=dev-python/pbr-0.6[${PYTHON_USEDEP}]
-       !~dev-python/pbr-0.7[${PYTHON_USEDEP}]
-       <dev-python/pbr-1.0[${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.5.1[${PYTHON_USEDEP}]
-       >=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
-       >=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-"
-DEPEND="
-       dev-python/setuptools[${PYTHON_USEDEP}]
-       ${CDEPEND}
-       test? (
-               ${TCDEPEND}
-               <dev-python/hacking-0.11[${PYTHON_USEDEP}]
-               >=dev-python/hacking-0.10.0[${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.2.0[${PYTHON_USEDEP}]
-               >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-               >=dev-python/requests-mock-0.5.1[${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.2.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="
-       ${CDEPEND}
-       >=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.6.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-i18n-1.3.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-serialization-1.2.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-utils-1.2.0[${PYTHON_USEDEP}]
-       >=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-       <dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-       >=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
-       !~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
-       >=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-       >=dev-python/stevedore-1.1.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-       use doc && esetup.py build_sphinx
-}
-
-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
-}

diff --git a/dev-python/python-keystoneclient/python-keystoneclient-1.2.0.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-1.2.0.ebuild
deleted file mode 100644 (file)
index fe0ee85..0000000
--- a/dev-python/python-keystoneclient/python-keystoneclient-1.2.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# 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.2.0.ebuild,v 1.2 2015/02/28 20:10:04 prometheanfire Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 )
-
-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.5.1[${PYTHON_USEDEP}]
-       >=dev-python/tempest-lib-0.2.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.6[${PYTHON_USEDEP}]
-       !~dev-python/pbr-0.7[${PYTHON_USEDEP}]
-       <dev-python/pbr-1.0[${PYTHON_USEDEP}]
-       test? (
-               ${TCDEPEND}
-               >=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
-               <dev-python/hacking-0.11[${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.2.0[${PYTHON_USEDEP}]
-               >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-               >=dev-python/requests-mock-0.5.1[${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.2.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.6.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-i18n-1.3.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-serialization-1.2.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-utils-1.2.0[${PYTHON_USEDEP}]
-       >=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-       <dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-       >=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
-       !~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
-       >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-       >=dev-python/stevedore-1.1.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-       use doc && esetup.py build_sphinx
-}
-
-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
-}

diff --git a/dev-python/python-keystoneclient/python-keystoneclient-1.3.0-r1.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-1.3.0-r2.ebuild
similarity index 93%
rename from dev-python/python-keystoneclient/python-keystoneclient-1.3.0-r1.ebuild
rename to dev-python/python-keystoneclient/python-keystoneclient-1.3.0-r2.ebuild
index dbfa03b368bed137d053b91837ecdd0d79d03857..ce9455329e8739ec50095553b91213d7fca7f1c9 100644 (file)
--- a/dev-python/python-keystoneclient/python-keystoneclient-1.3.0-r1.ebuild
+++ b/dev-python/python-keystoneclient/python-keystoneclient-1.3.0-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.3.0-r1.ebuild,v 1.1 2015/04/02 19:56:39 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-keystoneclient/python-keystoneclient-1.3.0-r2.ebuild,v 1.1 2015/04/14 16:17:32 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
@@ -70,9 +70,13 @@ RDEPEND="
        >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
        >=dev-python/stevedore-1.1.0[${PYTHON_USEDEP}]
 "
+PATCHES=(
+"${FILESDIR}/cve-2015-1852-master-keystoneclient.patch"
+)
 
 python_prepare_all() {
        use doc && esetup.py build_sphinx
+       distutils-r1_python_prepare_all
 }
 
 python_test() {