Version bump. Removed old. Converted bumped ebuild to use distutils-r1 (bug #460020)

Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

5 files changed, 81 insertions, 235 deletions

diff --git a/dev-vcs/mercurial/ChangeLog b/dev-vcs/mercurial/ChangeLog
index 60e1dbb41fdb..5f7e965f7215 100644
--- a/dev-vcs/mercurial/ChangeLog
+++ b/dev-vcs/mercurial/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-vcs/mercurial
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.114 2013/02/21 03:19:14 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.115 2013/03/08 13:00:57 polynomial-c Exp $
+
+*mercurial-2.5.2 (08 Mar 2013)
+
+  08 Mar 2013; Lars Wendler <polynomial-c@gentoo.org> -mercurial-2.1.1.ebuild,
+  -files/mercurial-2.4-dont_grep_indefinitely.patch, -mercurial-2.5.ebuild,
+  +mercurial-2.5.2.ebuild:
+  Version bump. Removed old. Converted bumped ebuild to use distutils-r1 (bug
+  #460020).
 
   21 Feb 2013; Zac Medico <zmedico@gentoo.org> mercurial-2.5.1.ebuild:
   Add ~arm-linux keyword.
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index cd34cdc105b9..5500ce643a76 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -3,22 +3,29 @@ Hash: SHA256
 
 AUX 70mercurial-gentoo.el 76 SHA256 c215746e4a5375569808c6aa6ddabe08e82d33d744128179be3142d9cd53a5ab SHA512 2efb67d5f595842ccdb9b9ea0c6b6fbc3a28a77955d7255817309486fac19e7550ee0a545d5824e3f9acaf586d93533e90ccd05e15d76884d6493f50fb390a44 WHIRLPOOL f4e8fa6a0400bf04314569f3d6e26e464ebf3c7a693508250e2b150919ad5e34a534af86b1b5847ff13f2964d23db531b1a77cc8bdd24e550c7f9e885c6f1682
 AUX cacerts.rc 51 SHA256 3d7c7e238ab4db22d2457e039bb1afcb02c6ac3a6c9aee8448614b0a6f414774 SHA512 39c40c6cc95c54dcae13effb5c23f541f49fd89e0f040e214673afd906c6d5140eb18801d55330f4455507b467f0fae011998e60932e9a2accf37a0e7a047b90 WHIRLPOOL 12c178cf03d7d31744311fd71200efd07a2c9ab3ab3bf1c08f254d113fbd0500848ac3bb76da2baa2c567666f2174026a605dd561a3b1bc96133f314e149f289
-AUX mercurial-2.4-dont_grep_indefinitely.patch 1276 SHA256 5cee3bf5297e33656e7d61b83de185a31f30315aa6e2fa5aeef2b145d8b136a1 SHA512 34cf5f4fed8c7a723529338d2c3b194027b5622b33de408c19051e46e40aa36b65e2bde4e4c91f6e45c4346e68d05c579b74a6d52f6bb04468cc398def273c00 WHIRLPOOL 683e89d5184300dd46e570faf5d3e16b7aa6fab90621d0579611298fda8f888989b25ad4f5651eb8a31f567109236d46ceda87831759989427312e4bf5644f48
-DIST mercurial-2.1.1.tar.gz 3313261 SHA256 0f8ec2b29f1121c6cb73c17509281eb1391ddbfad757b1f720d7e06de0a25dfd SHA512 046d8f9f9510727e4c08bbcaeb7e402544b6ce5d240f44d71f73768304072f2ed1e1b856c848143ed1ccd55fc6b109a0281be305e0adad84aa0a6583bb72ddc9 WHIRLPOOL a32516377c5018ae00c241d92d693594404569bed1972c68c517d972d4ca8f8e645e9900e303406a903f6ed488add271f677c17698d386e5f8af2d985fa65ee3
 DIST mercurial-2.4.2.tar.gz 3613392 SHA256 cc21083d7eab4caa8159b941e36c7229acbb6d41a26a7bed21a771b3f63dedf3 SHA512 642dbcc9de6662e563059cafadbd4a0f1b4d6cebad48b2bfc7160571fad950a0110456be52690f1aeef6b91a4f6ac1edf6fc3607d1f590337a60c4b2bcab4625 WHIRLPOOL 64b7f5d620ed132849318e270bc97a0bed99f8be16d1c65da0a38dab47cf3f20bbe0f6b1b9ab145ca6df70c48ba70814df5c0c6c8fa07b271fcda251bb7c9ddf
 DIST mercurial-2.5.1.tar.gz 3671108 SHA256 96688c49ee6cbf2809d0925f1ee797a9211f4ed735233d789cabfabaac221859 SHA512 91693ca5f34934956a7c2c98bb69a5648b2a5660afd2ecf4a05035c5420450d42c194eeef0606d7683e267e4eaaaab414df23f30b34c88219bdd5c1a0f1f66ed WHIRLPOOL 93229d04c1f43badc2d90ebc13868f8799f887eb86f4a37c7a19021cfeac6ede0aa008b0c0b5ad39011293103363cf16987b1329c5cdf43fbba2437c3ad9fc5a
-DIST mercurial-2.5.tar.gz 3669817 SHA256 63090f1b9f8494e029c00085d2a23d9ef1990f5f2c2ac2718adee4c9460d52e4 SHA512 8c710faf257bb51b1f0214b6562508045586787089b3dce6ccbe1bab7cb7bb7ffc88b4660b6d6e6b7a3c54536c08b367071c9f2316c4d4671519d64a1171457a WHIRLPOOL e52fb3d05ccc24b11c660402926d4b94974ce4af90c547831aa4d3ae3dae0b489f14f91a376ed474d53c3e15036d62f9f3761bc32b5b474ee80e5e49c7e2afc1
-EBUILD mercurial-2.1.1.ebuild 4010 SHA256 46c93140e3a84505502e5d78f703d07313daacc838a50d192901ed3a1eb47555 SHA512 bfd876d876621d745a82446cdabcee1b96c5f0c356777bcab121f5ef718a6a5797e479c56d9bebc97e34f92c58a2903d8ea9cef9d54b2c9d61d55544bb66f62d WHIRLPOOL 9cb1a7ffd2a82db0f43c01afaef8fe7d746c99af13e52ffb57d0811f0be8f9b17e9b399b70bd7de56f4385d2bdf43a5370fd6d3caddf5a3d05de3a426a3aa482
+DIST mercurial-2.5.2.tar.gz 3671671 SHA256 cf6d4a7bb70d6b7318905ad7e4db8a2b42be26556b28c82f9bd960299ddad34e SHA512 475995fe07d481b2857f109f7d10681d19db13cc6ffcb2e5ed08c85fed7e25206af6a09634e562ab44e6d047a2814f8ee8cb4daa7a7a82e3edea795bee096baa WHIRLPOOL 02d148093308175ee9078402531bd77de485b866e65579cd9b1e7addea6a6505520c7b1f7f7a2153ffa7880b367f7ca96807255339dd7cc7bd58eda11db4f777
 EBUILD mercurial-2.4.2.ebuild 4205 SHA256 e83115c31a5188e8eaac882ddce4e5a319bfd6bd8b2546f2734b3e9a35f1b014 SHA512 b64c82462d8c2ff4f24088b82e08ec3154b6aac08b44774a5e30d7f64e8346a9e18d624c3abe6e57d8a1e64bf60c9bc47c456186d22a316d0c10f7bb1ce847cc WHIRLPOOL 70d109a32ddc21d494c361ad66c8a2e2b60ea1346fedca67820a9ce32285fc3a24b9e5530501489df15cf1a494b43e54c29b8be3ee5f2c4b11f3cddd3fe80fd8
 EBUILD mercurial-2.5.1.ebuild 4228 SHA256 06dc4888ea8c98dca366eb0261fd701e6a7935785f7b2f0e50826646506816a4 SHA512 cf1e1d5ac1f870b03dcea347866dd868658d2e945a872a404a9e59d0423bbe920eaae0619e1becbeaff07610a5ff4c6c255c35abdcdfb865043ec8f1366cb127 WHIRLPOOL f07047cb50a7b8952d48d4bd5f9482a2a6b03ce121dc46efdf5e921292bbf49c77e9b9ba181b0179f669eba34d65466c9d549df6878089b84efb06b075be5641
-EBUILD mercurial-2.5.ebuild 4211 SHA256 9149118cec2e0a2e1f0bd80243dc5de97ff2bf39a88f2afa2ce464ae8c40bff8 SHA512 9fb0b1ebc8f99d57f307a7c55472affd1cbcba21614c6d084da3479fa53942b9d6239adb9428f041efe6618322bf5ffea2416950334e2cbe9284c804a44527da WHIRLPOOL 1a912f4de829275db7a41ad5a6855b4510fac1610593d8a37eb31b6cd37a282e1a991342e1cf6036a4bb960c52578fdeeb36126c8d059323457d19fee64b2e07
+EBUILD mercurial-2.5.2.ebuild 4462 SHA256 21c1227b11b8f4e6ae9a97868b1d635dd7e0f4fd91913c9133878361839d6154 SHA512 402a4ca455d36a28d4fb895615dac6d8bb5da4b29adfe1b72dd329a213589ef4eb5ffdd5150a6e114ece2b3f28ea939db2ae43f58b20ae1559d148fa8dd1094f WHIRLPOOL e0162dd3cc59ad8b8f4205466bcfacb154ae5ecb37c25635c933de59fcda1f4410befa58a1c5c943b023dbb2bc49ef81b628adf737a361860f917d9de87938c7
 EBUILD mercurial-9999.ebuild 4040 SHA256 14305b9a06deecfa1b9ff52361575e7733ee59da9788b4e087201175cb0026d2 SHA512 016dabe2a513c84e346e3898a15be4b1372905ab605f0bb7730966cc477e2a19e01f2ee5cefd64c743327ce862ef70c3646745038993942921546ac247afc22b WHIRLPOOL 8c3667549230153567dc0ad948ba9c223c6dd18165597c4e9f7126891dee5fbc995fd381f0b8d7dc2607239778d67f83e6dc0b295d8d23aa4bf64ecd4f7e1701
-MISC ChangeLog 33562 SHA256 67ca0ca203bff9388504f13390e33859acc398167de3ea6c6d1c0b1654157e69 SHA512 12de6a2157fa26686c2f313fb7e124b58e93bfdb62ca364fb1e2ad14b543e7fc8a9091b7b29abfc44e26d479f146bd0c730db799fa063f621ceefbb6f3dd4bce WHIRLPOOL 383fb698d7fde8e95a76fa3513191cc427569382849defcdab605aade89bea5398c9e651bc922f218c6c084a12b9cc99038cca6349657e6332d39fba8e21cd94
+MISC ChangeLog 33872 SHA256 25ea399aeb4a12c072f973cd266c71f3599924248035657e9b0aec14a1fb6acc SHA512 58d8724d0b0e436497ef203d2f81c4cd3f651b1a4c2688d1a6b40ca3d95abd1150b5ddceddf5f4f50253818d3b2444838e54023cbd414cc8be33395cb8e057bc WHIRLPOOL d6ca04b50f8a088d6ca585e1eb0c675482f535cbcd1dd3020d64df62f464b28e5525d43513aea6b6053e0b1412a0d666c0c4e4926ff8c8bf2b5e141bd6d82a38
 MISC metadata.xml 537 SHA256 44b0f25f7c2d2559b289caa0f843be24585036650b1db7f88edc9febbf648146 SHA512 7a4e6a17557580cf7d74628da3b9788d1c94dc5100bb3eb86f1411f32859293c13949ece56359214bfcc6e2ced88be2f5627a516ad59d59e4134708de20e38cd WHIRLPOOL 1a94fcda312a2345dea0f47183abe5ec18fabcccbd1fb0599586d98c567a89898c2265fde58e7774dbb584ccb2cb2cb133df15b1f15327eba8e71ded6cd3da9d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlElkjQACgkQ/ejvha5XGaMe+gCcD/B03NB4Ju0L5hGlMGTGn6in
-qiUAn2JnvJVK0iDB774NaLD9C21Yh1AO
-=i8sf
+iQIcBAEBCAAGBQJROeEKAAoJEPiazRVxLXTF4h8QAMEEM2pwAzFyb+IU12q97seA
+mv6YbPWcEBuC5seBdXouYR/zSjDLIKyChvkpp6/o4ziyRwZ7+VIWCFta3ZBVoEkv
+BFWhWl5YbD9qhAe6/5LVoaMeUiPM5rzmUryxdyHQtflzn9dSxtvHaU5W6nvyw/U6
+oiuxANurPDSHIfbd0hCnsnYDIOExUrRGkhwEqnjxbgpgWjC1nKQz7Pp0wnmx4a12
+1OLSHUt9MJ6+OP2qMlUf+qW/RBKzkDOtcU4zcDJFxgnSNUY7NeSU3uQo9sveM7mF
+GMAknfw1D9P9WjjfXIBWua/gF/onbcuVS7f9unJ6aoloAKvMR0diCw2G9bVXb5aY
+02GAwbtNx2c43Ooz7SF3TGHa7u1X5PhqRvpVpCGO2CoaOSgxmJdvChx4QcDUrEuJ
+E7/697yF6uzUcrhiCp2kcMjQjS3JLmllz66xuJZkPaRf/ikCCqgobjAd/kQncM5Y
+3idCooUGqzjPW2ZoxYB1mGRrVCtwmVJOhXrsRjJEPLMPLg7z/i9VFtMhPRJOOJzV
+YJ0fNW6pmISyw8Re+4FV1HJA1WObZHPG3FVNFgPM3lCLcNdMy9G8Ee5LAtWWpaVV
+vQ2R4VawK3vxZmv6YWAUCKPTHH4QB19P2hV6mlngrxb4x09I/DDL89gE7vn90w/H
+twk/D4hOC7nk2g0myJAl
+=Liqb
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/mercurial/files/mercurial-2.4-dont_grep_indefinitely.patch b/dev-vcs/mercurial/files/mercurial-2.4-dont_grep_indefinitely.patch
deleted file mode 100644
index 0f95724ffa11..000000000000
--- a/dev-vcs/mercurial/files/mercurial-2.4-dont_grep_indefinitely.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-
-# HG changeset patch
-# User Idan Kamara <idankk86@gmail.com>
-# Date 1352741223 -7200
-# Node ID 35ba170c0f82dba18f0207ef4bd93216e6de8bbf
-# Parent  45bd0cd7ca04f8cda0a61cddded8838dd312675a
-grep: don't search past the end of the searched string
-
-'*' causes the resulting RE to match 0 or more repetitions of the preceding RE:
-
->>> bool(re.search('.*', ''))
->>> True
-
-This causes an infinite loop because currently we're only checking if there was
-a match without looking at where we are in the searched string.
-
-diff -r 45bd0cd7ca04 -r 35ba170c0f82 mercurial/commands.py
---- a/mercurial/commands.py	Tue Nov 13 08:41:56 2012 -0800
-+++ b/mercurial/commands.py	Mon Nov 12 19:27:03 2012 +0200
-@@ -2935,7 +2935,7 @@
-     def matchlines(body):
-         begin = 0
-         linenum = 0
--        while True:
-+        while True and begin < len(body):
-             match = regexp.search(body, begin)
-             if not match:
-                 break
-diff -r 45bd0cd7ca04 -r 35ba170c0f82 tests/test-grep.t
---- a/tests/test-grep.t	Tue Nov 13 08:41:56 2012 -0800
-+++ b/tests/test-grep.t	Mon Nov 12 19:27:03 2012 +0200
-@@ -23,6 +23,10 @@
- 
- simple
- 
-+  $ hg grep '.*'
-+  port:4:export
-+  port:4:vaportight
-+  port:4:import/export
-   $ hg grep port port
-   port:4:export
-   port:4:vaportight
-
diff --git a/dev-vcs/mercurial/mercurial-2.1.1.ebuild b/dev-vcs/mercurial/mercurial-2.1.1.ebuild
deleted file mode 100644
index 98fcb8bb9d74..000000000000
--- a/dev-vcs/mercurial/mercurial-2.1.1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-2.1.1.ebuild,v 1.8 2012/06/17 17:32:15 armin76 Exp $
-
-EAPI=3
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="threads"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
-
-inherit bash-completion-r1 elisp-common eutils distutils
-
-DESCRIPTION="Scalable distributed SCM"
-HOMEPAGE="http://mercurial.selenic.com/"
-SRC_URI="http://mercurial.selenic.com/release/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bugzilla emacs gpg test tk zsh-completion"
-
-RDEPEND="bugzilla? ( dev-python/mysql-python )
-	gpg? ( app-crypt/gnupg )
-	tk? ( dev-lang/tk )
-	zsh-completion? ( app-shells/zsh )"
-DEPEND="emacs? ( virtual/emacs )
-	test? ( app-arch/unzip
-		dev-python/pygments )"
-
-PYTHON_CFLAGS=(
-	"2.* + -fno-strict-aliasing"
-	"* - -ftracer -ftree-vectorize"
-)
-
-PYTHON_MODNAME="${PN} hgext"
-SITEFILE="70${PN}-gentoo.el"
-
-src_prepare() {
-	distutils_src_prepare
-
-	# fix up logic that won't work in Gentoo Prefix (also won't outside in
-	# certain cases), bug #362891
-	sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die
-}
-
-src_compile() {
-	distutils_src_compile
-
-	if use emacs; then
-		cd "${S}"/contrib || die
-		elisp-compile mercurial.el || die "elisp-compile failed!"
-	fi
-
-	rm -rf contrib/{win32,macosx} || die
-}
-
-src_install() {
-	distutils_src_install
-
-	newbashcomp contrib/bash_completion ${PN} || die
-
-	if use zsh-completion ; then
-		insinto /usr/share/zsh/site-functions
-		newins contrib/zsh_completion _hg || die
-	fi
-
-	rm -f doc/*.?.txt || die
-	dodoc CONTRIBUTORS PKG-INFO README doc/*.txt || die
-	cp hgweb*.cgi "${ED}"/usr/share/doc/${PF}/ || die
-
-	dobin hgeditor || die
-	dobin contrib/hgk || die
-	dobin contrib/hg-ssh || die
-
-	rm -f contrib/hgk contrib/hg-ssh || die
-
-	rm -f contrib/bash_completion || die
-	cp -r contrib "${ED}"/usr/share/doc/${PF}/ || die
-	doman doc/*.? || die
-
-	cat > "${T}/80mercurial" <<-EOF
-HG="${EPREFIX}/usr/bin/hg"
-EOF
-	doenvd "${T}/80mercurial" || die
-
-	if use emacs; then
-		elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-}
-
-src_test() {
-	cd "${S}/tests/" || die
-	rm -rf *svn* || die			# Subversion tests fail with 1.5
-	rm -f test-archive || die		# Fails due to verbose tar output changes
-	rm -f test-convert-baz* || die		# GNU Arch baz
-	rm -f test-convert-cvs*	|| die		# CVS
-	rm -f test-convert-darcs* || die	# Darcs
-	rm -f test-convert-git* || die		# git
-	rm -f test-convert-mtn*	|| die		# monotone
-	rm -f test-convert-tla*	|| die		# GNU Arch tla
-	rm -f test-doctest* || die		# doctest always fails with python 2.5.x
-	if [[ ${EUID} -eq 0 ]]; then
-		einfo "Removing tests which require user privileges to succeed"
-		rm -f test-command-template || die	# Test is broken when run as root
-		rm -f test-convert || die		# Test is broken when run as root
-		rm -f test-lock-badness	|| die		# Test is broken when run as root
-		rm -f test-permissions	|| die		# Test is broken when run as root
-		rm -f test-pull-permission || die	# Test is broken when run as root
-		rm -f test-clone-failure || die
-		rm -f test-journal-exists || die
-		rm -f test-repair-strip || die
-	fi
-
-	testing() {
-		local testdir="${T}/tests-${PYTHON_ABI}"
-		rm -rf "${testdir}" || die
-		"$(PYTHON)" run-tests.py --tmpdir="${testdir}"
-	}
-	python_execute_function testing
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	use emacs && elisp-site-regen
-
-	elog "If you want to convert repositories from other tools using convert"
-	elog "extension please install correct tool:"
-	elog "  dev-vcs/cvs"
-	elog "  dev-vcs/darcs"
-	elog "  dev-vcs/git"
-	elog "  dev-vcs/monotone"
-	elog "  dev-vcs/subversion"
-}
-
-pkg_postrm() {
-	distutils_pkg_postrm
-	use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/mercurial/mercurial-2.5.ebuild b/dev-vcs/mercurial/mercurial-2.5.2.ebuild
index 4d9bae3e13b3..72ab1ed38c98 100644
--- a/dev-vcs/mercurial/mercurial-2.5.ebuild
+++ b/dev-vcs/mercurial/mercurial-2.5.2.ebuild
@@ -1,14 +1,13 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-2.5.ebuild,v 1.2 2013/02/03 14:41:06 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-2.5.2.ebuild,v 1.1 2013/03/08 13:00:57 polynomial-c Exp $
 
-EAPI=3
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="threads"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
+EAPI=5
 
-inherit bash-completion-r1 elisp-common eutils distutils
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_REQ_USE="threads"
+
+inherit bash-completion-r1 elisp-common eutils distutils-r1 flag-o-matic
 
 DESCRIPTION="Scalable distributed SCM"
 HOMEPAGE="http://mercurial.selenic.com/"
@@ -16,71 +15,79 @@ SRC_URI="http://mercurial.selenic.com/release/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bugzilla emacs gpg test tk zsh-completion"
 
-RDEPEND="bugzilla? ( dev-python/mysql-python )
+RDEPEND="bugzilla? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
 	gpg? ( app-crypt/gnupg )
 	tk? ( dev-lang/tk )
 	zsh-completion? ( app-shells/zsh )
 	app-misc/ca-certificates"
 DEPEND="emacs? ( virtual/emacs )
 	test? ( app-arch/unzip
-		dev-python/pygments )"
-
-PYTHON_CFLAGS=(
-	"2.* + -fno-strict-aliasing"
-	"* - -ftracer -ftree-vectorize"
-)
+		dev-python/pygments[${PYTHON_USEDEP}] )"
 
-PYTHON_MODNAME="${PN} hgext"
 SITEFILE="70${PN}-gentoo.el"
 
-src_prepare() {
-	distutils_src_prepare
+python_prepare_all() {
 	# fix up logic that won't work in Gentoo Prefix (also won't outside in
 	# certain cases), bug #362891
 	sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die
+
+	distutils-r1_python_prepare_all
 }
 
-src_compile() {
-	distutils_src_compile
+# XXX: temporary, needed to get ${PYTHON} set
+# https://bugs.gentoo.org/show_bug.cgi?id=460016
+python_configure() {
+	:
+}
+
+python_configure_all() {
+	strip-flags -ftracer -ftree-vectorize
+	# Note: make it impl-conditional if py3 is supported
+	append-flags -fno-strict-aliasing
+
+	"${PYTHON:-python}" setup.py build_mo || die
+}
+
+python_compile_all() {
+	rm -r contrib/{win32,macosx} || die
 	if use emacs; then
-		cd "${S}"/contrib || die
+		cd contrib || die
 		elisp-compile mercurial.el || die "elisp-compile failed!"
 	fi
-	rm -rf contrib/{win32,macosx} || die
 }
 
-src_install() {
-	distutils_src_install
-	python_convert_shebangs 2 contrib/hg-ssh
+python_install_all() {
+	distutils-r1_python_install_all
 
-	newbashcomp contrib/bash_completion ${PN} || die
+	newbashcomp contrib/bash_completion ${PN}
 
 	if use zsh-completion ; then
 		insinto /usr/share/zsh/site-functions
-		newins contrib/zsh_completion _hg || die
+		newins contrib/zsh_completion _hg
 	fi
 
 	rm -f doc/*.?.txt || die
-	dodoc CONTRIBUTORS README doc/*.txt || die
+	dodoc CONTRIBUTORS doc/*.txt
 	cp hgweb*.cgi "${ED}"/usr/share/doc/${PF}/ || die
 
-	dobin hgeditor || die
-	dobin contrib/hgk || die
-	dobin contrib/hg-ssh || die
+	dobin hgeditor
+	dobin contrib/hgk
+	python_foreach_impl python_doscript contrib/hg-ssh
 
 	rm -f contrib/hgk contrib/hg-ssh || die
 
 	rm -f contrib/bash_completion || die
-	cp -r contrib "${ED}"/usr/share/doc/${PF}/ || die
-	doman doc/*.? || die
+	dodoc -r contrib
+	docompress -x /usr/share/doc/${PF}/contrib
+	doman doc/*.?
 
 	cat > "${T}/80mercurial" <<-EOF
 HG="${EPREFIX}/usr/bin/hg"
 EOF
-	doenvd "${T}/80mercurial" || die
+	doenvd "${T}/80mercurial"
 
 	if use emacs; then
 		elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!"
@@ -92,7 +99,7 @@ EOF
 }
 
 src_test() {
-	cd "${S}/tests/" || die
+	cd tests || die
 	rm -rf *svn* || die					# Subversion tests fail with 1.5
 	rm -f test-archive* || die			# Fails due to verbose tar output changes
 	rm -f test-convert-baz* || die		# GNU Arch baz
@@ -115,16 +122,23 @@ src_test() {
 		rm -f test-repair-strip* || die
 	fi
 
-	testing() {
-		local testdir="${T}/tests-${PYTHON_ABI}"
-		rm -rf "${testdir}" || die
-		"$(PYTHON)" run-tests.py --tmpdir="${testdir}"
-	}
-	python_execute_function testing
+	cd .. || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	local TEST_DIR
+
+	rm -rf "${TMPDIR}"/test
+	distutils_install_for_testing
+	cd tests || die
+	"${PYTHON}" run-tests.py --verbose \
+		--tmpdir="${TMPDIR}"/test \
+		--with-hg="${TEST_DIR}"/scripts/hg \
+		|| die "Tests fail with ${EPYTHON}"
 }
 
 pkg_postinst() {
-	distutils_pkg_postinst
 	use emacs && elisp-site-regen
 
 	elog "If you want to convert repositories from other tools using convert"
@@ -137,6 +151,5 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	distutils_pkg_postrm
 	use emacs && elisp-site-regen
 }