--- ../django-1.0.2.ebuild.old	2009-01-14 15:13:52.217265323 +0530
+++ django-1.0.2.ebuild	2009-01-14 15:14:28.659265834 +0530
@@ -1,30 +1,28 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
+EAPI=2
 
-EAPI="1"
-
-inherit bash-completion distutils multilib versionator webapp
+inherit bash-completion subversion distutils multilib versionator webapp
 
 MY_P="${P/#d/D}-final"
 WEBAPP_MANUAL_SLOT="yes"
 
-DESCRIPTION="high-level python web framework"
+DESCRIPTION="High-level python web framework"
 HOMEPAGE="http://www.djangoproject.com/"
 SRC_URI="http://media.djangoproject.com/releases/${PV}/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
 IUSE="doc examples mysql postgres sqlite3 test"
-RESTRICT="test"
 
 RDEPEND="dev-python/imaging
         sqlite3? ( || (
                 ( dev-python/pysqlite:2 <dev-lang/python-2.5 )
-                >=dev-lang/python-2.5 ) )
+                >=dev-lang/python-2.5[sqlite] ) )
         test? ( || (
                 ( dev-python/pysqlite:2 <dev-lang/python-2.5 )
-                >=dev-lang/python-2.5 ) )
+                >=dev-lang/python-2.5[sqlite] ) )
         postgres? ( dev-python/psycopg )
         mysql? ( >=dev-python/mysql-python-1.2.1_p2 )
         doc? ( >=dev-python/sphinx-0.3 )"
@@ -34,8 +32,16 @@
 
 DOCS="docs/* AUTHORS"
 
-src_compile() {
+src_unpack() {
+	distutils_src_unpack
+	if use test; then
+		local repo_uri
+		repo_uri="http://code.djangoproject.com/svn/${PN}/tags/releases/${PV}/tests/"
+		subversion_fetch ${repo_uri} tests
+	fi
+}
 
+src_compile() {
 	distutils_src_compile
 	if use doc ; then
 		pushd docs
@@ -45,18 +51,17 @@
 }
 
 src_test() {
-
+	einfo "Running tests."
 	cat >> tests/settings.py << __EOF__
 DATABASE_ENGINE='sqlite3'
 ROOT_URLCONF='tests/urls.py'
 SITE_ID=1
 __EOF__
-	PYTHONPATH="." ${python} tests/runtests.py --settings=settings -v1 ||
-		die "tests failed"
+	PYTHONPATH="." ${python} tests/runtests.py --settings=settings -v1 \
+		|| die "tests failed"
 }
 
 src_install() {
-
 	distutils_python_version
 	site_pkgs="$(python_get_sitedir)"
 	export PYTHONPATH="${PYTHONPATH}:${D}/${site_pkgs}"
@@ -71,12 +76,12 @@
 		doins -r examples
 	fi
 	if use doc ; then
-		rm -Rf docs/_build/html/_sources
+		mv docs/_build/html/{_,.}sources
 		dohtml txt -r docs/_build/html/*
 	fi
 
 	insinto "${MY_HTDOCSDIR}"
-	doins -r "${D}"/usr/$(get_libdir)/python2.5/site-packages/django/contrib/admin/media
+	doins -r "${D}/${site_pkgs}"/django/contrib/admin/media
 
 	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
 	webapp_src_install
@@ -92,7 +97,7 @@
 	elog "site-packages dir for easy development"
 	echo
 	echo
-	ewarn "If you build Django-1.0.2 without USE="vhosts""
+	ewarn "If you build Django-1.0.2 without USE=\"vhosts\""
 	ewarn "webapp-config will automatically install the"
 	ewarn "admin media into the localhost webroot."
 }