- Version string is now N.N.N.devN to follow http://legacy.python.org/dev/peps/pep-0440/ .

- Support on the fly patches in zc.recipe.egg by ``EGGNAME-patches``,
  ``EGGNAME-patch-options``, ``EGGNAME-patch-binary`` (or
  ``patch-binary``) and ``EGGNAME-patch-revision`` options.
- Support on the fly patches in zc.recipe.egg:custom by ``patches``,
  ``patch-options``, ``patch-binary`` and ``patch-revision`` options.
  (options ``EGGNAME-*`` are also supported as well).

zc.recipe.egg_/CHANGES.SlapOS.txt

+1.3.2.post2
+-----------
+
+- Version string is now N.N.N.devN to follow http://legacy.python.org/dev/peps/pep-0440/ .
+- Support on the fly patches in zc.recipe.egg by ``EGGNAME-patches``,
+  ``EGGNAME-patch-options``, ``EGGNAME-patch-binary`` (or
+  ``patch-binary``) and ``EGGNAME-patch-revision`` options.
+- Support on the fly patches in zc.recipe.egg:custom by ``patches``,
+  ``patch-options``, ``patch-binary`` and ``patch-revision`` options.
+  (options ``EGGNAME-*`` are also supported as well).
+
+1.3.2nxd001
+-----------
+
+- Add setup-eggs option in zc.recipe.egg:custom.

zc.recipe.egg_/setup.py

@@ -14,7 +14,7 @@
 """Setup for zc.recipe.egg package
 """
 
-version = '1.3.2nxd001'
+version = '1.3.2.post2'
 
 import os
 from setuptools import setup, find_packages

zc.recipe.egg_/src/zc/recipe/egg/custom.py

@@ -37,6 +37,28 @@ class Base:
     def update(self):
         return self.install()
 
+    def _get_patch_dict(self, options, distribution):
+        patch_dict = {}
+        global_patch_binary = options.get('patch-binary', 'patch')
+        def get_option(egg, key, default):
+            return options.get('%s-%s' % (egg, key),
+                               options.get(key, default))
+        egg = re.sub('[<>=].*', '', distribution)
+        patches = filter(lambda x:x,
+                         map(lambda x:x.strip(),
+                             get_option(egg, 'patches', '').splitlines()))
+        if not patches:
+            return patch_dict
+        patch_options = get_option(egg, 'patch-options', '-p0').split()
+        patch_binary = get_option(egg, 'patch-binary', global_patch_binary)
+        patch_revision = int(get_option(egg, 'patch-revision', len(patches)))
+        patch_dict[egg] = {
+          'patches':patches,
+          'patch_options':patch_options,
+          'patch_binary':patch_binary,
+          'patch_revision':patch_revision,
+        }
+        return patch_dict
 
 class Custom(Base):
 
@@ -107,11 +129,11 @@ class Custom(Base):
 
         self._set_environment()
         try:
+            patch_dict = self._get_patch_dict(options, distribution)
             return zc.buildout.easy_install.build(
                 distribution, options['_d'], self.build_ext,
                 self.links, self.index, options['executable'], [options['_e']],
-                newest=self.newest,
-                )
+                newest=self.newest, patch_dict=patch_dict)
         finally:
             self._restore_environment()
 

zc.recipe.egg_/src/zc/recipe/egg/egg.py

@@ -61,6 +61,33 @@ class Eggs(object):
         python = options.setdefault('python', b_options['python'])
         options['executable'] = buildout[python]['executable']
 
+    def _get_patch_dict(self, options, distribution_list):
+        patch_dict = {}
+        global_patch_binary = options.get('patch-binary', 'patch')
+        def get_option(egg, key, default):
+            if len(distribution_list) == 1:
+                return options.get('%s-%s' % (egg, key),
+                                   options.get(key, default))
+            else:
+                return options.get('%s-%s' % (egg, key), default)
+        for distribution in distribution_list:
+            egg = re.sub('[<>=].*', '', distribution)
+            patches = filter(lambda x:x,
+                             map(lambda x:x.strip(),
+                                 get_option(egg, 'patches', '').splitlines()))
+            if not patches:
+                continue
+            patch_options = get_option(egg, 'patch-options', '-p0').split()
+            patch_binary = get_option(egg, 'patch-binary', global_patch_binary)
+            patch_revision = int(get_option(egg, 'patch-revision', len(patches)))
+            patch_dict[egg] = {
+              'patches':patches,
+              'patch_options':patch_options,
+              'patch_binary':patch_binary,
+              'patch_revision':patch_revision,
+            }
+        return patch_dict
+
     def working_set(self, extra=()):
         """Separate method to just get the working set
 
@@ -88,6 +115,7 @@ class Eggs(object):
             kw = {}
             if 'unzip' in options:
                 kw['always_unzip'] = options.query_bool('unzip', None)
+            patch_dict = self._get_patch_dict(options, distributions)
             ws = zc.buildout.easy_install.install(
                 distributions, options['eggs-directory'],
                 links=self.links,
@@ -98,6 +126,7 @@ class Eggs(object):
                 include_site_packages=self.include_site_packages,
                 allowed_eggs_from_site_packages=self.allowed_eggs,
                 allow_hosts=self.allow_hosts,
+                patch_dict=patch_dict,
                 **kw)
 
         return orig_distributions, ws