Version bump. Remove old.

(Portage version: 2.2.0_alpha79/cvs/Linux x86_64)

4 files changed, 19 insertions, 127 deletions

diff --git a/dev-vcs/tortoisehg/ChangeLog b/dev-vcs/tortoisehg/ChangeLog
index 393965865f10..aa1fa0405ba8 100644
--- a/dev-vcs/tortoisehg/ChangeLog
+++ b/dev-vcs/tortoisehg/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-vcs/tortoisehg
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/ChangeLog,v 1.5 2011/11/07 20:39:34 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/ChangeLog,v 1.6 2011/12/10 04:41:55 floppym Exp $
+
+*tortoisehg-2.2.1 (10 Dec 2011)
+
+  10 Dec 2011; Mike Gilbert <floppym@gentoo.org> +tortoisehg-2.2.1.ebuild,
+  -tortoisehg-2.1.3.ebuild, -tortoisehg-2.1.4-r1.ebuild,
+  -tortoisehg-2.1.4.ebuild:
+  Version bump. Remove old.
 
 *tortoisehg-2.2 (07 Nov 2011)
 
diff --git a/dev-vcs/tortoisehg/tortoisehg-2.1.3.ebuild b/dev-vcs/tortoisehg/tortoisehg-2.1.3.ebuild
deleted file mode 100644
index 13fb7774bce2..000000000000
--- a/dev-vcs/tortoisehg/tortoisehg-2.1.3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-2.1.3.ebuild,v 1.1 2011/09/07 02:33:42 floppym Exp $
-
-EAPI=3
-
-SUPPORT_PYTHON_ABIS=1
-PYTHON_DEPEND="2:2.5"
-RESTRICT_PYTHON_ABIS="2.4 3.*"
-
-inherit distutils eutils multilib
-
-DESCRIPTION="Set of graphical tools for Mercurial"
-HOMEPAGE="http://tortoisehg.bitbucket.org"
-SRC_URI="http://bitbucket.org/${PN}/targz/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc nautilus"
-
-RDEPEND="dev-python/iniparse
-	dev-python/pygments
-	dev-python/PyQt4
-	dev-python/qscintilla-python
-	>=dev-vcs/mercurial-1.9
-	nautilus? ( dev-python/nautilus-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
-	distutils_src_prepare
-}
-
-src_compile() {
-	distutils_src_compile
-
-	if use doc ; then
-		emake -C doc html || die
-	fi
-}
-
-src_install() {
-	distutils_src_install
-	dodoc doc/ReadMe*.txt doc/TODO || die
-
-	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 || die
-	domenu contrib/${PN}.desktop || die
-
-	if ! use nautilus; then
-		rm -rf "${ED}usr/$(get_libdir)/nautilus" || die
-	fi
-}
diff --git a/dev-vcs/tortoisehg/tortoisehg-2.1.4.ebuild b/dev-vcs/tortoisehg/tortoisehg-2.1.4.ebuild
deleted file mode 100644
index 0208d5cbf974..000000000000
--- a/dev-vcs/tortoisehg/tortoisehg-2.1.4.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-2.1.4.ebuild,v 1.1 2011/10/11 15:23:59 floppym Exp $
-
-EAPI=3
-
-SUPPORT_PYTHON_ABIS=1
-PYTHON_DEPEND="2:2.5"
-RESTRICT_PYTHON_ABIS="2.4 3.*"
-
-inherit distutils eutils multilib
-
-DESCRIPTION="Set of graphical tools for Mercurial"
-HOMEPAGE="http://tortoisehg.bitbucket.org"
-SRC_URI="http://bitbucket.org/${PN}/targz/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc nautilus"
-
-RDEPEND="dev-python/iniparse
-	dev-python/pygments
-	dev-python/PyQt4
-	dev-python/qscintilla-python
-	>=dev-vcs/mercurial-1.9
-	nautilus? ( dev-python/nautilus-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
-	distutils_src_prepare
-}
-
-src_compile() {
-	distutils_src_compile
-
-	if use doc ; then
-		emake -C doc html || die
-	fi
-}
-
-src_install() {
-	distutils_src_install
-	dodoc doc/ReadMe*.txt doc/TODO || die
-
-	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 || die
-	domenu contrib/${PN}.desktop || die
-
-	if ! use nautilus; then
-		rm -r "${ED}usr/$(get_libdir)/nautilus" || die
-	fi
-}
diff --git a/dev-vcs/tortoisehg/tortoisehg-2.1.4-r1.ebuild b/dev-vcs/tortoisehg/tortoisehg-2.2.1.ebuild
index 92465770eaf7..70313bce94e1 100644
--- a/dev-vcs/tortoisehg/tortoisehg-2.1.4-r1.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-2.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-2.1.4-r1.ebuild,v 1.1 2011/11/04 17:44:04 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-2.2.1.ebuild,v 1.1 2011/12/10 04:41:55 floppym Exp $
 
 EAPI=4
 
@@ -10,13 +10,21 @@ RESTRICT_PYTHON_ABIS="2.4 3.*"
 
 inherit distutils eutils multilib
 
+if [[ ${PV} != *9999* ]]; then
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://bitbucket.org/${PN}/targz/downloads/${P}.tar.gz"
+else
+	inherit mercurial
+	EHG_REPO_URI="https://bitbucket.org/tortoisehg/thg"
+	KEYWORDS=""
+	SRC_URI=""
+fi
+
 DESCRIPTION="Set of graphical tools for Mercurial"
 HOMEPAGE="http://tortoisehg.bitbucket.org"
-SRC_URI="http://bitbucket.org/${PN}/targz/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 IUSE="doc nautilus"
 
 RDEPEND="dev-python/iniparse
@@ -29,9 +37,6 @@ DEPEND="${RDEPEND}
 	doc? ( >=dev-python/sphinx-1.0.3 )"
 
 src_prepare() {
-	# Bug 389513: Mercurial 2 compatibility.
-	epatch "${FILESDIR}/${P}-mercurial-2.patch"
-
 	# make the install respect multilib.
 	sed -i -e "s:lib/nautilus:$(get_libdir)/nautilus:" setup.py || die