backupserver,re6stnet: fix missing eggs

This fixes a regression in commit a7a36453
("Clean up some zc.recipe.egg sections installing the same scripts/interpreter").

software/backupserver/buildout.hash.cfg

@@ -42,7 +42,7 @@ md5sum = 432d22bb0f67df5203bbc5d1134a952b
 
 [template-update-rss-script]
 filename = template-update-rss.sh.in
-md5sum = 80b3746568bc8e308a1f337bdaa2441c
+md5sum = ae4a0043414336a521b524d9c95f1c68
 
 [template-pullrdiffbackup]
 filename = instance-pullrdiffbackup.cfg.in

software/backupserver/software.cfg

@@ -16,7 +16,6 @@ extends =
   ../../stack/monitor/buildout.cfg
 
 parts =
-  extra-eggs
   rdiff-backup
   dcron
   logrotate
@@ -29,12 +28,12 @@ parts =
   template-crontab-line
   slapos-cookbook
 
-[extra-eggs]
+[rssgen-eggs]
 recipe = zc.recipe.egg
-interpreter = pythonforrssgen
+interpreter = python-${:_buildout_section_name_}
 eggs =
   PyRSS2Gen
-  python_dateutil
+  python-dateutil
 
 ##########################################################
 # Service startup scripts and configuration files

software/backupserver/template-update-rss.sh.in

@@ -4,7 +4,7 @@ STATUS_DIR=$${directory:status}
 RSS_DIR=$${directory:www}
 
 TAIL=${coreutils-output:tail}
-PYTHON=${buildout:directory}/bin/${extra-eggs:interpreter}
+PYTHON=${buildout:bin-directory}/${rssgen-eggs:interpreter}
 STATUS2RSS=${status2rss:output}
 BASENAME=${coreutils-output:basename}
 

software/re6stnet/software.cfg

@@ -17,30 +17,13 @@ extends =
 
 parts +=
   slapos-cookbook
-  eggs
   dash
   template
 
-[eggs]
+[re6st-eggs]
 recipe = zc.recipe.egg
+interpreter = python-${:_buildout_section_name_}
 eggs =
-  ${lxml-python:egg}
-  ${pycurl:egg}
-  ${python-cryptography:egg}
-  slapos.toolbox
-scripts =
-  slapos-kill
-  monitor.bootstrap
-  monitor.collect
-  monitor.genstatus
-  monitor.configwrite
-  is-process-older-than-dependency-set
-
-[extra-eggs]
-recipe = zc.recipe.egg
-interpreter = pythonwitheggs
-eggs =
-  ${lxml-python:egg}
   ${python-cffi:egg}
   ${python-cryptography:egg}
   pyOpenSSL
@@ -70,7 +53,7 @@ context =
     key template_wrapper template-wrapper:target
     key template_registry_run template-registry-run:target
     key monitor2_template_rendered monitor2-template:rendered
-    raw python_with_eggs ${buildout:directory}/bin/${extra-eggs:interpreter}
+    raw python_with_eggs ${buildout:bin-directory}/${re6st-eggs:interpreter}
 
 [template-re6stnet]
 < = download-base