Clean up the ebuild. Add a dep on mercurial, and use-deps on other Python packages. Enable more implementations. Fix running tests. Add Python team as a co-maintainer.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0x42B9401D

4 files changed, 38 insertions, 37 deletions

diff --git a/dev-python/hgtools/ChangeLog b/dev-python/hgtools/ChangeLog
index 4e235766816a..690d623b081f 100644
--- a/dev-python/hgtools/ChangeLog
+++ b/dev-python/hgtools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/hgtools
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/hgtools/ChangeLog,v 1.4 2013/01/01 08:12:01 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/hgtools/ChangeLog,v 1.5 2013/01/06 23:07:24 mgorny Exp $
+
+  06 Jan 2013; Michał Górny <mgorny@gentoo.org> hgtools-2.0.2.ebuild,
+  metadata.xml:
+  Clean up the ebuild. Add a dep on mercurial, and use-deps on other Python
+  packages. Enable more implementations. Fix running tests. Add Python team as a
+  co-maintainer.
 
   01 Jan 2013; Matthew Thode <prometheanfire@gentoo.org> hgtools-2.0.2.ebuild:
   update to eapi5 and distutils-r1
diff --git a/dev-python/hgtools/Manifest b/dev-python/hgtools/Manifest
index 3f736d9b062b..15947405615d 100644
--- a/dev-python/hgtools/Manifest
+++ b/dev-python/hgtools/Manifest
@@ -2,23 +2,15 @@
 Hash: SHA256
 
 DIST hgtools-2.0.2.zip 30635 SHA256 bfa82ccfea56b178c9f28cb719cb97853710880b207e0a32801ba1077757da07 SHA512 5173ff7e0e42657058731cdb3cf9c2fe7cbd378d026321be62e937c57da637fb79bbdc6b2c91df06f1c93854c253f77621c0a5b91a7df451d68ea72da6f25266 WHIRLPOOL 5f33ab464b72165948e8e568f3b3e2f5b364b14bc65ff9311906d0aafced74505d974f28af1241b963b6772cf770f544c77df2e6665376da86a41f83db9b349b
-EBUILD hgtools-2.0.2.ebuild 724 SHA256 084f1c2c5aab5c661777b0b0b749ec9dcb4afbb4184533e8f9945f710b854c90 SHA512 44d52917c4989c146cb7d44533eab7a80f6e8d8d44062fc118f8e2bbbc49aaea2dd605a66154b7d74b4f6119034578786e58752d5c3804453e551a02163482a4 WHIRLPOOL d4fdd56349d1105a885e7ad634ce592af3d257050bb9c1cbf6c71595245f2beb21eb70a3c5479a9b3ef377e2e47052889e9de228c7537d656528b76f9f527077
-MISC ChangeLog 787 SHA256 e919308588f69c0552f32309940594746d70897736439ebc856349c51c45af7b SHA512 1af057aa6d524940c3886fed4ed60713a86c14b844df70c1cb697638d5134b73971c7f1fd99059bb8a1b79a18957d0b0de21663479b8168f2b82fd39aad817d3 WHIRLPOOL 23afc3a0a09d5ef6d5a7bfebb6677760be0b6ac894cc98d88aaa3ac3544c29e4f147b6dbc6beb3312ecee492ca7fc454c2c340bd36f660a10ae7660af5b383c7
-MISC metadata.xml 806 SHA256 068570f7282f634dac607c8b06bfe7398fb4205d05bc08e9578f05ccc08a8606 SHA512 038ea69a5b172a0cc6c41b58fac31c71a237d9b8ef965c58f48729966e9ebe8ee5de8906bdcc48ee234a90b06d5c1f6ed3514fd5a6b4fd37615f2750223bd4d6 WHIRLPOOL 9daa9a14576b44bac571e7b1d538431043bf22f984d331bf5a5d12cec7c9b90cb32731ff609d83aa06fe24b73a4b793f1498f6da4d9717eb454f84756de2ca68
+EBUILD hgtools-2.0.2.ebuild 782 SHA256 675190853d308305d0dc4dca1cbb286d31baeecd611dbedf6d1573d236750348 SHA512 f915318409cb3d73f0dc4d9c077fcaf7b0c628d0a1efb930479adcf0d8ff65222f589a870c7aa37044c944de1eb99cf213327068a2c6a429f381c3d755df3e13 WHIRLPOOL e28a03842056e1d1db66e68fc4274e65c169ec26d493ba802229e402f68bdf9427ff13c52a27034636f6b14108c47cb9742c7b1fdb20df1e366e4648e8ba5225
+MISC ChangeLog 1042 SHA256 d9e0d56fff1fa7fe80443512b2ebc3b8317b7f585d0d6b59c5aaef491436a047 SHA512 98b17c2eee2090a0da23c1f8ccc980afca28e77ad7ad38ae59f0ce41d7272985038734fcfacfecc23a931cc887afec64624ed2b211921bdd6ea14ebeee369200 WHIRLPOOL cbf69b1ef26d351d8531ec78769902d84f18e30333ab87a77c5b916b71bcde708ee9776d294c359deb4402451b74b415c1056e17811c3b18de18e16d082befc0
+MISC metadata.xml 369 SHA256 45645fc60cfe2bd6c545a37db51ab0d60363b6de21615ba42bd780db41d41760 SHA512 c1c11c0a19a1d6928b1c0526f29c9d3c53b99409273a3dfa037e3e0661edffb26ea6d02868827f6219937fdea4aec5821fd80b20af09b7fbece44e8ca95fa2ef WHIRLPOOL a30b946e65463441bb65fd043498869c4f6578aacc6e5c2833c224dc21af1b64f3d99f5ef637ec90ab9b23f08abc0924adf2f955cccbef3a24af5a8dd4c280dc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ4ppXAAoJECRx6z5ArFrDJDMP/1rl35tSvzffFAb4u76CMLn1
-zlqG84BWo7mF66rkrtq00q6YQELsfqENqOvwSr34eHPrtnduhsHF1HRffbGAvG5D
-9OuN0pLdG8w5S8wLNiVuv6GHY4uyEovmBPnpuxUva8dxudus8sBWTyjHz+RZNcXe
-ALUrZ5zH1v0qsqEOZHmZ/LyjzU4kr7LeLtM6GvEKWa2kd8H11CQwhDWBtY9OcKoP
-+vUKHpiU3/CmrZk6hapghnmA4F35n0TWnimIs5+cTRe7SXqYGZPOOpwIb//Abz/r
-8XDnj8u3VFNMD3cEgceBpvFTAnwjBKdpU0kjKS/CGbArRbVA66PlZ0kAKR1Z/i6b
-ijNgTuJmgQgBIGrUPC6HukmtBVN8D1YQHlsly9Ii9jQNBtoUHiSq9Nkgfd1YeWme
-M1R92fFxpmyyGsZgGFOD6OhNNe1bJWwyWD2mF0HPCytwWQpAOxmLovUrYTnM5dLH
-yF6UoigmK/yi2Rn1ot5uTGtHby9v9eJeOH7J+mEcMkKtZssFp62pbKGEZGmpovia
-WGLBETMxNooyZVSjsAAM9sMY8IPF3tywCoHcz9qKuKv2UCcsJx5B5xEALNy4JQ3x
-ZsFafYPGoNmEFsekXsNH/Ro4HVMSi0NiBye0Sxu3+9wGUFrzdLVicSVFfhZmqnPC
-VmyrDiymi6EKgdGJ1rXR
-=qUpW
+iJwEAQEIAAYFAlDqA8YACgkQfXuS5UK5QB3QkwP5AeaIJMItJtEqz7NNsfuicpiV
+ckxyp5z7sPSSt2mQ41AJ3mKEpe7GnWpoO4yPDtHjG2Kj4aU/upOyAqO2vdQBOXKZ
+hgrOVakI5yAbcM7uHa4Uk+YnMPhaw8F9fxubgGXHw9sJAmsvkw6yi6GhVGnNCOng
+lD7C3Hel751TWSYH+OA=
+=S3Oe
 -----END PGP SIGNATURE-----
