compile with non-threadsafe libmysqlclient if mysql4 is installed (linker error) ..

4 files changed, 55 insertions, 6 deletions

diff --git a/dev-python/mysql-python/ChangeLog b/dev-python/mysql-python/ChangeLog
index 1ecba3d4d0eb..33538f9e78af 100644
--- a/dev-python/mysql-python/ChangeLog
+++ b/dev-python/mysql-python/ChangeLog
@@ -1,9 +1,13 @@
 # ChangeLog for dev-python/mysql-python
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mysql-python/ChangeLog,v 1.5 2003/04/04 19:27:05 liquidx Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mysql-python/ChangeLog,v 1.6 2003/04/05 07:20:53 lordvan Exp $
+	
 *mysql-python-0.9.2 (03 Nov 2002)
 
+  05 Apr 2003; Thomas Raschbacher <lordvan@gentoo.org> mysql-python-0.9.2-r1.ebuild:
+  compiling with non-threadsafe libmysqlclient if mysql4 is installed
+  (commiting this non ~arch since otherwise it won't work with mysql4!)
+	
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
   03 Nov 2002; Nicholas Henke <roughneck@gentoo.org> mysql-python-0.9.2.ebuild,Changelog  :
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
new file mode 100644
index 000000000000..45970cd3c33b
--- /dev/null
+++ b/dev-python/mysql-python/files/digest-mysql-python-0.9.2-r1
@@ -0,0 +1 @@
+MD5 afef758f56289f98408dd9f379d8fc8d MySQL-python-0.9.2.tar.gz 64258
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
new file mode 100644
index 000000000000..70e14ed202cd
--- /dev/null
+++ b/dev-python/mysql-python/mysql-python-0.9.2-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mysql-python/mysql-python-0.9.2-r1.ebuild,v 1.1 2003/04/05 07:20:53 lordvan Exp $
+
+S=${WORKDIR}/MySQL-python-${PV}
+DESCRIPTION="MySQL Module for python" 
+SRC_URI="mirror://sourceforge/mysql-python/MySQL-python-${PV}.tar.gz"
+HOMEPAGE="http://sourceforge.net/projects/mysql-python/"
+LICENSE="GPL-2"
+SLOT="0"
+DEPEND="virtual/python
+	virtual/glibc
+	>=dev-lang/python-1.5.2
+	>=dev-db/mysql-3.22.19"
+RDEPEND=""
+KEYWORDS="ppc x86 sparc "
+IUSE=""
+
+inherit distutils
+
+src_compile() {
+    if has_version '>=dev-db/mysql-4.0.10' >& /dev/null
+	then
+	mv setup.py setup.orig
+	sed -e 's/thread_safe_library = YES/thread_safe_library = NO/' \
+	    setup.orig > setup.py
+    fi
+    distutils_src_compile
+}
+
+src_install() {
+    distutils_src_install
+    
+    dohtml doc/*
+}
+
diff --git a/dev-python/mysql-python/mysql-python-0.9.2.ebuild b/dev-python/mysql-python/mysql-python-0.9.2.ebuild
index 07f376929296..ca86ebc35b6a 100644
--- a/dev-python/mysql-python/mysql-python-0.9.2.ebuild
+++ b/dev-python/mysql-python/mysql-python-0.9.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mysql-python/mysql-python-0.9.2.ebuild,v 1.3 2003/02/13 11:35:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mysql-python/mysql-python-0.9.2.ebuild,v 1.4 2003/04/05 07:20:53 lordvan Exp $
 
 S=${WORKDIR}/MySQL-python-${PV}
 DESCRIPTION="MySQL Module for python" 
@@ -18,9 +18,17 @@ IUSE=""
 
 inherit distutils
 
-src_install() {
-	distutils_src_install
+src_compile() {
+    if has_version '>=dev-db/mysql-4.0.10' >& /dev/null
+	then
+	cp ${FILESDIR}/setup.py-0.9.2__mysql4 ${S}/setup.py
+    fi
+    distutils_src_compile
+}
 
-	dohtml doc/*
+src_install() {
+    distutils_src_install
+    
+    dohtml doc/*
 }