Version bump. Removed old

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

6 files changed, 48 insertions, 334 deletions

diff --git a/dev-vcs/tortoisehg/ChangeLog b/dev-vcs/tortoisehg/ChangeLog
index b599a20805b7..aa49430c0ead 100644
--- a/dev-vcs/tortoisehg/ChangeLog
+++ b/dev-vcs/tortoisehg/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-vcs/tortoisehg
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/ChangeLog,v 1.35 2013/03/05 03:44:16 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/ChangeLog,v 1.36 2013/03/08 13:01:37 polynomial-c Exp $
+
+*tortoisehg-2.7.1 (08 Mar 2013)
+
+  08 Mar 2013; Lars Wendler <polynomial-c@gentoo.org> -tortoisehg-2.4.3.ebuild,
+  -tortoisehg-2.5.1.ebuild, -tortoisehg-2.6.1.ebuild,
+  -files/tortoisehg-2.6.1-missing_thg_script.patch, +tortoisehg-2.7.1.ebuild:
+  Version bump. Removed old.
 
   05 Mar 2013; Mike Gilbert <floppym@gentoo.org> tortoisehg-2.7.ebuild,
   tortoisehg-9999.ebuild:
diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest
index 5ab61cd42529..ce9cf35828cd 100644
--- a/dev-vcs/tortoisehg/Manifest
+++ b/dev-vcs/tortoisehg/Manifest
@@ -1,24 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX tortoisehg-2.6.1-missing_thg_script.patch 4537 SHA256 6406fa4776093c77e5da8611f4396b327e05137dea328a0b2fe9c7700e8ca14d SHA512 0244d8fc747f4e81b5b3de5dd6f70082eb762e3593169f4b4b91fab33e4ec281b27ed2eaac22e13538fb716eee48397e1e5293e868fec793b88e5a2c802cfb48 WHIRLPOOL 8b9f63d410541e74de9737f0756be1913d88b0ffb520c23291c163bb3c6c223356096845f0257a960ddd9f9ac8088fec941ea0f8ab1fc6c2226d02baff19b340
-DIST TortoiseHg-2.6.1.tar.gz 9005314 SHA256 affb6280bec4417eb444536389f17a88c7a34034f207b135b1224ae8c6937a4f SHA512 034a9777ba601150f95b3d84a239bc947a7dbd6ccd38bd486e621394782b97323884aa0d2988965c8d8df08cfc335845e1a9eb7061eb9f1aeabcdfeb69e73a0d WHIRLPOOL 55a525a4721f51188c08c974958a84ca3dd8d83c9183f6eaf37309c3f610c38bf08d43bed1a7bac7c8a3e8bd2cfdbf34101f004fba84c5a1c44803998fc50c40
-DIST tortoisehg-2.4.3.tar.gz 9025948 SHA256 6db82b51c301e8e7e83a5f7730882fdd055ba99f33ed5013d8c16b68b243f373 SHA512 5321c53750959888272d7073483025b47467de3bf9946c1e816fed5672651183d0fed2dec82ddb6975272dcb6c1cbae56aba6c256edea98e434f7533f46d7d68 WHIRLPOOL 29d8bb553af5e7fc7efb1843cdd81bcb9b077528d9767ee424869e7ccc6e0e5f7b2c5542047ddd0c061ffa419535cfb84f8f848ed7c143064771927c6d68531e
-DIST tortoisehg-2.5.1.tar.gz 9066918 SHA256 d679738e2b15b33902dac2dd9db3ff5d0e7923acadf57c1d0d8faa9d01953749 SHA512 2671d22f15f869f3f2128bd76ae24273cc0d46b8a778d080efaf3d3eb1792874d8c92299adcdc4412a241f471f08cbbda82db8a457f493f636f913bf5a64f1ff WHIRLPOOL 62d5a6b8a3f62fe1dafb2d1a871e883e387188a57a0930eb22727340f4ce93a5cd8d8c7ca781449992edb630937d97fea6f6d87ab813cb43369b99454c0f57ef
 DIST tortoisehg-2.6.2.tar.gz 9105928 SHA256 f079488fea008bb4f73a5dbb9b80e523c87355d0b9ea34e38e78fbd5724dd609 SHA512 b9515e1d228c94e8f8dbe62ac858532bdcc0a08e8620ad07546046a2c9ae4a5f9b8c5237ea7136def6fe24e36a1192a44321d46b0692aece213a6a8d7da08259 WHIRLPOOL 17944938e4a9dadddb310dba0b3d8bc6358dcaf44abc45904a4494b45bd7d98496ea35afaa0e8bd5f83e719f750cbc490c9b6d5e7939cfb1009625bd246737b9
