Merge remote-tracking branch 'origin/master' into erp5-cluster

7ba8df74 · Kazuhiko Shiozaki · b146354c · e8548dd9 · 7ba8df74 · 7ba8df74
Commit 7ba8df74 authored Aug 14, 2014 by Kazuhiko Shiozaki
170 changed files
--- a/component/apache-php/buildout.cfg
+++ b/component/apache-php/buildout.cfg
@@ -21,9 +21,6 @@ extends =
 [apache-php]
 # Note: Shall react on each build of apache and reinstall itself
 recipe = slapos.recipe.cmmi
-depends =
-  ${mariadb:version}
-  ${libpng:so_version}
 url = http://fr2.php.net/distributions/php-5.4.12.tar.bz2
 md5sum = 5c7b614242ae12e9cacca21c8ab84818
 configure-options =
@@ -70,9 +67,6 @@ environment =
 [apache-php-postgres]
 # Note: Shall react on each build of apache and reinstall itself
 recipe = slapos.recipe.cmmi
-depends =
-   ${postgresql:url}
-   ${libpng:so_version}
 url = http://fr2.php.net/distributions/php-5.4.12.tar.bz2
 md5sum = 5c7b614242ae12e9cacca21c8ab84818
 configure-options =

--- a/component/apache/buildout.cfg
+++ b/component/apache/buildout.cfg
@@ -28,15 +28,9 @@ url = https://archive.apache.org/dist/apr/apr-util-${:version}.tar.bz2
 md5sum = 6f3417691c7a27090f36e7cf4d94b36e
 [apache]
-# apache-antiloris should be rebuilt when apache is rebuilt. to
-# achieve this, please modify 'revision' value below each time you
-# modify anything (but version) in [apache] target.
 # inspired on http://old.aclark.net/team/aclark/blog/a-lamp-buildout-for-wordpress-and-other-php-apps/
 recipe = slapos.recipe.cmmi
-depends =
-  ${gdbm:version}
 version = 2.4.10
-revision = 2
 url = https://archive.apache.org/dist/httpd/httpd-${:version}.tar.bz2
 md5sum = 44543dff14a4ebc1e9e2d86780507156
 configure-command = cp -ar ${apr:location}/apr-${apr:version} srclib/apr/; cp -ar ${apr-util:location}/apr-util-${apr-util:version} srclib/apr-util; ./configure
@@ -106,10 +100,6 @@ patch-options = -p0
 # http://www.apachelounge.com/viewtopic.php?p=20551
 patches =
  ${:_profile_base_location_}/mod_antiloris-apache-2.4.patch#4f074f035d3b37f3f3e71cd9616440f3
-depends =
-  ${apache:version}
-  ${apache:revision}
-  ${gdbm:version}
 configure-command = ${apache:location}/bin/apxs
 configure-options = -c mod_antiloris.c
 make-binary = ${:configure-command}
@@ -117,13 +107,9 @@ make-options = -i -a -n antiloris mod_antiloris.la
 make-targets =
 [apache-2.2]
-# apache-antiloris-apache-2.2 should be rebuilt when apache-2.2 is
-# rebuilt. to achieve this, please modify 'revision' value below each
-# time you modify anything (but version) in [apache] target.
 # inspired on http://old.aclark.net/team/aclark/blog/a-lamp-buildout-for-wordpress-and-other-php-apps/
 recipe = slapos.recipe.cmmi
 version = 2.2.27
-revision = 1
 url = https://archive.apache.org/dist/httpd/httpd-${:version}.tar.bz2
 md5sum = 8faef0decf3fa7e69b2568eb2105a3d8
 patch-options = -p1
@@ -186,9 +172,6 @@ environment =
 recipe = slapos.recipe.cmmi
 url = http://downloads.sourceforge.net/project/mod-antiloris/mod_antiloris-0.4.tar.bz2
 md5sum = 66862bf10e9be3a023e475604a28a0b4
-depends =
-  ${apache-2.2:version}
-  ${apache-2.2:revision}
 configure-command = ${apache-2.2:location}/bin/apxs
 configure-options = -c mod_antiloris.c
 make-binary = ${:configure-command}

--- a/component/aspell/buildout.cfg
+++ b/component/aspell/buildout.cfg
@@ -16,7 +16,6 @@ stop-on-error = yes
 [aspell]
 recipe = slapos.recipe.cmmi
-revision = 1
 url = http://ftp.gnu.org/gnu/aspell/aspell-0.60.6.1.tar.gz
 md5sum = e66a9c9af6a60dc46134fdacf6ce97d7
 environment =
@@ -29,6 +28,3 @@ recipe = slapos.recipe.cmmi
 url = ftp://ftp.gnu.org/gnu/aspell/dict/en/aspell6-en-7.1-0.tar.bz2
 md5sum = beba5e8f3afd3ed1644653bb685b2dfb
 configure-command = ./configure --vars ASPELL=${aspell:location}/bin/aspell PREZIP=${aspell:location}/bin/prezip-bin
-depends =
-  ${aspell:url}
-  ${aspell:revision}
--- a/component/curl/buildout.cfg
+++ b/component/curl/buildout.cfg
@@ -12,8 +12,8 @@ parts =
 [curl]
 recipe = slapos.recipe.cmmi
-url = http://curl.haxx.se/download/curl-7.37.0.tar.bz2
+url = http://curl.haxx.se/download/curl-7.37.1.tar.bz2
-md5sum = 7dda0cc2e4136f78d5801ac347be696b
+md5sum = 95c627abcf6494f5abe55effe7cd6a57
 configure-options =
  --disable-static
  --disable-ldap

--- a/component/ffmpeg/buildout.cfg
+++ b/component/ffmpeg/buildout.cfg
@@ -33,8 +33,6 @@ environment =
 recipe = slapos.recipe.cmmi
 url = http://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.bz2
 md5sum = 292ab65cedd5021d6b7ddd117e07cd8e
-depends =
-  ${libpng:so_version}
 patches =
  ${:_profile_base_location_}/libtheora-png_sizeof.patch#eaa1454081b50f05b59495a12f52b0d5

