Version bump.

Package-Manager: portage-2.2.0_alpha174/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

4 files changed, 94 insertions, 18 deletions

diff --git a/dev-vcs/tortoisehg/ChangeLog b/dev-vcs/tortoisehg/ChangeLog
index 3ebad5ccfcf7..1e9177772237 100644
--- a/dev-vcs/tortoisehg/ChangeLog
+++ b/dev-vcs/tortoisehg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-vcs/tortoisehg
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/ChangeLog,v 1.38 2013/05/03 07:46:20 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/ChangeLog,v 1.39 2013/05/07 00:45:39 floppym Exp $
+
+*tortoisehg-2.8 (07 May 2013)
+
+  07 May 2013; Mike Gilbert <floppym@gentoo.org> +tortoisehg-2.8.ebuild,
+  tortoisehg-9999.ebuild:
+  Version bump.
 
 *tortoisehg-2.7.2 (03 May 2013)
 
diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest
index 851bfe4a6d5b..0c7a32247773 100644
--- a/dev-vcs/tortoisehg/Manifest
+++ b/dev-vcs/tortoisehg/Manifest
@@ -4,26 +4,18 @@ Hash: SHA256
 AUX 2.7.1-qtversion.patch 879 SHA256 092f107ab2ca82ca4dafdf2790ae5b1d82246d99c65b9f56a807b046c160d3d2 SHA512 a1e164c8e473700a6c08efb58a589b95bb44e12a6aa35b10b30beb068f2b7dc8e7435f2e0dca6d9e5b7b25b7ca8b9668085cf3584079f61d60a39ff6988478b8 WHIRLPOOL faf2d1725d4b8f3b4f2f74f5870425b03d099d4cdef054fe88edaa5700a776319d38d5d526c2692d0a7001848529ec825506702b33d847f7b285c86fef64e9e0
 DIST tortoisehg-2.7.1.tar.gz 8954742 SHA256 d279432f612b2fe9790a4601119aaf50024bf2372cad2df76b9aea24c1c843c6 SHA512 d3787be0815df054fdde65e4c9077fd9abf5862a7ea5f3e8641435d2beea3422ecd6c48657decbfd95427e48cc49125882edab09d6719db896b2ccb8440b9140 WHIRLPOOL 60e65fc217f2b1dd51e247f8c2c33a5427b458b833565bc6b6ee27d9afd3d1ad54c5e405436a4c3d587d8972dd38d5bc1beaeaeb0fb9c91f5cf85bcf244f3115
 DIST tortoisehg-2.7.2.tar.gz 8971703 SHA256 21da4ea31d3a376a53f98ead49dceb4c68179327fd740522021a1ff7edad1b1d SHA512 677a3bfd1d98a8e0860d0d84abc223db9337141a7891125b564c69354e18838a4e5cd9fe92ff39d244706cdce3c9d0b23550416afb66f730a6a338e02fee2a96 WHIRLPOOL ee58ddf1bcb7dc83e50027545f672db5c51bde02ca0c4724508e53caaf5e865501b835229daaeb2c1571233eb5a061aa93df71029caf1bd36e7a07fc25821773
+DIST tortoisehg-2.8.tar.gz 8978628 SHA256 473aba6d925f91a8461166bcfd5e21a28d05ce810f96cefb4184bd2cbb388fde SHA512 979641268c743816a73bd748ed396f38a8bee0ff6fe64d9dc1a0c31a41b99f71491712932355ee87d1a5be9e27e2cf59c0c0ac3fc318614b4e6c48413334107c WHIRLPOOL 0f30a421ef208a12c2eef22a8ba3e06a8d5c9f7b855f6d0971c59e028c5928b978c3cbbd8219587ef0dbf94892ce8de55d0ecb0933eeabbb42b21b04350bf900
 EBUILD tortoisehg-2.7.1-r1.ebuild 1967 SHA256 8a13c6cb25d7d0dd19aacf312112d09a66a1999add86462f0efb38361847915a SHA512 8c30f876f9ac1d17d1efb0a674cc2f5f7a52bed4c29616eb185b94c8ff3bc7348ae6afcf32cc7d266b89ad0cef56531ebd9d10f13d37d1fd366b7f58ec0c9820 WHIRLPOOL b1d67ed3fa1f352380897a867465aaf82e6b8213f6bfd9f8335b10b07cf2b3928445df0a680c12dbe0e14e8619ea4ac0b7b1561605e4a592aa97e731dc010b3e
 EBUILD tortoisehg-2.7.1.ebuild 1921 SHA256 c84c9e7d5ae19607a825e51cab15f42d335d1eade322bc07e805ffaf450c546b SHA512 3fc659a1899eb2b6b69f6d9fdcf724b432f7f4cb238e96de5fa415f9625aa052ef06214d367974d8855fe8c2d9d268f9346751155d78e3ef8d06b5b21530efcd WHIRLPOOL 0f63fe0cd07c25dd6d7129adf02c416c9e33e403f52443ebb1f8e0d27e03b72c3167cde721af7e938214903e515d4377332904d7e98f0e1cb0f171b3e11d14cc
 EBUILD tortoisehg-2.7.2.ebuild 1921 SHA256 2ff6585afe2c385c835eb1d5ed0ee1194f07d6601af9a1bcaf8c36a667545916 SHA512 0c336fe12d7733d1f3ceba78e063475bfbf5a828c883af06ed2f2c75a536867f3f391fd859fc437e904eb739448f38cbfc2bc36cb7808828a626cc5391d8a1e2 WHIRLPOOL f17759b51cfcb08d62eb721984fa1fe2830036f37f422515e36fb9ed13df574d3bcd3dbc9119bbce893937031ac236f1a2482464940d364a344cc3f776764ce1
