From 1ed328d1d80e90c3e98d02a911be2879b319dbc7 Mon Sep 17 00:00:00 2001
From: Julien Muchembled <jm@nexedi.com>
Date: Mon, 4 May 2020 04:27:07 +0200
Subject: [PATCH] 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                | 1 -
 component/gateone/buildout.cfg               | 2 +-
 component/r-language/software.cfg            | 3 +--
 component/unstable/boinc-client/buildout.cfg | 1 -
 component/unstable/boinc/buildout.cfg        | 1 -
 software/lamp-template/software.cfg          | 1 -
 software/turnserver/software.cfg             | 3 +--
 stack/lamp/buildout.cfg                      | 4 +---
 8 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/component/condor/buildout.cfg b/component/condor/buildout.cfg
index 30240713d..9c2819db0 100644
--- a/component/condor/buildout.cfg
+++ b/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
diff --git a/component/gateone/buildout.cfg b/component/gateone/buildout.cfg
index c2f2a0ef4..71c650798 100644
--- a/component/gateone/buildout.cfg
+++ b/component/gateone/buildout.cfg
@@ -1,6 +1,6 @@
 [buildout]
 extends =
-  ../../stack/slapos.cfg
+  ../lxml-python/buildout.cfg
   ../python-kerberos/buildout.cfg
   ../git/buildout.cfg
 
diff --git a/component/r-language/software.cfg b/component/r-language/software.cfg
index 744c55557..c821ae30a 100644
--- a/component/r-language/software.cfg
+++ b/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
diff --git a/component/unstable/boinc-client/buildout.cfg b/component/unstable/boinc-client/buildout.cfg
index 89ec5921c..0f7444681 100644
--- a/component/unstable/boinc-client/buildout.cfg
+++ b/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
diff --git a/component/unstable/boinc/buildout.cfg b/component/unstable/boinc/buildout.cfg
index 4cbbea991..ec1a85f0e 100644
--- a/component/unstable/boinc/buildout.cfg
+++ b/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]
diff --git a/software/lamp-template/software.cfg b/software/lamp-template/software.cfg
index b1917fc47..87e0df2cc 100644
--- a/software/lamp-template/software.cfg
+++ b/software/lamp-template/software.cfg
@@ -2,7 +2,6 @@
 
 extends =
   ../../stack/lamp/buildout.cfg
-  ../../stack/slapos.cfg
 
 [application]
 recipe = slapos.recipe.build:download-unpacked
diff --git a/software/turnserver/software.cfg b/software/turnserver/software.cfg
index 4be6f44e4..b1bebb40e 100644
--- a/software/turnserver/software.cfg
+++ b/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
diff --git a/stack/lamp/buildout.cfg b/stack/lamp/buildout.cfg
index 5170fe5a9..ea798bb58 100644
--- a/stack/lamp/buildout.cfg
+++ b/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
-- 
2.30.9