prepare for python2.3

5 files changed, 84 insertions, 11 deletions

diff --git a/dev-python/kinterbasdb/ChangeLog b/dev-python/kinterbasdb/ChangeLog
index e1b03a661ee1..04f8ad5770fe 100644
--- a/dev-python/kinterbasdb/ChangeLog
+++ b/dev-python/kinterbasdb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/kinterbasdb
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/kinterbasdb/ChangeLog,v 1.5 2003/04/04 21:54:21 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kinterbasdb/ChangeLog,v 1.6 2003/10/02 13:59:26 liquidx Exp $
+
+  02 Oct 2003; Alastair Tse <liquidx@gentoo.org>
+  kinterbasdb-3.0.1_pre3.ebuild, kinterbasdb-3.0.2.ebuild,
+  files/kinterbasdb-3.0.2-py23.patch:
+  add patch for python2.3 support
 
 *kinterbasdb-3.0.2 (04 Apr 2003)
 
diff --git a/dev-python/kinterbasdb/Manifest b/dev-python/kinterbasdb/Manifest
index 19a72fd1d047..2e07e806d123 100644
--- a/dev-python/kinterbasdb/Manifest
+++ b/dev-python/kinterbasdb/Manifest
@@ -1,6 +1,7 @@
-MD5 f6d741b5507bd8d595137b1f1fb1b75c ChangeLog 678
-MD5 7e6d2e61539529b138f53d202fa5c83d kinterbasdb-3.0.1_pre3.ebuild 776
-MD5 c735190d603a3934f4b31e368745fbff kinterbasdb-3.0.2.ebuild 819
+MD5 d2aeb8c6c65b5af8c659d3e86c57240d ChangeLog 859
+MD5 2f508834f145f7a180ca2976ef788058 kinterbasdb-3.0.1_pre3.ebuild 775
+MD5 ef07c773b42099d01eb9a66d4f056d8f kinterbasdb-3.0.2.ebuild 959
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
 MD5 511dc7e5e77d8d502391235c232c519f files/digest-kinterbasdb-3.0.1_pre3 73
 MD5 78dab154a76b4a60b9defcda40ae5262 files/digest-kinterbasdb-3.0.2 139
