start moving cloudoo out of ERP5 SR

stack/erp5/buildout.cfg

@@ -54,39 +54,75 @@ extends =
   ../../component/userhosts/buildout.cfg
   ../../software/neoppod/software-common.cfg
 
+cloudooo_parts = 
+  
+  libreoffice-bin
+
+
+; assuming that cloudooo can handle all conversions
+cloudooo_more_parts = 
+  poppler
+  libpng
+  imagemagick
+  inkscape
+  ghostscript
+  w3m
+# basic Xorg
+  libXdmcp
+  libXext
+  libXau
+  libSM
+  libXrender
+
+# fonts
+  liberation-fonts
+  ipaex-fonts
+  ipa-fonts
+  ocrb-fonts
+  android-fonts
+
+# Cloudooo specific part
+  cloudooo-develop
+  cloudooo
+
+
+test_parts = 
+  jsl
+  w3-validator
+  
+  aspell
+  aspell-en-dictionary
+  
+obsolete_parts =
+  stunnel
+  hookbox
+  tesseract
+  zabbix-agent
+  
+  
 parts +=
-  erp5-util-develop
-  slapos-cookbook-develop
+  erp5-util-develop # no
+  slapos-cookbook-develop # no
   slapos-cookbook
   rdiff-backup
-  aspell
-  aspell-en-dictionary
+
   apache
   apache-antiloris
   file
   findutils
   graphviz
   haproxy
-  jsl
-  stunnel
-  w3m
-  poppler
-  libpng
-  ghostscript
+  
   mroonga-mariadb
-  imagemagick
-  inkscape
+
   libdmtx
   dmtx-utils
   kumo
-  libreoffice-bin
-  w3-validator
-  tesseract
-  hookbox
+  
   perl-DBD-mariadb
   perl-DBI
   percona-toolkit
-  zabbix-agent
+  
   dash
   wget
   userhosts
@@ -96,24 +132,6 @@ parts +=
   testrunner
   test_suite_runner
 
-# basic Xorg
-  libXdmcp
-  libXext
-  libXau
-  libSM
-  libXrender
-
-# fonts
-  liberation-fonts
-  ipaex-fonts
-  ipa-fonts
-  ocrb-fonts
-  android-fonts
-
-# Cloudooo specific part
-  cloudooo-develop
-  cloudooo
-
 # get git repositories
   erp5
   genbt5list
@@ -129,12 +147,6 @@ parts +=
 <= download-base-neo
 url = ${:_profile_base_location_}/${:filename}
 
-[check-recipe]
-recipe = plone.recipe.command
-stop-on-error = true
-update-command = ${:command}
-command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link
-
 [mariadb-resiliency-after-import-script]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/template/instance-mariadb-resiliency-after-import-script.sh.in
@@ -165,7 +177,7 @@ md5sum = 7d9760fe65f454700342eeffec14c884
 [template-cloudooo]
 <= download-base
 filename = instance-cloudoo.cfg.in
-md5sum = 8468648aa91712f0349baa1ad0c8ccdf
+md5sum = 050fa6ff4eb397c5d4cb41a9f75afb3f
 
 [template-zope-conf]
 <= download-base
@@ -202,7 +214,7 @@ recipe = slapos.recipe.template:jinja2
 # XXX: "template.cfg" is hardcoded in instanciation recipe
 rendered = ${buildout:directory}/template.cfg
 template = ${:_profile_base_location_}/instance.cfg.in
-md5sum = f0c8b6491f97fdb0568b0db883dcda0b
+md5sum = 6a2c99f8df8bb8fe8e2b7fa96f68f62b
 mode = 640
 context =
     key mariadb_link_binary template-mariadb:link-binary
@@ -211,7 +223,6 @@ context =
     key aspell_location aspell:location
     key bin_directory buildout:bin-directory
     key buildout_bin_directory buildout:bin-directory
-    key cairo_location cairo:location
     key coreutils_location coreutils:location
     key cups_location cups:location
     key curl_location curl:location
@@ -251,7 +262,6 @@ context =
     key mariadb_resiliency_after_import_script mariadb-resiliency-after-import-script:target
     key mesa_location mesa:location
     key openssl_location openssl:location
-    key pixman_location pixman:location
     key root_common root-common:target
     key sixtunnel_location 6tunnel:location
     key slapos_core_version versions:slapos.core
@@ -547,7 +557,7 @@ setup = ${erp5:location}
 
 [cloudooo-repository]
 branch =
-revision = f1545ad0e6db238d22fd8c84a149b004ab6b8f03
+revision = 3241978a6ec832f6aa71d1df1a62e22a8feae2f1
 
 [slapos-toolbox]
 recipe = zc.recipe.egg
@@ -566,7 +576,6 @@ scripts =
 # patched eggs
 Acquisition = 2.13.8+SlapOSPatched001
 Products.DCWorkflow = 2.2.4+SlapOSPatched001
