Version bump

Package-Manager: portage-2.2.20/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 20233ad63ea3..bc3aa2c8ab0b 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.77 2015/05/13 07:12:37 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/ChangeLog,v 1.78 2015/06/09 07:03:39 polynomial-c Exp $
+
+*tortoisehg-3.4.1 (09 Jun 2015)
+
+  09 Jun 2015; Lars Wendler <polynomial-c@gentoo.org> +tortoisehg-3.4.1.ebuild:
+  Version bump.
 
 *tortoisehg-3.4 (13 May 2015)
 
diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest
index 5ae7cc63c0cb..a707fb16920e 100644
--- a/dev-vcs/tortoisehg/Manifest
+++ b/dev-vcs/tortoisehg/Manifest
@@ -3,27 +3,29 @@ 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.1.tar.gz 8236037 SHA256 0b85e92b76ef14eba2ea4a2476ef16f561711680089c3e4148e185a51bfb81b4 SHA512 06379ce04d6074a91f69cca6b56d081b57d21239aa7e1cf8368d25f76f04dfd09d00bcc67999380ef7539ff404cee0a0586131ad99722382e077b4f11aff2b14 WHIRLPOOL 8702417b63826d6fede4cac379a137cf912c5073ea4d83260a3d35e0b02dc7150df004c9b6716861c2b045d82e9aeffc26cebc4d2c7ba8ae28ef4542fc46ca88
 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.1.ebuild 1934 SHA256 e2335b355bfef3f58eef7f5b52a17938550dccd6cccab9ada014c4dbcf6f6c7f SHA512 1fed8b24cada2b663bacc1dd990cf5de9594d3f97f4226c768740fc004cc9080f6641b0d0e23dc565a4caadcd52aa08691c783bb3787fc5337f28d64c26c920e WHIRLPOOL 42353f6541d83ef25a7f4809180733ae3773b73c8f73f343c1ec9ce42bef769583d0e594ec922afd9423ccd930520dc7354ddeb68214547e00e0426c7d68c18a
 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 12891 SHA256 940e0116c50976523b279960d52d12ace253e7f74c9e59445b8cce63f5c0e7b4 SHA512 902d773b6ae5dd7b3b4d100774bacbb63cc8c78099e10d56f54fd91dc62ae608fc4bcb6bc08956678ef01c4267a80cb90434a8dca43cc19a2d11ba72c93ecc39 WHIRLPOOL 5a81e9a837120a47cf5dce780881d61038b55daf626a766f4e9c74c2d680dc18bb0ae50b65f0f2f1a8dbb953425a5a1c7e7118c1a2cc627158bce0d7cbd67790
+MISC ChangeLog 13021 SHA256 7436b073df2bfad10a7df3e86e1a76e551893fa6fb9b6cd813f69cb45ef89747 SHA512 7768f98f9ec0453e4e41d9264fe2483932cdc35c83cbf598b4161b146a65622da04b5caf79f4910fb283db800e75ac591c7264c272224d75e330de0106b2ce2e WHIRLPOOL a51197966eff92d43b3ba4aad1075afdf12bcfa3e4b04c7a4aec3d83eaf1bce3306bdf5e1cae3ee364899771fb91b90d2ee5e523a64beb61941e81530a51188c
 MISC metadata.xml 330 SHA256 3a426c0792eb862bd697f0e6a2afb37621a1a5ea3a5ef4ddaaf748bb94e9eda0 SHA512 83d0c23820847cac4ca7e298392581051ac4fe45c88ee36b23ee20634f62e38b3a6a6c7df17952cf685213fb8755e358a6f7b602ac46aaebbdec8e71bbcbaedf WHIRLPOOL 53b2b3929cdd21719c8389cca2fe646b6549608ae0fa381ac1a228175c4aef7295acc6b1da4ebe5c9f11c91f6e0a5343b0268993afbbc5a2e5348617b740baf2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-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
+iQIcBAEBCAAGBQJVdo/MAAoJEPiazRVxLXTFxK8QANoVcfFYDpbqVfA51A6HtGPn
+aALQTKATprqowruyet6aiXALpzalElspkCK0jef4mLxe8VRnP/s5vRBh65djQtsJ
+NzT7idJGK3sOfvKTSmh4QXf0TZyTqi7bYrq+BmrjplN4U6y7/vzD8Gonbhy2BNgt
+9BfUq47rqPIQN2EKKUg8/t9IgaOu1uMfgYC3hG8Dj4KbdsQub6E953HFJDV47pj+
+uRn0WiyuJrX20YDRp0V5KjzW3yLVNiC2bCys3G7l2asCg47nj4P2sYpycMTCL2hc
+X+eHdzI6rFAJtfjxF/4xlrMI/mp8eRauQzOniGEHz97vOpo5gERI18eryjiD4jVV
+ldF1mZeRrsVgmwpOldHj7Q6k2WyRrwF/k768wSgTnyS9X7RHSyJDsvIGY649H9G4
+YnBJXezmF6gGw84VUcnwdUP/Pf98/vIcDcmPM7D1Ob09D26huno38RC3gPhEJIMX
+g2H9bNs+yiQGrN0t3B/zDReqxeF+mvctnmA6aNb45dhcFwIuqXAxlw1gAQwN8dVr
+yIKZUWxlvKzCCZigc7rfBlhUEu3Oes+HOf0t58AYBYc7InR0sHy7PQzbcFVq2NUd
+xTTztm1HH7UlHSi1Hqx1Jk3zBmqIkLShgdbGmLjTEjw8i8rgFd1+95NfnwNKH3m1
+7Y4JAgO7sI5XL3wY6eNC
+=N4rh
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/tortoisehg/tortoisehg-3.4.1.ebuild b/dev-vcs/tortoisehg/tortoisehg-3.4.1.ebuild
new file mode 100644
index 000000000000..7084d0e22e15
--- /dev/null
+++ b/dev-vcs/tortoisehg/tortoisehg-3.4.1.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.1.ebuild,v 1.1 2015/06/09 07:03:39 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."
+}