Version bump

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

3 files changed, 101 insertions, 5 deletions

diff --git a/dev-vcs/tortoisehg/ChangeLog b/dev-vcs/tortoisehg/ChangeLog
index b52057d18d26..d33d01bb8b35 100644
--- a/dev-vcs/tortoisehg/ChangeLog
+++ b/dev-vcs/tortoisehg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-vcs/tortoisehg
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/ChangeLog,v 1.53 2014/03/02 22:38:32 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/ChangeLog,v 1.54 2014/03/05 07:44:56 polynomial-c Exp $
+
+*tortoisehg-2.11.1 (05 Mar 2014)
+
+  05 Mar 2014; Lars Wendler <polynomial-c@gentoo.org>
+  +tortoisehg-2.11.1.ebuild:
+  Version bump.
 
   02 Mar 2014; Pacho Ramos <pacho@gentoo.org> tortoisehg-2.10.2.ebuild:
   amd64 stable, bug #500348
diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest
index 224a74bcc2d9..d75f89227211 100644
--- a/dev-vcs/tortoisehg/Manifest
+++ b/dev-vcs/tortoisehg/Manifest
@@ -4,22 +4,34 @@ Hash: SHA256
 AUX 2.7.1-qtversion.patch 879 SHA256 092f107ab2ca82ca4dafdf2790ae5b1d82246d99c65b9f56a807b046c160d3d2 SHA512 a1e164c8e473700a6c08efb58a589b95bb44e12a6aa35b10b30beb068f2b7dc8e7435f2e0dca6d9e5b7b25b7ca8b9668085cf3584079f61d60a39ff6988478b8 WHIRLPOOL faf2d1725d4b8f3b4f2f74f5870425b03d099d4cdef054fe88edaa5700a776319d38d5d526c2692d0a7001848529ec825506702b33d847f7b285c86fef64e9e0
 AUX tortoisehg-2.9.1-desktop_file.patch 269 SHA256 3a540929845c6956ab662c176626f1565632c69ea94b82175c81c2038eab4bc0 SHA512 8d8449c84154967056a82f7c4216df7548afeceba44345aca784009fda0acd6ee3127a69821be292e740c8f27b633c65da97e472cbe4691225bb3a14d243e6a0 WHIRLPOOL 00cd9e3cc9973bceb218f56ab7ae4da8e3c70032e093df42c3b1641ef50c882c51912e802d5370ffa4bef4cb8f139cafaf1cd0c8330457721ecb1785d879b67b
 DIST tortoisehg-2.10.2.tar.gz 8623834 SHA256 ecced3fa86be99ce1424fe30efec1ec583f22277b5d30ac26656875e10cd82ef SHA512 0ec06af4b30a3d8ef20b554e2432a0b60c930a32afc4faaaabff16a46380af8a6581bdf2155ac933e4b3b46db5b52ae64da68429f454b662fc400076ab9afa46 WHIRLPOOL 425e58b46e93551d7ede320880855bdacd767cd16bc0f81a75d6eb6f80658e5c8e6b064726f7fd6b94bb2aa1e78dfce846ce1bdd9a919d11cfd48739f7e38835
+DIST tortoisehg-2.11.1.tar.gz 7381876 SHA256 675e8ac59a29af0d21798facbdba1219c696e3de081f5be3990a49162385e22d SHA512 eaf1e113d2a3a324bef4afea7769ba2e44fbdfe9dc017266461b22d3b9586c4533ec08c805ae6256a02039d1b905a3a4ccae16a3afeb05cef9fb177fdad01bf6 WHIRLPOOL 22b9c74fbfa6110d591f4d1f6d41e5a728a5297df2c655088c6cafb886c4cff07a9c301d465c0169703c344b9a505f93be1966e50b39e9c5075efcf5144511f0
 DIST tortoisehg-2.11.tar.gz 7383690 SHA256 4b66ac7c94a8b31a7a06cbb1d1919a271c8e7c5d2587247d1e08f22a835da687 SHA512 bd936896d5d6bcffe32b5286d6dd0951f57c034ed235aeed46d170b5330e27da94c72620cce41a10c4642efa6982c9e99abdbe77ef03e890fb476c9fe846c397 WHIRLPOOL 15d289aae0e7111c66745dd2de419d0a0dd2ce21c19e153f759e570cd253acff547a20537be487685aa98de029689415aa1a196715ae588756e85bc1ffd4dbe2
 DIST tortoisehg-2.7.2.tar.gz 8971703 SHA256 21da4ea31d3a376a53f98ead49dceb4c68179327fd740522021a1ff7edad1b1d SHA512 677a3bfd1d98a8e0860d0d84abc223db9337141a7891125b564c69354e18838a4e5cd9fe92ff39d244706cdce3c9d0b23550416afb66f730a6a338e02fee2a96 WHIRLPOOL ee58ddf1bcb7dc83e50027545f672db5c51bde02ca0c4724508e53caaf5e865501b835229daaeb2c1571233eb5a061aa93df71029caf1bd36e7a07fc25821773
 DIST tortoisehg-2.8.2.tar.gz 9094811 SHA256 57fccb8cf5a6a44fc8e95cd5f3d139d11c01c7da3a07767acb2cd8655494329f SHA512 2b30b096d9c131db00f96b4ec1211efd8d0e1cfc9030beac9c3bf7940cd243daea0e4d4ba426b38c75e133f107e36d441d317dd83b26bb269703fe878a5c946f WHIRLPOOL b511ad4ce4de75f97d5dfc6a6e90e51bdd173aa7b2df62d6bef6d9eded26a2f45eb067304b310cb42cbc40b782f4ba26d07f39c7126c977e38d122a3ef14f14d
 DIST tortoisehg-2.9.2.tar.gz 9643805 SHA256 4fdfa902bc39cc64632f85adbe89076a88fa4449953fc370d4fee54d5005e7e1 SHA512 9e9ca829c7e52c9cd9bc9fb5112da57e6ed932678e036c9e6fbfb97d338bb49350d38202db47e0a20a7350dd5dd1519ab75b4924efa03419bad4265ecf91d945 WHIRLPOOL 83d5e54c4ddec619144882b6a0daf186c8f43fe0ff0c1ae1b167b038a2085527b243e017e9963f3bffafd36f5c209dc2cdc563cab6db60d7db24f9799150ea2e
 EBUILD tortoisehg-2.10.2.ebuild 1926 SHA256 168cfb6d75d75fea5899bdb942954b2ae2f20e2bca3bc270f318e1b3e1d35f97 SHA512 2b94da03a4512ce26b509caad2fc41d47b7304663faf6682a8022207b80ab3bc80c2f5650ad60ca5045269fb97f9fbaddf593c1c79b2dab99bc66a08f3873820 WHIRLPOOL d644c8a6547abb00a036e9f2c1947ad0b59f758790347866f6636484d6c6bf9ac2d991e73d591bac763d363af692148edb2098051a0d4be7e738d1a67215ca0b
