Version bump. Removed old

(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

6 files changed, 10 insertions, 193 deletions

diff --git a/dev-vcs/tortoisehg/ChangeLog b/dev-vcs/tortoisehg/ChangeLog
index 3d1924a56c7e..01e3814e7a44 100644
--- a/dev-vcs/tortoisehg/ChangeLog
+++ b/dev-vcs/tortoisehg/ChangeLog
@@ -1,6 +1,13 @@
 # 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.63 2014/09/13 19:57:13 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/ChangeLog,v 1.64 2014/10/13 18:34:14 polynomial-c Exp $
+
+*tortoisehg-3.1.2 (13 Oct 2014)
+
+  13 Oct 2014; Lars Wendler <polynomial-c@gentoo.org> -tortoisehg-2.8.2.ebuild,
+  -tortoisehg-2.9.2.ebuild, -tortoisehg-3.0.2.ebuild, +tortoisehg-3.1.2.ebuild,
+  -files/2.7.1-qtversion.patch, -files/tortoisehg-2.9.1-desktop_file.patch:
+  Version bump. Removed old.
 
 *tortoisehg-3.1.1 (13 Sep 2014)
 
diff --git a/dev-vcs/tortoisehg/files/2.7.1-qtversion.patch b/dev-vcs/tortoisehg/files/2.7.1-qtversion.patch
deleted file mode 100644
index aaa5b0f573d3..000000000000
--- a/dev-vcs/tortoisehg/files/2.7.1-qtversion.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-# HG changeset patch
-# User Steve Borho <steve@borho.org>
-# Date 1362690570 21600
-# Branch stable
-# Node ID e571f9b3eadc2e2706bd350dab33d3bee5bf2315
-# Parent  6fbbe3d1974c267e5a30e4d9d1efc54a24fd1f35
-qt: use int comparison for Qt and PyQt version check (fixes #2467)
-
-diff --git a/tortoisehg/hgqt/qtlib.py b/tortoisehg/hgqt/qtlib.py
---- a/tortoisehg/hgqt/qtlib.py
-+++ b/tortoisehg/hgqt/qtlib.py
-@@ -25,9 +25,8 @@
- from PyQt4.QtCore import *
- from PyQt4.QtGui import *
- 
--if PYQT_VERSION_STR.split('.') < ['4', '6'] or \
--   QT_VERSION_STR.split('.') < ['4', '6']:
--    sys.stderr.write('TortoiseHg requires Qt 4.6 and PyQt 4.7\n')
-+if PYQT_VERSION < 0x40600 or QT_VERSION < 0x40600:
-+    sys.stderr.write('TortoiseHg requires Qt 4.6 and PyQt 4.6\n')
-     sys.stderr.write('You have Qt %s and PyQt %s\n' %
-                      (QT_VERSION_STR, PYQT_VERSION_STR))
-     sys.exit()
diff --git a/dev-vcs/tortoisehg/files/tortoisehg-2.9.1-desktop_file.patch b/dev-vcs/tortoisehg/files/tortoisehg-2.9.1-desktop_file.patch
deleted file mode 100644
index 1170b2a6326f..000000000000
--- a/dev-vcs/tortoisehg/files/tortoisehg-2.9.1-desktop_file.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/thg.desktop
-+++ contrib/thg.desktop
-@@ -0,0 +1,8 @@
-+[Desktop Entry]
-+Type=Application
-+Name=TortoiseHg
-+GenericName=Version Control GUI
-+Comment=GUI application for using Mercurial
-+Icon=thg_logo
-+Exec=thg --nofork
-+Categories=Development;RevisionControl;
diff --git a/dev-vcs/tortoisehg/tortoisehg-2.8.2.ebuild b/dev-vcs/tortoisehg/tortoisehg-2.8.2.ebuild
deleted file mode 100644
index 9a11d1c49842..000000000000
--- a/dev-vcs/tortoisehg/tortoisehg-2.8.2.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-2.8.2.ebuild,v 1.3 2014/07/06 13:20:06 mgorny 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.5 <dev-vcs/mercurial-2.7"
-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/${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."
-}
diff --git a/dev-vcs/tortoisehg/tortoisehg-2.9.2.ebuild b/dev-vcs/tortoisehg/tortoisehg-2.9.2.ebuild
deleted file mode 100644
index 0bfba797d097..000000000000
--- a/dev-vcs/tortoisehg/tortoisehg-2.9.2.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-2.9.2.ebuild,v 1.3 2014/07/06 13:20:06 mgorny 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.6 <dev-vcs/mercurial-2.8"
-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.0.2.ebuild b/dev-vcs/tortoisehg/tortoisehg-3.1.2.ebuild
index d16bab7e5c54..96721ba8455a 100644
--- a/dev-vcs/tortoisehg/tortoisehg-3.0.2.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-3.1.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.0.2.ebuild,v 1.2 2014/08/02 02:02:03 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-3.1.2.ebuild,v 1.1 2014/10/13 18:34:14 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.1"
+	HG_DEPEND=">=dev-vcs/mercurial-2.9 <dev-vcs/mercurial-3.2"
 else
 	inherit mercurial
 	EHG_REPO_URI="https://bitbucket.org/tortoisehg/thg"