.

component/ZEO/buildout.cfg

@@ -11,9 +11,11 @@ extends =
 #
 #   [ZEO]
 #   egg = ${ZEO<version>:egg}
+#
+# By default ZEO4 is used
 [ZEO]
 recipe  = zc.recipe.egg
-# egg   = ${ZEOx:egg}
+egg     = ${ZEO4:egg}
 scripts = runzeo
 
 

software/neoppod/software-common.cfg

@@ -15,7 +15,6 @@ extends =
     ../../component/lxml-python/buildout.cfg
 #END LXML
     ../../component/msgpack-python/buildout.cfg
-    ../../component/patch/buildout.cfg
     ../../component/python-mysqlclient/buildout.cfg
     ../../component/python-cryptography/buildout.cfg
     ../../component/pycurl/buildout.cfg
@@ -55,10 +54,6 @@ eggs = neoppod[admin, ctl, master]
   coverage
   setproctitle
 adapter-egg = ${python-mysqlclient:egg}
-patch-binary = ${patch:location}/bin/patch
-ZEO-patch-options = -p1
-ZEO-patches =
-  ${:_profile_base_location_}/../../component/egg-patch/ZEO4/TCP_NODELAY.patch#b07288522d5c6857738240d948321df6
 
 # XXX: buildout fails to install properly eggs with setup_requires
 [BTrees]
@@ -156,11 +151,6 @@ zodbpickle = 1.0.4
 cython-zstd = 0.2
 python-dateutil = 2.7.3
 
-# Required by:
-# zodburi==2.0
-# ZEO 5 requires transaction >= 2
-ZEO = 4.3.1+SlapOSPatched001
-
 # Required by:
 # ZEO==4.3.1
 zdaemon = 4.2.0

software/neoppod/software-zodb5.cfg

@@ -3,7 +3,9 @@ extends = software.cfg
 
 [neoppod]
 eggs += mock
-ZEO-patches =
+
+[ZEO]
+egg = ${ZEO5:egg}
 
 [versions]
 ZODB = 5.6.0