Version bump

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

3 files changed, 100 insertions, 15 deletions

diff --git a/dev-vcs/tortoisehg/ChangeLog b/dev-vcs/tortoisehg/ChangeLog
index df6c4daf96b5..50de68b6e389 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.71 2015/02/03 07:26:08 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/ChangeLog,v 1.72 2015/02/04 22:21:58 polynomial-c Exp $
+
+*tortoisehg-3.3 (04 Feb 2015)
+
+  04 Feb 2015; Lars Wendler <polynomial-c@gentoo.org> +tortoisehg-3.3.ebuild:
+  Version bump.
 
 *tortoisehg-3.2.4 (03 Feb 2015)
 
diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest
index 16aa98dd589f..151998bfeaeb 100644
--- a/dev-vcs/tortoisehg/Manifest
+++ b/dev-vcs/tortoisehg/Manifest
@@ -3,25 +3,27 @@ Hash: SHA256
 
 DIST tortoisehg-3.2.2.tar.gz 8212311 SHA256 ce3c9a3cd44ae071b6d44c68fd2fa78858f11dddaeef688cc4e7cb4a4fdf81a0 SHA512 9dd2c398467afea507376255125d916af36e94943678410232c5f100c7b3a56f37f89076baa2b824cdee12d4792144ff5ecba1493d28f10f23377322f0f628d1 WHIRLPOOL f0ecdc78b795e1d19b8c8321a1c8606ff0058ae56915fea6ba93c4f1e2893a69dd217f70562db922b5b68f3a3d965067f88b4a0b7e5f853245934f4fb9c88abd
 DIST tortoisehg-3.2.4.tar.gz 8212476 SHA256 71653daafa3beff6518e1f198ad7f26403118f4413ed0ae02830fdd1ae86001a SHA512 d94554e8d3e2c2199f0e8858925bf20dc4399595f214c08dd00b7f40c5674dd6097d97c7181f502c010d0d76efebc1491caac23d7d2e238596dbf5f734b79253 WHIRLPOOL 424968f10e0bb26942a990255b586f95d565161f29fee669ba35d516c25d204ebc0b9b154d619907dbfc9331a0a03d005653d42886a1671ec8f319ac5d3f0c36
+DIST tortoisehg-3.3.tar.gz 8210712 SHA256 087af028bb54a2162a31a2dd81a14a3f1f1e12eadde42890a489ab11f7201cdb SHA512 ed1f3870c116e1e22f3f9f38b73e7660b1036452a42f65794782a542c2df55036e2d5737aa1e121d4d9c513509305a72f41a51cb4a1270f3ce49cb4c99c74baf WHIRLPOOL 3905ad92b1eaf3a7ead3a58e5cf5fbf0212b3a7decc06652cc5ed1ac140dee50e30c238532ff9abe23f1531efa8f3410bc562a518505c3e36cca0cb1b7323f9b
 EBUILD tortoisehg-3.2.2.ebuild 1933 SHA256 1cfe02102d659542db5f9d618c691578a9a994612678c570b6e8e23665fb8485 SHA512 35f6d51f6f3493cac7ae187d5abd6f2b5f9932501b4941f18c3de0aa10bf4f49a7e393d142f32bb79736658c5853e2ebd239283e03b106db6dba618d59814ed9 WHIRLPOOL 9035ef6621cf25933b5f7374637154fe7e0ab8ca8ce342e594a82249631fc3c0e0c251ef6e58e4f5f9d58e0480f2a0a498e88c036871e412f55433a147d8481c
 EBUILD tortoisehg-3.2.4.ebuild 1940 SHA256 69b9d94d6cbcbe811a6ad1dae3620f95abaf5453db9bcf033ff8c031df78adf1 SHA512 66fe04b41ce501c32e56da005bf356213dc1b7108f37ca381e5a76db4f8db54d05e9f0185de411204cedbf3b662f88f5e1cd6a130f9b39d9f958d0791f2467b0 WHIRLPOOL b90a33ced00507a470eb1b3d5f96233b090d29e8b156baa11e66bc9c5dec02c3aa7afd4d8929f219c0bc9f5b88db1aba96088d55e389af10e1a7e01b3c76d18e
+EBUILD tortoisehg-3.3.ebuild 1938 SHA256 9c32ceda1fdd05ae4fc61fa3973ac0bf41a89e039d39e7a72f6105becac3dd89 SHA512 2e1bccd529cbf2b86b1f3fa6d5771f836cc6f36e72daeed1714ba4e7e2f1306ed53495c6775e9b7b78708b6a1d42425718d054e434c75899525d4884d487efc7 WHIRLPOOL a86a46cf54a7a6c2a4e0125c029d672ca91ad9ed91ffad3ff2e831c1f976a8410f6168f17ba805d40f9bc5b95b45585b9948d66e8459e53b8a8895dfa24da838
 EBUILD tortoisehg-9999.ebuild 1936 SHA256 6d4acb5a853a5797a04ffa02808da1e42268309f201188eefa11d3d0a5fdd888 SHA512 db0ce9158fa707d4b9f87ccbf6be748ef85eb274cada0fcd687fc92d318c7fe08ea6fae3f8457a4109281fc77b3f264fca5ef1442f3f912af787817b64eac82e WHIRLPOOL 495e8d4ec84a4033db497d4e88d9ff833adc7d25a382516ff55c8eaed5103889f2d8627e1c1a20adf56d2117bcb08eefedbec60caab89ddc8866f7387e8ccce0
