Version bump. Removed old

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

4 files changed, 25 insertions, 99 deletions

diff --git a/dev-vcs/tortoisehg/ChangeLog b/dev-vcs/tortoisehg/ChangeLog
index 01e3814e7a44..0b11c3452e32 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.64 2014/10/13 18:34:14 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/ChangeLog,v 1.65 2014/11/06 21:26:17 polynomial-c Exp $
+
+*tortoisehg-3.2 (06 Nov 2014)
+
+  06 Nov 2014; Lars Wendler <polynomial-c@gentoo.org> -tortoisehg-3.1.ebuild,
+  -tortoisehg-3.1.1.ebuild, +tortoisehg-3.2.ebuild:
+  Version bump. Removed old.
 
 *tortoisehg-3.1.2 (13 Oct 2014)
 
diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest
index ef0850b935d6..0280679121a3 100644
--- a/dev-vcs/tortoisehg/Manifest
+++ b/dev-vcs/tortoisehg/Manifest
@@ -4,32 +4,30 @@ Hash: SHA256
 DIST tortoisehg-2.10.2.tar.gz 8623834 SHA256 ecced3fa86be99ce1424fe30efec1ec583f22277b5d30ac26656875e10cd82ef SHA512 0ec06af4b30a3d8ef20b554e2432a0b60c930a32afc4faaaabff16a46380af8a6581bdf2155ac933e4b3b46db5b52ae64da68429f454b662fc400076ab9afa46 WHIRLPOOL 425e58b46e93551d7ede320880855bdacd767cd16bc0f81a75d6eb6f80658e5c8e6b064726f7fd6b94bb2aa1e78dfce846ce1bdd9a919d11cfd48739f7e38835
 DIST tortoisehg-2.11.2.tar.gz 8202579 SHA256 ac032fb306ccab1051322363d0d0a6fd54bd85417f3d9dd5d6c92dacb49706d7 SHA512 0155d342d393b86eee46cf9cec277ea0bbc37a0e1f9c43e835e9aa495a7048e66a6cc1e67beb42c18cc21f5109b7f8aee21f626addf2d94f6cffb3f563a6e4df WHIRLPOOL 6cfbc27ce0265ac1e34dddef238ae96373fb4d261f76c78a6b66d1ada992a2fcb42bc38d987412eee210db05bb0bb9b7a2cc1d712f91e36284876a5461dbb524
 DIST tortoisehg-2.7.2.tar.gz 8971703 SHA256 21da4ea31d3a376a53f98ead49dceb4c68179327fd740522021a1ff7edad1b1d SHA512 677a3bfd1d98a8e0860d0d84abc223db9337141a7891125b564c69354e18838a4e5cd9fe92ff39d244706cdce3c9d0b23550416afb66f730a6a338e02fee2a96 WHIRLPOOL ee58ddf1bcb7dc83e50027545f672db5c51bde02ca0c4724508e53caaf5e865501b835229daaeb2c1571233eb5a061aa93df71029caf1bd36e7a07fc25821773
-DIST tortoisehg-3.1.1.tar.gz 8198553 SHA256 95c41ba139dbe5164f612f96f6aff86ad91edd140a3812212656c0829944193c SHA512 3796507ae05913deff411875077d7f7fc0292c2ae02ef8277740ae7c411906cb1784dcf0b7162add51e9ddd14fe3a8e9ffa9719f44eb7efca9b39c65be47348f WHIRLPOOL 42b440b3c7bc6414a526a649a9965f7cf4b11988474cc1639384d476bb902a97089500c0240e0892350ba4f000221bc03d780f3bc4567a9b1ddfd78469f30bb9
 DIST tortoisehg-3.1.2.tar.gz 8198724 SHA256 390ed33e1d5957e247f40859b1d3f8ffa37cce3e1abdfe0021251dc9585a87a0 SHA512 edf10ed994739a641996e231bf9d42781743cf5b76e97642ee71860edfa90e4802ccd2a3adb83355bdb9e99fe25a71efd9a787585dbb4a4950e045a85210b725 WHIRLPOOL 7e8ecfcbd2a4b8970e52ee0d3fed12eff2f6961c7bde5380fc5891c82b238b25325f2ed5b15467f8062525974b72e03de85f63a53c93622aa35cc47c5f0fce63
