diff -ur distribute-0.6.36.orig/setuptools/tests/test_easy_install.py distribute-0.6.36/setuptools/tests/test_easy_install.py
--- setuptools/tests/test_easy_install.py	2013-03-20 07:51:06.000000000 +0800
+++ setuptools/tests/test_easy_install.py	2013-05-24 00:23:51.087757588 +0800
@@ -306,15 +306,16 @@
         old_stderr = sys.stderr
         sys.stdout = StringIO.StringIO()
         sys.stderr = StringIO.StringIO()
-        try:
-            reset_setup_stop_context(
-                lambda: run_setup(test_setup_py, ['install'])
-            )
-        except SandboxViolation:
-            self.fail('Installation caused SandboxViolation')
-        finally:
-            sys.stdout = old_stdout
-            sys.stderr = old_stderr
+        if sys.version_info >= (2, 6):
+            try:
+                reset_setup_stop_context(
+                    lambda: run_setup(test_setup_py, ['install'])
+                )
+            except SandboxViolation:
+                self.fail('Installation caused SandboxViolation')
+            finally:
+                sys.stdout = old_stdout
+                sys.stderr = old_stderr
 
 
 class TestSetupRequires(unittest.TestCase):
--- setuptools-0.6.33.ebuild	2013-02-21 11:17:10.000000000 +0800
+++ setuptools-0.6.36.ebuild	2013-05-24 00:30:44.434725699 +0800
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.6.33.ebuild,v 1.4 2013/02/21 03:17:10 zmedico Exp $
+# $Header: $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_8,1_9,2_0} )
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
 
 inherit distutils-r1 eutils
 
@@ -31,18 +31,22 @@
 python_prepare_all() {
 	local PATCHES=(
 		"${FILESDIR}/${PN}-0.6_rc7-noexe.patch"
-		"${FILESDIR}/distribute-0.6.16-fix_deprecation_warnings.patch"
+		"${FILESDIR}/distribute-0.6.16-fix_deprecation_warnings.patch" 
+#		"${FILESDIR}"/skip-test.patch
 	)
 
 	# Disable tests requiring network connection.
 	rm -f setuptools/tests/test_packageindex.py
+	sed -e 's:test_setup_requires_honors_fetch_params:_&:' \
+		-i setuptools/tests/test_easy_install.py || die
 
 	distutils-r1_python_prepare_all
 }
 
 python_test() {
 	# they fail with everything but py2.6 & 2.7
-	esetup.py test
+	pushd "${BUILD_DIR}"/../
+	"${PYTHON}" setup.py test || die
 }
 
 python_install() {