updating deps and stuff for distutils-r1

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

3 files changed, 27 insertions, 32 deletions

diff --git a/dev-python/python-keystoneclient/ChangeLog b/dev-python/python-keystoneclient/ChangeLog
index a8c7f32e0242..39911c61b82b 100644
--- a/dev-python/python-keystoneclient/ChangeLog
+++ b/dev-python/python-keystoneclient/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/python-keystoneclient
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-keystoneclient/ChangeLog,v 1.14 2013/08/20 18:59:34 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-keystoneclient/ChangeLog,v 1.15 2013/09/13 19:40:27 prometheanfire Exp $
+
+  13 Sep 2013; Matthew Thode <prometheanfire@gentoo.org>
+  python-keystoneclient-9999.ebuild:
+  updating deps and stuff for distutils-r1
 
   20 Aug 2013; Matthew Thode <prometheanfire@gentoo.org>
   python-keystoneclient-0.3.1.ebuild:
diff --git a/dev-python/python-keystoneclient/Manifest b/dev-python/python-keystoneclient/Manifest
index d4ec3a406f38..6511e54aa21f 100644
--- a/dev-python/python-keystoneclient/Manifest
+++ b/dev-python/python-keystoneclient/Manifest
@@ -1,27 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST python-keystoneclient-0.2.5.tar.gz 196496 SHA256 3985ab402b3b63510f387df639658687ee001c047ed710bee9a46219ebc31e2b SHA512 2c14d039a80a8b8ac65c974410722b5726b2f0f94c238b60ac93d09828abcf4518cec16af10387ccaa5e1639a5c9e168afa32623e507899c8486152c3d785c8b WHIRLPOOL aa82ee7f157c8573978b04b485068cc5d3f3f8bcfc4e573b8ed631b23ca3ffd8eb47830449c13da5e93e674c42a23c1efb072ffd5005c93a3c6f84a12e1b4063
 DIST python-keystoneclient-0.3.1.tar.gz 209845 SHA256 bfc149b2d161bfe168be0fde41d9e75f2c0a99b9f398672f92c7c54c6f62fa26 SHA512 e79a4ab0b8e2c99a94efd6bf6690abd15cf41ea6b4e605c1a3534ee9788cb38239b6cd43e2956bd513b1149ab359af63eb46c7a61a9ebe3f3c1005068a7533de WHIRLPOOL ab4636f77e8de91fe38718f3f43a9f81d4bde69ed02710fe0d02ce1e8965f728c53fff6f28780981e7303c16fe43a33c9c30ac21a7cb1cfc8a2e855bc47c1f36
 EBUILD python-keystoneclient-0.2.5.ebuild 2008 SHA256 bf8a08c00c628ff38a4fa302ef4c14da80280f37fb6bde99be87eda903291825 SHA512 d8c1c1ea5fc98cbb1796651fcdf711a0a70102756285e79214f0cd24a39a56a266a92844b7f7872a005f15578f019f16676b4d44342b0429fdd7669063c463c4 WHIRLPOOL 4552217863d7c9368d9293fc5f9ad2a8d8aa96165f920aba62e6345f632bceb8f63d72bbc0774bc08bef60aed8afd38ae83f12f9dd7756b3d7050e00796ab715
 EBUILD python-keystoneclient-0.3.1.ebuild 2050 SHA256 204f8454a308efdba6b0bf080bee7565d36918933a8ab0524d4f3021e18b560b SHA512 65da59d3b6e7636caade70c81fd60c97e54bb2dbb9e4f980703f8ef5584c8b76fe000ccffe1bb6b6657c1d238c88bc23cbf2a79696826e3746236949990a9dfc WHIRLPOOL e2f5fc1cbccc27c652b75c0b173da827e135a03ad600d47a8ece3fab05bc434fae125275ef2b6fe30b45f85d3b4da52916fa28f8597037b7813ef29292a1faf1
