diff -ur ../deform.orig/deform-0.9.5.ebuild ../deform/deform-0.9.5.ebuild
--- ../deform.orig/deform-0.9.5.ebuild	2012-05-24 23:40:02.774063350 +0800
+++ ../deform/deform-0.9.5.ebuild	2012-05-24 23:33:10.643074560 +0800
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/deform/deform-0.9.4.ebuild,v 1.1 2012/02/23 00:31:45 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/deform/deform-0.9.5.ebuild,v 1.2 2012/05/20 20:03:20 floppym Exp $
 
 EAPI="3"
 
 SUPPORT_PYTHON_ABIS=1
 PYTHON_DEPEND="2:2.6 3:3.2"
-RESTRICT_PYTHON_ABIS="2.5 3.0 3.1"
-DISTUTILS_SRC_TEST="setup.py"
+RESTRICT_PYTHON_ABIS="2.5 3.[01]"
+DISTUTILS_SRC_TEST="nosetests"
 
 inherit distutils
 
@@ -18,21 +18,18 @@
 LICENSE="repoze"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="test"
 
 # Depend on peppercorn, translationstring and colander with Python 3 support
 RDEPEND=">=dev-python/translationstring-1.1
 	>=dev-python/colander-0.9.6
 	>=dev-python/peppercorn-0.4
 	>=dev-python/chameleon-1.2.3"
-
-# The tests depend on beautifulsoup4, which is not currently packaged.
-# They will pass because setuptools downloads it from crummy.com
-# during the test phase. This is undesirable, so restrict the tests for now.
-# Revisit this in the future if beautifulsoup4 is packaged.
-DEPEND="${RDEPEND}"
-#	test? ( dev-python/beautifulsoup )"
-RESTRICT="test"
+DEPEND="${RDEPEND}
+	test? ( dev-python/beautifulsoup:4
+	>=dev-python/chameleon-1.2.3 
+	>=dev-python/peppercorn-0.3 
+	>=dev-python/colander-0.8 )"
 
 # Include COPYRIGHT.txt because the license seems to require it.
 DOCS="CHANGES.txt COPYRIGHT.txt README.txt"
@@ -46,5 +43,5 @@
 	# the docs would not actually work offline). Install the
 	# source, which is somewhat readable.
 	docinto docs
-	dodoc docs/*.rst
+	dodoc docs/*.rst || die
 }