Remove old versions.

Package-Manager: portage-2.1.10.57/cvs/Linux x86_64

6 files changed, 9 insertions, 562 deletions

diff --git a/dev-vcs/mercurial/ChangeLog b/dev-vcs/mercurial/ChangeLog
index 7e635e049b9f..e57a2e2baf69 100644
--- a/dev-vcs/mercurial/ChangeLog
+++ b/dev-vcs/mercurial/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-vcs/mercurial
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.72 2012/05/02 08:35:56 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.73 2012/05/02 08:38:20 djc Exp $
+
+  02 May 2012; Dirkjan Ochtman <djc@gentoo.org> -mercurial-1.7.ebuild,
+  -mercurial-2.0.1.ebuild, -mercurial-2.0.2.ebuild, -mercurial-2.1.ebuild:
+  Remove old versions.
 
 *mercurial-2.2 (02 May 2012)
 
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index fff191b9229b..60d6d5e80810 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -2,29 +2,21 @@
 Hash: SHA512
 
 AUX 70mercurial-gentoo.el 76 RMD160 1891ab510adb464211b4cc35c5b6e4b149da79fa SHA1 72eb35d2bf86fa8f806acfbc823b88fc5188741b SHA256 c215746e4a5375569808c6aa6ddabe08e82d33d744128179be3142d9cd53a5ab
-DIST mercurial-1.7.tar.gz 2468587 RMD160 1103d8033309a69ed76a29d40823f45877dee5b9 SHA1 54f5f58365c79dd897e0e490043a5b52aa50aae1 SHA256 19125eb6497c3aeb90a7ad9d5ed7ac2499935c1df796611b017646512f38ba5a
-DIST mercurial-2.0.1.tar.gz 3128233 RMD160 1c2e84fb5ac1eef3dbdd64f16e76e99fdf34fc98 SHA1 7983f564c06aef598fcfd7f8c1c33f4669362760 SHA256 6b9e6870e21e7161bb2e44c09e078e622ad7dd46bf5a122d3155319919dc1b38
-DIST mercurial-2.0.2.tar.gz 3134016 RMD160 5d5da2c17994da77340de6527108fb4a38c216eb SHA1 aedcb4e41c5b49188d9d34d12c343b2ec099c61b SHA256 ca8b8fb93f2e3e8c3cdf2f81d87e92592f5f20c5bfcaaeb6a75550d4a69572c9
 DIST mercurial-2.0.tar.gz 3090977 RMD160 f0c5f143eabff4a6c06d512cecd718bf594d06b1 SHA1 5ede1b3f54d3be2af0657901e7013dde7c19b7c5 SHA256 affab78a4d5074c71f97c07fe211de958263444eb8d86b3ad6fb6d648eb6c594
 DIST mercurial-2.1.1.tar.gz 3313261 RMD160 e17a995a069d1a7a46537a49189520df953acb6f SHA1 d6cc4b649b6705113732e62756788542897ba008 SHA256 0f8ec2b29f1121c6cb73c17509281eb1391ddbfad757b1f720d7e06de0a25dfd
 DIST mercurial-2.1.2.tar.gz 3343349 RMD160 4ac9a91e7debbe556f1c314cc3b6fc87b6cbf2f0 SHA1 6fa2f2510757e3e62efa9d8953f8b703b84075b2 SHA256 914d4889e195687209e070c0c33cf3ae7b78d6c6c92fa7d6ccc718aa96959886
-DIST mercurial-2.1.tar.gz 3308300 RMD160 4d89616c7a2dff4d8c05cf9d8ee8b13bda1c9e23 SHA1 f649a0b33e0cafb3e5867a2e970f41eb887d3fab SHA256 cb37f90807e99dd4508cac70c098aa433b26adb7a3ab064c0b1626dc9a094383
 DIST mercurial-2.2.tar.gz 3414331 RMD160 8dd7b78da6ebdab1882a749c5ad3198ef765eff2 SHA1 8d2dc0b72d0e2aef70770a9eca32154f456e8afa SHA256 18985f38d2bf9fce8173cc2c1824b39df655b826b7886cff8db0b430e0c6ba12
