Fixed tests, added sphinx doc generation, dropped ppc64 until sphinx is keyworded, use EAPI1 for slots

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 i686

4 files changed, 52 insertions, 18 deletions

diff --git a/dev-python/django/ChangeLog b/dev-python/django/ChangeLog
index ec2c206fe187..67a492568f3c 100644
--- a/dev-python/django/ChangeLog
+++ b/dev-python/django/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/django
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.25 2008/09/04 06:21:44 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.26 2008/10/06 18:42:46 pythonhead Exp $
+
+  06 Oct 2008; Rob Cakebread <pythonhead@gentoo.org> django-1.0.ebuild,
+  django-9999.ebuild:
+  Fixed tests, added sphinx doc generation, dropped ppc64 until sphinx is
+  keyworded, use EAPI1 for slots
 
 *django-1.0 (04 Sep 2008)
 
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 959f738c1719..10f72fa36a55 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST Django-0.96.1.tar.gz 1746455 RMD160 1bd8fcceab101f80560bb4aa8a4851c204f3918b SHA1 85270f857ff405983cae9a1ef76dfb3303ca6eec SHA256 4874134e9fc6bd08eb7e451e42038394668895c26b7cc867d4c3fdaf9d711085
 DIST Django-0.96.2.tar.gz 1637044 RMD160 29488b09cc6d8013716c8a7d190fe6bc9625e568 SHA1 2766d858b15d5d76da61e096fa6ffeb55b0469fb SHA256 8964023587331412aed118549c83cf0dcc106850833cc75573e8671b68ecf29c
 DIST Django-1.0.tar.gz 4789634 RMD160 ace144c8d33fda35e29b6a07cd5645d2666c98d9 SHA1 e3875f5ebf6f956d93f8b9bac47e23c48631b798 SHA256 4c780b9e2906944ce02a9325b15f480d2bd4c0b12137f752aa4800c0f8563acf
 EBUILD django-0.96.2.ebuild 2248 RMD160 501513a32dc199187fe4462209612bb9a24782e4 SHA1 5e147c96e1a5f9c5edc5106fd4c8512b87481fb2 SHA256 38f1f1bd6335e8b47951383e000592ada427fc07ef5409e27a5c501462bf2516
-EBUILD django-1.0.ebuild 1700 RMD160 648df33bea477e95ce84d79ff3b4894892220676 SHA1 3ef8c18fb5fd55174806b988a96db5c0cf0fa35a SHA256 f2efd0d79041eabdf03c304bc9e0fca37fe0c82dc53e350c1f54a86a8e248b2f
-EBUILD django-9999.ebuild 2063 RMD160 39671d70fe086019bad81a7cbf661a126bbba0e9 SHA1 a9ebd3ec7568c6af5c9dc05ef24e6c7cf50b7db3 SHA256 675230bdf6209f7baafb8c62ec03d55f0fc623e61260a2e236ac71948fa6cb39
-MISC ChangeLog 4202 RMD160 5c3b76b0d55e37c9aadb7937b4cbda30625284a0 SHA1 9b7b26d2820c83b66afb30bbbe16523abd11b306 SHA256 d1181db371d944abb5ab0fcb821f11ccf15800db44ed759c1d9f90a63653a0dc
+EBUILD django-1.0.ebuild 1854 RMD160 59718925c2d5b56e534996fce5087eaadf833a53 SHA1 0c3fc86f1170e2bcb2306a545a7904f684398953 SHA256 822ce604a32f6e58f0b9910e06df1f54fcd999f9d05a2df2cc05638b8537f844
+EBUILD django-9999.ebuild 2058 RMD160 8d165e5a603c0f60cdce2f4a0e58673b9bd93403 SHA1 0e95cd5eda84aa7a72b8d5d6d6dbdca6b52680cb SHA256 629bc65a363bd4522b6c1675dddafb4dd833186a5f78efdcd9ab3ea4e4fb296e
+MISC ChangeLog 4404 RMD160 e64d70817fb1a78b14660aa72318d8ecd29cd05d SHA1 02bfc8de2bc0fc51f45fdfe7f2ad51b932583878 SHA256 84fd989b1d456ceacb2a7ef5ae7e60aee9627695a539fc7597cb13cc1264aabb
 MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkjqXCsACgkQ8aihIaC/zgBmQACfdcc6TcdpW7lsj4BGuHBSm2Ri
