fixing versions

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

3 files changed, 54 insertions, 42 deletions

diff --git a/dev-python/python-heatclient/ChangeLog b/dev-python/python-heatclient/ChangeLog
index d9df74a6d49b..e532c41c46a7 100644
--- a/dev-python/python-heatclient/ChangeLog
+++ b/dev-python/python-heatclient/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/python-heatclient
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-heatclient/ChangeLog,v 1.9 2014/03/27 21:52:18 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-heatclient/ChangeLog,v 1.10 2014/03/27 22:05:47 prometheanfire Exp $
+
+  27 Mar 2014; Matthew Thode <prometheanfire@gentoo.org>
+  python-heatclient-9999.ebuild:
+  fixing versions
 
 *python-heatclient-0.2.8 (27 Mar 2014)
 
diff --git a/dev-python/python-heatclient/Manifest b/dev-python/python-heatclient/Manifest
index 39e30f7c5879..a1a2a3f341af 100644
--- a/dev-python/python-heatclient/Manifest
+++ b/dev-python/python-heatclient/Manifest
@@ -9,23 +9,23 @@ EBUILD python-heatclient-0.2.4-r1.ebuild 1867 SHA256 76c6c57bd7c3eb28104a86c6119
 EBUILD python-heatclient-0.2.5.ebuild 1940 SHA256 c8e4ee2005be2b3c58b85a1a79b47a81971457a97d7a9427cee46df18c8e997a SHA512 696e864162798c02c24acf3a4a2df3e82649525a3cac26b979482da1bb051ef73debb2adfcbc8ef21122902f1bc0fcbfd7dd50f9a2c12a24a030d282955f1339 WHIRLPOOL 2facd07de03d28ae2450be6664ee9c79319724b4916ac45a9351326034a77ac0ae4a0f749f1e1549f727204f0fd52d8e0a52b7b117b8b1c2335061acbe957125
 EBUILD python-heatclient-0.2.6.ebuild 2216 SHA256 84299b76a71b81f89488cc551c30ba1cb7380bd0b1cad4b4676e7c4506cdb4ba SHA512 cff9cc1cb188146fb15603fbfb9932d2338e21724645b22b3ea8134f117ae86950763632f39d54c56ef05d84413c19a36eda858a3884db98cb0449212fad45c3 WHIRLPOOL 5a9aabad87a55134555781670edecf4d7361a500fc7180786bafc06167108dc9022f4b6e292e842942a1e90324f7268f4ac20cc2e66d746a79dd6b126f13d4c1
 EBUILD python-heatclient-0.2.8.ebuild 1974 SHA256 e0bf599230f3e7e63ca092addeea156ed781218fdebed2800ff906ce2329b3db SHA512 657d309ee1c31c9338505ff089d9e29fc60fcbf8e4b5422d62553cb6a4c9db5300f2757fcf36a4b019dfda23129b7df39c4755ab5ac10a2f4555cf17000920a9 WHIRLPOOL 7d934cdf227cede6fe60c9b091f8311627a5dbc16ddd7c1a59670830a1ba73198407198a54ae4c85e7a95681eb6591eb4b15285b755fd27207210d4c744aaced