+MD5 1efb7ccd6e6d24df8da73638b1f9d443 files/kinterbasdb-3.0.2-py23.patch 2518
diff --git a/dev-python/kinterbasdb/files/kinterbasdb-3.0.2-py23.patch b/dev-python/kinterbasdb/files/kinterbasdb-3.0.2-py23.patch
new file mode 100644
index 000000000000..2e2084b4a744
--- /dev/null
+++ b/dev-python/kinterbasdb/files/kinterbasdb-3.0.2-py23.patch
@@ -0,0 +1,59 @@
+--- _kinterbasdb.c	2002-08-28 19:01:52.000000000 +0100
++++ /tmp/_kinterbasdb.c	2003-10-02 12:06:53.000000000 +0100
+@@ -1626,7 +1626,7 @@
+ ** YYY:DSR This normalize_double implementation should be audited for overflow
+ ** issues.
+  */
+-static LONG_LONG normalize_double( double d, short* sqlscalePtr ) {
++static PY_LONG_LONG normalize_double( double d, short* sqlscalePtr ) {
+     /* DSR: Note that my implementation could just as well receive a
+     ** 'short sqlscale' as the current 'pointer to short sqlscale'.
+     ** I left it as a pointer in order to adhere to the function's original
+@@ -1636,7 +1636,7 @@
+      */
+ 
+     /* We iteratively build the normalized double in this variable: */
+-    LONG_LONG result;
++    PY_LONG_LONG result;
+ 
+     /* During this the bulk of this function's computations, we deal with the
+     ** ABSOLUTE value of d, so we must remember the original sign: */
+@@ -1654,9 +1654,9 @@
+     ** fractional portion.
+      */
+     if (signOfD == SIGN_POSITIVE) {
+-        result = (LONG_LONG) fabs(floor(d));
++        result = (PY_LONG_LONG) fabs(floor(d));
+     } else {
+-        result = (LONG_LONG) fabs(ceil(d));
++        result = (PY_LONG_LONG) fabs(ceil(d));
+     }
+ 
+     fractionalPartRemaining = fabs(modf(d, &wholePartRemaining));
+@@ -1868,7 +1868,7 @@
+         ** engine), and 10 to the 18th is less than LONG_LONG_MAX.
+         ** The actual scaling is done using Python longs, will never overflow.
+         */
+-        LONG_LONG multiplier = 1;
++        PY_LONG_LONG multiplier = 1;
+         PyObject* pyMultiplier;
+         short i;
+         for (i = 0; i < num_decimal_places; i++)
+@@ -2000,7 +2000,7 @@
+         *(LONG_LONG*)sqlvar->sqldata = (LONG_LONG) PyInt_AsLong(pyScaledN);
+       } else { /* Must be PyLong */
+       #endif
+-        *(LONG_LONG*)sqlvar->sqldata = PyLong_AsLongLong(pyScaledN);
++        *(PY_LONG_LONG*)sqlvar->sqldata = PyLong_AsLongLong(pyScaledN);
+       #if !PYTHON_2_2_OR_LATER
+       }
+       #endif
+@@ -3164,7 +3164,7 @@
+     ** values properly in imprecise mode (the 64-bit int will overflow the
+     ** double).  This can be overcome by using precise mode.
+     */
+-    LONG_LONG conv_long_long = *(LONG_LONG*)( sqlvar->sqldata );
++    PY_LONG_LONG conv_long_long = *(PY_LONG_LONG*)( sqlvar->sqldata );
+     if ( num_decimal_places == 0 || precision_mode != PRECISION_MODE_IMPRECISE ) {
+       /* This is either a NUMERIC/DECIMAL field being requested in precise
+       ** mode as an uninterpreted integer, or a NUMERIC/DECIMAL field being
diff --git a/dev-python/kinterbasdb/kinterbasdb-3.0.1_pre3.ebuild b/dev-python/kinterbasdb/kinterbasdb-3.0.1_pre3.ebuild
index 9799b8809d70..f40a2f624412 100644
--- a/dev-python/kinterbasdb/kinterbasdb-3.0.1_pre3.ebuild
+++ b/dev-python/kinterbasdb/kinterbasdb-3.0.1_pre3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/kinterbasdb/kinterbasdb-3.0.1_pre3.ebuild,v 1.12 2003/09/11 01:14:04 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kinterbasdb/kinterbasdb-3.0.1_pre3.ebuild,v 1.13 2003/10/02 13:59:26 liquidx Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="kinterbasdb - firebird/interbase interface for Python."
@@ -11,7 +11,7 @@ SLOT="0"
 KEYWORDS="x86 sparc alpha"
 
 DEPEND="virtual/python
-	>=dev/db/firebird-1.0_rc1
+	>=dev-db/firebird-1.0_rc1
 	>=dev-python/egenix-mx-base-2.0.1"
 
 src_compile() {
diff --git a/dev-python/kinterbasdb/kinterbasdb-3.0.2.ebuild b/dev-python/kinterbasdb/kinterbasdb-3.0.2.ebuild
index 1c76e5c89417..041fbcb01391 100644
--- a/dev-python/kinterbasdb/kinterbasdb-3.0.2.ebuild
+++ b/dev-python/kinterbasdb/kinterbasdb-3.0.2.ebuild
@@ -1,22 +1,30 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/kinterbasdb/kinterbasdb-3.0.2.ebuild,v 1.5 2003/09/06 23:32:28 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kinterbasdb/kinterbasdb-3.0.2.ebuild,v 1.6 2003/10/02 13:59:26 liquidx Exp $
 
 inherit distutils
 
-IUSE=""
-S=${WORKDIR}/${P}
 DESCRIPTION="kinterbasdb - firebird/interbase interface for Python."
 SRC_URI="mirror://sourceforge/kinterbasdb/${P}-src.tar.gz"
 HOMEPAGE="http://kinterbasdb.sourceforge.net"
+
+IUSE=""
 LICENSE="kinterbasdb"
 SLOT="0"
 KEYWORDS="x86 ~sparc ~alpha"
 
-DEPEND="virtual/python
-	>=dev/db/firebird-1.0_rc1
+DEPEND="dev-lang/python
+	>=dev-db/firebird-1.0_rc1
 	>=dev-python/egenix-mx-base-2.0.1"
 
+src_unpack() {
+	distutils_python_version
+	unpack ${A}
+	if [ ${PYVER_MINOR} -gt 2 ]; then
+		EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${P}-py23.patch
+	fi		
+}
+
 src_install() {
 	mydoc="docs/*.txt"
 	distutils_src_install --install-data=/usr/share/doc/${PF}