+DIST tortoisehg-2.7.1.tar.gz 8954742 SHA256 d279432f612b2fe9790a4601119aaf50024bf2372cad2df76b9aea24c1c843c6 SHA512 d3787be0815df054fdde65e4c9077fd9abf5862a7ea5f3e8641435d2beea3422ecd6c48657decbfd95427e48cc49125882edab09d6719db896b2ccb8440b9140 WHIRLPOOL 60e65fc217f2b1dd51e247f8c2c33a5427b458b833565bc6b6ee27d9afd3d1ad54c5e405436a4c3d587d8972dd38d5bc1beaeaeb0fb9c91f5cf85bcf244f3115
 DIST tortoisehg-2.7.tar.gz 9999270 SHA256 14d8180a8636ff05182683793b371c5dff8561e83b90e3008a7037f746bd818d SHA512 4dbf48e19155f90443be1a1c4444c0c161e4659ea1a680f5615149063c4a4386d03faab4e770f89cf588d6ed9d172b31231ff79fd040506f70987ea9b981688a WHIRLPOOL 5d2e0e1c0c18f38563d6bca6460c10c3232a70a4167f8899a4b0d22450fcae71eaaa4e601ea873b05f6706f2d5fa4e30c6331fdfdfb1145e1abee8b8f65c49a2
-EBUILD tortoisehg-2.4.3.ebuild 1733 SHA256 c9ce919fd0a7302e857d9f9255cacdf6f53a3a32c41291356172b4dfa5de2ecb SHA512 fdf8f38f1e6fba5a720f411dc4c3532b10c3e82d982436c388c4e25c892c099670ff1d4c5c11599cc0b99c63fa17a15c9c0912438dd0dfe914a5fea72916c6e3 WHIRLPOOL b4f7e9c163123502d639cdcf72ae3a4f5607fba43b4b755e2895ff905f2da4b87ba790d4375ae922871b494d6dfa4f4f3bfae0cd940dc11b47b7086fb325c23d
-EBUILD tortoisehg-2.5.1.ebuild 1624 SHA256 1a4b538b73a0404e9264de5ef9ea4f0b5e5245a2d37e95c6a7df2ec13f90350d SHA512 d7b1f946e2dd223357b6e7637327310eb410da83d2659218e05885882e57453ef57b5c18df0b9893183e4c1d658b8248793375d2bab4eed41ea39e2890b21e6e WHIRLPOOL 7d6327a45a14e65808d5a64a7b34d2acc2ee9c3479f2716b825b58be0adc65e14fffcfb29ecb2021a8db0a79664f30097083c018570faa045fd8fb5791ba7daa
-EBUILD tortoisehg-2.6.1.ebuild 2097 SHA256 2d03c4b6151b0a71c978a5c02efb931ade16964c842949574d1432ec985de9c5 SHA512 c2b3a1c3c1fb0c15b86a74ade0d2f53847222f94d2017a67713beb17d6ee0b557dd1da405d2e92ccac57e4cc290c78865031bfb4e3cacc14c321047e3047275b WHIRLPOOL 0c80c09513621d3bba189b5b072759397b0a726aa381b23d223bcbae1ccaf920e018afa3268c76eab961f6f6db500ae7cc1a20ff78e67d28ee087e4c1771cae4
 EBUILD tortoisehg-2.6.2.ebuild 1820 SHA256 f0a2a8d67866e72224ef49329a28efb245d53f434298b564f9837cee44add253 SHA512 4ad5d090dfd3e42734e2f8278883f6a7b6b067da65edfc6fb95369877a185e1531cb66f056cf533add35f01c970fce25319b21fb4d79caccf0be2f3e4f113136 WHIRLPOOL f344266e152175f908d8772955972d686246dabe626d63803bb05a6276f0b2bcbe948755746d6d1a03315817a78c66c3cea7bb8338e5f6de8a9594e6dea5c7bf
