Version bump to newest 0.9 and 0.10 series.

(Portage version: 2.1.4.4)

5 files changed, 58 insertions, 87 deletions

diff --git a/dev-python/sqlobject/ChangeLog b/dev-python/sqlobject/ChangeLog
index 72368b576c1d..035d7aa37c17 100644
--- a/dev-python/sqlobject/ChangeLog
+++ b/dev-python/sqlobject/ChangeLog
@@ -1,6 +1,15 @@
 # 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.26 2007/11/04 23:41:47 lucass Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlobject/ChangeLog,v 1.27 2008/03/23 15:14:56 chtekk Exp $
+
+*sqlobject-0.10.0 (23 Mar 2008)
+*sqlobject-0.9.5 (23 Mar 2008)
+
+  23 Mar 2008; Luca Longinotti <chtekk@gentoo.org>
+  -files/converters-0.6.1-gentoo.diff, -sqlobject-0.6.1-r1.ebuild,
+  -sqlobject-0.9.2.ebuild, +sqlobject-0.9.5.ebuild,
+  +sqlobject-0.10.0.ebuild:
+  Version bump to newest 0.9 and 0.10 series.
 
 *sqlobject-0.9.2 (04 Nov 2007)
 
diff --git a/dev-python/sqlobject/files/converters-0.6.1-gentoo.diff b/dev-python/sqlobject/files/converters-0.6.1-gentoo.diff
deleted file mode 100644
index 9c806f5f190c..000000000000
--- a/dev-python/sqlobject/files/converters-0.6.1-gentoo.diff
+++ /dev/null
@@ -1,29 +0,0 @@
---- sqlobject/converters.py.orig	2005-03-17 23:38:50.135566808 -0800
-+++ sqlobject/converters.py	2005-03-17 23:41:39.244858288 -0800
-@@ -1,3 +1,5 @@
-+from array import array
-+
- try:
-     import mx.DateTime.ISO
-     origISOStr = mx.DateTime.ISO.strGMT
-@@ -89,6 +91,12 @@
- lookupConverter = converters.lookupConverter
- 
- def StringLikeConverter(value, db):
-+    if type(value) == type(array('c','')):
-+        try:
-+            value = value.tounicode()
-+        except ValueError:
-+            value = value.tostring()
-+
-     if db in ('mysql', 'postgres'):
-         for orig, repl in sqlStringReplace:
-             value = value.replace(orig, repl)
-@@ -100,6 +108,7 @@
- 
- registerConverter(type(""), StringLikeConverter)
- registerConverter(type(u""), StringLikeConverter)
-+registerConverter(type(array('c','')), StringLikeConverter)
- 
- def IntConverter(value, db):
-     return repr(int(value))
diff --git a/dev-python/sqlobject/sqlobject-0.9.2.ebuild b/dev-python/sqlobject/sqlobject-0.10.0.ebuild
index 9d999cdddc2b..caa3c294b3b3 100644
--- a/dev-python/sqlobject/sqlobject-0.9.2.ebuild
+++ b/dev-python/sqlobject/sqlobject-0.10.0.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlobject/sqlobject-0.9.2.ebuild,v 1.1 2007/11/04 23:41:47 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlobject/sqlobject-0.10.0.ebuild,v 1.1 2008/03/23 15:14:56 chtekk Exp $
 
 NEED_PYTHON=2.3
 
 inherit distutils
 
-MY_PN=SQLObject
-MY_P=${MY_PN}-${PV}
+MY_PN="SQLObject"
+MY_P="${MY_PN}-${PV}"
 
-DESCRIPTION="Object-relational mapper for Python"
+DESCRIPTION="Object-relational mapper for Python."
 HOMEPAGE="http://sqlobject.org/"
 SRC_URI="http://cheeseshop.python.org/packages/source/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 LICENSE="LGPL-2.1"
@@ -23,14 +23,14 @@ RDEPEND="postgres? ( dev-python/psycopg )
 		firebird? ( >=dev-python/kinterbasdb-3.0.2 )
 		>=dev-python/formencode-0.2.2"
 DEPEND="${RDEPEND}
-	dev-python/setuptools"
+		dev-python/setuptools"
 
 S="${WORKDIR}/${MY_P}"
 
 src_install() {
 	distutils_src_install
 
-	if use doc; then
+	if use doc ; then
 		cd "${S}/docs"
 		dodoc *.txt
 		dohtml -r presentation-2004-11
@@ -38,13 +38,3 @@ src_install() {
 		doins -r europython
 	fi
 }
-
-#src_test() {
-#	cd sqlobject/tests
-#	sed -i \
-#		-e "s/\('-transactions': 'mysql\)',/\1 sqlite',/" \
-#		dbtest.py
-#	rm test_sqlobject_admin.py
-#	py.test | tee pytest.log
-#	tail -n 1 pytest.log | grep -q "failed" && die "tests failed"
-#}
diff --git a/dev-python/sqlobject/sqlobject-0.6.1-r1.ebuild b/dev-python/sqlobject/sqlobject-0.6.1-r1.ebuild
deleted file mode 100644
index ab5b0001b6b4..000000000000
--- a/dev-python/sqlobject/sqlobject-0.6.1-r1.ebuild
+++ /dev/null
@@ -1,39 +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.6.1-r1.ebuild,v 1.6 2007/07/04 20:27:04 lucass Exp $
-
-inherit distutils eutils
-
-MY_P=${P/sqlobject/SQLObject}
-DESCRIPTION="Object-relational mapper for Python"
-HOMEPAGE="http://sqlobject.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc 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 )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	#Add array type for Subway:
-	epatch ${FILESDIR}/converters-${PV}-gentoo.diff
-}
-
-src_install() {
-	distutils_src_install
-	if use doc; then
-		dodoc docs/*.txt
-		dohtml docs/*.css docs/*.html
-		docinto examples
-		dodoc examples/*
-	fi
-}
diff --git a/dev-python/sqlobject/sqlobject-0.9.5.ebuild b/dev-python/sqlobject/sqlobject-0.9.5.ebuild
new file mode 100644
index 000000000000..44feb3c2c6fa
--- /dev/null
+++ b/dev-python/sqlobject/sqlobject-0.9.5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlobject/sqlobject-0.9.5.ebuild,v 1.1 2008/03/23 15:14:56 chtekk Exp $
+
+NEED_PYTHON=2.3
+
+inherit distutils
+
+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/${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="postgres? ( dev-python/psycopg )
+		mysql? ( >=dev-python/mysql-python-0.9.2-r1 )
+		sqlite? ( || ( dev-python/pysqlite >=dev-lang/python-2.5 ) )
+		firebird? ( >=dev-python/kinterbasdb-3.0.2 )
+		>=dev-python/formencode-0.2.2"
+DEPEND="${RDEPEND}
+		dev-python/setuptools"
+
+S="${WORKDIR}/${MY_P}"
+
+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
+}