.

component/ZODB/buildout-zodb3.cfg

@@ -4,9 +4,13 @@
 [buildout]
 extends = buildout.cfg
 
+# XXX drop "4"
+[ZODB4]
+egg  = ZODB3
 
 [ZODB-repository]
-branch  = 3.10-nxd
+#branch  = 3.10-nxd
+branch  = 3.10-nxd--t
 #revision= ...	XXX pin
 
 [versions]

component/ZODB/buildout.cfg

@@ -29,6 +29,7 @@ eggs    = ${ZODB:egg}
 
 # ZODB4: we maintain our own 4-nxd branch with patches for wendelin.core to work
 # correctly. The patches are backports of what is in ZODB master (ZODB5) ... XXX
+# XXX drop 4
 [ZODB4]
 recipe  = zc.recipe.egg:develop
 setup   = ${ZODB-repository:location}

component/ZODB/test-common.cfg

@@ -32,7 +32,7 @@ depends += ${manuel:egg}
 # bin/python is preinstalled with sys.path to ZODB & friends.
 [ZODB-python]
 <= python-interpreter
-eggs += ZODB[test]
+eggs += ${ZODB:egg}[test]
 
 # env.sh for ZODB's python to be on $PATH.
 [ZODB-env.sh]
@@ -64,3 +64,4 @@ template = inline:
 
 
 [versions]
+# XXX