.

component/ZODB/buildout.cfg

@@ -4,6 +4,7 @@
 [buildout]
 extends =
     ../git/buildout.cfg
+    ../python-cffi/buildout.cfg
 
 parts = ZODB/scripts
 
@@ -58,6 +59,7 @@ git-executable = ${git:location}/bin/git
 recipe  = zc.recipe.egg:develop
 setup   = ${ZODB4-repository:location}
 egg     = ZODB
+depends = ${persistent:egg} ${BTrees:egg}
 
 egg_versions =
   transaction = 1.7.0
@@ -93,6 +95,7 @@ branch  = 3.10-nxd--t
 recipe  = zc.recipe.egg:develop
 setup   = ${ZODB5-repository:location}
 egg     = ZODB
+depends = ${persistent:egg} ${BTrees:egg}
 
 egg_versions =
   transaction = 2.4.0
@@ -103,6 +106,18 @@ location = ${buildout:parts-directory}/ZODB5
 branch  = master
 #revision= ...	XXX pin
 
+# XXX: buildout fails to install properly eggs with setup_requires
+[BTrees]
+recipe = zc.recipe.egg:custom
+egg = ${:_buildout_section_name_}
+setup-eggs = ${persistent:egg}
+
+[persistent]
+recipe = zc.recipe.egg:custom
+egg = ${:_buildout_section_name_}
+setup-eggs = ${python-cffi:egg}
+###
+
 
 # eggs versions that are used by all all ZODB<X>.
 [versions]

software/neoppod/software-common.cfg

@@ -56,19 +56,6 @@ eggs = neoppod[admin, ctl, master]
   setproctitle
 adapter-egg = ${python-mysqlclient:egg}
 
-# XXX -> component/ZODB
-# XXX: buildout fails to install properly eggs with setup_requires
-[BTrees]
-recipe = zc.recipe.egg:custom
-egg = ${:_buildout_section_name_}
-setup-eggs = ${persistent:egg}
-
-[persistent]
-recipe = zc.recipe.egg:custom
-egg = ${:_buildout_section_name_}
-setup-eggs = ${python-cffi:egg}
-###
-
 [download-base-neo]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:filename}

software/neotest/software.cfg

@@ -105,8 +105,8 @@ template = inline:
 recipe  = zc.recipe.egg
 eggs    =
 # wendelin.core still requires ZODB3 but having ZODB4 or 5 installed satisfies latest ZODB3
-# XXX -> ${ZODB:egg} ?
-    ZODB3
+#   ZODB3
+    ${ZODB:egg}
 # also for wc
     ${numpy:egg}
 # to install not only wendelin.core modules but also scripts