From ff99b1a6deb375f607ba06605673d870624650fd Mon Sep 17 00:00:00 2001
From: Matt Thode <prometheanfire@gentoo.org>
Date: Wed, 22 Apr 2015 21:06:16 +0000
Subject: [PATCH] bup

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x33ED3FD25AFC78BA
---
 dev-python/python-heatclient/ChangeLog        |  8 +-
 dev-python/python-heatclient/Manifest         | 31 +++---
 .../python-heatclient-0.5.0.ebuild            | 98 +++++++++++++++++++
 .../python-heatclient-9999.ebuild             | 81 ---------------
 4 files changed, 121 insertions(+), 97 deletions(-)
 create mode 100644 dev-python/python-heatclient/python-heatclient-0.5.0.ebuild
 delete mode 100644 dev-python/python-heatclient/python-heatclient-9999.ebuild

diff --git a/dev-python/python-heatclient/ChangeLog b/dev-python/python-heatclient/ChangeLog
index 433365ac8257..9b2f63f7d448 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-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-heatclient/ChangeLog,v 1.17 2015/04/01 19:05:11 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-heatclient/ChangeLog,v 1.18 2015/04/22 21:06:07 prometheanfire Exp $
+
+*python-heatclient-0.5.0 (22 Apr 2015)
+
+  22 Apr 2015; Matthew Thode <prometheanfire@gentoo.org>
+  +python-heatclient-0.5.0.ebuild, -python-heatclient-9999.ebuild:
+  bup
 
 *python-heatclient-0.4.0 (01 Apr 2015)
 
diff --git a/dev-python/python-heatclient/Manifest b/dev-python/python-heatclient/Manifest
index 7c23c0781802..d356f34922c5 100644
--- a/dev-python/python-heatclient/Manifest
+++ b/dev-python/python-heatclient/Manifest
@@ -5,27 +5,28 @@ DIST python-heatclient-0.2.12.tar.gz 99919 SHA256 e9d5b74206b322ce30184a1b132a78
 DIST python-heatclient-0.2.9.tar.gz 81470 SHA256 8cc6d99f86529633b8b5d99417358fd7c023223572f190ae3e1da09ff435420f SHA512 05fc3a5ff8e738fdc3ac2c5d8221c9be932467aa9109e1138c4a96053f7e68d8ba77b13f50968f05a37e94b60bd5ff2e798faf0c5b145ae80c2a0a6f7f68313a WHIRLPOOL 1c77ac1329c6f5dc1c207670d5864ea44046d6a0686b12c373ad2a26560999fc0bdc011b8efaf431f9c6f5379d19eb9bb65b68fb08a7297f12ec6e0313ce1846
 DIST python-heatclient-0.3.0.tar.gz 95621 SHA256 c3fe26b69610dcd1540f5ab2c8ae59183c3df09d9ede52a5bb704977345f29ad SHA512 f550e785ce21e1a1ad8dedfb1fc94bdaf4e0d9b5902c05a704b73c72e3e49ac6e35f79acbbc8ac511bca329d5032f796447899dfa737da0f7b8b376e5983153a WHIRLPOOL 9a02d508401600a659f552d2c7b46d7a4c94500514ff3763bd47ecfefa2fcc89cf49b20bbfbdb859a04fe4c719bcbdceb29d15cc793f631c89192a03642a2b3f
 DIST python-heatclient-0.4.0.tar.gz 104613 SHA256 1b71e2bb5c380ac6b2e1f07b48b7b3e82e7364cc43255ed696c795ab5f8d5a1d SHA512 f1235e40d6407fc05f53dfa1592d4f1fa72c10c6aa17fcbb78a7a8bf999cf803f4a42f9f7672f403d336006bdb72f3960d849474c398e592085f1d637a28faed WHIRLPOOL 680af36f92f9674667cf1ad97167248e3b30b4fc828065bd9f2dd7ecef4fd7dcd03729c5d257d8f31ce42184764bcea1d4c4aaee37d53ac63e1e44183c694f84