+EBUILD tortoisehg-2.7.1.ebuild 1921 SHA256 c84c9e7d5ae19607a825e51cab15f42d335d1eade322bc07e805ffaf450c546b SHA512 3fc659a1899eb2b6b69f6d9fdcf724b432f7f4cb238e96de5fa415f9625aa052ef06214d367974d8855fe8c2d9d268f9346751155d78e3ef8d06b5b21530efcd WHIRLPOOL 0f63fe0cd07c25dd6d7129adf02c416c9e33e403f52443ebb1f8e0d27e03b72c3167cde721af7e938214903e515d4377332904d7e98f0e1cb0f171b3e11d14cc
 EBUILD tortoisehg-2.7.ebuild 1914 SHA256 61e3858a47767dc0baf60ba62cedaca67d0d8ec64503f11115570c89b36c1f4c SHA512 f78f30c7304e3c7ec739ee5d403ecbea55273e86d8f1c9cd84470531a6e04dafb28f3383f0edc9fb76027f35f6682e9a993409fbf7cdd975fc91d803646edc02 WHIRLPOOL 33ee83909b69c5151cf945f37c30c62a5f2b0025d63c2c8e2eef2016479f9ca5f7f9f70b4a5b28c98c6f7643c84ccaea18e53c767877f9b757c29866425519b8
 EBUILD tortoisehg-9999.ebuild 1916 SHA256 fdc514219d4d8e2466d86193b2746da8d5519e42cd6c38c998365458994f5d16 SHA512 946e8016c79a9be463c95d503a3d6f0fcd68d4dabca24fdb00666ce8a64a5e9aa90b0f97aacc287db9e56d32d53df437d1500600bc2f2b0140e68f0a2a745d5d WHIRLPOOL 11808f949b8a20dbaed9ae55a509083c0c183fc01061a637d96da155c3bbd0f78107159d9594a103f4ff2ec4beb33821dd338e705996eecd576f3c95977f0c03
-MISC ChangeLog 5830 SHA256 04ec37b12a19ae92ff1b532c1bf6d471d2fb38061892feda30157f69cf17b689 SHA512 6b18702b1513b1154f0ae29cc4f9e8a09bd5ae85e89a9e13fd1418df236bdeaccabb72bb7030ee8ca629739f2d8cbf12853d3d2477d383b2cf9b5c76a50c0704 WHIRLPOOL 580a94299b683322aed179ca96b5fdefe4f04cb9f9094d3c4c80b631c9c69c1cad5e9f06b2a2f8b6d5ede5784f162544a889e34512a78714527195da8dec6014
+MISC ChangeLog 6110 SHA256 ca04e776cc509031be153f00356537c9dec28a6e4c55da35443a3049916027ed SHA512 f70272702b911928ae4bc3792dc22d054952c90ccbe6ae80b1b3a0476a80f153e249dd94a8252f7731ab3df46cc64505bcdce55e17fedde6e6b569db69be8d70 WHIRLPOOL a0a484bada407825bf99011f0184100a36e64dfcafdd41b75275fbea29a7815d569becd8a105117db1edf0e0405df7f8deef6fc4b15eff2a7ba96d632ffc3d2c
 MISC metadata.xml 330 SHA256 d7ad48468c73b97db8462532efe7a2b1858883ed765e9c62b60dd9ab51fe9793 SHA512 6ea38fb93b6f671785062726c2a62ed042d270475e7657763bcda1ccd94ca8fa14396c7e0fde65ed8b827638d0a190e0c0699673359a5bf95e4fa965d6ca8e4c WHIRLPOOL 2dd5a5d00e461b1e47c674a185554b25bd28b923167f877d0a097c498a8f652a1302c18f5a475b9b0ca7b028184635a76e3ea03789fce2e4a82b8ed55ce7081a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlE1ahEACgkQC77qH+pIQ6TW6QD+OgT/hiKdYRsuu/674oO+wkn4