diff --git a/dev-python/hgtools/hgtools-2.0.2.ebuild b/dev-python/hgtools/hgtools-2.0.2.ebuild
index 0e05094ad10c..3dfd06aad782 100644
--- a/dev-python/hgtools/hgtools-2.0.2.ebuild
+++ b/dev-python/hgtools/hgtools-2.0.2.ebuild
@@ -1,25 +1,27 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/hgtools/hgtools-2.0.2.ebuild,v 1.4 2013/01/01 08:12:01 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/hgtools/hgtools-2.0.2.ebuild,v 1.5 2013/01/06 23:07:24 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+# python3.2+: bug #450666 (doctest failure)
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
 
 inherit distutils-r1
 
-MY_PN=${PN#python-}
-S="${WORKDIR}/${MY_PN}-${PV}"
 DESCRIPTION="Classes and setuptools plugin for Mercurial repositories"
 HOMEPAGE="https://bitbucket.org/jaraco/hgtools/"
-SRC_URI="mirror://pypi/h/${MY_PN}/${MY_PN}-${PV}.zip"
+SRC_URI="mirror://pypi/h/${PN}/${P}.zip"
+
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
 IUSE="test"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		test? ( dev-python/py )"
-RDEPEND=""
+
+DEPEND="app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+RDEPEND="dev-vcs/mercurial"
 
 python_test() {
-	"${PYTHON}" setup.py test
+	py.test "${BUILD_DIR}"/lib test || die
 }
diff --git a/dev-python/hgtools/metadata.xml b/dev-python/hgtools/metadata.xml
index 0ced3d080139..81ed6741376e 100644
--- a/dev-python/hgtools/metadata.xml
+++ b/dev-python/hgtools/metadata.xml
@@ -1,11 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>                                          
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">          
-<pkgmetadata>                                                                   
-  <maintainer>                                                                  
-    <email>prometheanfire@gentoo.org</email>                                    
-    <name>Matthew Thode</name>                                                  
-  </maintainer>                                                                 
-  <longdescription lang="en">                                                   
-    Classes and setuptools plugin for Mercurial repositories
-  </longdescription>                                                            
-</pkgmetadata> 
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>python</herd>
+	<maintainer>
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
+		Classes and setuptools plugin for Mercurial repositories
+	</longdescription>
+</pkgmetadata>