diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2012-02-12 02:19:18 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2012-02-12 02:19:18 +0000 |
| commit | 3d111ee2a865072fba74308632d3dae25b68b8d7 (patch) | |
| tree | 06617b2b09a3e544ad352b5c4275384f7ee32997 /dev-vcs | |
| parent | Add patch for mercurial-2.1 compat. (diff) | |
| download | gentoo-2-3d111ee2a865072fba74308632d3dae25b68b8d7.tar.gz gentoo-2-3d111ee2a865072fba74308632d3dae25b68b8d7.tar.bz2 gentoo-2-3d111ee2a865072fba74308632d3dae25b68b8d7.zip | |
Bump mercurial dep on live ebuild. Drop unused patch.
(Portage version: 2.2.0_alpha85/cvs/Linux x86_64)
Diffstat (limited to 'dev-vcs')
| -rw-r--r-- | dev-vcs/tortoisehg/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-vcs/tortoisehg/files/tortoisehg-2.1.4-mercurial-2.patch | 20 | ||||
| -rw-r--r-- | dev-vcs/tortoisehg/tortoisehg-9999.ebuild | 6 |
3 files changed, 8 insertions, 24 deletions
diff --git a/dev-vcs/tortoisehg/ChangeLog b/dev-vcs/tortoisehg/ChangeLog index f728377759f9..8b7430d7be6e 100644 --- a/dev-vcs/tortoisehg/ChangeLog +++ b/dev-vcs/tortoisehg/ChangeLog @@ -1,6 +1,10 @@ # 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.9 2012/02/12 02:16:09 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/ChangeLog,v 1.10 2012/02/12 02:19:18 floppym Exp $ + + 12 Feb 2012; Mike Gilbert <floppym@gentoo.org> + -files/tortoisehg-2.1.4-mercurial-2.patch, tortoisehg-9999.ebuild: + Bump mercurial dep on live ebuild. Drop unused patch. *tortoisehg-2.2.2-r1 (12 Feb 2012) 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 deleted file mode 100644 index 3f3284263240..000000000000 --- a/dev-vcs/tortoisehg/files/tortoisehg-2.1.4-mercurial-2.patch +++ /dev/null @@ -1,20 +0,0 @@ -# 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-9999.ebuild b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild index 3ba72ffd0d50..a1e2497f7102 100644 --- a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild +++ b/dev-vcs/tortoisehg/tortoisehg-9999.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-9999.ebuild,v 1.3 2011/12/10 04:42:45 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-9999.ebuild,v 1.4 2012/02/12 02:19:18 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 )" |