Version bump: added dep on setuptools. Removed old versions.

(Portage version: 2.1.2.2)

8 files changed, 19 insertions, 90 deletions

diff --git a/dev-python/sqlobject/ChangeLog b/dev-python/sqlobject/ChangeLog
index d4ee22aaa143..12a8f57d8c44 100644
--- a/dev-python/sqlobject/ChangeLog
+++ b/dev-python/sqlobject/ChangeLog
@@ -1,6 +1,13 @@
 # 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.15 2007/02/15 13:08:59 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlobject/ChangeLog,v 1.16 2007/03/19 19:49:59 lucass Exp $
+
+*sqlobject-0.8.1 (19 Mar 2007)
+
+  19 Mar 2007; Lukasz Strzygowski <lucass@gentoo.org>
+  -sqlobject-0.7.2.ebuild, -sqlobject-0.7.3.ebuild, -sqlobject-0.8.0.ebuild,
+  +sqlobject-0.8.1.ebuild:
+  Version bump: added dep on setuptools. Removed old versions.
 
 *sqlobject-0.8.0 (15 Feb 2007)
 
diff --git a/dev-python/sqlobject/files/digest-sqlobject-0.7.2 b/dev-python/sqlobject/files/digest-sqlobject-0.7.2
deleted file mode 100644
index 884e545862cb..000000000000
--- a/dev-python/sqlobject/files/digest-sqlobject-0.7.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 78fe392b86b43912bb249af93d44df57 SQLObject-0.7.2.tar.gz 387957
-RMD160 a690073891b4ddf40c9d9aadfec4a5a44593a01f SQLObject-0.7.2.tar.gz 387957
-SHA256 c0562bc0aae98eb9aa0939c90f5572790b771355991a0b00214faeb64c35d7d9 SQLObject-0.7.2.tar.gz 387957
diff --git a/dev-python/sqlobject/files/digest-sqlobject-0.7.3 b/dev-python/sqlobject/files/digest-sqlobject-0.7.3
deleted file mode 100644
index e443581a4866..000000000000
--- a/dev-python/sqlobject/files/digest-sqlobject-0.7.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 77553064c9e18c04cc8490a86498d910 SQLObject-0.7.3.tar.gz 196287
-RMD160 8a3a26d1e6ebdd6e721d8a7c1d23f270c8ac7c8a SQLObject-0.7.3.tar.gz 196287
-SHA256 b1abb19144740b2d385ca1f3e8004b32b2f0a13b0bcd78e64328a1b05d667979 SQLObject-0.7.3.tar.gz 196287
diff --git a/dev-python/sqlobject/files/digest-sqlobject-0.8.0 b/dev-python/sqlobject/files/digest-sqlobject-0.8.0
deleted file mode 100644
index 4eb2c75803f0..000000000000
--- a/dev-python/sqlobject/files/digest-sqlobject-0.8.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 aaa586740c57c3317ad9ebfe064c6fd3 SQLObject-0.8.0.tar.gz 232569
-RMD160 865583a0eb4446e9edd1f705802bef11a4a7ddaf SQLObject-0.8.0.tar.gz 232569
-SHA256 122430265774b89b4dfdf224d1c663e31d84129fdbf0808f4ae2fc7482deaa2f SQLObject-0.8.0.tar.gz 232569
diff --git a/dev-python/sqlobject/files/digest-sqlobject-0.8.1 b/dev-python/sqlobject/files/digest-sqlobject-0.8.1
new file mode 100644
index 000000000000..11db640a30e2
--- /dev/null
+++ b/dev-python/sqlobject/files/digest-sqlobject-0.8.1
@@ -0,0 +1,3 @@
+MD5 60949e3307f3e9261a64d4fabb60ef9e SQLObject-0.8.1.tar.gz 235046
+RMD160 a207b7707804808f63e9b6c9d87b72e491923b6b SQLObject-0.8.1.tar.gz 235046
+SHA256 c3f2129684f9740990924ec5cc8f038ce1e42bc9277304ee153d670fcb952442 SQLObject-0.8.1.tar.gz 235046
diff --git a/dev-python/sqlobject/sqlobject-0.7.2.ebuild b/dev-python/sqlobject/sqlobject-0.7.2.ebuild
deleted file mode 100644
index 0f1fd91ed28a..000000000000
--- a/dev-python/sqlobject/sqlobject-0.7.2.ebuild
+++ /dev/null
@@ -1,34 +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/sqlobject/sqlobject-0.7.2.ebuild,v 1.1 2006/12/26 23:58:11 dev-zero Exp $
-
-inherit distutils
-
-MY_PN=${PN/sqlobject/SQLObject}
-DESCRIPTION="Object-relational mapper for Python"
-HOMEPAGE="http://sqlobject.org/"
-SRC_URI="http://cheeseshop.python.org/packages/source/S/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE="postgres mysql sqlite firebird doc"
-RDEPEND=">=dev-lang/python-2.2
-		postgres? ( <dev-python/psycopg-1.99 )
-		mysql? ( >=dev-python/mysql-python-0.9.2-r1 )
-		sqlite? ( <dev-python/pysqlite-2.0 )
-		firebird? ( >=dev-python/kinterbasdb-3.0.2 )
-		>=dev-python/formencode-0.2.2"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	#We don't want to use setuptools until egg.seclass is solid
-	rm -rf ez_setup
-}
-
-src_install() {
-	distutils_src_install
-	use doc && dodoc docs/*
-}
diff --git a/dev-python/sqlobject/sqlobject-0.8.0.ebuild b/dev-python/sqlobject/sqlobject-0.8.0.ebuild
deleted file mode 100644
index 555fa3ba3909..000000000000
--- a/dev-python/sqlobject/sqlobject-0.8.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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.8.0.ebuild,v 1.1 2007/02/15 13:08:59 lucass Exp $
-
-inherit distutils
-
-MY_PN=${PN/sqlobject/SQLObject}
-DESCRIPTION="Object-relational mapper for Python"
-HOMEPAGE="http://sqlobject.org/"
-SRC_URI="http://cheeseshop.python.org/packages/source/S/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE="postgres mysql sqlite firebird doc"
-RDEPEND=">=dev-lang/python-2.2
-		postgres? ( <dev-python/psycopg-1.99 )
-		mysql? ( >=dev-python/mysql-python-0.9.2-r1 )
-		sqlite? ( <dev-python/pysqlite-2.0 )
-		firebird? ( >=dev-python/kinterbasdb-3.0.2 )
-		>=dev-python/formencode-0.2.2"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	#We don't want to use setuptools until egg.seclass is solid
-	rm -rf ez_setup
-}
-
-src_install() {
-	distutils_src_install
-
-	if use doc; then
-		cd "${S}/docs"
-		dodoc *.txt
-		dohtml -r presentation-2004-11
-		insinto /usr/share/doc/${PF}
-		doins -r europython
-	fi
-}
diff --git a/dev-python/sqlobject/sqlobject-0.7.3.ebuild b/dev-python/sqlobject/sqlobject-0.8.1.ebuild
index dd75da473fda..7aeb9685f697 100644
--- a/dev-python/sqlobject/sqlobject-0.7.3.ebuild
+++ b/dev-python/sqlobject/sqlobject-0.8.1.ebuild
@@ -1,6 +1,8 @@
 # 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.7.3.ebuild,v 1.1 2007/01/31 23:40:00 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlobject/sqlobject-0.8.1.ebuild,v 1.1 2007/03/19 19:49:59 lucass Exp $
+
+NEED_PYTHON=2.2
 
 inherit distutils
 
@@ -12,20 +14,21 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
 IUSE="postgres mysql sqlite firebird doc"
-RDEPEND=">=dev-lang/python-2.2
-		postgres? ( <dev-python/psycopg-1.99 )
+RDEPEND="postgres? ( <dev-python/psycopg-1.99 )
 		mysql? ( >=dev-python/mysql-python-0.9.2-r1 )
 		sqlite? ( <dev-python/pysqlite-2.0 )
 		firebird? ( >=dev-python/kinterbasdb-3.0.2 )
 		>=dev-python/formencode-0.2.2"
+DEPEND="${RDEPEND}
+	dev-python/setuptools"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	#We don't want to use setuptools until egg.seclass is solid
-	rm -rf ez_setup
+
+	sed -i -e '/use_setuptools/d' setup.py
 }
 
 src_install() {