[csw-devel] SF.net SVN: gar:[22118] csw/mgar/pkg/lang-python/mysql-python/trunk

[wahwah at users.sourceforge.net]

Revision: 22118
          http://gar.svn.sourceforge.net/gar/?rev=22118&view=rev
Author:   wahwah
Date:     2013-10-04 22:07:18 +0000 (Fri, 04 Oct 2013)
Log Message:
-----------
lang-python/mysql-python/trunk: Upgrade to a new version

Modified Paths:
--------------
    csw/mgar/pkg/lang-python/mysql-python/trunk/Makefile
    csw/mgar/pkg/lang-python/mysql-python/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/lang-python/mysql-python/trunk/files/0001-Disable-the-stupid-download.-We-have-setuptools.patch
    csw/mgar/pkg/lang-python/mysql-python/trunk/files/0002-Remove-GCC-incompatible-compilation-flags.patch

Modified: csw/mgar/pkg/lang-python/mysql-python/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/mysql-python/trunk/Makefile	2013-10-04 19:16:52 UTC (rev 22117)
+++ csw/mgar/pkg/lang-python/mysql-python/trunk/Makefile	2013-10-04 22:07:18 UTC (rev 22118)
@@ -1,7 +1,7 @@
 # $Id$
 
 NAME = MySQL-python
-VERSION = 1.2.4
+VERSION = 1.2.4b4
 CATEGORIES = python
 GARTYPE = v2
 
@@ -10,16 +10,25 @@
 endef
 
 SF_PROJECT = $(call TOLOWER,$(NAME))
-# MASTER_SITES = $(SF_MIRRORS)
 DISTFILES    = $(DISTNAME).zip
 
-GARCOMPILER = SOS12U3
+PATCHFILES += 0001-Disable-the-stupid-download.-We-have-setuptools.patch
+PATCHFILES += 0002-Remove-GCC-incompatible-compilation-flags.patch
+# PATCHFILES_2_7 += 0002-Remove-GCC-incompatible-compilation-flags.patch
+# PATCHFILES += $(PATCHFILES_$(PYTHON_VERSION))
 
+BUILD_DEP_PKGS = CSWpy-setuptools
 PACKAGES = CSWpy-mysql
+RUNTIME_DEP_PKGS_CSWpy-mysql += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWpy-mysql += CSWlibmysqlclient18
 RUNTIME_DEP_PKGS_CSWpy-mysql += CSWlibpython2-6-1-0
-RUNTIME_DEP_PKGS_CSWpy-mysql += CSWlibmysqlclient18
+RUNTIME_DEP_PKGS_CSWpy-mysql += CSWlibpython2-7-1-0
 SPKG_DESC_CSWpy-mysql = MySQL Support for Python
 
+OBSOLETED_BY_CSWpy-mysql = CSWpymysql
+
 SKIPTEST = 1
 
+CHECKPKG_OVERRIDES_CSWpy-mysql += binary-architecture-does-not-match-placement|file=opt/csw/lib/python2.6/site-packages/_mysql.so|arch_id=18|arch_name=sparcv8+
+
 include gar/category.mk

Modified: csw/mgar/pkg/lang-python/mysql-python/trunk/checksums
===================================================================
--- csw/mgar/pkg/lang-python/mysql-python/trunk/checksums	2013-10-04 19:16:52 UTC (rev 22117)
+++ csw/mgar/pkg/lang-python/mysql-python/trunk/checksums	2013-10-04 22:07:18 UTC (rev 22118)
@@ -1 +1 @@
-ddf2386daf10a97af115ffad2ed4a9a0  MySQL-python-1.2.4.zip
+2ce6fad5c5fe4074c33e8e799dc7a0af  MySQL-python-1.2.4b4.zip

Added: csw/mgar/pkg/lang-python/mysql-python/trunk/files/0001-Disable-the-stupid-download.-We-have-setuptools.patch
===================================================================
--- csw/mgar/pkg/lang-python/mysql-python/trunk/files/0001-Disable-the-stupid-download.-We-have-setuptools.patch	                        (rev 0)
+++ csw/mgar/pkg/lang-python/mysql-python/trunk/files/0001-Disable-the-stupid-download.-We-have-setuptools.patch	2013-10-04 22:07:18 UTC (rev 22118)
@@ -0,0 +1,27 @@
+From 824f4fced9ca81059100cabb012548a7070b93fd Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Fri, 4 Oct 2013 19:47:27 +0200
+Subject: [PATCH] Disable the stupid download. We have setuptools!
+
+---
+ setup.py           |    4 ++--
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 798f96f..684023c 100644
+--- a/setup.py
++++ b/setup.py
+@@ -3,8 +3,8 @@
+ import os
+ import sys
+ 
+-from distribute_setup import use_setuptools
+-use_setuptools()
++# from distribute_setup import use_setuptools
++# use_setuptools()
+ from setuptools import setup, Extension
+ 
+ if not hasattr(sys, "hexversion") or sys.hexversion < 0x02040000:
+-- 
+1.7.10.3
+

Added: csw/mgar/pkg/lang-python/mysql-python/trunk/files/0002-Remove-GCC-incompatible-compilation-flags.patch
===================================================================
--- csw/mgar/pkg/lang-python/mysql-python/trunk/files/0002-Remove-GCC-incompatible-compilation-flags.patch	                        (rev 0)
+++ csw/mgar/pkg/lang-python/mysql-python/trunk/files/0002-Remove-GCC-incompatible-compilation-flags.patch	2013-10-04 22:07:18 UTC (rev 22118)
@@ -0,0 +1,25 @@
+From 1b0107dad51359fac86ab204c2331894b67be54c Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Fri, 4 Oct 2013 23:49:15 +0200
+Subject: [PATCH] Remove GCC-incompatible compilation flags.
+
+---
+ setup_posix.py |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup_posix.py b/setup_posix.py
+index f7cb588..86e9a1b 100644
+--- a/setup_posix.py
++++ b/setup_posix.py
+@@ -52,7 +52,7 @@ def get_config():
+     library_dirs = [ dequote(i[2:]) for i in libs if i.startswith(compiler_flag("L")) ]
+     libraries = [ dequote(i[2:]) for i in libs if i.startswith(compiler_flag("l")) ]
+ 
+-    removable_compile_args = [ compiler_flag(f) for f in "ILl" ]
++    removable_compile_args = [ compiler_flag(f) for f in "ILlKmxfn" ]
+     extra_compile_args = [ i.replace("%", "%%") for i in mysql_config("cflags")
+                            if i[:2] not in removable_compile_args ]
+ 
+-- 
+1.7.10.3
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.