version bump iwth bash-completion goodness and testability -- thanks to the python team for that stuff

svn path=/; revision=6

6 files changed, 41 insertions, 68 deletions

diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 14d0646..66b5e4a 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,24 +1,16 @@
-DIST Django-0.96_pre3740.tar.bz2 1398030 RMD160 98aecd5805298b22f8cd520ed32161201fef3a51 SHA1 1a3f9b84d38b4c24c4ffda4a092d518032d3baac SHA256 ec017851c0a85f7f0d6e49422a9ab8ad31c5b31db7f9540cb5a165f6f043ff64
-DIST Django-0.96_pre4225.tar.bz2 1503386 RMD160 11a30c1d2a51e69a59463ede14ecfa783989794b SHA1 704f8aa902ba59b8e2f96a2e4b80d03a1d36d017 SHA256 490f448553a2e076975833407c5a4e7c517345034c7edf501f65118a18fc8206
 DIST Django-0.96_pre4269.tar.bz2 1494530 RMD160 b764f81e35a63b3ad9a2155df8a3ceaa4adbe6f1 SHA1 eaf31fee0f56db58f21bb73024cd80583db86975 SHA256 9dc72a49b2b62bfc3f5fe38070a7f4c75b0691060c5c91b9f26671892f9acf20
-EBUILD django-0.96_pre3740.ebuild 1088 RMD160 f63f4d742da30691c414d6b263dc42d36b88bc41 SHA1 7c944cdefc8b9133c4bb9cb6ce36ac8bfac9fcb4 SHA256 60016b070fa864c57ce11993d4976f31ef5959c4fe16148555c2a36c57824a8a
-MD5 b0510a961b4dc2e6384d0d455d5394f5 django-0.96_pre3740.ebuild 1088
-RMD160 f63f4d742da30691c414d6b263dc42d36b88bc41 django-0.96_pre3740.ebuild 1088
-SHA256 60016b070fa864c57ce11993d4976f31ef5959c4fe16148555c2a36c57824a8a django-0.96_pre3740.ebuild 1088
-EBUILD django-0.96_pre4225.ebuild 1052 RMD160 a5db1770ac444657c7c97149235ec40604e90038 SHA1 eac9fca9adeca8395a2af228ac01d41023faa811 SHA256 dc440f8f2fc5b592414b98ff46591da16866d2e771e720d362fbe190cb9cbbee
-MD5 09742c68ab8caaf5baa761712d5b0077 django-0.96_pre4225.ebuild 1052
-RMD160 a5db1770ac444657c7c97149235ec40604e90038 django-0.96_pre4225.ebuild 1052
-SHA256 dc440f8f2fc5b592414b98ff46591da16866d2e771e720d362fbe190cb9cbbee django-0.96_pre4225.ebuild 1052
+DIST Django-0.96_pre4455.tar.bz2 1518857 RMD160 104a64035c4691e2d7fe9c7ac96c82e37323eac3 SHA1 8fefb19a8c351f895bc8a90e65d06cf311130175 SHA256 db5e31b3e4caf722809685577deaeb5454af593968b47318ade2dc87a91d18a5
 EBUILD django-0.96_pre4269.ebuild 1091 RMD160 3887331ae2c5d53a3d90bea1c3c6443fc3f4e158 SHA1 36b261b9badf4359744ef829aff71d2e23aa193b SHA256 adfd1866589e7cbf11970dc85edf7031c256df9953ff1d58cf0e9886533da5dd
 MD5 a60cd01fc1547c2c597d32ec85a28271 django-0.96_pre4269.ebuild 1091
 RMD160 3887331ae2c5d53a3d90bea1c3c6443fc3f4e158 django-0.96_pre4269.ebuild 1091
 SHA256 adfd1866589e7cbf11970dc85edf7031c256df9953ff1d58cf0e9886533da5dd django-0.96_pre4269.ebuild 1091
