.

component/ZODB/buildout-dev.cfg

+# SlapOS component for ZODB development.
 
+[buildout]
+extends = buildout.cfg
 
 # unpin ZODB<X> from particular revisions; only branch is left.
 [ZODB3-repository]

component/ZODB/buildout-zodb3.cfg

-## SlapOS component for ZODB3.
-## https://zodb.org/
-#
-#[buildout]
-#extends = buildout.cfg
-#
-## XXX drop "4"
-#[ZODB4]
-#egg  = ZODB3
-#
-#[ZODB-repository]
-##branch  = 3.10-nxd
-#branch  = 3.10-nxd--t
-##revision= ...	XXX pin
-#
-#[versions]
-#transaction = 1.1.1
-#zdaemon = 2.0.7

component/ZODB/buildout-zodb5.cfg

-## SlapOS component for ZODB5.
-## https://zodb.org/
-#
-#[buildout]
-#extends = buildout.cfg
-#
-#
-#[ZODB-repository]
-#branch = master
-##revision = ...  XXX pin
-#
-#[versions]
-#transaction = 2.4.0

component/ZODB/buildout.cfg

@@ -104,6 +104,7 @@ branch  = master
 #revision= ...	XXX pin
 
 
+# eggs versions that are used by all all ZODB<X>.
 [versions]
 # TODO update to 4.7.3 once it is released
 Btrees = 4.5.1

component/ZODB/test-common.cfg

@@ -3,9 +3,9 @@
 
 [buildout]
 extends =
-# test*.cfg first extend from buildout<ZODB-flavour>.cfg to use
-# appropriate ZODB version.
+# test<X>.cfg configures ZODB.major to be <X>.
 
+    buildout-dev.cfg
     ../pygolang/buildout.cfg
     ../python-manuel/buildout.cfg
     ../../stack/nxdtest.cfg
@@ -20,10 +20,6 @@ parts =
     instance.cfg
 
 
-# # unpin ZODB from particular revision; only ${ZODB:branch} is left.
-# [ZODB-repository]
-# revision=
-
 # test-dependent eggs that must come through in-tree recipes.
 [ZODB]
 depends += ${manuel:egg}
@@ -61,7 +57,3 @@ template = inline:
   [runTestSuite]
   env.sh  = ${ZODB-env.sh:rendered}
   workdir = ${buildout:directory}
-
-
-[versions]
-# XXX

component/ZODB/test-zodb3.cfg

 # SlapOS software release to test ZODB3 on Nexedi testing infrastructure.
 
 [buildout]
-extends =
-    buildout-zodb3.cfg
-    test-common.cfg
+extends = test-common.cfg
+
+[ZODB]
+major = 3

component/ZODB/test-zodb5.cfg

 # SlapOS software release to test ZODB5 on Nexedi testing infrastructure.
 
 [buildout]
-extends =
-    buildout-zodb5.cfg
-    test-common.cfg
+extends = test-common.cfg
+
+[ZODB]
+major = 5

component/ZODB/test.cfg

 # SlapOS software release to test ZODB on Nexedi testing infrastructure.
 
 [buildout]
-extends =
-    buildout.cfg
-    test-common.cfg
+extends = test-common.cfg
+
+[ZODB]
+major = 4