-8SO1foj1sIjr2v+h+aoA/2ObeS/SvstnqstJSuEN71qlZR1NA3pysXfYq9AAK2p0
-=jX8q
+iQIcBAEBCAAGBQJROeEzAAoJEPiazRVxLXTFH6EQAJwDuHhJhdzWaNOaq6JJYCtF
+vKz3T697DMLa+GUyi/GwpKJRcDqzwp5BRk3bECzhnZjRU+nD1ZpizvVsXNX2mYP6
+u6+UzzsDPe9EKggRoyREp3VM7itlK557QkQQIaPjP2WPoQCMJ8QJ9dYg2oRk+RSl
+GLU1MnU029iKvvN1J6XQJ+LmuP/wCYS/n/HU6opDPg9qxtZdB11ZVoZdpMD4j0B/
+ZIouUWY3Uet3+GWpT2yLl3rlDCx0WhdZBWhE9Frq8mYk6UTDAjyvh+5fjEWdNlpF
+7/QNb+/utcjyU7YAea/XyA+v3duz4c5CZO+Z6qo69/lER2ULdzXxwQ3bgwCm82LQ
+maSrS/HUHD/bldK1j/3khjmkkB7DjygrmEnVW5cc8Vyp4zed1Xs5x/NMelatSddE
+x0F1nwssZVMzsoo7u1/XyThY1F+o0zVa0cnERbUjepZymNkKPR/YSQLbWE4/+V1G
+u24B4meEeusMsRL6ZDkeNcErP/4emB5A29ML8KCKC+i43zj3MYzUrjJP9rOB282U
+0A1Nvn2R7bpXcTB/SVDPlyuPPepbpLZ/cftkZP1kdv4qP3injfJJMn9fSQlNxH/X
+LBrv2Lod7Y4vrTCzGLjXRbAdF+9O87+6m6ja1TML8MeMS/fFbbv6Qd3gVe+eRLGk
+o5np7KeLxjOKVFsTKApa
+=JfPo
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/tortoisehg/files/tortoisehg-2.6.1-missing_thg_script.patch b/dev-vcs/tortoisehg/files/tortoisehg-2.6.1-missing_thg_script.patch
deleted file mode 100644
index dda5ddca00ea..000000000000
--- a/dev-vcs/tortoisehg/files/tortoisehg-2.6.1-missing_thg_script.patch
+++ /dev/null
@@ -1,124 +0,0 @@
---- thg
-+++ thg
-@@ -0,0 +1,121 @@
-+#!/usr/bin/env python
-+#
-+# thg - front-end script for TortoiseHg dialogs
-+#
-+# Copyright (C) 2008-2011 Steve Borho <steve@borho.org>
-+# Copyright (C) 2008 TK Soh <teekaysoh@gmail.com>
-+#
-+# This software may be used and distributed according to the terms of the
-+# GNU General Public License version 2, incorporated herein by reference.
-+
-+import os
-+import sys
-+
-+argv = sys.argv[1:]
-+if 'THG_OSX_APP' in os.environ:
-+    # Remove the -psn argument supplied by launchd
-+    if argv[0].startswith('-psn'):
-+        argv = argv[1:]
-+    # sys.path as created by py2app doesn't work quite right with demandimport
-+    # Add the explicit path where PyQt4 and other libs are
-+    bundlepath = os.path.dirname(os.path.realpath(__file__))
-+    sys.path.insert(0, os.path.join(bundlepath, 'lib/python2.6/lib-dynload'))
-+
-+if hasattr(sys, "frozen"):
-+    if sys.frozen == 'windows_exe' and 'THGDEBUG' in os.environ:
-+        import win32traceutil
-+        print 'starting'
-+    # os.Popen() needs this, and Mercurial still uses os.Popen
-+    if 'COMSPEC' not in os.environ:
-+        comspec = os.path.join(os.environ.get('SystemRoot', r'C:\Windows'),
-+                               'system32', 'cmd.exe')
-+        os.environ['COMSPEC'] = comspec
-+else:
-+    thgpath = os.path.dirname(os.path.realpath(__file__))
-+    testpath = os.path.join(thgpath, 'tortoisehg')
-+    if os.path.isdir(testpath) and thgpath not in sys.path:
-+        sys.path.insert(0, thgpath)
-+
-+    # compile .ui and .qrc for in-place use
-+    fpath = os.path.realpath(__file__)
-+    if os.path.exists(os.path.join(os.path.dirname(fpath), 'setup.py')):
-+        from distutils.dist import Distribution
-+        from setup import build_qt
-+        build_qt(Distribution()).run()
-+
-+    if 'HGPATH' in os.environ:
-+        hgpath = os.environ['HGPATH']
-+        testpath = os.path.join(hgpath, 'mercurial')
-+        if os.path.isdir(testpath) and hgpath not in sys.path:
-+            sys.path.insert(0, hgpath)
-+
-+# Make sure to load threading by main thread; otherwise, _MainThread instance
-+# may have wrong thread id and results KeyError at exit.
-+import threading
-+
-+from mercurial import demandimport
-+demandimport.ignore.append('win32com.shell')
-+demandimport.ignore.append('tortoisehg.util.config')
-+demandimport.ignore.append('icons_rc')
-+demandimport.ignore.append('translations_rc')
-+demandimport.enable()
-+
-+# Verify we can reach TortoiseHg sources first
-+try:
-+    import tortoisehg.hgqt.run
-+except ImportError, e:
-+    sys.stderr.write(str(e)+'\n')
-+    sys.stderr.write("abort: couldn't find tortoisehg libraries in [%s]\n" %
-+                     os.pathsep.join(sys.path))
-+    sys.stderr.write("(check your install and PYTHONPATH)\n")
-+    sys.exit(-1)
-+
-+# Verify we have an acceptable version of Mercurial
-+from tortoisehg.util.hgversion import hgversion, checkhgversion
-+errmsg = checkhgversion(hgversion)
-+if errmsg:
-+    from mercurial import ui
-+    from tortoisehg.hgqt.bugreport import run
-+    from tortoisehg.hgqt.run import qtrun
-+    opts = {}
-+    opts['cmd'] = ' '.join(argv)
-+    opts['error'] = '\n' + errmsg + '\n'
-+    opts['nofork'] = True
-+    qtrun(run, ui.ui(), **opts)
-+    sys.exit(1)
-+
-+if 'THGDEBUG' in os.environ or '--profile' in sys.argv:
-+    sys.exit(tortoisehg.hgqt.run.dispatch(argv))
-+else:
-+    import cStringIO
-+    mystderr = cStringIO.StringIO()
-+    origstderr = sys.stderr
-+    sys.stderr = mystderr
-+    sys.__stdout__ = sys.stdout
-+    sys.__stderr__ = sys.stderr
-+    ret = 0
-+    try:
-+        ret = tortoisehg.hgqt.run.dispatch(argv)
-+        sys.stderr = origstderr
-+        stderrout = mystderr.getvalue()
-+        errors = ('Traceback', 'TypeError', 'NameError', 'AttributeError',
-+                  'NotImplementedError')
-+        for l in stderrout.splitlines():
-+            if l.startswith(errors):
-+                from mercurial import ui
-+                from tortoisehg.hgqt.bugreport import run
-+                from tortoisehg.hgqt.run import qtrun
-+                opts = {}
-+                opts['cmd'] = ' '.join(argv)
-+                opts['error'] = 'Recoverable error (stderr):\n' + stderrout
-+                opts['nofork'] = True
-+                qtrun(run, ui.ui(), **opts)
-+                break
-+        sys.exit(ret)
-+    except:
-+        if sys.exc_info()[0] not in [SystemExit, KeyboardInterrupt]:
-+            import traceback
-+            sys.stderr = origstderr
-+            traceback.print_exc()
-+        else:
-+            raise SystemExit(ret)
diff --git a/dev-vcs/tortoisehg/tortoisehg-2.4.3.ebuild b/dev-vcs/tortoisehg/tortoisehg-2.4.3.ebuild
deleted file mode 100644
index 2da30e850e19..000000000000
--- a/dev-vcs/tortoisehg/tortoisehg-2.4.3.ebuild
+++ /dev/null
@@ -1,81 +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/tortoisehg/tortoisehg-2.4.3.ebuild,v 1.1 2012/08/21 15:17:33 floppym Exp $
-
-EAPI=4
-
-SUPPORT_PYTHON_ABIS=1
-PYTHON_DEPEND="2:2.5"
-RESTRICT_PYTHON_ABIS="2.4 3.* *-pypy-*"
-
-inherit distutils eutils multilib
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="mirror://bitbucket/${PN}/targz/downloads/${P}.tar.gz"
-	HG_DEPEND=">=dev-vcs/mercurial-2.2 <dev-vcs/mercurial-2.4"
-else
-	inherit mercurial
-	EHG_REPO_URI="https://bitbucket.org/tortoisehg/thg"
-	KEYWORDS=""
-	SRC_URI=""
-	HG_DEPEND="dev-vcs/mercurial"
-fi
-
-DESCRIPTION="Set of graphical tools for Mercurial"
-HOMEPAGE="http://tortoisehg.bitbucket.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc"
-
-RDEPEND="${HG_DEPEND}
-	dev-python/iniparse
-	dev-python/pygments
-	dev-python/PyQt4
-	dev-python/qscintilla-python"
-DEPEND="${RDEPEND}
-	doc? ( >=dev-python/sphinx-1.0.3 )"
-
-src_prepare() {
-	# make the install respect multilib.
-	sed -i -e "s:lib/nautilus:$(get_libdir)/nautilus:" setup.py || die
-
-	if [[ ${LINGUAS+set} ]]; then
-		pushd i18n/tortoisehg > /dev/null || die
-		local x y keep
-		for x in *.po; do
-			keep=
-			for y in ${LINGUAS}; do
-				if [[ ${y} == ${x%.po}* ]]; then
-					keep=1
-					break
-				fi
-			done
-			[[ ${keep} ]] || rm "${x}" || die
-		done
-		popd > /dev/null || die
-	fi
-
-	distutils_src_prepare
-}
-
-src_compile() {
-	distutils_src_compile
-
-	if use doc ; then
-		emake -C doc html
-	fi
-}
-
-src_install() {
-	distutils_src_install
-	dodoc doc/ReadMe*.txt doc/TODO
-
-	if use doc ; then
-		dohtml -r doc/build/html
-	fi
-
-	newicon -s scalable icons/scalable/apps/thg-logo.svg tortoisehg_logo.svg
-	domenu contrib/${PN}.desktop
-}
diff --git a/dev-vcs/tortoisehg/tortoisehg-2.5.1.ebuild b/dev-vcs/tortoisehg/tortoisehg-2.5.1.ebuild
deleted file mode 100644
index 9ef552ecfed1..000000000000
--- a/dev-vcs/tortoisehg/tortoisehg-2.5.1.ebuild
+++ /dev/null
@@ -1,78 +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/tortoisehg/tortoisehg-2.5.1.ebuild,v 1.1 2012/10/04 05:57:37 polynomial-c Exp $
-
-EAPI=4
-
-SUPPORT_PYTHON_ABIS=1
-PYTHON_DEPEND="2:2.5"
-RESTRICT_PYTHON_ABIS="2.4 3.* *-pypy-*"
-
-inherit distutils eutils
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="mirror://bitbucket/${PN}/targz/downloads/${P}.tar.gz"
-	HG_DEPEND=">=dev-vcs/mercurial-2.2 <dev-vcs/mercurial-2.4"
-else
-	inherit mercurial
-	EHG_REPO_URI="https://bitbucket.org/tortoisehg/thg"
-	KEYWORDS=""
-	SRC_URI=""
-	HG_DEPEND="dev-vcs/mercurial"
-fi
-
-DESCRIPTION="Set of graphical tools for Mercurial"
-HOMEPAGE="http://tortoisehg.bitbucket.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc"
-
-RDEPEND="${HG_DEPEND}
-	dev-python/iniparse
-	dev-python/pygments
-	dev-python/PyQt4
-	dev-python/qscintilla-python"
-DEPEND="${RDEPEND}
-	doc? ( >=dev-python/sphinx-1.0.3 )"
-
-src_prepare() {
-	if [[ ${LINGUAS+set} ]]; then
-		pushd i18n/tortoisehg > /dev/null || die
-		local x y keep
-		for x in *.po; do
-			keep=false
-			for y in ${LINGUAS}; do
-				if [[ ${y} == ${x%.po}* ]]; then
-					keep=true
-					break
-				fi
-			done
-			${keep} || rm "${x}" || die
-		done
-		popd > /dev/null || die
-	fi
-
-	distutils_src_prepare
-}
-
-src_compile() {
-	distutils_src_compile
-
-	if use doc ; then
-		emake -C doc html
-	fi
-}
-
-src_install() {
-	distutils_src_install
-	dodoc doc/ReadMe*.txt doc/TODO
-
-	if use doc ; then
-		dohtml -r doc/build/html
-	fi
-
-	newicon -s scalable icons/scalable/apps/thg-logo.svg tortoisehg_logo.svg
-	domenu contrib/${PN}.desktop
-}
diff --git a/dev-vcs/tortoisehg/tortoisehg-2.6.1.ebuild b/dev-vcs/tortoisehg/tortoisehg-2.7.1.ebuild
index 1c7bb841109b..ee6db08fdb1e 100644
--- a/dev-vcs/tortoisehg/tortoisehg-2.6.1.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-2.7.1.ebuild
@@ -1,26 +1,20 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-2.6.1.ebuild,v 1.1 2012/12/20 13:36:53 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-2.7.1.ebuild,v 1.1 2013/03/08 13:01:37 polynomial-c Exp $
 
