Removed use_setuptools sed. Removed setuptools dependency in 0.96.

Package-Manager: portage-2.1.3_rc6

3 files changed, 9 insertions, 22 deletions

diff --git a/dev-python/django/ChangeLog b/dev-python/django/ChangeLog
index 5241c00b5aa7..3d4bf5bca839 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.16 2007/04/24 16:04:52 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.17 2007/07/04 21:23:18 lucass Exp $
+
+  04 Jul 2007; Lukasz Strzygowski <lucass@gentoo.org> django-0.95.1.ebuild,
+  django-0.96.ebuild:
+  Removed use_setuptools sed. Removed setuptools dependency in 0.96.
 
   24 Apr 2007; Seemant Kulleen <seemant@gentoo.org> django-0.96.ebuild:
   adjust the mysql-python dependency, as 1.2.1_p2 is the minimum allowed
diff --git a/dev-python/django/django-0.95.1.ebuild b/dev-python/django/django-0.95.1.ebuild
index 7c18cc33d367..5daac43b040e 100644
--- a/dev-python/django/django-0.95.1.ebuild
+++ b/dev-python/django/django-0.95.1.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2007/01/22 16:55:50 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-0.95.1.ebuild,v 1.3 2007/07/04 21:23:18 lucass Exp $
 
 inherit bash-completion distutils eutils versionator
 
@@ -32,14 +32,6 @@ S=${WORKDIR}/${MY_P}
 
 DOCS="docs/* AUTHORS"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i \
-		-e '/ez_setup/d' \
-		setup.py || die "sed failed"
-}
-
 src_install() {
 	distutils_python_version
 
diff --git a/dev-python/django/django-0.96.ebuild b/dev-python/django/django-0.96.ebuild
index 032b11e60836..a948b72c7ded 100644
--- a/dev-python/django/django-0.96.ebuild
+++ b/dev-python/django/django-0.96.ebuild
@@ -1,6 +1,6 @@
 # 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.96.ebuild,v 1.3 2007/04/24 16:04:52 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-0.96.ebuild,v 1.4 2007/07/04 21:23:17 lucass Exp $
 
 inherit bash-completion distutils eutils versionator
 
@@ -25,21 +25,12 @@ RDEPEND="dev-python/imaging
 		>=dev-lang/python-2.5 ) )
 	postgres? ( dev-python/psycopg )
 	mysql? ( >=dev-python/mysql-python-1.2.1_p2 )"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-0.6_rc3"
+DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 DOCS="docs/* AUTHORS"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i \
-		-e '/ez_setup/d' \
-		setup.py || die "sed failed"
-}
-
 src_test() {
 	cat >> tests/settings.py << __EOF__
 DATABASE_ENGINE='sqlite3'