Apache is not a stack

software/apache/software.cfg

 [buildout]
+versions = versions
+
 extends =
-  ../../stack/apache.cfg
+  ../../component/binutils/buildout.cfg
+  ../../component/gcc/buildout.cfg
+  ../../component/lxml-python/buildout.cfg
+  ../../component/apache/buildout.cfg
+  ../../component/stunnel/buildout.cfg
+  ../../component/varnish/buildout.cfg
+  ../../component/dcron/buildout.cfg
+  ../../component/logrotate/buildout.cfg
+  ../../component/rdiff-backup/buildout.cfg
+  ../../stack/slapos.cfg
 
 parts =
   template
@@ -20,11 +31,6 @@ parts =
   eggs
   instance-recipe-egg
 
-# XXX: Workaround of SlapOS limitation
-# Unzippig of eggs is required, as SlapOS do not yet provide nicely working
-# development / fast switching environment for whole software
-unzip = true
-
 [instance-recipe]
 # Note: In case if specific instantiation recipe is used this is the place to
 # put its name
@@ -33,9 +39,13 @@ module = apache
 
 [instance-recipe-egg]
 recipe = zc.recipe.egg
-python = python2.7
 eggs = ${instance-recipe:egg}
 
+[eggs]
+recipe = zc.recipe.egg
+eggs =
+  ${lxml-python:egg}
+
 [template]
 # Default template for apache instance.
 recipe = slapos.recipe.template
@@ -44,6 +54,10 @@ md5sum = 17180caef7d1c477fbb037d28b705e8b
 output = ${buildout:directory}/template.cfg
 mode = 0644
 
+[versions]
+# Use SlapOS patched zc.buildout
+zc.buildout = 1.5.3-dev-SlapOS-010
+
 [networkcache]
 # Cedric de Saint Martin signature certificate
 signature-certificate-list =

stack/apache.cfg

-[buildout]
-extensions =
-  slapos.zcbworkarounds
-
-find-links =
-    http://www.nexedi.org/static/packages/source/slapos.buildout/
-    http://dist.repoze.org
-    http://www.nexedi.org/static/packages/source/
-
-extends =
-  ../component/binutils/buildout.cfg
-  ../component/gcc/buildout.cfg
-  ../component/lxml-python/buildout.cfg
-  ../component/apache/buildout.cfg
-  ../component/stunnel/buildout.cfg
-  ../component/varnish/buildout.cfg
-  ../component/dcron/buildout.cfg
-  ../component/logrotate/buildout.cfg
-  ../component/python-2.7/buildout.cfg
-  shacache-client.cfg
-  ../component/rdiff-backup/buildout.cfg
-
-versions = versions
-
-parts =
-  binutils
-  gcc-java-minimal
-  apache
-  apache-antiloris
-
-  stunnel
-  varnish-2.1
-
-  dcron
-  logrotate
-  rdiff-backup
-
-# Buildoutish
-  eggs
-  instance-recipe-egg
-
-[lxml-python]
-python = python2.7
-
-[instance-recipe-egg]
-recipe = zc.recipe.egg
-python = python2.7
-eggs =
-  ${instance-recipe:egg}
-
-[eggs]
-recipe = zc.recipe.egg
-python = python2.7
-eggs =
-  ${lxml-python:egg}
-
-[rebootstrap]
-# Default first version of rebootstrapped python
-version = 2
-section = python2.7
-
-[versions]
-# Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
-rdiff-backup = 1.0.5