Bug #114925, thanks to "malc"

Package-Manager: portage-2.0.53

4 files changed, 58 insertions, 5 deletions

diff --git a/dev-perl/DBD-mysql/ChangeLog b/dev-perl/DBD-mysql/ChangeLog
index 3ff102afe190..490af5a1b5a1 100644
--- a/dev-perl/DBD-mysql/ChangeLog
+++ b/dev-perl/DBD-mysql/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-perl/DBD-mysql
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/DBD-mysql/ChangeLog,v 1.44 2005/12/08 21:18:11 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/DBD-mysql/ChangeLog,v 1.45 2005/12/12 10:49:59 vivo Exp $
+
+  12 Dec 2005; Francesco Riosa <vivo@gentoo.org>
+  +files/mysql-5.0-new_bit_type.patch, DBD-mysql-3.0002_p4.ebuild:
+  fix Bug #114925, compile fail with mysql < 5.0. Many thanks  Malcolm (malc)
+  Lashley.
 
 *DBD-mysql-3.0002_p4 (08 Dec 2005)
 
diff --git a/dev-perl/DBD-mysql/DBD-mysql-3.0002_p4.ebuild b/dev-perl/DBD-mysql/DBD-mysql-3.0002_p4.ebuild
index f9f083ae55fb..81b5b49bfa0c 100644
--- a/dev-perl/DBD-mysql/DBD-mysql-3.0002_p4.ebuild
+++ b/dev-perl/DBD-mysql/DBD-mysql-3.0002_p4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/DBD-mysql/DBD-mysql-3.0002_p4.ebuild,v 1.1 2005/12/08 21:18:11 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/DBD-mysql/DBD-mysql-3.0002_p4.ebuild,v 1.2 2005/12/12 10:49:59 vivo Exp $
 
-inherit perl-module
+inherit eutils perl-module
 
 MY_P="${P/_p/_}"
 S=${WORKDIR}/${MY_P}
@@ -21,3 +21,9 @@ DEPEND="dev-perl/DBI
 	dev-db/mysql"
 
 mydoc="ToDo"
+
+src_unpack () {
+	unpack ${A}
+	cd ${S}
+	epatch "${FILESDIR}/mysql-5.0-new_bit_type.patch"
+}
diff --git a/dev-perl/DBD-mysql/Manifest b/dev-perl/DBD-mysql/Manifest
index 704e90c4370a..ab9af7ba1da7 100644
--- a/dev-perl/DBD-mysql/Manifest
+++ b/dev-perl/DBD-mysql/Manifest
@@ -1,13 +1,14 @@
-MD5 327fb779f9ab198845f5ea3a7531b49e ChangeLog 5211
+MD5 4540b4036645f85f593871bbb185a7d4 ChangeLog 5417
 MD5 a6ae96f1686c621af79bc868a36a7415 DBD-mysql-2.1027.ebuild 562
 MD5 985e957d1fff607e9e8439c0c4e21d37 DBD-mysql-2.9003.ebuild 577
 MD5 78335dd9c48248b56dfd74e7d89fdd71 DBD-mysql-2.9007.ebuild 598
 MD5 973033c4b97c1e1411874e09fead0142 DBD-mysql-3.0002_p3.ebuild 641
-MD5 da446d38c0ae7296d17f3ec0242df3a5 DBD-mysql-3.0002_p4.ebuild 639
+MD5 409e9f864077dadda7c746a1aa2b76dc DBD-mysql-3.0002_p4.ebuild 738
 MD5 f40eecb7d598ce677826cb398539758f files/digest-DBD-mysql-2.1027 67
 MD5 5213da48718338e1d1164d1c5479d18b files/digest-DBD-mysql-2.9003 68
 MD5 77d091a5ff85d5d195d78693a662fae3 files/digest-DBD-mysql-2.9007 68
 MD5 31a4a8ffca04c0de391fa5f8e216ac0d files/digest-DBD-mysql-3.0002_p3 70
 MD5 f85b62240da6965826cc2326a528fd0a files/digest-DBD-mysql-3.0002_p4 70
 MD5 1e7e8cdcdfe45851d63691a85f463762 files/makemaker.patch 398
+MD5 41410536dd5f7348dda0f6e01bb38c6f files/mysql-5.0-new_bit_type.patch 1404
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
diff --git a/dev-perl/DBD-mysql/files/mysql-5.0-new_bit_type.patch b/dev-perl/DBD-mysql/files/mysql-5.0-new_bit_type.patch
new file mode 100644
index 000000000000..426e67872e7f
--- /dev/null
+++ b/dev-perl/DBD-mysql/files/mysql-5.0-new_bit_type.patch
@@ -0,0 +1,41 @@
+diff -aur DBD-mysql-3.0002_4/dbdimp.c DBD-mysql-3.0002_4/dbdimp.c
+--- DBD-mysql-3.0002_4/dbdimp.c	2005-11-06 21:32:01.000000000 +0000
++++ DBD-mysql-3.0002_4/dbdimp.c	2005-12-11 11:46:08.000000000 +0000
+@@ -246,9 +246,10 @@
+   case MYSQL_TYPE_LONG:
+   case MYSQL_TYPE_INT24:
+   case MYSQL_TYPE_YEAR:
++#if MYSQL_VERSION_ID > NEW_BIT_DATATYPE_VERSION
+   case MYSQL_TYPE_BIT:
+     return MYSQL_TYPE_LONG;
+-
++#endif
+   case MYSQL_TYPE_DECIMAL:
+   case MYSQL_TYPE_LONGLONG:			/* No longlong in perl */
+   case MYSQL_TYPE_DATE:
+@@ -256,11 +257,13 @@
+   case MYSQL_TYPE_DATETIME:
+   case MYSQL_TYPE_NEWDATE:
+   case MYSQL_TYPE_VAR_STRING:
++#if MYSQL_VERSION_ID > NEW_BIT_DATATYPE_VERSION
+   case MYSQL_TYPE_VARCHAR:
++#endif
+   case MYSQL_TYPE_STRING:
+   case MYSQL_TYPE_BLOB:
+   case MYSQL_TYPE_TINY_BLOB:
+-#ifdef MYSQL_VERSION_ID > NEW_DATATYPE_VERSION
++#if MYSQL_VERSION_ID > NEW_DATATYPE_VERSION
+   case MYSQL_TYPE_GEOMETRY:
+ #endif
+   case MYSQL_TYPE_TIMESTAMP:
+diff -aur DBD-mysql-3.0002_4/dbdimp.h DBD-mysql-3.0002_4/dbdimp.h
+--- DBD-mysql-3.0002_4/dbdimp.h	2005-11-06 21:32:01.000000000 +0000
++++ DBD-mysql-3.0002_4/dbdimp.h	2005-12-11 11:32:00.000000000 +0000
+@@ -31,6 +31,7 @@
+ #define SERVER_PREPARE_VERSION 40103
+ #define LIMIT_PLACEHOLDER_VERSION 50007
+ #define NEW_DATATYPE_VERSION 50007
++#define NEW_BIT_DATATYPE_VERSION 50300
+ 
+ /*
+  *  The following are return codes passed in $h->err in case of