+EBUILD tortoisehg-2.11.1.ebuild 1935 SHA256 a4f410d90f6ca89cc62f44b683ff0c2b204857825a2e4fa0cf43d9886a6ab1c5 SHA512 ed058edc3b63e88db81eb837eef778bf0c7b3b63d0d90608949b962a55183c163624b3b0a42ce346959b5d131292a217ca383ce9463f9769300fb9f3ef057822 WHIRLPOOL dc7047296944b0e79f6ba9efb460484e682779ad8d7814539ba981fe65fc805db18e65725118a377102ec9e2a8c95178d53882fa8d82dd43e18e0862211fe6de
 EBUILD tortoisehg-2.11.ebuild 1933 SHA256 c5e3b7c33c068b53ffac61658775684e5613d0b3b413bdd5fac6e88a22e53f05 SHA512 c7e977a42a8512f4ce01e845764684d0ec7b22d72b665de2b79e46421c328f0efb241e8169e8320d8f64a8e5c3d498b89957b5675385712fe40eb6f3e6aa9bec WHIRLPOOL 93f239e8be1dd04da98af524350234fa8fac72c6000dcebefc1c4705e24e49c825fbb996e87435de9a205683b2037e6cc33e05ad4efdf3f502a7921f0eeb14e8
 EBUILD tortoisehg-2.7.2.ebuild 1911 SHA256 d731bc60ffbc4824af4658dbed7923dc8346d91fd7ae7f89cf005f933e67c844 SHA512 a7acc4d96e5f60169fee20621cc9fc6b9c1db4a08c2a080f17133e2f905ebb10a2d099dd1a5d5a3e96c3aa90d58bd8d923aef76b910cfcffba66129edd815527 WHIRLPOOL 01053fee1635ac87afb843df1ef65ea7ac4140efa3b53e836f7986f480738d9fcafb0f34308ac897e607473726a4b03ec3ac4908a85b5e001493a671e3a4a8cd
 EBUILD tortoisehg-2.8.2.ebuild 1929 SHA256 dd798bea3cd4f7cc5ea84622b6bfd73a011f42373baf3046a1791c59251664c4 SHA512 dfe0c9a2a5c9b2b50621de36716ee1f7f2027d209269b473cef34297ebe7547188f5a5d82a0217f1deb2945e50a832f43af1448bcdc8833058cb9ef5082f140e WHIRLPOOL 5e9f4162337fb7542489cb144da91b2850d0535658ed3838ca7559703ba10bceaf21e6ade07595e60e2b80ab1fb4a0eadb789eaaea4b10fc9772bf4b8afd3ccf
 EBUILD tortoisehg-2.9.2.ebuild 1933 SHA256 06f728779e4b476a0b7083afbefc52b06250ff9b5326d75ee02be6c80ae07a03 SHA512 775e0f1b0af68b746f350d53b20c51dd6e058b78570c369c91ee64da6fff4fb66bbeaee616280488c74ffbe8e7b46fd7303f2dd1f433568753196cab4263f110 WHIRLPOOL ef0a33b98c366bf06f2640caad9a613cbcb00d51585786ddb57e9161a657fa1cb829f5657dd12720ce29c47e6c0e71597ed511fb954a8396150bc90270b5cae8
 EBUILD tortoisehg-9999.ebuild 1929 SHA256 052cbd0c0870d2fc16902b4d8bc2a2dd05b239840fc62645e34ca6460f0cf0a7 SHA512 36d8acf68778e542a3e2683133dfc69c69fa5b567a72bc3d742885403d39a5f992b95f442fcce795e47febe6ecddd0a74040a12fb3d700f2b8b3ef74ac90d32c WHIRLPOOL 01210c8d5d23803b9b331bd16566909cfd609c259fa83208af9f3b357510c59a2cf4888576c5df407f7ff039ae05a1ac44c2382845213fba0cc2a793f485ef66
