version up : zc.buildout-1.7.1.post6 and zc.recipe.egg-1.3.2.post2.

and drop using minitage.recipe.egg that has too many side-effects.

stack/erp5/buildout.cfg

@@ -97,7 +97,6 @@ parts =
   wget
 
 # Buildoutish
-  patched-eggs
   eggs
   testrunner
   test_suite_runner
@@ -385,22 +384,6 @@ initialization =
   repository_id_list = list(reversed('''${erp5_repository_list:repository_id_list}'''.split()))
   sys.path[0:0] = ['/'.join(['''${buildout:parts-directory}''', x]) for x in repository_id_list]
 
-[patched-eggs]
-recipe = minitage.recipe.egg
-eggs =
-  Acquisition
-  Products.DCWorkflow
-  ZODB3
-Acquisition-patches = ${:_profile_base_location_}/../../component/egg-patch/Acquisition/aq_dynamic.patch
-Acquisition-patch-options = -p1
-Acquisition-patch-binary = ${patch:location}/bin/patch
-Products.DCWorkflow-patches = ${:_profile_base_location_}/../../component/egg-patch/Products.DCWorkflow/workflow_method.patch
-Products.DCWorkflow-patch-options = -p1
-Products.DCWorkflow-patch-binary = ${patch:location}/bin/patch
-ZODB3-patches = ${:_profile_base_location_}/../../component/egg-patch/ZODB3-3.10.5.patch
-ZODB3-patch-options = -p1
-ZODB3-patch-binary = ${patch:location}/bin/patch
-
 [eggs]
 recipe = zc.recipe.egg
 eggs =
@@ -507,6 +490,15 @@ scripts =
 extra-paths =
   ${erp5:location}
 
+# patches for eggs
+patch-binary = ${patch:location}/bin/patch
+Acquisition-patches = ${:_profile_base_location_}/../../component/egg-patch/Acquisition/aq_dynamic.patch
+Acquisition-patch-options = -p1
+Products.DCWorkflow-patches = ${:_profile_base_location_}/../../component/egg-patch/Products.DCWorkflow/workflow_method.patch
+Products.DCWorkflow-patch-options = -p1
+ZODB3-patches = ${:_profile_base_location_}/../../component/egg-patch/ZODB3-3.10.5.patch
+ZODB3-patch-options = -p1
+
 [zodbanalyze]
 recipe = zc.recipe.egg
 eggs =
@@ -542,9 +534,9 @@ scripts =
 
 [versions]
 # patched eggs
-Acquisition = 2.13.8-ZMinitagePatched-AqDynamic
-Products.DCWorkflow = 2.2.4-ZMinitagePatched-WorkflowMethod
-ZODB3 = 3.10.5-ZMinitagePatched-ZODB33105
+Acquisition = 2.13.8+SlapOSPatched001
+Products.DCWorkflow = 2.2.4+SlapOSPatched001
+ZODB3 = 3.10.5+SlapOSPatched001
 
 # specify dev version to be sure that an old released version is not used
 cloudooo = 1.2.5-dev
@@ -622,8 +614,6 @@ interval = 1.0.0
 ipdb = 0.8
 ipython = 2.3.1
 logilab-common = 0.63.2
-minitage.paste = 1.4.6
-minitage.recipe.egg = 1.107
 numpy = 1.9.1
 plone.recipe.command = 1.1
 ply = 3.4
@@ -675,27 +665,6 @@ feedparser = 5.1.3
 # SOAPpy==0.12.0nxd001
 fpconst = 0.7.2
 
-# Required by:
-# minitage.recipe.egg==1.107
-iniparse = 0.4
-
-# Required by:
-# minitage.core==2.0.57
-minitage = 2.0.67
-
-# Required by:
-# minitage.recipe.common==1.90
-# minitage.recipe.egg==1.107
-minitage.core = 2.0.57
-
-# Required by:
-# minitage.recipe.egg==1.107
-minitage.recipe.common = 1.90
-
-# Required by:
-# minitage.recipe.egg==1.107
-ordereddict = 1.1
-
 # Required by:
 # slapos.toolbox==0.45.2
 paramiko = 1.15.2

stack/slapos.cfg

@@ -102,9 +102,9 @@ eggs =
 
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.7.1-dev-SlapOS-005
+zc.buildout = 1.7.1.post6
 # Use SlapOS patched zc.recipe.egg (zc.recipe.egg 2.x is for Buildout 2)
-zc.recipe.egg = 1.3.2nxd001
+zc.recipe.egg = 1.3.2.post2
 # Use own version of h.r.download to be able to open .xz and .lz archives
 hexagonit.recipe.download = 1.7nxd003