-EBUILD python-keystoneclient-9999.ebuild 1597 SHA256 0062df58f82beaaa54dd279e7a95ae8540c51cc1a2bb32e4621ae96cf2508216 SHA512 6de16b203f9cdf88cad8c8c19c99bfd1f243de807971ca2292437074b147f02476d526974cab64b8f881afb6e2c8f19938966f5322eed50b95c5a95de25461e0 WHIRLPOOL 8d26907ba7ac0e570a3fa245b8d2e04d5285c4ff02c2ecafd7fa9cf9cd4b3a6b938abfe9efb925e02b5733320a4cb05b2fb1aca005ca5ffd0f19ab4d19db58a4
-MISC ChangeLog 3892 SHA256 42a41e06e8f3a1a8a52895b2c763ec14a0fc2f05b064065418d42b1e1d5076fe SHA512 e7d8a4dd24351a5c9aaea288f8a79230ca8acba1a73ed071a102059c61007e7814d568dcf0c7af2927a9f71be136b5a04684f20f1bd3e9b7c9fb11c0abd75524 WHIRLPOOL 6c35009c1cc7d93b4829e36762a953b0ff7acf9c7e3af9fd506a70e59eeb7e72bf54e21359c54cb70b46db77d9efb5cc5c80cc5e884cb7a7b2b3b8d2912a94ba
+EBUILD python-keystoneclient-9999.ebuild 2074 SHA256 e86c01aea02607a7f7f90ed4b8ac7b355c5b8bb59aadb7ba1ef67331a3aa5392 SHA512 699340f1e6e3a2e9b42a09e2f97244c4159d69c50b9264ef1ae3f7e9e4330482b91b46ae8e913b93feb20d9375702599de06ab99692baebb97ce681e79a44c5a WHIRLPOOL cc34ed28825578c49cc6f27c5e0b10cb57c0035aa55eb82704fac714d4f09f589bb6eb72b446b584de522fac488062cf0cd24490f22e9ca1fa2c9fb9f09c9d9c
+MISC ChangeLog 4030 SHA256 4fbf86c5ec161aeff9389553a8bad3b0b794d1ccf940d7247b41aa346ec97d25 SHA512 ab0056b9596acae978ffaa277166de33a3683ce9fb9bcc8b52d73279082ea5203585bc7b74ccad8991cb89c13cd7cd7a9be216173cdb564abfb77e7c737d50ab WHIRLPOOL 7e09743b838b29a52895c055795707098a9e18c88a7196468c94bd113416cf37c2fb472626b63b8f07ac2986804888d4ccc80b41fa3cecda6a60016ac03a0c6a
 MISC metadata.xml 343 SHA256 716e96a66916d216f80e7ce0283db63bd6d18a95e2365d9d1a35964b2ef461f9 SHA512 fd28e5434f725af6a835205ae8cfae1354983f8e68f6c25f9a4f56ec17041ac9bb1a460ff8e82d0e165ab19c5b0f26e0f0c8c5124dfcc37723c786e12cd4d3bf WHIRLPOOL b486328b67aa7f6e4b68adc757bf5d3983077a894d7ded68be7723fe5655805324a73e5914fda0f81ae334e75db9557e2675a43e9437df633311590758466c5c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
-
-iQIcBAEBCAAGBQJSE7zZAAoJECRx6z5ArFrDYOEP/Ridtdg4MYn5PLCl00Eyzh9i
-XXK0zI1CUPQhISR7Xn2vYNE2hAU1R8hyrVEF5lAkgRe6TSAgv9fr5zietysnpCh/
-aSn6AX2Tl8G3cJ9kv6QDhCRm34SuWZJiuS2zd3NNXvv7N2+MsO+Bv71ie3pxqymL
-kY2FiTXspVYB78bi/V91p8x7VOwHMINPkvNSv0ttKbcZjcs5x4E9hq0jiKZE/eWo
-G9GcSp0u6WFKphARocOEzgVZbUYrUE4nCoqUVG+FYxUkghQLALli59wGgmXTTfNB
-4yp9+KIQKExi68QiuU7ycKhZgGSXoKr2D6ob/1wfSY/E2DszeI2cf38GkFxm+/IL
-FI+9pKtO2BpH90Ig6ttA9lahikG0sW95INUmlpwutlWxEb+X+82cWMuAQyCjriY+
-W9VKAsN3EVN9U1U/u3b1z/u2dIwqja+oM62qEuo2DQcGdQ9YIJjyjYqghDlvNBvk
-nEJfs9pfxzxZlxGC6nqPDdfXDAVF0QOwCvFBU1Li+IgQJ+9Xj4uWD362Gm9AgLet
-DABqWSU5BYZRDcHf5IOjSH9B+7KKE3dKxHyiouVZvDTi0LGtyWGFY/QaRBKB2dWW
-B4P+fd45jB3eobnD6NCFgQYhaFgNa24Bw8oEUgj34Gc3WvGVvXe1DviAqve4tQBd
-3m9k/ern/e6WArGspnWz
-=/WIb
------END PGP SIGNATURE-----
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-9999.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-9999.ebuild
index fba93c540fac..895d6b4253f7 100644
--- a/dev-python/python-keystoneclient/python-keystoneclient-9999.ebuild
+++ b/dev-python/python-keystoneclient/python-keystoneclient-9999.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2013 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.4 2013/03/26 06:09:02 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-keystoneclient/python-keystoneclient-9999.ebuild,v 1.5 2013/09/13 19:40:27 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 git-2 distutils-r1
+inherit distutils-r1 git-2
 
 DESCRIPTION="A client for the OpenStack Keystone API"
 HOMEPAGE="https://github.com/openstack/python-keystoneclient"
@@ -15,7 +16,7 @@ EGIT_REPO_URI="https://github.com/openstack/python-keystoneclient.git"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
@@ -29,18 +30,28 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 			dev-python/nose-exclude[${PYTHON_USEDEP}]
 			dev-python/nosehtmloutput[${PYTHON_USEDEP}]
 			dev-python/openstack-nose-plugin[${PYTHON_USEDEP}]
-			=dev-python/pep8-1.3.3
+			=dev-python/pep8-1.4.5[${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 )"
-RDEPEND="dev-python/iso8601[${PYTHON_USEDEP}]
-		dev-python/prettytable
-		>=dev-python/requests-0.8.8
-		<=dev-python/requests-1.0
+			>=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.1.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/prettytable-0.8[${PYTHON_USEDEP}]
+		>=dev-python/requests-0.8.8[${PYTHON_USEDEP}]
 		dev-python/simplejson[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
 		virtual/python-argparse[${PYTHON_USEDEP}]"
 
+PATCHES=(
+)
+#	"${FILESDIR}/0.2.3-CVE-2013-2104.patch"
+
 python_test() {
 	${PYTHON} setup.py nosetests || die
 }