-MISC ChangeLog 8976 SHA256 ad9ac745d018ed906a52fbabe198d2df57be768e7b7c2370d44670f6033cedc7 SHA512 9a48aae77110037e07b0f04451ea8c7efaa1680ce048204d41c0be9b0a9a3febac33e9653c3590b82c11b238c833a517f93f9c4499a238f20050b5ed6becbbfe WHIRLPOOL 80253544217a489c4ba4f7aaea7b49aab2a9b76ada8aa63bbf3637733125c0570d6d49796bd7484b0acb7012d627e0085bfea154b4773943cd3d200482f7ca3c
+MISC ChangeLog 9117 SHA256 ef22ccffb1a87d76f0c2ef4582d8b05f492589307f3778990631a2575907ab1d SHA512 e3213ba690f2b613115cb115b9f5b47ef428cfa90da8fea0795b4da4369572ffbf33e9fe846090133aeb653d3e82cff521bb05bc698435dd770b9f6864b48c9e WHIRLPOOL 7b5d3d09f41509304ae905f1b65be926d056985214b3b64d1bb58a8997f6042d5fc0d730c83bdc7c907936e11cbe6a15f83fd389132eb93d4782819af719b17c
 MISC metadata.xml 330 SHA256 d7ad48468c73b97db8462532efe7a2b1858883ed765e9c62b60dd9ab51fe9793 SHA512 6ea38fb93b6f671785062726c2a62ed042d270475e7657763bcda1ccd94ca8fa14396c7e0fde65ed8b827638d0a190e0c0699673359a5bf95e4fa965d6ca8e4c WHIRLPOOL 2dd5a5d00e461b1e47c674a185554b25bd28b923167f877d0a097c498a8f652a1302c18f5a475b9b0ca7b028184635a76e3ea03789fce2e4a82b8ed55ce7081a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMTsukACgkQCaWpQKGI+9RzaQCePROwKzWMXoVdxP9qUUAZxAgA
-0OwAmgK0bi/6QJaTy3UqXLORePOXp1a7
-=zBoA
+iQIcBAEBCAAGBQJTFtX5AAoJEPiazRVxLXTF5NEP+gLd3CiTpV52q7aLEvlfoPRb
+eV0heyh6EMrkQKJFQ94YXs7OYIDZveLiDFKvzdijir7DMFFrlxVlvuPVe7DyST6q
+HpBIE4X9WmnqVyO/Qwr6We4qGZdRnVskqpmjDvWkRt3LZQzEfWoLjGrnMVTG4q1L
+pUxOPoV2auQRHPSfvKUxwNWyq4lgwgyjp9hhx4+Jn3RB50pLYVVGr0pWb4AoU6jb
+5pvg0trHO+DYVZNY/mT64MNcDNJfd5t9pF3IswpdI9XKdlTL9eCQnOGAiq8X1a+R
+nrHbrudm+1g3yXN6qkw49BO7Ub0pzBT5rdsAem3R8Rrnu3MubjeYrw3sNlQFanIB
+aqqfTm65HiEErUBzin9Mf32vFxj/X9d3msgb24wR5QYRUNlbJVB3bPLS3Ecm+EPY
+sEeSGUhHAmLqcFOoVT5lRqLTHE1NFzdXxMRQAnMeNy+LS5TFA6ST7u+U/9Z/KoPc
+wU4b6np+jSQxeXoWwZTE9g2wT1spuBmZ4paMgVlw7puElkxiXaCCkWpnpFQjeLtV
+sfygijbZuelNCG+R2q7kmigxIaSpqv/lwx/+/8uZc0faXN9drMUiunV0ZiRFxMF4
+YGR5z2Jt0xx+uXMMc/QtffYyKS14FIbH7fSlFy0s6hAQqLng0o7BZbGU9UOkyg08
+INSYdW+0PmSA8X5OVY8z
+=HvM8
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/tortoisehg/tortoisehg-2.11.1.ebuild b/dev-vcs/tortoisehg/tortoisehg-2.11.1.ebuild
new file mode 100644
index 000000000000..0edcc8348508
--- /dev/null
+++ b/dev-vcs/tortoisehg/tortoisehg-2.11.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-2.11.1.ebuild,v 1.1 2014/03/05 07:44:56 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="mirror://bitbucket/${PN}/targz/downloads/${P}.tar.gz"
+	HG_DEPEND=">=dev-vcs/mercurial-2.8 <dev-vcs/mercurial-2.10"
+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."
+}