diff -ur deform.orig/deform-0.9.5.ebuild deform/deform-0.9.5.ebuild
--- deform.orig/deform-0.9.5.ebuild	2012-05-09 01:20:49.016819179 +0800
+++ deform/deform-0.9.5.ebuild	2012-05-09 01:35:33.047851312 +0800
@@ -2,11 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-python/deform/deform-0.9.5.ebuild,v 1.1 2012/02/23 00:31:45 marienz Exp $
 
-EAPI="3"
+EAPI="4"
 
 SUPPORT_PYTHON_ABIS=1
-PYTHON_DEPEND="2:2.6 3:3.2"
+PYTHON_DEPEND="2:2.7 3:3.2"
 RESTRICT_PYTHON_ABIS="2.5 3.0 3.1"
+PYTHON_TESTS_RESTRICTED_ABIS="2.6" 
 DISTUTILS_SRC_TEST="setup.py"
 
 inherit distutils
@@ -18,33 +19,42 @@
 LICENSE="repoze"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="test doc"
 
 # 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"
+	>=dev-python/chameleon-1.2.3
+	doc? ( dev-python/sphinx )"
 
-# 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"
+# The tests depend on beautifulsoup4 which is now packaged.
+# beautifulsoup4 has file collisions with Python2.6; TODO
+DEPEND="${RDEPEND}
+	test? ( dev-python/beautifulsoup4 )"
 
 # Include COPYRIGHT.txt because the license seems to require it.
-DOCS="CHANGES.txt COPYRIGHT.txt README.txt"
+DOCS=( CHANGES.txt COPYRIGHT.txt README.txt docs/_themes/README.rst )
+
+src_compile() {
+	if use doc; then
+		emake -C docs html
+	fi
+}
 
 src_install() {
 	distutils_src_install
 
-	# Install only the .rst source, as sphinx processing requires
-	# a theme only available from git that contains hardcoded
-	# references to files on https://static.pylonsproject.org/ (so
-	# the docs would not actually work offline). Install the
-	# source, which is somewhat readable.
-	docinto docs
-	dodoc docs/*.rst
+	# dohtml makes unnecessary duplication of /html. Try it if you're keen
+	# This puts all in a sane finished form
+	if use doc; then
+		docompress -x usr/share/doc/${P}/doctrees
+		insinto usr/share/doc/${P}
+		doins -r docs/_build/html
+		insinto usr/share/doc/${P}/html
+		doins -r docs/_themes
+		insinto usr/share/doc/${P}
+		doins -r docs/_build/doctrees
+	fi
+	dodoc ${DOCS[@]}
 }