--- mercurial-2.5.1.ebuild	2013-03-02 18:28:47.405473103 +0100
+++ mercurial-2.5.1-r1.ebuild	2013-03-02 18:51:36.833520366 +0100
@@ -2,13 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-2.5.1.ebuild,v 1.2 2013/02/21 03:19:14 zmedico 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/"
@@ -19,68 +18,76 @@ SLOT="0"
 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}" 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
 }