fixing dep issues and a version bump

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

4 files changed, 97 insertions, 33 deletions

diff --git a/dev-python/python-heatclient/ChangeLog b/dev-python/python-heatclient/ChangeLog
index 900bdd01d796..1ee252e8ef67 100644
--- a/dev-python/python-heatclient/ChangeLog
+++ b/dev-python/python-heatclient/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/python-heatclient
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-heatclient/ChangeLog,v 1.3 2013/09/13 19:36:04 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-heatclient/ChangeLog,v 1.4 2013/10/23 16:26:24 prometheanfire Exp $
+
+*python-heatclient-0.2.5 (23 Oct 2013)
+
+  23 Oct 2013; Matthew Thode <prometheanfire@gentoo.org>
+  +python-heatclient-0.2.5.ebuild, python-heatclient-0.2.4-r1.ebuild:
+  fixing dep issues and a version bump
 
 *python-heatclient-0.2.2-r1 (13 Sep 2013)
 *python-heatclient-0.2.4-r1 (13 Sep 2013)
diff --git a/dev-python/python-heatclient/Manifest b/dev-python/python-heatclient/Manifest
index 3069eca01e95..c37f2538604d 100644
--- a/dev-python/python-heatclient/Manifest
+++ b/dev-python/python-heatclient/Manifest
@@ -3,25 +3,27 @@ Hash: SHA256
 
 DIST python-heatclient-0.2.2.tar.gz 40892 SHA256 1ccd0d04928429a3928d9e7057db28de893659d3200f15c4da43de7fb731392b SHA512 b29e097a59c3e773e51a932011714d893e51692bdc9b76ea3431d5b642a8fdafb6237af25516a495c9c88ad344193da01af17db7d344e35e4debc614f814dd7a WHIRLPOOL df9997b97babe7aa57b2a44d5e25b8db53d542fcb563e14eb28ce8b25892912ebed1ea8c0b571ec1986aefb41efa07da2eea6709c777fc99da321f173e55f688
 DIST python-heatclient-0.2.4.tar.gz 44387 SHA256 b56c2f2249496e40fa8eba80e59966a0ba792f4bc86524feb48f3d2e20d3bdd0 SHA512 e78a5dbabf85cdd95b4439d1f262929771ad1958261fe4d35f0b7beb5911c99dadf9ffc22317dcdc9dd54a9b4540d89c0969a2a0ca0928ae21ea241967389aeb WHIRLPOOL 3ae1358c6e14d55eb67284561c648b9e5433e44a100f0392d36248e7c267f87839ddc205dc917425f480da95905a59c9410076abf298c0b41a9da464465a9efe
+DIST python-heatclient-0.2.5.tar.gz 48071 SHA256 f1d8d07947aa619498640aef84927e5f7a82efc566cc5f6260e146ddbcbc6ba8 SHA512 22deca348cf9787984cac66da5a40606a654276fd7ff356da85984db88167bf4a3cbe0ea275d10973db04ed9f9b9a0cf563b808e98682aa9801a5acaf22fa5ea WHIRLPOOL 584b49236d1ae97b70dd32154b35b2f49ad5aed1b579e402f07a93a956c49ef611d5869a1f333fab9543d1e7caff448dab01db175576c350264e292c927cd7cd
 EBUILD python-heatclient-0.2.2-r1.ebuild 1547 SHA256 142683be1e636721daf99919496a63a50f1d0f1432453058207e0be31017c23e SHA512 ea750af7f70a2a313373dfa5a25067d5225340d76e14555cf63eb8d80dc7835a2574e0591cf693259dfdbf2e0e19635e360b4e05e2eff217ee5ef6d28a69dbe7 WHIRLPOOL 02483e276fde52703993ec13802f7e3a9a230249b3824070b4a06ac204cb02836ea13d91a51d5e3d9bacbf30d9b0adec248052e721792711472e73b5a0d6ecc7
