update live ebuild with python3_3 target

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

3 files changed, 68 insertions, 39 deletions

diff --git a/dev-python/python-heatclient/ChangeLog b/dev-python/python-heatclient/ChangeLog
index 55a533349a7b..bfa0ef79e185 100644
--- a/dev-python/python-heatclient/ChangeLog
+++ b/dev-python/python-heatclient/ChangeLog
@@ -1,6 +1,9 @@
 # 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.14 2014/09/28 23:00:16 alunduil Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-heatclient/ChangeLog,v 1.15 2014/09/28 23:16:33 alunduil Exp $
+
+  28 Sep 2014; Alex Brandt <alunduil@gentoo.org> python-heatclient-9999.ebuild:
+  add python3_3 target
 
 *python-heatclient-0.2.12 (28 Sep 2014)
 
diff --git a/dev-python/python-heatclient/Manifest b/dev-python/python-heatclient/Manifest
index ee48dcbae6bb..df183fbabea3 100644
--- a/dev-python/python-heatclient/Manifest
+++ b/dev-python/python-heatclient/Manifest
@@ -5,13 +5,13 @@ 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
 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-9999.ebuild 1948 SHA256 6ac0fadc6db59041969beaa48b2273d693a0b46bcfbc1ea2c7697e3a8dd39640 SHA512 2a02969731b517c981194aa7904ee6de022cd429af39f5f0e872c1f0734d97f572204afffb6d7e805de42f88e05dca8a4389eb121023ea6e7319e812ca90f312 WHIRLPOOL 412456c898a8deab3e00fe26bacb66126390d73e35d166da8967f5a9f4f821e840513135dd737a804e8119e79e37d190a25eb0236839ae0eba117c38cc97d871
-MISC ChangeLog 2965 SHA256 979e3d4da8587a62ba99af8e59c91cc48f1f9bddb97d37a0c7aee40842a1b28f SHA512 7bed59ecec817949e32bdec024465b5a04966568c14b8f036cb682c312e19516b7eea418c02693d75f1e8083dbaf20b460de850b47e7d34f4ef9bf00c372a4d1 WHIRLPOOL 8db944bf035773cbb26b8e539c337fc158efb1d94e9bf0e338bad8573c17808392054f58448ea85c8ea28d8fc6dbb91142692e1ba0473faeaf0386b12e5b6dec
+EBUILD python-heatclient-9999.ebuild 2462 SHA256 a205122039ab98aea8a9b9a3a77715e9b4577a931e7a54876f1db76c53c88969 SHA512 44b8a3b8b00740102763acc5de15e109319a5bf7be3e9ccb97f4214a6a4091f5d2593299c347fcf574e1dd3e2e628a00704f45f48b110cbcf42e76e9039d0cc8 WHIRLPOOL b5daae996a8acdeefa36f5ee6273f737ecb79218532f6a74d4920e574c001eac2cec044cdd87df040cf8b0509ce39dcd4119b2de4f29eb1fd782eb88cc10c5b9
+MISC ChangeLog 3069 SHA256 45e61ff10512f6a3d1f49af2d0b93604709c69913e509a946767a14dcb0fcf9f SHA512 ce771766c3d9767803f6b252c877187b5c3cf1f6977ad37622acef91e10b425566f4b8fa0ce8fb4420888570c5cd4827ff3610d61e3a729f79748f8f7519c5ad WHIRLPOOL 65df9761d3fed71c432485eb118663ffdce2b0dc54382a96560adbb4899d42a631179adcd12e4683006e475101d62f5a7270ed93209a96a42dda5e3e12321c5e
 MISC metadata.xml 397 SHA256 8c43bf1f2859a65a1abbf67a39f8fd9673eedbc52366131a2082920d6759b2a5 SHA512 18358c69fb98c9448aace7363ca6f784fbb20e430a7c4c89bbdda67a5105f5ca7c8aac4f795ec2e9c19c03d8c607fad6816ec2bae76c14d64d4d45c0e721a9f2 WHIRLPOOL a4b0c1febc9961406bef32383705d9b0580e6948d3e23c7fffbbd7d5dc931a2e1593fd22e925e21381eaabcdf143ba76bbf12152ec11a8aaf4ba5bffb5fd0749
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlQokwUACgkQin3kvZL+oosC7AD/S4uiyVU9xR+U1knrVSL2URO7
-fd90fmORdQy7Go85fQ0A/ix3ojK1VLPPXTws2QEfrpwfFH9xNZVHx3uFe9JNh/iN
-=XgV+
+iF4EAREIAAYFAlQoltUACgkQin3kvZL+ootJyQD/VGfnJfjgd8ANwxVw3ocnpiA4
+G8uz9Wmfei2VCxYIKT4A+wZaeWenSUdLWHKbKPUe4/VAsdgAldxPaUeHGXnMOGd2
+=Sf8/
 -----END PGP SIGNATURE-----
diff --git a/dev-python/python-heatclient/python-heatclient-9999.ebuild b/dev-python/python-heatclient/python-heatclient-9999.ebuild
index b4583687dcfd..269fb9620478 100644
--- a/dev-python/python-heatclient/python-heatclient-9999.ebuild
+++ b/dev-python/python-heatclient/python-heatclient-9999.ebuild
@@ -1,55 +1,81 @@
 # 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.6 2014/07/06 12:47:58 mgorny Exp $
+# $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 )
+PYTHON_COMPAT=( python2_7 python3_3)
 
-inherit git-2 distutils-r1
+inherit distutils-r1 git-2
 
-DESCRIPTION="This is a client library for Heat built on the Heat orchestration
-API."
-HOMEPAGE="https://github.com/openstack/python-heatclient"
-EGIT_REPO_URI="https://github.com/openstack/python-heatclient.git"
+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"
 
-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/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/testrepository-0.0.18[${PYTHON_USEDEP}]
-				>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-				>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}] )"
-RDEPEND=">=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.7.0[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-		>=dev-python/six-1.5.2[${PYTHON_USEDEP}]"
+# 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 && sphinx-build -b html -c doc/source/ doc/source/ doc/source/html
+	use doc && esetup.py build_sphinx
 }
 
 python_test() {
-	"${PYTHON}" setup.py testr --coverage
-	"${PYTHON}" setup.py testr --slowest
+	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/source/html/. )
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
 	distutils-r1_python_install_all
 }