revision bump with mysql 5 support patch. bumped dep to version mysql-5 in case someone mistakenly stablises this before mysql-5 is stable. (#117948)

(Portage version: 2.1_pre3-r1)

10 files changed, 50 insertions, 70 deletions

diff --git a/dev-python/mysql-python/ChangeLog b/dev-python/mysql-python/ChangeLog
index c7d15842108d..faf8855224bf 100644
--- a/dev-python/mysql-python/ChangeLog
+++ b/dev-python/mysql-python/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-python/mysql-python
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mysql-python/ChangeLog,v 1.29 2006/01/29 16:49:52 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mysql-python/ChangeLog,v 1.30 2006/02/06 21:58:31 liquidx Exp $
+
+*mysql-python-1.2.0-r1 (06 Feb 2006)
+
+  06 Feb 2006; Alastair Tse <liquidx@gentoo.org>
+  +files/1.2.0-newdecimal.patch, -mysql-python-0.9.2-r1.ebuild,
+  -mysql-python-1.0.0.ebuild, -mysql-python-1.1.9.ebuild,
+  +mysql-python-1.2.0-r1.ebuild:
+  revision bump with mysql 5 support patch. bumped dep to version mysql-5 in
+  case someone mistakenly stablises this before mysql-5 is stable. (#117948)
 
   29 Jan 2006; Simon Stelling <blubb@gentoo.org> mysql-python-1.2.0.ebuild:
   stable on amd64
diff --git a/dev-python/mysql-python/Manifest b/dev-python/mysql-python/Manifest
index f2ada3e5e2ab..e9a78cba001f 100644
--- a/dev-python/mysql-python/Manifest
+++ b/dev-python/mysql-python/Manifest
@@ -1,10 +1,13 @@
 MD5 f7f542db29e2be589f8ace15c836dc5a ChangeLog 3477
+MD5 5615c89423881b929da50b6ead828cda files/1.2.0-newdecimal.patch 1021
 MD5 dec65a6be280c6066b2a5decfa636c5a files/digest-mysql-python-0.9.2-r1 69
 MD5 b1dca80b5330985b577712c067a33096 files/digest-mysql-python-1.0.0 69
 MD5 d4c5bb267574a73ad065250341113a2e files/digest-mysql-python-1.1.9 70
 MD5 88531e3c04872ef98f13969b2ef06c4f files/digest-mysql-python-1.2.0 70
+MD5 88531e3c04872ef98f13969b2ef06c4f files/digest-mysql-python-1.2.0-r1 70
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
 MD5 596f72d9352d777bbf34636819319491 mysql-python-0.9.2-r1.ebuild 795
 MD5 48af54066702cc243bc9225d9253259c mysql-python-1.0.0.ebuild 797
 MD5 e20b871746f64f37be527194fd150465 mysql-python-1.1.9.ebuild 700
+MD5 b4bda00647ff13a997e756fd3a00a911 mysql-python-1.2.0-r1.ebuild 800
 MD5 c0e4fad09c18c2eb14c442286ff0454e mysql-python-1.2.0.ebuild 701
diff --git a/dev-python/mysql-python/files/1.2.0-newdecimal.patch b/dev-python/mysql-python/files/1.2.0-newdecimal.patch
new file mode 100644
index 000000000000..c24a9debd7e8
--- /dev/null
+++ b/dev-python/mysql-python/files/1.2.0-newdecimal.patch
@@ -0,0 +1,24 @@
+diff -U 2 -r MySQL-python-1.2.0/MySQLdb/constants/FIELD_TYPE.py MySQL-python-1.2.0-fix-5/MySQLdb/constants/FIELD_TYPE.py
+--- MySQL-python-1.2.0/MySQLdb/constants/FIELD_TYPE.py	2005-01-05 03:40:19.000000000 +0000
++++ MySQL-python-1.2.0-fix-5/MySQLdb/constants/FIELD_TYPE.py	2006-01-05 21:53:56.000000000 +0000
+@@ -21,4 +21,5 @@
+ YEAR = 13
+ NEWDATE = 14
++NEWDECIMAL = 246
+ ENUM = 247
+ SET = 248
+diff -U 2 -r MySQL-python-1.2.0/MySQLdb/converters.py MySQL-python-1.2.0-fix-5/MySQLdb/converters.py
+--- MySQL-python-1.2.0/MySQLdb/converters.py	2005-01-21 02:39:22.000000000 +0000
++++ MySQL-python-1.2.0-fix-5/MySQLdb/converters.py	2006-01-05 22:24:02.000000000 +0000
+@@ -129,4 +129,5 @@
+     FIELD_TYPE.DOUBLE: float,
+     FIELD_TYPE.DECIMAL: float,
++    FIELD_TYPE.NEWDECIMAL: float,
+     FIELD_TYPE.LONGLONG: long,
+     FIELD_TYPE.INT24: int,
+@@ -146,4 +147,5 @@
+     from decimal import Decimal
+     conversions[FIELD_TYPE.DECIMAL] = Decimal
++    conversions[FIELD_TYPE.NEWDECIMAL] = Decimal
+ except ImportError:
+     pass
diff --git a/dev-python/mysql-python/files/digest-mysql-python-0.9.2-r1 b/dev-python/mysql-python/files/digest-mysql-python-0.9.2-r1
deleted file mode 100644
index 45970cd3c33b..000000000000
--- a/dev-python/mysql-python/files/digest-mysql-python-0.9.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 afef758f56289f98408dd9f379d8fc8d MySQL-python-0.9.2.tar.gz 64258
diff --git a/dev-python/mysql-python/files/digest-mysql-python-1.0.0 b/dev-python/mysql-python/files/digest-mysql-python-1.0.0
deleted file mode 100644
index 627d8ea8f036..000000000000
--- a/dev-python/mysql-python/files/digest-mysql-python-1.0.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0f9527a3aa4111802f376cc6816cc7cf MySQL-python-1.0.0.tar.gz 53708
diff --git a/dev-python/mysql-python/files/digest-mysql-python-1.1.9 b/dev-python/mysql-python/files/digest-mysql-python-1.1.9
deleted file mode 100644
index 8559e07694e7..000000000000
--- a/dev-python/mysql-python/files/digest-mysql-python-1.1.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3512f24f8c6ffd3640ff0f5d1a1a27f3 MySQL-python-1.1.9.tar.gz 250025
diff --git a/dev-python/mysql-python/files/digest-mysql-python-1.2.0-r1 b/dev-python/mysql-python/files/digest-mysql-python-1.2.0-r1
new file mode 100644
index 000000000000..2d170cd29b69
--- /dev/null
+++ b/dev-python/mysql-python/files/digest-mysql-python-1.2.0-r1
@@ -0,0 +1 @@
+MD5 b0eb974cc3c917276e015275e1ec996f MySQL-python-1.2.0.tar.gz 252290
diff --git a/dev-python/mysql-python/mysql-python-0.9.2-r1.ebuild b/dev-python/mysql-python/mysql-python-0.9.2-r1.ebuild
deleted file mode 100644
index 9234efde2c70..000000000000
--- a/dev-python/mysql-python/mysql-python-0.9.2-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mysql-python/mysql-python-0.9.2-r1.ebuild,v 1.10 2005/01/25 14:31:50 fserb Exp $
-
-inherit distutils
-
-S=${WORKDIR}/MySQL-python-${PV}
-DESCRIPTION="MySQL Module for python"
-HOMEPAGE="http://sourceforge.net/projects/mysql-python/"
-SRC_URI="mirror://sourceforge/mysql-python/MySQL-python-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="ppc x86 sparc"
-IUSE=""
-
-DEPEND="virtual/python
-	>=dev-db/mysql-3.22.19"
-
-src_compile() {
-	if has_version '>=dev-db/mysql-4.0.10' >& /dev/null ; then
-		sed -i 's/thread_safe_library = YES/thread_safe_library = NO/' setup.py
-	fi
-	distutils_src_compile
-}
-
-src_install() {
-	distutils_src_install
-	dohtml doc/*
-}
diff --git a/dev-python/mysql-python/mysql-python-1.0.0.ebuild b/dev-python/mysql-python/mysql-python-1.0.0.ebuild
deleted file mode 100644
index 555d6fa19bd5..000000000000
--- a/dev-python/mysql-python/mysql-python-1.0.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mysql-python/mysql-python-1.0.0.ebuild,v 1.8 2005/04/24 09:36:00 blubb Exp $
-
-inherit distutils
-
-S=${WORKDIR}/MySQL-python-${PV}
-DESCRIPTION="MySQL Module for python"
-HOMEPAGE="http://sourceforge.net/projects/mysql-python/"
-SRC_URI="mirror://sourceforge/mysql-python/MySQL-python-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="ppc x86 sparc amd64"
-IUSE=""
-
-DEPEND="virtual/python
-	>=dev-db/mysql-3.22.19"
-
-src_compile() {
-	if has_version '>=dev-db/mysql-4.0.10' >& /dev/null ; then
-		sed -i 's/thread_safe_library = YES/thread_safe_library = NO/' setup.py
-	fi
-	distutils_src_compile
-}
-
-src_install() {
-	distutils_src_install
-	dohtml doc/*
-}
diff --git a/dev-python/mysql-python/mysql-python-1.1.9.ebuild b/dev-python/mysql-python/mysql-python-1.2.0-r1.ebuild
index 28017788effe..c105f31c3e73 100644
--- a/dev-python/mysql-python/mysql-python-1.1.9.ebuild
+++ b/dev-python/mysql-python/mysql-python-1.2.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mysql-python/mysql-python-1.1.9.ebuild,v 1.3 2005/01/26 03:37:49 fserb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mysql-python/mysql-python-1.2.0-r1.ebuild,v 1.1 2006/02/06 21:58:31 liquidx Exp $
 
-inherit distutils
+inherit distutils eutils
 
 S=${WORKDIR}/MySQL-python-${PV}
 DESCRIPTION="MySQL Module for python"
@@ -11,12 +11,18 @@ SRC_URI="mirror://sourceforge/mysql-python/MySQL-python-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~ppc ~x86 ~sparc ~amd64"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
 
 IUSE=""
 
-DEPEND="virtual/python
-	>=dev-db/mysql-3.22.19"
+DEPEND="dev-lang/python
+	>=dev-db/mysql-5"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-newdecimal.patch
+}
 
 src_compile() {
 	export mysqlclient="mysqlclient_r"