Version bump

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

6 files changed, 262 insertions, 30 deletions

diff --git a/dev-vcs/mercurial/ChangeLog b/dev-vcs/mercurial/ChangeLog
index 10553d47b070..a57c09058540 100644
--- a/dev-vcs/mercurial/ChangeLog
+++ b/dev-vcs/mercurial/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-vcs/mercurial
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.185 2015/05/12 19:06:51 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.186 2015/05/13 07:10:55 polynomial-c Exp $
+
+*mercurial-3.4 (13 May 2015)
+
+  13 May 2015; Lars Wendler <polynomial-c@gentoo.org> +mercurial-3.4.ebuild:
+  Version bump.
 
   12 May 2015; Lars Wendler <polynomial-c@gentoo.org> -mercurial-3.2.3.ebuild:
   Removed vulnerable version.
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index 1d704be92f0f..abc6e6b5221b 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -6,25 +6,27 @@ AUX cacerts.rc 51 SHA256 3d7c7e238ab4db22d2457e039bb1afcb02c6ac3a6c9aee8448614b0
 AUX mercurial-3.0.1-po_fixes.patch 1396 SHA256 e111e7e609edec0cb13be1d89d6558bc41785c48266b3f1aca9bc6572c0d884e SHA512 c696e0df1f6d149e8522123fe51585ded2955bbea782819d634eaf6edb0ddd189c68372692cb247bbd96d51c69801c2d8232e4b0b60093ff1f11b28010292cb7 WHIRLPOOL e9ed6368f9a633fcb919c9466b9a613f5f4db62fbed3ac9427e2628ad882320415e851620d609b5ba5c3ee1d96f3d191bc579fdb645765e65f83043b2355bbc8
 DIST mercurial-3.3.2.tar.gz 4165131 SHA256 67c617c740ac706f923371a26f02339b27cd6c36e5d3fb2ccad0dc02361527fa SHA512 f151ea3187b70d70a82f643aaacd2742d0ce5f996590eab008332a7f28df5a19e99634ff33b0509ad38d2b6b411627413a457255df8a8e45025246beebb6fcc1 WHIRLPOOL 740b1ebb68f7c8baf3e6a9b023be2423677e3189221dc302c0601b514193e27eaaf73985c9536c6aa03fa0c5b9be8c092cd7b3eaca5f77ee24bfa276bbb6109c
 DIST mercurial-3.3.3.tar.gz 4167447 SHA256 a445367f0dcbaf3a6279bfa743b364e729be0d1f0c852cb6d37f297916ffae13 SHA512 bea215b0bd9e8603ade019f01ae0600dd1d1ad77675b38b5e13d86c43dd2c58b6c86c252517f0fcab6444c171e9f53537e4e170739c991ac08a1111169fe545d WHIRLPOOL e5fd41c6d27d7fce8559a2d15b33e24cf702d9497326e2c1062fe2acd22e7ad16cd6981d3dadb5a7458f12dcd35cc98583f53bc3188d99a9638daddb7d95657b
+DIST mercurial-3.4.tar.gz 4289081 SHA256 ff1da0545cdd46ebcf473176d55937a22bb55fff51cdff9d4c2f900fc80baf10 SHA512 a61b0d4cf528136991243bb23ac972c11c50ab5681d09f8b2d12cf7d37d3a9d76262f7fe6e7a1834bf6d03e8dc0ebbd9231da982e049e09830341dabefe5d064 WHIRLPOOL 200374186efa25cc22315c6125ead6af9ba2952205f9547d37b33f9bfd3b97b255f0aa29c703793fd4563022b29377cf12689394d921b598396a366a386c8556
 EBUILD mercurial-3.3.2.ebuild 3768 SHA256 2f054dfa76d51319b1818087176c0ab6f0c991bc1ebe29d19134ace92bf9881c SHA512 f1be7caeae5bd4cb89e00fc09743d4689b5014ef6607914593b06d63b22d504d894ec276bac0e4a41df1f17495547e4acdb6087a9a5b490db12cdf8f9a527cf5 WHIRLPOOL 711c3317a8dcdafcf248be908558a88939e62a7963bfff152918f98a02bcb44b8ba6b35588b78a1c42a61097bb673d6d2b248f7046200b44c908f54c9024467b
 EBUILD mercurial-3.3.3.ebuild 3779 SHA256 8e3871108162eb35810656b388a7b63ae3be2796db7ef60e0d39514c76160ebf SHA512 e5b23476a2c6589d2e119d4bf038565a5733b6f766172f6af69875107416eceec65bf6bef3c43d6860f910a44b097460b3b4c8140561b9cb9422baaa726f7440 WHIRLPOOL 15a9d24d77863adfdda4aa014f0dfab8bd9f4986b508103276050e4d72013db9478f39f7d3db1319bcaafe8ab97a9a2bdba30c1bdfe7ae9b04369451ad89c645