-pysvn = 1.7.10+SlapOSPatched002
 
 # specify dev version to be sure that an old released version is not used
 cloudooo = 1.2.5-dev
@@ -580,6 +589,10 @@ zope.dottedname = 4.1.0
 # test_UserManagerInterfaces in testERP5Security fails with 1.10.0.
 Products.PluggableAuthService = 1.9.0
 
+# official pysvn egg does not supports --include-dirs and
+# --library-dirs, so we use our modified version
+pysvn = 1.7.4nxd006
+
 # we are still using this old stable version.
 rdiff-backup = 1.0.5
 
@@ -587,20 +600,7 @@ rdiff-backup = 1.0.5
 slapos.cookbook =
 
 # modified version that works fine for buildout installation
-SOAPpy = 0.12.0nxd001
-
-# CMF 2.3 is not yet supported.
-Products.CMFCalendar = 2.2.3
-Products.CMFCore = 2.2.8
-Products.CMFDefault = 2.2.4
-Products.CMFTopic = 2.2.1
-Products.CMFUid = 2.2.1
-
-# newer version requires zope.traversing>=4.0.0a2.
-zope.app.appsetup = 3.16.0
-
-# newer version requires zope.i18n>=4.0.0a3
-zope.app.publication = 3.14.0
+SOAPpy = 0.12.0nxd0cation = 3.14.0
 
 # newer version requires zope.testbrowser>=4
 zope.app.testing = 3.8.1
@@ -611,17 +611,17 @@ Pillow = 2.9.0
 Products.CMFActionIcons = 2.1.3
 Products.DCWorkflowGraph = 0.4.1
 Products.ExternalEditor = 1.1.0
-Products.GenericSetup = 1.7.7
+Products.GenericSetup = 1.7.5
 Products.LongRequestLogger = 1.1.0
 Products.MimetypesRegistry = 2.0.8
 Products.PluginRegistry = 1.3
 Products.TIDStorage = 5.4.9
-PyPDF2 = 1.25.1
+PyPDF2 = 1.24
 PyXML = 0.8.5
-Pympler = 0.4.2
+Pympler = 0.4.1
 StructuredText = 2.11.1
 WSGIUtils = 0.7
-apache-libcloud = 0.18.0
+apache-libcloud = 0.17.0
 astroid = 1.3.6
 chardet = 2.3.0
 collective.recipe.template = 1.11
@@ -640,25 +640,24 @@ huBarcode = 1.0.0
 interval = 1.0.0
 ipdb = 0.8.1
 ipython = 3.2.0
-logilab-common = 1.0.2
-neoppod = 1.4.0
+logilab-common = 1.0.1
 numpy = 1.9.2
 plone.recipe.command = 1.1
 ply = 3.6
-polib = 1.0.7
+polib = 1.0.6
 pprofile = 1.7.3
-pycountry = 1.14
+pycountry = 1.12
 pycrypto = 2.6.1
 pyflakes = 0.9.2
 pylint = 1.4.4
-python-ldap = 2.4.20
+python-ldap = 2.4.19
 python-magic = 0.4.6
-python-memcached = 1.57
+python-memcached = 1.54
 qrcode = 5.1
 restkit = 4.2.2
 rtjp-eventlet = 0.3.2
 slapos.recipe.template = 2.8
-slapos.toolbox = 0.50
+slapos.toolbox = 0.48
 smmap = 0.9.0
 socketpool = 0.5.3
 spyne = 2.11.0
@@ -668,11 +667,10 @@ timerserver = 2.0.2
 urlnorm = 1.1.2
 uuid = 1.30
 validictory = 1.0.0
-xfw = 0.10
 xupdate-processor = 0.4
 
 # Required by:
-# slapos.toolbox==0.50
+# slapos.toolbox==0.48
 GitPython = 1.0.1
 
 # Required by:
@@ -680,7 +678,7 @@ GitPython = 1.0.1
 Products.ZSQLMethods = 2.13.4
 
 # Required by:
-# slapos.toolbox==0.50
+# slapos.toolbox==0.48
 atomize = 0.2.0
 
 # Required by:
@@ -688,23 +686,23 @@ atomize = 0.2.0
 backports.ssl-match-hostname = 3.4.0.2
 
 # Required by:
-# slapos.toolbox==0.50
-feedparser = 5.2.1
+# slapos.toolbox==0.48
+feedparser = 5.2.0.post1
 
 # Required by:
 # SOAPpy===0.12.0nxd001
 fpconst = 0.7.2
 
 # Required by:
-# slapos.toolbox==0.50
+# slapos.toolbox==0.48
 lockfile = 0.10.2
 
 # Required by:
-# slapos.toolbox==0.50
+# slapos.toolbox==0.48
 paramiko = 1.15.2
 
 # Required by:
-# slapos.toolbox==0.50
+# slapos.toolbox==0.48
 rpdb = 0.1.5
 
 # Required by: