Add patch for mercurial-2.1 compat.

(Portage version: 2.2.0_alpha85/cvs/Linux x86_64)

4 files changed, 33 insertions, 73 deletions

diff --git a/dev-vcs/tortoisehg/ChangeLog b/dev-vcs/tortoisehg/ChangeLog
index fa4939cb6489..f728377759f9 100644
--- a/dev-vcs/tortoisehg/ChangeLog
+++ b/dev-vcs/tortoisehg/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-vcs/tortoisehg
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/ChangeLog,v 1.8 2012/01/28 03:57:04 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/ChangeLog,v 1.9 2012/02/12 02:16:09 floppym Exp $
+
+*tortoisehg-2.2.2-r1 (12 Feb 2012)
+
+  12 Feb 2012; Mike Gilbert <floppym@gentoo.org>
+  +files/tortoisehg-2.2.2-hgversion.patch, +tortoisehg-2.2.2-r1.ebuild,
+  -tortoisehg-2.2.1.ebuild, -tortoisehg-2.2.ebuild:
+  Add patch for mercurial-2.1 compat.
 
 *tortoisehg-2.2.2 (28 Jan 2012)
 
diff --git a/dev-vcs/tortoisehg/files/tortoisehg-2.2.2-hgversion.patch b/dev-vcs/tortoisehg/files/tortoisehg-2.2.2-hgversion.patch
new file mode 100644
index 000000000000..f01800bf6343
--- /dev/null
+++ b/dev-vcs/tortoisehg/files/tortoisehg-2.2.2-hgversion.patch
@@ -0,0 +1,19 @@
+# HG changeset patch
+# User Yuya Nishihara <yuya@tcha.org>
+# Date 1327248119 -32400
+# Node ID d5dc83c7fc47f6692887f5af6bb7b1c819e7ad8e
+# Parent  54c988c2eb8442d3cb121b8ba73973bcdcbac467
+hgversion: bump required Mercurial version 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
+@@ -18,7 +18,7 @@
+ 
+ def checkhgversion(v):
+     """range check the Mercurial version"""
+-    reqver = ['1', '9']
++    reqver = ['2', '0']
+     v = v.split('+')[0]
+     if not v or v == 'unknown' or len(v) >= 12:
+         # can't make any intelligent decisions about unknown or hashes
diff --git a/dev-vcs/tortoisehg/tortoisehg-2.2.1.ebuild b/dev-vcs/tortoisehg/tortoisehg-2.2.2-r1.ebuild
index 70313bce94e1..0e4d657dd7f4 100644
--- a/dev-vcs/tortoisehg/tortoisehg-2.2.1.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-2.2.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.2.1.ebuild,v 1.1 2011/12/10 04:41:55 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-2.2.2-r1.ebuild,v 1.1 2012/02/12 02:16:09 floppym Exp $
 
 EAPI=4
 
@@ -31,7 +31,7 @@ RDEPEND="dev-python/iniparse
 	dev-python/pygments
 	dev-python/PyQt4
 	dev-python/qscintilla-python
-	>=dev-vcs/mercurial-1.9
+	>=dev-vcs/mercurial-2.0
 	nautilus? ( dev-python/nautilus-python )"
 DEPEND="${RDEPEND}
 	doc? ( >=dev-python/sphinx-1.0.3 )"
@@ -40,6 +40,9 @@ src_prepare() {
 	# make the install respect multilib.
 	sed -i -e "s:lib/nautilus:$(get_libdir)/nautilus:" setup.py || die
 
+	# Bump the required mercurial version range.
+	epatch "${FILESDIR}/${P}-hgversion.patch"
+
 	distutils_src_prepare
 }
 
diff --git a/dev-vcs/tortoisehg/tortoisehg-2.2.ebuild b/dev-vcs/tortoisehg/tortoisehg-2.2.ebuild
deleted file mode 100644
index 9fb429d6ddef..000000000000
--- a/dev-vcs/tortoisehg/tortoisehg-2.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# 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.2.ebuild,v 1.1 2011/11/07 20:39:34 floppym Exp $
-
-EAPI=4
-
-SUPPORT_PYTHON_ABIS=1
-PYTHON_DEPEND="2:2.5"
-RESTRICT_PYTHON_ABIS="2.4 3.*"
-
-inherit distutils eutils multilib
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="http://bitbucket.org/${PN}/targz/downloads/${P}.tar.gz"
-else
-	inherit mercurial
-	EHG_REPO_URI="https://bitbucket.org/tortoisehg/thg"
-	KEYWORDS=""
-	SRC_URI=""
-fi
-
-DESCRIPTION="Set of graphical tools for Mercurial"
-HOMEPAGE="http://tortoisehg.bitbucket.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-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() {
-	# 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
-}