+EBUILD mercurial-3.4.ebuild 3783 SHA256 f09e17fac89ac001096278f1ee1216a9f4489a93ec57dc19d0cbc2809665baaf SHA512 454453f2dea67832c78ad7d4f43286cc77525a578283c231455aa23abc100ed511a445753855c3ac0df795bd196f11f28602808581e0ffb13a9ee3b7bc2c794b WHIRLPOOL 9eb1de11934026f561526ccb0e7d9419212ce21f32aea2a0286b2268bb1c0617d74ee868c6c9f03127631743b504afef73a64b4dcd50f29baf5c0a5c1d3a90e5
 EBUILD mercurial-9999.ebuild 4244 SHA256 0e08810696a1d444521d2e175b8c35c5f7cb29eb4544d1c0c1f4718aeb07adc8 SHA512 d102c5b0c6c17dbe72af87aefb4cd933d5ba3f5f1102911fbfc468511f9c2dea9679c98d9eb46083a9b9303dfeba76cc9620e79257daf6b1eca4439ecdea51cc WHIRLPOOL 95b155db1ac8cc2c751f48051dacbb6868c2d215186111f85c194a0aad5d4996f7a323754cdba61d137cf516d666390cd236160bbab3db4e48d6623f24c98b3c
-MISC ChangeLog 43525 SHA256 a94a2826edabb72dc4ceb8bba06d4ff564aafc259576df87899bd5286cc23057 SHA512 9c7aa9d03764d2f83f5006e48718db6d97467dd92ccf840243e9a10dcea6d986aba54f8c33258769d0fc7cd494d26ade851c69c3939930b6bbf7e34cacc9bc2b WHIRLPOOL f2856077482b6d408f45171c5ce00cdd793c645b1c0e4100f4237f4623068229960f8e94dac72fc7594e5ab60c61b09b568a94279a2ceb85416488b62860db62
+MISC ChangeLog 43649 SHA256 7cdc6c7d41661da180554a7fdc860af17db68b5dccbc3742c69f90a3a53269ca SHA512 3fe8aa6999ed8e55f9d19958f8e287faa69c69f852f9b1c2c5a5a3737bbb5153561c6b477e9857550de354892d6899aa34ccce7040a212cf93a929b9e4e5c27c WHIRLPOOL a506f69977327a861266b8d198480c97aa9708b6d5d5ef20d4a02bba2947d8347493754bb118a760d327d65fdb70689e159a8c7c0202c7c4e2c7eab520b57e80
 MISC metadata.xml 704 SHA256 480f335881782bc8d66eb715a3f36afd00ee91e815e01af3c2e0e04e132b8aa5 SHA512 c821612c8f09223e4d3790734040727872cfcdeffcea6afd6d3ce8245bb263aa5707a9d892a8e3308e05ab00c18a911f2c0a3549b350eab4a3a794051d974d0b WHIRLPOOL d0ca9e9a0db527bcf2e7bf41118ffe967015d740269ada1dfc1ae92118fe53e5588a824fedd2fb7bc77077902e9f1de5d50ca0366744bf6059486a62859f03d8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVUk9MAAoJEPiazRVxLXTFmr8P/j0yuE43Oe7MIcCXm1mKwOc4