-EBUILD python-heatclient-9999.ebuild 1729 SHA256 3d439fe6c4ecbc5e463e922a0085e844ab56f64bcc3cb3cc325daf3517ecfafd SHA512 dcae2f472f5971100295103b953d0d86f61e725e66d35315d287b367a14e06ee7d53c9ee772d6b8ba29096dc3e1acd94b833873488ab886216f594882c5ac2af WHIRLPOOL 2fd116e097d6482b4c5178ca61e201a7d98872411bda57ec1991d8d4e09b82d69b0a7a5692c101ca0f41526e5e663492cd04a9297e7fb81a682a8f1858539296
-MISC ChangeLog 1993 SHA256 69a56b927b1693454e94e3acbb6fa4f3322dfbbf1ebb761ae7efd21aa9b10fea SHA512 2fdbce0d39bb144760a435b739785d00d414cef892cb4c8c5b2fd6e7104a0bd72b8eb337af5042b0c851b1b9f17dc2f289d3b08744e63539062e147f960786ac WHIRLPOOL 4771a10225a3e5191e251fc6f752800daf42f101c059a99e2d8580ba09f9e340fb701dbe6460cc9f7ef4b76b697075b6578ab25ba07393c3d16498a6d639b7e2
+EBUILD python-heatclient-9999.ebuild 1959 SHA256 930286e4cd29cb94ac196ddf4897e2a162d9a532d331aae3c9c31dde0507773c SHA512 213493f6f8bfc18263f20ea25d8d2cf62dcfa9c44c44c5956913510c5742d38c941aaf895871d665bd66f631b9150179ef5230174bfabc4405a8a8a1a23b1822 WHIRLPOOL d1651cdc9959c59dea9ffcd9b021ec26ef37c06c3a9ba5b5fdad1311038501d4bf7214cb81aa9eed6b98972265dd7193b89897c0c8af37bc85e9b7c6a3ef88ad
+MISC ChangeLog 2103 SHA256 ac8fe3e4b4ff8f3886544eef2f5ad130aa87b83c52f536d5e115b0c7d07ced86 SHA512 26c17beac3afb991ef17225b5048a49306233c38d4de3fd84fb3edee9b9631582c6c059230f76d99d3345e8da71fc3262db325d74b93faca765fe479062ab108 WHIRLPOOL e7fc44f7c54809a285197fd9563be12f3aa9ac24ad41c19e9800bfad872a4a8300dab1334870be1ae83f76c77fa72af34d94a376e8b30e96178201506ea79622
 MISC metadata.xml 397 SHA256 8c43bf1f2859a65a1abbf67a39f8fd9673eedbc52366131a2082920d6759b2a5 SHA512 18358c69fb98c9448aace7363ca6f784fbb20e430a7c4c89bbdda67a5105f5ca7c8aac4f795ec2e9c19c03d8c607fad6816ec2bae76c14d64d4d45c0e721a9f2 WHIRLPOOL a4b0c1febc9961406bef32383705d9b0580e6948d3e23c7fffbbd7d5dc931a2e1593fd22e925e21381eaabcdf143ba76bbf12152ec11a8aaf4ba5bffb5fd0749
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTNJ3BAAoJECRx6z5ArFrDzTsP/338sgrgU7SX44pyd1Bib1Po
-KOkp3egJPyVLDL6hOtnILensJi8n2Ik/DapiE/P442I9qtYH24yt/KptD0KHLGd9
-1CHgvCd/mKwCF5Kpa9M82H0LxFJnaX3iqeyy862m+9eE+PGssZ6IrYu+/dpoghqP
-Yp1DaxdqU5A8bXjz7vI02v+kyNXnc9zDa0IFtDx7HwTzdKMtvBD8Cxg8+sjMDL/N
-wEst7xP7PoQMmsUgmYlqD7LNpIvXyjXvFKywaJJr7eQLVFbVeeiQrHDSKHM49V36
-l/J3Sv4zZgOvI3IeV5dhzRyy7y1heg2+T5NF5I0g/Qo7k36+xY2MDs7jGMZPIut1
-vZfYFCoDCyz8DqWmk5Y/L5vL/lOoIHz1FK0ff7QoIS2I8jt9eAdS3dHn8rVjsznC
-myUBifO+n4QCT+ZBxQJkgJ6MPtf+9A0qbjI9/Bowuhu6n/pVRf0jGdxg+1FQCqAa
-rywNvRVPX7qFy94PbKnaPQ4xL6q/7bPi5dUIBctfKvXp9Bma5ION5s4YMA0B20RA
-J0m2vXaIWpyAuvUM7f766aYVP0V3Ux0Fuec95lYZIHE366mKkRPd8ZKKkbeJPLqb
-f4rcZ7/aESH16Z6LioWWWgC0ebOAAtF1H7XBNKhXjX25Bbb0syQu2KTlOkHqDFUB
-jQJdIijLn0pcJux+bEtp
-=jGPx
+iQIcBAEBCAAGBQJTNKDqAAoJECRx6z5ArFrDw5UP/1IhuytPD5vK2mop5kCd4XcN
+jlhHm2hO42bhf2bcOL65dHMrlTAWQV9g46AzSNPEvnONjpe6SlcY2KndUO4iov9a
+XfzOufwRJEpS7t9XUYSpVq2cw3VpklIgmuwFJnb4vT0+emZwu1S/0wm1rMbbz+zs
+zrUvOb2JlBsK8a3vx1w5Yx/Wjvh4iwoIRQhNASJLF8EkXh+uVcGff5oWJk7qlVgj
+IAWXeNMJtckq5LeUI9dYO2GLVMO7TSk/tDAAJa7L/27hhhdH6iEjwvYFlAs2WiQ9
+QA0RGfUFWfbKq/XLX+w05Yf6RLLmnKbzJGsz2YZFIggKTkKVkz4np3j6tQiZWW+b
+A9mjGuKntSonA8XEFN+E8F9t6KRZvx0MKqBoz8/1JEpguB+NGO0SD51eOT7SX6rz
+wd+t8C8wgViInbdWRalI6/6Ao5tU9a2LdD2wm/HEWg4hAQ2xkRYvWdfSFkTlZz/O
+c8QQ/F1JBqYRNVC4/M47N2b/0eI3pJhQYd4tObLhj2OxhfjSzgZJUyeH1mEfGl8p
+GwnFr+MqJ+0s9AwisuvVy/8rZrOCtxr+8jV0jpQ0IPczBDdHMJuGiDNAPV4gfDUb
+uk2MbuGspHyfz/Rb9TbiTKHPmZ0F3I6Tj2udyL2yAulzmTg2qpFESCDlR7Bv8uk+
+oVmdQVOqq71CrG07tNnx
+=Uoso
 -----END PGP SIGNATURE-----
