Add patch for Mercurial 2 compat, bug 389513 by polynomial-c. EAPI=4.

Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64

4 files changed, 97 insertions, 5 deletions

diff --git a/dev-vcs/tortoisehg/ChangeLog b/dev-vcs/tortoisehg/ChangeLog
index 32e71435239b..d1fd6ec44e95 100644
--- a/dev-vcs/tortoisehg/ChangeLog
+++ b/dev-vcs/tortoisehg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-vcs/tortoisehg
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/ChangeLog,v 1.2 2011/10/11 15:23:59 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/ChangeLog,v 1.3 2011/11/04 17:44:04 floppym Exp $
+
+*tortoisehg-2.1.4-r1 (04 Nov 2011)
+
+  04 Nov 2011; Mike Gilbert <floppym@gentoo.org>
+  +files/tortoisehg-2.1.4-mercurial-2.patch, +tortoisehg-2.1.4-r1.ebuild:
+  Add patch for Mercurial 2 compat, bug 389513 by polynomial-c. EAPI=4.
 
 *tortoisehg-2.1.4 (11 Oct 2011)
 
diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest
index c412a2faf272..c930f27b94b9 100644
--- a/dev-vcs/tortoisehg/Manifest
+++ b/dev-vcs/tortoisehg/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX tortoisehg-2.1.4-mercurial-2.patch 746 RMD160 15c68fcf98e27f7c53d079c62458315f3f599267 SHA1 ce893cd3dd8bcbbe0f13b9cd9afd6cd9a8d28575 SHA256 683b02b01feabcdba64b991aab7ca33ab5f7f07b9bbf6972111f5a2f7bb0dabe
 DIST tortoisehg-2.1.3.tar.gz 8944697 RMD160 fa76dbbba6eb9868b8c0cd13756aa2c71dd5af60 SHA1 f5869bf46fc937d2a90b3362ee266083617a806f SHA256 2a186bb226da7dc93db4bd0e61cdd783d3d5f8189c76a2a2ad8a04c09f4a2912
 DIST tortoisehg-2.1.4.tar.gz 8949670 RMD160 94cff8cfa81b051607a8a4212558d790fe83919f SHA1 f70378055c3dc21421024139b384446178be09ef SHA256 ab76a54839c5177a687d2c33cfce690e15d8263119d581b9b368fb2fb1f898b5
 EBUILD tortoisehg-2.1.3.ebuild 1410 RMD160 ad641c26b408d5aec436db14e8e36028782adb3f SHA1 b2d8c817ef939e26e7cadc4bdbfd20fe1114022c SHA256 ea96a2eae21b692ae91c0ac9768fceefdb224f999ba200c440e49e50e6d8a595
+EBUILD tortoisehg-2.1.4-r1.ebuild 1473 RMD160 99b08927c20853b855985ccd03638e228e432001 SHA1 78d568147d17c580704dcf9bd5549d92c35bd17c SHA256 19c4ba0a1cd43eedaeb8972791fb00844eeaf0ec4a17006dc9c6ae75a95733f7
 EBUILD tortoisehg-2.1.4.ebuild 1409 RMD160 3515ca740dc9a92f26e1c39d77603d0574097baf SHA1 0ddae61e81c4bc10735bd4f4767c233bfda26ae1 SHA256 94faa554e668dfa4c589103171b8f85aa33b6999a946d5c80065dfaa68b02981
-MISC ChangeLog 577 RMD160 32c76cc4f3e05405dba54663d7b696c352ba8fe2 SHA1 cbef8268e8f57bfb2cd65e5bdf67d2bb8baef178 SHA256 ad0537cfecb7fa3bdfb0e135cf00ba2fb2bf2ea826aa72eddc0bab61eab9166f
+MISC ChangeLog 809 RMD160 1ee1d70830735574a699149b30a0a0e52698ff2a SHA1 db46d342e4308af511a58ba0762642378de506f5 SHA256 e728f1c83d7ff6a837f2e375715ac28f9a950a8b115d9bf396b57e1cab0cc19a
 MISC metadata.xml 337 RMD160 8d648546c6f6d9cfac725f1acec7c6938515a671 SHA1 719f0b6af46dbd922e9994c78fe8ba1b06cf3ef4 SHA256 819e42b8e72796ad9d65a8a5042beb1e064f675ddd20ef72bab0a4ae40bd6a8a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk6UX5cACgkQC77qH+pIQ6R0iQD6AooYkYh+dnWj/MnPXjo3Hnzc