-EBUILD python-heatclient-0.2.4-r1.ebuild 1572 SHA256 dbf2f84d94e78201cb9023abe17a328092c96cac89782b5ee7ea32d366e21f1e SHA512 140164aafc525a8ebe1e10283432fafeeddd7e4cd24e1f3b28878f069845caf66c76151ecae2e57ce45f835f043355a5bbb836f41d12ed1eb25967d88dbd18dd WHIRLPOOL 1cf29a2d4f46008be2bc2bffb614f88711f9e97690ea1350a5fb3f0e5a748c7a8feefe4e59de62e08526a86333337250078bee67af183242d2fc0da5c8d111af
+EBUILD python-heatclient-0.2.4-r1.ebuild 1867 SHA256 76c6c57bd7c3eb28104a86c6119f5ce1e68b4a20ab85a8c040a03bee14d3cfcb SHA512 fd693965bb896b61c68b35f58c5e12d68115c3d6f5e544d26caa1a034a152530d505057c5228bf23dc410b450824265f1aa5090ca6335170600a103d394e0ce2 WHIRLPOOL 0ecd5f5a4509c225f75fcd1c335d01ee7c25d39718c5ced78919cc97e69d65518d9419c5f19527f39a4e3fdcab8120d9c1381107d1093902e9ff8f7026924b60
+EBUILD python-heatclient-0.2.5.ebuild 1864 SHA256 48a183d286ee7f37702652a70bde9874422baeb59f833709b24b61c36902ac52 SHA512 bce0018e0b2a50f78836e6e37bb148b97ff33dcc313842f4b1791ad23a55b0a1c9bd39f9dbac9608ac2dd727f7b4f7d959303b639f4719b673fed1b8c891e12e WHIRLPOOL 6508405c499702174f7e9854f8f7f923476a4d01fa1301a0dc8b9ba30cd1190330a09c4aa826ee5e6a6ebcbdc81560995bae898ba82a994daff0499678e1eba5
 EBUILD python-heatclient-9999.ebuild 1729 SHA256 3d439fe6c4ecbc5e463e922a0085e844ab56f64bcc3cb3cc325daf3517ecfafd SHA512 dcae2f472f5971100295103b953d0d86f61e725e66d35315d287b367a14e06ee7d53c9ee772d6b8ba29096dc3e1acd94b833873488ab886216f594882c5ac2af WHIRLPOOL 2fd116e097d6482b4c5178ca61e201a7d98872411bda57ec1991d8d4e09b82d69b0a7a5692c101ca0f41526e5e663492cd04a9297e7fb81a682a8f1858539296
-MISC ChangeLog 1017 SHA256 a46bc1c44e3b4ba971d71e83d4823d8b0d796cb6f21188599634b24ec20242a0 SHA512 7aa00b3a5065b06059baf644d44e4e1fe0c4897f351e45ef7e5740b086abd838617bf1afd0221a8dc2634888b2b1bdc1672b255ea9552f2449ecc82e2977e636 WHIRLPOOL 20a29149228e721b9e0188ffb487a8b0c0deb233a9d8501884db7c18393b1fca43aef51ba70ac100b86e7eb746296bf1c54c27455af95e6a090f8d12b3b1942a
+MISC ChangeLog 1224 SHA256 44e1c914a520e0ea9f9af6090c6d862e4519fa2adc135f5deb96fb7a02b3f0cd SHA512 74d42687fe150505ab8c2e913f314e3d392fe7486a4417a37eb049c7f8adfba3fcc44e4af5deafc7d98f22838add01b0024bdc5a0cd5faa9db053412b07806fd WHIRLPOOL 74e9d5c7ffd9b53f2ad202ddc3ad135ac54bdaec91227469a673a4dd6e8c138ed334163c4f08713cd1ae51b518e7de932208e79239f89b5fe6926a1aa3901a75
 MISC metadata.xml 372 SHA256 24f3c325fb555376255f0c1236891bdae5bbf6333dcfb139a594491d49392997 SHA512 187f67e4c02db7d99a53eaac30787265611100ddaa0ea9bf9aefd2552581647c54f15f3a7ea51d5ec013bd907ded3c7d92ee728bbf5e91211bc1ab305ae5e133 WHIRLPOOL f5136fc137f9046aee9807712d4db107fb14a29706253d17d0d21ce6a61928ad97072df5c34796bb41604b358119fc19975fec6b7cc5f2b3445cb8c2a0bd1dc2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSM2l9AAoJECRx6z5ArFrDWOMP/iZRn7KfjccngIIXGEntJ/+f
-x1uQhWV+xD8zm7epZuKmhyyKSq9DX2wooaNcpsybNvJOfgde8Y/oO3PASlXNVn1N
-Ajgoyh+4H7i0Kot5DrBNjV2UdHfpbePF8TWc/lyLN9p+UUHbPVVKwMAT5BZYUdj6
-PPzqP/P3KOND4evLlhGIYYFA1MWp4K/7rjzbIm4ZG7GDKTQgKbHjINSToVDKipwX
-NrVi8GU3tvlliJJDI9/yTm5Oc1ubQ6nF4XSEqYCfulFDOJ6wXlRCnoji1gu7mPY0
-oSRdDkld1e8gBI1nDdQMvxiKk+uqhDftCNK5vlHdLobArTtqy9iJwPrARKXIWfVY
-1deXXS0INawLf1YwAxyHmjcmPQbPxt1MqO4YLRLapzd0Q407bb3fJAn8lARRX/xW
-ALgymBOWPkX4Ko9ab3pQJtIDdYlow+bkjhE5PE4xZAb5OOy6s7lRz9XBWRqjFjex
-MRoubybXa4MBeDr/crPp/2SAHGu3djkQs3+Sz8FfOeI5OtWKEDA8NB29g5AZey3/
-++ZRHQ2tnaZmHGXOjp3XuaI8U+9+cUh/+R7nEQuaWrj7BMh+4ITzv1BmRxNgLiG4
-Z5z9yJvh+wdqoZ9pjqqkNkCL7UQfRCAvxq1bG2nSZPzYhM68ZY2sl79s8ZRrlldZ
-h14EY2l88fxFnLjZvBCE
-=/xzU
+iQIcBAEBCAAGBQJSZ/ktAAoJECRx6z5ArFrD1RkQAJdLcy+1z8lWSnfIjiGjNNE8
+DEzCvoZfIuqHYzSLjcEULyboDMqyko5Utv48OuUQYiK1OJgy+c/LoDh7RSwU7RnU
+yernD/gnVHi83hKn4j9NWrOOdO2Q9ji8lhQvZ7FzGCY3nkJQj7IjX8SujxhllaYj
+g98t3fDELAung6RO6z3fWtFeDg6SexUS4pJHmJRYEsbwYPgSNIX1iotmljXUJLoe
+OJJL5c10hN0FgQiLPBg6Q0TiVLrJriyuMolTVc7RUs1wlAAi5tkMeUzSU3xtnNdJ
+Bj232QYukh6CmTSJvgIA5KuYaqDxp0xrHhFG14EviIFznG9uZ5oUFV/5z+1juaaq
++0WatfQp/aJsof27GzQfIAkh1wCVsUFCkbodzy/C8EU8z+iTyBQxWaUg9QFLfKe1
+4Ty7TF+NIwHTFY7fzLknVw+070xp3P5lQymicUvKs4qD3cBAvQfcOY8rEJakc3Nq
+I+R7v8Pt0in+J+MFLpFMFTToACpDE4o1cSRLyEmwntc+BmPN8+S8GVdz+H2wP7Xr
+ac1zKnzniLlk05lTdfzU682ZpY4/mxMshlrhSVGAjvS8wN0q3odF68RbRjE9a7B8
+/wSq/3Iz/gi7r1/vcRQvmo9XwXPO8qMshdizxMe82Sa1F1Kd7Ha58y2wfkncIG8l
+CuZjEiBWHq04nqqmPp93
+=5swo
 -----END PGP SIGNATURE-----
diff --git a/dev-python/python-heatclient/python-heatclient-0.2.4-r1.ebuild b/dev-python/python-heatclient/python-heatclient-0.2.4-r1.ebuild
index eb9a1181daf7..31589635f124 100644
--- a/dev-python/python-heatclient/python-heatclient-0.2.4-r1.ebuild
+++ b/dev-python/python-heatclient/python-heatclient-0.2.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-heatclient/python-heatclient-0.2.4-r1.ebuild,v 1.1 2013/09/13 19:36:04 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-heatclient/python-heatclient-0.2.4-r1.ebuild,v 1.2 2013/10/23 16:26:24 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -18,29 +18,34 @@ KEYWORDS="~amd64 ~x86"
 IUSE="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/sphinx-1.1.2[${PYTHON_USEDEP}]
-			>=dev-python/setuptools-git-0.4[${PYTHON_USEDEP}] )"
-RDEPEND=">=dev-python/pbr-0.5.16[${PYTHON_USEDEP}]
-		<dev-python/pbr-0.6[${PYTHON_USEDEP}]
+		>=dev-python/pbr-0.5.21[${PYTHON_USEDEP}]
+		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+		test? ( ~dev-python/pep8-1.4.5[${PYTHON_USEDEP}]
+				~dev-python/pyflakes-0.7.2[${PYTHON_USEDEP}]
+				~dev-python/flake8-2.0[${PYTHON_USEDEP}]
+				>=dev-python/hacking-0.5.6[${PYTHON_USEDEP}]
+				<dev-python/hacking-0.7[${PYTHON_USEDEP}]
+				>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+				>=dev-python/fixtures-0.3.12[${PYTHON_USEDEP}]
+				>=dev-python/mock-0.8.0[${PYTHON_USEDEP}]
+				>=dev-python/mox-0.5.3[${PYTHON_USEDEP}]
+				>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+				>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+				<dev-python/testscenarios-0.5[${PYTHON_USEDEP}]
+				>=dev-python/testrepository-0.0.17[${PYTHON_USEDEP}]
+				>=dev-python/testtools-0.9.32[${PYTHON_USEDEP}] )"
+RDEPEND="virtual/python-argparse[${PYTHON_USEDEP}]
 		dev-python/httplib2[${PYTHON_USEDEP}]
 		>=dev-python/iso8601-0.1.4[${PYTHON_USEDEP}]
 		>=dev-python/prettytable-0.6[${PYTHON_USEDEP}]
 		<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-		<dev-python/python-keystoneclient-0.3[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
-		virtual/python-argparse[${PYTHON_USEDEP}]"
+		>=dev-python/python-keystoneclient-0.3.0[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]"
 
 PATCHES=(
 )
 #	"${FILESDIR}/0.2.3-CVE-2013-2104.patch"
 
 python_test() {
-	${PYTHON} setup.py nosetests || die
+	${PYTHON} -m subunit.run discover -t ./ . || die
 }
diff --git a/dev-python/python-heatclient/python-heatclient-0.2.5.ebuild b/dev-python/python-heatclient/python-heatclient-0.2.5.ebuild
new file mode 100644
index 000000000000..b5dbf8a693e0
--- /dev/null
+++ b/dev-python/python-heatclient/python-heatclient-0.2.5.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-heatclient/python-heatclient-0.2.5.ebuild,v 1.1 2013/10/23 16:26:24 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="This is a client library for Heat built on the Heat orchestration
+API."
+HOMEPAGE="https://github.com/openstack/python-heatclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		>=dev-python/pbr-0.5.21[${PYTHON_USEDEP}]
+		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+		test? ( ~dev-python/pep8-1.4.5[${PYTHON_USEDEP}]
+				~dev-python/pyflakes-0.7.2[${PYTHON_USEDEP}]
+				~dev-python/flake8-2.0[${PYTHON_USEDEP}]
+				>=dev-python/hacking-0.5.6[${PYTHON_USEDEP}]
+				<dev-python/hacking-0.7[${PYTHON_USEDEP}]
+				>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+				>=dev-python/fixtures-0.3.12[${PYTHON_USEDEP}]
+				>=dev-python/mock-0.8.0[${PYTHON_USEDEP}]
+				>=dev-python/mox-0.5.3[${PYTHON_USEDEP}]
+				>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+				>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+				<dev-python/testscenarios-0.5[${PYTHON_USEDEP}]
+				>=dev-python/testrepository-0.0.17[${PYTHON_USEDEP}]
+				>=dev-python/testtools-0.9.32[${PYTHON_USEDEP}] )"
+RDEPEND="virtual/python-argparse[${PYTHON_USEDEP}]
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		>=dev-python/iso8601-0.1.4[${PYTHON_USEDEP}]
+		>=dev-python/prettytable-0.6[${PYTHON_USEDEP}]
+		<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+		>=dev-python/python-keystoneclient-0.3.0[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]"
+
+PATCHES=(
+)
+#	"${FILESDIR}/0.2.3-CVE-2013-2104.patch"
+
+python_test() {
+	${PYTHON} -m subunit.run discover -t ./ . || die
+}