Version bump.

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

4 files changed, 102 insertions, 8 deletions

diff --git a/dev-vcs/tortoisehg/ChangeLog b/dev-vcs/tortoisehg/ChangeLog
index 251dea1db363..9e771b99f309 100644
--- a/dev-vcs/tortoisehg/ChangeLog
+++ b/dev-vcs/tortoisehg/ChangeLog
@@ -1,6 +1,12 @@
 # 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.16 2012/05/03 02:25:52 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/ChangeLog,v 1.17 2012/05/07 18:04:45 floppym Exp $
+
+*tortoisehg-2.4 (07 May 2012)
+
+  07 May 2012; Mike Gilbert <floppym@gentoo.org> +tortoisehg-2.4.ebuild,
+  tortoisehg-9999.ebuild:
+  Version bump.
 
   03 May 2012; Mike Gilbert <floppym@gentoo.org> -tortoisehg-2.3.ebuild,
   tortoisehg-2.3.1.ebuild:
diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest
index ec6242e75fb5..d725b1dd1840 100644
--- a/dev-vcs/tortoisehg/Manifest
+++ b/dev-vcs/tortoisehg/Manifest
@@ -3,14 +3,16 @@ 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.4.tar.gz 8978194 RMD160 368295eeff289599c30562ad84fb0bfd6a16fc0d SHA1 cde776dc9eb29ed9fca0d67e027adcbd4841e6c6 SHA256 117029ff1912b98c52cd89ebc6ee6aa5d4375bff67bbc1d2ee9f2bd636d06233
 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 2793 RMD160 d6adcafc9d58cc827aebca4a56bc07b1eeb2a6d7 SHA1 eeb64d494fb06b76240c825d8b1887f22bb8c113 SHA256 4ba12e6da6ea4024d70ebea0ddb37e8505e2611f7b053d0551b9a0bdf7b7b4dd
+EBUILD tortoisehg-2.4.ebuild 1847 RMD160 a35286820a53a90079b4dfe1165ddcadd798bbaf SHA1 6912ec5f52e617b4cb2adb93c063a9f7ebeaec4a SHA256 90939928b057417d01b7f6eb24473e62c7849478ed7280acc9dc77effe613912
+EBUILD tortoisehg-9999.ebuild 1521 RMD160 1a8aaa7c0c8134988b1cb39c4299f8ecdb096edd SHA1 6ab38949d6a9eafba4b483f07b709fefa851e6b0 SHA256 bcfa292f41e5f1e733df719ef36dd66cf0d145a6181cd776a239edf68a8a97f9
+MISC ChangeLog 2940 RMD160 ed55b2a3aaaae5d88457d4ba9befd72cc1acafab SHA1 f441e4513bb8f21579b3b379d4c2de012fff0320 SHA256 4b1cf3412863f5bcc68648bb965c1cdac890b58228d2e3ac3bee650015bb0ed7
 MISC metadata.xml 337 RMD160 8d648546c6f6d9cfac725f1acec7c6938515a671 SHA1 719f0b6af46dbd922e9994c78fe8ba1b06cf3ef4 SHA256 819e42b8e72796ad9d65a8a5042beb1e064f675ddd20ef72bab0a4ae40bd6a8a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk+h7LYACgkQC77qH+pIQ6S7/AD9FZ6+Lzy1IM2b54H3RRTBnDgy
-bjNmqGImCptuvR3D+P4A/0xLAGBQbRX7QLkgQAQfqdNX5dzSXUzLzOwCq0NH/G/A
-=efbZ
+iF4EAREIAAYFAk+oDsQACgkQC77qH+pIQ6R4kAD/cqLvsi482BvM3n18rvxJz2JI
++//dpVMDwYE3nRCUfQwA/1DDS2dYblR0aiHc+aPkZqTYuANzXPIfNg6DMC4E8iNq
+=t75V
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/tortoisehg/tortoisehg-2.4.ebuild b/dev-vcs/tortoisehg/tortoisehg-2.4.ebuild
new file mode 100644
index 000000000000..5b243caa7b6e
--- /dev/null
+++ b/dev-vcs/tortoisehg/tortoisehg-2.4.ebuild
@@ -0,0 +1,86 @@
+# 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.ebuild,v 1.1 2012/05/07 18:04:45 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"
+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.1
+	<dev-vcs/mercurial-2.3
+	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
+
+	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 || 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
+}
diff --git a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
index e1a2630f4abf..c52687fcadff 100644
--- a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-9999.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-9999.ebuild,v 1.6 2012/04/17 15:04:36 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-9999.ebuild,v 1.7 2012/05/07 18:04:45 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-2.0
+	dev-vcs/mercurial
 	nautilus? ( dev-python/nautilus-python )"
 DEPEND="${RDEPEND}
 	doc? ( >=dev-python/sphinx-1.0.3 )"