Added patch for array type needed for Subway

Package-Manager: portage-2.0.51.19

5 files changed, 82 insertions, 5 deletions

diff --git a/dev-python/sqlobject/ChangeLog b/dev-python/sqlobject/ChangeLog
index cf30a96343a4..34b3bfc86d63 100644
--- a/dev-python/sqlobject/ChangeLog
+++ b/dev-python/sqlobject/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/sqlobject
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlobject/ChangeLog,v 1.2 2005/03/03 04:29:09 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlobject/ChangeLog,v 1.3 2005/03/18 18:23:49 pythonhead Exp $
+
+*sqlobject-0.6.1-r1 (18 Mar 2005)
+
+  18 Mar 2005; Rob Cakebread <pythonhead@gentoo.org>
+  +files/converters-0.6.1-gentoo.diff, +sqlobject-0.6.1-r1.ebuild:
+  Added patch for array type needed for Subway
 
 *sqlobject-0.6.1 (02 Mar 2005)
 
diff --git a/dev-python/sqlobject/Manifest b/dev-python/sqlobject/Manifest
index 4296ae9517d8..851679da414f 100644
--- a/dev-python/sqlobject/Manifest
+++ b/dev-python/sqlobject/Manifest
@@ -3,14 +3,17 @@ Hash: SHA1
 
 MD5 1436c0c2e931c2d0ca9aa610b5a34a38 sqlobject-0.6.ebuild 887
 MD5 4f1a2e57adc3709e1eb06286ce386e62 metadata.xml 373
-MD5 c4ce49788ecadb13cafad9e040a84738 ChangeLog 584
+MD5 be2c62c4382ca4613a6f4c0e030ab3d4 ChangeLog 787
 MD5 4e367ed18e4e4b3460613985ff2d342d sqlobject-0.6.1.ebuild 888
+MD5 d7839f55ba5e2c3a2ad8dbe35acfaa2e sqlobject-0.6.1-r1.ebuild 1077
 MD5 d0031ecb2e25667b84c0f038fbfd9824 files/digest-sqlobject-0.6 65
 MD5 1f977e1d1bdca5117fa468d6d620ca80 files/digest-sqlobject-0.6.1 67
+MD5 5b2d75adc12e9723956e5f5bc0d6dbcf files/converters-0.6.1-gentoo.diff 894
+MD5 1f977e1d1bdca5117fa468d6d620ca80 files/digest-sqlobject-0.6.1-r1 67
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFCJpLcz2gxt1z4IGYRAmEeAKCuQJZi9wvz1Cf2DeL7QhPh9XZdUwCgjlxu
-kY+Jn++JMJr+VxYtxuDF980=
-=FoCZ
+iD8DBQFCOxzCz2gxt1z4IGYRAr8LAJoC1VnG/s19vniuN052VCheACSMMgCgo1zX
+t9Q6ora3prf373mWnlGD3Mk=
+=Tlkl
 -----END PGP SIGNATURE-----
diff --git a/dev-python/sqlobject/files/converters-0.6.1-gentoo.diff b/dev-python/sqlobject/files/converters-0.6.1-gentoo.diff
new file mode 100644
index 000000000000..9c806f5f190c
--- /dev/null
+++ b/dev-python/sqlobject/files/converters-0.6.1-gentoo.diff
@@ -0,0 +1,29 @@
+--- 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/files/digest-sqlobject-0.6.1-r1 b/dev-python/sqlobject/files/digest-sqlobject-0.6.1-r1
new file mode 100644
index 000000000000..0384fe925011
--- /dev/null
+++ b/dev-python/sqlobject/files/digest-sqlobject-0.6.1-r1
@@ -0,0 +1 @@
+MD5 0dbb6ea429aa40eee734751ad48fbfbb SQLObject-0.6.1.tar.gz 147871
diff --git a/dev-python/sqlobject/sqlobject-0.6.1-r1.ebuild b/dev-python/sqlobject/sqlobject-0.6.1-r1.ebuild
new file mode 100644
index 000000000000..8cefcab7caaf
--- /dev/null
+++ b/dev-python/sqlobject/sqlobject-0.6.1-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2005 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.1 2005/03/18 18:23:49 pythonhead 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="~x86"
+IUSE="postgres mysql sqlite firebird doc"
+RDEPEND=">=dev-lang/python-2.2
+		postgres? ( >=dev-python/psycopg-1.1.11 )
+		mysql? ( >=dev-python/mysql-python-0.9.2-r1 )
+		sqlite? ( >=dev-python/pysqlite-0.5.0 )
+		firebird? ( >=dev-python/kinterbasdb-3.0.2 )"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A} || die "Failed to unpack ${A}"
+	cd ${S} || die "Failed to cd to ${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
+}