Version bump. Removed old

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

4 files changed, 38 insertions, 90 deletions

diff --git a/dev-vcs/tortoisehg/ChangeLog b/dev-vcs/tortoisehg/ChangeLog
index 4ae6a735257f..2a6dd8884333 100644
--- a/dev-vcs/tortoisehg/ChangeLog
+++ b/dev-vcs/tortoisehg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-vcs/tortoisehg
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/ChangeLog,v 1.24 2012/10/04 05:57:37 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/ChangeLog,v 1.25 2012/11/24 22:28:44 polynomial-c Exp $
+
+*tortoisehg-2.6 (24 Nov 2012)
+
+  24 Nov 2012; Lars Wendler <polynomial-c@gentoo.org> -tortoisehg-2.4.2.ebuild,
+  -tortoisehg-2.5.ebuild, +tortoisehg-2.6.ebuild:
+  non-maintainer commit: Version bump. Removed old.
 
 *tortoisehg-2.5.1 (04 Oct 2012)
 
diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest
index 0636d3974d08..120eaa1094f7 100644
--- a/dev-vcs/tortoisehg/Manifest
+++ b/dev-vcs/tortoisehg/Manifest
@@ -1,11 +1,29 @@
-DIST tortoisehg-2.4.2.tar.gz 9018020 SHA256 d30963453a9d618b04dfbfebda1641cb4742133829c25ff60735236f1399108a SHA512 433e2facd02b44a9c9ea2a20ecdf98ff4381f2c30c046f59b246c27686f2142eef944c3fc256371e7444495cb95a0291e8f4924382f8a67e2c109060a52e5b54 WHIRLPOOL 95d26511cbd502048854f846172e7fad107ae492f4d4eb9a5a6ce5ff9e9b482978ec28e693c752cf914ad6b1048e987ac3eb2ceaf79c838d0ff41f53607a2aac
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST tortoisehg-2.4.3.tar.gz 9025948 SHA256 6db82b51c301e8e7e83a5f7730882fdd055ba99f33ed5013d8c16b68b243f373 SHA512 5321c53750959888272d7073483025b47467de3bf9946c1e816fed5672651183d0fed2dec82ddb6975272dcb6c1cbae56aba6c256edea98e434f7533f46d7d68 WHIRLPOOL 29d8bb553af5e7fc7efb1843cdd81bcb9b077528d9767ee424869e7ccc6e0e5f7b2c5542047ddd0c061ffa419535cfb84f8f848ed7c143064771927c6d68531e
 DIST tortoisehg-2.5.1.tar.gz 9066918 SHA256 d679738e2b15b33902dac2dd9db3ff5d0e7923acadf57c1d0d8faa9d01953749 SHA512 2671d22f15f869f3f2128bd76ae24273cc0d46b8a778d080efaf3d3eb1792874d8c92299adcdc4412a241f471f08cbbda82db8a457f493f636f913bf5a64f1ff WHIRLPOOL 62d5a6b8a3f62fe1dafb2d1a871e883e387188a57a0930eb22727340f4ce93a5cd8d8c7ca781449992edb630937d97fea6f6d87ab813cb43369b99454c0f57ef
