Clean-up extends

The only change should be the upgrade of rdiff-backup
(from 1.0.5+SlapOSPatched001 to 1.3.4nxd6-SlapOSPatched001)
for some SR that extend the resilient stack.

component/condor/buildout.cfg

@@ -11,7 +11,6 @@ extends =
   ../openldap/buildout.cfg
   ../dash/buildout.cfg
   ../zlib/buildout.cfg
-  ../../stack/slapos.cfg
 
 [condor]
 recipe = slapos.recipe.build

component/gateone/buildout.cfg

 [buildout]
 extends =
-  ../../stack/slapos.cfg
+  ../lxml-python/buildout.cfg
   ../python-kerberos/buildout.cfg
   ../git/buildout.cfg
 

component/r-language/software.cfg

@@ -3,8 +3,7 @@
 [buildout]
 extends = 
   ../../stack/slapos.cfg
-  ../../component/gcc/buildout.cfg
-  ../../component/r-language/buildout.cfg
+  buildout.cfg
 
 parts =
   eggs

component/unstable/boinc-client/buildout.cfg

@@ -14,7 +14,6 @@ extends =
   ../pkgconfig/buildout.cfg
   ../openldap/buildout.cfg
   ../gnutls/buildout.cfg
-  ../../stack/slapos.cfg
 
 [download-boinc]
 recipe = slapos.recipe.build:download

component/unstable/boinc/buildout.cfg

@@ -16,7 +16,6 @@ extends =
   ../gnutls/buildout.cfg
   ../mariadb/buildout.cfg
   ../curl/buildout.cfg
-  ../../stack/slapos.cfg
 
 #checkout boinc package from svn repository
 [boinc-package]

software/lamp-template/software.cfg

@@ -2,7 +2,6 @@
 
 extends =
   ../../stack/lamp/buildout.cfg
-  ../../stack/slapos.cfg
 
 [application]
 recipe = slapos.recipe.build:download-unpacked

software/turnserver/software.cfg

@@ -6,11 +6,10 @@ extends =
 #  ../../component/6tunnel/buildout.cfg
   ../../component/socat/buildout.cfg
   ../../stack/monitor/buildout.cfg
-  ../../stack/slapos.cfg
   buildout.hash.cfg
 
 
-parts +=
+parts =
   slapos-cookbook
   coturn
   instance-cfg

stack/lamp/buildout.cfg

@@ -32,13 +32,11 @@ extends =
   ../../component/sqlite3/buildout.cfg
   ../../component/stunnel/buildout.cfg
   ../../component/zlib/buildout.cfg
+  ../erp5/buildout.cfg
   ../logrotate/buildout.cfg
   ../resilient/buildout.cfg
-  ../erp5/buildout.cfg
   ../../component/apache-php/buildout.cfg
 
-  ../slapos.cfg
-
 
 [template-download-base]
 recipe = hexagonit.recipe.download