+lm8AnjTWwqmBOPUK1lTfrKbFTabQf49L
+=jm6f
+-----END PGP SIGNATURE-----
diff --git a/dev-python/django/django-1.0.ebuild b/dev-python/django/django-1.0.ebuild
index e2314eb5628c..c9bc5481082f 100644
--- a/dev-python/django/django-1.0.ebuild
+++ b/dev-python/django/django-1.0.ebuild
@@ -1,35 +1,52 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.0.ebuild,v 1.2 2008/09/04 14:52:23 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.0.ebuild,v 1.3 2008/10/06 18:42:46 pythonhead Exp $
 
-inherit bash-completion distutils eutils versionator
+EAPI="1"
+inherit bash-completion distutils versionator
 
 DESCRIPTION="high-level python web framework"
 HOMEPAGE="http://www.djangoproject.com/"
 SRC_URI="http://media.djangoproject.com/releases/${PV}/Django-${PV}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="examples mysql postgres sqlite3 test"
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
+IUSE="doc examples mysql postgres sqlite3 test"
 
 RDEPEND="dev-python/imaging
 	sqlite3? ( || (
-		( >=dev-python/pysqlite-2.0.3 <dev-lang/python-2.5 )
+		( dev-python/pysqlite:2 <dev-lang/python-2.5 )
 		>=dev-lang/python-2.5 ) )
 	test? ( || (
-		( >=dev-python/pysqlite-2.0.3 <dev-lang/python-2.5 )
+		( dev-python/pysqlite:2 <dev-lang/python-2.5 )
 		>=dev-lang/python-2.5 ) )
 	postgres? ( dev-python/psycopg )
-	mysql? ( >=dev-python/mysql-python-1.2.1_p2 )"
+	mysql? ( >=dev-python/mysql-python-1.2.1_p2 )
+	doc? ( >=dev-python/sphinx-0.3 )"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${P/#d/D}"
 
 DOCS="docs/* AUTHORS"
 
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	#Submitted upstream http://code.djangoproject.com/ticket/8865
+	#by pythonhead, accepted in trunk
+	epatch "${FILESDIR}/${P}"-fields.py.patch
+}
+
+src_compile() {
+	distutils_src_compile
+	if use doc ; then
+		cd docs
+		emake html || die "docs failed"
+	fi
+}
+
 src_test() {
-	#Test fails, reported upstream http://code.djangoproject.com/ticket/8865
-	echo "tests='''pass'''" > tests/regressiontests/forms/fields.py
 	cat >> tests/settings.py << __EOF__
 DATABASE_ENGINE='sqlite3'
 ROOT_URLCONF='tests/urls.py'
@@ -39,11 +56,9 @@ __EOF__
 }
 
 src_install() {
-	#TODO: Use sphinx to generate docs when sphinx is keyworded for
-	#all arches django is
 	distutils_python_version
 
-	site_pkgs="/usr/$(get_libdir)/python${PYVER}/site-packages/"
+	site_pkgs="$(python_get_sitedir)"
 	export PYTHONPATH="${PYTHONPATH}:${D}/${site_pkgs}"
 	dodir ${site_pkgs}
 
@@ -55,4 +70,8 @@ src_install() {
 		insinto /usr/share/doc/${PF}
 		doins -r examples
 	fi
+	if use doc ; then
+		rm -Rf docs/_build/html/_sources
+		dohtml txt -r docs/_build/html/*
+	fi
 }
diff --git a/dev-python/django/django-9999.ebuild b/dev-python/django/django-9999.ebuild
index 0c8c92edac7b..77d34c40c061 100644
--- a/dev-python/django/django-9999.ebuild
+++ b/dev-python/django/django-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-9999.ebuild,v 1.1 2008/06/07 12:51:16 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-9999.ebuild,v 1.2 2008/10/06 18:42:46 pythonhead Exp $
 
 ESVN_REPO_URI="http://code.djangoproject.com/svn/django/trunk/"
 
@@ -10,7 +10,7 @@ DESCRIPTION="high-level python web framework"
 HOMEPAGE="http://www.djangoproject.com/"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
 IUSE="doc examples mysql postgres sqlite test"
 
 RDEPEND="dev-python/imaging