diff --git a/dev-vcs/mercurial/mercurial-1.4.2.bep b/dev-vcs/mercurial/mercurial-1.4.2.bep
deleted file mode 100644
index 00f938832..000000000
--- a/dev-vcs/mercurial/mercurial-1.4.2.bep
+++ /dev/null
@@ -1,18 +0,0 @@
-DESCRIPTION="Mercurial is a free, distributed source control management tool" 
-HOMEPAGE="http://mercurial.selenic.com/" 
-SRC_URI="http://mercurial.selenic.com/release/mercurial-1.4.2.tar.gz"
-CHECKSUM_MD5="cf23b0887f0437c8601d5b89ae4663a6"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD {
-	cd mercurial-1.4.2
-	python setup.py build
-}
-
-INSTALL {
-	cd mercurial-1.4.2
-	python setup.py install --prefix=`finddir B_COMMON_DIRECTORY`
-}
-LICENSE="GNU GPL v2"
-COPYRIGHT="2005-2010 Matt Mackall et al. "
diff --git a/dev-vcs/mercurial/mercurial-1.4.bep b/dev-vcs/mercurial/mercurial-1.4.bep
deleted file mode 100644
index eabf12e46..000000000
--- a/dev-vcs/mercurial/mercurial-1.4.bep
+++ /dev/null
@@ -1,18 +0,0 @@
-DESCRIPTION="Mercurial is a free, distributed source control management tool" 
-HOMEPAGE="http://mercurial.selenic.com/" 
-SRC_URI="http://mercurial.selenic.com/release/mercurial-1.4.tar.gz"
-CHECKSUM_MD5="951ebd4a8153eaa3c56fc0ce2575ab70"
-REVISION="1"
-STATUS_HAIKU="broken"
-DEPEND=""
-BUILD {
-	cd mercurial-1.4
-	python setup.py  install --prefix="/boot/common" --force
-}
-
-INSTALL {
-	cd mercurial-1.4
-	make install PREFIX=/boot/common
-}
-LICENSE="GNU GPL v2"
-COPYRIGHT="2005-2010 Matt Mackall et al. "
diff --git a/dev-vcs/mercurial/mercurial-1.5.1.bep b/dev-vcs/mercurial/mercurial-1.5.1.bep
deleted file mode 100644
index 35d5b3d8f..000000000
--- a/dev-vcs/mercurial/mercurial-1.5.1.bep
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION="Mercurial is a free, distributed source control management tool" 
-HOMEPAGE="http://mercurial.selenic.com/" 
-SRC_URI="http://mercurial.selenic.com/release/mercurial-1.5.1.tar.gz"
-CHECKSUM_MD5="22eac5602d777f9601e23700e641503f"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD {
-	cd mercurial-1.5.1
-	python setup.py build --force
-}
-
-INSTALL {
-	cd mercurial-1.5.1
-	if [ -n ${DESTDIR} ];then
-		python setup.py install --root="${DESTDIR}" --prefix="/boot/common" --force
-	else
-		python setup.py install --prefix="/boot/common" --force
-	fi
-}
-LICENSE="GNU GPL v2"
-COPYRIGHT="2005-2010 Matt Mackall et al. "
diff --git a/dev-vcs/mercurial/mercurial-1.5.2.bep b/dev-vcs/mercurial/mercurial-1.5.2.bep
deleted file mode 100644
index f9f5e32fb..000000000
--- a/dev-vcs/mercurial/mercurial-1.5.2.bep
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION="Mercurial is a free, distributed source control management tool" 
-HOMEPAGE="http://mercurial.selenic.com/" 
-SRC_URI="http://mercurial.selenic.com/release/mercurial-1.5.2.tar.gz"
-CHECKSUM_MD5="deafaaf017fc3c8a9deef39e566aec80"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD {
-	cd mercurial-1.5.2
-	python setup.py build --force
-}
-
-INSTALL {
-	cd mercurial-1.5.2
-	if [ -n ${DESTDIR} ];then
-		python setup.py install --root="${DESTDIR}" --prefix="/boot/common" --force
-	else
-		python setup.py install --prefix="/boot/common" --force
-	fi
-}
-LICENSE="GNU GPL v2"
-COPYRIGHT="2005-2010 Matt Mackall et al. "
diff --git a/dev-vcs/mercurial/mercurial-1.5.3.bep b/dev-vcs/mercurial/mercurial-1.5.3.bep
deleted file mode 100644
index 1ec3f0351..000000000
--- a/dev-vcs/mercurial/mercurial-1.5.3.bep
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION="Mercurial is a free, distributed source control management tool" 
-HOMEPAGE="http://mercurial.selenic.com/" 
-SRC_URI="http://mercurial.selenic.com/release/mercurial-1.5.3.tar.gz"
-CHECKSUM_MD5="0969b8109f1b5a9c4debf985cca938f9"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="dev-lang/python >= 2.3"
-BUILD {
-	cd mercurial-1.5.3
-	python setup.py build --force
-}
-
-INSTALL {
-	cd mercurial-1.5.3
-	if [ -n ${DESTDIR} ];then
-		python setup.py install --root="${DESTDIR}" --prefix="/boot/common" --force
-	else
-		python setup.py install --prefix="/boot/common" --force
-	fi
-}
-LICENSE="GNU GPL v2"
-COPYRIGHT="2005-2010 Matt Mackall et al. "
diff --git a/dev-vcs/mercurial/mercurial-1.5.bep b/dev-vcs/mercurial/mercurial-1.5.bep
deleted file mode 100644
index fb1b85aa6..000000000
--- a/dev-vcs/mercurial/mercurial-1.5.bep
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION="Mercurial is a free, distributed source control management tool" 
-HOMEPAGE="http://mercurial.selenic.com/" 
-SRC_URI="http://mercurial.selenic.com/release/mercurial-1.5.tar.gz"
-CHECKSUM_MD5="6e31357ada35fe20557f08a4e89f9c42"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD {
-	cd mercurial-1.5
-	python setup.py build --force
-}
-
-INSTALL {
-	cd mercurial-1.5
-	if [ -n ${DESTDIR} ];then
-		python setup.py install --root="${DESTDIR}" --prefix="/boot/common" --force
-	else
-		python setup.py install --prefix="/boot/common" --force
-	fi
-}
-LICENSE="GNU GPL v2"
-COPYRIGHT="2005-2010 Matt Mackall et al. "
diff --git a/dev-vcs/mercurial/mercurial-1.6.bep b/dev-vcs/mercurial/mercurial-1.6.bep
deleted file mode 100644
index 2e993e784..000000000
--- a/dev-vcs/mercurial/mercurial-1.6.bep
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION="Mercurial is a free, distributed source control management tool" 
-HOMEPAGE="http://mercurial.selenic.com/" 
-SRC_URI="http://mercurial.selenic.com/release/mercurial-1.6.tar.gz"
-CHECKSUM_MD5="e97772cb424d29d9382c41daafa6f92d"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="dev-lang/python >= 2.3"
-BUILD {
-	cd mercurial-1.6
-	python setup.py build --force
-}
-
-INSTALL {
-	cd mercurial-1.6
-	if [ -n "${DESTDIR}" ];then
-		python setup.py install --root="${DESTDIR}" --prefix="/boot/common" --force
-	else
-		python setup.py install --prefix="/boot/common" --force
-	fi
-}
-LICENSE="GNU GPL v2"
-COPYRIGHT="2005-2010 Matt Mackall et al. "
diff --git a/dev-vcs/mercurial/mercurial-1.7.3.bep b/dev-vcs/mercurial/mercurial-1.7.3.bep
deleted file mode 100644
index dcd197d07..000000000
--- a/dev-vcs/mercurial/mercurial-1.7.3.bep
+++ /dev/null
@@ -1,28 +0,0 @@
-DESCRIPTION="Mercurial is a free, distributed source control management tool" 
-HOMEPAGE="http://mercurial.selenic.com/" 
-SRC_URI="http://mercurial.selenic.com/release/mercurial-1.7.3.tar.gz"
-CHECKSUM_MD5="1d635ad307fa20a5e9c6afba6145a73b"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="dev-lang/python >= 2.3"
-BUILD {
-	cd mercurial-1.7.3
-	python setup.py build --force
-}
-
-INSTALL {
-	cd mercurial-1.7.3
-	if [ -n "${DESTDIR}" ];then
-		python setup.py install --root="${DESTDIR}" --prefix="/boot/common" --force
-	else
-		python setup.py install --prefix="/boot/common" --force
-	fi
-}
-
-TEST {
-	cd mercurial-1.7.3/tests
-	python run-tests.py
-}
-
-LICENSE="GNU GPL v2"
-COPYRIGHT="2005-2010 Matt Mackall et al. "
diff --git a/dev-vcs/mercurial/mercurial-1.8.3.bep b/dev-vcs/mercurial/mercurial-1.8.3.bep
deleted file mode 100644
index 1769cff1a..000000000
--- a/dev-vcs/mercurial/mercurial-1.8.3.bep
+++ /dev/null
@@ -1,28 +0,0 @@
-DESCRIPTION="Mercurial is a free, distributed source control management tool" 
-HOMEPAGE="http://mercurial.selenic.com/" 
-SRC_URI="http://mercurial.selenic.com/release/mercurial-1.8.3.tar.gz"
-CHECKSUM_MD5="7afea936dfdb21220064cac6402f8743"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="dev-lang/python >= 2.3"
-BUILD {
-	cd mercurial-1.8.3
-	python setup.py build --force
-}
-
-INSTALL {
-	cd mercurial-1.8.3
-	if [ -n "${DESTDIR}" ];then
-		python setup.py install --root="${DESTDIR}" --prefix="/boot/common" --force
-	else
-		python setup.py install --prefix="/boot/common" --force
-	fi
-}
-
-TEST {
-	cd mercurial-1.8.3/tests
-	python run-tests.py
-}
-
-LICENSE="GNU GPL v2"
-COPYRIGHT="2005-2011 Matt Mackall et al. "
diff --git a/dev-vcs/mercurial/mercurial-1.9.bep b/dev-vcs/mercurial/mercurial-2.2.bep
similarity index 73%
rename from dev-vcs/mercurial/mercurial-1.9.bep
rename to dev-vcs/mercurial/mercurial-2.2.bep
index 7d1cc60e8..ec0a36e79 100644
--- a/dev-vcs/mercurial/mercurial-1.9.bep
+++ b/dev-vcs/mercurial/mercurial-2.2.bep
@@ -1,17 +1,17 @@
 DESCRIPTION="Mercurial is a free, distributed source control management tool" 
 HOMEPAGE="http://mercurial.selenic.com/" 
