add back the bash completion, docs install fix and stc_test that Tiziano added into -r1

(Portage version: 2.1.2-r2)

2 files changed, 28 insertions, 9 deletions

diff --git a/dev-python/django/ChangeLog b/dev-python/django/ChangeLog
index c1f202191f99..88b11adcc5d7 100644
--- a/dev-python/django/ChangeLog
+++ b/dev-python/django/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/django
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.11 2007/01/22 09:06:48 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.12 2007/01/22 16:55:50 seemant Exp $
+
+  22 Jan 2007; Seemant Kulleen <seemant@gentoo.org> django-0.95.1.ebuild:
+  add back the bash completion, docs install fix and stc_test that Tiziano
+  added into -r1
 
 *django-0.95.1 (22 Jan 2007)
 
diff --git a/dev-python/django/django-0.95.1.ebuild b/dev-python/django/django-0.95.1.ebuild
index 6d495aedfd7e..7c18cc33d367 100644
--- a/dev-python/django/django-0.95.1.ebuild
+++ b/dev-python/django/django-0.95.1.ebuild
@@ -1,32 +1,36 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-0.95.1.ebuild,v 1.1 2007/01/22 09:06:48 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-0.95.1.ebuild,v 1.2 2007/01/22 16:55:50 seemant Exp $
 
-inherit distutils versionator
+inherit bash-completion distutils eutils versionator
 
 RPV=$(get_version_component_range 1-2)
 
-MY_P="${PN/d/D}-${PV}"
+MY_P="Django-${PV}"
+
 DESCRIPTION="high-level python web framework"
 HOMEPAGE="http://www.djangoproject.com/"
 SRC_URI="http://media.djangoproject.com/releases/${RPV}/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
-IUSE="sqlite postgres mysql"
+IUSE="examples mysql postgres sqlite test"
 
 RDEPEND="dev-python/imaging
 	sqlite? ( || (
 		( >=dev-python/pysqlite-2.0.3 <dev-lang/python-2.5 )
 		>=dev-lang/python-2.5 ) )
-	postgres? ( <dev-python/psycopg-1.99 )
+	test? ( || (
+		( >=dev-python/pysqlite-2.0.3 <dev-lang/python-2.5 )
+		>=dev-lang/python-2.5 ) )
+	postgres? ( dev-python/psycopg )
 	mysql? ( dev-python/mysql-python )"
 DEPEND="${RDEPEND}
 	>=dev-python/setuptools-0.6_rc3"
 
 S=${WORKDIR}/${MY_P}
 
-DOCS="docs/* AUTHORS INSTALL"
+DOCS="docs/* AUTHORS"
 
 src_unpack() {
 	unpack ${A}
@@ -45,6 +49,17 @@ src_install() {
 
 	distutils_src_install --single-version-externally-managed
 
-	insinto /usr/share/doc/${PF}
-	doins -r examples
+	dobashcompletion extras/django_bash_completion
+
+	if use examples ; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
+
+src_test() {
+	cat >> tests/settings.py << __EOF__
+DATABASE_ENGINE='sqlite3'
+__EOF__
+	PYTHONPATH="." ${python} tests/runtests.py --settings=settings -v1 || die "tests failed"
 }