-EBUILD tortoisehg-9999.ebuild 1916 SHA256 fdc514219d4d8e2466d86193b2746da8d5519e42cd6c38c998365458994f5d16 SHA512 946e8016c79a9be463c95d503a3d6f0fcd68d4dabca24fdb00666ce8a64a5e9aa90b0f97aacc287db9e56d32d53df437d1500600bc2f2b0140e68f0a2a745d5d WHIRLPOOL 11808f949b8a20dbaed9ae55a509083c0c183fc01061a637d96da155c3bbd0f78107159d9594a103f4ff2ec4beb33821dd338e705996eecd576f3c95977f0c03
-MISC ChangeLog 6503 SHA256 50b007ee1154c595ae4eb9131ba432961e1b2b7ebae5e05a75c1d39220f519ea SHA512 5719a165486ff9b467d0f0760d4ff43502997386428f8a80c6af2b2ecf38088fbf4456f1babe3aa18a0a0157c4d269be54081dddf4d64b6a1a4a088df686b0f3 WHIRLPOOL 8cb2a8e206497711ad2174bf19d2ee356453e746c947dcdcc04d894de69a01eae20ecdf7bbe683904d6f44a71ccc04f7cd46efbd306d532fb106a4ca5815180b
+EBUILD tortoisehg-2.8.ebuild 1914 SHA256 6e487d6146ea6fe2b71d1a96236c84aeeb24f7e701c896426a55322ac7008cc6 SHA512 84a8df40b94948d8cdf6b145c818bd0d1ce363cb66fef03a5089253f83e47b46bf2b835bb843284db3bf97a5c753bcea25083f3764ffbbb45743c39b62b2281e WHIRLPOOL 5c33b157c0c371bb34c90cb4d085080a63c906d9d73f9690e29c228d8e9b7040977a0edcd9a94774ccf8bf642d2ef1757c97399ce84bfef7aaf2aff377fd99f8
+EBUILD tortoisehg-9999.ebuild 1916 SHA256 a55f4ba4229c8d3ab3b2fcb8ae57790ea8a2d8b7f1cf412afb356f29286d7bfd SHA512 33eef9c907089642e53c024b5e7e5c613b295a3dd0f1c13a1de975835fd040940c56e8e55e33ae5908b0817d9c72174b2d7cc89a1c84a4238ab79e3777d818ec WHIRLPOOL d3e08ff9ebfd7b95f4c857c745dfb8f6cea2518d2d681113594e9c7e4b231025df586508dd98c88fb5a41d556d0c8ee5a1d7467b3a0461e46f67d8ec39f511ad
+MISC ChangeLog 6645 SHA256 e6531c61d730ca2fdfcbd6dab8360bf1e983c6e4129f94c0e0e3bce097068133 SHA512 13a7ba3492719392194ce2cee853c6779bdbdc2a32092428d8b9644bb82642f07b2fb2b89e80ed6ddb137cc687bab6d8a2e1b3095c1b6b8bca25345978bbb0ed WHIRLPOOL ca18d75c1c557e5a442e991b4eb2fafd84dd5f2ff2a17568c107d783e9ea3353766572c10c0ab36828143440dc55467ec402b11d2916315b52f7f0d831cbe382
 MISC metadata.xml 330 SHA256 d7ad48468c73b97db8462532efe7a2b1858883ed765e9c62b60dd9ab51fe9793 SHA512 6ea38fb93b6f671785062726c2a62ed042d270475e7657763bcda1ccd94ca8fa14396c7e0fde65ed8b827638d0a190e0c0699673359a5bf95e4fa965d6ca8e4c WHIRLPOOL 2dd5a5d00e461b1e47c674a185554b25bd28b923167f877d0a097c498a8f652a1302c18f5a475b9b0ca7b028184635a76e3ea03789fce2e4a82b8ed55ce7081a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRg2tNAAoJEPiazRVxLXTF/NQP/jeMXQOx2YoxXyv9eFZTI8cK