-MD5 9eff7e7b6d16778a29ccfb90b77cd53e files/digest-django-0.96_pre3740 265
-RMD160 1f9c852555f26d5bb489aa04a1c70baec3ffeb95 files/digest-django-0.96_pre3740 265
-SHA256 96f442a8d06aafe014d57853b624e1258ccf0b2037d3c7765473635a8944eec8 files/digest-django-0.96_pre3740 265
-MD5 6c074fb938608b412dbd72ace5eece92 files/digest-django-0.96_pre4225 265
-RMD160 aae54f89c502cb8a59a587559acfcad2f04f90a6 files/digest-django-0.96_pre4225 265
-SHA256 a191ab69830b3b235a74ad62a302790a6cd141465202793f9af5f4fd3a07ad7e files/digest-django-0.96_pre4225 265
+EBUILD django-0.96_pre4455.ebuild 1621 RMD160 0a1699e8dd9e051618add06ea7eee60553c78dd7 SHA1 e6a6f69c9a93cecd42edad3bfdd9a84e091478af SHA256 fa83db11f5aae25dd2482448e227e311dbc6d0163df66ad5886f41c20ad0049d
+MD5 4f396c0a772ef14e648de4d3fdb88743 django-0.96_pre4455.ebuild 1621
+RMD160 0a1699e8dd9e051618add06ea7eee60553c78dd7 django-0.96_pre4455.ebuild 1621
+SHA256 fa83db11f5aae25dd2482448e227e311dbc6d0163df66ad5886f41c20ad0049d django-0.96_pre4455.ebuild 1621
 MD5 41f706f2dea80ba3090676a463653569 files/digest-django-0.96_pre4269 265
 RMD160 f7fcce2f83c7f0196a75044ac73b956b961385ee files/digest-django-0.96_pre4269 265
 SHA256 635e82b5a427cd760d80b8719ff8b3fd11934546dfb9a3b6bb379d1a7f947087 files/digest-django-0.96_pre4269 265
+MD5 9920a6d7cf44225708dd2ddec3c06f87 files/digest-django-0.96_pre4455 265
+RMD160 16e50b8ee4cfdb84f5966dc9a07e0b1c8ac395c7 files/digest-django-0.96_pre4455 265
+SHA256 52e5bd6bb8dab31d729ae1a389425aee1d521ef9e2874c6abc9c183dbe30d839 files/digest-django-0.96_pre4455 265
diff --git a/dev-python/django/django-0.96_pre3740.ebuild b/dev-python/django/django-0.96_pre3740.ebuild
deleted file mode 100644
index dac40d3..0000000
--- a/dev-python/django/django-0.96_pre3740.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-0.95.ebuild,v 1.2 2006/08/13 15:40:12 lucass Exp $
-
-inherit distutils
-
-MY_P="${PN/d/D}-${PV}"
-DESCRIPTION="high-level python web framework"
-HOMEPAGE="http://www.djangoproject.com/"
-SRC_URI="http://dev.gentoo.org/~seemant/distfiles/${MY_P}.tar.bz2"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
-IUSE="sqlite postgres mysql"
-
-DEPEND=">=dev-lang/python-2.3
-		>=dev-python/setuptools-0.6_rc1"
-
-RDEPEND=">=dev-lang/python-2.3
-		sqlite? ( >=dev-python/pysqlite-2.0.3 )
-		postgres? ( <dev-python/psycopg-1.99 )
-		mysql? ( dev-python/mysql-python )
-		dev-python/imaging"
-
-S="${WORKDIR}/${MY_P}"
-DOCS="docs/* AUTHORS INSTALL LICENSE"
-
-src_install()
-{
-	distutils_python_version
-
-	site_pkgs="/usr/$(get_libdir)/python${PYVER}/site-packages/"
-	export PYTHONPATH="${PYTHONPATH}:${D}/${site_pkgs}"
-	dodir ${site_pkgs}
-
-	distutils_src_install --single-version-externally-managed
-
-	cp -r examples "${D}/usr/share/doc/${PF}"
-}
diff --git a/dev-python/django/django-0.96_pre4225.ebuild b/dev-python/django/django-0.96_pre4455.ebuild
index 6fffc9a..aeb1faf 100644
--- a/dev-python/django/django-0.96_pre4225.ebuild
+++ b/dev-python/django/django-0.96_pre4455.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-0.95.ebuild,v 1.2 2006/08/13 15:40:12 lucass Exp $
 
