.

component/ZEO/buildout.cfg

@@ -14,24 +14,30 @@ parts = ZEO/scripts
 recipe  = slapos.recipe.build
 depends = ${ZODB:egg}
 init =
-  # XXX ZODB3 -> just link to ZODB3
-  # link/depend to ZEO<ZODB.major>
   zodb = self.buildout['ZODB']
-  zeo_x = 'ZEO'+zodb['major']
-  options['depends'] += '$${%s:egg}' % zeo_x
-  zeo_x = self.buildout[zeo_x]
-  options['egg'] = zeo_x['egg']
-  #options['location'] = zeo_x['setup']		XXX needed? reenable?
-
-  # update [versions] from what is needed by ZEO<X>
-  for _ in zeo_x['egg_versions'].splitlines():
-    egg, eq, version = _.split() # 'transaction = 1.7.0'
-    assert eq == '='
-    self.buildout['versions'][egg] = version
-  # propagate updated [versions] -> easy_install
-  # (buildout does this in Buildout constructor)
-  import zc.buildout.easy_install
-  zc.buildout.easy_install.default_versions(self.buildout['versions'])
+  zmajor = zodb['major']
+
+  # ZODB3 -> just link ZEO to ZODB3 (ZEO3 is part of ZODB3)
+  if zmajor == '3':
+    options['egg'] = '$${ZODB:egg}'
+
+  # ZODB{4,5}: link/depend to ZEO<ZODB.major>
+  else:
+    zeo_x = 'ZEO'+zmajor
+    options['depends'] += '$${%s:egg}' % zeo_x
+    zeo_x = self.buildout[zeo_x]
+    options['egg'] = zeo_x['egg']
+    #options['location'] = zeo_x['setup']		XXX needed? reenable?
+
+    # update [versions] from what is needed by ZEO<X>
+    for _ in zeo_x['egg_versions'].splitlines():
+      egg, eq, version = _.split() # 'transaction = 1.7.0'
+      assert eq == '='
+      self.buildout['versions'][egg] = version
+    # propagate updated [versions] -> easy_install
+    # (buildout does this in Buildout constructor)
+    import zc.buildout.easy_install
+    zc.buildout.easy_install.default_versions(self.buildout['versions'])
 
 
 # ZEO/scripts installs scripts from ZEO