--- dulwich-0.9.5.ebuild	2014-06-17 18:14:31.324807317 +0800
+++ dulwich-0.9.7.ebuild	2014-06-18 00:28:39.149669359 +0800
@@ -3,26 +3,25 @@
 # $Header: /var/cvsroot/gentoo-x86/dev-python/dulwich/dulwich-0.9.5.ebuild,v 1.2 2014/03/31 21:16:47 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} pypy pypy2_0 )
+PYTHON_COMPAT=( python2_7 pypy )
 
 inherit distutils-r1
 
 DESCRIPTION="Dulwich is a pure-Python implementation of the Git file formats and protocols."
-HOMEPAGE="http://samba.org/~jelmer/dulwich/ http://pypi.python.org/pypi/dulwich"
+HOMEPAGE="https://github.com/jelmer/dulwich/  http://pypi.python.org/pypi/dulwich"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
+IUSE="doc examples test"
 
+RDEPEND=""
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		dev-python/gevent[$(python_gen_usedep python2_7)]
 		virtual/python-unittest2[${PYTHON_USEDEP}]
 	)"
-RDEPEND=""
-
 DISTUTILS_IN_SOURCE_BUILD=1
 
 python_compile_all() {
@@ -30,11 +29,16 @@
 }
 
 python_test() {
-	ln -s "${BUILD_DIR}"/lib/dulwich/*.so dulwich/ || die
-	nosetests -v || die "Tests failed under ${EPYTHON}"
+	# https://github.com/jelmer/dulwich/issues/196
+	if [[ "${EPYTHON}" == pypy ]]; then
+		"${PYTHON}" -m unittest dulwich.tests.test_suite || die "Tests failed under pypy"
+	else
+		emake check
+	fi
 }
 
 python_install_all() {
 	use doc && local HTML_DOCS=( docs/build/html/. )
+	use examples && local EXAMPLES=( examples/. )
 	distutils-r1_python_install_all
 }