Put upper bound on mercurial dep.

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

4 files changed, 13 insertions, 80 deletions

diff --git a/dev-vcs/tortoisehg/ChangeLog b/dev-vcs/tortoisehg/ChangeLog
index dc99f800b163..251dea1db363 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.15 2012/04/17 15:04:36 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/ChangeLog,v 1.16 2012/05/03 02:25:52 floppym Exp $
+
+  03 May 2012; Mike Gilbert <floppym@gentoo.org> -tortoisehg-2.3.ebuild,
+  tortoisehg-2.3.1.ebuild:
+  Put upper bound on mercurial dep.
 
   17 Apr 2012; Michał Górny <mgorny@gentoo.org> tortoisehg-2.3.ebuild,
   tortoisehg-2.3.1.ebuild, tortoisehg-9999.ebuild:
diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest
index 6414a6abcb54..ec6242e75fb5 100644
--- a/dev-vcs/tortoisehg/Manifest
+++ b/dev-vcs/tortoisehg/Manifest
@@ -3,18 +3,14 @@ Hash: SHA256
 
 AUX tortoisehg-2.2.2-hgversion.patch 665 RMD160 628aa3e0c54d110151cccff5dc8fd1eaa879be6c SHA1 611ee90bd2e07cc3061d806a7a97a0cfc0fc3059 SHA256 e7fe886f98bd821e04d397183024b49d6d1a45ec9b26e2e1625440b97bc74182
 DIST tortoisehg-2.3.1.tar.gz 9970047 RMD160 6a22abe62369100ec905b7e7485241cf7799501e SHA1 03fdf7cc9ed3e1cf75dab285112ac04c38a6974d SHA256 06701807fcab987f4d9ce22a77fbfc5ef7d641df986d1618c44b7938cb70c6c0
-DIST tortoisehg-2.3.tar.gz 9961032 RMD160 cddb7a3d09aae42a6bf55fe3489399d17b3b474c SHA1 8638670c581cb167200481bd4c9f305e391f6edb SHA256 5f6f05dec5e43d14cf5210448cf6c5f77622171107e99ba666c24aabeb908d9d
-EBUILD tortoisehg-2.3.1.ebuild 1824 RMD160 b17a5875463af204be28976a009e10eddbdd1018 SHA1 abdc5114fd6d48fe5733b85ac87a24f76dfc00af SHA256 b997219a66a57745a94cc3a5f329588ff1aaf17621d8e566ba733241cd83f6ea
-EBUILD tortoisehg-2.3.ebuild 1524 RMD160 3bb226d6a3d10c2772655c58084131423499a03c SHA1 8cfd2c506a6238bb874455847487780f8a953b42 SHA256 539c6bc68fd54300865f0eefc80514a3d00f556e65813b4163ce0120e646f8d9
+EBUILD tortoisehg-2.3.1.ebuild 1849 RMD160 21ea2387c5db07f5e36282264f8039f44a25a5d1 SHA1 1852e94a9fe01da436abb19113d8dc8698c3ce1d SHA256 58066e4a1f48034a202b9be01624980fb2831a08d21578e1921f7276edb1b126
 EBUILD tortoisehg-9999.ebuild 1526 RMD160 7375f02044419353a33c108dfd28c207a665fa78 SHA1 02db9e958a6a0de8cefcf02d180d36bc9c8947e9 SHA256 5b10cada0fdf069728eb68dd6bc5f5b92ccdc94c5f8c6d017da98d1e020fef2e
-MISC ChangeLog 2655 RMD160 a9daacde7e0f149836a4de7ff2697f15ae32a3bf SHA1 c98aa5bfb9072c4bd67feb2e741aa83f194a3ba5 SHA256 d6ff69566cb18a7e20c5ecaf0273883ed8ab337885aed65690a0ff09ba00ad5e
+MISC ChangeLog 2793 RMD160 d6adcafc9d58cc827aebca4a56bc07b1eeb2a6d7 SHA1 eeb64d494fb06b76240c825d8b1887f22bb8c113 SHA256 4ba12e6da6ea4024d70ebea0ddb37e8505e2611f7b053d0551b9a0bdf7b7b4dd
 MISC metadata.xml 337 RMD160 8d648546c6f6d9cfac725f1acec7c6938515a671 SHA1 719f0b6af46dbd922e9994c78fe8ba1b06cf3ef4 SHA256 819e42b8e72796ad9d65a8a5042beb1e064f675ddd20ef72bab0a4ae40bd6a8a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk+NhqQACgkQfXuS5UK5QB1tLAP/SrlgSk3psXZvzcl0PENzTAs/
-mBoO8/LPweYqBGC8EuEAofBog0OORyVIz2Jo+toxi1H4wctjK1BIxTCbzNYUpdv5
-SNVQt7rDjlDvG6Ve/Mjt/00r8zCvHcMFvRDKYRZFke802nnPJMprDvxo91ENC+eT
-75Esg7e76Npd7VCgN58=
-=Nv+U
+iF4EAREIAAYFAk+h7LYACgkQC77qH+pIQ6S7/AD9FZ6+Lzy1IM2b54H3RRTBnDgy
+bjNmqGImCptuvR3D+P4A/0xLAGBQbRX7QLkgQAQfqdNX5dzSXUzLzOwCq0NH/G/A
+=efbZ
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/tortoisehg/tortoisehg-2.3.1.ebuild b/dev-vcs/tortoisehg/tortoisehg-2.3.1.ebuild
index 3f6128ec3a0c..f202bae03d3e 100644
--- a/dev-vcs/tortoisehg/tortoisehg-2.3.1.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-2.3.1.ebuild
@@ -1,6 +1,6 @@
 # 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.3.1.ebuild,v 1.3 2012/04/17 15:04:36 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-2.3.1.ebuild,v 1.4 2012/05/03 02:25:52 floppym Exp $
 
 EAPI=4
 
@@ -32,6 +32,7 @@ RDEPEND="dev-python/iniparse
 	dev-python/PyQt4
 	dev-python/qscintilla-python
 	>=dev-vcs/mercurial-2.0
+	<dev-vcs/mercurial-2.2
 	nautilus? ( dev-python/nautilus-python )"
 DEPEND="${RDEPEND}
 	doc? ( >=dev-python/sphinx-1.0.3 )"
diff --git a/dev-vcs/tortoisehg/tortoisehg-2.3.ebuild b/dev-vcs/tortoisehg/tortoisehg-2.3.ebuild
deleted file mode 100644
index df4fb0b49629..000000000000
--- a/dev-vcs/tortoisehg/tortoisehg-2.3.ebuild
+++ /dev/null
@@ -1,68 +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.3.ebuild,v 1.3 2012/04/17 15:04:36 mgorny 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"
-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-2.0
-	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
-}