SF.net SVN: gar:[23648] csw/mgar/pkg/lang-python/pysetuptools/trunk

[wahwah at users.sourceforge.net]

Revision: 23648
          http://sourceforge.net/p/gar/code/23648
Author:   wahwah
Date:     2014-05-18 12:55:09 +0000 (Sun, 18 May 2014)
Log Message:
-----------
lang-python/pysetuptools/trunk: Version bump, patch updated

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

Added Paths:
-----------
    csw/mgar/pkg/lang-python/pysetuptools/trunk/files/0001-Solaris-packages-can-t-handle-spaces-in-file-names.patch

Removed Paths:
-------------
    csw/mgar/pkg/lang-python/pysetuptools/trunk/files/0001-Solaris-package-mge-does-not-handle-spaces.patch

Modified: csw/mgar/pkg/lang-python/pysetuptools/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/pysetuptools/trunk/Makefile	2014-05-18 12:53:43 UTC (rev 23647)
+++ csw/mgar/pkg/lang-python/pysetuptools/trunk/Makefile	2014-05-18 12:55:09 UTC (rev 23648)
@@ -1,7 +1,7 @@
 # $Id$
 
 NAME = setuptools
-VERSION = 1.1.6
+VERSION = 3.6
 CATEGORIES = python
 GARTYPE = v2
 
@@ -11,14 +11,10 @@
 
 DESCRIPTION = Distribution Utilities for Python
 
-define BLURB
-  Distribution Utilities for Python
-endef
-
 # Upstream has rejected our patch. :(
 # https://bitbucket.org/pypa/setuptools/issue/134/spaces-in-file-names-make-it-impossible-to
 # https://bitbucket.org/pypa/setuptools/pull-request/33/rename-script-templatepy-to-script/diff
-PATCHFILES += 0001-Solaris-package-mge-does-not-handle-spaces.patch
+PATCHFILES += 0001-Solaris-packages-can-t-handle-spaces-in-file-names.patch
 
 ARCHALL_CSWpy-setuptools = 1
 DISTFILES  = $(NAME)-$(VERSION).tar.gz

Modified: csw/mgar/pkg/lang-python/pysetuptools/trunk/checksums
===================================================================
--- csw/mgar/pkg/lang-python/pysetuptools/trunk/checksums	2014-05-18 12:53:43 UTC (rev 23647)
+++ csw/mgar/pkg/lang-python/pysetuptools/trunk/checksums	2014-05-18 12:55:09 UTC (rev 23648)
@@ -1 +1 @@
-ee82ea53def4480191061997409d2996  setuptools-1.1.6.tar.gz
+8f3a1dcdc14313c8334eb6af4f66ea0a  setuptools-3.6.tar.gz

Deleted: csw/mgar/pkg/lang-python/pysetuptools/trunk/files/0001-Solaris-package-mge-does-not-handle-spaces.patch
===================================================================
--- csw/mgar/pkg/lang-python/pysetuptools/trunk/files/0001-Solaris-package-mge-does-not-handle-spaces.patch	2014-05-18 12:53:43 UTC (rev 23647)
+++ csw/mgar/pkg/lang-python/pysetuptools/trunk/files/0001-Solaris-package-mge-does-not-handle-spaces.patch	2014-05-18 12:55:09 UTC (rev 23648)
@@ -1,25 +0,0 @@
-From 2b9d28c7baad8086bba0afdbb343051a3b55f235 Mon Sep 17 00:00:00 2001
-From: Maciej Blizinski <maciej at opencsw.org>
-Date: Tue, 1 Oct 2013 17:57:01 +0200
-Subject: [PATCH] Solaris package mge does not handle spaces
-
----
- setuptools/command/easy_install.py |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
-index 6ce19fa..f0ab449 100644
---- a/setuptools/command/easy_install.py
-+++ b/setuptools/command/easy_install.py
-@@ -759,7 +759,7 @@ Please make the appropriate changes for your system and try again.
-             return clean_template
- 
-         if is_script:
--            template_name = 'script template.py'
-+            template_name = 'script_template.py'
-             if dev_path:
-                 template_name = template_name.replace('.py', ' (dev).py')
-             script_text = (get_script_header(script_text) +
--- 
-1.7.10.3
-

Added: csw/mgar/pkg/lang-python/pysetuptools/trunk/files/0001-Solaris-packages-can-t-handle-spaces-in-file-names.patch
===================================================================
--- csw/mgar/pkg/lang-python/pysetuptools/trunk/files/0001-Solaris-packages-can-t-handle-spaces-in-file-names.patch	                        (rev 0)
+++ csw/mgar/pkg/lang-python/pysetuptools/trunk/files/0001-Solaris-packages-can-t-handle-spaces-in-file-names.patch	2014-05-18 12:55:09 UTC (rev 23648)
@@ -0,0 +1,28 @@
+From 9f85a0682b3cf98845ce149724db1639cebac07d Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Sun, 18 May 2014 14:47:41 +0200
+Subject: [PATCH] Solaris packages can't handle spaces in file names
+
+---
+ setuptools/command/easy_install.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
+index a5f324e..87f12b2 100644
+--- a/setuptools/command/easy_install.py
++++ b/setuptools/command/easy_install.py
+@@ -756,9 +756,9 @@ Please make the appropriate changes for your system and try again.
+         if is_script:
+             # See https://bitbucket.org/pypa/setuptools/issue/134 for info
+             #  on script file naming and downstream issues with SVR4
+-            template_name = 'script template.py'
++            template_name = 'script_template.py'
+             if dev_path:
+-                template_name = template_name.replace('.py', ' (dev).py')
++                template_name = template_name.replace('.py', '_(dev).py')
+             script_text = (get_script_header(script_text) +
+                 get_template(template_name) % locals())
+         self.write_script(script_name, _to_ascii(script_text), 'b')
+-- 
+1.8.4.1
+

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