-DIST tortoisehg-2.5.tar.gz 9767802 SHA256 8fb1fdd90517e9c24c36f62053eea862aea55e43ee28b1b898848798538b1abd SHA512 efd32a06ac81c6802e184c79b6cddead4256585e3473a3a91236831e461aad056a681532b08358ebec0c10e704fb2cb252df3f5350ec3c4d147edf46b692b8b1 WHIRLPOOL 693cf1bb59e673fc30d05cfa4af683f8ea67c79ebddb96786dae14b3a320ef1875d6678421c0472a13cc977e91958379ed0e78a952c3f48256e740575059ca11
-EBUILD tortoisehg-2.4.2.ebuild 1775 SHA256 bdd30abb7b82acd5b5d5a1372a3a553c551f2b5c986f030c4c679382d3361306 SHA512 27ca11c8b9c4e24efe52e61d196b64d99989a8012b2ca2570a90a2d0f1f6b9754e74603c2184dfbe5f71ec31990f6ca783b3cfe12c2ecd24944823abfc68bbb2 WHIRLPOOL 781703cbfd4f8ae4f9b816e3bcae3443b49fd0ecc8c3bfe50043aaf5068e95f1a7ee8a93e663fc5b6be61c74d716337bd75b77d8c67f8be7cc7d554fd1148d33
+DIST tortoisehg-2.6.tar.gz 9794047 SHA256 50ca1c490feaeb112409ad4de9383b2fef34743eb0c65c7dc3f0d7a40b49c895 SHA512 64db6397ead3a1c0b6b20ecb0069665977925e89ad0322df3d25013ab10dc136b648abeefb843597fd3d2a442d3b8547e23948f2d957b2aeed769146736c85d7 WHIRLPOOL 17a04cb9bf20d01575f9435a076fb47b6720f873f412f10d18d72433df42da65d5580b686838bdd7f8cfd317386fc6e1e6c8698d8c8633bb2e984b78ab38e25a
 EBUILD tortoisehg-2.4.3.ebuild 1733 SHA256 c9ce919fd0a7302e857d9f9255cacdf6f53a3a32c41291356172b4dfa5de2ecb SHA512 fdf8f38f1e6fba5a720f411dc4c3532b10c3e82d982436c388c4e25c892c099670ff1d4c5c11599cc0b99c63fa17a15c9c0912438dd0dfe914a5fea72916c6e3 WHIRLPOOL b4f7e9c163123502d639cdcf72ae3a4f5607fba43b4b755e2895ff905f2da4b87ba790d4375ae922871b494d6dfa4f4f3bfae0cd940dc11b47b7086fb325c23d
 EBUILD tortoisehg-2.5.1.ebuild 1624 SHA256 1a4b538b73a0404e9264de5ef9ea4f0b5e5245a2d37e95c6a7df2ec13f90350d SHA512 d7b1f946e2dd223357b6e7637327310eb410da83d2659218e05885882e57453ef57b5c18df0b9893183e4c1d658b8248793375d2bab4eed41ea39e2890b21e6e WHIRLPOOL 7d6327a45a14e65808d5a64a7b34d2acc2ee9c3479f2716b825b58be0adc65e14fffcfb29ecb2021a8db0a79664f30097083c018570faa045fd8fb5791ba7daa
-EBUILD tortoisehg-2.5.ebuild 1617 SHA256 c665da24deeea05a94c2a44e907a565706426548f1d8bfac5c0b82a442ca71c4 SHA512 e312765dfffd94fd57557cda5a610fdfe2c1d9e31443cbb7e44af858d5ed1a7add27f2377460b8820b88afcc172b537fdeebcf359e73c24e03006f3d0a44f794 WHIRLPOOL a527be76f4ff2468e6f0e51da34aa532b55dfc1a3f7dc601910af8e038406034be9558938f82b5c6cd1ef0bcad21ac19f38b388f7866c60a3ac84a01193fc35e
+EBUILD tortoisehg-2.6.ebuild 1818 SHA256 85be057479831cbd77da61c9910da2733b09521341e594f08301a94afede1f28 SHA512 b8c2a5d4bffa76914cb7a141ec321a327de94bea4e95009c3de8482acabb5301071f448df81d5f1d8937e5f724ac234585157f749e5684e7965f6c89adc21b62 WHIRLPOOL 67dee69dad1fdf397201e5736287822895857114f521083c0d124f96dfab35970021b464064d9b401f65cabfc806f3dbe018151b412316047c6ec5a14586916f
 EBUILD tortoisehg-9999.ebuild 1619 SHA256 985c19994251f92c5b2578ff945f59568aea3e8cc2809874c3478b8e1dc3c86c SHA512 37f232960fe20c15b3c2a8e045a8e0fc7f4c0074fa430affefa6f180f810032f3ba8d3f4fa4a098df031eabf35594a32c699f4fc0f3f03361df19f4faec213b4 WHIRLPOOL d810dd3a9fead6056413a37ebb08143a7e5c7fc29805ead90f1066fdab147484a25450579b345424b6e5278d9ffe8ed3562c3e4920d72253881870ae3c011410
