--- /usr/portage/dev-python/irc/irc-8.5.1.ebuild	2013-08-26 04:38:37.000000000 +0200
+++ irc-8.5.1.ebuild	2013-09-19 12:59:44.000000000 +0200
@@ -17,9 +17,7 @@
 IUSE="examples test"
 
 DEPEND="app-arch/unzip
-	app-text/dos2unix
 	dev-python/pytest-runner[${PYTHON_USEDEP}]
-	dev-python/hgtools[${PYTHON_USEDEP}]
 	test? ( dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}] )"
 
@@ -27,11 +25,8 @@
 	dev-python/six[${PYTHON_USEDEP}]"
 
 python_prepare_all() {
-	# Prevent setup from downloading hgtools package
-	dos2unix setup.py || die "Failed attempt of conversion by dos2unix"
-
 	# Don't rely on hgtools for version
-	sed -e "s/use_hg_version=True/version=\"${PV}\"/" -i setup.py || die
+	epatch "${FILESDIR}/${PV}-remove-hg-dependencies.diff"
 	sed -e "/^tag_/d" -i setup.cfg || die
 
 	distutils-r1_python_prepare_all