Version bump, dropped old version, 0.8.1 left for stabilisation. Fixed pysqlite dep.

(Portage version: 2.1.2.5)

5 files changed, 36 insertions, 13 deletions

diff --git a/dev-python/sqlobject/ChangeLog b/dev-python/sqlobject/ChangeLog
index 647724fc0258..9139d91abb27 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.20 2007/05/02 20:00:48 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlobject/ChangeLog,v 1.21 2007/05/05 13:27:11 lucass Exp $
+
+*sqlobject-0.8.3 (05 May 2007)
+
+  05 May 2007; Lukasz Strzygowski <lucass@gentoo.org>
+  -sqlobject-0.7.3.ebuild, sqlobject-0.8.1.ebuild, +sqlobject-0.8.3.ebuild:
+  Version bump, dropped old version, 0.8.1 left for stabilisation. Fixed
+  pysqlite dep.
 
   02 May 2007; Rob Cakebread <pythonhead@gentoo.org> Manifest:
   Fixed Manifest.
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.3 b/dev-python/sqlobject/files/digest-sqlobject-0.8.3
new file mode 100644
index 000000000000..ebceb7174090
--- /dev/null
+++ b/dev-python/sqlobject/files/digest-sqlobject-0.8.3
@@ -0,0 +1,3 @@
+MD5 b660ee2de20d110657987cb83fa90e0b SQLObject-0.8.3.tar.gz 236869
+RMD160 5b547f43f62f023523cd92075f3385030f2f08f4 SQLObject-0.8.3.tar.gz 236869
+SHA256 78ffb57c64c3356d505b20fbf2d2e461428b73f855faea26bc8445f2d895a3fe SQLObject-0.8.3.tar.gz 236869
diff --git a/dev-python/sqlobject/sqlobject-0.8.1.ebuild b/dev-python/sqlobject/sqlobject-0.8.1.ebuild
index 2bf72e4a7da0..8ee6fd54c89b 100644
--- a/dev-python/sqlobject/sqlobject-0.8.1.ebuild
+++ b/dev-python/sqlobject/sqlobject-0.8.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/sqlobject/sqlobject-0.8.1.ebuild,v 1.3 2007/03/19 21:59:03 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlobject/sqlobject-0.8.1.ebuild,v 1.4 2007/05/05 13:27:11 lucass Exp $
 
 NEED_PYTHON=2.2
 
@@ -19,7 +19,7 @@ IUSE="postgres mysql sqlite firebird doc"
 
 RDEPEND="postgres? ( dev-python/psycopg )
 		mysql? ( >=dev-python/mysql-python-0.9.2-r1 )
-		sqlite? ( <dev-python/pysqlite-2.0 )
+		sqlite? ( dev-python/pysqlite )
 		firebird? ( >=dev-python/kinterbasdb-3.0.2 )
 		>=dev-python/formencode-0.2.2"
 DEPEND="${RDEPEND}
diff --git a/dev-python/sqlobject/sqlobject-0.7.3.ebuild b/dev-python/sqlobject/sqlobject-0.8.3.ebuild
index 94a64fe25d00..f9a1bcc5cbe1 100644
--- a/dev-python/sqlobject/sqlobject-0.7.3.ebuild
+++ b/dev-python/sqlobject/sqlobject-0.8.3.ebuild
@@ -1,26 +1,42 @@
 # 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.3 2007/05/02 16:42:51 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlobject/sqlobject-0.8.3.ebuild,v 1.1 2007/05/05 13:27:11 lucass Exp $
+
+NEED_PYTHON=2.2
 
 inherit distutils
 
-MY_PN=${PN/sqlobject/SQLObject}
+MY_PN=SQLObject
+MY_P=${MY_PN}-${PV}
+
 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"
+SRC_URI="http://cheeseshop.python.org/packages/source/${MY_PN:0:1}/${MY_PN}/${MY_P}.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 )
+
+RDEPEND="postgres? ( dev-python/psycopg )
 		mysql? ( >=dev-python/mysql-python-0.9.2-r1 )
-		sqlite? ( <dev-python/pysqlite-2.0 )
+		sqlite? ( dev-python/pysqlite )
 		firebird? ( >=dev-python/kinterbasdb-3.0.2 )
 		>=dev-python/formencode-0.2.2"
+DEPEND="${RDEPEND}
+	dev-python/setuptools"
 
-S="${WORKDIR}/${MY_PN}-${PV}"
+S=${WORKDIR}/${MY_P}
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	sed -i \
+		-e '/use_setuptools/d' \
+		-e '/install_requires=/d' \
+		-e '/extras_require/, /},/d' \
+		setup.py || die "sed failed"
+}
 
 src_install() {
 	distutils_src_install