-DIST tortoisehg-3.1.tar.gz 8206784 SHA256 ba809c2e4171148185a948a391f609ab0aa232f08ea94cc75c77baf9122b3752 SHA512 cc762472589b8e3bbaf45cb4e39c7127b134f47ce183d44ac14ab71f7dc0997785874d7caf527ed773feb9871ad780edfb2bfaa3f4e8440575409f37c3d6763e WHIRLPOOL 970e09b4f96988bcf4a5412905921b62d1b52fdcbeadee6fcef4465e43638df7b11ecf16c4ac964624d3fa867d5cd278d3f171107854dcce222b2f5299a597d9
+DIST tortoisehg-3.2.tar.gz 8203236 SHA256 12eff3ef518a5fd8815a409745c3dc6b1dba0f1a81e677de5d0700453ae848c4 SHA512 bc518edc79f47deb035ca9dfe7bbff1d50f7fb01a284edc1969a5d943eb286b142e18e8b684bd935ccce627331bbf16bc9e7728286ce01dfdf19144522d5ff2d WHIRLPOOL 14a9d2601ca681a97ed8601f5c5e9cba06853ab3cad24aa82deee96e43ca6678d7ff86128f17bce7a5677e9e8ce22a13896704b707eab605f9ade7311cb4854e
 EBUILD tortoisehg-2.10.2.ebuild 1936 SHA256 631cea5100fcab705a5e6cb593543017d6757d36b99f03bae9d8c74367bc1c6e SHA512 c6b9c9e532505a8d0298bffb3e1456b7f25d806cf43a325feeab0f005abc96ae797d25e9fb4646815048c9274fcad6cdbfd43da651298a7db62f367c1ddd12e3 WHIRLPOOL eea9918742b7e50fc52f1332c3e2813dd2ec56f53188e2170f3f1d0547e699f0abfbf52135f825571b844bac14e9456461a94c6d4a25bbff5e0fc23c1c58e20c
 EBUILD tortoisehg-2.11.2.ebuild 1936 SHA256 de1c9fe0f33b1d17f37ae8243093e43e6ba1b03c025e791eebd6e9964c63b374 SHA512 e060054250c146d157cac722718552f1c5fa5357f48617abceb62414d3b33b67c14220cd4e37e1779105c65ba6b32790a33d5eed72f27f6a38ebcbbafb034963 WHIRLPOOL 7a8fd842f3f5eaacbe328b72bfa005e71a866a26a777f47fc25e896252476bc1e3b800c563bce2b60a70e19c2ff39388bf8efe93c528479b0c38dfc4edda8f29
 EBUILD tortoisehg-2.7.2.ebuild 1918 SHA256 c0b8f52e4b8d7acc59d063b4c96091f380ec860495c2055b69bd569e196a20a2 SHA512 5a559263c721eb81db3a5949ad0e3682c79334c2b4546a589ce5f318bf63b603ed2e3dca3c829503ed625c82f1cd356cc2e8f82ee95107f3a3ac378f7f242940 WHIRLPOOL 21af447fe77928c5f725b7f84c74d02aa1bd9271638b3e0a0c237a66b6408c0748a5532ced73dbb9c53bf219e3f97d930e1764b9f2b6eb95b0f03d51da515154
-EBUILD tortoisehg-3.1.1.ebuild 1940 SHA256 b6118557afc26b68cef37d2d7e26ab9602a364b97fd34ff544d88683cfa2bf0c SHA512 e9ab0443f995b0e7cbee616db98be22ae99b08a382595e1290e3b3e58a62831b9539f1cec4ee7ac26d815375343ce704160c3d8ee776e785e0569fdc2a53df62 WHIRLPOOL 2924810e89c8256bc66583d6a2e494599d4fa72b58e0899cbf1e4e2c92eb3bdf56f557383148bc00497287df918758f219e4a2bbf48eac899b2898d8e0706068
 EBUILD tortoisehg-3.1.2.ebuild 1940 SHA256 586b9dfa86dad648536b13325685fd8863394f1ea3f6e45fa6a48d1353994a93 SHA512 6529f1989dc06b074b1eb2317e0321db7b072d0f41772dcfc7ad66faa28c854391b7b81f2cb1b497fd1271b5029ab5c9e66a6e56a1d85ce341711eb7fe157747 WHIRLPOOL 8f36f4d2b4c582125f88c44b234f34ff3a40bc48f11d1a64f54c79b9cdc4be0bd8f423d20874a19cdc36d74d4268991eea5c83e2d962e04c157814807fbc487e
