Move z2analyzer to erp5 software

software/erp5/software.cfg

@@ -8,11 +8,15 @@ versions = versions
 # Local development
 develop =
   ${:parts-directory}/slapos.cookbook-repository
+  ${:parts-directory}/z2loganalyser-repository
 parts +=
 # Local development
   slapos.cookbook-repository
   check-recipe
   slapos.cookbook-python2.6
+  z2loganalyser-repository
+  check-z2loganalyser
+  z2loganalyser-python2.6
 # Create instance template
   template
   validator
@@ -46,6 +50,28 @@ eggs = slapos.cookbook
 scripts =
 python = python2.6
 
+[z2loganalyser-repository]
+recipe = plone.recipe.command
+svn_param =--trust-server-cert --no-auth-cache --non-interactive --quiet -r 45666
+svn = ${subversion:location}/bin/svn
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+stop-on-error = true
+update-command = ${:command}
+command =
+  ${:svn} checkout ${:svn_param} https://svn.erp5.org/repos/public/erp5/trunk/utils/z2loganalyser/ ${:location} || exit 1
+
+[check-z2loganalyser]
+recipe = plone.recipe.command
+stop-on-error = true
+update-command = ${:command}
+command = grep parts ${buildout:develop-eggs-directory}/z2loganalyser.egg-link
+
+[z2loganalyser-python2.6]
+recipe = zc.recipe.egg
+eggs = z2loganalyser
+scripts =
+python = python2.6
+
 [template-mariadb]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-mariadb.cfg

software/sanef/software.cfg

 [buildout]
-develop =
-  ${:parts-directory}/z2loganalyser
 
 extends =
   ../../component/mysql-tritonn-5.0/buildout.cfg
@@ -13,8 +11,6 @@ parts +=
   mysql-tritonn-5.0
   products-upgrade
   bt5-repository
-  checkrecipe
-  checkz2loganalyser
   maatkit
 
 [eggs]
@@ -31,7 +27,6 @@ bef_dummy =
 # Note: Possibly everything from setup.py shall be done in same way.
 eggs +=
   slapos.core
-  z2loganalyser
 
 extra-paths +=
   ${products-erp5:location}
@@ -40,30 +35,10 @@ extra-paths +=
 url = ${:_profile_base_location_}/instance.cfg
 md5sum = e22bbf531d2b5f121462267cbd8d2ef8
 
-[eggcheck]
-recipe = plone.recipe.command
-stop-on-error = true
-update-command = ${:command}
-command = grep parts ${buildout:develop-eggs-directory}/${:egg}.egg-link
-
-[checkz2loganalyser]
-<= eggcheck
-egg = z2loganalyser
-
 [instance-recipe]
 egg = slapos.cookbook
 module = bef_erp5
 
-[z2loganalyser]
-recipe = plone.recipe.command
-svn_param =--trust-server-cert --no-auth-cache --non-interactive --quiet -r 45666
-svn = ${subversion:location}/bin/svn
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-stop-on-error = true
-update-command = ${:command}
-command =
-  ${:svn} checkout ${:svn_param} https://svn.erp5.org/repos/public/erp5/trunk/utils/z2loganalyser/ ${:location} || exit 1
-
 [sanef.repository]
 <= erp5
 branch = CR1094