-esgdJOhIoCFvXHjILXkBAIj/zvleDhSFimB2PWtKbhK7OzEP3PcEGMxYtuqrp5oE
-=nQrT
+iF4EAREIAAYFAk60JGwACgkQC77qH+pIQ6SQagD/STVbxMTw0auntGowlQXLMLyf
+8Qu7cziTjQ89To5VebQA/1PUhV4V1PlzlWs4zHEh6vf1ZKt4T3PQyWGic0VDlm+C
+=2xvw
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/tortoisehg/files/tortoisehg-2.1.4-mercurial-2.patch b/dev-vcs/tortoisehg/files/tortoisehg-2.1.4-mercurial-2.patch
new file mode 100644
index 000000000000..3f3284263240
--- /dev/null
+++ b/dev-vcs/tortoisehg/files/tortoisehg-2.1.4-mercurial-2.patch
@@ -0,0 +1,20 @@
+# HG changeset patch
+# User Yuya Nishihara <yuya@tcha.org>
+# Date 1319557903 -32400
+# Node ID f3817a7abb17cb14bdbb428b63345fb2d17f0853
+# Parent  08559b0a658f824b99294ac12cd2e472f4cd5129
+hgversion: carry minor digit to major like 1.9 to 2.0
+
+diff --git a/tortoisehg/util/hgversion.py b/tortoisehg/util/hgversion.py
+--- a/tortoisehg/util/hgversion.py
++++ b/tortoisehg/util/hgversion.py
+@@ -26,8 +26,7 @@
+     vers = re.split(r'\.|-', v)[:2]
+     if vers == reqver or len(vers) < 2:
+         return
+-    nextver = list(reqver)
+-    nextver[1] = str(int(reqver[1])+1)
++    nextver = map(str, divmod(int(reqver[0]) * 10 + int(reqver[1]) + 1, 10))
+     if vers == nextver:
+         return
+     return (('This version of TortoiseHg requires Mercurial '
diff --git a/dev-vcs/tortoisehg/tortoisehg-2.1.4-r1.ebuild b/dev-vcs/tortoisehg/tortoisehg-2.1.4-r1.ebuild
new file mode 100644
index 000000000000..92465770eaf7
--- /dev/null
+++ b/dev-vcs/tortoisehg/tortoisehg-2.1.4-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-2.1.4-r1.ebuild,v 1.1 2011/11/04 17:44:04 floppym Exp $
+
+EAPI=4
+
+SUPPORT_PYTHON_ABIS=1
+PYTHON_DEPEND="2:2.5"
+RESTRICT_PYTHON_ABIS="2.4 3.*"
+
+inherit distutils eutils multilib
+
+DESCRIPTION="Set of graphical tools for Mercurial"
+HOMEPAGE="http://tortoisehg.bitbucket.org"
+SRC_URI="http://bitbucket.org/${PN}/targz/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc nautilus"
+
+RDEPEND="dev-python/iniparse
+	dev-python/pygments
+	dev-python/PyQt4
+	dev-python/qscintilla-python
+	>=dev-vcs/mercurial-1.9
+	nautilus? ( dev-python/nautilus-python )"
+DEPEND="${RDEPEND}
+	doc? ( >=dev-python/sphinx-1.0.3 )"
+
+src_prepare() {
+	# Bug 389513: Mercurial 2 compatibility.
+	epatch "${FILESDIR}/${P}-mercurial-2.patch"
+
+	# make the install respect multilib.
+	sed -i -e "s:lib/nautilus:$(get_libdir)/nautilus:" setup.py || die
+
+	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 || die
+	fi
+
+	insinto /usr/share/icons/hicolor/scalable/apps
+	newins icons/scalable/apps/thg-logo.svg tortoisehg_logo.svg
+	domenu contrib/${PN}.desktop
+
+	if ! use nautilus; then
+		rm -r "${ED}usr/$(get_libdir)/nautilus" || die
+	fi
+}