-EBUILD tortoisehg-3.1.ebuild 1938 SHA256 b03955769e02afb4752383e8b353d5c92563eea851940792e48a05ac0df10199 SHA512 b6368a6d42c6f3596a091235297d7e6371f02528d9bdf8ea3364e22abe63bb06629402ea12b98fce80760f046bd86d7f2574e6867a5a91017f91efb0a99c4c0a WHIRLPOOL a17031b56618f9e2fc5a723593992481f6d10ee0e6e91c1e1f536bedd74c724d278cd589fb650154ea5f9a8d3abd2a1f9825a2f205786daf48388a894480496b
+EBUILD tortoisehg-3.2.ebuild 1938 SHA256 7f8e173b31bb25edc89ba87cca7e1aa617e7fbc57feaeb536352a48a4c48e4fb SHA512 0b19a73b4fa3b0f51ed67286e6e9dcc9193762e3bf3a328032b69262fbed26d8d071d7692d45391cf9d34610283b065bd119c116bff41c634271847cf9be03d2 WHIRLPOOL fbdce3f7edb0e4bd74d0582f5a9cf61c10654265a1012270f0f310c53059b0ca5c51c274d7eb6db705fbf5226191114b2d75ffdb416ca059c4d6c9072f785869
 EBUILD tortoisehg-9999.ebuild 1936 SHA256 6d4acb5a853a5797a04ffa02808da1e42268309f201188eefa11d3d0a5fdd888 SHA512 db0ce9158fa707d4b9f87ccbf6be748ef85eb274cada0fcd687fc92d318c7fe08ea6fae3f8457a4109281fc77b3f264fca5ef1442f3f912af787817b64eac82e WHIRLPOOL 495e8d4ec84a4033db497d4e88d9ff833adc7d25a382516ff55c8eaed5103889f2d8627e1c1a20adf56d2117bcb08eefedbec60caab89ddc8866f7387e8ccce0
-MISC ChangeLog 10900 SHA256 64c0ae8083a78c95cdaad8a81fdae761abe1080a7b0bd43c4b30be68644f69db SHA512 eb0e3253eff64cbb972447b3622f850b891d54d468a375bc1fd9e669c52c86f8219639db962610ab3deed168d4f04b815fa7a597a9ab8ec52a576b9d2d38c2e6 WHIRLPOOL b6e9d45a3e3d223d4ec63639619b365e2214b60461014b24b80cfc0e3dacd514bbbd096202940f292d68240debf810f08984838adfc41efbbe638f07dff7fdbf
+MISC ChangeLog 11091 SHA256 80b17453eb6b2762b680a65c2955bd436b0fd6f9f9363d4cb56682f4f8449c1f SHA512 1ff59ef20da4e73b41304dacafa610d4909f0f63aa749da43f1197cafe9eefc1576bf61ca47548673df78582fb500477ff97485085a383a6bea26e6b14e64c14 WHIRLPOOL 2bae9810dcaaec33298d14f5226e88b5b027cc8024fa160fb1a814a63ac7585242f11b8b4ac4e89c996f62e5bc295fb2483496a84a53b71ca2e972b1dcb4f347
 MISC metadata.xml 330 SHA256 d7ad48468c73b97db8462532efe7a2b1858883ed765e9c62b60dd9ab51fe9793 SHA512 6ea38fb93b6f671785062726c2a62ed042d270475e7657763bcda1ccd94ca8fa14396c7e0fde65ed8b827638d0a190e0c0699673359a5bf95e4fa965d6ca8e4c WHIRLPOOL 2dd5a5d00e461b1e47c674a185554b25bd28b923167f877d0a097c498a8f652a1302c18f5a475b9b0ca7b028184635a76e3ea03789fce2e4a82b8ed55ce7081a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUPBsnAAoJEPiazRVxLXTFzycP/3FiBnGTr+NGJk2AxkeyTqOT