-WxZxT/JjyQlCBZA5wvKGPUUJeYa377tTW06ccDuQBX3g/dmfDYpKtHD4YCpVPFeX
-IBMb01nr8FSDqBYAJLi+cyTezSnhpJ817OHUpdPJDrQBYLbbUfiIdnYh7b9Sz5lR
-mGl5oVblmHzGDHQyYL3CqiNz3oz84rBXMA0HwHN0EoHnZIaGfP3FhuvQJ8TE+/J0
-4JE32HbaiNbCjhwAcJuMbSntbFqrtgrZFdhqixbg2vQnJ40pzdd8MC0OoTCh3IVv
-iI7yfHZY6GTUb4uNxuS5ag04v7CCv1DUpsBGqWa++EuofcVWsTtjm1H3q7IST849
-HS0aJpXOiFg0Ocbuc1WTDBdW8zNAJ8OtjVZ/GIshAUBsR+krIqQ64yMnbLZID85z
-qEa8A2qz2+fgZJeW0vQ0tsEjoKazo3schGbajmOJ/URsELdYDQKiaPUjqwL/BWOd
-sLFrp6/WVpifGmLwjpDrPD3Pi+Zy3hsfRjGgNaSOm+R0jqtnVwK1yfCofN1W4cZs
-r3oKQHj3u3+9EPFNn3IxP/wWIPRjYsDjUUxTLEuimJOKTR02Ze1Is3qwtrdmujAX
-OVmshzci5m0EwWn44NqlIclwTZf1O9z4ioGaOgEegPViVlDh2au5CEytHVstuQjM
-QRnMhxFIi9UMNlpZCZux
-=u5JV
+iQIcBAEBCAAGBQJVUvkAAAoJEPiazRVxLXTFy+kP/12znq170iRVpsr46mli6HBx
+JsID5rwuzSg0QAwYa+uarZle8E/xpMgBjPIvIO7/dtSVKDGL0r9HSAKhTSzGTekG
+tFj9AbjXbirnq5+MJ/T/hewTBKeNSsUHTXFCZD+9MpYLGvVxDNgGHB6uAi9uVmKe
+U4iGp1hOoPn6C2elPtSTzMG9BNqPBG2dExfEGLas7rFkx+Yc0DDCHKTUNj1BfSHn
+6YJyeUvexKUFMC9IoJa/2tAAGBUa5rSav/juEd/umyhdpDk+uyafu++41aNfDClU
+8jueR/Dj1l9Vx41wCudb/LGyJpCTANphWVdiZZQ+BpbIGDjB/7B59R39EAeK7fWO
+FIkIutGAIxKXWu9GHczM9UZsZEjb6iYyrN8nf1CoUXQ6HuC1rbW777gkqTcr5K+b
+KT5WlStis6bK7m9VdG3nNS8HudRguPqtXfm/3Cn0GBv8TNujaMYkZEP62UdN+DsA
+wNk7CMu54UtzFjdnKA8OnzSimxDuWZPpWQLFhQ7PBp0julLfcbdGvqX8ssp5I983
+Xza67a9Ye2BQrRCc/SROgB99jk8MBxXqN4IxuwXzHQOhJMPXg2YE6Ester7a+Fdi
+Z/G6K3uK4boUbYgL8WOlrQjYTcdec+mt5TQjur1Mcrn67C/xiTq1BTRBRPRU5+OP
+y/pGanJqJDG5S/ZvCxP+
+=/fSf
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/mercurial/mercurial-3.4.ebuild b/dev-vcs/mercurial/mercurial-3.4.ebuild
new file mode 100644
index 000000000000..9d9319db7b3a
--- /dev/null
+++ b/dev-vcs/mercurial/mercurial-3.4.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-3.4.ebuild,v 1.1 2015/05/13 07:10:55 polynomial-c Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+
+inherit bash-completion-r1 elisp-common eutils distutils-r1 flag-o-matic
+
+DESCRIPTION="Scalable distributed SCM"
+HOMEPAGE="http://mercurial.selenic.com/"
+SRC_URI="http://mercurial.selenic.com/release/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bugzilla emacs gpg test tk"
+
+RDEPEND="bugzilla? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+	gpg? ( app-crypt/gnupg )
+	tk? ( dev-lang/tk )
+	app-misc/ca-certificates"
+DEPEND="emacs? ( virtual/emacs )
+	test? ( app-arch/unzip
+		dev-python/pygments[${PYTHON_USEDEP}] )"
+
+SITEFILE="70${PN}-gentoo.el"
+
+PATCHES=( "${FILESDIR}/${PN}-3.0.1-po_fixes.patch" )
+
+python_prepare_all() {
+	# fix up logic that won't work in Gentoo Prefix (also won't outside in
+	# certain cases), bug #362891
+	sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	strip-flags -ftracer -ftree-vectorize
+	# Note: make it impl-conditional if py3 is supported
+	append-flags -fno-strict-aliasing
+
+	"${PYTHON}" setup.py build_mo || die
+}
+
+python_compile_all() {
+	rm -r contrib/{win32,macosx} || die
+	if use emacs; then
+		cd contrib || die
+		elisp-compile mercurial.el || die "elisp-compile failed!"
+	fi
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newbashcomp contrib/bash_completion hg
+
+	insinto /usr/share/zsh/site-functions
+	newins contrib/zsh_completion _hg
+
+	rm -f doc/*.?.txt
+	dodoc CONTRIBUTORS
+	cp hgweb*.cgi "${ED}"/usr/share/doc/${PF}/ || die
+
+	dobin hgeditor
+	dobin contrib/hgk
+	python_foreach_impl python_doscript contrib/hg-ssh
+
+	if use emacs; then
+		elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!"
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+	fi
+
+	local RM_CONTRIB=(hgk hg-ssh bash_completion zsh_completion wix buildrpm plan9
+	                  *.el mercurial.spec)
+	for f in ${RM_CONTRIB[@]}; do
+		rm -r contrib/$f || die
+	done
+
+	dodoc -r contrib
+	docompress -x /usr/share/doc/${PF}/contrib
+	doman doc/*.?
+
+	cat > "${T}/80mercurial" <<-EOF
+HG="${EPREFIX}/usr/bin/hg"
+EOF
+	doenvd "${T}/80mercurial"
+
+	insinto /etc/mercurial/hgrc.d
+	doins "${FILESDIR}/cacerts.rc"
+}
+
+src_test() {
+	pushd tests &>/dev/null || die
+	rm -rf *svn*			# Subversion tests fail with 1.5
+	rm -f test-archive*		# Fails due to verbose tar output changes
+	rm -f test-convert-baz*		# GNU Arch baz
+	rm -f test-convert-cvs*		# CVS
+	rm -f test-convert-darcs*	# Darcs
+	rm -f test-convert-git*		# git
+	rm -f test-convert-mtn*		# monotone
+	rm -f test-convert-tla*		# GNU Arch tla
+	#rm -f test-doctest*		# doctest always fails with python 2.5.x
+	rm -f test-largefiles*		# tends to time out
+
+	popd &>/dev/null || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	local TEST_DIR
+
+	rm -rf "${TMPDIR}"/test
+	distutils_install_for_testing
+	cd tests || die
+	"${PYTHON}" run-tests.py --verbose \
+		--tmpdir="${TMPDIR}"/test \
+		--with-hg="${TEST_DIR}"/scripts/hg \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+
+	elog "If you want to convert repositories from other tools using convert"
+	elog "extension please install correct tool:"
+	elog "  dev-vcs/cvs"
+	elog "  dev-vcs/darcs"
+	elog "  dev-vcs/git"
+	elog "  dev-vcs/monotone"
+	elog "  dev-vcs/subversion"
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-vcs/tortoisehg/ChangeLog b/dev-vcs/tortoisehg/ChangeLog
index 2daf6bf67164..20233ad63ea3 100644
--- a/dev-vcs/tortoisehg/ChangeLog
+++ b/dev-vcs/tortoisehg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-vcs/tortoisehg
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/ChangeLog,v 1.76 2015/05/13 04:52:48 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/ChangeLog,v 1.77 2015/05/13 07:12:37 polynomial-c Exp $
+
+*tortoisehg-3.4 (13 May 2015)
+
+  13 May 2015; Lars Wendler <polynomial-c@gentoo.org> +tortoisehg-3.4.ebuild:
+  Version bump.
 
   13 May 2015; Lars Wendler <polynomial-c@gentoo.org> -tortoisehg-3.2.2.ebuild,
   tortoisehg-3.3.2.ebuild:
diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest
index 379c61974261..5ae7cc63c0cb 100644
--- a/dev-vcs/tortoisehg/Manifest
+++ b/dev-vcs/tortoisehg/Manifest
@@ -3,25 +3,27 @@ Hash: SHA256
 
 DIST tortoisehg-3.3.2.tar.gz 8226128 SHA256 779beb06588897d1c42fc463fecc4b61498f7cac76681fe1c1f017ecd811719a SHA512 4b7e1422731507aa8947b0e8e7746a6daa004186833db200122927c4e5a2f2cb1fbbf12f89089e3ee82d1a22fdb3c7745465188cbf3e14d73d831b953f2b2d9f WHIRLPOOL 34fce6c6383ae94eb4d6fbca854068535ac39b50746dbcc3ee9460976231dc68c3c5f824dc31082838505bdaeaf3620306ceea867d8ac5571d00ee1f1192e867
 DIST tortoisehg-3.3.3.tar.gz 8230380 SHA256 a22ec794b0152b25b085447a253594dde27f71863149b9471ec70669687fb47f SHA512 ed15a2ce76647f6c2d9df2daebc62f983eec6a27ea15a808060d83968cfee2c22f643b2ed6fb48bf06dd5d7cb9f4178e756e539eec2ca43e74fe4c8cfc7da4cf WHIRLPOOL d069dbe4ca109aaf2ebf9dd73f2d87343c2c71a8d5a894a5b7278a5edc878aa7eda56f9d53dca8968d1e730eea94a9f814a5cd76fb4af522a506753a5342cb47
+DIST tortoisehg-3.4.tar.gz 8230401 SHA256 d3ac14e374b551e3f7ebc14f15648250b68f103de3fbfea24fd866110299145c SHA512 9c968529432bc32f8dd1ce14415623687c0b37755fc5de97f6f8acfb395b61084a7ea92501552d77ff162c9394cbebd372423ecbd5986b6b647eb172e74a3388 WHIRLPOOL fc827fc0410d58f6963e0fa12f7d8b509675acfd94d31ca92eb628102d5bdfb3687591302be58ee8bb95b7f502dbb163dd68807f4ad7bf490521f07a08161b01
 EBUILD tortoisehg-3.3.2.ebuild 1932 SHA256 b976e18c5a126636d48f9d6e2a5c4c8899531f9691d07f1ea309ae24d64a135f SHA512 598dbf9cc42fc4f580f18ec8533fa930a8e49b1ae088c66ee1bd449077aa1f624b868d6833b82b5a9a558607a2736b7a9217eaadaedc62b6585e212eded99e89 WHIRLPOOL 4443e8b741f5055ebbe5e70da295742245fa22083100b2c584090315b3f4893d41ba26736093821f4a042b698d62866357a58034248278ec4836ad83db57aa6d
 EBUILD tortoisehg-3.3.3.ebuild 1934 SHA256 07cdb59f85ebe82c94dd1d283e5498306a43d24566dc830ee542ede9bbb4731b SHA512 9b7e17ca79fa1fe43a116f52fbf047ea3a92b33ba757ecae63d1124dc94c115b1f9129cef540dfff45dca57fca4023b19d5222d2cc732941c5586a47e858061b WHIRLPOOL c90706bcc373874ac8e86e619a28338dde4645bb1d60a10e44fbe4c50410bd8eff08c15460f288595666ad0218437bc4f6a320730bd45e20ead5d09e4724450f
+EBUILD tortoisehg-3.4.ebuild 1932 SHA256 e1d43fb72284e190f5bd114109e456e7de252c7bb7a497a1a790a8c67ece9c26 SHA512 2b8b052bb31c4dd4d8bf766df22ce5629927b54e6d16383047d170b848d488e58412bc026e8f5dffabb06cac2ae136566ce2ad339f04b4a2af37c81de3888f4c WHIRLPOOL 65d4fccb5979954c95d8bebc4ec1c6d2eb1cb5ec6771d976ea8987a814a73f60e0ceaf8a38cf131fbc18721af6db30889537718307469d933551d2f1d9564e1f
 EBUILD tortoisehg-9999.ebuild 1930 SHA256 40c98b08ff07bec3c84a30ba2448c2a683f5e2d6eb7a19468a61a301ece6eb55 SHA512 82740dd2c20256fdea850890b2ac4a63bfbd1f6d0eb44659d5b45fab645731156d00b03febed7642931972ea383d4e58c4749df8e3e20380dda8e5d726f5998b WHIRLPOOL f0edb077d8c3fb91e6e910189dd0c512619effbd81376b8486cd04e0d9f0c4c450560085b143f3990d2efc3e88ad043a0a402242878d525549ba6d3617108b5d
-MISC ChangeLog 12765 SHA256 d59c9f83f0ab14a2cbda053c868f9700a040285767cbacca33607151ca5335c3 SHA512 48813dd444132fc088aa136d96655887193ca2ee45408404e6caeccfb440d502656ace628d37611091ef2c5d2593131714d24c400050b23a3bf0851895734a69 WHIRLPOOL c99b6c80e2aadc2f845ee16bd01352779de2b412108aa71742a6a85f79eadef5eac59cb2ab571f2b9ddc4c2db83214017cff55bd22d4d82eba55cf27f2659b03
+MISC ChangeLog 12891 SHA256 940e0116c50976523b279960d52d12ace253e7f74c9e59445b8cce63f5c0e7b4 SHA512 902d773b6ae5dd7b3b4d100774bacbb63cc8c78099e10d56f54fd91dc62ae608fc4bcb6bc08956678ef01c4267a80cb90434a8dca43cc19a2d11ba72c93ecc39 WHIRLPOOL 5a81e9a837120a47cf5dce780881d61038b55daf626a766f4e9c74c2d680dc18bb0ae50b65f0f2f1a8dbb953425a5a1c7e7118c1a2cc627158bce0d7cbd67790
 MISC metadata.xml 330 SHA256 3a426c0792eb862bd697f0e6a2afb37621a1a5ea3a5ef4ddaaf748bb94e9eda0 SHA512 83d0c23820847cac4ca7e298392581051ac4fe45c88ee36b23ee20634f62e38b3a6a6c7df17952cf685213fb8755e358a6f7b602ac46aaebbdec8e71bbcbaedf WHIRLPOOL 53b2b3929cdd21719c8389cca2fe646b6549608ae0fa381ac1a228175c4aef7295acc6b1da4ebe5c9f11c91f6e0a5343b0268993afbbc5a2e5348617b740baf2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVUtihAAoJEPiazRVxLXTFWIYP/i5VA9lbvI60tm3/r39HVe7u
-qcqklt2lD1b+OkTPoShW5aCSpK8fWS6GVROEMxognGOT+NRREyggFnOGEakFiMfd
-Slk033WMyH/nTEkMj18nLgD4MKut80QvP07zpO19NeqFsuCXTsNEXR19fQv64dP/
-L++EyyEdkXYgnjTUMLeXtd18HIVjAf7cIcrnKZtiiAjBr7kpH8wKE0b03PQDgy+f
-DiKD+Avdz5INYl0tN32DTp91yxZi3ud3c4CXXfYKxdZqw1VkyK9Gok3Hm4IyEw3g
-qcEMmhTNi07UlE+Q3mb2Y3ZQY40AjRX+q0iaFhn5hybNgtS/CheSWh0iH0eLgWQM
-dQvha6NIfK/QdTwZMR4fsxpjD7QIjF8voDz7HBLqNpOsoyd/B7PIYVTWhplikDAg
-MA00g4QThYIXAZkcWyYIGZ4Nqu+bsV68E0LcKWmnBZP36vTWsoYRS3CCcCzkaoTS
-vnf192tM4envzbYj9VV5iZgBwoWJPAOyRK1nK79XTi6IRlMz52HrMCRHUoWr/uF0
-rf2SZFP3oHl5AtHgDz0lMqnDgRXOhuX4XktidEB1ftS2iKshhf3VBK4A7AqA+o/9
-x2E4jn9+wM8QZ+ynlxZGMizSdNBUAsnpmzPDZq9nVv+Jx2Jv+t4YhZJOz/xhj5Na
-9KyT9pkosSbsnjQ7tz6K
-=J/Lr
+iQIcBAEBCAAGBQJVUvlmAAoJEPiazRVxLXTFzjsP/01fUN9m4Xvr9ag8yjvkJfrk
+2/i3L9sCBn94DZtZq66fCBlvY9PcxRCvftkrqJfPZDL9EOHFlNLycKnkjXBEtnMm
+2/MGPR5SNERFOLiK3l26Dxtgn34J6+ESBOIiU/3bJQdvhs1IGHfaLrf0RWccNPnn
+p7Ap/IY7o/3+lQMCuzMWP2k+87UBkR+EOtE73UINuSiH7eK4CwL12RfPYal00sFl
+f8lbGqd0pacM5cKtcRrBo58UmMUYTVB1YQQj7MibUc1X132ggacDOJyN4aX+0uoh
+kT+vNDDWBcKkrjdVZa43mqlzPUFb0V538U1RaUhVxgTUQz/3x1sxE1ty6QiONdNh
+SaBRtSUjPQIh/BMtLNFns10llbDfaQtwgmIlFf8WXxhzGQfg9O4wpDW+KYd+wIpF
+QhlPJyzY+PJPhRJSvI5CT1J3n73OKGbWuRAsHR5Xwk1vMnu6ToyQodAv6pSpRcSQ
+aAbkLWafDArU2sxoQJXvXbyMOUerakZWlmjWQNKJpUlb6p8d7193RNS1nSfjkh/W
+wlJGUtVpQfgP6ADd7eBpF43AySEwqlv0OlRZ9RcrcI9RItwkBqYuz8KAp93cnB8b
+kdpnlVglW4Z/car5TWVhoanZfMX3MBedPFlFExll/JPOziN3b2tbKpd65kKWCDA7
+r3j1plr0pPkZ8nqS5wMZ
+=wPNv
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/tortoisehg/tortoisehg-3.4.ebuild b/dev-vcs/tortoisehg/tortoisehg-3.4.ebuild
new file mode 100644
index 000000000000..5d49cd8094e9
--- /dev/null
+++ b/dev-vcs/tortoisehg/tortoisehg-3.4.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-3.4.ebuild,v 1.1 2015/05/13 07:12:37 polynomial-c Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils
+
+if [[ ${PV} != *9999* ]]; then
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://www.bitbucket.org/${PN}/targz/downloads/${P}.tar.gz"
+	HG_DEPEND=">=dev-vcs/mercurial-3.3 <dev-vcs/mercurial-3.5"
+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[${PYTHON_USEDEP}]"
+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/thg.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."
+}