--- mercurial-1.0.1-r3.ebuild.orig	2008-08-17 20:53:57.000000000 -0500
+++ mercurial-1.0.1-r3.ebuild	2008-08-17 20:40:28.000000000 -0500
@@ -81,6 +81,9 @@
 }
 
 src_test() {
+	local testdir="${T}/tests"
+	mkdir -p "${testdir}" || die
+	chmod 777 "${testdir}"
 	cd "${S}/tests/"
 	rm -f *svn*		# Subversion tests fail with 1.5
 	rm -f test-convert-baz*		# GNU Arch baz
@@ -89,8 +92,17 @@
 	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 priviledges 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 || die "test failed"
+	python run-tests.py --tmpdir="${testdir}" || die "test failed"
 }
 
 pkg_postinst() {