-SRC_URI="http://mercurial.selenic.com/release/mercurial-1.9.tar.gz"
-CHECKSUM_MD5="d4842129fa2732eb6ed1180467bc32e2"
+SRC_URI="http://mercurial.selenic.com/release/mercurial-2.2.tar.gz"
+CHECKSUM_MD5="e52ab7ab35105c768a4cd1658de0e1a5"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-lang/python >= 2.3"
 BUILD {
-	cd mercurial-1.9
+	cd mercurial-2.2
 	python setup.py build --force
 }
 
 INSTALL {
-	cd mercurial-1.9
+	cd mercurial-2.2
 	if [ -n "${DESTDIR}" ];then
 		python setup.py install --root="${DESTDIR}" --prefix="$(finddir B_COMMON_DIRECTORY)" --force
 	else
@@ -20,11 +20,11 @@ INSTALL {
 }
 
 TEST {
-	cd mercurial-1.9/tests
+	cd mercurial-2.2/tests
 	shopt -s extglob
 	sed -i 's,/usr/bin/env,/bin/env,' !(blacklists|bundles|gpg|svn)
 	python run-tests.py
 }
 
 LICENSE="GNU GPL v2"
-COPYRIGHT="2005-2011 Matt Mackall et al."
+COPYRIGHT="2005-2012 Matt Mackall et al."
diff --git a/dev-vcs/mercurial/patches/mercurial-1.0.2-haiku.diff b/dev-vcs/mercurial/patches/mercurial-1.0.2-haiku.diff
deleted file mode 100644
index 03ba71c96..000000000
--- a/dev-vcs/mercurial/patches/mercurial-1.0.2-haiku.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -urN mercurial-1.0.2/mercurial/bdiff.c mercurial-1.0.2-haiku/mercurial/bdiff.c
---- mercurial-1.0.2/mercurial/bdiff.c	2008-08-13 22:11:47.000000000 +0000
-+++ mercurial-1.0.2-haiku/mercurial/bdiff.c	2008-09-09 15:43:50.000000000 +0000
-@@ -34,7 +34,7 @@
- }
- #else
- #include <sys/types.h>
--#ifdef __BEOS__
-+#if defined __BEOS__ && !defined __HAIKU__
- #include <ByteOrder.h>
- #else
- #include <arpa/inet.h>
-diff -urN mercurial-1.0.2/mercurial/mpatch.c mercurial-1.0.2-haiku/mercurial/mpatch.c
---- mercurial-1.0.2/mercurial/mpatch.c	2008-08-13 22:11:47.000000000 +0000
-+++ mercurial-1.0.2-haiku/mercurial/mpatch.c	2008-09-09 15:44:29.000000000 +0000
-@@ -52,7 +52,7 @@
- #else
- /* not windows */
- # include <sys/types.h>
--# ifdef __BEOS__
-+# if defined __BEOS__ && !defined __HAIKU__
- #  include <ByteOrder.h>
- # else
- #  include <arpa/inet.h>
diff --git a/dev-vcs/mercurial/patches/mercurial-1.5.1.patch b/dev-vcs/mercurial/patches/mercurial-1.5.1.patch
deleted file mode 100644
index e93404db5..000000000
--- a/dev-vcs/mercurial/patches/mercurial-1.5.1.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up mercurial-1.5.1/mercurial/ui.py.orig mercurial-1.5.1/mercurial/ui.py
---- mercurial-1.5.1/mercurial/ui.py.orig	2010-04-30 23:51:42.741605376 -0600
-+++ mercurial-1.5.1/mercurial/ui.py	2010-04-30 23:52:08.309854208 -0600
-@@ -384,7 +384,7 @@ class ui(object):
-         return (os.environ.get("HGEDITOR") or
-                 self.config("ui", "editor") or
-                 os.environ.get("VISUAL") or
--                os.environ.get("EDITOR", "vi"))
-+                os.environ.get("EDITOR", "nano"))
- 
-     def progress(self, topic, pos, item="", unit="", total=None):
-         '''show a progress message
diff --git a/dev-vcs/mercurial/patches/mercurial-1.5.2.patch b/dev-vcs/mercurial/patches/mercurial-1.5.2.patch
deleted file mode 100644
index 2f8db7ab5..000000000
--- a/dev-vcs/mercurial/patches/mercurial-1.5.2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up mercurial-1.5.2/mercurial/ui.py.orig mercurial-1.5.2/mercurial/ui.py
---- mercurial-1.5.2/mercurial/ui.py.orig	2010-05-01 15:02:48.041156608 -0600
-+++ mercurial-1.5.2/mercurial/ui.py	2010-05-01 17:04:56.068943872 -0600
-@@ -384,7 +384,7 @@ class ui(object):
-         return (os.environ.get("HGEDITOR") or
-                 self.config("ui", "editor") or
-                 os.environ.get("VISUAL") or
--                os.environ.get("EDITOR", "vi"))
-+                os.environ.get("EDITOR", "nano"))
- 
-     def progress(self, topic, pos, item="", unit="", total=None):
-         '''show a progress message
diff --git a/dev-vcs/mercurial/patches/mercurial-1.5.3.patch b/dev-vcs/mercurial/patches/mercurial-1.5.3.patch
deleted file mode 100644
index 9aae6cec9..000000000
--- a/dev-vcs/mercurial/patches/mercurial-1.5.3.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up mercurial-1.5.3/mercurial/ui.py.orig mercurial-1.5.3/mercurial/ui.py
---- mercurial-1.5.3/mercurial/ui.py.orig	2010-05-13 10:30:46.037224448 -0600
-+++ mercurial-1.5.3/mercurial/ui.py	2010-05-13 17:58:50.218890240 -0600
-@@ -384,7 +384,7 @@ class ui(object):
-         return (os.environ.get("HGEDITOR") or
-                 self.config("ui", "editor") or
-                 os.environ.get("VISUAL") or
--                os.environ.get("EDITOR", "vi"))
-+                os.environ.get("EDITOR", "nano"))
- 
-     def progress(self, topic, pos, item="", unit="", total=None):
-         '''show a progress message
diff --git a/dev-vcs/mercurial/patches/mercurial-1.6.patch b/dev-vcs/mercurial/patches/mercurial-1.6.patch
deleted file mode 100644
index 570190c90..000000000
--- a/dev-vcs/mercurial/patches/mercurial-1.6.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up mercurial-1.6/mercurial/ui.py.orig mercurial-1.6/mercurial/ui.py
---- mercurial-1.6/mercurial/ui.py.orig	2010-07-01 11:06:27.030670848 -0600
-+++ mercurial-1.6/mercurial/ui.py	2010-07-01 11:41:21.504365056 -0600
-@@ -557,7 +557,7 @@ class ui(object):
-         return (os.environ.get("HGEDITOR") or
-                 self.config("ui", "editor") or
-                 os.environ.get("VISUAL") or
--                os.environ.get("EDITOR", "vi"))
-+                os.environ.get("EDITOR", "nano"))
- 
-     def progress(self, topic, pos, item="", unit="", total=None):
-         '''show a progress message
diff --git a/dev-vcs/mercurial/patches/mercurial-1.7.3.patch b/dev-vcs/mercurial/patches/mercurial-1.7.3.patch
deleted file mode 100644
index 003c2d4cd..000000000
--- a/dev-vcs/mercurial/patches/mercurial-1.7.3.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up mercurial-1.7.3/mercurial/ui.py.orig mercurial-1.7.3/mercurial/ui.py
---- mercurial-1.7.3/mercurial/ui.py.orig	2010-07-01 11:06:27.030670848 -0600
-+++ mercurial-1.7.3/mercurial/ui.py	2010-07-01 11:41:21.504365056 -0600
-@@ -557,7 +557,7 @@ class ui(object):
-         return (os.environ.get("HGEDITOR") or
-                 self.config("ui", "editor") or
-                 os.environ.get("VISUAL") or
--                os.environ.get("EDITOR", "vi"))
-+                os.environ.get("EDITOR", "nano"))
- 
-     def progress(self, topic, pos, item="", unit="", total=None):
-         '''show a progress message
diff --git a/dev-vcs/mercurial/patches/mercurial-1.8.3.patch b/dev-vcs/mercurial/patches/mercurial-1.8.3.patch
deleted file mode 100644
index f43d9e245..000000000
--- a/dev-vcs/mercurial/patches/mercurial-1.8.3.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up mercurial-1.8.3/mercurial/ui.py.orig mercurial-1.8.3/mercurial/ui.py
---- mercurial-1.8.3/mercurial/ui.py.orig	2011-05-01 04:57:56.062128128 -0600
-+++ mercurial-1.8.3/mercurial/ui.py	2011-05-04 13:08:44.669515776 -0600
-@@ -580,7 +580,7 @@ class ui(object):
-         return (os.environ.get("HGEDITOR") or
-                 self.config("ui", "editor") or
-                 os.environ.get("VISUAL") or
--                os.environ.get("EDITOR", "vi"))
-+                os.environ.get("EDITOR", "nano"))
- 
-     def progress(self, topic, pos, item="", unit="", total=None):
-         '''show a progress message
diff --git a/dev-vcs/mercurial/patches/mercurial-1.9.patch b/dev-vcs/mercurial/patches/mercurial-1.9.patch
deleted file mode 100644
index 237f9be61..000000000
--- a/dev-vcs/mercurial/patches/mercurial-1.9.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up mercurial-1.9/mercurial/ui.py.orig mercurial-1.9/mercurial/ui.py
---- mercurial-1.9/mercurial/ui.py.orig	2011-07-01 12:54:23.057933824 -0600
-+++ mercurial-1.9/mercurial/ui.py	2011-07-02 12:23:10.208666624 -0600
-@@ -656,7 +656,7 @@ class ui(object):
-         return (os.environ.get("HGEDITOR") or
-                 self.config("ui", "editor") or
-                 os.environ.get("VISUAL") or
--                os.environ.get("EDITOR", "vi"))
-+                os.environ.get("EDITOR", "nano"))
- 
-     def progress(self, topic, pos, item="", unit="", total=None):
-         '''show a progress message
diff --git a/dev-vcs/mercurial/patches/mercurial-2.2.patch b/dev-vcs/mercurial/patches/mercurial-2.2.patch
new file mode 100644
index 000000000..d327fdb8f
--- /dev/null
+++ b/dev-vcs/mercurial/patches/mercurial-2.2.patch
@@ -0,0 +1,12 @@
+diff -up mercurial-2.2/mercurial/ui.py.orig mercurial-2.2/mercurial/ui.py
+--- mercurial-2.2/mercurial/ui.py.orig	2012-05-02 21:41:24.391643136 -0600
++++ mercurial-2.2/mercurial/ui.py	2012-05-02 21:42:15.730595328 -0600
+@@ -693,7 +693,7 @@ class ui(object):
+             # avoid confusion.
+             editor = 'E'
+         else:
+-            editor = 'vi'
++            editor = 'nano'
+         return (os.environ.get("HGEDITOR") or
+                 self.config("ui", "editor") or
+                 os.environ.get("VISUAL") or