diff --git a/dev-python/python-heatclient/python-heatclient-9999.ebuild b/dev-python/python-heatclient/python-heatclient-9999.ebuild
index b7c8b7d6272e..810797c3bf56 100644
--- a/dev-python/python-heatclient/python-heatclient-9999.ebuild
+++ b/dev-python/python-heatclient/python-heatclient-9999.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-heatclient/python-heatclient-9999.ebuild,v 1.2 2013/09/13 19:36:04 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-heatclient/python-heatclient-9999.ebuild,v 1.3 2014/03/27 22:05:47 prometheanfire Exp $
 
 EAPI=5
-#restricted due to not caring about 9999
-RESTRICT="test"
 PYTHON_COMPAT=( python2_7 )
 
 inherit git-2 distutils-r1
@@ -17,31 +15,41 @@ EGIT_REPO_URI="https://github.com/openstack/python-heatclient.git"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS=""
-IUSE="test"
+IUSE="doc test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		test? ( dev-python/mox[${PYTHON_USEDEP}]
-			dev-python/nose[${PYTHON_USEDEP}]
-			dev-python/nose-exclude[${PYTHON_USEDEP}]
-			dev-python/nosexcover[${PYTHON_USEDEP}]
-			dev-python/nosehtmloutput[${PYTHON_USEDEP}]
-			dev-python/openstack-nose-plugin[${PYTHON_USEDEP}]
-			~dev-python/pep8-1.4.5[${PYTHON_USEDEP}]
-			~dev-python/pyflakes-0.7.2[${PYTHON_USEDEP}]
-			>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-			>=dev-python/setuptools-git-0.4[${PYTHON_USEDEP}] )"
-RDEPEND=">=dev-python/d2to1-0.2.10[${PYTHON_USEDEP}]
-		<dev-python/d2to1-0.3[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.5.10[${PYTHON_USEDEP}]
-		<dev-python/pbr-0.6[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		>=dev-python/iso8601-0.1.4[${PYTHON_USEDEP}]
-		>=dev-python/prettytable-0.6[${PYTHON_USEDEP}]
+		>=dev-python/pbr-0.6[${PYTHON_USEDEP}]
+		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+		test? ( >=dev-python/hacking-0.8.0[${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/mox3-0.7.0[${PYTHON_USEDEP}]
+				>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+				<dev-python/sphinx-1.2[${PYTHON_USEDEP}]
+				>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+				>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+				>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}] )"
+RDEPEND="virtual/python-argparse[${PYTHON_USEDEP}]
+		>=dev-python/iso8601-0.1.8[${PYTHON_USEDEP}]
+		>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
 		<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-0.2[${PYTHON_USEDEP}]
-		<dev-python/python-keystoneclient-0.3[${PYTHON_USEDEP}]
-		virtual/python-argparse[${PYTHON_USEDEP}]"
+		>=dev-python/python-keystoneclient-0.6.0[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
+		>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+		>=dev-python/requests-1.1[${PYTHON_USEDEP}]"
+
+python_compile_all() {
+	use doc && sphinx-build -b html -c doc/source/ doc/source/ doc/source/html
+}
 
 python_test() {
-	${PYTHON} setup.py nosetests || die
+	"${PYTHON}" setup.py testr --coverage
+	"${PYTHON}" setup.py testr --slowest
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/source/html/. )
+	distutils-r1_python_install_all
 }