[82217] trunk/dports/python
snc at macports.org
snc at macports.org
Wed Aug 10 08:39:43 PDT 2011
Revision: 82217
http://trac.macports.org/changeset/82217
Author: snc at macports.org
Date: 2011-08-10 08:39:43 -0700 (Wed, 10 Aug 2011)
Log Message:
-----------
py-hgsvn: unify and update to 0.1.9
Modified Paths:
--------------
trunk/dports/python/py-hgsvn/Portfile
Removed Paths:
-------------
trunk/dports/python/py-hgsvn/files/
trunk/dports/python/py25-hgsvn/
trunk/dports/python/py26-hgsvn/Portfile
trunk/dports/python/py26-hgsvn/files/ez_setup.py
trunk/dports/python/py26-hgsvn/files/patch-hgsvn-run-hgpullsvn.py.diff
trunk/dports/python/py26-hgsvn/files/patch-hgsvn-ui.py.diff
trunk/dports/python/py27-hgsvn/Portfile
trunk/dports/python/py27-hgsvn/files/ez_setup.py
trunk/dports/python/py27-hgsvn/files/patch-hgsvn-ui.py.diff
Modified: trunk/dports/python/py-hgsvn/Portfile
===================================================================
--- trunk/dports/python/py-hgsvn/Portfile 2011-08-10 15:34:57 UTC (rev 82216)
+++ trunk/dports/python/py-hgsvn/Portfile 2011-08-10 15:39:43 UTC (rev 82217)
@@ -2,13 +2,15 @@
# $Id$
PortSystem 1.0
-PortGroup python24 1.0
+PortGroup python 1.0
-name py-hgsvn
-version 0.1.8
+name py-hgsvn
+version 0.1.9
+python.versions 24 25 26 27
+python.default_version 27
categories python devel
platforms darwin
-maintainers saispo
+maintainers saispo snc openmaintainer
homepage http://pypi.python.org/pypi/hgsvn
description hgsvn is a set of scripts for Subversion and Mercurial
long_description This set of scripts allows to work locally on \
@@ -17,16 +19,35 @@
master_sites http://pypi.python.org/packages/source/h/hgsvn
distname hgsvn-${version}
-checksums md5 56209eae48b955754e09185712123428 \
- sha1 029eeb5646228194d4677d2f4e3e33bc41da44cc \
- rmd160 af056571b2d25110b61cffbf5512cb35967a7c1f
-depends_lib-append port:py-setuptools
-depends_run-append port:py-elementtree
-post-extract { file copy ${filespath}/ez_setup.py ${worksrcpath} }
+checksums rmd160 3f6c9b0bbda5c8454478436d0c0589e04d8394e1 \
+ sha256 de45c04a1b3c3e104fcfc99973609239240c3b22789b6e87e29323c7b86c333f
-post-destroot {
- xinstall -m 644 -W ${worksrcpath} AUTHORS.txt COPYING.txt README.txt TODO.txt \
- ${destroot}${prefix}/share/doc/${name}
+if {$subport != $name} {
+
+ if {${python.version} == 24} {
+ depends_lib-append port:py-setuptools
+ depends_run-append port:py-elementtree
+ }
+
+ if {${python.version} == 27 || ${python.version} == 26 || ${python.version} == 25} {
+ depends_lib-append port:py${python.version}-distribute \
+ port:mercurial \
+ port:subversion
+ }
+
+ post-destroot {
+ xinstall -m 644 -W ${worksrcpath} AUTHORS.txt COPYING.txt README.txt TODO.txt \
+ ${destroot}${prefix}/share/doc/py${python.version}-hgsvn
+ if {${python.version} == 25 || ${python.version} == 24} {
+ move ${destroot}${prefix}/bin/hgimportsvn ${destroot}${prefix}/bin/hgimportsvn-${python.version}
+ move ${destroot}${prefix}/bin/hgpullsvn ${destroot}${prefix}/bin/hgpullsvn-${python.version}
+ move ${destroot}${prefix}/bin/hgpushsvn ${destroot}${prefix}/bin/hgpushsvn-${python.version}
+ }
+ }
+
}
+livecheck.type regex
+livecheck.url ${homepage}
+livecheck.regex hgsvn (\\d+(\\.\\d+)+)
Deleted: trunk/dports/python/py26-hgsvn/Portfile
===================================================================
--- trunk/dports/python/py26-hgsvn/Portfile 2011-08-10 15:34:57 UTC (rev 82216)
+++ trunk/dports/python/py26-hgsvn/Portfile 2011-08-10 15:39:43 UTC (rev 82217)
@@ -1,40 +0,0 @@
-# $Id$
-
-PortSystem 1.0
-PortGroup python26 1.0
-
-name py26-hgsvn
-version 0.1.8
-revision 2
-categories python devel
-platforms darwin
-maintainers snc openmaintainer
-homepage http://pypi.python.org/pypi/hgsvn
-description hgsvn is a set of scripts for Subversion and Mercurial
-long_description This set of scripts allows to work locally on \
- Subversion-managed projects using the Mercurial \
- distributed version control system.
-
-master_sites http://pypi.python.org/packages/source/h/hgsvn
-distname hgsvn-${version}
-
-checksums rmd160 af056571b2d25110b61cffbf5512cb35967a7c1f \
- sha256 90ddb565cc058c69617efc2ee0f02e5847104b6481ef56fb849a5410835c47a1
-
-depends_lib-append port:mercurial \
- port:subversion \
- port:py26-distribute
-
-patchfiles patch-hgsvn-ui.py.diff \
- patch-hgsvn-run-hgpullsvn.py.diff
-
-post-extract { file copy ${filespath}/ez_setup.py ${worksrcpath} }
-
-post-destroot {
- xinstall -m 644 -W ${worksrcpath} AUTHORS.txt COPYING.txt README.txt TODO.txt \
- ${destroot}${prefix}/share/doc/${name}
-}
-
-livecheck.type regex
-livecheck.url ${homepage}
-livecheck.regex hgsvn (\\d+\\.\\d+\\.\\d+)
Deleted: trunk/dports/python/py26-hgsvn/files/ez_setup.py
===================================================================
--- trunk/dports/python/py26-hgsvn/files/ez_setup.py 2011-08-10 15:34:57 UTC (rev 82216)
+++ trunk/dports/python/py26-hgsvn/files/ez_setup.py 2011-08-10 15:39:43 UTC (rev 82217)
@@ -1,284 +0,0 @@
-#!python
-"""Bootstrap setuptools installation
-
-If you want to use setuptools in your package's setup.py, just include this
-file in the same directory with it, and add this to the top of your setup.py::
-
- from ez_setup import use_setuptools
- use_setuptools()
-
-If you want to require a specific version of setuptools, set a download
-mirror, or use an alternate download directory, you can do so by supplying
-the appropriate options to ``use_setuptools()``.
-
-This file can also be run as a script to install or upgrade setuptools.
-"""
-import sys
-DEFAULT_VERSION = "0.6c11"
-DEFAULT_URL = "http://pypi.python.org/packages/%s/s/setuptools/" % sys.version[:3]
-
-md5_data = {
- 'setuptools-0.6b1-py2.3.egg': '8822caf901250d848b996b7f25c6e6ca',
- 'setuptools-0.6b1-py2.4.egg': 'b79a8a403e4502fbb85ee3f1941735cb',
- 'setuptools-0.6b2-py2.3.egg': '5657759d8a6d8fc44070a9d07272d99b',
- 'setuptools-0.6b2-py2.4.egg': '4996a8d169d2be661fa32a6e52e4f82a',
- 'setuptools-0.6b3-py2.3.egg': 'bb31c0fc7399a63579975cad9f5a0618',
- 'setuptools-0.6b3-py2.4.egg': '38a8c6b3d6ecd22247f179f7da669fac',
- 'setuptools-0.6b4-py2.3.egg': '62045a24ed4e1ebc77fe039aa4e6f7e5',
- 'setuptools-0.6b4-py2.4.egg': '4cb2a185d228dacffb2d17f103b3b1c4',
- 'setuptools-0.6c1-py2.3.egg': 'b3f2b5539d65cb7f74ad79127f1a908c',
- 'setuptools-0.6c1-py2.4.egg': 'b45adeda0667d2d2ffe14009364f2a4b',
- 'setuptools-0.6c10-py2.3.egg': 'ce1e2ab5d3a0256456d9fc13800a7090',
- 'setuptools-0.6c10-py2.4.egg': '57d6d9d6e9b80772c59a53a8433a5dd4',
- 'setuptools-0.6c10-py2.5.egg': 'de46ac8b1c97c895572e5e8596aeb8c7',
- 'setuptools-0.6c10-py2.6.egg': '58ea40aef06da02ce641495523a0b7f5',
- 'setuptools-0.6c11-py2.3.egg': '2baeac6e13d414a9d28e7ba5b5a596de',
- 'setuptools-0.6c11-py2.4.egg': 'bd639f9b0eac4c42497034dec2ec0c2b',
- 'setuptools-0.6c11-py2.5.egg': '64c94f3bf7a72a13ec83e0b24f2749b2',
- 'setuptools-0.6c11-py2.6.egg': 'bfa92100bd772d5a213eedd356d64086',
- 'setuptools-0.6c2-py2.3.egg': 'f0064bf6aa2b7d0f3ba0b43f20817c27',
- 'setuptools-0.6c2-py2.4.egg': '616192eec35f47e8ea16cd6a122b7277',
- 'setuptools-0.6c3-py2.3.egg': 'f181fa125dfe85a259c9cd6f1d7b78fa',
- 'setuptools-0.6c3-py2.4.egg': 'e0ed74682c998bfb73bf803a50e7b71e',
- 'setuptools-0.6c3-py2.5.egg': 'abef16fdd61955514841c7c6bd98965e',
- 'setuptools-0.6c4-py2.3.egg': 'b0b9131acab32022bfac7f44c5d7971f',
- 'setuptools-0.6c4-py2.4.egg': '2a1f9656d4fbf3c97bf946c0a124e6e2',
- 'setuptools-0.6c4-py2.5.egg': '8f5a052e32cdb9c72bcf4b5526f28afc',
- 'setuptools-0.6c5-py2.3.egg': 'ee9fd80965da04f2f3e6b3576e9d8167',
- 'setuptools-0.6c5-py2.4.egg': 'afe2adf1c01701ee841761f5bcd8aa64',
- 'setuptools-0.6c5-py2.5.egg': 'a8d3f61494ccaa8714dfed37bccd3d5d',
- 'setuptools-0.6c6-py2.3.egg': '35686b78116a668847237b69d549ec20',
- 'setuptools-0.6c6-py2.4.egg': '3c56af57be3225019260a644430065ab',
- 'setuptools-0.6c6-py2.5.egg': 'b2f8a7520709a5b34f80946de5f02f53',
- 'setuptools-0.6c7-py2.3.egg': '209fdf9adc3a615e5115b725658e13e2',
- 'setuptools-0.6c7-py2.4.egg': '5a8f954807d46a0fb67cf1f26c55a82e',
- 'setuptools-0.6c7-py2.5.egg': '45d2ad28f9750e7434111fde831e8372',
- 'setuptools-0.6c8-py2.3.egg': '50759d29b349db8cfd807ba8303f1902',
- 'setuptools-0.6c8-py2.4.egg': 'cba38d74f7d483c06e9daa6070cce6de',
- 'setuptools-0.6c8-py2.5.egg': '1721747ee329dc150590a58b3e1ac95b',
- 'setuptools-0.6c9-py2.3.egg': 'a83c4020414807b496e4cfbe08507c03',
- 'setuptools-0.6c9-py2.4.egg': '260a2be2e5388d66bdaee06abec6342a',
- 'setuptools-0.6c9-py2.5.egg': 'fe67c3e5a17b12c0e7c541b7ea43a8e6',
- 'setuptools-0.6c9-py2.6.egg': 'ca37b1ff16fa2ede6e19383e7b59245a',
-}
-
-import sys, os
-try: from hashlib import md5
-except ImportError: from md5 import md5
-
-def _validate_md5(egg_name, data):
- if egg_name in md5_data:
- digest = md5(data).hexdigest()
- if digest != md5_data[egg_name]:
- print >>sys.stderr, (
- "md5 validation of %s failed! (Possible download problem?)"
- % egg_name
- )
- sys.exit(2)
- return data
-
-def use_setuptools(
- version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir,
- download_delay=15
-):
- """Automatically find/download setuptools and make it available on sys.path
-
- `version` should be a valid setuptools version number that is available
- as an egg for download under the `download_base` URL (which should end with
- a '/'). `to_dir` is the directory where setuptools will be downloaded, if
- it is not already available. If `download_delay` is specified, it should
- be the number of seconds that will be paused before initiating a download,
- should one be required. If an older version of setuptools is installed,
- this routine will print a message to ``sys.stderr`` and raise SystemExit in
- an attempt to abort the calling script.
- """
- was_imported = 'pkg_resources' in sys.modules or 'setuptools' in sys.modules
- def do_download():
- egg = download_setuptools(version, download_base, to_dir, download_delay)
- sys.path.insert(0, egg)
- import setuptools; setuptools.bootstrap_install_from = egg
- try:
- import pkg_resources
- except ImportError:
- return do_download()
- try:
- pkg_resources.require("setuptools>="+version); return
- except pkg_resources.VersionConflict, e:
- if was_imported:
- print >>sys.stderr, (
- "The required version of setuptools (>=%s) is not available, and\n"
- "can't be installed while this script is running. Please install\n"
- " a more recent version first, using 'easy_install -U setuptools'."
- "\n\n(Currently using %r)"
- ) % (version, e.args[0])
- sys.exit(2)
- else:
- del pkg_resources, sys.modules['pkg_resources'] # reload ok
- return do_download()
- except pkg_resources.DistributionNotFound:
- return do_download()
-
-def download_setuptools(
- version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir,
- delay = 15
-):
- """Download setuptools from a specified location and return its filename
-
- `version` should be a valid setuptools version number that is available
- as an egg for download under the `download_base` URL (which should end
- with a '/'). `to_dir` is the directory where the egg will be downloaded.
- `delay` is the number of seconds to pause before an actual download attempt.
- """
- import urllib2, shutil
- egg_name = "setuptools-%s-py%s.egg" % (version,sys.version[:3])
- url = download_base + egg_name
- saveto = os.path.join(to_dir, egg_name)
- src = dst = None
- if not os.path.exists(saveto): # Avoid repeated downloads
- try:
- from distutils import log
- if delay:
- log.warn("""
----------------------------------------------------------------------------
-This script requires setuptools version %s to run (even to display
-help). I will attempt to download it for you (from
-%s), but
-you may need to enable firewall access for this script first.
-I will start the download in %d seconds.
-
-(Note: if this machine does not have network access, please obtain the file
-
- %s
-
-and place it in this directory before rerunning this script.)
----------------------------------------------------------------------------""",
- version, download_base, delay, url
- ); from time import sleep; sleep(delay)
- log.warn("Downloading %s", url)
- src = urllib2.urlopen(url)
- # Read/write all in one block, so we don't create a corrupt file
- # if the download is interrupted.
- data = _validate_md5(egg_name, src.read())
- dst = open(saveto,"wb"); dst.write(data)
- finally:
- if src: src.close()
- if dst: dst.close()
- return os.path.realpath(saveto)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-def main(argv, version=DEFAULT_VERSION):
- """Install or upgrade setuptools and EasyInstall"""
- try:
- import setuptools
- except ImportError:
- egg = None
- try:
- egg = download_setuptools(version, delay=0)
- sys.path.insert(0,egg)
- from setuptools.command.easy_install import main
- return main(list(argv)+[egg]) # we're done here
- finally:
- if egg and os.path.exists(egg):
- os.unlink(egg)
- else:
- if setuptools.__version__ == '0.0.1':
- print >>sys.stderr, (
- "You have an obsolete version of setuptools installed. Please\n"
- "remove it from your system entirely before rerunning this script."
- )
- sys.exit(2)
-
- req = "setuptools>="+version
- import pkg_resources
- try:
- pkg_resources.require(req)
- except pkg_resources.VersionConflict:
- try:
- from setuptools.command.easy_install import main
- except ImportError:
- from easy_install import main
- main(list(argv)+[download_setuptools(delay=0)])
- sys.exit(0) # try to force an exit
- else:
- if argv:
- from setuptools.command.easy_install import main
- main(argv)
- else:
- print "Setuptools version",version,"or greater has been installed."
- print '(Run "ez_setup.py -U setuptools" to reinstall or upgrade.)'
-
-def update_md5(filenames):
- """Update our built-in md5 registry"""
-
- import re
-
- for name in filenames:
- base = os.path.basename(name)
- f = open(name,'rb')
- md5_data[base] = md5(f.read()).hexdigest()
- f.close()
-
- data = [" %r: %r,\n" % it for it in md5_data.items()]
- data.sort()
- repl = "".join(data)
-
- import inspect
- srcfile = inspect.getsourcefile(sys.modules[__name__])
- f = open(srcfile, 'rb'); src = f.read(); f.close()
-
- match = re.search("\nmd5_data = {\n([^}]+)}", src)
- if not match:
- print >>sys.stderr, "Internal error!"
- sys.exit(2)
-
- src = src[:match.start(1)] + repl + src[match.end(1):]
- f = open(srcfile,'w')
- f.write(src)
- f.close()
-
-
-if __name__=='__main__':
- if len(sys.argv)>2 and sys.argv[1]=='--md5update':
- update_md5(sys.argv[2:])
- else:
- main(sys.argv[1:])
-
-
-
-
-
-
Deleted: trunk/dports/python/py26-hgsvn/files/patch-hgsvn-run-hgpullsvn.py.diff
===================================================================
--- trunk/dports/python/py26-hgsvn/files/patch-hgsvn-run-hgpullsvn.py.diff 2011-08-10 15:34:57 UTC (rev 82216)
+++ trunk/dports/python/py26-hgsvn/files/patch-hgsvn-run-hgpullsvn.py.diff 2011-08-10 15:39:43 UTC (rev 82217)
@@ -1,18 +0,0 @@
-diff -r affc710ef4f9 hgsvn/run/hgpullsvn.py
---- hgsvn/run/hgpullsvn.py Sun May 25 21:58:16 2008 +0200
-+++ hgsvn/run/hgpullsvn.py Fri Nov 19 15:19:49 2010 +0100
-@@ -161,7 +161,13 @@
- raise
- run_hg(["add"], [new])
- if removed_paths:
-- run_hg(["remove", "-A"], removed_paths)
-+ try:
-+ run_hg(["remove", "-A"], removed_paths)
-+ except (ExternalCommandFailed), e:
-+ if str(e).find("file is untracked") > 0:
-+ ui.status("Ignoring warnings about untracked files: '%s'" % str(e), level=ui.VERBOSE)
-+ else:
-+ raise
- hg_commit_from_svn_log_entry(log_entry)
- elif unrelated_paths:
- detect_overwritten_svn_branch(wc_url, svn_rev)
Deleted: trunk/dports/python/py26-hgsvn/files/patch-hgsvn-ui.py.diff
===================================================================
--- trunk/dports/python/py26-hgsvn/files/patch-hgsvn-ui.py.diff 2011-08-10 15:34:57 UTC (rev 82216)
+++ trunk/dports/python/py26-hgsvn/files/patch-hgsvn-ui.py.diff 2011-08-10 15:39:43 UTC (rev 82217)
@@ -1,16 +0,0 @@
-diff -r 02f257a83bbe hgsvn/ui.py
---- hgsvn/ui.py Mon Nov 15 10:10:07 2010 +0100
-+++ hgsvn/ui.py Mon Nov 15 11:07:21 2010 +0100
-@@ -7,7 +7,11 @@
-
- try:
- # First try to import the Mercurial implementation.
-- from mercurial.util import termwidth
-+ import mercurial.ui
-+ if getattr(mercurial.ui.ui(), 'termwidth', False):
-+ termwidth = mercurial.ui.ui().termwidth
-+ else:
-+ from mercurial.util import termwidth
- except ImportError:
- # Fallback to local copy of Mercurial's implementation.
- def termwidth():
Deleted: trunk/dports/python/py27-hgsvn/Portfile
===================================================================
--- trunk/dports/python/py27-hgsvn/Portfile 2011-08-10 15:34:57 UTC (rev 82216)
+++ trunk/dports/python/py27-hgsvn/Portfile 2011-08-10 15:39:43 UTC (rev 82217)
@@ -1,38 +0,0 @@
-# $Id$
-
-PortSystem 1.0
-PortGroup python27 1.0
-
-name py27-hgsvn
-version 0.1.8
-revision 1
-categories python devel
-platforms darwin
-maintainers snc openmaintainer
-homepage http://pypi.python.org/pypi/hgsvn
-description hgsvn is a set of scripts for Subversion and Mercurial
-long_description This set of scripts allows to work locally on \
- Subversion-managed projects using the Mercurial \
- distributed version control system.
-
-master_sites http://pypi.python.org/packages/source/h/hgsvn
-distname hgsvn-${version}
-checksums rmd160 af056571b2d25110b61cffbf5512cb35967a7c1f \
- sha256 90ddb565cc058c69617efc2ee0f02e5847104b6481ef56fb849a5410835c47a1
-
-depends_lib-append port:py27-distribute \
- port:mercurial \
- port:subversion
-
-patchfiles patch-hgsvn-ui.py.diff
-
-post-extract { file copy ${filespath}/ez_setup.py ${worksrcpath} }
-
-post-destroot {
- xinstall -m 644 -W ${worksrcpath} AUTHORS.txt COPYING.txt README.txt TODO.txt \
- ${destroot}${prefix}/share/doc/${name}
-}
-
-livecheck.type regex
-livecheck.url ${homepage}
-livecheck.regex hgsvn (\\d+\\.\\d+\\.\\d+)
Deleted: trunk/dports/python/py27-hgsvn/files/ez_setup.py
===================================================================
--- trunk/dports/python/py27-hgsvn/files/ez_setup.py 2011-08-10 15:34:57 UTC (rev 82216)
+++ trunk/dports/python/py27-hgsvn/files/ez_setup.py 2011-08-10 15:39:43 UTC (rev 82217)
@@ -1,284 +0,0 @@
-#!python
-"""Bootstrap setuptools installation
-
-If you want to use setuptools in your package's setup.py, just include this
-file in the same directory with it, and add this to the top of your setup.py::
-
- from ez_setup import use_setuptools
- use_setuptools()
-
-If you want to require a specific version of setuptools, set a download
-mirror, or use an alternate download directory, you can do so by supplying
-the appropriate options to ``use_setuptools()``.
-
-This file can also be run as a script to install or upgrade setuptools.
-"""
-import sys
-DEFAULT_VERSION = "0.6c11"
-DEFAULT_URL = "http://pypi.python.org/packages/%s/s/setuptools/" % sys.version[:3]
-
-md5_data = {
- 'setuptools-0.6b1-py2.3.egg': '8822caf901250d848b996b7f25c6e6ca',
- 'setuptools-0.6b1-py2.4.egg': 'b79a8a403e4502fbb85ee3f1941735cb',
- 'setuptools-0.6b2-py2.3.egg': '5657759d8a6d8fc44070a9d07272d99b',
- 'setuptools-0.6b2-py2.4.egg': '4996a8d169d2be661fa32a6e52e4f82a',
- 'setuptools-0.6b3-py2.3.egg': 'bb31c0fc7399a63579975cad9f5a0618',
- 'setuptools-0.6b3-py2.4.egg': '38a8c6b3d6ecd22247f179f7da669fac',
- 'setuptools-0.6b4-py2.3.egg': '62045a24ed4e1ebc77fe039aa4e6f7e5',
- 'setuptools-0.6b4-py2.4.egg': '4cb2a185d228dacffb2d17f103b3b1c4',
- 'setuptools-0.6c1-py2.3.egg': 'b3f2b5539d65cb7f74ad79127f1a908c',
- 'setuptools-0.6c1-py2.4.egg': 'b45adeda0667d2d2ffe14009364f2a4b',
- 'setuptools-0.6c10-py2.3.egg': 'ce1e2ab5d3a0256456d9fc13800a7090',
- 'setuptools-0.6c10-py2.4.egg': '57d6d9d6e9b80772c59a53a8433a5dd4',
- 'setuptools-0.6c10-py2.5.egg': 'de46ac8b1c97c895572e5e8596aeb8c7',
- 'setuptools-0.6c10-py2.6.egg': '58ea40aef06da02ce641495523a0b7f5',
- 'setuptools-0.6c11-py2.3.egg': '2baeac6e13d414a9d28e7ba5b5a596de',
- 'setuptools-0.6c11-py2.4.egg': 'bd639f9b0eac4c42497034dec2ec0c2b',
- 'setuptools-0.6c11-py2.5.egg': '64c94f3bf7a72a13ec83e0b24f2749b2',
- 'setuptools-0.6c11-py2.6.egg': 'bfa92100bd772d5a213eedd356d64086',
- 'setuptools-0.6c2-py2.3.egg': 'f0064bf6aa2b7d0f3ba0b43f20817c27',
- 'setuptools-0.6c2-py2.4.egg': '616192eec35f47e8ea16cd6a122b7277',
- 'setuptools-0.6c3-py2.3.egg': 'f181fa125dfe85a259c9cd6f1d7b78fa',
- 'setuptools-0.6c3-py2.4.egg': 'e0ed74682c998bfb73bf803a50e7b71e',
- 'setuptools-0.6c3-py2.5.egg': 'abef16fdd61955514841c7c6bd98965e',
- 'setuptools-0.6c4-py2.3.egg': 'b0b9131acab32022bfac7f44c5d7971f',
- 'setuptools-0.6c4-py2.4.egg': '2a1f9656d4fbf3c97bf946c0a124e6e2',
- 'setuptools-0.6c4-py2.5.egg': '8f5a052e32cdb9c72bcf4b5526f28afc',
- 'setuptools-0.6c5-py2.3.egg': 'ee9fd80965da04f2f3e6b3576e9d8167',
- 'setuptools-0.6c5-py2.4.egg': 'afe2adf1c01701ee841761f5bcd8aa64',
- 'setuptools-0.6c5-py2.5.egg': 'a8d3f61494ccaa8714dfed37bccd3d5d',
- 'setuptools-0.6c6-py2.3.egg': '35686b78116a668847237b69d549ec20',
- 'setuptools-0.6c6-py2.4.egg': '3c56af57be3225019260a644430065ab',
- 'setuptools-0.6c6-py2.5.egg': 'b2f8a7520709a5b34f80946de5f02f53',
- 'setuptools-0.6c7-py2.3.egg': '209fdf9adc3a615e5115b725658e13e2',
- 'setuptools-0.6c7-py2.4.egg': '5a8f954807d46a0fb67cf1f26c55a82e',
- 'setuptools-0.6c7-py2.5.egg': '45d2ad28f9750e7434111fde831e8372',
- 'setuptools-0.6c8-py2.3.egg': '50759d29b349db8cfd807ba8303f1902',
- 'setuptools-0.6c8-py2.4.egg': 'cba38d74f7d483c06e9daa6070cce6de',
- 'setuptools-0.6c8-py2.5.egg': '1721747ee329dc150590a58b3e1ac95b',
- 'setuptools-0.6c9-py2.3.egg': 'a83c4020414807b496e4cfbe08507c03',
- 'setuptools-0.6c9-py2.4.egg': '260a2be2e5388d66bdaee06abec6342a',
- 'setuptools-0.6c9-py2.5.egg': 'fe67c3e5a17b12c0e7c541b7ea43a8e6',
- 'setuptools-0.6c9-py2.6.egg': 'ca37b1ff16fa2ede6e19383e7b59245a',
-}
-
-import sys, os
-try: from hashlib import md5
-except ImportError: from md5 import md5
-
-def _validate_md5(egg_name, data):
- if egg_name in md5_data:
- digest = md5(data).hexdigest()
- if digest != md5_data[egg_name]:
- print >>sys.stderr, (
- "md5 validation of %s failed! (Possible download problem?)"
- % egg_name
- )
- sys.exit(2)
- return data
-
-def use_setuptools(
- version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir,
- download_delay=15
-):
- """Automatically find/download setuptools and make it available on sys.path
-
- `version` should be a valid setuptools version number that is available
- as an egg for download under the `download_base` URL (which should end with
- a '/'). `to_dir` is the directory where setuptools will be downloaded, if
- it is not already available. If `download_delay` is specified, it should
- be the number of seconds that will be paused before initiating a download,
- should one be required. If an older version of setuptools is installed,
- this routine will print a message to ``sys.stderr`` and raise SystemExit in
- an attempt to abort the calling script.
- """
- was_imported = 'pkg_resources' in sys.modules or 'setuptools' in sys.modules
- def do_download():
- egg = download_setuptools(version, download_base, to_dir, download_delay)
- sys.path.insert(0, egg)
- import setuptools; setuptools.bootstrap_install_from = egg
- try:
- import pkg_resources
- except ImportError:
- return do_download()
- try:
- pkg_resources.require("setuptools>="+version); return
- except pkg_resources.VersionConflict, e:
- if was_imported:
- print >>sys.stderr, (
- "The required version of setuptools (>=%s) is not available, and\n"
- "can't be installed while this script is running. Please install\n"
- " a more recent version first, using 'easy_install -U setuptools'."
- "\n\n(Currently using %r)"
- ) % (version, e.args[0])
- sys.exit(2)
- else:
- del pkg_resources, sys.modules['pkg_resources'] # reload ok
- return do_download()
- except pkg_resources.DistributionNotFound:
- return do_download()
-
-def download_setuptools(
- version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir,
- delay = 15
-):
- """Download setuptools from a specified location and return its filename
-
- `version` should be a valid setuptools version number that is available
- as an egg for download under the `download_base` URL (which should end
- with a '/'). `to_dir` is the directory where the egg will be downloaded.
- `delay` is the number of seconds to pause before an actual download attempt.
- """
- import urllib2, shutil
- egg_name = "setuptools-%s-py%s.egg" % (version,sys.version[:3])
- url = download_base + egg_name
- saveto = os.path.join(to_dir, egg_name)
- src = dst = None
- if not os.path.exists(saveto): # Avoid repeated downloads
- try:
- from distutils import log
- if delay:
- log.warn("""
----------------------------------------------------------------------------
-This script requires setuptools version %s to run (even to display
-help). I will attempt to download it for you (from
-%s), but
-you may need to enable firewall access for this script first.
-I will start the download in %d seconds.
-
-(Note: if this machine does not have network access, please obtain the file
-
- %s
-
-and place it in this directory before rerunning this script.)
----------------------------------------------------------------------------""",
- version, download_base, delay, url
- ); from time import sleep; sleep(delay)
- log.warn("Downloading %s", url)
- src = urllib2.urlopen(url)
- # Read/write all in one block, so we don't create a corrupt file
- # if the download is interrupted.
- data = _validate_md5(egg_name, src.read())
- dst = open(saveto,"wb"); dst.write(data)
- finally:
- if src: src.close()
- if dst: dst.close()
- return os.path.realpath(saveto)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-def main(argv, version=DEFAULT_VERSION):
- """Install or upgrade setuptools and EasyInstall"""
- try:
- import setuptools
- except ImportError:
- egg = None
- try:
- egg = download_setuptools(version, delay=0)
- sys.path.insert(0,egg)
- from setuptools.command.easy_install import main
- return main(list(argv)+[egg]) # we're done here
- finally:
- if egg and os.path.exists(egg):
- os.unlink(egg)
- else:
- if setuptools.__version__ == '0.0.1':
- print >>sys.stderr, (
- "You have an obsolete version of setuptools installed. Please\n"
- "remove it from your system entirely before rerunning this script."
- )
- sys.exit(2)
-
- req = "setuptools>="+version
- import pkg_resources
- try:
- pkg_resources.require(req)
- except pkg_resources.VersionConflict:
- try:
- from setuptools.command.easy_install import main
- except ImportError:
- from easy_install import main
- main(list(argv)+[download_setuptools(delay=0)])
- sys.exit(0) # try to force an exit
- else:
- if argv:
- from setuptools.command.easy_install import main
- main(argv)
- else:
- print "Setuptools version",version,"or greater has been installed."
- print '(Run "ez_setup.py -U setuptools" to reinstall or upgrade.)'
-
-def update_md5(filenames):
- """Update our built-in md5 registry"""
-
- import re
-
- for name in filenames:
- base = os.path.basename(name)
- f = open(name,'rb')
- md5_data[base] = md5(f.read()).hexdigest()
- f.close()
-
- data = [" %r: %r,\n" % it for it in md5_data.items()]
- data.sort()
- repl = "".join(data)
-
- import inspect
- srcfile = inspect.getsourcefile(sys.modules[__name__])
- f = open(srcfile, 'rb'); src = f.read(); f.close()
-
- match = re.search("\nmd5_data = {\n([^}]+)}", src)
- if not match:
- print >>sys.stderr, "Internal error!"
- sys.exit(2)
-
- src = src[:match.start(1)] + repl + src[match.end(1):]
- f = open(srcfile,'w')
- f.write(src)
- f.close()
-
-
-if __name__=='__main__':
- if len(sys.argv)>2 and sys.argv[1]=='--md5update':
- update_md5(sys.argv[2:])
- else:
- main(sys.argv[1:])
-
-
-
-
-
-
Deleted: trunk/dports/python/py27-hgsvn/files/patch-hgsvn-ui.py.diff
===================================================================
--- trunk/dports/python/py27-hgsvn/files/patch-hgsvn-ui.py.diff 2011-08-10 15:34:57 UTC (rev 82216)
+++ trunk/dports/python/py27-hgsvn/files/patch-hgsvn-ui.py.diff 2011-08-10 15:39:43 UTC (rev 82217)
@@ -1,16 +0,0 @@
-diff -r 02f257a83bbe hgsvn/ui.py
---- hgsvn/ui.py Mon Nov 15 10:10:07 2010 +0100
-+++ hgsvn/ui.py Mon Nov 15 11:07:21 2010 +0100
-@@ -7,7 +7,11 @@
-
- try:
- # First try to import the Mercurial implementation.
-- from mercurial.util import termwidth
-+ import mercurial.ui
-+ if getattr(mercurial.ui.ui(), 'termwidth', False):
-+ termwidth = mercurial.ui.ui().termwidth
-+ else:
-+ from mercurial.util import termwidth
- except ImportError:
- # Fallback to local copy of Mercurial's implementation.
- def termwidth():
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110810/de7031c9/attachment-0001.html>
More information about the macports-changes
mailing list