--- rope.orig/rope-0.9.4.ebuild	2012-06-11 21:04:44.999172484 +0800
+++ rope.orig/rope-0.9.4.ebuild	2012-06-11 21:25:29.240235083 +0800
@@ -7,9 +7,8 @@ 
 PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.* *-jython"
-PYTHON_TESTS_FAILURES_TOLERANT_ABIS="2.7-pypy-*"
 
-inherit distutils eutils 
+inherit distutils eutils
 
 DESCRIPTION="Python refactoring library"
 HOMEPAGE="http://rope.sourceforge.net/ http://pypi.python.org/pypi/rope"
@@ -23,9 +22,23 @@ 
 DEPEND="dev-python/setuptools"
 RDEPEND=""
 
+src_prepare() {
+	distutils_src_prepare
+	# copy files to be used by pypy in test phase
+	cp -f ropetest/builtinstest.py ropetest/builtinstest.pypy || die
+	cp -f ropetest/__init__.py ropetest/__init__.pypy || die
+	epatch "${FILESDIR}"/${P}_pypy_test.patch || die
+}
+
 src_test() {
 	testing() {
-		PYTHONPATH="build-${PYTHON_ABI}/lib:." "$(PYTHON)" ropetest/__init__.py
+		if [[ "${PYTHON_ABI:4:4}" == "pypy" ]]; then
+			# mv them to orig names
+			mv ropetest/builtinstest.pypy ropetest/builtinstest.py || die
+			mv ropetest/__init__.pypy ropetest/__init__.py || die
+		fi
+			PYTHONPATH="build-${PYTHON_ABI}/lib:." "$(PYTHON)" ropetest/__init__.py
+	}
 	python_execute_function testing
 }