-MmA4ZG5NLHM4lRN/4YbZMHiFN1SC9d1dpXF4dFkECHga4TnmZAZtLKDC1IxAR6fT
-SAcrwLwrjYOdGiLQtw4Xo7FJcLK9+EuS7GeX5QQ95DhoRG4YtUjshhKVDWLSnAWe
-goWmlWKacewd0RkLQ7yY1cAA1Dj/Zeaz3E6B+kPoEGa5wo3G6S/HUxdaT6geRvzj
-iKfD0+IKVuQA4ogZD/qYod5Uyr+kshyD8M6ITBMI/K6RarW9O6kjuD2Ju+grNrBi
-n6mWYTTIihAVlwdGt06ANFnnJWx6YIgDo8v1mHqDxNDJ9FpEDMBjmn6iRuxHyqzh
-597g9tY08/iRSHCOh5oIn8VPy+4xUNvufVjB3XAexKAYAC5G9+vB4layRJ6M6Eae
-5ht2D9SRmjqNjnMdj6EQMV0hMwFjWdTQWqCPMKwKwAsaYyO6i+dmq6431Kptr9Ii
-9EdiYgthFwP6HkAg63DSJNrtYwDiuVad+GuUK522ziT3PMuCb+2JXi2mx389Y6Jj
-4OjPYqBPviDf3zy9kusIRDACd4PlPGyZC7lMQRfDHDBEdXYgzY0rASkAymFVOOVn
-CWjs6693xA/2iMpJPczZfAuv/EvpXC54Juo2KKKHjTOhBS1c6PVFttlQjurwMXTV
-nQlDaJBxJEKCqoTNF/Rw
-=Kv+f
+iQIcBAEBCAAGBQJUW+d6AAoJEPiazRVxLXTFDt8QAJQE2YIgk95t3N9q3xAgW5OE
+uxF5onvyNE/dBrQU4hZTdEGF9HIwqrRrgDUfO1V3wMGHXSvRe1+YkJEM65si3GJ6
+Y9tglOp2gmU2m4zhNxp9VBrpp+JSJwm1jCqeAuhoYCL8EKzARqTO0E9uLl4k3sfk
+gFLONVMRKrm0xtyRCuFoidY/lxlsAGxALGmhTWix2PAYwzv5h2o1pDSPPQHqFb0B
+Hh9qAjMhnuU95R+REchrvIf9hyxEuO4f0qFwV8jDrT7gBG5uqxIZwweDD38lKmZ7
+GMi+9oGMesKJnBXkQYwLtuITHnW+m9iSd3bGAbubz6KriyLSNGGBl8KaqDH3kJDr
+843OfBHL+0s4qovGP6toseuqVV60xxquktsLWExFeK+XUZSfZ3+UQ65M82xXYVBt
+HMAZfl5NQvhxtgHtOwBzfUoNvYtotD0cnM4pDd0TTVFiodRjzSIurfmcc4NAkauW
+5rCRhLY0znuUOnJ8Zp4313ZdVBS2pIcy/fcQPHHh+tvjmymfXpBLI6jq4O9R7DW5
+2fEm84ipPwBMIdnTO86tmaq/xXm+rc0Q4kut4gYOJU5GATN+L2HyGNk7V04P6/RL
+FhiygUuePHdtpjnguGbktJVQySGKeu+L2RspGU4eiDZz65H/7x6tlYz76AkY6Ajk
+Lv47X1LcLhug+1inun9X
+=0jcm
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/tortoisehg/tortoisehg-3.1.1.ebuild b/dev-vcs/tortoisehg/tortoisehg-3.1.1.ebuild
deleted file mode 100644
index 9d22d48c005a..000000000000
--- a/dev-vcs/tortoisehg/tortoisehg-3.1.1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# 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-3.1.1.ebuild,v 1.1 2014/09/13 19:57:13 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-2.9 <dev-vcs/mercurial-3.2"
-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."
-}
diff --git a/dev-vcs/tortoisehg/tortoisehg-3.1.ebuild b/dev-vcs/tortoisehg/tortoisehg-3.2.ebuild
index 562c43a12976..c63d52fb8512 100644
--- a/dev-vcs/tortoisehg/tortoisehg-3.1.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-3.2.ebuild
@@ -1,6 +1,6 @@
 # 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-3.1.ebuild,v 1.1 2014/08/08 09:54:27 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-3.2.ebuild,v 1.1 2014/11/06 21:26:17 polynomial-c Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -10,7 +10,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-2.9 <dev-vcs/mercurial-3.2"
+	HG_DEPEND=">=dev-vcs/mercurial-3.0 <dev-vcs/mercurial-3.3"
 else
 	inherit mercurial
 	EHG_REPO_URI="https://bitbucket.org/tortoisehg/thg"