-EBUILD mercurial-1.7.ebuild 3587 RMD160 1ce152f6c318ee33537b492b921271c1ae4920b4 SHA1 e014f2e13314e09eee94400403ae90582c3ed8e6 SHA256 b8c62edc50007cfab8054f1d591d7bf9860fe352a2bc5124e52778917eadf002
-EBUILD mercurial-2.0.1.ebuild 4019 RMD160 e9a8283801fbd97d86819d5825847b91ca840cc9 SHA1 1f05310fbf30ef0a3fc37191d964c57150c65888 SHA256 602bf0ee3d80494f86b29357fb28f91295d181d3f694a659d2edf65923dae89f
-EBUILD mercurial-2.0.2.ebuild 4019 RMD160 0cbb84b3d8fcff513bc3149df7946a38b71e37b8 SHA1 e46a7d80be92e4847bf9e8757896e29c22984a5d SHA256 136a74103ec9537642b46ebc11113265f2d55d194c422d478200067b39295244
 EBUILD mercurial-2.0.ebuild 3780 RMD160 9101dd7670cc20b11c0360409a06143177c09a74 SHA1 d120c20da385213dd6c20138463d630556543cad SHA256 81e0c174d0df8f8917e65e29b1460b047ca90fa3a4fe591af63268eadeabcfc1
 EBUILD mercurial-2.1.1.ebuild 4014 RMD160 1c472912ea5028f7a222668a4363a38603ecaca8 SHA1 4d60be5b12bbe641ebaf87fd118a58ca300639ba SHA256 8bcd59edd7ca7b4ae5fe56b424eeeb1c6bfabe15531e7c19b1458a2c52f39e7f
 EBUILD mercurial-2.1.2.ebuild 4020 RMD160 0aa0852723dd04db54547a1161df27dcde4bb097 SHA1 503902613626de462b62c6c69ccf545132d5eabb SHA256 50ef564eb5c18fd96c8cabb7e10cff385367d0707613995986456240097254ac
-EBUILD mercurial-2.1.ebuild 4017 RMD160 3d2000f9108ffd9b0c64f7c75c5cac5ddf964d99 SHA1 06d9fbf8b86b8c85366ad64fb2eff47b7c93dfd5 SHA256 59b6d3c0f5e6e93745dbf8165621dd0079c0bd492f428f2ce100c6e8fcc1422a
 EBUILD mercurial-2.2.ebuild 4013 RMD160 fddae3e457525becd427861d473cd74fff5ee162 SHA1 3d3e0cfa50a63c20d352c90e240e382ee707f064 SHA256 6368a467aaf1fc3186b713ae237cf7f051d7b1e6851d8728bb9afca1b17afc53
 EBUILD mercurial-9999.ebuild 3496 RMD160 4da1f57f6d21fb051f3eaed843f97f151ecae05a SHA1 03172b1d17645d237d668b50d88d7c950dfb8fe8 SHA256 e863b3dcced3f63a981489c5216344c9cfb0f676c51a4ca625b7225570923385
-MISC ChangeLog 27847 RMD160 58162a139726e52285f908dc8055ce54797a136b SHA1 bbf96b047a4791d1d9bd55d516d5abfcf00d6fba SHA256 6dee06476b537390cc0cd023eae9c2054b0f0c5758635dd1ed5dab0a0164270c
+MISC ChangeLog 28017 RMD160 420f99aece6d1e45127638858fab51b71f92824a SHA1 a981810f675dc035913e8372b85e283a571f877e SHA256 2cd29a01303af5c3ca66052542848d1bebb94d01451c726e65f33c3c2b459306
 MISC metadata.xml 537 RMD160 094da5d55adea235b0980078f03edbc1e2006af9 SHA1 f01f12737cceb293ad828c22c9b1a37a4b51306b SHA256 41fac9bbf087e7bcf85d6ae1a1892c8b0e650e85e44346287f1215e1831948f2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk+g8foACgkQxeMuLWsGW/uRkgCfag6cEClTocWyw4CY5NUTMoeS
