[Midnightbsd-cvs] mports [16172] trunk/devel/py-setuptools/files: add missing patchset
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Apr 12 14:05:48 EDT 2014
Revision: 16172
http://svnweb.midnightbsd.org/mports/?rev=16172
Author: laffer1
Date: 2014-04-12 14:05:47 -0400 (Sat, 12 Apr 2014)
Log Message:
-----------
add missing patchset
Added Paths:
-----------
trunk/devel/py-setuptools/files/easy-install.pth.dist
trunk/devel/py-setuptools/files/patch-pkg_resources
trunk/devel/py-setuptools/files/patch-setuptools_command_install_egg_info.py
trunk/devel/py-setuptools/files/patch-setuptools_command_install_lib.py
trunk/devel/py-setuptools/files/patch-setuptools_command_sdist
trunk/devel/py-setuptools/files/pkg-message.in
Added: trunk/devel/py-setuptools/files/easy-install.pth.dist
===================================================================
--- trunk/devel/py-setuptools/files/easy-install.pth.dist (rev 0)
+++ trunk/devel/py-setuptools/files/easy-install.pth.dist 2014-04-12 18:05:47 UTC (rev 16172)
@@ -0,0 +1,2 @@
+import sys; sys.__plen = len(sys.path)
+import sys; new=sys.path[sys.__plen:]; del sys.path[sys.__plen:]; p=getattr(sys,'__egginsert',0); sys.path[p:p]=new; sys.__egginsert = p+len(new)
Added: trunk/devel/py-setuptools/files/patch-pkg_resources
===================================================================
--- trunk/devel/py-setuptools/files/patch-pkg_resources (rev 0)
+++ trunk/devel/py-setuptools/files/patch-pkg_resources 2014-04-12 18:05:47 UTC (rev 16172)
@@ -0,0 +1,72 @@
+diff -r 353a42700744 -r 5b1b03dc68ce pkg_resources.py
+--- pkg_resources.py Sun Dec 15 22:38:35 2013 -0500
++++ pkg_resources.py Fri Dec 20 22:09:39 2013 +0100
+@@ -1214,6 +1214,32 @@
+ return cls.interpret(parser.expr(text).totuple(1)[1])
+
+ @classmethod
++ def _markerlib_evaluate(cls, text):
++ """
++ Evaluate a PEP 426 environment marker using markerlib.
++ Return a boolean indicating the marker result in this environment.
++ Raise SyntaxError if marker is invalid.
++ """
++ import _markerlib
++ # markerlib implements Metadata 1.2 (PEP 345) environment markers.
++ # Translate the variables to Metadata 2.0 (PEP 426).
++ env = _markerlib.default_environment()
++ for key in env.keys():
++ new_key = key.replace('.', '_')
++ env[new_key] = env.pop(key)
++ try:
++ result = _markerlib.interpret(text, env)
++ except NameError:
++ e = sys.exc_info()[1]
++ raise SyntaxError(e.args[0])
++ return result
++
++ if 'parser' not in globals():
++ # Fall back to less-complete _markerlib implementation if 'parser' module
++ # is not available.
++ evaluate_marker = _markerlib_evaluate
++
++ @classmethod
+ def interpret(cls, nodelist):
+ while len(nodelist)==2: nodelist = nodelist[1]
+ try:
+@@ -1242,34 +1268,8 @@
+ return s[1:-1]
+ raise SyntaxError("Language feature not supported in environment markers")
+
+-def _markerlib_evaluate(text):
+- """
+- Evaluate a PEP 426 environment marker using markerlib.
+- Return a boolean indicating the marker result in this environment.
+- Raise SyntaxError if marker is invalid.
+- """
+- import _markerlib
+- # markerlib implements Metadata 1.2 (PEP 345) environment markers.
+- # Translate the variables to Metadata 2.0 (PEP 426).
+- env = _markerlib.default_environment()
+- for key in env.keys():
+- new_key = key.replace('.', '_')
+- env[new_key] = env.pop(key)
+- try:
+- result = _markerlib.interpret(text, env)
+- except NameError:
+- e = sys.exc_info()[1]
+- raise SyntaxError(e.args[0])
+- return result
+-
+ invalid_marker = MarkerEvaluation.is_invalid_marker
+-
+-if 'parser' in globals():
+- evaluate_marker = MarkerEvaluation.evaluate_marker
+-else:
+- # fallback to less-complete _markerlib implementation if 'parser' module
+- # is not available.
+- evaluate_marker = _markerlib_evaluate
++evaluate_marker = MarkerEvaluation.evaluate_marker
+
+ class NullProvider:
+ """Try to implement resources and metadata for arbitrary PEP 302 loaders"""
Added: trunk/devel/py-setuptools/files/patch-setuptools_command_install_egg_info.py
===================================================================
--- trunk/devel/py-setuptools/files/patch-setuptools_command_install_egg_info.py (rev 0)
+++ trunk/devel/py-setuptools/files/patch-setuptools_command_install_egg_info.py 2014-04-12 18:05:47 UTC (rev 16172)
@@ -0,0 +1,11 @@
+--- setuptools/command/install_egg_info.py.orig 2013-11-27 22:45:15.000000000 +0100
++++ setuptools/command/install_egg_info.py 2013-11-27 22:45:23.000000000 +0100
+@@ -23,7 +23,7 @@
+ ).egg_name()+'.egg-info'
+ self.source = ei_cmd.egg_info
+ self.target = os.path.join(self.install_dir, basename)
+- self.outputs = [self.target]
++ self.outputs = []
+
+ def run(self):
+ self.run_command('egg_info')
Added: trunk/devel/py-setuptools/files/patch-setuptools_command_install_lib.py
===================================================================
--- trunk/devel/py-setuptools/files/patch-setuptools_command_install_lib.py (rev 0)
+++ trunk/devel/py-setuptools/files/patch-setuptools_command_install_lib.py 2014-04-12 18:05:47 UTC (rev 16172)
@@ -0,0 +1,21 @@
+--- setuptools/command/install_lib.py.orig 2013-12-16 22:09:54.602395279 -0200
++++ setuptools/command/install_lib.py 2013-12-16 22:10:50.052393299 -0200
+@@ -4,18 +4,6 @@
+ class install_lib(_install_lib):
+ """Don't add compiled flags to filenames of non-Python files"""
+
+- def _bytecode_filenames (self, py_filenames):
+- bytecode_files = []
+- for py_file in py_filenames:
+- if not py_file.endswith('.py'):
+- continue
+- if self.compile:
+- bytecode_files.append(py_file + "c")
+- if self.optimize > 0:
+- bytecode_files.append(py_file + "o")
+-
+- return bytecode_files
+-
+ def run(self):
+ self.build()
+ outfiles = self.install()
Added: trunk/devel/py-setuptools/files/patch-setuptools_command_sdist
===================================================================
--- trunk/devel/py-setuptools/files/patch-setuptools_command_sdist (rev 0)
+++ trunk/devel/py-setuptools/files/patch-setuptools_command_sdist 2014-04-12 18:05:47 UTC (rev 16172)
@@ -0,0 +1,15 @@
+--- setuptools/command/sdist.py.orig 2013-12-24 08:01:18.439265244 +0000
++++ setuptools/command/sdist.py 2013-12-24 08:01:37.794263110 +0000
+@@ -35,10 +35,10 @@
+ f.close()
+ for match in self.pattern.finditer(data):
+ path = match.group(1)
+- if postproc:
++ if self.postproc:
+ #postproc used to be used when the svn finder
+ #was an re_finder for calling unescape
+- path = postproc(path)
++ path = self.postproc(path)
+ yield svn_utils.joinpath(dirname,path)
+ def __call__(self, dirname=''):
+ path = svn_utils.joinpath(dirname, self.path)
Added: trunk/devel/py-setuptools/files/pkg-message.in
===================================================================
--- trunk/devel/py-setuptools/files/pkg-message.in (rev 0)
+++ trunk/devel/py-setuptools/files/pkg-message.in 2014-04-12 18:05:47 UTC (rev 16172)
@@ -0,0 +1,7 @@
+*********************************************************************
+
+ The script %%PREFIX%%/bin/easy_install was already installed
+ on your system, so the only script %%PREFIX%%/bin/easy_install-%%PYVER%%
+ has been added.
+
+*********************************************************************
More information about the Midnightbsd-cvs
mailing list