[39887] trunk/dports/python/py-setuptools

[ryandesign at macports.org]

Revision: 39887
          http://trac.macports.org/changeset/39887
Author:   ryandesign at macports.org
Date:     2008-09-10 12:20:19 -0700 (Wed, 10 Sep 2008)
Log Message:
-----------
py-setuptools: allow it to work with Subversion 1.5 and up; merged from py25-setuptools r39886; see #16017 (maintainer timeout)

Modified Paths:
--------------
    trunk/dports/python/py-setuptools/Portfile

Added Paths:
-----------
    trunk/dports/python/py-setuptools/files/
    trunk/dports/python/py-setuptools/files/patch-sdist.py.diff

Removed Paths:
-------------
    trunk/dports/python/py-setuptools/files/patch-sdist.py.diff

Property Changed:
----------------
    trunk/dports/python/py-setuptools/


Property changes on: trunk/dports/python/py-setuptools
___________________________________________________________________
Added: svn:mergeinfo
   + /trunk/dports/python/py25-setuptools:39886

Modified: trunk/dports/python/py-setuptools/Portfile
===================================================================
--- trunk/dports/python/py-setuptools/Portfile	2008-09-10 19:17:04 UTC (rev 39886)
+++ trunk/dports/python/py-setuptools/Portfile	2008-09-10 19:20:19 UTC (rev 39887)
@@ -5,6 +5,7 @@
 
 name				py-setuptools
 version				0.6c8
+revision			1
 categories-append	devel
 maintainers			openmaintainer stechert at macports.org
 description			distutils enhancement for build and distribution
@@ -23,6 +24,8 @@
 				sha1 dbc7a4955672964c1c656ae4ca736cf661409d06 \
 				rmd160 081f49dccefae08d59f905d074ad15d348d51527
 
+patchfiles			patch-sdist.py.diff
+
 post-destroot {
 	xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
 	xinstall -m 644 -W ${worksrcpath} EasyInstall.txt api_tests.txt \

Deleted: trunk/dports/python/py-setuptools/files/patch-sdist.py.diff
===================================================================
--- trunk/dports/python/py25-setuptools/files/patch-sdist.py.diff	2008-09-10 19:17:04 UTC (rev 39886)
+++ trunk/dports/python/py-setuptools/files/patch-sdist.py.diff	2008-09-10 19:20:19 UTC (rev 39887)
@@ -1,11 +0,0 @@
---- setuptools/command/sdist.py	2006-10-31 11:20:42.000000000 -0600
-+++ setuptools/command/sdist.py	2008-09-10 14:08:14.000000000 -0500
-@@ -86,7 +87,7 @@
-     f = open(filename,'rU')
-     data = f.read()
-     f.close()
--    if data.startswith('8'):    # subversion 1.4
-+    if data.startswith('9') or data.startswith('8'):    # subversion 1.5/1.4
-         for record in map(str.splitlines, data.split('\n\x0c\n')[1:]):
-             if not record or len(record)>=6 and record[5]=="delete":
-                 continue    # skip deleted

Copied: trunk/dports/python/py-setuptools/files/patch-sdist.py.diff (from rev 39886, trunk/dports/python/py25-setuptools/files/patch-sdist.py.diff)
===================================================================
--- trunk/dports/python/py-setuptools/files/patch-sdist.py.diff	                        (rev 0)
+++ trunk/dports/python/py-setuptools/files/patch-sdist.py.diff	2008-09-10 19:20:19 UTC (rev 39887)
@@ -0,0 +1,11 @@
+--- setuptools/command/sdist.py	2006-10-31 11:20:42.000000000 -0600
++++ setuptools/command/sdist.py	2008-09-10 14:08:14.000000000 -0500
+@@ -86,7 +87,7 @@
+     f = open(filename,'rU')
+     data = f.read()
+     f.close()
+-    if data.startswith('8'):    # subversion 1.4
++    if data.startswith('9') or data.startswith('8'):    # subversion 1.5/1.4
+         for record in map(str.splitlines, data.split('\n\x0c\n')[1:]):
+             if not record or len(record)>=6 and record[5]=="delete":
+                 continue    # skip deleted
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080910/5c17c12a/attachment.html