Removed use_setuptools sed in 0.9.0-r1. Small cleanup in 0.6.1-r1.

(Portage version: 2.1.3_rc6)

3 files changed, 12 insertions, 16 deletions

diff --git a/dev-python/sqlobject/ChangeLog b/dev-python/sqlobject/ChangeLog
index 5097eac60f4a..29e8150c4278 100644
--- a/dev-python/sqlobject/ChangeLog
+++ b/dev-python/sqlobject/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/sqlobject
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlobject/ChangeLog,v 1.23 2007/07/04 19:04:41 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlobject/ChangeLog,v 1.24 2007/07/04 20:27:04 lucass Exp $
+
+  04 Jul 2007; Lukasz Strzygowski <lucass@gentoo.org>
+  sqlobject-0.6.1-r1.ebuild, sqlobject-0.9.0-r1.ebuild:
+  Removed use_setuptools sed in 0.9.0-r1. Small cleanup in 0.6.1-r1.
 
 *sqlobject-0.9.0-r1 (04 Jul 2007)
 
diff --git a/dev-python/sqlobject/sqlobject-0.6.1-r1.ebuild b/dev-python/sqlobject/sqlobject-0.6.1-r1.ebuild
index feadeaf50bc1..ab5b0001b6b4 100644
--- a/dev-python/sqlobject/sqlobject-0.6.1-r1.ebuild
+++ b/dev-python/sqlobject/sqlobject-0.6.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlobject/sqlobject-0.6.1-r1.ebuild,v 1.5 2006/07/28 12:04:40 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlobject/sqlobject-0.6.1-r1.ebuild,v 1.6 2007/07/04 20:27:04 lucass Exp $
 
 inherit distutils eutils
 
@@ -18,11 +18,12 @@ RDEPEND=">=dev-lang/python-2.2
 		sqlite? ( <dev-python/pysqlite-2.0 )
 		firebird? ( >=dev-python/kinterbasdb-3.0.2 )"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 src_unpack() {
-	unpack ${A} || die "Failed to unpack ${A}"
-	cd ${S} || die "Failed to cd to ${S}"
+	unpack ${A}
+	cd "${S}"
+
 	#Add array type for Subway:
 	epatch ${FILESDIR}/converters-${PV}-gentoo.diff
 }
diff --git a/dev-python/sqlobject/sqlobject-0.9.0-r1.ebuild b/dev-python/sqlobject/sqlobject-0.9.0-r1.ebuild
index 9a164d4263de..74d539a562b5 100644
--- a/dev-python/sqlobject/sqlobject-0.9.0-r1.ebuild
+++ b/dev-python/sqlobject/sqlobject-0.9.0-r1.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/sqlobject/sqlobject-0.9.0-r1.ebuild,v 1.1 2007/07/04 19:04:41 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlobject/sqlobject-0.9.0-r1.ebuild,v 1.2 2007/07/04 20:27:04 lucass Exp $
 
 NEED_PYTHON=2.3
 
@@ -27,15 +27,6 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -i \
-		-e '/use_setuptools/d' \
-		setup.py || die "sed failed"
-}
-
 src_install() {
 	distutils_src_install