--- a/component/freetype/buildout.cfg
+++ b/component/freetype/buildout.cfg
@@ -16,8 +16,6 @@ recipe = slapos.recipe.cmmi
 url = http://download.savannah.gnu.org/releases/freetype/freetype-2.5.3.tar.bz2
 md5sum = d6b60f06bfc046e43ab2a6cbfd171d65
 pkg_config_depends = ${zlib:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig
-depends =
-  ${libpng:so_version}
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 configure-options =
  --disable-static

--- a/component/gcc/buildout.cfg
+++ b/component/gcc/buildout.cfg
@@ -55,18 +55,6 @@ environment =
  PATH=${m4:location}/bin:%(PATH)s
  LDFLAGS=-Wl,-rpath=${gmp-4:location}/lib -Wl,-rpath=${ppl:location}/lib
-[gcc-download]
-hack-revision = ${gcc-interconnection-workaround:hack-revision}
-recipe = hexagonit.recipe.download
-url = http://www.mirrorservice.org/sites/sourceware.org/pub/gcc/releases/gcc-4.5.3/gcc-4.5.3.tar.bz2
-md5sum = 8e0b5c12212e185f3e4383106bfa9cc6
-strip-top-level-dir = True
-destination = ${gcc-source:location}
-[gcc-source]
-hack-revision = ${gcc-interconnection-workaround:hack-revision}
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
 [gcc-multiarch.patch]
 recipe = hexagonit.recipe.download
 md5sum = 819e6735270c8a432b0512b49f40219f
@@ -75,12 +63,9 @@ filename = ${:_buildout_section_name_}
 download-only = true
 [gcc]
-hack-revision = ${gcc-interconnection-workaround:hack-revision}
-depends =
-  ${gcc-download:location}
 recipe = slapos.recipe.cmmi
-path = ${gcc-source:location}
+url = http://www.mirrorservice.org/sites/sourceware.org/pub/gcc/releases/gcc-4.5.3/gcc-4.5.3.tar.bz2
-md5sum = bb3265edf0fa7543e50cedb93e04e427
+md5sum = 8e0b5c12212e185f3e4383106bfa9cc6
 patches =
  ${gcc-multiarch.patch:location}/${gcc-multiarch.patch:filename}
 patch-options = -p2
@@ -120,10 +105,3 @@ environment =
  LDFLAGS=-Wl,-rpath=${mpfr:location}/lib -Wl,-rpath=${gmp-4:location}/lib -Wl,-rpath=${mpc:location}/lib
 # make install does not work when several core are used
 make-targets = install -j1
-[gcc-interconnection-workaround]
-# gcc parts are interconnected, so buildout is not capable to clean them up
-# until gcc will be simplified by using more robust build recipe (like
-# slapos.recipe.build) each time any of parts which reuses this one gets updated
-# the hack-revision have to be increased
-hack-revision = 2
--- a/component/ghostscript/buildout.cfg
+++ b/component/ghostscript/buildout.cfg
@@ -11,8 +11,6 @@ parts = ghostscript
 [ghostscript-common]
 recipe = slapos.recipe.cmmi
-depends =
-  ${libtiff:version}
 pkg_config_depends = ${libtiff:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${fontconfig:pkg_config_depends}
 configure-options =
  --disable-cups

--- a/component/git/buildout.cfg
+++ b/component/git/buildout.cfg
@@ -15,8 +15,8 @@ parts =
 [git]
 recipe = slapos.recipe.cmmi
-url = https://www.kernel.org/pub/software/scm/git/git-2.0.1.tar.xz
+url = https://www.kernel.org/pub/software/scm/git/git-2.0.4.tar.xz
-md5sum = 6d28a5d112379c20c7f7df9e0ffb070c
+md5sum = 0caa9c54bb04612062d21823163ecb13
 configure-options =
  --with-curl=${curl:location}
  --with-openssl=${openssl:location}

--- a/component/gnutls/buildout.cfg
+++ b/component/gnutls/buildout.cfg
@@ -28,8 +28,6 @@ environment =
 recipe = slapos.recipe.cmmi
 url = ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/gnutls-3.2.15.tar.xz
 md5sum = ec3b06f80e312137386c5d322183ca5a
-depends =
-  ${gmp:version}
 configure-options =
  --disable-static
  --disable-libdane

--- a/component/graphviz/buildout.cfg
+++ b/component/graphviz/buildout.cfg
@@ -19,8 +19,6 @@ extends =
 recipe = slapos.recipe.cmmi
 url = http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.36.0.tar.gz
 md5sum = 1f41664dba0c93109ac8b71216bf2b57
-depends =
-  ${libpng:so_version}
 pkg_config_depends = ${pango:location}/lib/pkgconfig:${pango:pkg_config_depends}
 configure-options =
  --with-included-ltdl

--- a/component/groonga/buildout.cfg
+++ b/component/groonga/buildout.cfg
@@ -31,8 +31,6 @@ version = 1.0.6
 url = http://packages.groonga.org/source/groonga-normalizer-mysql/groonga-normalizer-mysql-${:version}.tar.gz
 md5sum = 12740a835cfdf4b0dac66c3f2f152d84
 location = ${groonga:location}
-depends =
-  ${groonga:version}
 configure-options =
  --disable-static
 environment =

--- a/component/gtk-2/buildout.cfg
+++ b/component/gtk-2/buildout.cfg
@@ -26,8 +26,6 @@ parts =
 recipe = slapos.recipe.cmmi
 url = http://cairographics.org/releases/cairo-1.12.16.tar.xz
 md5sum = a1304edcdc99282f478b995ee5f8f854
-depends =
-  ${libpng:so_version}
 pkg_config_depends = ${libXext:location}/lib/pkgconfig:${libXext:pkg_config_depends}:${libpng:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${fontconfig:pkg_config_depends}:${pixman:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig
 patch-options = -p1
 patches =
@@ -69,8 +67,6 @@ environment =
 recipe = slapos.recipe.cmmi
 url = http://ftp.gnome.org/pub/gnome/sources/pango/1.36/pango-1.36.1.tar.xz
 md5sum = 9e0d3a1ea395172f8c39ba98a4d2081a
-depends =
-  ${libpng:so_version}
 pkg_config_depends = ${harfbuzz:location}/lib/pkgconfig:${harfbuzz:pkg_config_depends}
 configure-options =
  --disable-static
@@ -112,8 +108,6 @@ environment =
 recipe = slapos.recipe.cmmi
 url = http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-2.24.22.tar.xz
 md5sum = 5fbbfb7637bbd571a572a2dae0e736d2
-depends =
-  ${libpng:so_version}
 pkg_config_depends = ${pango:location}/lib/pkgconfig:${pango:pkg_config_depends}:${atk:location}/lib/pkgconfig:${gdk-pixbuf:location}/lib/pkgconfig
 configure-options =
  --disable-static

--- a/component/gtkmm/buildout.cfg
+++ b/component/gtkmm/buildout.cfg
@@ -18,8 +18,6 @@ parts =
 recipe = slapos.recipe.cmmi
 url = http://cairographics.org/releases/cairomm-1.11.2.tar.gz
 md5sum = 732a3ff5b57401eb5dfeef795a2a0c52
-depends =
-  ${libpng:so_version}
 pkg_config_depends = ${cairo:location}/lib/pkgconfig:${cairo:pkg_config_depends}:${libsigc:location}/lib/pkgconfig
 configure-options =
  --disable-static

--- a/component/imagemagick/buildout.cfg
+++ b/component/imagemagick/buildout.cfg
@@ -27,10 +27,6 @@ recipe = slapos.recipe.cmmi
 version = 6.8.9-1
 url = http://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${:version}.tar.xz
 md5sum = bde038ae05fb20d29cebf88ab9cbdce5
-depends =
-  ${libtiff:version}
-  ${libpng:so_version}
-  ${webp:so_version}
 pkg_config_depends = ${fontconfig:location}/lib/pkgconfig:${fontconfig:pkg_config_depends}:${xz-utils:location}/lib/pkgconfig
 configure-options =
  --disable-static

--- a/component/inkscape/buildout.cfg
+++ b/component/inkscape/buildout.cfg
@@ -36,8 +36,6 @@ environment =
 recipe = slapos.recipe.cmmi
 url = http://sourceforge.net/projects/inkscape/files/inkscape/0.48.4/inkscape-0.48.4.tar.bz2
 md5sum = 47bd8546e42ba396624eef9eb66b9b6c
-depends =
-  ${libpng:so_version}
 pkg_config_depends = ${gtkmm:location}/lib/pkgconfig:${gtkmm:pkg_config_depends}:${gsl:location}/lib/pkgconfig:${popt:location}/lib/pkgconfig:${garbage-collector:location}/lib/pkgconfig:${libxslt:location}/lib/pkgconfig
 patch-options = -p0
 patches =

--- a/component/intltool/buildout.cfg
+++ b/component/intltool/buildout.cfg
@@ -12,7 +12,6 @@ recipe = slapos.recipe.cmmi
 url = http://edge.launchpad.net/intltool/trunk/0.41.1/+download/intltool-0.41.1.tar.gz
 md5sum = d6c91bf06681919ccfdf3624035b75dc
 depends =
-  ${perl:version}
  ${perl-XML-Parser:location}
 environment =
  PATH=${perl:location}/bin:${gettext:location}/bin:${pkgconfig:location}/bin:%(PATH)s

--- a/component/lcms/buildout.cfg
+++ b/component/lcms/buildout.cfg
@@ -15,9 +15,6 @@ parts =
 recipe = slapos.recipe.cmmi
 url = http://downloads.sourceforge.net/project/lcms/lcms/2.6/lcms2-2.6.tar.gz
 md5sum = f4c08d38ceade4a664ebff7228910a33
-depends =
-  ${libpng:so_version}
-  ${libtiff:version}
 configure-options =
  --disable-static
 environment =

--- a/component/leptonica/buildout.cfg
+++ b/component/leptonica/buildout.cfg
@@ -13,9 +13,6 @@ extends =
 recipe = slapos.recipe.cmmi
 url = http://leptonica.googlecode.com/files/leptonica-1.68.tar.gz
 md5sum = 5cd7092f9ff2ca7e3f3e73bfcd556403
-depends =
-  ${libpng:so_version}
-  ${webp:so_version}
 configure-command =
  ./autogen.sh
  ./configure --prefix=${buildout:parts-directory}/${:_buildout_section_name_} --disable-static

--- a/component/libdmtx/buildout.cfg
+++ b/component/libdmtx/buildout.cfg
@@ -23,9 +23,6 @@ configure-options =
 recipe = slapos.recipe.cmmi
 url = http://prdownloads.sourceforge.net/libdmtx/dmtx-utils-0.7.4.tar.bz2
 md5sum = b132ab9fb1d289869469b8bb4959a08a
-depends =
-  ${libpng:so_version}
-  ${imagemagick:version}
 configure-options =
  --disable-static
 environment =

--- a/component/libpng/buildout.cfg
+++ b/component/libpng/buildout.cfg
@@ -28,6 +28,5 @@ md5sum = 23fb6a0e9f4dbaab7b34b6fd317a4f2d
 [libpng]
 <= libpng-common
-url = http://download.sourceforge.net/libpng/libpng-1.6.10.tar.xz
+url = http://download.sourceforge.net/libpng/libpng-1.6.12.tar.xz
-md5sum = 5f414b20f683b1d96b163c89e3eff768
+md5sum = ee752da8aa75076500e4cf31318e636e
-so_version = 16
--- a/component/librsvg/buildout.cfg
+++ b/component/librsvg/buildout.cfg
@@ -25,8 +25,6 @@ environment =
 recipe = slapos.recipe.cmmi
 url = http://ftp.gnome.org/pub/GNOME/sources/librsvg/2.40/librsvg-2.40.2.tar.xz
 md5sum = acdecdb9f08f3bf662a68bf7dafb8b82
-depends =
-  ${libpng:so_version}
 pkg_config_depends = ${pango:location}/lib/pkgconfig:${pango:pkg_config_depends}:${zlib:location}/lib/pkgconfig:${gdk-pixbuf:location}/lib/pkgconfig:${libcroco:location}/lib/pkgconfig
 configure-options =
  --disable-static

--- a/component/mariadb/buildout.cfg
+++ b/component/mariadb/buildout.cfg
@@ -18,14 +18,10 @@ parts =
  mariadb
 [mariadb]
-# mroonga-mariadb should be rebuilt when mariadb is rebuilt. to
-# achieve this, please modify 'revision' value below each time you
-# modify anything (but version) in [mariadb] target.
 recipe = slapos.recipe.cmmi
-version = 10.0.12
+version = 10.0.13
-revision = 2
 url = https://downloads.mariadb.org/f/mariadb-${:version}/source/mariadb-${:version}.tar.gz/from/http:/ftp.osuosl.org/pub/mariadb
-md5sum = 6e9a7c075526f8f2f83ad8e0933bab2f
+md5sum = 7b2e88864b51d7d0607dc37abb8a0adb
 # compile directory is required to build mysql plugins.
 keep-compile-dir = true
 patch-options = -p0
@@ -67,10 +63,6 @@ configure-options =
  --with-mysql-config=${mariadb:location}/bin/mysql_config
  --disable-static
  --disable-document
-depends =
-  ${mariadb:version}
-  ${mariadb:revision}
-  ${groonga-normalizer-mysql:version}
 environment =
  PATH=${groonga:location}/bin:${pkgconfig:location}/bin:%(PATH)s
  CPPFLAGS=-I${groonga:location}/include/groonga

--- a/component/mydumper/buildout.cfg
+++ b/component/mydumper/buildout.cfg
@@ -15,8 +15,6 @@ parts = mydumper
 # mydumper that works
 [mydumper]
 recipe = slapos.recipe.build
-depends =
-  ${mariadb:version}
 url = https://launchpad.net/mydumper/0.5/0.5.1/+download/mydumper-0.5.1.tar.gz
 md5sum = b4df42dfe23f308ab13eb6ecb73a0d21
 buildout-bin-dir = ${buildout:bin-directory}

--- a/component/mysql-python/buildout.cfg
+++ b/component/mysql-python/buildout.cfg
@@ -13,8 +13,6 @@ PATH =${mariadb:location}/bin:%(PATH)s
 [mysql-python]
 recipe = zc.recipe.egg:custom
 egg = MySQL-python
-depends =
-  ${mariadb:version}
 environment = mysql-python-env
 library-dirs =
  ${zlib:location}/lib/

--- a/component/nettle/buildout.cfg
+++ b/component/nettle/buildout.cfg
@@ -14,8 +14,6 @@ md5sum = 41dd0ce2a73487929bdc637b75dd62c9
 recipe = slapos.recipe.cmmi
 url = http://www.lysator.liu.se/~nisse/archive/nettle-2.7.1.tar.gz
 md5sum = 003d5147911317931dd453520eb234a5
-depends =
-  ${gmp:version}
 patches =
  ${nettle-lib-location.patch:location}/${nettle-lib-location.patch:filename}
 configure-option =

--- a/component/openssl/buildout.cfg
+++ b/component/openssl/buildout.cfg
@@ -18,8 +18,6 @@ parts =
 recipe = slapos.recipe.cmmi
 url = https://www.openssl.org/source/openssl-1.0.1i.tar.gz
 md5sum = c8dc151a671b9b92ff3e4c118b174972
-depends =
-  ${ca-certificates:version}
 patch-binary = ${patch:location}/bin/patch
 patches =
  ${:_profile_base_location_}/openssl-nodoc.patch#b4887a7b4e18402447bc6227d2493b92

--- a/component/percona-toolkit/buildout.cfg
+++ b/component/percona-toolkit/buildout.cfg
@@ -8,10 +8,8 @@ parts =
 [percona-toolkit]
 recipe = slapos.recipe.cmmi
-depends =
+version = 2.2.10
-  ${perl:version}
-version = 2.2.9
 url = http://www.percona.com/redir/downloads/percona-toolkit/${:version}/percona-toolkit-${:version}.tar.gz
-md5sum = f0a24d89e56bd01c6c8c5fdfdb5cad44
+md5sum = 9a5f464942c1aafe89a982c031e5e9fa
 configure-command =
  ${perl:location}/bin/perl Makefile.PL
--- a/component/perl-Class-Accessor/buildout.cfg
+++ b/component/perl-Class-Accessor/buildout.cfg
@@ -6,8 +6,6 @@ parts =
 [perl-Class-Accessor]
 recipe = slapos.recipe.cmmi
-depends =
-  ${perl:version}
 url = http://www.cpan.org/modules/by-module/Class/Class-Accessor-0.34.tar.gz
 md5sum = 0d9640d237a13276145f7e44b4855b89
 configure-command =

--- a/component/perl-Config-General/buildout.cfg
+++ b/component/perl-Config-General/buildout.cfg
@@ -6,8 +6,6 @@ parts =
 [perl-Config-General]
 recipe = slapos.recipe.cmmi
-depends =
-  ${perl:version}
 url = http://www.cpan.org/modules/by-module/Config/Config-General-2.56.tar.gz
 md5sum = 8cf9dd044d016f27b4dc26077606736d
 configure-command =

--- a/component/perl-DBD-MySQL/buildout.cfg
+++ b/component/perl-DBD-MySQL/buildout.cfg
@@ -9,8 +9,7 @@ parts =
 [perl-DBD-MySQL-common]
 recipe = slapos.recipe.cmmi
 depends =
-  ${perl:version}
+  ${perl-DBI:location}
-  ${perl-DBI:version}
 url = http://www.cpan.org/modules/by-module/DBD/DBD-mysql-4.027.tar.gz
 md5sum = 11fa6449715ba9d3fa5f4ee5ae688d6f
 patches =

--- a/component/perl-DBI/buildout.cfg
+++ b/component/perl-DBI/buildout.cfg
@@ -6,11 +6,6 @@ parts =
 [perl-DBI]
 recipe = slapos.recipe.cmmi
-version = 1.616
-# binary library should be rebuilt when perl is updated.
-depends =
-  ${perl:version}
-  ${perl:revision}
 url = http://www.cpan.org/modules/by-module/DBI/DBI-1.631.tar.gz
 md5sum = 444d3c305e86597e11092b517794a840
 configure-command =

--- a/component/perl-Data-Dump/buildout.cfg
+++ b/component/perl-Data-Dump/buildout.cfg
@@ -6,8 +6,6 @@ parts =
 [perl-Data-Dump]
 recipe = slapos.recipe.cmmi
-depends =
-  ${perl:version}
 url = http://www.cpan.org/modules/by-module/Data/Data-Dump-1.22.tar.gz
 md5sum = db211fe64a5cab15b1e86e5b0dc379a4
 configure-command =

--- a/component/perl-Encode-HanExtra/buildout.cfg
+++ b/component/perl-Encode-HanExtra/buildout.cfg
@@ -6,10 +6,6 @@ parts =
 [perl-Encode-HanExtra]
 recipe = slapos.recipe.cmmi
-# binary library should be rebuilt when perl is updated.
-depends =
-  ${perl:version}
-  ${perl:revision}
 url = http://www.cpan.org/modules/by-module/Encode/Encode-HanExtra-0.23.tar.gz
 md5sum = e1d3bc32c1c8ee304235a06fbcd5d5a4
 configure-command =

--- a/component/perl-Encode-Locale/buildout.cfg
+++ b/component/perl-Encode-Locale/buildout.cfg
@@ -6,8 +6,6 @@ parts =
 [perl-Encode-Locale]
 recipe = slapos.recipe.cmmi
-depends =
-  ${perl:version}
 url = http://www.cpan.org/modules/by-module/Encode/Encode-Locale-1.03.tar.gz
 md5sum = de8422d068634e7c1068dab4e18b452f
 configure-command =

--- a/component/perl-File-Listing/buildout.cfg
+++ b/component/perl-File-Listing/buildout.cfg
@@ -8,7 +8,6 @@ parts =
 [perl-File-Listing]
 recipe = slapos.recipe.cmmi
 depends =
-  ${perl:version}
  ${perl-HTTP-Date:location}
 url = http://www.cpan.org/modules/by-module/File/File-Listing-6.04.tar.gz
 md5sum = 83f636b477741f3a014585bb9cc079a6

--- a/component/perl-HTML-Encoding/buildout.cfg
+++ b/component/perl-HTML-Encoding/buildout.cfg
@@ -8,7 +8,6 @@ parts =
 [perl-HTML-Encoding]
 recipe = slapos.recipe.cmmi
 depends =
-  ${perl:version}
  ${perl-HTTP-Message:location}
 url = http://www.cpan.org/modules/by-module/HTML/HTML-Encoding-0.61.tar.gz
 md5sum = bce9f00f04ad055feaa4d6511b30e421

--- a/component/perl-HTML-Parser/buildout.cfg
+++ b/component/perl-HTML-Parser/buildout.cfg
@@ -7,10 +7,7 @@ parts =
 [perl-HTML-Parser]
 recipe = slapos.recipe.cmmi
-# binary library should be rebuilt when perl is updated.
 depends =
-  ${perl:version}
-  ${perl:revision}
  ${perl-HTML-Tagset:location}
 url = http://www.cpan.org/modules/by-module/HTML/HTML-Parser-3.71.tar.gz
 md5sum = 9128a45893097dfa3bf03301b19c5efe

--- a/component/perl-HTML-Tagset/buildout.cfg
+++ b/component/perl-HTML-Tagset/buildout.cfg
@@ -6,8 +6,6 @@ parts =
 [perl-HTML-Tagset]
 recipe = slapos.recipe.cmmi
-depends =
-  ${perl:version}
 url = http://www.cpan.org/modules/by-module/HTML/HTML-Tagset-3.20.tar.gz
 md5sum = d2bfa18fe1904df7f683e96611e87437
 configure-command =

--- a/component/perl-HTML-Template/buildout.cfg
+++ b/component/perl-HTML-Template/buildout.cfg
@@ -6,8 +6,6 @@ parts =
 [perl-HTML-Template]
 recipe = slapos.recipe.cmmi
-depends =
-  ${perl:version}
 url = http://www.cpan.org/modules/by-module/HTML/HTML-Template-2.95.tar.gz
 md5sum = 6f08e9631af52e6a5f6e4648b89265fe
 configure-command =

--- a/component/perl-HTTP-Cookies/buildout.cfg
+++ b/component/perl-HTTP-Cookies/buildout.cfg
@@ -8,7 +8,6 @@ parts =
 [perl-HTTP-Cookies]
 recipe = slapos.recipe.cmmi
 depends =
-  ${perl:version}
  ${perl-HTTP-Message:location}
 url = http://www.cpan.org/modules/by-module/HTTP/HTTP-Cookies-6.01.tar.gz
 md5sum = ecfd0eeb88512033352c2f13c9580f03

--- a/component/perl-HTTP-Daemon/buildout.cfg
+++ b/component/perl-HTTP-Daemon/buildout.cfg
@@ -8,7 +8,6 @@ parts =
 [perl-HTTP-Daemon]
 recipe = slapos.recipe.cmmi
 depends =
-  ${perl:version}
  ${perl-HTTP-Message:location}
 url = http://www.cpan.org/modules/by-module/HTTP/HTTP-Daemon-6.01.tar.gz
 md5sum = ed0ae02d25d7f1e89456d4d69732adc2

--- a/component/perl-HTTP-Date/buildout.cfg
+++ b/component/perl-HTTP-Date/buildout.cfg
@@ -6,8 +6,6 @@ parts =
 [perl-HTTP-Date]
 recipe = slapos.recipe.cmmi
-depends =
-  ${perl:version}
 url = http://www.cpan.org/modules/by-module/HTTP/HTTP-Date-6.02.tar.gz
 md5sum = 52b7a0d5982d61be1edb217751d7daba
 configure-command =

--- a/component/perl-HTTP-Message/buildout.cfg
+++ b/component/perl-HTTP-Message/buildout.cfg
@@ -12,7 +12,6 @@ parts =
 [perl-HTTP-Message]
 recipe = slapos.recipe.cmmi
 depends =
-  ${perl:version}
  ${perl-Encode-Locale:location}
  ${perl-HTTP-Date:location}
  ${perl-IO-HTML:location}

--- a/component/perl-HTTP-Negotiate/buildout.cfg
+++ b/component/perl-HTTP-Negotiate/buildout.cfg
@@ -8,7 +8,6 @@ parts =
 [perl-HTTP-Negotiate]
 recipe = slapos.recipe.cmmi
 depends =
-  ${perl:version}
  ${perl-HTTP-Message:location}
 url = http://www.cpan.org/modules/by-module/HTTP/HTTP-Negotiate-6.01.tar.gz
 md5sum = 1236195250e264d7436e7bb02031671b

--- a/component/perl-IO-HTML/buildout.cfg
+++ b/component/perl-IO-HTML/buildout.cfg
@@ -6,8 +6,6 @@ parts =
 [perl-IO-HTML]
 recipe = slapos.recipe.cmmi
-depends =
-  ${perl:version}
 url = http://www.cpan.org/modules/by-module/IO/IO-HTML-1.00.tar.gz
 md5sum = fdfa3fe3d61a7fda9236c8d9776cdd65
 configure-command =

--- a/component/perl-Image-Magick/buildout.cfg
+++ b/component/perl-Image-Magick/buildout.cfg
@@ -6,9 +6,6 @@ parts = perl-Image-Magick
 [perl-Image-Magick]
 recipe = slapos.recipe.cmmi
-depends =
-  ${perl:version}
-  ${imagemagick:location}
 url = http://search.cpan.org/CPAN/authors/id/J/JC/JCRISTY/PerlMagick-6.77.tar.gz
 md5sum = fa0f66fa0cabbd1b196254f94dec8e99
 patch-options = -p0

--- a/component/perl-JSON/buildout.cfg
+++ b/component/perl-JSON/buildout.cfg
@@ -6,8 +6,6 @@ parts =
 [perl-JSON]
 recipe = slapos.recipe.cmmi
-depends =
-  ${perl:version}
 url = http://www.cpan.org/modules/by-module/JSON/JSON-2.90.tar.gz
 md5sum = e1512169a623e790a3f69b599cc1d3b9
 configure-command =

--- a/component/perl-LWP-MediaTypes/buildout.cfg
+++ b/component/perl-LWP-MediaTypes/buildout.cfg
@@ -8,7 +8,6 @@ parts =
 [perl-LWP-MediaTypes]
 recipe = slapos.recipe.cmmi
 depends =
-  ${perl:version}
  ${perl-URI:location}
 url = http://www.cpan.org/modules/by-module/LWP/LWP-MediaTypes-6.02.tar.gz
 md5sum = 8c5f25fb64b974d22aff424476ba13c9

--- a/component/perl-Net-HTTP/buildout.cfg
+++ b/component/perl-Net-HTTP/buildout.cfg
@@ -6,8 +6,6 @@ parts =
 [perl-Net-HTTP]
 recipe = slapos.recipe.cmmi
-depends =
-  ${perl:version}
 url = http://www.cpan.org/modules/by-module/Net/Net-HTTP-6.06.tar.gz
 md5sum = 6e74d76205f168775de68347266793a7
 configure-command =

--- a/component/perl-Net-IP/buildout.cfg
+++ b/component/perl-Net-IP/buildout.cfg
@@ -6,8 +6,6 @@ parts =
 [perl-Net-IP]
 recipe = slapos.recipe.cmmi
-depends =
-  ${perl:version}
 url = http://www.cpan.org/modules/by-module/Net/Net-IP-1.26.tar.gz
 md5sum = 3a98e3ac45d69ea38a63a7e678bd716d
 configure-command =

--- a/component/perl-SGML-Parser-OpenSP/buildout.cfg
+++ b/component/perl-SGML-Parser-OpenSP/buildout.cfg
@@ -8,10 +8,7 @@ parts =
 [perl-SGML-Parser-OpenSP]
 recipe = slapos.recipe.cmmi
-# binary library should be rebuilt when perl is updated.
 depends =
-  ${perl:version}
-  ${perl:revision}
  ${perl-Class-Accessor:location}
 url = http://www.cpan.org/modules/by-module/SGML/SGML-Parser-OpenSP-0.994.tar.gz
 md5sum = b1ee0244e9daa4d37f28cf32c4753691

--- a/component/perl-Term-ReadLine-Gnu/buildout.cfg
+++ b/component/perl-Term-ReadLine-Gnu/buildout.cfg
@@ -14,8 +14,6 @@ filename = ${:_buildout_section_name_}
 [perl-Term-ReadLine-Gnu]
 recipe = slapos.recipe.cmmi
-depends =
-  ${perl:version}
 url = http://search.cpan.org/CPAN/authors/id/H/HA/HAYASHI/Term-ReadLine-Gnu-1.20.tar.gz
 md5sum = fa33510193b89a2ada74fcef00816322
 patch-options = -p0

--- a/component/perl-URI/buildout.cfg
+++ b/component/perl-URI/buildout.cfg
@@ -6,8 +6,6 @@ parts =
 [perl-URI]
 recipe = slapos.recipe.cmmi
-depends =
-  ${perl:version}
 url = http://www.cpan.org/modules/by-module/URI/URI-1.60.tar.gz
 md5sum = 70f739be8ce28b8baba7c5920ffee4dc
 configure-command =

--- a/component/perl-WWW-RobotRules/buildout.cfg
+++ b/component/perl-WWW-RobotRules/buildout.cfg
@@ -6,8 +6,6 @@ parts =
 [perl-WWW-RobotRules]
 recipe = slapos.recipe.cmmi
-depends =
-  ${perl:version}
 url = http://www.cpan.org/modules/by-module/WWW/WWW-RobotRules-6.02.tar.gz
 md5sum = b7186e8b8b3701e70c22abf430742403
 configure-command =

--- a/component/perl-XML-LibXML/buildout.cfg
+++ b/component/perl-XML-LibXML/buildout.cfg
@@ -10,10 +10,7 @@ parts =
 [perl-XML-LibXML]
 recipe = slapos.recipe.cmmi
-# binary library should be rebuilt when perl is updated.
 depends =
-  ${perl:version}
-  ${perl:revision}
  ${perl-XML-NamespaceSupport:location}
  ${perl-XML-SAX:location}
 url = http://www.cpan.org/modules/by-module/XML/XML-LibXML-2.0116.tar.gz

--- a/component/perl-XML-NamespaceSupport/buildout.cfg
+++ b/component/perl-XML-NamespaceSupport/buildout.cfg
@@ -6,8 +6,6 @@ parts =
 [perl-XML-NamespaceSupport]
 recipe = slapos.recipe.cmmi
-depends =
-  ${perl:version}
 url = http://www.cpan.org/modules/by-module/XML/XML-NamespaceSupport-1.11.tar.gz
 md5sum = 222cca76161cd956d724286d36b607da
 configure-command =

--- a/component/perl-XML-Parser/buildout.cfg
+++ b/component/perl-XML-Parser/buildout.cfg
@@ -9,7 +9,6 @@ parts =
 [perl-XML-Parser]
 recipe = slapos.recipe.cmmi
 depends =
-  ${perl:version}
  ${perl-libwww-perl:location}
 url = http://www.cpan.org/modules/by-module/XML/XML-Parser-2.41.tar.gz
 md5sum = c320d2ffa459e6cdc6f9f59c1185855e

--- a/component/perl-XML-SAX-Base/buildout.cfg
+++ b/component/perl-XML-SAX-Base/buildout.cfg
@@ -6,8 +6,6 @@ parts =
 [perl-XML-SAX-Base]
 recipe = slapos.recipe.cmmi
-depends =
-  ${perl:version}
 url = http://www.cpan.org/modules/by-module/XML/XML-SAX-Base-1.08.tar.gz
 md5sum = 38c8c3247dfd080712596118d70dbe32
 configure-command =

--- a/component/perl-XML-SAX/buildout.cfg
+++ b/component/perl-XML-SAX/buildout.cfg
@@ -9,7 +9,6 @@ parts =
 [perl-XML-SAX]
 recipe = slapos.recipe.cmmi
 depends =
-  ${perl:version}
  ${perl-XML-NamespaceSupport:location}
  ${perl-XML-SAX-Base:location}
 url = http://www.cpan.org/modules/by-module/XML/XML-SAX-0.99.tar.gz

--- a/component/perl-libwww-perl/buildout.cfg
+++ b/component/perl-libwww-perl/buildout.cfg
@@ -19,7 +19,6 @@ parts =
 [perl-libwww-perl]
 recipe = slapos.recipe.cmmi
 depends =
-  ${perl:version}
  ${perl-Data-Dump:location}
  ${perl-Encode-Locale:location}
  ${perl-File-Listing:location}

--- a/component/perl/buildout.cfg
+++ b/component/perl/buildout.cfg
@@ -7,11 +7,7 @@ parts =
 [perl]
 recipe = slapos.recipe.cmmi
-depends =
-  ${gdbm:version}
 version = 5.20.0
-# increase revision when we need to rebuild binary libraries.
-revision = 1
 url = http://www.cpan.org/src/5.0/perl-${:version}.tar.bz2
 md5sum = 20cbecd4e9e880ee7a50a136c8b1484e
 siteprefix = ${buildout:parts-directory}/site_${:_buildout_section_name_}

--- a/component/poppler/buildout.cfg
+++ b/component/poppler/buildout.cfg
@@ -17,9 +17,6 @@ extends =
 recipe = slapos.recipe.cmmi
 url = http://poppler.freedesktop.org/poppler-0.26.0.tar.xz
 md5sum = 76c3b2f18002a0f1e2bbbc7cccd1b957
-depends =
-  ${libtiff:version}
-  ${libpng:so_version}
 configure-options =
  --disable-cairo-output
  --disable-cms

--- a/component/pycrypto-python/buildout.cfg
+++ b/component/pycrypto-python/buildout.cfg
@@ -11,8 +11,6 @@ versions = versions
 recipe = zc.recipe.egg:custom
 egg = pycrypto
 environment = pycrypto-python-env
-depends =
-  ${gmp:version}
 include-dirs =
  ${gmp:location}/include
 library-dirs =

--- a/component/python-2.6/buildout.cfg
+++ b/component/python-2.6/buildout.cfg
@@ -25,8 +25,6 @@ filename = python-2.6.6-no_system_inc_dirs.patch
 [python2.6]
 recipe = slapos.recipe.cmmi
-depends =
-  ${gdbm:version}
 # This is actually the default setting for prefix, but we can't use it in
 # other settings in this part if we don't set it explicitly here.
 prefix = ${buildout:parts-directory}/${:_buildout_section_name_}

--- a/component/python-2.7/buildout.cfg
+++ b/component/python-2.7/buildout.cfg
@@ -31,8 +31,6 @@ package_version = 2.7.8
 package_version_suffix =
 md5sum = d235bdfa75b8396942e360a70487ee00
-depends =
-  ${gdbm:version}
 # This is actually the default setting for prefix, but we can't use it in
 # other settings in this part if we don't set it explicitly here.
 prefix = ${buildout:parts-directory}/${:_buildout_section_name_}

--- a/component/qemu-kvm/buildout.cfg
+++ b/component/qemu-kvm/buildout.cfg
@@ -17,8 +17,6 @@ recipe = slapos.recipe.cmmi
 # qemu-kvm and qemu are now the same since 1.3.
 url = http://wiki.qemu-project.org/download/qemu-1.6.1.tar.bz2
 md5sum = 3a897d722457c5a895cd6ac79a28fda0
-depends =
-  ${libpng:so_version}
 configure-options =
  --target-list=x86_64-softmmu
  --enable-system

--- a/component/slapos/buildout.cfg
+++ b/component/slapos/buildout.cfg
@@ -135,7 +135,7 @@ mr.developer = 1.30
 netaddr = 0.7.11
 pyparsing = 2.0.2
 six = 1.7.3
-slapos.core = 1.1.2
+slapos.core = 1.1.3
 slapos.libnetworkcache = 0.14.1
 slapos.recipe.cmmi = 0.2
 stevedore = 0.15
@@ -143,29 +143,29 @@ xml-marshaller = 0.9.7
 z3c.recipe.scripts = 1.0.1
 # Required by:
-# slapos.core==1.1.2
+# slapos.core==1.1.3
 Flask = 0.10.1
 # Required by:
-# slapos.core==1.1.2
+# slapos.core==1.1.3
 cliff = 1.6.1
 # Required by:
-# slapos.core==1.1.2
+# slapos.core==1.1.3
 netifaces = 0.10.4
 # Required by:
-# slapos.core==1.1.2
+# slapos.core==1.1.3
 psutil = 2.1.1
 # Required by:
-# slapos.core==1.1.2
+# slapos.core==1.1.3
 requests = 2.3.0
 # Required by:
-# slapos.core==1.1.2
+# slapos.core==1.1.3
 supervisor = 3.0
 # Required by:
-# slapos.core==1.1.2
+# slapos.core==1.1.3
 zope.interface = 4.1.1
--- a/component/sphinx/buildout.cfg
+++ b/component/sphinx/buildout.cfg
@@ -18,8 +18,6 @@ filename = sphinx-1.10-beta-snowball.patch
 [sphinx]
 recipe = slapos.recipe.cmmi
-depends =
-  ${mariadb:version}
 url = http://sphinxsearch.com/files/sphinx-2.0.5-release.tar.gz
 md5sum = e71fdb5b0c2911247d48fb30550b9584
 configure-options =

--- a/component/tesseract/buildout.cfg
+++ b/component/tesseract/buildout.cfg
@@ -14,9 +14,6 @@ parts =
 recipe = slapos.recipe.cmmi
 url = http://tesseract-ocr.googlecode.com/files/tesseract-3.01.tar.gz
 md5sum = 1ba496e51a42358fb9d3ffe781b2d20a
-depends =
-  ${libpng:so_version}
-  ${webp:so_version}
 patch-options =
  -p1
 patches =

--- a/component/webp/buildout.cfg
+++ b/component/webp/buildout.cfg
@@ -12,9 +12,6 @@ extends =
 recipe = slapos.recipe.cmmi
 url = https://webp.googlecode.com/files/libwebp-0.3.0.tar.gz
 md5sum = 4183f4f51ada98976f14e7bd51f30938
-depends =
-  ${libpng:so_version}
-so_version = 4
 configure-options =
  --disable-static
  --with-jpegincludedir=${libjpeg:location}/include

--- a/component/xapian/buildout.cfg
+++ b/component/xapian/buildout.cfg
 [buildout]
 parts =
  xapian
-depends =
+extends =
  ../zlib/buildout.cfg
  ../libuuid/buildout.cfg

--- a/component/xorg/buildout.cfg
+++ b/component/xorg/buildout.cfg
@@ -314,7 +314,6 @@ recipe = slapos.recipe.cmmi
 url = http://www.x.org/releases/X11R7.7/src/everything/xkeyboard-config-2.6.tar.bz2
 md5sum = e7e31da9adb56ba52b5c18226b8cbef3
 depends =
-  ${perl:version}
  ${perl-XML-Parser:location}
 configure-options =
  --disable-static

--- a/software/MediaWiki/software.cfg
+++ b/software/MediaWiki/software.cfg
@@ -52,7 +52,6 @@ eggs = ${instance-recipe:egg}
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
 Jinja2 = 2.6
 MySQL-python = 1.2.3
@@ -104,12 +103,6 @@ paramiko = 1.7.7.1
 # slapos.toolbox==0.10
 psutil = 0.3.0
-# Required by:
-# slapos.cookbook==0.34
-# slapos.core==0.18
-# slapos.toolbox==0.10
-setuptools = 0.6c12dev-r88846
 # Required by:
 # slapos.cookbook==0.34
 # slapos.toolbox==0.10

--- a/software/ajaxplorer/software.cfg
+++ b/software/ajaxplorer/software.cfg
@@ -205,8 +205,6 @@ numpy = 1.6.2
 websockify = 0.3.0
 slapos.cookbook=0.78.1
-setuptools = 0.6c12dev-r88846
 Jinja2 = 2.7
 MarkupSafe = 0.18
 Werkzeug = 0.8.3

--- a/software/b2evolution/software.cfg
+++ b/software/b2evolution/software.cfg
@@ -37,7 +37,6 @@ eggs = ${instance-recipe:egg}
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
 Jinja2 = 2.6
 MySQL-python = 1.2.3
@@ -89,12 +88,6 @@ paramiko = 1.7.7.1
 # slapos.toolbox==0.10
 psutil = 0.3.0
-# Required by:
-# slapos.cookbook==0.34
-# slapos.core==0.18
-# slapos.toolbox==0.10
-setuptools = 0.6c12dev-r88846
 # Required by:
 # slapos.cookbook==0.34
 # slapos.toolbox==0.10

--- a/software/backupserver/software.cfg
+++ b/software/backupserver/software.cfg
@@ -247,7 +247,6 @@ output = ${buildout:directory}/template.cfg
 mode = 0644
 [versions]
-zc.buildout = 1.6.0-dev-SlapOS-010
 rdiff-backup = 1.0.5
 Jinja2 = 2.7
 MarkupSafe = 0.18
@@ -298,13 +297,6 @@ pyflakes = 0.7.3
 # slapos.cookbook==0.78.1
 pytz = 2013b
-# Required by:
-# slapos.cookbook==0.78.1
-# slapos.core==0.35.1
-# zc.buildout==1.6.0-dev-SlapOS-010
-# zc.recipe.egg==1.3.2
-setuptools = 0.9.5
 # Required by:
 # slapos.cookbook==0.78.1
 slapos.core = 0.35.1

--- a/software/boinc-client/software.cfg
+++ b/software/boinc-client/software.cfg
@@ -176,15 +176,6 @@ netifaces = 0.10.4
 # slapos.core==0.35.1
 pyflakes = 0.7.2
-# Required by:
-# hexagonit.recipe.download==1.6nxd002
-# slapos.cookbook==0.78.1
-# slapos.core==0.35.1
-# supervisor==3.0b1
-# zc.buildout==1.6.0-dev-SlapOS-010
-# zope.interface==4.0.5
-setuptools = 0.6c12dev-r88846
 # Required by:
 # slapos.core==0.35.1
 supervisor = 3.0b1

--- a/software/cmsmadesimple/software.cfg
+++ b/software/cmsmadesimple/software.cfg
@@ -36,7 +36,6 @@ eggs = ${instance-recipe:egg}
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
 Jinja2 = 2.6
 MySQL-python = 1.2.3
@@ -88,12 +87,6 @@ paramiko = 1.7.7.1
 # slapos.toolbox==0.10
 psutil = 0.3.0
-# Required by:
-# slapos.cookbook==0.34
-# slapos.core==0.18
-# slapos.toolbox==0.10
-setuptools = 0.6c12dev-r88846
 # Required by:
 # slapos.cookbook==0.34
 # slapos.toolbox==0.10

--- a/software/condor/software.cfg
+++ b/software/condor/software.cfg
@@ -212,15 +212,6 @@ netifaces = 0.10.4
 # slapos.core==0.35.1
 pyflakes = 0.7.2
-# Required by:
-# hexagonit.recipe.download==1.6nxd002
-# slapos.cookbook==0.78.1
-# slapos.core==0.35.1
-# supervisor==3.0b1
-# zc.buildout==1.6.0-dev-SlapOS-010
-# zope.interface==4.0.5
-setuptools = 0.6c12dev-r88846
 # Required by:
 # slapos.core==0.35.1
 supervisor = 3.0b1

--- a/software/coppermine/software.cfg
+++ b/software/coppermine/software.cfg
@@ -47,7 +47,6 @@ eggs = ${instance-recipe:egg}
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
 Jinja2 = 2.6
 MySQL-python = 1.2.3
@@ -99,12 +98,6 @@ paramiko = 1.7.7.1
 # slapos.toolbox==0.10
 psutil = 0.3.0
-# Required by:
-# slapos.cookbook==0.34
-# slapos.core==0.18
-# slapos.toolbox==0.10
-setuptools = 0.6c12dev-r88846
 # Required by:
 # slapos.cookbook==0.34
 # slapos.toolbox==0.10

--- a/software/dotclear/software.cfg
+++ b/software/dotclear/software.cfg
@@ -47,7 +47,6 @@ eggs = ${instance-recipe:egg}
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
 Jinja2 = 2.6
 MySQL-python = 1.2.3
@@ -99,12 +98,6 @@ paramiko = 1.7.7.1
 # slapos.toolbox==0.10
 psutil = 0.3.0
-# Required by:
-# slapos.cookbook==0.34
-# slapos.core==0.18
-# slapos.toolbox==0.10
-setuptools = 0.6c12dev-r88846
 # Required by:
 # slapos.cookbook==0.34
 # slapos.toolbox==0.10

--- a/software/dotproject/software.cfg
+++ b/software/dotproject/software.cfg
@@ -47,7 +47,6 @@ eggs = ${instance-recipe:egg}
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
 Jinja2 = 2.6
 MySQL-python = 1.2.3
@@ -99,12 +98,6 @@ paramiko = 1.7.7.1
 # slapos.toolbox==0.10
 psutil = 0.3.0
-# Required by:
-# slapos.cookbook==0.34
-# slapos.core==0.18
-# slapos.toolbox==0.10
-setuptools = 0.6c12dev-r88846
 # Required by:
 # slapos.cookbook==0.34
 # slapos.toolbox==0.10

--- a/software/eSKUeL/software.cfg
+++ b/software/eSKUeL/software.cfg
@@ -36,7 +36,6 @@ eggs = ${instance-recipe:egg}
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
 Jinja2 = 2.6
 MySQL-python = 1.2.3
@@ -88,12 +87,6 @@ paramiko = 1.7.7.1
 # slapos.toolbox==0.10
 psutil = 0.3.0
-# Required by:
-# slapos.cookbook==0.34
-# slapos.core==0.18
-# slapos.toolbox==0.10
-setuptools = 0.6c12dev-r88846
 # Required by:
 # slapos.cookbook==0.34
 # slapos.toolbox==0.10

--- a/software/erp5-util-testing/software.cfg
+++ b/software/erp5-util-testing/software.cfg
@@ -88,14 +88,6 @@ netaddr = 0.7.10
 # slapos.core==0.28.5
 netifaces = 0.10.4
-# Required by:
-# erp5.util==0.4.7
-# slapos.cookbook==0.65
-# slapos.core==0.28.5
-# zc.buildout==1.6.0-dev-SlapOS-006
-# zc.recipe.egg==1.3.2
-setuptools = 0.9.8
 # Required by:
 # slapos.cookbook==0.65
 slapos.core = 0.28.5

--- a/software/erp5/software-erp5-component.cfg
+++ b/software/erp5/software-erp5-component.cfg
+# This file is for building ERP5 software release using erp5-component
+# branch.
+[buildout]
+extends =
+  software.cfg
+[slapos.cookbook-repository]
+branch = erp5-component
+[erp5]
+branch = erp5-component
--- a/software/erp5testnode/software.cfg
+++ b/software/erp5testnode/software.cfg
@@ -182,9 +182,6 @@ signature-certificate-list =
 # use newest version of pytz
 pytz =
-# pin version of setuptools
-setuptools = 2.2
 Jinja2 = 2.7.3
 MarkupSafe = 0.23
 PyXML = 0.8.5

--- a/software/ezpublish/software.cfg
+++ b/software/ezpublish/software.cfg
@@ -36,7 +36,6 @@ eggs = ${instance-recipe:egg}
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
 Jinja2 = 2.6
 MySQL-python = 1.2.3
@@ -88,12 +87,6 @@ paramiko = 1.7.7.1
 # slapos.toolbox==0.10
 psutil = 0.3.0
-# Required by:
-# slapos.cookbook==0.34
-# slapos.core==0.18
-# slapos.toolbox==0.10
-setuptools = 0.6c12dev-r88846
 # Required by:
 # slapos.cookbook==0.34
 # slapos.toolbox==0.10

--- a/software/freeglobes/software.cfg
+++ b/software/freeglobes/software.cfg
@@ -51,7 +51,6 @@ eggs =
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically

--- a/software/freewebshop/software.cfg
+++ b/software/freewebshop/software.cfg
@@ -44,7 +44,6 @@ eggs =
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically

--- a/software/fusionnews/software.cfg
+++ b/software/fusionnews/software.cfg
@@ -44,7 +44,6 @@ eggs =
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically

--- a/software/guppy/software.cfg
+++ b/software/guppy/software.cfg
@@ -38,7 +38,6 @@ eggs = ${instance-recipe:egg}
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically

--- a/software/html5as/software.cfg
+++ b/software/html5as/software.cfg
@@ -152,14 +152,6 @@ pyflakes = 0.7
 # slapos.cookbook==0.82
 pytz = 2013b
-# Required by:
-# slapos.cookbook==0.82
-# slapos.core==0.35.1
-# slapos.toolbox==0.34.0
-# zc.buildout==1.6.0-dev-SlapOS-010
-# zc.recipe.egg==1.3.2
-setuptools = 0.6c12dev-r88846
 # Required by:
 # slapos.cookbook==0.82
 # slapos.toolbox==0.34.0

--- a/software/jio/software.cfg
+++ b/software/jio/software.cfg
@@ -78,17 +78,6 @@ pyflakes = 0.6.1
 # slapos.cookbook==0.76.0
 pytz = 2013b
-# Required by:
-# collective.recipe.template==1.10
-# erp5.util==0.4.33
-# hexagonit.recipe.download==1.6nxd002
-# slapos.cookbook==0.76.0
-# slapos.core==0.35.1
-# supervisor==3.0b1
-# zc.buildout==1.6.0-dev-SlapOS-010
-# zope.interface==4.0.5
-setuptools = 1.4.2
 # Required by:
 # slapos.cookbook==0.76.0
 slapos.core = 0.35.1

--- a/software/lamp-template-static/software.cfg
+++ b/software/lamp-template-static/software.cfg
@@ -38,7 +38,6 @@ eggs = ${instance-recipe:egg}
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.6.0-dev-SlapOS-003
 slapos.cookbook = 0.20
 # Generated by buildout-versions
@@ -73,13 +72,6 @@ netaddr = 0.7.6
 # slapos.core==0.21
 netifaces = 0.6
-# Required by:
-# slapos.cookbook==0.20
-# slapos.core==0.21
-# zc.buildout==1.6.0-dev-SlapOS-003
-# zc.recipe.egg==1.3.2
-setuptools = 0.6c12dev-r88846
 # Required by:
 # slapos.cookbook==0.20
 slapos.core = 0.21

--- a/software/lamp-template/software.cfg
+++ b/software/lamp-template/software.cfg
@@ -2,6 +2,7 @@
 extends =
  ../../stack/lamp/buildout.cfg
+  ../../stack/slapos.cfg
 [application]
 recipe = slapos.recipe.build:download-unpacked
@@ -19,4 +20,5 @@ mode = 0644
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 [application-configuration]
-location = Student shall put here relative path to application top level directory where configuration shall be created
+#Student shall put here relative path to application top level directory where configuration shall be created
+#location = 
--- a/software/magento/software.cfg
+++ b/software/magento/software.cfg
@@ -35,7 +35,6 @@ eggs = ${instance-recipe:egg}
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
 Jinja2 = 2.6
 MySQL-python = 1.2.3
@@ -87,12 +86,6 @@ paramiko = 1.7.7.1
 # slapos.toolbox==0.10
 psutil = 0.3.0
-# Required by:
-# slapos.cookbook==0.34
-# slapos.core==0.18
-# slapos.toolbox==0.10
-setuptools = 0.6c12dev-r88846
 # Required by:
 # slapos.cookbook==0.34
 # slapos.toolbox==0.10

--- a/software/mantis/software.cfg
+++ b/software/mantis/software.cfg
@@ -42,7 +42,6 @@ eggs =
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically

--- a/software/mariadb/software.cfg
+++ b/software/mariadb/software.cfg
@@ -124,13 +124,6 @@ pyflakes = 0.6.1
 # slapos.cookbook==0.72.0
 pytz = 2012j
-# Required by:
-# slapos.cookbook==0.72.0
-# slapos.core==0.35
-# zc.buildout==1.6.0-dev-SlapOS-010
-# zc.recipe.egg==1.3.2
-setuptools = 0.6c12dev-r88846
 # Required by:
 # slapos.cookbook==0.72.0
 slapos.core = 0.35

--- a/software/memcached/software.cfg
+++ b/software/memcached/software.cfg
@@ -37,13 +37,6 @@ mode = 0644
 [versions]
 slapos.cookbook = 0.7
-# Required by slapos.cookbook==0.7
-slapos.core = 0.2
-collective.recipe.template = 1.8
-netaddr = 0.7.5
-xml-marshaller = 0.9.7
-setuptools = 0.6c12dev-r88795
 hexagonit.recipe.cmmi = 1.5.0
 hexagonit.recipe.download = 1.6nxd002
 plone.recipe.command = 1.1

--- a/software/mioga/software.cfg
+++ b/software/mioga/software.cfg
--- a/software/monitor/dygraph-combined.js
+++ b/software/monitor/dygraph-combined.js
--- a/software/monitor/index.cgi.in
+++ b/software/monitor/index.cgi.in
--- a/software/monitor/instance.cfg
+++ b/software/monitor/instance.cfg
--- a/software/monitor/plot.html.in
+++ b/software/monitor/plot.html.in
--- a/software/monitor/rsync-logs.sh.in
+++ b/software/monitor/rsync-logs.sh.in
--- a/software/monitor/software.cfg
+++ b/software/monitor/software.cfg
--- a/software/moregroupware/software.cfg
+++ b/software/moregroupware/software.cfg
--- a/software/mysql-5.1/software.cfg
+++ b/software/mysql-5.1/software.cfg
--- a/software/net2ftp/software.cfg
+++ b/software/net2ftp/software.cfg
--- a/software/nucleus/software.cfg
+++ b/software/nucleus/software.cfg
--- a/software/officejs/software.cfg
+++ b/software/officejs/software.cfg
--- a/software/openX/software.cfg
+++ b/software/openX/software.cfg
--- a/software/openemr/software.cfg
+++ b/software/openemr/software.cfg
--- a/software/os-commerce/software.cfg
+++ b/software/os-commerce/software.cfg
--- a/software/phpbb/software.cfg
+++ b/software/phpbb/software.cfg
--- a/software/phpmyadmin/software.cfg
+++ b/software/phpmyadmin/software.cfg
--- a/software/phpmybackup/software.cfg
+++ b/software/phpmybackup/software.cfg
--- a/software/phpnuke/software.cfg
+++ b/software/phpnuke/software.cfg
--- a/software/phprojekt/software.cfg
+++ b/software/phprojekt/software.cfg
--- a/software/pimcore/software.cfg
+++ b/software/pimcore/software.cfg
--- a/software/piwigo/software.cfg
+++ b/software/piwigo/software.cfg
--- a/software/piwik/software.cfg
+++ b/software/piwik/software.cfg
--- a/software/postgres/software.cfg
+++ b/software/postgres/software.cfg
--- a/software/prestashop/software.cfg
+++ b/software/prestashop/software.cfg
--- a/software/punbb/software.cfg
+++ b/software/punbb/software.cfg
--- a/software/quick-cart/software.cfg
+++ b/software/quick-cart/software.cfg
--- a/software/quick-cms/software.cfg
+++ b/software/quick-cms/software.cfg
--- a/software/redis-server/software.cfg
+++ b/software/redis-server/software.cfg
--- a/software/seleniumrunner/software.cfg
+++ b/software/seleniumrunner/software.cfg
--- a/software/silverstripe/software.cfg
+++ b/software/silverstripe/software.cfg
--- a/software/simple-invoicing/software.cfg
+++ b/software/simple-invoicing/software.cfg
--- a/software/simpleMachineForum/software.cfg
+++ b/software/simpleMachineForum/software.cfg
--- a/software/slapos-testing/software.cfg
+++ b/software/slapos-testing/software.cfg
--- a/software/slaprunner-lite/software.cfg
+++ b/software/slaprunner-lite/software.cfg
--- a/software/slaprunner/README.txt
+++ b/software/slaprunner/README.txt
--- a/software/slaprunner/common.cfg
+++ b/software/slaprunner/common.cfg
--- a/software/slaprunner/development.cfg
+++ b/software/slaprunner/development.cfg
--- a/software/slaprunner/httpd_conf.in
+++ b/software/slaprunner/httpd_conf.in
--- a/software/slaprunner/instance-resilient-test.cfg.jinja2
+++ b/software/slaprunner/instance-resilient-test.cfg.jinja2
--- a/software/slaprunner/instance-resilient.cfg.jinja2
+++ b/software/slaprunner/instance-resilient.cfg.jinja2
--- a/software/slaprunner/instance-runner-export.cfg.in
+++ b/software/slaprunner/instance-runner-export.cfg.in
--- a/software/slaprunner/instance-runner.cfg
+++ b/software/slaprunner/instance-runner.cfg
--- a/software/slaprunner/node-frontend.in
+++ b/software/slaprunner/node-frontend.in
--- a/software/slaprunner/schema.json
+++ b/software/slaprunner/schema.json
--- a/software/slaprunner/software.cfg
+++ b/software/slaprunner/software.cfg
--- a/software/slaprunner/template/runner-export.sh.jinja2
+++ b/software/slaprunner/template/runner-export.sh.jinja2
--- a/software/slaprunner/template/slapos.cfg.in
+++ b/software/slaprunner/template/slapos.cfg.in
--- a/software/spip/software.cfg
+++ b/software/spip/software.cfg
--- a/software/statusnet/software.cfg
+++ b/software/statusnet/software.cfg
--- a/software/sugar-crm/software.cfg
+++ b/software/sugar-crm/software.cfg
--- a/software/test-slave-instance-deployment/software.cfg
+++ b/software/test-slave-instance-deployment/software.cfg
--- a/software/thelia/software.cfg
+++ b/software/thelia/software.cfg
--- a/software/tiki/software.cfg
+++ b/software/tiki/software.cfg
--- a/software/trac-svn/software.cfg
+++ b/software/trac-svn/software.cfg
--- a/software/ultimate-php-borad/software.cfg
+++ b/software/ultimate-php-borad/software.cfg
--- a/software/xoops/software.cfg
+++ b/software/xoops/software.cfg
--- a/software/xwiki/software.cfg
+++ b/software/xwiki/software.cfg
--- a/software/zabbix-agent/software.cfg
+++ b/software/zabbix-agent/software.cfg
--- a/software/zencart/software.cfg
+++ b/software/zencart/software.cfg
--- a/software/zimbra-kvm/software.cfg
+++ b/software/zimbra-kvm/software.cfg
--- a/stack/boinc/buildout.cfg
+++ b/stack/boinc/buildout.cfg
--- a/stack/cloudooo.cfg
+++ b/stack/cloudooo.cfg
--- a/stack/erp5/buildout.cfg
+++ b/stack/erp5/buildout.cfg
--- a/stack/lamp.cfg
+++ b/stack/lamp.cfg
--- a/stack/lamp/buildout.cfg
+++ b/stack/lamp/buildout.cfg
--- a/stack/lapp/buildout.cfg
+++ b/stack/lapp/buildout.cfg
--- a/stack/monitor/buildout.cfg
+++ b/stack/monitor/buildout.cfg
--- a/stack/monitor/monitor.cfg.in
+++ b/stack/monitor/monitor.cfg.in
--- a/stack/slapos.cfg
+++ b/stack/slapos.cfg