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

Package-Manager: portage-2.1.2-r2

3 files changed, 36 insertions, 17 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/Manifest b/dev-python/django/Manifest
index 310eb9fb228a..c7c8101d85a2 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -12,14 +12,14 @@ EBUILD django-0.95-r1.ebuild 1687 RMD160 9446acfc9868c22ceabb9918f6f611bf4b6cfb3
 MD5 8eb25bcc5959ce079dce5b781a9a1d31 django-0.95-r1.ebuild 1687
 RMD160 9446acfc9868c22ceabb9918f6f611bf4b6cfb3b django-0.95-r1.ebuild 1687
 SHA256 997971f28ea3555a1ddeae0c512f633352fedb689ea31c75d5a3268de4c0ff10 django-0.95-r1.ebuild 1687
-EBUILD django-0.95.1.ebuild 1267 RMD160 e08d156e0eb006ab4d72baf6ec53a318acce1de5 SHA1 4bc483b3431132f6477e44a0ce1fee5d24cc01c8 SHA256 1604b82a34a5eed475faa7da01b42e69b5fa9f57c9ce6f3a9640f466d7a6a6e2
-MD5 82fcfc7fc5be60e4c82de26bb9704f33 django-0.95.1.ebuild 1267
-RMD160 e08d156e0eb006ab4d72baf6ec53a318acce1de5 django-0.95.1.ebuild 1267
-SHA256 1604b82a34a5eed475faa7da01b42e69b5fa9f57c9ce6f3a9640f466d7a6a6e2 django-0.95.1.ebuild 1267
-MISC ChangeLog 1987 RMD160 c2792c1646b93cc848031898b5989378e85d822c SHA1 694470876ca4c17cc2be90e3c2eeb5d29b6b866e SHA256 fa87f8f568b417be8a8a06d7f5c336e55945373b413741d09702eecf95c4d420
-MD5 95f157977bf3f0b06c0c2b14ecff8a5d ChangeLog 1987
-RMD160 c2792c1646b93cc848031898b5989378e85d822c ChangeLog 1987
-SHA256 fa87f8f568b417be8a8a06d7f5c336e55945373b413741d09702eecf95c4d420 ChangeLog 1987
+EBUILD django-0.95.1.ebuild 1641 RMD160 a19104d5b0ab98437569b7c76af3949b016fa44b SHA1 b4a892674e04fbf22ed8706833e04b88c6c038ff SHA256 e7f22d3712e8e3d0376c8de8c50d0ac900ff6cd6ec4fec6babf609f7e0e18753
+MD5 35a12e123818bb22d5ceaf04cb88aecc django-0.95.1.ebuild 1641
+RMD160 a19104d5b0ab98437569b7c76af3949b016fa44b django-0.95.1.ebuild 1641
+SHA256 e7f22d3712e8e3d0376c8de8c50d0ac900ff6cd6ec4fec6babf609f7e0e18753 django-0.95.1.ebuild 1641
+MISC ChangeLog 2154 RMD160 9bf516305329cf9c8c666ac06d5b15d8bee52c33 SHA1 8556d15f773cb5cf7936db69106a3768f64dc349 SHA256 c63c3a9f528e030b65e6e6978e7a9727da456546df960428e9153959b5ddecca
+MD5 87ae2b5c4886fcfd77a094f387d38041 ChangeLog 2154
+RMD160 9bf516305329cf9c8c666ac06d5b15d8bee52c33 ChangeLog 2154
+SHA256 c63c3a9f528e030b65e6e6978e7a9727da456546df960428e9153959b5ddecca ChangeLog 2154
 MISC metadata.xml 299 RMD160 3d8704ab7bd5a6e6f1c503a0f121098b9565aa5b SHA1 6eb4ace4f35255ecb165611f126e131ff020ea1b SHA256 afc8576fd4c38ed4723c15af5d7c07612dc7a9e34b789f3fc48910bf89a57f34
 MD5 537bb635a4ec8d4809abd2cda4456638 metadata.xml 299
 RMD160 3d8704ab7bd5a6e6f1c503a0f121098b9565aa5b metadata.xml 299
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"
 }