+DIST python-heatclient-0.5.0.tar.gz 104320 SHA256 b64eadecea1ecab5b69c1f51ddd157d53d218dea1360c201843f28a052cb3dbf SHA512 97ac1bb3ef1ca82730650e42dffa5dec2f1f37fac63c38a8c2de87b2ccf772b905749f4e9211831ec92871ebaee57a5094a4a1005e7391823a6dee27b0592dd8 WHIRLPOOL fc90b7a21d70c9044cdb39d626584192dcc347f531f0dc83b5b349d8731b7e3e0278586f5dcec32d9be10d02a6a6cb53175c6088fc43857b9b874a979da77de2
 EBUILD python-heatclient-0.2.12.ebuild 3899 SHA256 2d80aaae041ba50fc091e3616349576c4456462633cb8b56c366a85a81d1c9c7 SHA512 35752c72f11299803e1beac47ff470fb6f32fd5454620b3091846cb4ace8463e96b80bc5349d14935adb8066bc109c24cbd56191156d9e0b8762e3ad5c3798bc WHIRLPOOL a5abaec8edd20cac23e258cee084090342d1f8950719bee931d52b26d763e209d340c98a001361c66be4daada3c09b812688adca1e2800a1a8ec5463413eda18
 EBUILD python-heatclient-0.2.9.ebuild 1980 SHA256 890286bf3a8dddd3a9e96866077a3bab607a83f8fb175166a7c2dbc1a18a1f1a SHA512 2da5ec0f11f2b103cf01421bfe3232deccc16569562c36abd2c020dabfbe9aec4077bf04132aac9fbb82430dbaaf2c11c8c5509127a1dc635b63340a5c9a176b WHIRLPOOL 2bbe4cc47653b6056b940461cc54d087736aefc0b6989bc55080e0c4d02e5b5a32e889d8bd6f5767b289cfb6809f50fa2d40218f9f41024e15120d05b01eeaad
 EBUILD python-heatclient-0.3.0.ebuild 2927 SHA256 8f476fa84f626b93ba1f889f4036997834f8629feeb4cfa100e5fe49666ed996 SHA512 f491ca2e5a00316fc86118ca6eb72d2e137ddc5d54189b1c902f8d1d4fdea4b4d0f4b39a8aa39a1ff03752210d389d3cab79475c4792e76b53657159a3bb03f2 WHIRLPOOL 8f309c99998bbe49ecc8b4bab364fd14f996eb210c8613806aac2d07037228ceef91374531daa820612ae9628ce06462035deeae3fbd09c84dce9266990d7b86
 EBUILD python-heatclient-0.4.0.ebuild 3198 SHA256 010c7eddb4ce3deed37aca75d665a411f44f056f6c2220dbb0cb737a8a68ff51 SHA512 1ec0256f974711a0e95fe9aa6f609f74d50c124ba1502a7001622dee95fcf32e9c619d7dfb667f336e79f0cb64ce25bb0825f1dcfb7ff0fe361c3a1a3d5520bf WHIRLPOOL 1819911939b1f3d637eea39e2cd6de69eca2178e738773e4002754121d246443d6b8d6ef89e1eef41f8aa74ef8cb36c22bed7190c96beab279d1e5e547c70a69