-1NsAn05+NUTSDmqcWs2CzJkoQ2hk+8BP
-=i6Y6
+iEYEAREKAAYFAk+g8oYACgkQxeMuLWsGW/vUswCgkdSLRzleZAtr9tKVatCzD/oS
+5FwAn2IXq7RVBJtyCPO2ROZpOK1D0lQQ
+=3lhU
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/mercurial/mercurial-1.7.ebuild b/dev-vcs/mercurial/mercurial-1.7.ebuild
deleted file mode 100644
index 3ef47e716536..000000000000
--- a/dev-vcs/mercurial/mercurial-1.7.ebuild
+++ /dev/null
@@ -1,132 +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/mercurial/mercurial-1.7.ebuild,v 1.11 2012/02/21 03:31:01 patrick Exp $
-
-EAPI=3
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="threads"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
-
-inherit bash-completion elisp-common eutils distutils
-
-DESCRIPTION="Scalable distributed SCM"
-HOMEPAGE="http://mercurial.selenic.com/"
-SRC_URI="http://mercurial.selenic.com/release/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bugzilla emacs gpg test tk zsh-completion"
-
-RDEPEND="bugzilla? ( dev-python/mysql-python )
-	gpg? ( app-crypt/gnupg )
-	tk? ( dev-lang/tk )
-	zsh-completion? ( app-shells/zsh )"
-DEPEND="emacs? ( virtual/emacs )
-	test? ( app-arch/unzip
-		dev-python/pygments )"
-
-PYTHON_CFLAGS=(
-	"2.* + -fno-strict-aliasing"
-	"* - -ftracer -ftree-vectorize"
-)
-
-PYTHON_MODNAME="${PN} hgext"
-SITEFILE="70${PN}-gentoo.el"
-
-src_compile() {
-	distutils_src_compile
-
-	if use emacs; then
-		cd "${S}"/contrib
-		elisp-compile mercurial.el || die "elisp-compile failed!"
-	fi
-
-	rm -rf contrib/{win32,macosx}
-}
-
-src_install() {
-	distutils_src_install
-
-	dobashcompletion contrib/bash_completion ${PN}
-
-	if use zsh-completion ; then
-		insinto /usr/share/zsh/site-functions
-		newins contrib/zsh_completion _hg
-	fi
-
-	rm -f doc/*.?.txt
-	dodoc CONTRIBUTORS PKG-INFO README doc/*.txt
-	cp hgweb*.cgi "${ED}"/usr/share/doc/${PF}/
-
-	dobin hgeditor
-	dobin contrib/hgk
-	dobin contrib/hg-ssh
-
-	rm -f contrib/hgk contrib/hg-ssh
-
-	rm -f contrib/bash_completion
-	cp -r contrib "${ED}"/usr/share/doc/${PF}/
-	doman doc/*.?
-
-	cat > "${T}/80mercurial" <<-EOF
-HG="${EPREFIX}/usr/bin/hg"
-EOF
-	doenvd "${T}/80mercurial"
-
-	if use emacs; then
-		elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-}
-
-src_test() {
-	cd "${S}/tests/"
-	rm -rf *svn*				# Subversion tests fail with 1.5
-	rm -f test-archive			# Fails due to verbose tar output changes
-	rm -f test-convert-baz*		# GNU Arch baz
-	rm -f test-convert-cvs*		# CVS
-	rm -f test-convert-darcs*	# Darcs
-	rm -f test-convert-git*		# git
-	rm -f test-convert-mtn*		# monotone
-	rm -f test-convert-tla*		# GNU Arch tla
-	rm -f test-doctest*			# doctest always fails with python 2.5.x
-	if [[ ${EUID} -eq 0 ]]; then
-		einfo "Removing tests which require user privileges to succeed"
-		rm -f test-command-template	# Test is broken when run as root
-		rm -f test-convert			# Test is broken when run as root
-		rm -f test-lock-badness		# Test is broken when run as root
-		rm -f test-permissions		# Test is broken when run as root
-		rm -f test-pull-permission	# Test is broken when run as root
-		rm -f test-clone-failure
-		rm -f test-journal-exists
-		rm -f test-repair-strip
-	fi
-
-	testing() {
-		local testdir="${T}/tests-${PYTHON_ABI}"
-		rm -rf "${testdir}"
-		"$(PYTHON)" run-tests.py --tmpdir="${testdir}"
-	}
-	python_execute_function testing
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	use emacs && elisp-site-regen
-	bash-completion_pkg_postinst
-
-	elog "If you want to convert repositories from other tools using convert"
-	elog "extension please install correct tool:"
-	elog "  dev-vcs/cvs"
-	elog "  dev-vcs/darcs"
-	elog "  dev-vcs/git"
-	elog "  dev-vcs/monotone"
-	elog "  dev-vcs/subversion"
-}
-
-pkg_postrm() {
-	distutils_pkg_postrm
-	use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/mercurial/mercurial-2.0.1.ebuild b/dev-vcs/mercurial/mercurial-2.0.1.ebuild
deleted file mode 100644
index 94896cac19c5..000000000000
--- a/dev-vcs/mercurial/mercurial-2.0.1.ebuild
+++ /dev/null
@@ -1,139 +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/mercurial/mercurial-2.0.1.ebuild,v 1.3 2012/02/21 03:31:01 patrick Exp $
-
-EAPI=3
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="threads"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
-
-inherit bash-completion-r1 elisp-common eutils distutils
-
-DESCRIPTION="Scalable distributed SCM"
-HOMEPAGE="http://mercurial.selenic.com/"
-SRC_URI="http://mercurial.selenic.com/release/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bugzilla emacs gpg test tk zsh-completion"
-
-RDEPEND="bugzilla? ( dev-python/mysql-python )
-	gpg? ( app-crypt/gnupg )
-	tk? ( dev-lang/tk )
-	zsh-completion? ( app-shells/zsh )"
-DEPEND="emacs? ( virtual/emacs )
-	test? ( app-arch/unzip
-		dev-python/pygments )"
-
-PYTHON_CFLAGS=(
-	"2.* + -fno-strict-aliasing"
-	"* - -ftracer -ftree-vectorize"
-)
-
-PYTHON_MODNAME="${PN} hgext"
-SITEFILE="70${PN}-gentoo.el"
-
-src_prepare() {
-	distutils_src_prepare
-
-	# fix up logic that won't work in Gentoo Prefix (also won't outside in
-	# certain cases), bug #362891
-	sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die
-}
-
-src_compile() {
-	distutils_src_compile
-
-	if use emacs; then
-		cd "${S}"/contrib || die
-		elisp-compile mercurial.el || die "elisp-compile failed!"
-	fi
-
-	rm -rf contrib/{win32,macosx} || die
-}
-
-src_install() {
-	distutils_src_install
-
-	newbashcomp contrib/bash_completion ${PN} || die
-
-	if use zsh-completion ; then
-		insinto /usr/share/zsh/site-functions
-		newins contrib/zsh_completion _hg || die
-	fi
-
-	rm -f doc/*.?.txt || die
-	dodoc CONTRIBUTORS PKG-INFO README doc/*.txt || die
-	cp hgweb*.cgi "${ED}"/usr/share/doc/${PF}/ || die
-
-	dobin hgeditor || die
-	dobin contrib/hgk || die
-	dobin contrib/hg-ssh || die
-
-	rm -f contrib/hgk contrib/hg-ssh || die
-
-	rm -f contrib/bash_completion || die
-	cp -r contrib "${ED}"/usr/share/doc/${PF}/ || die
-	doman doc/*.? || die
-
-	cat > "${T}/80mercurial" <<-EOF
-HG="${EPREFIX}/usr/bin/hg"
-EOF
-	doenvd "${T}/80mercurial" || die
-
-	if use emacs; then
-		elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-}
-
-src_test() {
-	cd "${S}/tests/" || die
-	rm -rf *svn* || die			# Subversion tests fail with 1.5
-	rm -f test-archive || die		# Fails due to verbose tar output changes
-	rm -f test-convert-baz* || die		# GNU Arch baz
-	rm -f test-convert-cvs*	|| die		# CVS
-	rm -f test-convert-darcs* || die	# Darcs
-	rm -f test-convert-git* || die		# git
-	rm -f test-convert-mtn*	|| die		# monotone
-	rm -f test-convert-tla*	|| die		# GNU Arch tla
-	rm -f test-doctest* || die		# doctest always fails with python 2.5.x
-	if [[ ${EUID} -eq 0 ]]; then
-		einfo "Removing tests which require user privileges to succeed"
-		rm -f test-command-template || die	# Test is broken when run as root
-		rm -f test-convert || die		# Test is broken when run as root
-		rm -f test-lock-badness	|| die		# Test is broken when run as root
-		rm -f test-permissions	|| die		# Test is broken when run as root
-		rm -f test-pull-permission || die	# Test is broken when run as root
-		rm -f test-clone-failure || die
-		rm -f test-journal-exists || die
-		rm -f test-repair-strip || die
-	fi
-
-	testing() {
-		local testdir="${T}/tests-${PYTHON_ABI}"
-		rm -rf "${testdir}" || die
-		"$(PYTHON)" run-tests.py --tmpdir="${testdir}"
-	}
-	python_execute_function testing
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	use emacs && elisp-site-regen
-
-	elog "If you want to convert repositories from other tools using convert"
-	elog "extension please install correct tool:"
-	elog "  dev-vcs/cvs"
-	elog "  dev-vcs/darcs"
-	elog "  dev-vcs/git"
-	elog "  dev-vcs/monotone"
-	elog "  dev-vcs/subversion"
-}
-
-pkg_postrm() {
-	distutils_pkg_postrm
-	use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/mercurial/mercurial-2.0.2.ebuild b/dev-vcs/mercurial/mercurial-2.0.2.ebuild
deleted file mode 100644
index 9b8918086b1b..000000000000
--- a/dev-vcs/mercurial/mercurial-2.0.2.ebuild
+++ /dev/null
@@ -1,139 +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/mercurial/mercurial-2.0.2.ebuild,v 1.2 2012/02/21 03:31:01 patrick Exp $
-
-EAPI=3
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="threads"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
-
-inherit bash-completion-r1 elisp-common eutils distutils
-
-DESCRIPTION="Scalable distributed SCM"
-HOMEPAGE="http://mercurial.selenic.com/"
-SRC_URI="http://mercurial.selenic.com/release/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bugzilla emacs gpg test tk zsh-completion"
-
-RDEPEND="bugzilla? ( dev-python/mysql-python )
-	gpg? ( app-crypt/gnupg )
-	tk? ( dev-lang/tk )
-	zsh-completion? ( app-shells/zsh )"
-DEPEND="emacs? ( virtual/emacs )
-	test? ( app-arch/unzip
-		dev-python/pygments )"
-
-PYTHON_CFLAGS=(
-	"2.* + -fno-strict-aliasing"
-	"* - -ftracer -ftree-vectorize"
-)
-
-PYTHON_MODNAME="${PN} hgext"
-SITEFILE="70${PN}-gentoo.el"
-
-src_prepare() {
-	distutils_src_prepare
-
-	# fix up logic that won't work in Gentoo Prefix (also won't outside in
-	# certain cases), bug #362891
-	sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die
-}
-
-src_compile() {
-	distutils_src_compile
-
-	if use emacs; then
-		cd "${S}"/contrib || die
-		elisp-compile mercurial.el || die "elisp-compile failed!"
-	fi
-
-	rm -rf contrib/{win32,macosx} || die
-}
-
-src_install() {
-	distutils_src_install
-
-	newbashcomp contrib/bash_completion ${PN} || die
-
-	if use zsh-completion ; then
-		insinto /usr/share/zsh/site-functions
-		newins contrib/zsh_completion _hg || die
-	fi
-
-	rm -f doc/*.?.txt || die
-	dodoc CONTRIBUTORS PKG-INFO README doc/*.txt || die
-	cp hgweb*.cgi "${ED}"/usr/share/doc/${PF}/ || die
-
-	dobin hgeditor || die
-	dobin contrib/hgk || die
-	dobin contrib/hg-ssh || die
-
-	rm -f contrib/hgk contrib/hg-ssh || die
-
-	rm -f contrib/bash_completion || die
-	cp -r contrib "${ED}"/usr/share/doc/${PF}/ || die
-	doman doc/*.? || die
-
-	cat > "${T}/80mercurial" <<-EOF
-HG="${EPREFIX}/usr/bin/hg"
-EOF
-	doenvd "${T}/80mercurial" || die
-
-	if use emacs; then
-		elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-}
-
-src_test() {
-	cd "${S}/tests/" || die
-	rm -rf *svn* || die			# Subversion tests fail with 1.5
-	rm -f test-archive || die		# Fails due to verbose tar output changes
-	rm -f test-convert-baz* || die		# GNU Arch baz
-	rm -f test-convert-cvs*	|| die		# CVS
-	rm -f test-convert-darcs* || die	# Darcs
-	rm -f test-convert-git* || die		# git
-	rm -f test-convert-mtn*	|| die		# monotone
-	rm -f test-convert-tla*	|| die		# GNU Arch tla
-	rm -f test-doctest* || die		# doctest always fails with python 2.5.x
-	if [[ ${EUID} -eq 0 ]]; then
-		einfo "Removing tests which require user privileges to succeed"
-		rm -f test-command-template || die	# Test is broken when run as root
-		rm -f test-convert || die		# Test is broken when run as root
-		rm -f test-lock-badness	|| die		# Test is broken when run as root
-		rm -f test-permissions	|| die		# Test is broken when run as root
-		rm -f test-pull-permission || die	# Test is broken when run as root
-		rm -f test-clone-failure || die
-		rm -f test-journal-exists || die
-		rm -f test-repair-strip || die
-	fi
-
-	testing() {
-		local testdir="${T}/tests-${PYTHON_ABI}"
-		rm -rf "${testdir}" || die
-		"$(PYTHON)" run-tests.py --tmpdir="${testdir}"
-	}
-	python_execute_function testing
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	use emacs && elisp-site-regen
-
-	elog "If you want to convert repositories from other tools using convert"
-	elog "extension please install correct tool:"
-	elog "  dev-vcs/cvs"
-	elog "  dev-vcs/darcs"
-	elog "  dev-vcs/git"
-	elog "  dev-vcs/monotone"
-	elog "  dev-vcs/subversion"
-}
-
-pkg_postrm() {
-	distutils_pkg_postrm
-	use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/mercurial/mercurial-2.1.ebuild b/dev-vcs/mercurial/mercurial-2.1.ebuild
deleted file mode 100644
index cdc99fefe2e9..000000000000
--- a/dev-vcs/mercurial/mercurial-2.1.ebuild
+++ /dev/null
@@ -1,139 +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/mercurial/mercurial-2.1.ebuild,v 1.2 2012/02/21 03:31:01 patrick Exp $
-
-EAPI=3
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="threads"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
-
-inherit bash-completion-r1 elisp-common eutils distutils
-
-DESCRIPTION="Scalable distributed SCM"
-HOMEPAGE="http://mercurial.selenic.com/"
-SRC_URI="http://mercurial.selenic.com/release/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bugzilla emacs gpg test tk zsh-completion"
-
-RDEPEND="bugzilla? ( dev-python/mysql-python )
-	gpg? ( app-crypt/gnupg )
-	tk? ( dev-lang/tk )
-	zsh-completion? ( app-shells/zsh )"
-DEPEND="emacs? ( virtual/emacs )
-	test? ( app-arch/unzip
-		dev-python/pygments )"
-
-PYTHON_CFLAGS=(
-	"2.* + -fno-strict-aliasing"
-	"* - -ftracer -ftree-vectorize"
-)
-
-PYTHON_MODNAME="${PN} hgext"
-SITEFILE="70${PN}-gentoo.el"
-
-src_prepare() {
-	distutils_src_prepare
-
-	# fix up logic that won't work in Gentoo Prefix (also won't outside in
-	# certain cases), bug #362891
-	sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die
-}
-
-src_compile() {
-	distutils_src_compile
-
-	if use emacs; then
-		cd "${S}"/contrib || die
-		elisp-compile mercurial.el || die "elisp-compile failed!"
-	fi
-
-	rm -rf contrib/{win32,macosx} || die
-}
-
-src_install() {
-	distutils_src_install
-
-	newbashcomp contrib/bash_completion ${PN} || die
-
-	if use zsh-completion ; then
-		insinto /usr/share/zsh/site-functions
-		newins contrib/zsh_completion _hg || die
-	fi
-
-	rm -f doc/*.?.txt || die
-	dodoc CONTRIBUTORS PKG-INFO README doc/*.txt || die
-	cp hgweb*.cgi "${ED}"/usr/share/doc/${PF}/ || die
-
-	dobin hgeditor || die
-	dobin contrib/hgk || die
-	dobin contrib/hg-ssh || die
-
-	rm -f contrib/hgk contrib/hg-ssh || die
-
-	rm -f contrib/bash_completion || die
-	cp -r contrib "${ED}"/usr/share/doc/${PF}/ || die
-	doman doc/*.? || die
-
-	cat > "${T}/80mercurial" <<-EOF
-HG="${EPREFIX}/usr/bin/hg"
-EOF
-	doenvd "${T}/80mercurial" || die
-
-	if use emacs; then
-		elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-}
-
-src_test() {
-	cd "${S}/tests/" || die
-	rm -rf *svn* || die			# Subversion tests fail with 1.5
-	rm -f test-archive || die		# Fails due to verbose tar output changes
-	rm -f test-convert-baz* || die		# GNU Arch baz
-	rm -f test-convert-cvs*	|| die		# CVS
-	rm -f test-convert-darcs* || die	# Darcs
-	rm -f test-convert-git* || die		# git
-	rm -f test-convert-mtn*	|| die		# monotone
-	rm -f test-convert-tla*	|| die		# GNU Arch tla
-	rm -f test-doctest* || die		# doctest always fails with python 2.5.x
-	if [[ ${EUID} -eq 0 ]]; then
-		einfo "Removing tests which require user privileges to succeed"
-		rm -f test-command-template || die	# Test is broken when run as root
-		rm -f test-convert || die		# Test is broken when run as root
-		rm -f test-lock-badness	|| die		# Test is broken when run as root
-		rm -f test-permissions	|| die		# Test is broken when run as root
-		rm -f test-pull-permission || die	# Test is broken when run as root
-		rm -f test-clone-failure || die
-		rm -f test-journal-exists || die
-		rm -f test-repair-strip || die
-	fi
-
-	testing() {
-		local testdir="${T}/tests-${PYTHON_ABI}"
-		rm -rf "${testdir}" || die
-		"$(PYTHON)" run-tests.py --tmpdir="${testdir}"
-	}
-	python_execute_function testing
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	use emacs && elisp-site-regen
-
-	elog "If you want to convert repositories from other tools using convert"
-	elog "extension please install correct tool:"
-	elog "  dev-vcs/cvs"
-	elog "  dev-vcs/darcs"
-	elog "  dev-vcs/git"
-	elog "  dev-vcs/monotone"
-	elog "  dev-vcs/subversion"
-}
-
-pkg_postrm() {
-	distutils_pkg_postrm
-	use emacs && elisp-site-regen
-}