zodbtools: Move it into separate component from neoppod

component/zodbtools/buildout.cfg

+# SlapOS component for zodbtools.
+# https://lab.nexedi.com/nexedi/zodbtools
+
+[buildout]
+extends =
+    ../ZEO/buildout.cfg
+
+parts =
+    zodbtools/scripts
+
+
+[zodbtools]
+recipe  = zc.recipe.egg:eggs
+egg     = zodbtools
+eggs    =
+    ${:egg}
+
+# dependent eggs that must come through in-tree recipes
+depends =
+# ZEO comes through zodbtools -> zodburi -> ZEO
+    ${ZEO:egg}
+
+[zodbtools/scripts]
+recipe  = zc.recipe.egg:scripts
+eggs    = ${zodbtools:eggs}
+
+
+[versions]
+zodbtools = 0.0.0.dev4
+
+# Required by:
+# zodbtools==0.0.0dev4
+zodburi = 2.3.0

software/neoppod/software-common.cfg

@@ -19,6 +19,7 @@ extends =
     ../../component/python-cryptography/buildout.cfg
     ../../component/pycurl/buildout.cfg
     ../../component/ZEO/buildout.cfg
+    ../../component/zodbtools/buildout.cfg
 
 parts =
 # keep neoppod first so that ZODB is built correctly,
@@ -50,11 +51,10 @@ eggs = neoppod[admin, ctl, master]
   psutil
   ZODB
   zope.testing
-  zodbtools
+  ${zodbtools:egg}
   coverage
   setproctitle
 adapter-egg = ${python-mysqlclient:egg}
-depends = ${ZEO:egg}
 
 # XXX: buildout fails to install properly eggs with setup_requires
 [BTrees]
@@ -149,14 +149,9 @@ setproctitle = 1.1.10
 slapos.recipe.template = 4.4
 transaction = 1.7.0
 zodbpickle = 2.0.0
-zodbtools = 0.0.0.dev4
 cython-zstd = 0.2
 python-dateutil = 2.7.3
 
-# Required by:
-# zodbtools==0.0.0dev4
-zodburi = 2.3.0
-
 # Required by:
 # mock = 3.0.5
 funcsigs = 1.0.2