-EBUILD python-heatclient-9999.ebuild 2462 SHA256 a205122039ab98aea8a9b9a3a77715e9b4577a931e7a54876f1db76c53c88969 SHA512 44b8a3b8b00740102763acc5de15e109319a5bf7be3e9ccb97f4214a6a4091f5d2593299c347fcf574e1dd3e2e628a00704f45f48b110cbcf42e76e9039d0cc8 WHIRLPOOL b5daae996a8acdeefa36f5ee6273f737ecb79218532f6a74d4920e574c001eac2cec044cdd87df040cf8b0509ce39dcd4119b2de4f29eb1fd782eb88cc10c5b9
-MISC ChangeLog 3359 SHA256 1a47120fa18d6437e0bc6199969d4cb1575b652dc48e5b24f771fdd010c143b9 SHA512 198a3606c379f6bae9d32fc6d033a9ed281bf40e1091236d548fe54a57a62347d64b0246dbc8c2280d6a748a28f29e1afde5ce9aca184220d1bb97a51c77b6de WHIRLPOOL c416676be3d12e2e35aa33348a2d5acbbfda46b1aac546d84dfd5e2d7816025b2df443d3a9f93b25b864046c149ccc8d0f0206162e0d7926025ffd6ea56a1167
+EBUILD python-heatclient-0.5.0.ebuild 2999 SHA256 4b0e85af99142d0e6c9b86f95b6ff6ac4b4911f355ed2afff8b8ae34be4e1867 SHA512 254996a4f6628b9ebe3087b500857ed7d5df1a782df17d5d09da6477b81cf5224e7d93ec97f3fee78f8268722a7bf7d9e9698523cea1d4d23f4f8b843732052b WHIRLPOOL 9708b26a23436c0111d19fb8453583ee7aac020512ed35ee51c97a55e50f5b261f59c7b787e13bdfc561f89abf6027d48ef94c2da045a517f8d30d782e979230
+MISC ChangeLog 3530 SHA256 fa80cbba7e08c2059b1c3309530db5eefa1a70551babab8b971b04f1cefcddfd SHA512 c32a7419f014f12f23a0bebab95b9d321dffa464a9fe9287a8c76c2c598af57d476e9ec04794a1de93f6dc8772a48a49a5a786f720021a3880c869622d472a7e WHIRLPOOL 2597251328c6064a850201289228058b5bb8d2ae2a314576852129840409f8d96e433eb4d87e904aa9395f5cc2b245edb0674eab4c70f8380858d09d46d5124b
 MISC metadata.xml 397 SHA256 8c43bf1f2859a65a1abbf67a39f8fd9673eedbc52366131a2082920d6759b2a5 SHA512 18358c69fb98c9448aace7363ca6f784fbb20e430a7c4c89bbdda67a5105f5ca7c8aac4f795ec2e9c19c03d8c607fad6816ec2bae76c14d64d4d45c0e721a9f2 WHIRLPOOL a4b0c1febc9961406bef32383705d9b0580e6948d3e23c7fffbbd7d5dc931a2e1593fd22e925e21381eaabcdf143ba76bbf12152ec11a8aaf4ba5bffb5fd0749
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVHEFtAAoJEGSje+quGaToKTUQAJEeDTEEwBItgF/I/s/DEdTH
-reuJhWAUKShkK58O2ckWaX/HavA2y95Fbw2CsJaOE2lU8q3VsjIzQkLuJhO2pS0O
-DuAP+q3mMNCfp3bSPBWAdf9nEV9+wJCtcr2noT0Ad95G9OE3vYncvOFvD5j4iIDo
-olHE51fNhFlIFuIxXd+kSP3GiEHTyDb8uJ/Vn3GtihWY+LM7KBNu/HKx2tYhW302
-AI0KLPQ1NqPydzmCniRi4ZpIgL+fvrRjKhuzCTG/r4LUBMa7gbF/hXBPY/aYebIv
-6i2M0fqK39f5IYWRwQQOf/zcfDKgADyb+AKOjsEvEjSaujCR5O0UjrMsJ3nT+vw/
-ALF2n+urjJMXE7qyO5DZS+xc+PM0BLErD+c2ljJPXAMgHkolIxvo1RMxzSxQll0w
-WaSvH7uuSkWmzPXDQ8EufHDu2HMt1Ur/3M+OygTXAIG98bOqquYnDAZwiB1d9FDf
-6tqe49S7ZwrQirZ9/rqxffeVEnq//2mKbXzAjFJ9iZT4IBg+/NLFiKjsD06eEbdQ
-PyvokzUGMb7QBjgMhaqgvZWzE0yJe956mHx7dOtVH4FWxDy3GS9F/tZGrb1fDCHN
-ugGuZblkPLkMBDygBAgtBqF2muXWiFqnK21Kh29NWWn5qIbvau9iiKQTon4tTSlw
-cgoHRmnlswP2jhZapWD4
-=6DjP
+iQIcBAEBCAAGBQJVOA1SAAoJEGSje+quGaTozncP/1GIcL8HPVef4mXTPQwG5vvj
+njyxNguW6O7Hox33xG4hcapkgfN20IlYfm53JNciNUF57hbRV1cI1OkqAb06spQR
+J5XsJdjdfQ6ybUPVZg1Cd21bDKR6kS+gZGQOhdyQxtLS2PxY+2MZJBNppxwica9a
+wAOp0/vGMmcabjpU8aPJiCaSPTfIiIvvFr66HTLWD3Jc6MSyyuezljmWmimHvRs4
+2EZIkUr8jm60f0kpRLS1cdzbz8YX9VyhJEk5vuKuSdw/VA9H38ZyrDW5ZVnYbGpS
+OnEFHQdhTWb8gpRgbIvXjx63Q7gMnL4twfouHGvmk+duV4qOjnxTWQ8425ouHrq/
+w/s2XW/AjhHSYtXvf3GIX4DzoS0c43C33kOv3p1JhAHnxTKh63c1LfHOSPKNwRuS
+z6JrXrikI8p3GycN6B2jdLbIy6kQwlxAQZKwsuB3cq+NwQwtwa+m3KY0mnxhYDxb
+P+XYQkIuF6qwSU+vWHMCyYq+U0O2yssJ0MOMinScFBD7ZzcbizG4GP6/AAeGhE0h
+crsCLy6+g3CEl+PYyVqmFjw1Gas4IfjevxlYLdqPsw0ZMrbs3TafHBtDjSdpC7lt
+ySzQ99t68dIkYoHUGKhbGfKbY/x6IrVjDVtbqPE9CuKo8icFSN0uI1ELx/PODOQz
+oEUpHaMNlVxLybEB2nYb
+=3U0F
 -----END PGP SIGNATURE-----