-MISC ChangeLog 11948 SHA256 c91c78ea419c15caf18076c3c3e5ef2bf19836ac5219e78063eb03f5c8ef8f66 SHA512 507e0f8dea5af2bd496e9ccc4bd10556b26a41f9f3e411693a5552c2a7cbc0a4f00a61151fadabc865e4b4ad95d035259ebaa0b15ca00f3b34ca3fc600349b3f WHIRLPOOL a995ecd0d719fc592931598aacefaf5f1fcf973ec37f6779487ce4c6c558b75931c2d1359dcd97c8a84fa93eebf993baa31c4adc4acbcbb72c15b38ba5c98030
+MISC ChangeLog 12074 SHA256 1d2476eb2bdbeffe0ef42a9d35d9f00281978393be9ff76a5315c47be2715ab1 SHA512 c87d2a31e1f712b9e076896fa52b1f8732cdd65a3076bc3d532c5551ceb8073c107d1586abd5bb2842c22a55915ec5370335cafc18a315127fb629db2a57a19e WHIRLPOOL 6894b89b38df0fa79e96bc118139d22a9a204416ff4354abf0a6b45bd84cd6180835bee9ebec5e600bd09ae8eee842ae23e80ed441c59827af4415f62cf1c91f
 MISC metadata.xml 330 SHA256 3a426c0792eb862bd697f0e6a2afb37621a1a5ea3a5ef4ddaaf748bb94e9eda0 SHA512 83d0c23820847cac4ca7e298392581051ac4fe45c88ee36b23ee20634f62e38b3a6a6c7df17952cf685213fb8755e358a6f7b602ac46aaebbdec8e71bbcbaedf WHIRLPOOL 53b2b3929cdd21719c8389cca2fe646b6549608ae0fa381ac1a228175c4aef7295acc6b1da4ebe5c9f11c91f6e0a5343b0268993afbbc5a2e5348617b740baf2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU0HgRAAoJEPiazRVxLXTF4/8P/ihZUedSaqJuYoSNYixbIKth
-5p/WQp2L/DHyNM9TrfQ6zNphV6mCFyXGMEZuE4vemumFcYT48Jihcr23rjEJfoU/
-q40hveVHHGOUSZRTYA/somNUKVTMUrLv00XhOqPnjy4AF9H8upqJYPh/0oC/FVCm
-j3qxmDLY/N2k6L1uGTgt++rj5kCOR5rDb+suDyk6Np89rE9r3AaVz/NSajZAx+fK
-T0OBVSlONPW648USToiHVKUHCCu9uQGP+suoBZSOmvSi6DZ8c3cyt8VVJbh1ngzT
-5Fz8CdM1OpmzV+ggOLrBEZ4hhuZfmaD7yrpRFs3klOUe1a1pK/62G5cDzkTaIKJX
-ScpbxJfa8sZ3vcdJP0lF7gWEbeIHf290AAM22untBPmk4JyluX7iX0yU09LD3uEr
-jk2uCtEyglo+df7/bs97zLSXhnB1DhbafQ8C5jHLAFpEE3kJURG+Y+6ispfMDz9D
-yFaF9wxSFWR/d6EQmgtUFADiDXRDPXytOBMCKHB6LZufuH0i046hRMmFuRucf712
-kcAazHZWrIOAaGTRMrnQAlMvlAWnFcqgzb8yAKtEA6huZv6hFykf39JgfQw5xisD
-ImunLD2FTO2CVprWmRxmBE1GjHIxt0acB0f/qjxj3ldQ310kp94Y4FHZ7u6Dt9EQ
-HxzGP1zVfzNq5gnfs0QR
-=i2kh
+iQIcBAEBCAAGBQJU0puHAAoJEPiazRVxLXTFBO4QAIfSoUhikbQVlXe8FnlKHkdC
+/lksxfyhEHJNgaLPm1THO0aeXCRWhuxVLJ6eckM3ZgfsZfUzsyk1KZ4x+nXdXw2m
+zpdmcGjiI6+y09vru0Rorx1m0N424VaBFvEUy0W7R+qmCnIWwQ/tyW3l39zbvlx5
+K95uz3h8qRqNY/aMJtAtrhdFa+XYq5GvMZyP5fm+RdjTd1MAuxfrLn5DwWTHBNou
+K+s5ersrztn+2oLSLWEIXsX+Wh0zRv1th9M+eHWEls2fnJAFt9zP7HbyyrYFDmXq
+fSYLv+I3JBQeUxiwkynXtxgb/7gDw1V+9/jGsZMl2fD/mb9sL0/5pqTgBqPYOP0+
+wMLEx13djyNNqhQsw2W7IjWJI/rpM/dPp53+iytNN2HyreGVwfGXNNrnLjbzYNFB
+u2qyvsBYaTMnHBVAdsxd1GCaIu/RBmunBzfFpz9Gjho1PgFal7ZJl2mRgnDrw8cU
+1M0WpTHTegEqfODl+hrR26m67gfDh9EkdVY7V3o1c0bBFQp0HNfxMxUTJVR//7ky
+xOYdWkfXmz521u/rk/0zZMBB6PrPDEv3xCWC34t4LeN6DUHx22iVj0+MwRdjh11z
+CWqADnq8T5YnVQBRIWhurd0f/stD9wgdNZiCMz1K6kvTCmpzb/wQE5mpqO5ONUQR
+52xpbll7qVq0/SSUh4Lt
+=+SQH
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/tortoisehg/tortoisehg-3.3.ebuild b/dev-vcs/tortoisehg/tortoisehg-3.3.ebuild
new file mode 100644
index 000000000000..653933cf4125
--- /dev/null
+++ b/dev-vcs/tortoisehg/tortoisehg-3.3.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.3.ebuild,v 1.1 2015/02/04 22:21:58 polynomial-c Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_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.2 <dev-vcs/mercurial-3.4"
+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."
+}