-iJ6wnQ6sIUoYlqDKRtXrGEFxcYBGIJIc7eGYQuF/6v2QfUxrAyF3vHBxqCuMd+Rc
-lySukG1Pq2shFOFow3T4bAlZNRLfIc/sCq3PelwxCUfAFeCVfB2GTUOwQsZ2rYOW
-VtQHEXPpvhVZ0JS23j96jLllvDLEKLvWsoPrdTlGwlew+4bIjxBaYpGQ2M9fpipc
-1wpGLUGwX7euNaVgZDaBVspnYQcUkAdMLls6PfihClQAgrdrsEjTWxln1OEH1wPz
-4XmBkLTeL1q5vI+8T+sddsyCu3Dl5qRDnNmhBRyKc+XDWRXH3zfcWSDOjH6Lzo8f
-2Q2wtcYbuxkif3rw+XT3wc9n8km82lagQf74eQILH1Wn5HSUnb7Z73H1zjlcwsZn
-ebzi71dc8hAykHSZvwEeS7MDhCtkx+2b9MUcntG3ZwsOdZhhzgV1Mk+E/r7fFgig
-Bm7aEUPwy5SnXS5CVLCUMKAWe0RJUz5BEH+1U6Y9djrbNY/FmY4kFSbl1dhjm/vG
-2xVsiaZx3/sUT+VgWBilXtO5N2ZQx3iUGCzQvCmA2AWNxc8sGmcSN9mVP/WKz7er
-Qn5RQ4GSDB4ea17oygpaBYlTZbvam2EatH/S5UVCsQbrv6IX5gfm+k5wNQsBPXx7
-+y+hBU8umSOVh3cjGm9S
-=FSY+
+iF4EAREIAAYFAlGITroACgkQC77qH+pIQ6SzHgD/XetD65noDJGKBYKk67SkAYIp
+KZ+z5yQQnqUmWUC/+OIA/Rn8Y+Gqzs8iqq8a/FQYJN4EnJrdkJEoqX5Rei3M7gDY
+=fABn
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/tortoisehg/tortoisehg-2.8.ebuild b/dev-vcs/tortoisehg/tortoisehg-2.8.ebuild
new file mode 100644
index 000000000000..4c2bce07e5ee
--- /dev/null
+++ b/dev-vcs/tortoisehg/tortoisehg-2.8.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-2.8.ebuild,v 1.1 2013/05/07 00:45:39 floppym Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+
+inherit distutils-r1 eutils
+
+if [[ ${PV} != *9999* ]]; then
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="mirror://bitbucket/${PN}/targz/downloads/${P}.tar.gz"
+	HG_DEPEND=">=dev-vcs/mercurial-2.5 <dev-vcs/mercurial-2.7"
+else
+	inherit mercurial
+	EHG_REPO_URI="https://bitbucket.org/tortoisehg/thg"
+	EHG_REVISION="stable"
+	KEYWORDS=""
+	SRC_URI=""
+	HG_DEPEND="dev-vcs/mercurial"
+fi
+
+DESCRIPTION="Set of graphical tools for Mercurial"
+HOMEPAGE="http://tortoisehg.bitbucket.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc"
+
+RDEPEND="${HG_DEPEND}
+	dev-python/iniparse[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/PyQt4[svg,${PYTHON_USEDEP}]
+	dev-python/qscintilla-python"
+DEPEND="${RDEPEND}
+	doc? ( >=dev-python/sphinx-1.0.3 )"
+
+# Workaround race condition in build_qt
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	if [[ ${LINGUAS+set} ]]; then
+		cd i18n/tortoisehg || die
+		local x y keep
+		for x in *.po; do
+			keep=false
+			for y in ${LINGUAS}; do
+				if [[ ${y} == ${x%.po}* ]]; then
+					keep=true
+					break
+				fi
+			done
+			${keep} || rm "${x}" || die
+		done
+		cd "${S}" || die
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	dodoc doc/ReadMe*.txt doc/TODO contrib/mergetools.rc
+	if use doc ; then
+		dohtml -r doc/build/html/
+	fi
+	newicon -s scalable icons/scalable/apps/thg-logo.svg thg_logo.svg
+	domenu contrib/${PN}.desktop
+}
+
+pkg_postinst() {
+	elog "When startup of ${PN} fails with an API version mismatch error"
+	elog "between dev-python/sip and dev-python/PyQt4 please rebuild"
+	elog "dev-python/qscintilla-python."
+}
diff --git a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
index 56e7f74a58db..4b51b48a9942 100644
--- a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.19 2013/03/05 03:44:16 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-9999.ebuild,v 1.20 2013/05/07 00:45:39 floppym Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_5,2_6,2_7} )
@@ -10,7 +10,7 @@ inherit distutils-r1 eutils
 if [[ ${PV} != *9999* ]]; then
 	KEYWORDS="~amd64 ~x86"
 	SRC_URI="mirror://bitbucket/${PN}/targz/downloads/${P}.tar.gz"
-	HG_DEPEND=">=dev-vcs/mercurial-2.4 <dev-vcs/mercurial-2.6"
+	HG_DEPEND=">=dev-vcs/mercurial-2.5 <dev-vcs/mercurial-2.7"
 else
 	inherit mercurial
 	EHG_REPO_URI="https://bitbucket.org/tortoisehg/thg"