diff --git a/dev-python/python-heatclient/python-heatclient-0.5.0.ebuild b/dev-python/python-heatclient/python-heatclient-0.5.0.ebuild
new file mode 100644
index 000000000000..73304c6f4d7c
--- /dev/null
+++ b/dev-python/python-heatclient/python-heatclient-0.5.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2015 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.5.0.ebuild,v 1.1 2015/04/22 21:06:07 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_3 )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack Orchestration API Client Library"
+HOMEPAGE="http://www.openstack.org/"
+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"
+
+CDEPEND="
+	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
+	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	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/requests-mock-0.6.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
+		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		<dev-python/oslo-sphinx-2.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}]
+	)
+"
+
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7[${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/python-keystoneclient-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.1.0[${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}]
+"
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	# BUG: https://bugs.launchpad.net/python-heatclient/+bug/1313257
+	ebegin 'patching heatclient/tests/test_common_http.py'
+	sed \
+		-e '645,/def/ d' \
+		-i heatclient/tests/test_common_http.py
+	STATUS=${?}
+	eend ${STATUS}
+	[[ ${STATUS} -gt 0 ]] && die
+
+	# BUG: https://bugs.launchpad.net/python-heatclient/+bug/1375035
+	ebegin 'patching heatclient/tests/test_shell.py'
+	sed \
+		-e '2116,/def|@/ d' \
+		-i heatclient/tests/test_shell.py
+	STATUS=${?}
+	eend ${STATUS}
+	[[ ${STATUS} -gt 0 ]] && die
+
+	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
+
+	testr init
+	testr run || die "testsuite failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-heatclient/python-heatclient-9999.ebuild b/dev-python/python-heatclient/python-heatclient-9999.ebuild
deleted file mode 100644
index 269fb9620478..000000000000
--- a/dev-python/python-heatclient/python-heatclient-9999.ebuild
+++ /dev/null
@@ -1,81 +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-heatclient/python-heatclient-9999.ebuild,v 1.7 2014/09/28 23:16:33 alunduil Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3)
-
-inherit distutils-r1 git-2
-
-DESCRIPTION="OpenStack Orchestration API Client Library"
-HOMEPAGE="http://www.openstack.org/"
-EGIT_REPO_URI="https://github.com/openstack/${PN}.git"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS=""
-IUSE="doc test"
-
-# NOTE: dev-python/discover is not used in tests
-# 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}]
-"
-CRDEPEND="
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-0.10.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-1.2.1[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.4[${PYTHON_USEDEP}]
-	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		${CRDEPEND}
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/hacking-0.8.0[${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/httpretty-0.8.3[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/mox3-0.7.0[${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}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	${CRDEPEND}
-"
-
-python_compile_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 ${EPYTYHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-}
-- 
2.26.2