-EAPI=4
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
 
-SUPPORT_PYTHON_ABIS=1
-PYTHON_DEPEND="2:2.5"
-RESTRICT_PYTHON_ABIS="2.4 3.* *-pypy-*"
-
-inherit distutils eutils
-
-# version 2.6.1 has a rather uncommon source package. Files with DOS line
-# endings, tarball name in caps, missing files...
-MY_P="TortoiseHg-${PV}"
+inherit distutils-r1 eutils
 
 if [[ ${PV} != *9999* ]]; then
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="mirror://bitbucket/${PN}/targz/downloads/${MY_P}.tar.gz"
-	HG_DEPEND=">=dev-vcs/mercurial-2.3 <dev-vcs/mercurial-2.5"
+	SRC_URI="mirror://bitbucket/${PN}/targz/downloads/${P}.tar.gz"
+	HG_DEPEND=">=dev-vcs/mercurial-2.4 <dev-vcs/mercurial-2.6"
 else
 	inherit mercurial
 	EHG_REPO_URI="https://bitbucket.org/tortoisehg/thg"
+	EHG_REVISION="stable"
 	KEYWORDS=""
 	SRC_URI=""
 	HG_DEPEND="dev-vcs/mercurial"
@@ -34,21 +28,19 @@ SLOT="0"
 IUSE="doc"
 
 RDEPEND="${HG_DEPEND}