-inherit distutils
+inherit distutils eutils versionator bash-completion
 
 MY_P="${PN/d/D}-${PV}"
 DESCRIPTION="high-level python web framework"
@@ -11,13 +11,17 @@ SRC_URI="http://dev.gentoo.org/~seemant/distfiles/${MY_P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
-IUSE="sqlite postgres mysql"
+IUSE="examples sqlite postgres mysql test"
 
-DEPEND=">=dev-lang/python-2.3
-		>=dev-python/setuptools-0.6_rc1"
+DEPEND=">=dev-python/setuptools-0.6_rc3
+		test? ( || (
+			( >=dev-python/pysqlite-2.0.3 <dev-lang/python-2.5 )
+			>=dev-lang/python-2.5 ) )"
 
-RDEPEND=">=dev-lang/python-2.3
-		sqlite? ( >=dev-python/pysqlite-2.0.3 )
+RDEPEND="${DEPEND}
+		sqlite? ( || (
+			( >=dev-python/pysqlite-2.0.3 <dev-lang/python-2.5 )
+			>=dev-lang/python-2.5 ) )
 		postgres? ( <dev-python/psycopg-1.99 )
 		mysql? ( dev-python/mysql-python )
 		dev-python/imaging"
@@ -25,6 +29,11 @@ RDEPEND=">=dev-lang/python-2.3
 S="${WORKDIR}/${MY_P}"
 DOCS="docs/* AUTHORS INSTALL LICENSE"
 
+src_unpack() {
+	unpack ${A}; cd "${S}"
+	sed -i -e '/ez_setup/d' setup.py || die "sed failed"
+}
+
 src_install()
 {
 	distutils_python_version
@@ -33,7 +42,21 @@ src_install()
 	export PYTHONPATH="${PYTHONPATH}:${D}/${site_pkgs}"
 	dodir ${site_pkgs}
 
+	find ${S} -name '.svn' | xargs rm -r
+
 	distutils_src_install
 
-	cp -r examples "${D}/usr/share/doc/${PF}"
+	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"
 }
diff --git a/dev-python/django/files/digest-django-0.96_pre3740 b/dev-python/django/files/digest-django-0.96_pre3740
deleted file mode 100644
index 3f865d1..0000000
--- a/dev-python/django/files/digest-django-0.96_pre3740
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b8a688135d4e2a7bd388d223f4347dae Django-0.96_pre3740.tar.bz2 1398030
-RMD160 98aecd5805298b22f8cd520ed32161201fef3a51 Django-0.96_pre3740.tar.bz2 1398030
-SHA256 ec017851c0a85f7f0d6e49422a9ab8ad31c5b31db7f9540cb5a165f6f043ff64 Django-0.96_pre3740.tar.bz2 1398030
diff --git a/dev-python/django/files/digest-django-0.96_pre4225 b/dev-python/django/files/digest-django-0.96_pre4225
deleted file mode 100644
index 9f228d8..0000000
--- a/dev-python/django/files/digest-django-0.96_pre4225
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7b8a4739584c399b0425f71c92f9c601 Django-0.96_pre4225.tar.bz2 1503386
-RMD160 11a30c1d2a51e69a59463ede14ecfa783989794b Django-0.96_pre4225.tar.bz2 1503386
-SHA256 490f448553a2e076975833407c5a4e7c517345034c7edf501f65118a18fc8206 Django-0.96_pre4225.tar.bz2 1503386
diff --git a/dev-python/django/files/digest-django-0.96_pre4455 b/dev-python/django/files/digest-django-0.96_pre4455
new file mode 100644
index 0000000..23a9a57
--- /dev/null
+++ b/dev-python/django/files/digest-django-0.96_pre4455
@@ -0,0 +1,3 @@
+MD5 f4ebfc0612c2ca502c4adb667d340f37 Django-0.96_pre4455.tar.bz2 1518857
+RMD160 104a64035c4691e2d7fe9c7ac96c82e37323eac3 Django-0.96_pre4455.tar.bz2 1518857
+SHA256 db5e31b3e4caf722809685577deaeb5454af593968b47318ade2dc87a91d18a5 Django-0.96_pre4455.tar.bz2 1518857