-MISC ChangeLog 4061 SHA256 53dff1ebce6c21e28eca1ea076603a9cc0bc561184a3833a1bedddc404625206 SHA512 afc7724ebfd22c79bd96f46b7bd053b8f4d30e58bc4523ab7db52f9774777499cbf1c676e519b285eaaeccca88c4cb7a72e8cf3e8e3bf290fe774e535add9790 WHIRLPOOL 7efb86a2dff41ffc323b11a9500d6fa6e673fbec15bdf975f15a5f9bbe79a4dc24068174df4b4259f425e1928aadfe376823ae0aed7df0378d3368468e3b435f
+MISC ChangeLog 4275 SHA256 df79547ab4b941e07c8a48a6e463193f492db58c5d3de2a5298af423bd6637c9 SHA512 4c5669f2a2cc7a75daa56bf90e1860375a24eb5120ee90291450a2cda768ac9b11d6b2abaf956bddda975c775417bc9daa22a459a446d6dfe6425bc4e7b3d777 WHIRLPOOL 3451a10be33fc5201e130ca533eb25b4c2f89baf5ed645815469e60269f7b2675b22c55838282302b2c76166b36da7fe78d595203d86aca579b2f3e759c6ab80
 MISC metadata.xml 232 SHA256 8e0308eed9efea18755c3fc2161057faa2b438c4d31895e776d2d5cd5ff109df SHA512 0ec524315be6762228ff54bca53ec039e93672dcef379ef6ef0087656d5e11644aebabcc08663af4f18bdb1b254e71f2b2d3f91277e2867022b93f00d975ae88 WHIRLPOOL bd96dd794e9fdf37bea367be6ada6deb0cf7b98f1978c9e23746f98b1fc2fef931077dd59f6bff7d64856ed284d39f638fb8e0517c61b42f6a0605db09297047
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQsUodAAoJEPiazRVxLXTFHiMQAK+1NROId6q5P+dO0Hq75ubK
+kxFZJTlOZUQrt8pIb2HY6MA/CJJlpAufmlc8afGCBs78yo0tuWIG7zGzrswH7V0j
+s7fxK55iu6gVVEyX/wfmkXQuwO3QLHnxMGOhSEZ0ZAEI6VPyOmKZ1R/TVnwRcin1
+eZM0A+e1y6CZIO4EaNUX+QsHRd/ypvKwebTGtV7i3gno/p2U26Zjsx6zQ9a8dUbk
+2Ym5veHPa02SUzkn6UkTAXy1UjxKju9TUlOHyuAm4OsVpTmDqjusqzKKGBtDmB+x
+E6GxW7u2aag5UDZRIqwgyd0fiPrpGIBqZpyIHBL2DuECISldiO1Z9sxzYcURS0u/
+W80MILR3h+y6yidqq9g3mu9KrNjDf+cNNyjmXSijbqpwmNMtnF/KgQIu6WTtuo6V
+XDUsX9HrHcNW3JrTE6yWbyFziqJ+LHBacnByaVpG+amaoT0dH3l2WMUukDsOuTZT
+Qj/1bbIbXH0LqO34+eRWyE2bg76RNHNsDzMMd2K6+q5FpDFM9gOS7grTQdLyErZA
+5ElgAVFt4OQnpgrqVOTVH6g2vovzh5xW3eO+4jCSre7RHB/wRmRo0qpum3XMQl4+
+TBnBHHvzfVZO4UzmnHMy1m0D60RIRICBrT80xq9Wya/FUjJIp/bP0xpGjr1pQiS/
+lw9arveSq3r+t60hMc3s
+=SDCx
+-----END PGP SIGNATURE-----
diff --git a/dev-vcs/tortoisehg/tortoisehg-2.4.2.ebuild b/dev-vcs/tortoisehg/tortoisehg-2.4.2.ebuild
deleted file mode 100644
index 2d3576e78311..000000000000
--- a/dev-vcs/tortoisehg/tortoisehg-2.4.2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-2.4.2.ebuild,v 1.1 2012/07/20 16:31:52 floppym Exp $
-
-EAPI=4
-
-SUPPORT_PYTHON_ABIS=1
-PYTHON_DEPEND="2:2.5"
-RESTRICT_PYTHON_ABIS="2.4 3.* *-pypy-*"
-
-inherit distutils eutils multilib
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="mirror://bitbucket/${PN}/targz/downloads/${P}.tar.gz"
-	HG_DEPEND=">=dev-vcs/mercurial-2.1 <dev-vcs/mercurial-2.3"
-else
-	inherit mercurial
-	EHG_REPO_URI="https://bitbucket.org/tortoisehg/thg"
-	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
-	dev-python/pygments
-	dev-python/PyQt4
-	dev-python/qscintilla-python"
-DEPEND="${RDEPEND}
-	doc? ( >=dev-python/sphinx-1.0.3 )"
-
-src_prepare() {
-	# make the install respect multilib.
-	sed -i -e "s:lib/nautilus:$(get_libdir)/nautilus:" setup.py || die
-
-	if [[ ${LINGUAS+set} ]]; then
-		pushd i18n/tortoisehg > /dev/null || die
-		local x y keep
-		for x in *.po; do
-			keep=
-			for y in ${LINGUAS}; do
-				if [[ ${y} == ${x%.po}* ]]; then
-					keep=1
-					break
-				fi
-			done
-			[[ ${keep} ]] || rm "${x}" || die
-		done
-		popd > /dev/null || die
-	fi
-
-	distutils_src_prepare
-}
-
-src_compile() {
-	distutils_src_compile
-
-	if use doc ; then
-		emake -C doc html
-	fi
-}
-
-src_install() {
-	distutils_src_install
-	dodoc doc/ReadMe*.txt doc/TODO
-
-	if use doc ; then
-		dohtml -r doc/build/html || die
-	fi
-
-	insinto /usr/share/icons/hicolor/scalable/apps
-	newins icons/scalable/apps/thg-logo.svg tortoisehg_logo.svg
-	domenu contrib/${PN}.desktop
-}
diff --git a/dev-vcs/tortoisehg/tortoisehg-2.5.ebuild b/dev-vcs/tortoisehg/tortoisehg-2.6.ebuild
index 26f992e20c24..ab41ba70af48 100644
--- a/dev-vcs/tortoisehg/tortoisehg-2.5.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-2.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-2.5.ebuild,v 1.2 2012/09/10 20:14:10 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-2.6.ebuild,v 1.1 2012/11/24 22:28:44 polynomial-c Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ inherit distutils eutils
 if [[ ${PV} != *9999* ]]; then
 	KEYWORDS="~amd64 ~x86"
 	SRC_URI="mirror://bitbucket/${PN}/targz/downloads/${P}.tar.gz"
-	HG_DEPEND=">=dev-vcs/mercurial-2.2 <dev-vcs/mercurial-2.4"
+	HG_DEPEND=">=dev-vcs/mercurial-2.2 <dev-vcs/mercurial-2.5"
 else
 	inherit mercurial
 	EHG_REPO_URI="https://bitbucket.org/tortoisehg/thg"
@@ -76,3 +76,9 @@ src_install() {
 	newicon -s scalable icons/scalable/apps/thg-logo.svg tortoisehg_logo.svg
 	domenu contrib/${PN}.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."
+}