-	dev-python/iniparse
-	dev-python/pygments
-	dev-python/PyQt4
+	dev-python/iniparse[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/PyQt4[svg,${PYTHON_USEDEP}]
 	dev-python/qscintilla-python"
 DEPEND="${RDEPEND}
 	doc? ( >=dev-python/sphinx-1.0.3 )"
 
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# Missing from somewhat broken source tarball.
-	epatch "${FILESDIR}"/${P}-missing_thg_script.patch
+# Workaround race condition in build_qt
+DISTUTILS_IN_SOURCE_BUILD=1
 
+python_prepare_all() {
 	if [[ ${LINGUAS+set} ]]; then
-		pushd i18n/tortoisehg > /dev/null || die
+		cd i18n/tortoisehg || die
 		local x y keep
 		for x in *.po; do
 			keep=false
@@ -60,29 +52,22 @@ src_prepare() {
 			done
 			${keep} || rm "${x}" || die
 		done
-		popd > /dev/null || die
+		cd "${S}" || die
 	fi
-
-	distutils_src_prepare
+	distutils-r1_python_prepare_all
 }
 
-src_compile() {
-	distutils_src_compile
-
-	if use doc ; then
-		emake -C doc html
-	fi
+python_compile_all() {
+	use doc && emake -C doc html
 }
 
-src_install() {
-	distutils_src_install
-	dodoc doc/ReadMe*.txt doc/TODO
-
+python_install_all() {
+	distutils-r1_python_install_all
+	dodoc doc/ReadMe*.txt doc/TODO contrib/mergetools.rc
 	if use doc ; then
-		dohtml -r doc/build/html
+		dohtml -r doc/build/html/
 	fi
-
-	newicon -s scalable icons/scalable/apps/thg-logo.svg tortoisehg_logo.svg
+	newicon -s scalable icons/scalable/apps/thg-logo.svg thg_logo.svg
 	domenu contrib/${PN}.desktop
 }