diff --git a/dev-util/mercurial/Manifest b/dev-util/mercurial/Manifest
deleted file mode 100644
--- a/dev-util/mercurial/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 70mercurial-gentoo.el 76 RMD160 1891ab510adb464211b4cc35c5b6e4b149da79fa SHA1 72eb35d2bf86fa8f806acfbc823b88fc5188741b SHA256 c215746e4a5375569808c6aa6ddabe08e82d33d744128179be3142d9cd53a5ab
-AUX mercurial-1.0.2-wsgi.patch 516 RMD160 405d97ed307e497223959e9d6b2fd3f20850d8b5 SHA1 02efa27299895a36bfeced164eb22495bdbc8586 SHA256 e1dd9fc4d774564ddb111cffd4ca3f60610da7ab491ad373bb925b62e1557ce7
-DIST mercurial-1.0.2.tar.gz 815530 RMD160 0f163d19a12bbe7dcfc45f10cdab07f5b16e7b3a SHA1 6d5be655276770192b889cee279bdcc0aee977e3 SHA256 f96d985c04b57848cc142c206a22c2118941ff81e660824c29a859b5a652423a
-EBUILD mercurial-1.0.2.ebuild 3315 RMD160 d862fcefc809f3c25224fe5d4d437ab8c259ef20 SHA1 d593f25ab77ee799b7bc07a801ab11b844a378f5 SHA256 52df7ce8ccd3ef66927efbc2771902c557ec799a1b43318b3f02fb5bfcbff4f2
diff --git a/dev-util/mercurial/files/70mercurial-gentoo.el b/dev-util/mercurial/files/70mercurial-gentoo.el
deleted file mode 100644
--- a/dev-util/mercurial/files/70mercurial-gentoo.el
+++ /dev/null
@@ -1,3 +0,0 @@
-;;; mercurial site-lisp configuration
-
-(add-to-list 'load-path "@SITELISP@")
\ No newline at end of file
diff --git a/dev-util/mercurial/files/mercurial-1.0.2-wsgi.patch b/dev-util/mercurial/files/mercurial-1.0.2-wsgi.patch
deleted file mode 100644
--- a/dev-util/mercurial/files/mercurial-1.0.2-wsgi.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -c /var/tmp/portage/dev-util/mercurial-1.0.2/work/mercurial-1.0.2/mercurial/ui.py /tmp/buffer-content-25351rxn
---- mercurial-1.0.2/mercurial/ui.py	2008-11-09 01:00:02.000000000 -0500
-+++ /tmp/buffer-content-25351rxn	2008-11-09 01:00:11.000000000 -0500
-@@ -394,6 +394,7 @@
-         except IOError, inst:
-             if inst.errno != errno.EPIPE:
-                 raise
-+        except AttributeError, inst: pass
- 
-     def flush(self):
-         try: sys.stdout.flush()
-
-Diff finished.  Sun Nov  9 01:00:11 2008
diff --git a/dev-util/mercurial/files/mercurial-1.1.2-wsgi.patch b/dev-util/mercurial/files/mercurial-1.1.2-wsgi.patch
deleted file mode 100644
--- a/dev-util/mercurial/files/mercurial-1.1.2-wsgi.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From http://www.selenic.com/mercurial/bts/file636/modwsgi.diff, http://www.selenic.com/mercurial/bts/issue1095, by chmullig 2008/06/08
-diff -r d90d83ebea9e mercurial/ui.py
---- a/mercurial/ui.py   Tue Jun 03 12:10:14 2008 +0200
-+++ b/mercurial/ui.py   Sat Jun 07 22:58:36 2008 -0400
-@@ -385,12 +385,14 @@
- 
-     def write_err(self, *args):
-         try:
--            if not sys.stdout.closed: sys.stdout.flush()
-+            try: sys.stdout.flush()
-+            except: pass
-             for a in args:
-                 sys.stderr.write(str(a))
-             # stderr may be buffered under win32 when redirected to files,
-             # including stdout.
--            if not sys.stderr.closed: sys.stderr.flush()
-+            try: sys.stderr.flush()
-+            except: pass
-         except IOError, inst:
-             if inst.errno != errno.EPIPE:
-                 raise
diff --git a/dev-util/mercurial/files/mercurial-1.1.2-wsgi.patch~ b/dev-util/mercurial/files/mercurial-1.1.2-wsgi.patch~
deleted file mode 100644
--- a/dev-util/mercurial/files/mercurial-1.1.2-wsgi.patch~
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -r d90d83ebea9e mercurial/ui.py
---- a/mercurial/ui.py   Tue Jun 03 12:10:14 2008 +0200
-+++ b/mercurial/ui.py   Sat Jun 07 22:58:36 2008 -0400
-@@ -385,12 +385,14 @@
- 
-     def write_err(self, *args):
-         try:
--            if not sys.stdout.closed: sys.stdout.flush()
-+            try: sys.stdout.flush()
-+            except: pass
-             for a in args:
-                 sys.stderr.write(str(a))
-             # stderr may be buffered under win32 when redirected to files,
-             # including stdout.
--            if not sys.stderr.closed: sys.stderr.flush()
-+            try: sys.stderr.flush()
-+            except: pass
-         except IOError, inst:
-             if inst.errno != errno.EPIPE:
-                 raise
diff --git a/dev-util/mercurial/mercurial-1.0.2.ebuild b/dev-util/mercurial/mercurial-1.0.2.ebuild
deleted file mode 100644
--- a/dev-util/mercurial/mercurial-1.0.2.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/mercurial-1.0.2.ebuild,v 1.7 2008/10/17 08:04:41 aballier Exp $
-
-inherit bash-completion elisp-common flag-o-matic eutils distutils
-
-DESCRIPTION="Scalable distributed SCM"
-HOMEPAGE="http://www.selenic.com/mercurial/"
-SRC_URI="http://www.selenic.com/mercurial/release/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="bugzilla emacs gpg test zsh-completion"
-
-CDEPEND=">=dev-lang/python-2.3"
-RDEPEND="${CDEPEND}
-	bugzilla? ( dev-python/mysql-python )
-	gpg? ( app-crypt/gnupg )
-	zsh-completion? ( app-shells/zsh )"
-DEPEND="${CDEPEND}
-	emacs? ( virtual/emacs )
-	test? ( app-arch/unzip
-		dev-python/pygments )"
-
-PYTHON_MODNAME="${PN} hgext"
-SITEFILE="70${PN}-gentoo.el"
-
-src_unpack() {
-	distutils_src_unpack
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-wsgi.patch"
-}
-
-src_compile() {
-	filter-flags -ftracer -ftree-vectorize
-
-	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 "${D}"/usr/share/doc/${PF}/
-
-	dobin contrib/hgk
-	dobin contrib/hg-relink
-	dobin contrib/hg-ssh
-
-	rm -f contrib/hgk contrib/hg-relink contrib/hg-ssh
-
-	rm -f contrib/bash_completion
-	cp -r contrib "${D}"/usr/share/doc/${PF}/
-	doman doc/*.?
-
-	cat > "${T}/80mercurial" <<-EOF
-HG=/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() {
-	local testdir="${T}/tests"
-	mkdir -p -m1777 "${testdir}" || die
-	cd "${S}/tests/"
-	rm -f *svn*		# Subversion tests fail with 1.5
-	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 ! has userpriv ${FEATURES}; 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
-	fi
-	einfo "Running Mercurial tests ..."
-	python run-tests.py --tmpdir="${testdir}" || die "test failed"
-}
-
-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-util/cvs"
-	elog "  dev-util/darcs"
-	elog "  dev-util/git"
-	elog "  dev-util/monotone"
-	elog "  dev-util/subversion"
-}
-
-pkg_postrm() {
-	distutils_pkg_postrm
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/mercurial/mercurial-1.1.2.ebuild b/dev-util/mercurial/mercurial-1.1.2.ebuild
deleted file mode 100644
--- a/dev-util/mercurial/mercurial-1.1.2.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/mercurial-1.0.2.ebuild,v 1.7 2008/10/17 08:04:41 aballier Exp $
-
-inherit bash-completion elisp-common flag-o-matic eutils distutils
-
-DESCRIPTION="Scalable distributed SCM"
-HOMEPAGE="http://www.selenic.com/mercurial/"
-SRC_URI="http://www.selenic.com/mercurial/release/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="bugzilla emacs gpg test tk zsh-completion"
-
-CDEPEND=">=dev-lang/python-2.3"
-RDEPEND="${CDEPEND}
-	bugzilla? ( dev-python/mysql-python )
-	gpg? ( app-crypt/gnupg )
-	tk? ( dev-lang/tk )
-	zsh-completion? ( app-shells/zsh )"
-DEPEND="${CDEPEND}
-	emacs? ( virtual/emacs )
-	test? ( app-arch/unzip
-		dev-python/pygments )"
-
-PYTHON_MODNAME="${PN} hgext"
-SITEFILE="70${PN}-gentoo.el"
-
-src_unpack() {
-	distutils_src_unpack
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-wsgi.patch"
-}
-
-src_compile() {
-	filter-flags -ftracer -ftree-vectorize
-
-	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 "${D}"/usr/share/doc/${PF}/
-
-	dobin contrib/hgk
-	dobin contrib/hg-relink
-	dobin contrib/hg-ssh
-
-	rm -f contrib/hgk contrib/hg-relink contrib/hg-ssh
-
-	rm -f contrib/bash_completion
-	cp -r contrib "${D}"/usr/share/doc/${PF}/
-	doman doc/*.?
-
-	cat > "${T}/80mercurial" <<-EOF
-HG=/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() {
-	local testdir="${T}/tests"
-	mkdir -p -m1777 "${testdir}" || die
-	cd "${S}/tests/"
-	rm -f *svn*		# Subversion tests fail with 1.5
-	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 ! has userpriv ${FEATURES}; 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
-	fi
-	einfo "Running Mercurial tests ..."
-	python run-tests.py --tmpdir="${testdir}" || die "test failed"
-}
-
-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-util/cvs"
-	elog "  dev-util/darcs"
-	elog "  dev-util/git"
-	elog "  dev-util/monotone"
-	elog "  dev-util/subversion"
-}
-
-pkg_postrm() {
-	distutils_pkg_postrm
-	use emacs && elisp-site-regen
-}