Update Release Candidate

component/6tunnel/buildout.cfg

@@ -9,6 +9,7 @@ extends =
 
 [6tunnel]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://toxygen.net/6tunnel/6tunnel-0.11rc2.tar.gz
 md5sum = 74e02d4f0704b3083a01feda66033449
 pre-configure =

component/apache/buildout.cfg

@@ -19,6 +19,7 @@ extends =
 
 [apr]
 recipe = slapos.recipe.build:download-unpacked
+shared = false
 strip-top-level-dir = false
 version = 1.5.2
 md5sum = 4e9769f3349fe11fc0a5e1b224c236aa
@@ -26,6 +27,7 @@ url = https://archive.apache.org/dist/apr/apr-${:version}.tar.bz2
 
 [apr-util]
 recipe = slapos.recipe.build:download-unpacked
+shared = false
 strip-top-level-dir = false
 version = 1.5.4
 url = https://archive.apache.org/dist/apr/apr-util-${:version}.tar.bz2
@@ -34,6 +36,7 @@ md5sum = 2202b18f269ad606d70e1864857ed93c
 [apache]
 # inspired on http://old.aclark.net/team/aclark/blog/a-lamp-buildout-for-wordpress-and-other-php-apps/
 recipe = slapos.recipe.cmmi
+shared = false
 version = 2.4.33
 url = https://archive.apache.org/dist/httpd/httpd-${:version}.tar.bz2
 md5sum = 6ef469d3f16fffeb688bc6e0346823e5
@@ -100,6 +103,7 @@ environment =
 [apache-antiloris]
 # Note: Shall react on each build of apache and reinstall itself
 recipe = slapos.recipe.cmmi
+shared = false
 url = http://downloads.sourceforge.net/project/mod-antiloris/mod_antiloris-0.4.tar.bz2
 md5sum = 66862bf10e9be3a023e475604a28a0b4
 patch-options = -p0
@@ -118,6 +122,7 @@ environment =
 [apache-2.2]
 # inspired on http://old.aclark.net/team/aclark/blog/a-lamp-buildout-for-wordpress-and-other-php-apps/
 recipe = slapos.recipe.cmmi
+shared = false
 version = 2.2.34
 url = https://archive.apache.org/dist/httpd/httpd-${:version}.tar.bz2
 md5sum = c0bf1bdb779a3b5e6e294caf9ca20441
@@ -179,6 +184,7 @@ environment =
 [apache-antiloris-apache-2.2]
 # Note: Shall react on each build of apache and reinstall itself
 recipe = slapos.recipe.cmmi
+shared = false
 url = http://downloads.sourceforge.net/project/mod-antiloris/mod_antiloris-0.4.tar.bz2
 md5sum = 66862bf10e9be3a023e475604a28a0b4
 configure-command = ${apache-2.2:location}/bin/apxs
@@ -189,6 +195,7 @@ make-targets =
 
 [template-apache-backend-conf]
 recipe = slapos.recipe.build:download
+shared = false
 url = ${:_profile_base_location_}/apache-backend.conf.in
 md5sum = 8f1f92ad308ab6bad973c790ee583428
 mode = 640

component/aspell/buildout.cfg

@@ -10,10 +10,12 @@ extends =
 
 [aspell-dictionary-common]
 recipe = slapos.recipe.cmmi
+shared = false
 configure-command = ./configure --vars ASPELL=${aspell:location}/bin/aspell PREZIP=${aspell:location}/bin/prezip-bin
 
 [aspell]
 recipe = slapos.recipe.cmmi
+shared = false
 url = http://ftp.gnu.org/gnu/aspell/aspell-0.60.6.1.tar.gz
 md5sum = e66a9c9af6a60dc46134fdacf6ce97d7
 patch-options = -p1

component/autoconf/buildout.cfg

@@ -8,6 +8,7 @@ parts =
 
 [autoconf]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.gz
 md5sum = 82d05e03b93e45f5a39b828dc9c6c29b
 patch-options = -p1

component/automake/buildout.cfg

@@ -9,6 +9,7 @@ parts =
 
 [automake]
 recipe = slapos.recipe.cmmi
+shared = true
 md5sum = 24cd3501b6ad8cd4d7e2546f07e8b4d4
 url = http://ftp.gnu.org/gnu/automake/automake-1.15.1.tar.xz
 patch-options = -p1

component/bash/buildout.cfg

@@ -8,6 +8,7 @@ extends =
 
 [bash]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://ftp.gnu.org/gnu/bash/bash-4.3.tar.gz
 md5sum = 81348932d5da294953e15d4814c74dd1
 patches =

component/binutils/buildout.cfg

@@ -6,6 +6,7 @@ parts = binutils
 
 [mpfr]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://ftp.gnu.org/gnu/mpfr/mpfr-3.1.3.tar.xz
 md5sum = 6969398cd2fbc56a6af570b5273c56a9
 configure-options =
@@ -17,6 +18,7 @@ environment =
 
 [mpc]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://ftp.gnu.org/gnu/mpc/mpc-1.0.3.tar.gz
 md5sum = d6a1d5f8ddea3abd2cc3e98f58352d26
 configure-options =
@@ -28,6 +30,7 @@ environment =
 
 [isl]
 recipe = slapos.recipe.cmmi
+shared = true
 url = ftp://gcc.gnu.org/pub/gcc/infrastructure/isl-0.16.1.tar.bz2
 md5sum = ac1f25a0677912952718a51f5bc20f32
 configure-options =
@@ -38,6 +41,7 @@ environment =
 
 [binutils]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://ftp.gnu.org/gnu/binutils/binutils-2.27.tar.bz2
 md5sum = 2869c9bf3e60ee97c74ac2a6bf4e9d68
 configure-options =

component/bison/buildout.cfg

@@ -8,6 +8,7 @@ parts =
 
 [bison]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://ftp.gnu.org/gnu/bison/bison-3.0.2.tar.xz
 md5sum = 146be9ff9fbd27497f0bf2286a5a2082
 environment =

component/boost-lib/buildout.cfg

@@ -8,9 +8,10 @@ extends =
 
 [boost-lib]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://downloads.sourceforge.net/sourceforge/boost/boost_1_58_0.tar.bz2
 md5sum = b8839650e61e9c1c0a89f371dd475546
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
+location = @@LOCATION@@
 configure-command = ./bootstrap.sh --prefix=${:location} --with-python=${python2.7:location}/bin/python2.7
 make-binary =
 make-options =

component/bzip2/buildout.cfg

@@ -4,10 +4,11 @@ parts =
 
 [bzip2]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz
 md5sum = 00b516f4704d4a7cb50a1d97e6e8e15b
 configure-command = true
 make-options =
-  PREFIX=${buildout:parts-directory}/${:_buildout_section_name_}
+  PREFIX=@@LOCATION@@
   CFLAGS="-fpic -fPIC -Wall -Winline -O2 -g -D_FILE_OFFSET_BITS=64"
 post-make-hook =  ${:_profile_base_location_}/bzip2-hooks.py#066c8355b7d726f30176ea5b6a35e1a2:post_make_hook

component/ca-certificates/buildout.cfg

@@ -11,6 +11,7 @@ parts =
 
 [ca-certificates]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://http.debian.net/debian/pool/main/c/ca-certificates/ca-certificates_20170717.tar.xz
 patch-binary = ${patch:location}/bin/patch
 md5sum = 55a6bb6b98afb16b3cde8e3ad1e262eb
@@ -19,6 +20,6 @@ patches =
   ${:_profile_base_location_}/ca-certificates-sbin-dir.patch#0b4e7d82ce768823c01954ee41ef177b
 patch-options = -p0
 configure-command = true
-make-targets = install DESTDIR=${buildout:parts-directory}/${:_buildout_section_name_} CERTSDIR=certs SBINDIR=sbin
+make-targets = install DESTDIR=@@LOCATION@@ CERTSDIR=certs SBINDIR=sbin
 environment =
   PATH=${xz-utils:location}/bin:%(PATH)s

component/cmake/buildout.cfg

@@ -7,6 +7,7 @@ parts =
 
 [cmake]
 recipe = slapos.recipe.cmmi
+shared = true
 url = https://cmake.org/files/v3.7/cmake-3.7.2.tar.gz
 md5sum = 79bd7e65cd81ea3aa2619484ad6ff25a
 environment =

component/coreutils/buildout.cfg

@@ -8,6 +8,7 @@ parts =
 
 [coreutils]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://ftp.gnu.org/gnu/coreutils/coreutils-8.23.tar.xz
 md5sum = abed135279f87ad6762ce57ff6d89c41
 environment =

component/cups/buildout.cfg

@@ -9,6 +9,7 @@ extends =
 # for now we build and install library and header files only.
 [cups]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://www.cups.org/software/1.7.4/cups-1.7.4-source.tar.bz2
 md5sum = 1a2295c2b2d2f422db2e50f40ed2fb99
 configure-options =

component/curl/buildout.cfg

@@ -14,6 +14,7 @@ parts =
 
 [curl]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://curl.haxx.se/download/curl-7.60.0.tar.xz
 md5sum = a889cd11b4ae8794b7030472cb4df0a0
 configure-options =

component/cyrus-sasl/buildout.cfg

@@ -11,9 +11,10 @@ extends =
 
 [cyrus-sasl]
 recipe = slapos.recipe.cmmi
+shared = true
 url = ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.26.tar.gz
 md5sum = a7f4e5e559a0e37b3ffc438c9456e425
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
+location = @@LOCATION@@
 pre-configure =
   "${libtool:location}/bin/libtoolize" -c -f &&
   "${automake:location}/bin/aclocal" -I "${libtool:location}/share/aclocal" -I config -I cmulocal &&

component/dash/buildout.cfg

@@ -6,6 +6,7 @@ parts = dash-output
 
 [dash]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.8.tar.gz
 md5sum = 5c152209680dab3c319e8923f6c51378
 configure-options =

component/dbus/buildout.cfg

@@ -10,9 +10,10 @@ parts =
 
 [dbus]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://dbus.freedesktop.org/releases/dbus/dbus-1.11.6.tar.gz
 md5sum = fdb03ad2f2861a171fe7d0caad3b415f 
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
+location = @@LOCATION@@
 configure-options =
   --disable-static
   --without-x
@@ -25,6 +26,7 @@ environment =
 
 [dbus-glib]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.104.tar.gz
 md5sum = 5497d2070709cf796f1878c75a72a039
 configure-options =

component/file/buildout.cfg

@@ -11,10 +11,12 @@ recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/msooxml
 md5sum = c889ad135cbfb343db36b729a3897432
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
+shared = false
 filename = msooxml
 
 [file]
 recipe = slapos.recipe.cmmi
+shared = false
 url = http://ftp.icm.edu.pl/packages/file/file-5.32.tar.gz
 md5sum = 4f2503752ff041895090ed6435610435
 configure-options =

component/findutils/buildout.cfg

@@ -6,6 +6,7 @@ parts =
 
 [findutils]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://ftp.gnu.org/gnu/findutils/findutils-4.4.2.tar.gz
 md5sum = 351cc4adb07d54877fa15f75fb77d39f
 

component/flex/buildout.cfg

@@ -8,6 +8,7 @@ parts =
 
 [flex]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://downloads.sourceforge.net/project/flex/flex-2.6.0.tar.xz
 md5sum = 3cbbfa1554d0b75fad9f8100732454de
 environment =

component/fontconfig/buildout.cfg

@@ -14,6 +14,7 @@ parts =
 
 [fontconfig]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://fontconfig.org/release/fontconfig-2.12.6.tar.bz2
 md5sum = 733f5e2371ca77b69707bd7b30cc2163
 pkg_config_depends = ${freetype:pkg_config_depends}:${freetype:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig

component/freetype/buildout.cfg

@@ -13,10 +13,11 @@ parts =
 
 [freetype]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://download.savannah.gnu.org/releases/freetype/freetype-2.7.1.tar.bz2
 md5sum = b3230110e0cab777e0df7631837ac36e
 pkg_config_depends = ${zlib:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
+location = @@LOCATION@@
 configure-options =
   --disable-static
 environment =

component/garbage-collector/buildout.cfg

@@ -6,6 +6,7 @@ parts = garbage-collector
 
 [garbage-collector]
 recipe = slapos.recipe.cmmi
+shared = true
 md5sum = 6f77f9fff5fb5bf96adfc1e93cd035b6
 url = http://www.hboehm.info/gc/gc_source/gc-7.2g.tar.gz
 configure-options =

component/gcc/buildout.cfg

@@ -14,6 +14,7 @@ parts =
 
 [gcc-common]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://ftp.gnu.org/gnu/gcc/gcc-5.5.0/gcc-5.5.0.tar.gz
 md5sum = 781bc0195edeb0ceaace8428f63ae63d
 # make install does not work when several core are used

component/gdbm/buildout.cfg

@@ -4,6 +4,7 @@ parts =
 
 [gdbm]
 recipe = slapos.recipe.cmmi
+shared = true
 version = 1.11
 url = ftp://ftp.gnu.org/gnu/gdbm/gdbm-${:version}.tar.gz
 md5sum = 72c832680cf0999caedbe5b265c8c1bd
@@ -12,7 +13,7 @@ configure-options =
   --enable-libgdbm-compat
 # install as parts/gdbm/include/gdbm/*.h etc. because some softwares
 # (eg. python's dbmmodule.c extension) assume the location like this.
-includedir = ${buildout:parts-directory}/${:_buildout_section_name_}/include
+includedir = @@LOCATION@@/include
 make-targets =
   install includedir=${:includedir}/gdbm && rm -f ${:includedir}/*.h && ln -sf gdbm/gdbm.h ${:includedir}/gdbm.h
 # it seems that parallel build sometimes fails for gdbm.

component/gettext/buildout.cfg

@@ -10,6 +10,7 @@ extends =
 
 [gettext]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://ftp.gnu.org/pub/gnu/gettext/gettext-0.19.8.1.tar.lz
 md5sum = d838d2c4144261d0c5fbab4a0aceb5c1
 

component/ghostscript/buildout.cfg

@@ -11,6 +11,7 @@ parts = ghostscript
 
 [ghostscript-common]
 recipe = slapos.recipe.cmmi
+shared = true
 pkg_config_depends = ${libtiff:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${fontconfig:pkg_config_depends}
 configure-options =
   --disable-cups

component/giflib/buildout.cfg

@@ -4,6 +4,7 @@ parts =
 
 [giflib]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://downloads.sourceforge.net/project/giflib/giflib-4.x/giflib-4.2.3.tar.bz2
 md5sum = be1f5749c24644257a88c9f42429343d
 configure-options =

component/git/buildout.cfg

@@ -17,6 +17,7 @@ parts =
 
 [git]
 recipe = slapos.recipe.cmmi
+shared = true
 url = https://www.kernel.org/pub/software/scm/git/git-2.11.0.tar.xz
 md5sum = dd4e3360e28aec5bb902fb34dd7fce3b
 configure-options =

component/glib/buildout.cfg

@@ -12,6 +12,7 @@ parts =
 
 [glib]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://ftp.gnome.org/pub/gnome/core/3.22/3.22.2/sources/glib-2.50.2.tar.xz
 md5sum = 5eeb2bfaf78a07be59585e8b6e80b1d6
 configure-options =

component/glibmm/buildout.cfg

@@ -12,6 +12,7 @@ parts =
 
 [glibmm]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://ftp.gnome.org/pub/gnome/core/3.22/3.22.2/sources/glibmm-2.50.0.tar.xz
 md5sum = e7416beff6cba1f38c2bccd0dc8c3278
 pkg_config_depends = ${glib:location}/lib/pkgconfig:${libsigc:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig

component/gmp/buildout.cfg

@@ -8,6 +8,7 @@ parts =
 
 [gmp]
 recipe = slapos.recipe.cmmi
+shared = true
 version = 6.1.1
 url = https://gmplib.org/download/gmp/gmp-${:version}.tar.xz
 md5sum = e70e183609244a332d80529e7e155a35

component/gnutls/buildout.cfg

@@ -9,6 +9,7 @@ parts = gnutls
 
 [gpg-common]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://www.gnupg.org/ftp/gcrypt/${:_buildout_section_name_}/${:_buildout_section_name_}-${:version}.tar.bz2
 # we'd like to combine <= and +=
 configure-options = ${:configure-options-extra}

component/gperf/buildout.cfg

@@ -2,5 +2,6 @@
 
 [gperf]
 recipe = slapos.recipe.cmmi
+shared = true
 url = ftp://ftp.gnu.org/pub/gnu/gperf/gperf-3.0.4.tar.gz
 md5sum = c1f1db32fb6598d6a93e6e88796a8632

component/graphviz/buildout.cfg

@@ -12,6 +12,7 @@ extends =
 
 [graphviz]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.38.0.tar.gz
 md5sum = 5b6a829b2ac94efcd5fa3c223ed6d3ae
 pkg_config_depends = ${pango:location}/lib/pkgconfig:${pango:pkg_config_depends}

component/grep/buildout.cfg

@@ -8,6 +8,7 @@ parts =
 
 [grep]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://ftp.gnu.org/gnu/grep/grep-2.25.tar.xz
 md5sum = 04e96b0e6f0fe6a180ae62c88fcd0af6
 environment =

component/groff/buildout.cfg

@@ -7,6 +7,7 @@ extends =
 
 [groff]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://ftp.gnu.org/gnu/groff/groff-1.21.tar.gz
 md5sum = 8b8cd29385b97616a0f0d96d0951c5bf
 configure-options =

component/groonga/buildout.cfg

@@ -14,6 +14,7 @@ extends =
 
 [groonga]
 recipe = slapos.recipe.cmmi
+shared = false
 url = https://packages.groonga.org/source/groonga/groonga-8.0.5.tar.gz
 md5sum = 72ce790646ce561c246ef4e2ea961f79
 # temporary patch to respect more tokens in natural language mode.
@@ -44,6 +45,7 @@ environment =
 
 [groonga-normalizer-mysql]
 recipe = slapos.recipe.cmmi
+shared = false
 url = http://packages.groonga.org/source/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.1.tar.gz
 md5sum = 5a93c0238da114e5f91db659ffd499b0
 location = ${groonga:location}

component/gtk-2/buildout.cfg

@@ -24,6 +24,7 @@ parts =
 
 [cairo]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://cairographics.org/releases/cairo-1.14.2.tar.xz
 md5sum = e1cdfaf1c6c995c4d4c54e07215b0118
 pkg_config_depends = ${fontconfig:location}/lib/pkgconfig:${fontconfig:pkg_config_depends}:${glib:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig:${libXext:pkg_config_depends}:${libpng:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig
@@ -45,6 +46,7 @@ environment =
 
 [harfbuzz]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-0.9.35.tar.bz2
 md5sum = 531ee8650626ecddcd90b2a4637e31d4
 pkg_config_depends = ${cairo:location}/lib/pkgconfig:${cairo:pkg_config_depends}
@@ -61,6 +63,7 @@ environment =
 
 [pango]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://ftp.gnome.org/pub/gnome/core/3.22/3.22.2/sources/pango-1.40.3.tar.xz
 md5sum = 17c26720f5a862a12f7e1745e2f1d966
 pkg_config_depends = ${harfbuzz:location}/lib/pkgconfig:${harfbuzz:pkg_config_depends}
@@ -75,6 +78,7 @@ environment =
 
 [gdk-pixbuf]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://ftp.gnome.org/pub/gnome/core/3.22/3.22.2/sources/gdk-pixbuf-2.36.0.tar.xz
 md5sum = 1a3baf91956c7923dab49ee3de100ce1
 pkg_config_depends = ${glib:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libX11:pkg_config_depends}:${pcre:location}/lib/pkgconfig
@@ -92,6 +96,7 @@ environment =
 
 [atk]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://ftp.gnome.org/pub/gnome/core/3.22/3.22.2/sources/atk-2.22.0.tar.xz
 md5sum = c7f2adcf75e4058727174cde970e9129
 configure-options =
@@ -105,6 +110,7 @@ environment =
 
 [gtk-2]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://ftp.gnome.org/pub/gnome/core/3.22/3.22.2/sources/gtk+-2.24.31.tar.xz
 md5sum = 526a1008586094a2cbb4592fd3f9ee10
 pkg_config_depends = ${pango:location}/lib/pkgconfig:${pango:pkg_config_depends}:${atk:location}/lib/pkgconfig:${gdk-pixbuf:location}/lib/pkgconfig

component/gtk-3/buildout.cfg

@@ -15,12 +15,10 @@ extends =
 recipe = slapos.recipe.cmmi
 url =http://ftp.gnome.org/pub/gnome/core/3.22/3.22.2/sources/at-spi2-core-2.22.0.tar.xz
 md5sum = 3da5fe62a653e49dad1c47f9a46fee56
-depends =
-  ${perl-XML-Parser:location}
 configure-options =
   --disable-gtk-doc-html
 environment =
-  PATH=${dbus:location}/bin:${gettext:location}/bin:${glib:location}/bin:${intltool:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PATH=${dbus:location}/bin:${gettext:location}/bin:${glib:location}/bin:${intltool:location}/bin:${perl-XML-Parser:perl-PATH}:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${dbus:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig
   CPPFLAGS=-I${inputproto:location}/include -I${kbproto:location}/include -I${libX11:location}/include -I${libXi:location}/include -I${libXtst:location}/include -I${xextproto:location}/include -I${xproto:location}/include
   LDFLAGS=-L${libX11:location}/lib -Wl,-rpath=${libX11:location}/lib -L${libXi:location}/lib -Wl,-rpath=${libXi:location}/lib -L${libXtst:location}/lib -Wl,-rpath=${libXtst:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib

component/gtkmm/buildout.cfg

@@ -16,6 +16,7 @@ parts =
 
 [cairomm]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://cairographics.org/releases/cairomm-1.13.1.tar.gz
 md5sum = 21fe892652741b7544f52da6965d27fc
 pkg_config_depends = ${cairo:location}/lib/pkgconfig:${cairo:pkg_config_depends}:${libsigc:location}/lib/pkgconfig
@@ -31,6 +32,7 @@ environment =
 
 [pangomm]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://ftp.gnome.org/pub/gnome/core/3.22/3.22.2/sources/pangomm-2.40.1.tar.xz
 md5sum = 874eadd9434613dbacf0272c82c3ac23
 pkg_config_depends = ${pango:location}/lib/pkgconfig:${pango:pkg_config_depends}:${glibmm:location}/lib/pkgconfig:${glibmm:pkg_config_depends}:${cairomm:location}/lib/pkgconfig
@@ -45,6 +47,7 @@ environment =
 
 [atkmm]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://ftp.gnome.org/pub/gnome/core/3.22/3.22.2/sources/atkmm-2.24.2.tar.xz
 md5sum = d53b60b0f1be597e86070954a49cf0c3
 pkg_config_depends = ${atk:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${glibmm:location}/lib/pkgconfig:${libsigc:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig
@@ -59,6 +62,7 @@ environment =
 
 [gtkmm]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.24/gtkmm-2.24.5.tar.xz
 md5sum = 6c59ae8bbff48fad9132f23af347acf1
 pkg_config_depends = ${pangomm:location}/lib/pkgconfig:${pangomm:pkg_config_depends}:${atkmm:location}/lib/pkgconfig:${atkmm:pkg_config_depends}:${gtk-2:location}/lib/pkgconfig:${gtk-2:pkg_config_depends}

component/gzip/buildout.cfg

@@ -6,6 +6,7 @@ parts =
 
 [gzip]
 recipe = slapos.recipe.cmmi
+shared = true
 url = ftp://ftp.gnu.org/pub/gnu/gzip/gzip-1.8.tar.xz
 md5sum = f7caabb65cddc1a4165b398009bd05b9
 environment =

component/haproxy/buildout.cfg

@@ -12,6 +12,7 @@ parts = haproxy
 
 [haproxy]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://www.haproxy.org/download/1.8/src/haproxy-1.8.4.tar.gz
 md5sum = 540cd21169e8828d5d11894b2fa74ab4
 configure-command = true
@@ -21,7 +22,7 @@ configure-command = true
 make-options =
   TARGET="$(uname -sr 2>/dev/null|grep -Eq '^Linux (2\.6\.2[89]|2\.6\.[3-9]|[3-9])' && echo linux2628 || echo generic)"
   ARCH="$(uname -m 2>/dev/null|grep -E '^(x86_64|i[3456]86)$')"
-  PREFIX=${buildout:parts-directory}/${:_buildout_section_name_}
+  PREFIX=@@LOCATION@@
   USE_DL=1
   USE_LUA=1
   LUA_INC=${lua:location}/include

component/hdf5/buildout.cfg

@@ -6,6 +6,7 @@ parts =
 
 [hdf5]
 recipe = slapos.recipe.cmmi
+shared = true
 url = https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.0-patch1/src/hdf5-1.10.0-patch1.tar.bz2
 md5sum = f6d980febe2c35c11670a9b34fa3b487
 configure-options =

component/imagemagick/buildout.cfg

@@ -25,6 +25,7 @@ extends =
 
 [imagemagick]
 recipe = slapos.recipe.cmmi
+shared = true
 version = 7.0.2-10
 url = https://www.imagemagick.org/download/releases/ImageMagick-${:version}.tar.xz
 md5sum = e1cb23d9c10a8eff228ef30ee281711a

component/inkscape/buildout.cfg

@@ -27,6 +27,7 @@ extends =
 
 [gsl]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://ftp.gnu.org/gnu/gsl/gsl-2.3.tar.gz
 md5sum = 905fcbbb97bc552d1037e34d200931a0
 configure-options =
@@ -39,9 +40,10 @@ environment =
 
 [inkscape]
 recipe = slapos.recipe.cmmi
+shared = true
 url = https://inkscape.org/gallery/item/10682/inkscape-0.92.1.tar_XlpI7qT.bz2
 md5sum = db2eb2a566cf35ff949fc9ccb172889a
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
+location = @@LOCATION@@
 pkg_config_depends = ${freetype:location}/lib/pkgconfig:${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
 configure-command = ${cmake:location}/bin/cmake
 configure-options =

component/intltool/buildout.cfg

@@ -10,13 +10,12 @@ parts =
 
 [intltool]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://edge.launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz
 md5sum = 12e517cac2b57a0121cda351570f1e63
 patch-options = -p1
 patches =
   ${:_profile_base_location_}/intltool-0.51.0.regexp.patch#3e7736d5ce7876e9a8d078c35e7f327b
-depends =
-  ${perl-XML-Parser:location}
 environment =
-  PATH=${patch:location}/bin:${perl:location}/bin:${gettext:location}/bin:${pkgconfig:location}/bin:%(PATH)s
+  PATH=${patch:location}/bin:${perl-XML-Parser:perl-PATH}:${gettext:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${perl:location}/lib/pkgconfig

component/jasper/buildout.cfg

@@ -7,6 +7,7 @@ parts =
 
 [jasper]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-1.900.1.zip
 md5sum = a342b2b4495b3e1394e161eb5d85d754
 patch-options = -p1

component/jbigkit/buildout.cfg

@@ -7,6 +7,7 @@ parts =
 
 [jbigkit]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://www.cl.cam.ac.uk/~mgk25/download/jbigkit-2.0.tar.gz
 md5sum = 3dd87f605abb1a97a22dc79d8b3e8f6c
 patch-options =

component/jemalloc/buildout.cfg

@@ -5,6 +5,7 @@ parts =
 
 [jemalloc]
 recipe = slapos.recipe.cmmi
+shared = true
 url = https://github.com/jemalloc/jemalloc/releases/download/${:version}/jemalloc-${:version}.tar.bz2
 version = 3.6.0
 md5sum = e76665b63a8fddf4c9f26d2fa67afdf2
@@ -13,4 +14,4 @@ configure-options =
   --enable-readline
 environment =
   CPPFLAGS=-I${readline:location}/include -I${ncurses:location}/include
-  LDFLAGS=-L${buildout:parts-directory}/${:_buildout_section_name_} -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${readline:location}/lib -L${ncurses:location}/lib
+  LDFLAGS=-L@@LOCATION@@ -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${readline:location}/lib -L${ncurses:location}/lib

component/kumo/buildout.cfg

@@ -11,6 +11,7 @@ parts = kumo
 
 [kumo]
 recipe = slapos.recipe.cmmi
+shared = true
 url = https://github.com/downloads/etolabo/kumofs/kumofs-0.4.13.tar.gz
 md5sum = 46148e9536222d0ad2ef36777c55714d
 pre-configure-hook = ${:_profile_base_location_}/kumo-hooks.py#958a595a02de75624728f8d65e39d800:pre_configure_hook

component/lcms/buildout.cfg

@@ -13,6 +13,7 @@ parts =
 
 [lcms2]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://downloads.sourceforge.net/project/lcms/lcms/2.8/lcms2-2.8.tar.gz
 md5sum = 87a5913f1a52464190bb655ad230539c
 configure-options =

component/leptonica/buildout.cfg

@@ -13,6 +13,7 @@ extends =
 recipe = slapos.recipe.cmmi
 url = http://www.leptonica.com/source/leptonica-1.76.0.tar.gz
 md5sum = a263a5e4f7e8f8a661fb121a265d2d20
+shared = true
 configure-options =
   --disable-static
 

component/libaio/buildout.cfg

@@ -5,8 +5,9 @@ parts =
 [libaio]
 recipe = slapos.recipe.cmmi
 # originally located at http://www.kernel.org/pub/linux/libs/aio/
+shared = true
 url = http://ftp.free.fr/mirrors/ftp.debian.org/pool/main/liba/libaio/libaio_0.3.109.orig.tar.gz
 md5sum = 435a5b16ca6198eaf01155263d855756
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
+location = @@LOCATION@@
 configure-command = echo
 make-options = prefix=${:location}

component/libdb/buildout.cfg

@@ -3,10 +3,11 @@ parts = libdb
 
 [libdb]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://download.oracle.com/berkeley-db/db-4.5.20.tar.gz
 md5sum = b0f1c777708cb8e9d37fb47e7ed3312d
 configure-command = cd build_unix && ../dist/configure
 configure-options =
   --disable-static
-  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
+  --prefix=@@LOCATION@@
 make-binary = cd build_unix && make

component/libdmtx/buildout.cfg

@@ -14,6 +14,7 @@ parts =
 
 [libdmtx]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://prdownloads.sourceforge.net/libdmtx/libdmtx-0.7.4.tar.bz2
 md5sum = d3a4c0becd92895eb606dbdb78b023e2
 configure-options =
@@ -21,6 +22,7 @@ configure-options =
 
 [dmtx-utils]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://prdownloads.sourceforge.net/libdmtx/dmtx-utils-0.7.4.tar.bz2
 md5sum = b132ab9fb1d289869469b8bb4959a08a
 configure-options =

component/libexpat/buildout.cfg

@@ -4,6 +4,7 @@ parts =
 
 [libexpat]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://downloads.sourceforge.net/project/expat/expat/2.2.1/expat-2.2.1.tar.bz2
 md5sum = d9c3baeab58774cefc2f04faf29f2cf8
 configure-options =

component/libffi/buildout.cfg

@@ -7,10 +7,11 @@ parts =
 
 [libffi]
 recipe = slapos.recipe.cmmi
+shared = true
 version = 3.2.1
 url = ftp://sourceware.org/pub/libffi/libffi-${:version}.tar.gz
 md5sum = 83b89587607e3eb65c70d361f13bab43
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
+location = @@LOCATION@@
 patch-options = -p1
 patches =
   ${:_profile_base_location_}/includedir.diff#e430307d16a0d215a24ec2acff23d184

component/libjpeg/buildout.cfg

@@ -4,6 +4,7 @@ parts =
 
 [libjpeg]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://www.ijg.org/files/jpegsrc.v8d.tar.gz
 md5sum = 52654eb3b2e60c35731ea8fc87f1bd29
 configure-options =

component/libpng/buildout.cfg

@@ -9,6 +9,7 @@ parts =
 
 [libpng-common]
 recipe = slapos.recipe.cmmi
+shared = true
 configure-options =
   --disable-static
 environment =

component/librsvg/buildout.cfg

@@ -10,6 +10,7 @@ extends =
 
 [libcroco]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://ftp.gnome.org/pub/gnome/core/3.20/3.20.2/sources/libcroco-0.6.11.tar.xz
 md5sum = dabc1911dfbfa85f8e6859ca47863168
 configure-options =
@@ -21,6 +22,7 @@ environment =
 
 [librsvg]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://ftp.gnome.org/pub/gnome/core/3.22/3.22.2/sources/librsvg-2.40.16.tar.xz
 md5sum = f474fe37177a2bf8050787df2046095c
 pkg_config_depends = ${pango:location}/lib/pkgconfig:${pango:pkg_config_depends}:${zlib:location}/lib/pkgconfig:${gdk-pixbuf:location}/lib/pkgconfig:${libcroco:location}/lib/pkgconfig

component/librsync/buildout.cfg

@@ -11,9 +11,10 @@ parts =
 
 [librsync]
 recipe = slapos.recipe.cmmi
+shared = true
 url = https://github.com/librsync/librsync/archive/v2.0.0.tar.gz
 md5sum = cbda9c3eba21bcf2d56a4080ba7a5dc4
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
+location = @@LOCATION@@
 patch-options = -p1
 patches =
   ${:_profile_base_location_}/librsync-2.0.0-issue50.patch#5bac5363646a2c2ec6d2c4b26ca4cd7f

component/libsigc/buildout.cfg

@@ -10,6 +10,7 @@ parts =
 
 [libsigc]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://ftp.gnome.org/pub/gnome/core/3.22/3.22.2/sources/libsigc++-2.10.0.tar.xz
 md5sum = 70bcbde2c900e4925d6ef4bf50954195
 configure-options =

component/libsodium/buildout.cfg

@@ -4,6 +4,7 @@ parts =
 
 [libsodium]
 recipe = slapos.recipe.cmmi
+shared = true
 url = https://download.libsodium.org/libsodium/releases/libsodium-1.0.8.tar.gz
 md5sum = 0a66b86fd3aab3fe4c858edcd2772760
 configure-options =

component/libstemmer/buildout.cfg

@@ -7,12 +7,13 @@ extends =
 
 [libstemmer]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://snowball.tartarus.org/dist/libstemmer_c.tgz
 md5sum = 6f32f8f81cd6fa0150333ab540af5e27
 patch-options = -p0
 patches =
   ${:_profile_base_location_}/libstemmer.Makefile.patch#f337bfe457ecf00d3297043a153d402a
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
+location = @@LOCATION@@
 configure-command = true
 make-options = DESTDIR=${:location}
 environment =

component/libtasn1/buildout.cfg

@@ -4,6 +4,7 @@ parts =
 
 [libtasn1]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://ftp.gnu.org/gnu/libtasn1/libtasn1-4.12.tar.gz
 md5sum = 5c724bd1f73aaf4a311833e1cd297b21
 configure-options =

component/libtiff/buildout.cfg

@@ -10,6 +10,7 @@ parts =
 
 [libtiff]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://download.osgeo.org/libtiff/tiff-4.0.8.tar.gz
 md5sum = 2a7d1c1318416ddf36d5f6fa4600069b
 configure-options =

component/libtool/buildout.cfg

@@ -6,6 +6,7 @@ parts = libtool
 
 [libtool]
 recipe = slapos.recipe.cmmi
+shared = true
 md5sum = 1bfb9b923f2c1339b4d2ce1807064aa5
 url = http://ftp.gnu.org/gnu/libtool/libtool-2.4.6.tar.xz
 configure-options =

component/libuuid/buildout.cfg

@@ -7,6 +7,7 @@ extends =
 
 [libuuid]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://www.kernel.org/pub/linux/utils/util-linux/v2.18/util-linux-ng-2.18.tar.bz2
 md5sum = 2f5f71e6af969d041d73ab778c141a77
 configure-options =

component/libxml2/buildout.cfg

@@ -11,6 +11,7 @@ parts =
 
 [libxml2]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://xmlsoft.org/sources/libxml2-2.9.7.tar.gz
 md5sum = 896608641a08b465098a40ddf51cefba
 configure-options =

component/libxslt/buildout.cfg

@@ -10,6 +10,7 @@ parts =
 url = ftp://xmlsoft.org/libxslt/libxslt-1.1.32.tar.gz
 md5sum = 1fc72f98e98bf4443f1651165f3aa146
 recipe = slapos.recipe.cmmi
+shared = true
 configure-options =
   --disable-static
   --with-libxml-prefix=${libxml2:location}

component/libyaml/buildout.cfg

@@ -5,5 +5,6 @@ parts =
 
 [libyaml]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://pyyaml.org/download/libyaml/yaml-0.1.6.tar.gz
 md5sum = 5fe00cda18ca5daeb43762b80c38e06e

component/libzmq/buildout.cfg

@@ -8,6 +8,7 @@ parts =
 
 [libzmq]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://download.zeromq.org/zeromq-4.1.4.tar.gz
 md5sum = a611ecc93fffeb6d058c0e6edf4ad4fb
 configure-options =

component/logrotate/buildout.cfg

@@ -7,11 +7,12 @@ parts = logrotate
 
 [logrotate]
 recipe = slapos.recipe.cmmi
+shared = true
 url = https://github.com/logrotate/logrotate/releases/download/3.11.0/logrotate-3.11.0.tar.xz
 md5sum = 3a9280e4caeb837427a2d54518fbcdac
 # BBB this is only for backward-compatibility.
 post-install =
-  ln -nsf . ${buildout:parts-directory}/${:_buildout_section_name_}/usr
+  ln -nsf . @@LOCATION@@/usr
 environment =
   PATH=${xz-utils:location}/bin:%(PATH)s
   CPPFLAGS=-I${popt:location}/include

component/lua/buildout.cfg

@@ -7,6 +7,7 @@ parts =
 
 [lua]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://www.lua.org/ftp/lua-5.3.1.tar.gz
 md5sum = 797adacada8d85761c079390ff1d9961
 configure-command = true
@@ -15,4 +16,4 @@ make-options =
   MYCFLAGS="-I${readline:location}/include"
   MYLDFLAGS="-L${readline:location}/lib -Wl,-rpath=${readline:location}/lib"
 make-targets =
-  install INSTALL_TOP=${buildout:parts-directory}/${:_buildout_section_name_}
+  install INSTALL_TOP=@@LOCATION@@

component/lunzip/buildout.cfg

@@ -4,6 +4,7 @@ parts =
 
 [lunzip]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://download.savannah.gnu.org/releases-redirect/lzip/lunzip/lunzip-1.7.tar.gz
 md5sum = cb37bd46590a78bd19a77748b3a097ee
 configure-options =

component/m4/buildout.cfg

@@ -6,6 +6,7 @@ parts =
 
 [m4]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://ftp.gnu.org/gnu/m4/m4-1.4.17.tar.xz
 md5sum = 12a3c829301a4fd6586a57d3fcf196dc
 environment =

component/mesa/buildout.cfg

@@ -15,6 +15,7 @@ parts =
 
 [mesa]
 recipe = slapos.recipe.cmmi
+shared = true
 url = ftp://ftp.freedesktop.org/pub/mesa/11.0.3/mesa-11.0.3.tar.xz
 md5sum = bf9118bf0fbf360715cfe60baf7a1db5
 configure-options =
@@ -47,6 +48,7 @@ make-options =
 
 [glu]
 recipe = slapos.recipe.cmmi
+shared = true
 # tar.bz2 cannot be well extracted why ?
 url = ftp://ftp.freedesktop.org/pub/mesa/glu/glu-9.0.0.tar.gz
 md5sum = bbc57d4fe3bd3fb095bdbef6fcb977c4

component/messagepack/buildout.cfg

@@ -7,6 +7,7 @@ parts = messagepack
 
 [messagepack]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://downloads.sourceforge.net/project/msgpack/msgpack/cpp/msgpack-0.5.4.tar.gz
 md5sum = 18d96a3178f7cad73c0ca44f6284ae7d
 configure-options =

component/mysql-tritonn-5.0/buildout.cfg

@@ -19,6 +19,7 @@ parts =
 
 [senna]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://www.nexedi.org/static/tarballs/senna/senna-r1311.tar.gz
 md5sum = 1cc51554789f81a9e5208da04a5c2f4c
 configure-command =
@@ -27,7 +28,7 @@ configure-command =
   ACLOCAL_ARGS=-I${libtool:location}/share/aclocal ./autogen.sh
   ./configure
 configure-options =
-  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
+  --prefix=@@LOCATION@@
   --without-mecab
   --disable-glibtest
 make-options =
@@ -53,6 +54,7 @@ download-only = true
 
 [mysql-tritonn-5.0]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://www.nexedi.org/static/tarballs/mysql/mysql-5.0.87.tar.gz
 md5sum = 65e6229cc98b6a8d4c5206d7fe16c7be
 # configure: how to avoid searching for my.cnf?
@@ -66,7 +68,7 @@ configure-command =
   touch sql/sql_yacc.yy
   ./configure
 configure-options =
-  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
+  --prefix=@@LOCATION@@
   --with-senna
   --with-openssl=${openssl:location}
   --without-mecab

component/ncurses/buildout.cfg

@@ -6,13 +6,14 @@ parts =
 
 [ncurses]
 recipe = slapos.recipe.cmmi
+shared = true
 url = ftp://ftp.gnu.org/pub/gnu/ncurses/ncurses-6.0.tar.gz
 md5sum = ee13d052e1ead260d7c28071f46eefb1
 patch-options = -p1
 patches =
   ${:_profile_base_location_}/ncurses-5.9-gcc-5.patch#57f4cd0cc0c0a42a5ddb2167f9546d72
 configure-options =
-  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
+  --prefix=@@LOCATION@@
   --with-shared
   --without-ada
   --without-manpages
@@ -23,7 +24,7 @@ configure-options =
   --enable-rpath
 # tricky way to rerun with --enable-widec
 make-targets =
-  install && (for i in curses unctrl eti form menu panel term; do ln -sf ncurses/$i.h ${buildout:parts-directory}/${:_buildout_section_name_}/include/$i.h; done; ln -sf libncurses.so ${buildout:parts-directory}/${:_buildout_section_name_}/lib/libcurses.so) && ./configure ${:configure-options} --enable-widec && make ${:make-options} && make ${:make-options} install
+  install && (for i in curses unctrl eti form menu panel term; do ln -sf ncurses/$i.h @@LOCATION@@/include/$i.h; done; ln -sf libncurses.so @@LOCATION@@/lib/libcurses.so) && ./configure ${:configure-options} --enable-widec && make ${:make-options} && make ${:make-options} install
 # pass dummy LDCONFIG to skip needless calling of ldconfig by non-root user
 environment =
   LDCONFIG=/bin/echo

component/neon/buildout.cfg

@@ -9,6 +9,7 @@ extends =
 
 [neon]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://www.webdav.org/neon/neon-0.29.5.tar.gz
 md5sum = ff369e69ef0f0143beb5626164e87ae2
 configure-options =

component/nettle/buildout.cfg

@@ -6,6 +6,7 @@ extends =
 
 [nettle]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://ftp.gnu.org/gnu/nettle/nettle-3.3.tar.gz
 md5sum = 10f969f78a463704ae73529978148dbe
 patches =
@@ -18,4 +19,4 @@ configure-option =
 environment =
   PATH=${m4:location}/bin:${patch:location}/bin:%(PATH)s
   CPPFLAGS=-I${gmp:location}/include
-  LDFLAGS=-L${gmp:location}/lib -Wl,-rpath=${gmp:location}/lib -Wl,-rpath=${buildout:parts-directory}/${:_buildout_section_name_}/lib
+  LDFLAGS=-L${gmp:location}/lib -Wl,-rpath=${gmp:location}/lib -Wl,-rpath=@@LOCATION@@/lib

component/nghttp2/buildout.cfg

@@ -11,9 +11,10 @@ parts =
 
 [nghttp2]
 recipe = slapos.recipe.cmmi
+shared = true
 url = https://github.com/nghttp2/nghttp2/archive/v1.20.0.zip 
 md5sum = e77319851b27c2366aa1cc8a8eabe73e
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
+location = @@LOCATION@@
 
 pre-configure =
   autoreconf -fisv -I ${libtool:location}/share/aclocal -I ${pkgconfig:location}/share/aclocal

component/nginx/buildout.cfg

@@ -12,6 +12,7 @@ parts = nginx-output
 
 [nginx-common]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://nginx.org/download/nginx-1.10.1.tar.gz
 md5sum = 088292d9caf6059ef328aa7dda332e44
 patch-options = -p0

component/nodejs/buildout.cfg

 [buildout]
 extends =
+  ../coreutils/buildout.cfg
   ../patch/buildout.cfg
   ../git/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../openssl/buildout.cfg
   ../zlib/buildout.cfg
   ../python-2.7/buildout.cfg
+  ../gcc/buildout.cfg
 
 parts =
   nodejs
@@ -25,12 +27,21 @@ configure-options =
   --shared-openssl-libpath=${openssl:location}/lib
 environment =
   HOME=${buildout:parts-directory}/${:_buildout_section_name_}
-  PATH=${pkgconfig:location}/bin:${python2.7:location}/bin/:%(PATH)s
+  PATH=${gcc:location}/bin:${pkgconfig:location}/bin:${python2.7:location}/bin/:%(PATH)s
   PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig/
   CPPFLAGS=-I${zlib:location}/include
-  LDFLAGS=-Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+  LDFLAGS=-Wl,-rpath=${gcc:location}/lib -Wl,-rpath=${gcc:location}/lib64 -Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
   LD_LIBRARY_PATH=${openssl:location}/lib
 
+[nodejs-8.6.0-output]
+# Shared binary location to ease migration
+recipe = plone.recipe.command
+stop-on-error = true
+update-command = ${:command}
+command = ${coreutils-output:test} -x ${:node} -a -x ${:npm}
+node = ${nodejs-8.6.0:location}/bin/node
+npm = ${nodejs-8.6.0:location}/bin/npm
+
 [nodejs-5]
 # Server-side Javascript.
 recipe = slapos.recipe.cmmi

component/openblas/buildout.cfg

@@ -11,6 +11,7 @@ extends =
 
 [openblas]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://github.com/xianyi/OpenBLAS/archive/v0.2.18.tar.gz
 md5sum = 805e7f660877d588ea7e3792cda2ee65
 patch-options = -p0
@@ -34,7 +35,7 @@ configure-command =
 make-options =
   dummy
 make-targets =
-  PREFIX="${buildout:parts-directory}/${:_buildout_section_name_}" install
+  PREFIX="@@LOCATION@@" install
 environment =
   PATH=${gcc:location}/bin:${patch:location}/bin:${perl:location}/bin:%(PATH)s
   LD_LIBRARY_PATH=${gcc:location}/lib:${gcc:location}/lib64

component/openldap/buildout.cfg

@@ -8,6 +8,7 @@ extends =
 
 [openldap]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.42.tgz
 md5sum = 47c8e2f283647a6105b8b0325257e922
 configure-options =

component/opensp/buildout.cfg

@@ -7,6 +7,7 @@ extends =
 
 [opensp]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://prdownloads.sourceforge.net/openjade/OpenSP-1.5.2.tar.gz
 md5sum = 670b223c5d12cee40c9137be86b6c39b
 configure-options =

component/openssl/buildout.cfg

@@ -16,9 +16,10 @@ parts =
 
 [openssl]
 recipe = slapos.recipe.cmmi
+shared = true
 url = https://www.openssl.org/source/openssl-1.0.2o.tar.gz
 md5sum = 44279b8557c3247cbe324e2322ecd114
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
+location = @@LOCATION@@
 # 'prefix' option to override --openssldir/--prefix (which is useful
 # when combined with INSTALL_PREFIX). Used by slapos.package.git/obs
 prefix = ${:location}

component/p11-kit/buildout.cfg

@@ -9,6 +9,7 @@ extends =
 
 [p11-kit]
 recipe = slapos.recipe.cmmi
+shared = true
 url = https://github.com/p11-glue/p11-kit/releases/download/${:version}/p11-kit-${:version}.tar.gz
 version = 0.23.7
 md5sum = ebbefd123210594231adb4bde21b8560

component/patch/buildout.cfg

@@ -6,6 +6,7 @@ parts =
 
 [patch]
 recipe = slapos.recipe.cmmi
+shared = true
 url = ftp://ftp.gnu.org/gnu/patch/patch-2.7.5.tar.xz
 md5sum = e3da7940431633fb65a01b91d3b7a27a
 environment =

component/pcre/buildout.cfg

@@ -4,6 +4,7 @@ parts =
 
 [pcre]
 recipe = slapos.recipe.cmmi
+shared = true
 url = https://ftp.pcre.org/pub/pcre/pcre-8.42.tar.bz2
 md5sum = 085b6aa253e0f91cae70b3cdbe8c1ac2
 configure-options =

component/percona-toolkit/buildout.cfg

@@ -7,17 +7,10 @@ parts =
   percona-toolkit
 
 [percona-toolkit]
-recipe = slapos.recipe.cmmi
+<= perl-CPAN-package
+# XXX it's not on CPAN, so we use url
 version = 3.0.3
 url = https://www.percona.com/downloads/percona-toolkit/${:version}/source/tarball/percona-toolkit-${:version}.tar.gz
 md5sum = 8af181994fdf9aa984475637861098e9
-depends =
-  ${perl-DBI:location}
-  ${perl-DBD-mariadb:location}
-pre-configure =
-  sed -i -e 's,^#!/usr/bin/env perl,#!perl,' bin/*
-configure-command =
-  ${perl:location}/bin/perl Makefile.PL
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-make-options =
-  INSTALLSITESCRIPT=${:location}/bin
+
+inc = ${perl-DBI:site_perl}:${perl-DBD-mariadb:site_perl}

component/perl-CGI/buildout.cfg

@@ -5,8 +5,7 @@ parts =
   perl-CGI
 
 [perl-CGI]
-recipe = slapos.recipe.cmmi
-url = http://www.cpan.org/modules/by-module/CGI/CGI-4.36.tar.gz
-md5sum = 48566d81f430a7f755bb4d8f426ce35d
-configure-command =
-  ${perl:location}/bin/perl Makefile.PL
+<= perl-CPAN-package
+module = CGI/CGI
+version = 4.38
+md5sum = 0aeb8563d533e7f83724ed068b5bfc37

component/perl-Class-Accessor/buildout.cfg

@@ -5,8 +5,7 @@ parts =
   perl-Class-Accessor
 
 [perl-Class-Accessor]
-recipe = slapos.recipe.cmmi
-url = http://www.cpan.org/modules/by-module/Class/Class-Accessor-0.34.tar.gz
+<= perl-CPAN-package
+module = Class/Class-Accessor
+version = 0.34
 md5sum = 0d9640d237a13276145f7e44b4855b89
-configure-command =
-  ${perl:location}/bin/perl Makefile.PL

component/perl-Config-General/buildout.cfg

@@ -5,8 +5,7 @@ parts =
   perl-Config-General
 
 [perl-Config-General]
-recipe = slapos.recipe.cmmi
-url = http://www.cpan.org/modules/by-module/Config/Config-General-2.56.tar.gz
+<= perl-CPAN-package
+module = Config/Config-General
+version = 2.56
 md5sum = 8cf9dd044d016f27b4dc26077606736d
-configure-command =
-  ${perl:location}/bin/perl Makefile.PL

component/perl-Crypt-SSLeay/buildout.cfg

-[buildout]
-extends =
-  ../perl/buildout.cfg
-  ../../component/openssl/buildout.cfg
-  ../../component/zlib/buildout.cfg
-parts =
-  perl-Crypt-SSLeay
-
-[perl-Crypt-SSLeay]
-recipe = slapos.recipe.build:cpan
-modules =
-  G/GA/GAAS/URI-1.60.tar.gz
-  N/NA/NANIS/Crypt-SSLeay-0.64.tar.gz
-cpan-configuration =
-  make_arg=('OTHERLDFLAGS="-L${zlib:location}/lib -Wl,-R${zlib:location}/lib -L${openssl:location}/lib -Wl,-R${openssl:location}/lib"')
-  makepl_arg=('INC=-I${openssl:location}/include')
-environment =
-  OPENSSL_PREFIX=${openssl:location}
-perl = perl
-

component/perl-DBD-MySQL/buildout.cfg

@@ -9,17 +9,18 @@ parts =
   perl-DBD-MySQL
 
 [perl-DBD-MySQL-common]
-recipe = slapos.recipe.cmmi
-depends =
-  ${perl-DBI:location}
-  ${perl-Devel-CheckLib:location}
-url = https://github.com/perl5-dbi/DBD-mysql/archive/4.046_01.tar.gz
+<= perl-CPAN-package
+module = DBD/DBD-mysql
+version = 4.046_01
 md5sum = 90f87aec4b7ab95a9543f2dd10969a07
+# 4.046_01 is not released on CPAN, so we get it from github
+url = https://github.com/perl5-dbi/DBD-mysql/archive/4.046_01.tar.gz
+
+inc = ${perl-DBI:site_perl}:${perl-Devel-CheckLib:site_perl}
 patches =
   ${:_profile_base_location_}/DBD-mysql-4.027.rpathsupport.patch#a932982b7725e6621cfce3a3d7917e03
 patch-options = -p1
-configure-command =
-  ${perl:location}/bin/perl Makefile.PL --libs="-L${zlib:location}/lib -L${openssl:location}/lib $(mysql_config --libs)"
+extra-configure-args=--libs "-L${zlib:location}/lib -L${openssl:location}/lib $(mysql_config --libs)"
 
 [perl-DBD-MySQL]
 <= perl-DBD-MySQL-common

component/perl-DBD-Pg/buildout.cfg

-[buildout]
-extends =
-  ../perl/buildout.cfg
-  ../postgresql/buildout.cfg
-parts =
-  perl-DBD-Pg
-
-[perl-DBD-Pg]
-recipe = slapos.recipe.build:cpan
-modules =
-  T/TU/TURNSTEP/DBD-Pg-2.19.3.tar.gz
-environment =
-  POSTGRES_HOME=${postgresql:location}
-perl = perl

component/perl-DBI/buildout.cfg

@@ -5,11 +5,9 @@ parts =
   perl-DBI
 
 [perl-DBI]
-recipe = slapos.recipe.cmmi
-url = http://www.cpan.org/modules/by-module/DBI/DBI-1.631.tar.gz
-md5sum = 444d3c305e86597e11092b517794a840
-configure-command =
-  ${perl:location}/bin/perl Makefile.PL
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
+<= perl-CPAN-package
+module = DBI/DBI
+version = 1.641
+md5sum = e77fd37fcf77fc88fde029c1b75ded54
 make-options =
   INSTALLSITESCRIPT=${:location}/bin

component/perl-Data-Dump/buildout.cfg

@@ -5,8 +5,7 @@ parts =
   perl-Data-Dump
 
 [perl-Data-Dump]
-recipe = slapos.recipe.cmmi
-url = http://www.cpan.org/modules/by-module/Data/Data-Dump-1.22.tar.gz
+<= perl-CPAN-package
+module = Data/Data-Dump
+version = 1.22
 md5sum = db211fe64a5cab15b1e86e5b0dc379a4
-configure-command =
-  ${perl:location}/bin/perl Makefile.PL

component/perl-Devel-CheckLib/buildout.cfg

@@ -3,8 +3,7 @@ extends =
   ../perl/buildout.cfg
 
 [perl-Devel-CheckLib]
-recipe = slapos.recipe.cmmi
-url = http://www.cpan.org/modules/by-module/Devel/Devel-CheckLib-1.11.tar.gz
+<= perl-CPAN-package
+module = Devel/Devel-CheckLib
+version = 1.11
 md5sum = c20873798591176283f51af4ad8088cd
-configure-command =
-  ${perl:location}/bin/perl Makefile.PL

component/perl-Encode-HanExtra/buildout.cfg

@@ -6,11 +6,12 @@ parts =
   perl-Encode-HanExtra
 
 [perl-Encode-HanExtra]
-recipe = slapos.recipe.cmmi
-url = http://www.cpan.org/modules/by-module/Encode/Encode-HanExtra-0.23.tar.gz
+<= perl-CPAN-package
+module = Encode/Encode-HanExtra
+version = 0.23
 md5sum = e1d3bc32c1c8ee304235a06fbcd5d5a4
-configure-command =
-  ${perl:location}/bin/perl -I. Makefile.PL
+
+install-inc = .
 patch-options = -p1
 patches =
   ${:_profile_base_location_}/Encode-HanExtra-0.23_use_shebang.patch#4ac804013a68a3e6b7c3bc4115d25a5e

component/perl-Encode-Locale/buildout.cfg

@@ -5,8 +5,7 @@ parts =
   perl-Encode-Locale
 
 [perl-Encode-Locale]
-recipe = slapos.recipe.cmmi
-url = http://www.cpan.org/modules/by-module/Encode/Encode-Locale-1.03.tar.gz
+<= perl-CPAN-package
+module = Encode/Encode-Locale
+version= 1.03
 md5sum = de8422d068634e7c1068dab4e18b452f
-configure-command =
-  ${perl:location}/bin/perl Makefile.PL

component/perl-File-Listing/buildout.cfg

@@ -6,10 +6,9 @@ parts =
   perl-File-Listing
 
 [perl-File-Listing]
-recipe = slapos.recipe.cmmi
-depends =
-  ${perl-HTTP-Date:location}
-url = http://www.cpan.org/modules/by-module/File/File-Listing-6.04.tar.gz
+<= perl-CPAN-package
+module = File/File-Listing
+version = 6.04
 md5sum = 83f636b477741f3a014585bb9cc079a6
-configure-command =
-  ${perl:location}/bin/perl Makefile.PL
+
+inc = ${perl-HTTP-Date:site_perl}

component/perl-HTML-Encoding/buildout.cfg

@@ -6,10 +6,9 @@ parts =
   perl-HTML-Encoding
 
 [perl-HTML-Encoding]
-recipe = slapos.recipe.cmmi
-depends =
-  ${perl-HTTP-Message:location}
-url = http://www.cpan.org/modules/by-module/HTML/HTML-Encoding-0.61.tar.gz
+<= perl-CPAN-package
+module = HTML/HTML-Encoding
+version = 0.61
 md5sum = bce9f00f04ad055feaa4d6511b30e421
-configure-command =
-  ${perl:location}/bin/perl Makefile.PL
+
+inc = ${perl-HTTP-Message:location}

component/perl-HTML-Parser/buildout.cfg

@@ -6,10 +6,9 @@ parts =
   perl-HTML-Parser
 
 [perl-HTML-Parser]
-recipe = slapos.recipe.cmmi
-depends =
-  ${perl-HTML-Tagset:location}
-url = http://www.cpan.org/modules/by-module/HTML/HTML-Parser-3.71.tar.gz
+<= perl-CPAN-package
+module = HTML/HTML-Parser
+version = 3.71
 md5sum = 9128a45893097dfa3bf03301b19c5efe
-configure-command =
-  ${perl:location}/bin/perl Makefile.PL
+
+inc = ${perl-HTML-Tagset:site_perl}

component/perl-HTML-Tagset/buildout.cfg

@@ -5,8 +5,7 @@ parts =
   perl-HTML-Tagset
 
 [perl-HTML-Tagset]
-recipe = slapos.recipe.cmmi
-url = http://www.cpan.org/modules/by-module/HTML/HTML-Tagset-3.20.tar.gz
+<= perl-CPAN-package
+module = HTML/HTML-Tagset
+version = 3.20
 md5sum = d2bfa18fe1904df7f683e96611e87437
-configure-command =
-  ${perl:location}/bin/perl Makefile.PL

component/perl-HTML-Template/buildout.cfg

@@ -5,8 +5,7 @@ parts =
   perl-HTML-Template
 
 [perl-HTML-Template]
-recipe = slapos.recipe.cmmi
-url = http://www.cpan.org/modules/by-module/HTML/HTML-Template-2.95.tar.gz
+<= perl-CPAN-package
+module = HTML/HTML-Template
+version = 2.95
 md5sum = 6f08e9631af52e6a5f6e4648b89265fe
-configure-command =
-  ${perl:location}/bin/perl Makefile.PL

component/perl-HTTP-Cookies/buildout.cfg

@@ -6,10 +6,9 @@ parts =
   perl-HTTP-Cookies
 
 [perl-HTTP-Cookies]
-recipe = slapos.recipe.cmmi
-depends =
-  ${perl-HTTP-Message:location}
-url = http://www.cpan.org/modules/by-module/HTTP/HTTP-Cookies-6.01.tar.gz
+<= perl-CPAN-package
+module = HTTP/HTTP-Cookies
+version = 6.01
 md5sum = ecfd0eeb88512033352c2f13c9580f03
-configure-command =
-  ${perl:location}/bin/perl Makefile.PL
+
+inc = ${perl-HTTP-Message:site_perl}

component/perl-HTTP-Daemon/buildout.cfg

@@ -6,10 +6,9 @@ parts =
   perl-HTTP-Daemon
 
 [perl-HTTP-Daemon]
-recipe = slapos.recipe.cmmi
-depends =
-  ${perl-HTTP-Message:location}
-url = http://www.cpan.org/modules/by-module/HTTP/HTTP-Daemon-6.01.tar.gz
+<= perl-CPAN-package
+module = HTTP/HTTP-Daemon
+version = 6.01
 md5sum = ed0ae02d25d7f1e89456d4d69732adc2
-configure-command =
-  ${perl:location}/bin/perl Makefile.PL
+
+inc = ${perl-HTTP-Message:site_perl}

component/perl-HTTP-Date/buildout.cfg

@@ -5,8 +5,7 @@ parts =
   perl-HTTP-Date
 
 [perl-HTTP-Date]
-recipe = slapos.recipe.cmmi
-url = http://www.cpan.org/modules/by-module/HTTP/HTTP-Date-6.02.tar.gz
+<= perl-CPAN-package
+module = HTTP/HTTP-Date
+version = 6.02
 md5sum = 52b7a0d5982d61be1edb217751d7daba
-configure-command =
-  ${perl:location}/bin/perl Makefile.PL

component/perl-HTTP-Message/buildout.cfg

@@ -10,14 +10,14 @@ parts =
   perl-HTTP-Message
 
 [perl-HTTP-Message]
-recipe = slapos.recipe.cmmi
-depends =
-  ${perl-Encode-Locale:location}
-  ${perl-HTTP-Date:location}
-  ${perl-IO-HTML:location}
-  ${perl-LWP-MediaTypes:location}
-  ${perl-URI:location}
-url = http://www.cpan.org/modules/by-module/HTTP/HTTP-Message-6.06.tar.gz
+<= perl-CPAN-package
+module = HTTP/HTTP-Message
+version = 6.06
 md5sum = e563ac516e28d33f65bc0f295f625f85
-configure-command =
-  ${perl:location}/bin/perl Makefile.PL
+
+inc =
+  ${perl-Encode-Locale:site_perl}:\
+  ${perl-HTTP-Date:site_perl}:\
+  ${perl-IO-HTML:site_perl}:\
+  ${perl-LWP-MediaTypes:site_perl}:\
+  ${perl-URI:site_perl}

component/perl-HTTP-Negotiate/buildout.cfg

@@ -6,10 +6,9 @@ parts =
   perl-HTTP-Negotiate
 
 [perl-HTTP-Negotiate]
-recipe = slapos.recipe.cmmi
-depends =
-  ${perl-HTTP-Message:location}
-url = http://www.cpan.org/modules/by-module/HTTP/HTTP-Negotiate-6.01.tar.gz
+<= perl-CPAN-package
+module = HTTP/HTTP-Negotiate
+version = 6.01
 md5sum = 1236195250e264d7436e7bb02031671b
-configure-command =
-  ${perl:location}/bin/perl Makefile.PL
+
+inc = ${perl-HTTP-Message:site_perl}

component/perl-IO-HTML/buildout.cfg

@@ -5,8 +5,7 @@ parts =
   perl-IO-HTML
 
 [perl-IO-HTML]
-recipe = slapos.recipe.cmmi
-url = http://www.cpan.org/modules/by-module/IO/IO-HTML-1.00.tar.gz
+<= perl-CPAN-package
+module = IO/IO-HTML
+version = 1.00
 md5sum = fdfa3fe3d61a7fda9236c8d9776cdd65
-configure-command =
-  ${perl:location}/bin/perl Makefile.PL

component/perl-Image-Magick/buildout.cfg

@@ -6,13 +6,15 @@ extends =
 parts = perl-Image-Magick
 
 [perl-Image-Magick]
-recipe = slapos.recipe.cmmi
+<= perl-CPAN-package
+# module = Image/PerlMagick
+# version = 6.77
+# version 6.77 is not in `by-module` folder, so we use url= until we update
 url = http://search.cpan.org/CPAN/authors/id/J/JC/JCRISTY/PerlMagick-6.77.tar.gz
 md5sum = fa0f66fa0cabbd1b196254f94dec8e99
 patch-options = -p0
 patches =
   ${:_profile_base_location_}/perl-Image-Magick_MakefilePL.patch#31043e2b79e725d3b251aa09b4549046
-configure-command =
-  ${perl:location}/bin/perl Makefile.PL LIBS="-L${imagemagick:location}/lib -Wl,-R${imagemagick:location}/lib -L${perl:location}/libs-c -Wl,-R${perl:location}/libs-c" INC="-I${imagemagick:location}/include/ImageMagick"
+extra-configure-args = LIBS="-L${imagemagick:location}/lib -Wl,-R${imagemagick:location}/lib -L${perl:location}/libs-c -Wl,-R${perl:location}/libs-c" INC="-I${imagemagick:location}/include/ImageMagick"
 environment =
   PATH=${patch:location}/bin:%(PATH)s

component/perl-JSON/buildout.cfg

@@ -5,8 +5,7 @@ parts =
   perl-JSON
 
 [perl-JSON]
-recipe = slapos.recipe.cmmi
-url = http://www.cpan.org/modules/by-module/JSON/JSON-2.90.tar.gz
+<= perl-CPAN-package
+module = JSON/JSON
+version = 2.90
 md5sum = e1512169a623e790a3f69b599cc1d3b9
-configure-command =
-  ${perl:location}/bin/perl Makefile.PL

component/perl-LWP-MediaTypes/buildout.cfg

@@ -6,10 +6,9 @@ parts =
   perl-LWP-MediaTypes
 
 [perl-LWP-MediaTypes]
-recipe = slapos.recipe.cmmi
-depends =
-  ${perl-URI:location}
-url = http://www.cpan.org/modules/by-module/LWP/LWP-MediaTypes-6.02.tar.gz
+<= perl-CPAN-package
+module = LWP/LWP-MediaTypes
+version = 6.02
 md5sum = 8c5f25fb64b974d22aff424476ba13c9
-configure-command =
-  ${perl:location}/bin/perl Makefile.PL
+
+inc = ${perl-URI:site_perl}

component/perl-Net-HTTP/buildout.cfg

@@ -5,8 +5,7 @@ parts =
   perl-Net-HTTP
 
 [perl-Net-HTTP]
-recipe = slapos.recipe.cmmi
-url = http://www.cpan.org/modules/by-module/Net/Net-HTTP-6.06.tar.gz
+<= perl-CPAN-package
+module = Net/Net-HTTP
+version = 6.06
 md5sum = 6e74d76205f168775de68347266793a7
-configure-command =
-  ${perl:location}/bin/perl Makefile.PL

component/perl-Net-IP/buildout.cfg

@@ -5,11 +5,7 @@ parts =
   perl-Net-IP
 
 [perl-Net-IP]
-recipe = slapos.recipe.cmmi
-url = http://www.cpan.org/modules/by-module/Net/Net-IP-1.26.tar.gz
+<= perl-CPAN-package
+module = Net/Net-IP
+version = 1.26
 md5sum = 3a98e3ac45d69ea38a63a7e678bd716d
-configure-command =
-  ${perl:location}/bin/perl Makefile.PL
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-make-options =
-  INSTALLSITESCRIPT=${:location}/bin

component/perl-SGML-Parser-OpenSP/buildout.cfg

@@ -7,13 +7,13 @@ parts =
   perl-SGML-Parser-OpenSP
 
 [perl-SGML-Parser-OpenSP]
-recipe = slapos.recipe.cmmi
-depends =
-  ${perl-Class-Accessor:location}
-url = http://www.cpan.org/modules/by-module/SGML/SGML-Parser-OpenSP-0.994.tar.gz
+<= perl-CPAN-package
+module = SGML/SGML-Parser-OpenSP
+version = 0.994
 md5sum = b1ee0244e9daa4d37f28cf32c4753691
-configure-command =
-  ${perl:location}/bin/perl Makefile.PL \
+
+inc = ${perl-Class-Accessor:site_perl}
+extra-configure-args = \
   INC=-I${opensp:location}/include \
   LIBS="-lstdc++ -L${opensp:location}/lib -losp"
 make-options =

component/perl-Search-Xapian/buildout.cfg

-[buildout]
-extends =
-  ../perl/buildout.cfg
-  ../xapian/buildout.cfg
-parts =
-  perl-Search-Xapian
-
-[perl-Search-Xapian]
-recipe = slapos.recipe.build:cpan
-modules =
-  O/OL/OLLY/Search-Xapian-1.2.10.0.tar.gz
-environment =
-  XAPIAN_CONFIG=${xapian:location}/bin/xapian-config
-perl = perl

component/perl-Term-ReadLine-Gnu/buildout.cfg

@@ -7,13 +7,18 @@ extends =
 parts = perl-Term-ReadLine-Gnu
 
 [perl-Term-ReadLine-Gnu]
-recipe = slapos.recipe.cmmi
-url = http://search.cpan.org/CPAN/authors/id/H/HA/HAYASHI/Term-ReadLine-Gnu-1.20.tar.gz
+<= perl-CPAN-package
+module = Term/Term-Readline-Gnu
+version = 1.20
 md5sum = fa33510193b89a2ada74fcef00816322
+
 patch-options = -p0
 patches =
   ${:_profile_base_location_}/perl-Term-ReadLine-Gnu.patch#d4e4624e717c8da63e4d153149d57b68
-configure-command =
-  ${perl:location}/bin/perl Makefile.PL --libdir=${readline:location}/lib --includedir="${readline:location}/include" LIBS="-Wl,-R${readline:location}/lib -L${ncurses:location}/lib -Wl,-R${ncurses:location}/lib" INC="-I${ncurses:location}/include"
+extra-configure-args = \
+  --includedir="${readline:location}/include" \
+  --libdir=${readline:location}/lib \
+  INC="-I${ncurses:location}/include" \
+  LIBS="-Wl,-R${readline:location}/lib -L${ncurses:location}/lib -Wl,-R${ncurses:location}/lib"
 environment =
   PATH=${patch:location}/bin:%(PATH)s

component/perl-Text-Iconv/buildout.cfg

-[buildout]
-extends =
-  ../perl/buildout.cfg
-  ../libiconv/buildout.cfg
-parts = perl-Text-Iconv
-
-[perl-Text-Iconv]
-recipe = slapos.recipe.build:cpan
-cpan-configuration =
-  makepl_arg='LIBS="-L${libiconv:location}/lib -Wl,-R${libiconv:location}/lib" INC="-I${libiconv:location}/include"'
-modules =
-  M/MP/MPIOTR/Text-Iconv-1.7.tar.gz
-perl = perl

component/perl-URI/buildout.cfg

@@ -5,8 +5,7 @@ parts =
   perl-URI
 
 [perl-URI]
-recipe = slapos.recipe.cmmi
-url = http://www.cpan.org/modules/by-module/URI/URI-1.71.tar.gz
-md5sum = 247c3da29a794f72730e01aa5a715daf
-configure-command =
-  ${perl:location}/bin/perl Makefile.PL
+<= perl-CPAN-package
+module = URI/URI
+version = 1.72
+md5sum = cd56d81ed429efaa97e7f3ff08851b48

component/perl-WWW-RobotRules/buildout.cfg

@@ -5,8 +5,7 @@ parts =
   perl-WWW-RobotRules
 
 [perl-WWW-RobotRules]
-recipe = slapos.recipe.cmmi
-url = http://www.cpan.org/modules/by-module/WWW/WWW-RobotRules-6.02.tar.gz
+<= perl-CPAN-package
+module = WWW/WWW-RobotRules
+version = 6.02
 md5sum = b7186e8b8b3701e70c22abf430742403
-configure-command =
-  ${perl:location}/bin/perl Makefile.PL

component/perl-XML-LibXML/buildout.cfg

@@ -9,14 +9,15 @@ parts =
   perl-XML-LibXML
 
 [perl-XML-LibXML]
-recipe = slapos.recipe.cmmi
-depends =
-  ${perl-XML-NamespaceSupport:location}
-  ${perl-XML-SAX:location}
-url = http://www.cpan.org/modules/by-module/XML/XML-LibXML-2.0116.tar.gz
+<= perl-CPAN-package
+module = XML/XML-LibXML
+version = 2.0116
 md5sum = a53a743bf053a0cb4afb41513fb8a684
-configure-command =
-  ${perl:location}/bin/perl Makefile.PL DEBUG=1 \
+
+inc = ${perl-XML-NamespaceSupport:site_perl}:${perl-XML-SAX:site_perl}
+install-inc = blib/lib
+extra-configure-args = \
+  DEBUG=1 \
   INC=-I${libxml2:location}/include/libxml2 \
   LIBS="-L${libxml2:location}/lib -L${zlib:location}/lib"
 # Parallel make does not work for this package on fast machines
@@ -25,4 +26,3 @@ make-options =
   OTHERLDFLAGS=" -Wl,-rpath=${libxml2:location}/lib -Wl,-rpath=${zlib:location}/lib" -j1
 environment =
   LD_LIBRARY_PATH=${libxml2:location}/lib:${zlib:location}/lib
-  PERLLIB=blib/lib

component/perl-XML-LibXSLT/buildout.cfg

-[buildout]
-extends =
-  ../perl/buildout.cfg
-  ../libxslt/buildout.cfg
-  ../libxml2/buildout.cfg
-  ../zlib/buildout.cfg
-parts = perl-XML-LibXSLT
-
-[perl-XML-LibXSLT]
-recipe = slapos.recipe.build:cpan
-cpan-configuration =
-  makepl_arg='LIBS="-L${libxslt:location}/lib -Wl,-R${libxslt:location}/lib -L${zlib:location}/lib -Wl,-R${zlib:location}/lib -L${libxml2:location}/lib -Wl,-R${libxml2:location}/lib" INC="-I${libxslt:location}/include -I${libxml2:location}/include/libxml2"'
-modules =
-  S/SH/SHLOMIF/XML-LibXSLT-1.78.tar.gz
-perl = perl

component/perl-XML-NamespaceSupport/buildout.cfg

@@ -5,8 +5,9 @@ parts =
   perl-XML-NamespaceSupport
 
 [perl-XML-NamespaceSupport]
-recipe = slapos.recipe.cmmi
-url = http://www.cpan.org/modules/by-module/XML/XML-NamespaceSupport-1.11.tar.gz
+<= perl-CPAN-package
+module = XML/XML-NamespaceSupport
+version = 1.11
 md5sum = 222cca76161cd956d724286d36b607da
-configure-command =
-  ${perl:location}/bin/perl -I. Makefile.PL
+
+install-inc = .

component/perl-XML-Parser/buildout.cfg

@@ -7,18 +7,17 @@ parts =
   perl-XML-Parser
 
 [perl-XML-Parser]
-recipe = slapos.recipe.cmmi
-depends =
-  ${perl-libwww-perl:location}
-url = http://www.cpan.org/modules/by-module/XML/XML-Parser-2.41.tar.gz
+<= perl-CPAN-package
+module = XML/XML-Parser
+version = 2.41
 md5sum = c320d2ffa459e6cdc6f9f59c1185855e
-configure-command =
-  ${perl:location}/bin/perl Makefile.PL \
+
+inc = ${perl-libwww-perl:site_perl}
+install-inc = blib/lib
+extra-configure-args =
     EXPATINCPATH=${libexpat:location}/include \
-    EXPATLIBPATH=${libexpat:location}/lib \
+    EXPATLIBPATH=${libexpat:location}/lib
 # Parallel make does not work for this package on fast machines
 # with many cores
 make-options =
   OTHERLDFLAGS="-Wl,-rpath=${libexpat:location}/lib" -j1
-environment =
-  PERLLIB=blib/lib

component/perl-XML-SAX-Base/buildout.cfg

@@ -5,8 +5,7 @@ parts =
   perl-XML-SAX-Base
 
 [perl-XML-SAX-Base]
-recipe = slapos.recipe.cmmi
-url = http://www.cpan.org/modules/by-module/XML/XML-SAX-Base-1.08.tar.gz
+<= perl-CPAN-package
+module = XML/XML-SAX-Base
+version = 1.08
 md5sum = 38c8c3247dfd080712596118d70dbe32
-configure-command =
-  ${perl:location}/bin/perl Makefile.PL

component/perl-XML-SAX/buildout.cfg

@@ -7,14 +7,14 @@ parts =
   perl-XML-SAX
 
 [perl-XML-SAX]
-recipe = slapos.recipe.cmmi
-depends =
-  ${perl-XML-NamespaceSupport:location}
-  ${perl-XML-SAX-Base:location}
-url = http://www.cpan.org/modules/by-module/XML/XML-SAX-0.99.tar.gz
+<= perl-CPAN-package
+module = XML/XML-SAX
+version = 0.99
 md5sum = 290f5375ae87fdebfdb5bc3854019f24
-# say 'y' for 'Do you want XML::SAX to alter ParserDetails.ini? [Y]' question.
-configure-command =
-  echo y | ${perl:location}/bin/perl Makefile.PL
+
+inc = ${perl-XML-NamespaceSupport:site_perl}:${perl-XML-SAX-Base:site_perl}
+install-inc = blib/lib
+
+# PERL_MM_USE_DEFAULT: To answer default answers to prompt ( see http://search.cpan.org/~bingos/ExtUtils-MakeMaker-7.34/lib/ExtUtils/MakeMaker.pm )
 environment =
-  PERLLIB=blib/lib
+  PERL_MM_USE_DEFAULT=yes

component/perl-libwww-perl/buildout.cfg

@@ -17,24 +17,21 @@ parts =
   perl-libwww-perl
 
 [perl-libwww-perl]
-recipe = slapos.recipe.cmmi
-depends =
-  ${perl-Data-Dump:location}
-  ${perl-Encode-Locale:location}
-  ${perl-File-Listing:location}
-  ${perl-HTML-Parser:location}
-  ${perl-HTTP-Cookies:location}
-  ${perl-HTTP-Daemon:location}
-  ${perl-HTTP-Message:location}
-  ${perl-HTTP-Negotiate:location}
-  ${perl-LWP-MediaTypes:location}
-  ${perl-Net-HTTP:location}
-  ${perl-URI:location}
-  ${perl-WWW-RobotRules:location}
-url = http://www.cpan.org/modules/by-module/LWP/libwww-perl-6.06.tar.gz
+<= perl-CPAN-package
+module = LWP/libwww-perl
+version = 6.06
 md5sum = 292496bd2a13da95903b383f59009200
-configure-command =
-  ${perl:location}/bin/perl Makefile.PL
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-make-options =
-  INSTALLSITESCRIPT=${:location}/bin
+
+inc =
+  ${perl-Data-Dump:site_perl}:\
+  ${perl-Encode-Locale:site_perl}:\
+  ${perl-File-Listing:site_perl}:\
+  ${perl-HTML-Parser:site_perl}:\
+  ${perl-HTTP-Cookies:site_perl}:\
+  ${perl-HTTP-Daemon:site_perl}:\
+  ${perl-HTTP-Message:site_perl}:\
+  ${perl-HTTP-Negotiate:site_perl}:\
+  ${perl-LWP-MediaTypes:site_perl}:\
+  ${perl-Net-HTTP:site_perl}:\
+  ${perl-URI:site_perl}:\
+  ${perl-WWW-RobotRules:site_perl}

component/perl/buildout.cfg

@@ -26,3 +26,93 @@ configure-command =
 environment =
   PATH=${patch:location}/bin:%(PATH)s
 post-make-hook = ${:_profile_base_location_}/perl-create-libs-symlink.py#943453b7d3ff8d49ed12d44a7f7076ee:post_make_hook
+
+
+[perl-CPAN-package]
+# Macro to install a perl package from CPAN
+# This macro will generate a perl wrapper as {:perl-bin} and rewrite all
+# scripts installed by the package to use this perl. Executable scripts are
+# installed in ${:perl-PATH}
+
+# Inputs:
+#  - module name, ie. Category/Category-Name
+module = (required)
+#  - module version
+version = (required)
+#  - checksum of module
+md5sum = (required)
+
+#  - colon (:) separated site perl of runtime dependencies, for example
+#  ${perl-X-Y:site_perl}:${perl-X-Z:site_perl} these paths will be included in
+#  the generated wrappers
+inc =
+#  - colon (:) separated site perl of install dependencies, for example
+#  ${perl-X-Y:site_perl}:${perl-X-Z:site_perl} these paths will be used only
+#  for installation. A typical use case is to add current directory (.) for
+#  packages using a local version of Module::Install.
+install-inc =
+#  - extra arguments passed to perl Makefile.PL
+extra-configure-args =
+
+# Outputs:
+#  - site_perl, to use in inc in dependent packages
+site_perl=${:location}/lib/site_perl/${perl:version}:${:location}:${:inc}
+
+#  - a $PATH that contain the perl wrapper
+perl-PATH = ${:location}/bin/
+#  - the path for a perl wrapper with @INC set to this CPAN package and all the
+#  dependencies
+perl-bin = ${:perl-PATH}/perl
+
+
+# Implementation
+recipe = slapos.recipe.cmmi
+url = https://www.cpan.org/modules/by-module/${:module}-${:version}.tar.gz
+configure-command =
+  PERL5LIB="${:inc}:${:install-inc}" \
+  ${perl:location}/bin/perl \
+  Makefile.PL \
+  PREFIX=${:location} \
+  ${:extra-configure-args}
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+# Install scripts in "perl-bin", but create wrappers in ./bin/
+make-options =
+  INSTALLSITESCRIPT=${:location}/perl-bin/
+
+make-binary=
+  PERL5LIB="${:inc}:${:install-inc}" make
+
+# this post-make-hook is same for all users of the macro.
+post-make-hook = ${:_profile_base_location_}/../../component/perl/perl-CPAN-package-create-wrapper.py#d012f7ba3300b14b2c6b173351d410be:post_make_hook
+
+perl_location = ${perl:location}
+
+
+[perl-wrapper]
+# Macro to generate a perl wrapper with @INC set as ${:inc}
+# The wrapper will be named as the section name, in buildout's bin directory.
+#
+# Note that this is usually not needed, because each part installed with
+# perl-CPAN-package generates its own wrapper with the package and all
+# dependencies available.
+# This macro is useful to build a wrapper with several independent package
+# available.
+# It also takes care of executing perl with -I argument and not with $PERL5LIB
+# environment variable, because the later is ignored when perl runs in tainted
+# mode ( with -T argument )
+#
+# Inputs:
+#  - inc : colon (:) separated site perl of modules to include in @INC
+# Outputs:
+#  - perl-bin : an executable perl
+recipe = slapos.recipe.template:jinja2
+template = inline: 
+  #!/bin/sh
+  {% set inc = "${:inc}".split(':') %} {# XXX we could remove duplicates from inc #}
+  exec ${perl:location}/bin/perl \
+  {% for item in inc -%}{% if item %}  -I "{{ item }}" \
+  {% endif %}{% endfor %}  "$@"
+mode = 0755
+rendered = ${buildout:bin-directory}/${:_buildout_section_name_}
+perl-bin = ${:rendered}
+

component/perl/perl-CPAN-package-create-wrapper.py

+import os
+import textwrap
+import glob
+
+def post_make_hook(options, buildout, environmet):
+  prefix = options['prefix']
+  site_perl = options['site_perl']
+  perl_location = options['perl_location']
+  bin_folder = os.path.join(prefix, 'bin')
+  if not os.path.isdir(bin_folder):
+      os.mkdir(bin_folder)
+
+  # install a ./bin/perl wrapper with @INC set
+  perl_wrapper_path = os.path.join(bin_folder, 'perl')
+  with open(perl_wrapper_path, 'w') as wrapper:
+      wrapper.write('''#!/bin/sh
+export PERL5LIB="{site_perl}:$PERL5LIB"
+exec {perl_location}/bin/perl "$@"
+'''.format(**locals()))
+  os.chmod(perl_wrapper_path, 0755)
+
+  # create a wrapper for each scripts installed in perl-bin
+  for script_path in glob.glob(os.path.join(prefix, 'perl-bin', '*')):
+      script_name = os.path.basename(script_path)
+      wrapper_path = os.path.join(prefix, 'bin', script_name)
+      with open(wrapper_path, 'w') as wrapper:
+          wrapper.write('''#!/bin/sh
+export PERL5LIB="{site_perl}:$PERL5LIB"
+exec {perl_location}/bin/perl {script_path} "$@"
+'''.format(**locals()))
+      os.chmod(wrapper_path, 0755)

component/pkgconfig/buildout.cfg

@@ -13,9 +13,10 @@ extends =
 
 [pkgconfig]
 recipe = slapos.recipe.cmmi
+shared = true
 url = https://pkgconfig.freedesktop.org/releases/pkg-config-0.29.tar.gz
 md5sum = 77f27dce7ef88d0634d0d6f90e03a77f
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
+location = @@LOCATION@@
 # build pkg-config twice so that second configure can use pkg-config
 # to compute GLIB_CFLAGS and GLIB_LIBS.
 pre-configure =

component/poppler/buildout.cfg

@@ -13,6 +13,7 @@ extends =
 
 [poppler]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://poppler.freedesktop.org/poppler-0.43.0.tar.xz
 md5sum = 1d2b001663119855cdfbc0713dbfb9c6
 configure-options =

component/popt/buildout.cfg

@@ -4,6 +4,7 @@ parts =
 
 [popt]
 recipe = slapos.recipe.cmmi
+shared = true
 url = ftp://anduin.linuxfromscratch.org/BLFS/svn/p/popt-1.16.tar.gz
 md5sum = 3743beefa3dd6247a73f8f7a32c14c33
 configure-options =

component/postfix/buildout.cfg

@@ -11,9 +11,10 @@ extends =
 
 [postfix]
 recipe = slapos.recipe.cmmi
+shared = true
 url = ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-2.11.6.tar.gz
 md5sum = c3277d05b78eaaf5955406bc7b6d2b9f
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
+location = @@LOCATION@@
 patch-options = -p1
 patches =
   ${:_profile_base_location_}/noroot.patch#738bcc97b8044c45b58708bdf3a84b8e

component/python-2.7/buildout.cfg

@@ -28,13 +28,14 @@ python = python2.7
 
 [python2.7]
 recipe = slapos.recipe.cmmi
+shared = true
 package_version = 2.7.14
 package_version_suffix =
 md5sum = 1f6db41ad91d9eb0a6f0c769b8613c5b
 
 # 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_}
+prefix = @@LOCATION@@
 version = 2.7
 executable = ${:prefix}/bin/python${:version}
 

component/rdiff-backup/buildout.cfg

@@ -25,7 +25,7 @@ find-links = http://pkgs.fedoraproject.org/repo/pkgs/rdiff-backup/rdiff-backup-1
 [rdiff-backup-build-1.3.4]
 <= rdiff-backup-build
 # use our own version
-find-links = http://www.nexedi.org/static/packages/source/rdiff-backup-1.3.4nxd4.tar.gz
+find-links = http://www.nexedi.org/static/packages/source/rdiff-backup-1.3.4nxd2.tar.gz
 patches =
   ${:_profile_base_location_}/rdiff-backup-1.3.4-librsync-1.0.0.patch#31fafc8bc4a00f002f52008a9f3b671f
 

component/readline/buildout.cfg

@@ -10,6 +10,7 @@ parts =
 # readline-5.x is still used for GPL2 only softwares.
 [readline5]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://ftp.gnu.org/gnu/readline/readline-5.2.tar.gz
 patches =
   http://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-001#9d4d41622aa9b230c57f68548ce87d8f
@@ -35,6 +36,7 @@ environment =
 
 [readline]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://ftp.gnu.org/gnu/readline/readline-6.3.tar.gz
 md5sum = 33c8fb279e981274f485fd91da77e94a
 patches =

component/sed/buildout.cfg

@@ -4,6 +4,7 @@ parts =
 
 [sed]
 recipe = slapos.recipe.cmmi
+shared = true
 url = ftp://ftp.gnu.org/gnu/sed/sed-4.2.1.tar.gz
 md5sum = f0fd4d7da574d4707e442285fd2d3b86
 environment =

component/serf/buildout.cfg

@@ -9,6 +9,7 @@ extends =
 
 [serf]
 recipe = slapos.recipe.cmmi
+shared = true
 url = https://serf.googlecode.com/files/serf-1.2.1.tar.bz2
 md5sum = 4f8e76c9c6567aee1d66aba49f76a58b
 configure-options =

component/sqlite3/buildout.cfg

@@ -5,6 +5,7 @@ parts =
 
 [sqlite3]
 recipe = slapos.recipe.cmmi
+shared = true
 url = https://sqlite.org/2018/sqlite-autoconf-3220000.tar.gz
 md5sum = 96b5648d542e8afa6ab7ffb8db8ddc3d
 configure-options =
@@ -12,4 +13,4 @@ configure-options =
   --enable-readline
 environment =
   CPPFLAGS=-I${readline:location}/include -I${ncurses:location}/include
-  LDFLAGS=-L${buildout:parts-directory}/${:_buildout_section_name_} -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${readline:location}/lib -L${ncurses:location}/lib
+  LDFLAGS=-L@@LOCATION@@ -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${readline:location}/lib -L${ncurses:location}/lib

component/stunnel/buildout.cfg

@@ -6,6 +6,7 @@ parts =
 
 [stunnel]
 recipe = slapos.recipe.cmmi
+shared = true
 url = https://www.stunnel.org/downloads/archive/5.x/stunnel-5.14.tar.gz
 md5sum = e716501960dc6856d80f92547298f724
 configure-options =

component/subversion/buildout.cfg

@@ -20,6 +20,7 @@ parts =
 
 [subversion]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://apache.mirrors.tds.net/subversion/subversion-1.8.14.tar.bz2
 md5sum = fe476ba26d6835eba4393780ea907361
 # Patch available thanks to gentoo developpers
@@ -58,6 +59,7 @@ environment =
 
 [subversion-1.9]
 recipe = hexagonit.recipe.cmmi
+shared = true
 url = http://www.apache.org/dist/subversion/subversion-1.7.9.tar.gz
 md5sum = dfb083e8bfac88aa28d606168b08e4ff
 configure-options =

component/swig/buildout.cfg

@@ -9,6 +9,7 @@ parts =
 
 [swig]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://prdownloads.sourceforge.net/swig/swig-3.0.10.tar.gz
 md5sum = bb4ab8047159469add7d00910e203124
 configure-options =

component/systemd/buildout.cfg

@@ -5,7 +5,6 @@ extends =
   ../gperf/buildout.cfg
   ../intltool/buildout.cfg
   ../libcap/buildout.cfg
-  ../perl/buildout.cfg
   ../perl-XML-Parser/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../util-linux/buildout.cfg
@@ -16,12 +15,10 @@ recipe = slapos.recipe.cmmi
 # XXX This version requires Linux kernel >= 3.7.
 url = https://www.freedesktop.org/software/systemd/systemd-221.tar.xz
 md5sum = b4d5a253841cf28a98b7ec99c45e3716
-depends =
-  ${perl-XML-Parser:location}
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 make-options = rootprefix=${:location} SYSTEM_SYSVINIT_PATH=${:location}/etc/init.d
 environment =
-  PATH=${coreutils:location}/bin:${gettext:location}/bin:${gperf:location}/bin:${intltool:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PATH=${coreutils:location}/bin:${gettext:location}/bin:${gperf:location}/bin:${intltool:location}/bin:${perl-XML-Parser:perl-PATH}:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
   CPPFLAGS=-I${libcap:location}/include -I${util-linux:location}/include
   LDFLAGS=-L${libcap:location}/lib -Wl,-rpath=${libcap:location}/lib -L${util-linux:location}/lib -Wl,-rpath=${util-linux:location}/lib
   PKG_CONFIG_PATH=${util-linux:location}/lib/pkgconfig

component/tar/buildout.cfg

@@ -6,6 +6,7 @@ parts = tar
 
 [tar]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://ftp.gnu.org/gnu/tar/tar-1.29.tar.xz
 md5sum = a1802fec550baaeecff6c381629653ef
 environment =

component/tesseract/buildout.cfg

 [buildout]
-
 extends =
-  ../pkgconfig/buildout.cfg
   ../autoconf/buildout.cfg
   ../automake/buildout.cfg
+  ../gcc/buildout.cfg
   ../jbigkit/buildout.cfg
   ../leptonica/buildout.cfg
   ../libpng/buildout.cfg
   ../libtool/buildout.cfg
   ../patch/buildout.cfg
-  ../webp/buildout.cfg
+  ../fontconfig/buildout.cfg
+  ../lcms/buildout.cfg
+  ../pkgconfig/buildout.cfg
 
 parts =
   tesseract
@@ -23,10 +24,7 @@ url = https://github.com/tesseract-ocr/tesseract/archive/6b250b58121a9858d3e3019
 md5sum = fdc38148ad8eb1bd0485a217503dd6d5
 pkg_config_depends = ${leptonica:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${fontconfig:pkg_config_depends}:${lcms2:location}/lib/pkgconfig:${xz-utils:location}/lib/pkgconfig
 pre-configure =
-  aclocal -I${pkgconfig:location}/share/aclocal -I${libtool:location}/share/aclocal
-  ./autogen.sh
-  autoreconf -ivf
-  autoconf -Wno-portability
+  autoreconf -ivf -I${pkgconfig:location}/share/aclocal -I${libtool:location}/share/aclocal -Wno-portability
 
 configure-options =
   --disable-static
@@ -34,19 +32,11 @@ configure-options =
 # XXX: tesseract seems not easily configurable at runtime about where to find
 # its trained data, so we set its datarootdir above to a controlled location
 
-# tesseract has a non-standard way of testing for leptonica, hence the
-# LIBLEPT_HEADERSDIR entry below:
 environment =
-  PATH=${pkgconfig:location}/bin:${autoconf:location}/bin:${automake:location}/bin:${libtool:location}/bin:${m4:location}/bin:${patch:location}/bin:%(PATH)s
+  PATH=${pkgconfig:location}/bin:${autoconf:location}/bin:${automake:location}/bin:${gcc:location}/bin:${libtool:location}/bin:${m4:location}/bin:${patch:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${:pkg_config_depends}
-  ACLOCAL_ARGS=-I${libtool:location}/share/aclocal
-  ACLOCAL_PATH=${pkgconfig:location}/share/aclocal:${libtool:location}/share/aclocal
-  LIBLEPT_HEADERSDIR=${leptonica:location}/include
-  CPPFLAGS=-I${leptonica:location}/include
-  LDFLAGS =-L${leptonica:location}/lib -Wl,-rpath=${leptonica:location}/lib -L${jbigkit:location}/lib -Wl,-rpath=${jbigkit:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
-
-make-options =
-  LIBTOOL=${libtool:location}/bin/libtool
+  LD_LIBRARY_PATH=${gcc:location}/lib:${gcc:location}/lib64
+  LDFLAGS=-Wl,-rpath=${gcc:location}/lib -Wl,-rpath=${gcc:location}/lib64 -L${leptonica:location}/lib -Wl,-rpath=${leptonica:location}/lib -L${jbigkit:location}/lib -Wl,-rpath=${jbigkit:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
 
 [tesseract-traineddata]
 location = ${buildout:parts-directory}/${:_buildout_section_name_}

component/tokyocabinet/buildout.cfg

@@ -6,6 +6,7 @@ parts = tokyocabinet
 
 [tokyocabinet]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://fallabs.com/tokyocabinet/tokyocabinet-1.4.48.tar.gz
 md5sum = fd03df6965f8f56dd5b8518ca43b4f5e
 
@@ -14,4 +15,4 @@ configure-options =
   --with-bzip=${bzip2:location}
 
 environment =
-  LDFLAGS =-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${buildout:parts-directory}/${:_buildout_section_name_}/lib
+  LDFLAGS =-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=@@LOCATION@@/lib

component/unixodbc/buildout.cfg

@@ -4,6 +4,7 @@ parts=
 
 [unixodbc]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://www.unixodbc.org/unixODBC-2.3.5.tar.gz
 md5sum = abf14cf943f1f8c5e63a24cb26d54fd9
-post-install = ln -s ${buildout:parts-directory}/${:_buildout_section_name_}/lib/libodbcinst.so ${buildout:parts-directory}/${:_buildout_section_name_}/lib/libodbcinst.so.1
+post-install = ln -s @@LOCATION@@/lib/libodbcinst.so @@LOCATION@@/lib/libodbcinst.so.1

component/w3-validator/buildout.cfg

@@ -21,22 +21,25 @@ versions = versions
 [versions]
 erp5.recipe.w3validator = 1.0.2
 
+[w3-validator-perl]
+<= perl-wrapper
+inc =
+  ${perl-CGI:site_perl}:\
+  ${perl-Config-General:site_perl}:\
+  ${perl-Encode-HanExtra:site_perl}:\
+  ${perl-HTML-Encoding:site_perl}:\
+  ${perl-HTML-Parser:site_perl}:\
+  ${perl-HTML-Template:site_perl}:\
+  ${perl-JSON:site_perl}:\
+  ${perl-Net-IP:site_perl}:\
+  ${perl-SGML-Parser-OpenSP:site_perl}:\
+  ${perl-URI:site_perl}:\
+  ${perl-XML-LibXML:site_perl}:\
+  ${perl-libwww-perl:site_perl}
+
 [w3-validator]
 recipe = erp5.recipe.w3validator
-depends =
-  ${perl-CGI:location}
-  ${perl-Config-General:location}
-  ${perl-Encode-HanExtra:location}
-  ${perl-HTML-Encoding:location}
-  ${perl-HTML-Parser:location}
-  ${perl-HTML-Template:location}
-  ${perl-JSON:location}
-  ${perl-Net-IP:location}
-  ${perl-SGML-Parser-OpenSP:location}
-  ${perl-URI:location}
-  ${perl-XML-LibXML:location}
-  ${perl-libwww-perl:location}
-perl-path = ${perl:location}/bin/perl
+perl-path = ${w3-validator-perl:perl-bin}
 # validator-1_3-release in https://dvcs.w3.org/hg/markup-validator/tags
 validator-url = https://dvcs.w3.org/hg/markup-validator/archive/6c6c7c1f69c5.tar.bz2
 dtd-url =

component/w3m/buildout.cfg

@@ -14,6 +14,7 @@ parts =
 
 [w3m]
 recipe = slapos.recipe.cmmi
+shared = true
 md5sum = 1b845a983a50b8dec0169ac48479eacc
 url = http://downloads.sourceforge.net/project/w3m/w3m/w3m-0.5.3/w3m-0.5.3.tar.gz
 configure-options =

component/webp/buildout.cfg

@@ -12,6 +12,7 @@ extends =
 
 [webp]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://downloads.webmproject.org/releases/webp/libwebp-0.4.1.tar.gz
 md5sum = 42bc79613ec5ee5b0e68ba97839c981e
 configure-options =

component/wget/buildout.cfg

@@ -13,6 +13,7 @@ parts =
 
 [wget]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://ftp.gnu.org/gnu/wget/wget-1.19.5.tar.lz
 md5sum = 4ee511011a15f4207bea8b2993c343ee
 configure-options =

component/xorg/buildout.cfg

@@ -14,6 +14,7 @@ extends =
   ../openssl/buildout.cfg
   ../patch/buildout.cfg
   ../perl/buildout.cfg
+  ../perl-XML-Parser/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../zlib/buildout.cfg
 
@@ -30,11 +31,13 @@ ACLOCAL=${xorg-util-macros:location}/share/aclocal
 
 [xorg-util-macros]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://www.x.org/releases/X11R7.7/src/everything/util-macros-1.17.tar.bz2
 md5sum = 4f41667e1bf4938bb2b24fa09d517f77
 
 [xproto]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://www.x.org/releases/X11R7.7/src/everything/xproto-7.0.23.tar.bz2
 md5sum = d4d241a4849167e4e694fe73371c328c
 configure-options =
@@ -47,6 +50,7 @@ environment =
 
 [xextproto]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://www.x.org/releases/X11R7.7/src/everything/xextproto-7.2.1.tar.bz2
 md5sum = eaac343af094e6b608cf15cfba0f77c5
 configure-options =
@@ -59,6 +63,7 @@ environment =
 
 [xtrans]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://www.x.org/releases/X11R7.7/src/everything/xtrans-1.2.7.tar.bz2
 md5sum = 84c66908cf003ad8c272b0eecbdbaee3
 patches =
@@ -74,6 +79,7 @@ environment =
 
 [libXau]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://www.x.org/releases/X11R7.7/src/everything/libXau-1.0.7.tar.bz2
 md5sum = 2d241521df40d27034413436d1a1465c
 configure-options =
@@ -84,6 +90,7 @@ environment =
 
 [xcbproto]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://xcb.freedesktop.org/dist/xcb-proto-1.8.tar.bz2
 md5sum = a5de3432cc6e43cc6a27f241dbb991b1
 environment =
@@ -92,11 +99,13 @@ environment =
 
 [xorg-libpthread-stubs]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.bz2
 md5sum = e8fa31b42e13f87e8f5a7a2b731db7ee
 
 [libxcb]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://xcb.freedesktop.org/dist/libxcb-1.9.1.tar.bz2
 md5sum = ed632cb0dc31b6fbd7ea5c0f931cf5a4
 patches =
@@ -116,6 +125,7 @@ environment =
 
 [libXext]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://ftp.x.org/pub/individual/lib/libXext-1.3.3.tar.bz2
 md5sum = 52df7c4c1f0badd9f82ab124fb32eb97
 pkg_config_depends = ${libX11:location}/lib/pkgconfig:${libX11:pkg_config_depends}
@@ -134,6 +144,7 @@ configure-options =
 
 [inputproto]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://www.x.org/releases/X11R7.7/src/everything/inputproto-2.2.tar.bz2
 md5sum = 13c8aedaf98a92e282b7e456c0a5bed9
 environment =
@@ -142,6 +153,7 @@ environment =
 
 [kbproto]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://www.x.org/releases/X11R7.7/src/everything/kbproto-1.0.6.tar.bz2
 md5sum = 677ea8523eec6caca86121ad2dca0b71
 environment =
@@ -150,6 +162,7 @@ environment =
 
 [libX11]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://ftp.x.org/pub/individual/lib/libX11-1.6.2.tar.bz2
 md5sum = c35d6ad95b06635a524579e88622fdb5
 pkg_config_depends = ${inputproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xorg-util-macros:location}/share/pkgconfig:${xproto:location}/lib/pkgconfig:${xtrans:location}/share/pkgconfig
@@ -171,6 +184,7 @@ environment =
 
 [libXdmcp]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://www.x.org/releases/X11R7.7/src/everything/libXdmcp-1.1.1.tar.bz2
 md5sum = b94af6cef211cf3ee256f7e81f70fcd9
 environment =
@@ -183,6 +197,7 @@ configure-options =
 
 [fixesproto]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://www.x.org/releases/X11R7.7/src/everything/fixesproto-5.0.tar.bz2
 md5sum = e7431ab84d37b2678af71e29355e101d
 environment =
@@ -191,6 +206,7 @@ environment =
 
 [bigreqsproto]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://www.x.org/releases/X11R7.7/src/everything/bigreqsproto-1.1.2.tar.bz2
 md5sum = 1a05fb01fa1d5198894c931cf925c025
 environment =
@@ -199,6 +215,7 @@ environment =
 
 [xcmiscproto]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://www.x.org/releases/X11R7.7/src/everything/xcmiscproto-1.2.2.tar.bz2
 md5sum = 5f4847c78e41b801982c8a5e06365b24
 environment =
@@ -207,6 +224,7 @@ environment =
 
 [damageproto]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://www.x.org/releases/X11R7.7/src/everything/damageproto-1.2.1.tar.bz2
 md5sum = 998e5904764b82642cc63d97b4ba9e95
 environment =
@@ -215,6 +233,7 @@ environment =
 
 [randrproto]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://www.x.org/releases/X11R7.7/src/everything/randrproto-1.3.2.tar.bz2
 md5sum = 597491c0d8055e2a66f11350c4985775
 environment =
@@ -223,6 +242,7 @@ environment =
 
 [renderproto]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://www.x.org/releases/X11R7.7/src/everything/renderproto-0.11.1.tar.bz2
 md5sum = a914ccc1de66ddeb4b611c6b0686e274
 environment =
@@ -231,6 +251,7 @@ environment =
 
 [videoproto]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://www.x.org/releases/X11R7.7/src/everything/videoproto-2.3.1.tar.bz2
 md5sum = c3b348c6e2031b72b11ae63fc7f805c2
 environment =
@@ -239,6 +260,7 @@ environment =
 
 [fontsproto]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://www.x.org/releases/X11R7.7/src/everything/fontsproto-2.1.2.tar.bz2
 md5sum = c5f4f1fb4ba7766eedbc9489e81f3be2
 configure-options =
@@ -251,6 +273,7 @@ environment =
 
 [recordproto]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://www.x.org/releases/X11R7.7/src/everything/recordproto-1.14.2.tar.bz2
 md5sum = 1b4e5dede5ea51906f1530ca1e21d216
 environment =
@@ -259,6 +282,7 @@ environment =
 
 [resourceproto]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://www.x.org/releases/X11R7.7/src/everything/resourceproto-1.2.0.tar.bz2
 md5sum = cfdb57dae221b71b2703f8e2980eaaf4
 environment =
@@ -267,6 +291,7 @@ environment =
 
 [xineramaproto]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://www.x.org/releases/X11R7.7/src/everything/xineramaproto-1.2.1.tar.bz2
 md5sum = 9959fe0bfb22a0e7260433b8d199590a
 environment =
@@ -275,6 +300,7 @@ environment =
 
 [pixman]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://cairographics.org/releases/pixman-0.34.0.tar.gz
 md5sum = e80ebae4da01e77f68744319f01d52a3
 configure-options =
@@ -282,6 +308,7 @@ configure-options =
 
 [libfontenc]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://www.x.org/releases/X11R7.7/src/everything/libfontenc-1.1.1.tar.bz2
 md5sum = a2a861f142c3b4367f14fc14239fc1f7
 environment =
@@ -292,6 +319,7 @@ environment =
 
 [libXfont]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://www.x.org/releases/X11R7.7/src/everything/libXfont-1.4.5.tar.bz2
 md5sum = 6851da5dae0a6cf5f7c9b9e2b05dd3b4
 environment =
@@ -302,6 +330,7 @@ environment =
 
 [libxkbfile]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://www.x.org/releases/X11R7.7/src/everything/libxkbfile-1.0.8.tar.bz2
 md5sum = 19e6533ae64abba0773816a23f2b9507
 environment =
@@ -312,21 +341,21 @@ environment =
 
 [xkeyboard-config]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://www.x.org/releases/X11R7.7/src/everything/xkeyboard-config-2.6.tar.bz2
 md5sum = e7e31da9adb56ba52b5c18226b8cbef3
-depends =
-  ${perl-XML-Parser:location}
 configure-options =
   --disable-static
   --enable-shared
   --enable-compat-rules
   --with-xkb-rules-symlink=xfree86
 environment =
-  PATH=${gettext:location}/bin:${intltool:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:${xkbcomp:location}/bin:%(PATH)s
+  PATH=${gettext:location}/bin:${intltool:location}/bin:${perl-XML-Parser:perl-PATH}:${pkgconfig:location}/bin:${xkbcomp:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${libX11:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig
 
 [xkbcomp]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://www.x.org/releases/X11R7.7/src/everything/xkbcomp-1.2.4.tar.bz2
 md5sum = a0fc1ac3fc4fe479ade09674347c5aa0
 # Hardcoded location for xkeyboard-config, needed during compile time
@@ -340,11 +369,13 @@ environment =
 
 [render]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://xlibs.freedesktop.org/release/renderext-0.9.tar.bz2
 md5sum = d43c2afc69937655d13c02588c9ff974
 
 [libXrender]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://www.x.org/releases/X11R7.7/src/everything/libXrender-0.9.7.tar.bz2
 md5sum = ee62f4c7f0f16ced4da63308963ccad2
 configure-options =
@@ -355,6 +386,7 @@ environment =
 
 [libXinerama]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://www.x.org/releases/X11R7.7/src/everything/libXinerama-1.1.2.tar.bz2
 md5sum = cb45d6672c93a608f003b6404f1dd462
 environment =
@@ -365,6 +397,7 @@ configure-options =
 
 [libICE]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://www.x.org/releases/X11R7.7/src/everything/libICE-1.0.8.tar.bz2
 md5sum = 471b5ca9f5562ac0d6eac7a0bf650738
 configure-options =
@@ -377,6 +410,7 @@ environment =
 
 [libSM]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://www.x.org/releases/X11R7.7/src/everything/libSM-1.2.1.tar.bz2
 md5sum = 766de9d1e1ecf8bf74cebe2111d8e2bd
 configure-options =
@@ -390,6 +424,7 @@ environment =
 
 [libXt]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://www.x.org/releases/X11R7.7/src/everything/libXt-1.1.3.tar.bz2
 md5sum = a6f137ae100e74ebe3b71eb4a38c40b3
 configure-options =
@@ -400,6 +435,7 @@ environment =
 
 [dri2proto]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://www.x.org/releases/X11R7.7/src/everything/dri2proto-2.6.tar.bz2
 md5sum = 2eb74959684f47c862081099059a11ab
 configure-options =
@@ -411,6 +447,7 @@ environment =
 
 [pciaccess]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://www.x.org/releases/X11R7.7/src/everything/libpciaccess-0.13.1.tar.bz2
 md5sum = 399a419ac6a54f0fc07c69c9bdf452dc
 configure-options =
@@ -420,6 +457,7 @@ environment =
 
 [makedepend]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://xorg.freedesktop.org/releases/individual/util/makedepend-1.0.3.tar.bz2
 md5sum = 4e6cb97bbecfbb34f3f644a75e513093
 configure-options =
@@ -430,6 +468,7 @@ environment =
 
 [glproto]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://xorg.freedesktop.org/releases/individual/proto/glproto-1.4.14.tar.bz2
 md5sum = f48257daf0017f7a7667e5bf48ca3578
 configure-options =
@@ -440,6 +479,7 @@ environment =
 
 [xfixes]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://xorg.freedesktop.org/releases/individual/lib/libXfixes-4.0.5.tar.bz2
 md5sum = 1b4b8386bd5d1751b2c7177223ad4629
 configure-options =
@@ -450,6 +490,7 @@ environment =
 
 [xdamage]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://www.x.org/releases/X11R7.7/src/everything/libXdamage-1.1.3.tar.bz2
 md5sum = 44774e1a065158b52f1a0da5100cebec
 configure-options =
@@ -460,6 +501,7 @@ environment =
 
 [libxmu]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://www.x.org/releases/X11R7.7/src/everything/libXmu-1.1.1.tar.bz2
 md5sum = a4efff8de85bd45dd3da124285d10c00
 environment =
@@ -468,11 +510,13 @@ environment =
 
 [compositeproto]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://www.x.org/releases/X11R7.7/src/everything/compositeproto-0.4.2.tar.bz2
 md5sum = 98482f65ba1e74a08bf5b056a4031ef0
 
 [libXcomposite]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://www.x.org/releases/X11R7.7/src/everything/libXcomposite-0.4.3.tar.bz2
 md5sum = a60e0b5c276d0aa9e2d3b982c98f61c8
 configure-options =
@@ -483,6 +527,7 @@ environment =
 
 [libXcursor]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://www.x.org/releases/X11R7.7/src/everything/libXcursor-1.1.13.tar.bz2
 md5sum = 52efa81b7f26c8eda13510a2fba98eea
 configure-options =
@@ -493,6 +538,7 @@ environment =
 
 [xwd]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://www.x.org/releases/X11R7.7/src/everything/xwd-1.0.5.tar.bz2
 md5sum = 2113126f9ac9c02bb8547c112c5d037e
 environment =
@@ -504,6 +550,7 @@ environment =
 [xserver]
 # Adds Xvfb functionnality
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://www.x.org/releases/X11R7.7/src/everything/xorg-server-1.12.2.tar.bz2
 md5sum = 791f0323b886abb7954de7f042bb7dc6
 patches =
@@ -531,6 +578,7 @@ environment =
 
 [libXi]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://www.x.org/releases/X11R7.7/src/everything/libXi-1.6.1.tar.bz2
 md5sum = 78ee882e1ff3b192cf54070bdb19938e
 pkg_config_depends = ${inputproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig
@@ -546,6 +594,7 @@ configure-options =
 
 [libXtst]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://www.x.org/releases/X11R7.7/src/everything/libXtst-1.2.1.tar.bz2
 md5sum = e8abc5c00c666f551cf26aa53819d592
 configure-options =
@@ -560,6 +609,7 @@ environment =
 
 [scrnsaverproto]
 recipe = slapos.recipe.cmmi
+shared = true
 url = https://www.x.org/releases/X11R7.7/src/everything/scrnsaverproto-1.2.2.tar.bz2
 md5sum = edd8a73775e8ece1d69515dd17767bfb
 environment =
@@ -568,6 +618,7 @@ environment =
 
 [libXScrnSaver]
 recipe = slapos.recipe.cmmi
+shared = true
 url = https://www.x.org/releases/X11R7.7/src/everything/libXScrnSaver-1.2.2.tar.bz2
 md5sum = 7a773b16165e39e938650bcc9027c1d5
 environment =

component/xz-utils/buildout.cfg

@@ -4,6 +4,7 @@ parts =
 
 [xz-utils]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://tukaani.org/xz/xz-5.2.2.tar.bz2
 md5sum = f90c9a0c8b259aee2234c4e0d7fd70af
 configure-options =

component/zabbix/buildout.cfg

@@ -4,6 +4,7 @@ parts =
 
 [zabbix-agent]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://downloads.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stable/2.0.10/zabbix-2.0.10.tar.gz
 md5sum = 49297c0ac61858fd75ab9ea18ca6cdbb
 configure-options =

component/zbar/buildout.cfg

@@ -4,6 +4,7 @@ parts=
 
 [zbar]
 recipe = slapos.recipe.cmmi
+shared = true
 url = https://jaist.dl.sourceforge.net/project/zbar/zbar/0.10/zbar-0.10.tar.bz2
 md5sum = 0fd61eb590ac1bab62a77913c8b086a5
 configure-options = 

component/zlib/buildout.cfg

@@ -4,5 +4,6 @@ parts =
 
 [zlib]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://downloads.sourceforge.net/project/libpng/zlib/1.2.11/zlib-1.2.11.tar.gz
 md5sum = 1c9f62f0778697a09d36121ead88e08e

component/zstd/buildout.cfg

@@ -4,8 +4,9 @@ parts =
 
 [zstd]
 recipe = slapos.recipe.cmmi
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
 url = https://github.com/facebook/zstd/archive/v1.3.5.tar.gz
 md5sum = d2fc97be4852d666f086282053c02319
+shared = true
+location = @@LOCATION@@
 configure-command = :
 make-options = PREFIX=${:location}

slapos/recipe/erp5testnode/template/httpd.conf.in

@@ -37,6 +37,11 @@ LoadModule dir_module modules/mod_dir.so
 LoadModule alias_module modules/mod_alias.so
 LoadModule ssl_module modules/mod_ssl.so
 LoadModule autoindex_module modules/mod_autoindex.so
+# for password access
+LoadModule authn_file_module modules/mod_authn_file.so
+LoadModule authn_core_module modules/mod_authn_core.so
+LoadModule authz_user_module modules/mod_authz_user.so
+LoadModule auth_basic_module modules/mod_auth_basic.so
 
 # SSL Configuration
 SSLEngine on
@@ -79,7 +84,7 @@ Listen [%(ip)s]:%(software_access_port)s
     SSLEngine on
     DocumentRoot "%(testnode_srv_directory)s"
     <Directory />
-        AllowOverride FileInfo AuthConfig
+        AllowOverride AuthConfig
         Options FollowSymLinks
         IndexOptions FancyIndexing
         Require all denied

software/agent/software.cfg

@@ -51,7 +51,7 @@ pycrypto = 2.6.1
 pycurl = 7.43.0
 slapos.recipe.download = 1.0
 slapos.recipe.template = 4.3
-slapos.toolbox = 0.78
+slapos.toolbox = 0.80
 smmap = 0.9.0
 
 # Required by:

software/apache-frontend/software.cfg

@@ -11,7 +11,7 @@ plone.recipe.command = 1.1
 pycrypto = 2.6.1
 rdiff-backup = 1.0.5+SlapOSPatched001
 slapos.recipe.template = 4.3
-slapos.toolbox = 0.78
+slapos.toolbox = 0.80
 smmap = 0.9.0
 numpy = 1.11.2
 pyasn1 = 0.2.3

software/backupserver/software.cfg

@@ -121,9 +121,9 @@ eggs =
   ${rdiff-backup-build-1.3.4:egg}
 
 [versions]
-# 1.3.4nxd2 is invalid version string, thus pached version string is not '1.3.4nxd4+SlapOSPatched001'
+# 1.3.4nxd2 is invalid version string, thus pached version string is not '1.3.4nxd2+SlapOSPatched001'
 # but '1.3.4nxd2-SlapOSPatched001'.
-rdiff-backup = 1.3.4nxd4-SlapOSPatched001
+rdiff-backup = 1.3.4nxd2-SlapOSPatched001
 gunicorn = 19.1.1
 plone.recipe.command = 1.1
 slapos.recipe.template = 2.4.2

software/caddy-frontend/software.cfg

@@ -11,7 +11,7 @@ plone.recipe.command = 1.1
 pycrypto = 2.6.1
 rdiff-backup = 1.0.5+SlapOSPatched001
 slapos.recipe.template = 4.3
-slapos.toolbox = 0.78
+slapos.toolbox = 0.80
 smmap = 0.9.0
 numpy = 1.11.2
 pyasn1 = 0.2.3

software/caddy-frontend/test/setup.py

@@ -38,6 +38,7 @@ setup(name=name,
       packages=find_packages(),
       install_requires=[
         'slapos.core',
+        'slapos.libnetworkcache',
         'erp5.util',
         'requests',
         'forcediphttpsadapter',

software/erp5testnode/software.cfg

@@ -34,6 +34,7 @@ eggs =
   pytz
   erp5.util
   PyXML
+  z3c.etestbrowser
 
 [testnode]
 
@@ -58,13 +59,14 @@ mode = 0644
 
 [versions]
 PyXML = 0.8.5
-erp5.util = 0.4.51
+erp5.util = 0.4.52
 slapos.recipe.template = 4.3
 ipython = 5.3.0
 apache-libcloud = 2.1.0
 gitdb2 = 2.0.2
 pyasn1 = 0.3.2
 smmap2 = 2.0.3
+z3c.etestbrowser = 2.0.1
 
 # Required by:
 # slapos.toolbox==0.70
@@ -89,3 +91,15 @@ lockfile = 0.12.2
 # Required by:
 # slapos.toolbox==0.70
 passlib = 1.7.1
+
+# Required by:
+# z3c.etestbrowser==2.0.1
+zope.testbrowser = 5.2.4
+WSGIProxy2 = 0.4.4
+WebTest = 2.0.30
+zope.cachedescriptors = 4.3.1
+zope.schema = 4.5.0
+WebOb = 1.8.2
+beautifulsoup4 = 4.6.3
+waitress = 1.1.0
+zope.event = 4.3.0

software/jstestnode/runTestSuite.in

@@ -12,6 +12,8 @@ from selenium import webdriver
 from selenium.webdriver.common.by import By
 from selenium.webdriver.support.ui import WebDriverWait
 from selenium.webdriver.support import expected_conditions as EC
+from subprocess import check_output
+import json
 
 os.environ['TMPDIR'] = '$${xvfb-instance:tmp-path}'
 os.environ['DISPLAY'] = ':0'
@@ -114,6 +116,29 @@ def main():
         'platform': args.target,
         'version': args.target_version
       }
+
+
+    if args.target == 'node':
+      # Execute NodeJS tests
+      result_string = check_output(['${nodejs-output:node}', '${jio-repository.git:location}/test/node.js'],
+                                   cwd='${jio-repository.git:location}',
+                                   env={'CI': 'true'})
+      result_dict = json.loads(result_string)
+      for result in result_dict['tests']:
+        test_line_dict['%s: %s' % (result['module'], result['name'])] = {
+          'test_count': int(result['total']),
+          'error_count': 0,
+          'failure_count': int(result['failed']),
+          'skip_count': 0,
+          'duration': int(result['duration']),
+          'command': '',
+          'stdout': result['source'],
+          'stderr': '',
+          'html_test_result': json.dumps(result['assertions'])
+        }
+
+    else:
+      # Execute WebBrowser tests
       if is_appium:
         if not args.appium_server_auth:
           raise RuntimeError('--appium_server_auth is required.')
@@ -179,6 +204,7 @@ def main():
       browser.quit()
       is_browser_running = False
 
+    # Send results
     tool = taskdistribution.TaskDistributor(portal_url=args.master_url)
     test_result = tool.createTestResult(revision = revision,
                                         test_name_list = test_line_dict.keys(),

software/jstestnode/software.cfg

@@ -2,12 +2,14 @@
 extends =
   ../../stack/slapos.cfg
   ../../stack/nodejs.cfg
+  ../../component/coreutils/buildout.cfg
   ../../component/git/buildout.cfg
   ../../component/xorg/buildout.cfg
   ../../component/firefox/buildout.cfg
   ../../component/dash/buildout.cfg
   ../../component/nginx/buildout.cfg
   ../../component/openssl/buildout.cfg
+  ../../component/curl/buildout.cfg
 
 parts =
   slapos-cookbook
@@ -23,6 +25,12 @@ parts =
   openssl
   instance
 
+[nodejs]
+<= nodejs-8.6.0
+
+[nodejs-output]
+<= nodejs-8.6.0-output
+
 [instance]
 recipe = slapos.recipe.template
 md5sum = 7c907db5f803b03a218b49888a3a3799
@@ -48,7 +56,7 @@ develop = true
 [renderjs-install]
 recipe = plone.recipe.command
 stop-on-error = true
-command = cd ${renderjs-repository.git:location} && PATH=${git:location}/bin/:${nodejs:location}/bin/:$PATH ${nodejs:location}/bin/npm install . && PATH=${git:location}/bin/:${nodejs:location}/bin/:$PATH ./node_modules/grunt-cli/bin/grunt
+command = cd ${renderjs-repository.git:location} && PATH=${git:location}/bin/:${nodejs:location}/bin/:$PATH ${nodejs-output:npm} install . && PATH=${git:location}/bin/:${nodejs:location}/bin/:$PATH ./node_modules/grunt-cli/bin/grunt
 update-command = ${:command}
 
 [jio-repository.git]
@@ -61,7 +69,7 @@ develop = true
 [jio-install]
 recipe = plone.recipe.command
 stop-on-error = true
-command = cd ${jio-repository.git:location} && PATH=${git:location}/bin/:${nodejs:location}/bin/:$PATH ${nodejs:location}/bin/npm install . && PATH=${git:location}/bin/:${nodejs:location}/bin/:$PATH ./node_modules/grunt-cli/bin/grunt
+command = cd ${jio-repository.git:location} && PATH=${git:location}/bin/:${nodejs:location}/bin/:$PATH ${nodejs:location}/bin/npm install jslint@0.9.2 jison@0.4.16 && PATH=${curl:location}/bin/:${nodejs:location}/bin/:$PATH make
 update-command = ${:command}
 
 [rsvp-repository.git]
@@ -107,7 +115,7 @@ mode = 0644
 [template-runTestSuite]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/runTestSuite.in
-md5sum = 8528d90cce5d034195e3e71bef855c48
+md5sum = 2898d62902351e6df9ce887bd98e2ca1
 output = ${buildout:directory}/runTestSuite.in
 mode = 0644
 

software/kvm/software.cfg

@@ -255,7 +255,7 @@ context =
 # XXX - use websockify = 0.5.1 for compatibility with kvm frontend
 websockify = 0.5.1
 
-slapos.toolbox = 0.78
+slapos.toolbox = 0.80
 erp5.util = 0.4.51
 apache-libcloud = 1.1.0
 collective.recipe.environment = 0.2.0

software/monitor/software.cfg

@@ -78,7 +78,6 @@ scripts =
   monitor.genstatus
   monitor.configwrite
   is-process-older-than-dependency-set
-  check-free-disk
   check-computer-memory
 
 [monitor-eggs]

software/neoppod/software-common.cfg

@@ -134,7 +134,7 @@ pycrypto = 2.6.1
 pycurl = 7.43.0
 setproctitle = 1.1.10
 slapos.recipe.template = 4.3
-slapos.toolbox = 0.78
+slapos.toolbox = 0.80
 smmap2 = 2.0.1
 transaction = 1.7.0
 zodbpickle = 0.6.0

software/nginx-push-stream/software.cfg

@@ -46,7 +46,7 @@ mode = 0644
 
 [versions]
 slapos.recipe.template = 4.3
-slapos.toolbox = 0.78
+slapos.toolbox = 0.80
 dnspython = 1.15.0
 PyRSS2Gen = 1.1
 erp5.util = 0.4.51

software/proftpd/test/setup.py

@@ -43,6 +43,7 @@ setup(name=name,
       packages=find_packages(),
       install_requires=[
         'slapos.core',
+        'slapos.libnetworkcache',
         'erp5.util',
         'pysftp',
         'supervisor',

software/re6stnet/software.cfg

@@ -34,7 +34,6 @@ scripts =
   monitor.genstatus
   monitor.configwrite
   is-process-older-than-dependency-set
-  check-free-disk
 
 [extra-eggs]
 recipe = zc.recipe.egg
@@ -118,7 +117,7 @@ plone.recipe.command = 1.1
 pycrypto = 2.6.1
 pycurl = 7.43.0
 slapos.recipe.template = 4.3
-slapos.toolbox = 0.78
+slapos.toolbox = 0.80
 smmap = 0.9.0
 dnspython = 1.15.0
 erp5.util = 0.4.51

software/re6stnet/test/setup.py

@@ -43,6 +43,7 @@ setup(name=name,
       packages=find_packages(),
       install_requires=[
         'slapos.core',
+        'slapos.libnetworkcache',
         'erp5.util',
         'supervisor',
         'psutil',

software/slapos-master/buildout.hash.cfg

@@ -14,7 +14,7 @@
 # not need these here).
 [template-erp5]
 filename = instance-erp5.cfg.in
-md5sum = ab91539deb74e0fdb0680f35d246bd3a
+md5sum = 92f1e522d8e7d0e9a9f7b4db63f092e4
 
 [template-balancer]
 filename = instance-balancer.cfg.in

software/slapos-master/instance-erp5.cfg.in

@@ -44,7 +44,6 @@ config-name = {{ name }}
 
 {{ request('memcached-persistent', 'kumofs', 'kumofs', {'tcpv4-port': 2000}, {'url': True, 'monitor-base-url': False}, key_config={'monitor-passwd': 'monitor-htpasswd:passwd'}) }}
 {{ request('memcached-volatile', 'kumofs', 'memcached', {'tcpv4-port': 2010, 'ram-storage-size': 64}, {'url': True, 'monitor-base-url': False}, key_config={'monitor-passwd': 'monitor-htpasswd:passwd'}) }}
-{{ request('cloudooo', 'cloudooo', 'cloudooo', {'tcpv4-port': 2020}, {'url': True, 'monitor-base-url': False}, key_config={'monitor-passwd': 'monitor-htpasswd:passwd'}) }}
 {{ request('mariadb', 'mariadb', 'mariadb', {'tcpv4-port': 2099, 'max-slowqueries-threshold': monitor_dict.get('max-slowqueries-threshold', 1000), 'slowest-query-threshold': monitor_dict.get('slowest-query-threshold', '') }, {'database-list': True, 'test-database-list': True, 'monitor-base-url': False}, key_config={'monitor-passwd': 'monitor-htpasswd:passwd'}) }}
 {% if has_posftix -%}
 {{   request('smtp', 'postfix', 'smtp', {'tcpv4-port': 2025, 'smtpd-sasl-user': 'erp5@nowhere'}, key_config={'smtpd-sasl-password': 'publish-early:smtpd-sasl-password'}) }}
@@ -150,7 +149,7 @@ return =
 config-bt5 = {{ dumps(slapparameter_dict.get('bt5', bt5_default_list)) }}
 config-bt5-repository-url = {{ dumps(slapparameter_dict.get('bt5-repository-url', local_bt5_repository)) }}
 config-caucase-url = ${request-caucase:connection-http-url}
-config-cloudooo-url = ${request-cloudooo:connection-url}
+config-cloudooo-url = {{ dumps(slapparameter_dict.get('cloudooo-url', default_cloudooo_url)) }}
 config-deadlock-debugger-password = ${publish-early:deadlock-debugger-password}
 config-developer-list = {{ dumps(slapparameter_dict.get('developer-list', [inituser_login])) }}
 config-hosts-dict = {{ dumps(slapparameter_dict.get('hosts-dict', {})) }}

software/slapos-testing/software.cfg

@@ -172,10 +172,8 @@ mode = 640
 [versions]
 Pygments = 2.1.3
 
-slapos.recipe.build = 0.36
-slapos.recipe.cmmi = 0.7
 slapos.recipe.template = 4.3
-slapos.toolbox = 0.78
+slapos.toolbox = 0.80
 
 # All depencies should be pinned.
 apache-libcloud = 2.3.0

software/slaprunner/buildout.hash.cfg

@@ -22,7 +22,7 @@ md5sum = 04e31ac503753f89510dd412b4680c56
 
 [template-runner-import-script]
 filename = template/runner-import.sh.jinja2
-md5sum = e033845c9c24e4bb20caeedf19f9628a
+md5sum = 92ac3f6982dec97e3b2df90f97111bd3
 
 [instance-runner-import]
 filename = instance-runner-import.cfg.in

software/slaprunner/software.cfg

@@ -171,7 +171,7 @@ prettytable = 0.7.2
 pycurl = 7.43.0
 slapos.recipe.template = 4.3
 collective.recipe.environment = 0.2.0
-slapos.toolbox = 0.78
+slapos.toolbox = 0.80
 smmap = 0.9.0
 lockfile = 0.12.2
 

software/slaprunner/template/runner-import.sh.jinja2

@@ -132,20 +132,33 @@ SLAPOS='{{ directory["bin"] }}'/slapos
 # XXX hardcoded
 SQLITE3="$HOME/software_release/parts/sqlite3/bin/sqlite3"
 DATABASE="$HOME/srv/runner/proxy.db"
+db_query () {
+  # Try opening locked tables for 5 seconds to prevent "database is locked" error
+"$SQLITE3" "$DATABASE" <<EOF
+.timeout 5000
+$@
+EOF
+}
+# If slapproxy database is empty then no software release was opened
+if [ ! -s "$DATABASE" ]; then
+  log_message "Slapproxy database empty, no Software Requested... Writing status file... End"
+  echo 0 > $RESTORE_EXIT_CODE_FILE
+  exit 0
+fi
 # Change slapproxy database to point instances to new software release
 # XXX hardcoded
 PARTITION=$(basename $HOME)
-OLD_SOFTWARE_RELEASE=$("$SQLITE3" "$DATABASE" "select software_release from partition11 where reference='slappart0';")
+OLD_SOFTWARE_RELEASE=$(db_query "select software_release from partition11 where reference='slappart0';")
 SOFTWARE_RELEASE=$(echo "$OLD_SOFTWARE_RELEASE" | sed 's/\/\(slappart\|test0-\)[0-9][0-9]*\//\/'"$PARTITION"'\//')
-"$SQLITE3" "$DATABASE" "update partition11 set software_release='$SOFTWARE_RELEASE' where software_release NOT NULL;"
-"$SQLITE3" "$DATABASE" "update software11 set url='$SOFTWARE_RELEASE' where url='$OLD_SOFTWARE_RELEASE';" || "$SQLITE3" "$DATABASE" "delete from software11 where url='$OLD_SOFTWARE_RELEASE';"
+db_query "update partition11 set software_release='$SOFTWARE_RELEASE' where software_release NOT NULL;"
+db_query "update software11 set url='$SOFTWARE_RELEASE' where url='$OLD_SOFTWARE_RELEASE';" || db_query "delete from software11 where url='$OLD_SOFTWARE_RELEASE';"
 # Change slapproxy database to have all instances stopped
-"$SQLITE3" "$DATABASE" "update partition11 set requested_state='stopped';"
+db_query "update partition11 set requested_state='stopped';"
 # Change slapproxy database to get correct IPs
 IPV4='{{ ipv4 }}'
 IPV6='{{ ipv6 }}'
-"$SQLITE3" "$DATABASE" "update partition_network11 set address='$IPV4' where netmask='255.255.255.255';"
-"$SQLITE3" "$DATABASE" "update partition_network11 set address='$IPV6' where netmask='ffff:ffff:ffff::';"
+db_query "update partition_network11 set address='$IPV4' where netmask='255.255.255.255';"
+db_query "update partition_network11 set address='$IPV6' where netmask='ffff:ffff:ffff::';"
 
 MASTERURL='http://{{ ipv4 }}:{{ proxy_port }}'
 
@@ -213,7 +226,7 @@ done
 
 # Change back slapproxy database to have all instances started
 log_message "Set instances as to start after takeover..."
-"$SQLITE3" "$DATABASE" "update partition11 set requested_state='started';"
+db_query "update partition11 set requested_state='started';"
 
 # Write exit code to an arbitrary file that will be checked by promise/monitor
 log_message "Writing status file... End"

software/unstable/mioga/software.cfg

@@ -6,16 +6,11 @@ develop =
 extends =
   ../../component/rsync/buildout.cfg
   ../../component/apache-perl/buildout.cfg
-  ../../component/perl-Crypt-SSLeay/buildout.cfg
   ../../component/perl-XML-Parser/buildout.cfg
   ../../component/perl-XML-LibXML/buildout.cfg
-  ../../component/perl-XML-LibXSLT/buildout.cfg
   ../../component/perl-Term-ReadLine-Gnu/buildout.cfg
-  ../../component/perl-Text-Iconv/buildout.cfg
   ../../component/perl-Image-Magick/buildout.cfg
   ../../component/postgresql/buildout.cfg
-  ../../component/perl-DBD-Pg/buildout.cfg
-  ../../component/perl-Search-Xapian/buildout.cfg
   ../../component/libxslt/buildout.cfg
   ../../component/dcron/buildout.cfg
   ../../component/dropbear/buildout.cfg
@@ -43,6 +38,79 @@ parts =
   template-apacheperl
   template-postgres
 
+
+# Those were unmaintained components inlined here
+# slapos.recipe.build:cpan no longer exist, we now use perl-CPAN-package macro instead
+
+# ../../component/perl-Crypt-SSLeay/buildout.cfg
+[buildout]
+extends +=
+  ../../component/openssl/buildout.cfg
+  ../../component/zlib/buildout.cfg
+[perl-Crypt-SSLeay]
+recipe = slapos.recipe.build:cpan
+modules =
+  G/GA/GAAS/URI-1.60.tar.gz
+  N/NA/NANIS/Crypt-SSLeay-0.64.tar.gz
+cpan-configuration =
+  make_arg=('OTHERLDFLAGS="-L${zlib:location}/lib -Wl,-R${zlib:location}/lib -L${openssl:location}/lib -Wl,-R${openssl:location}/lib"')
+  makepl_arg=('INC=-I${openssl:location}/include')
+environment =
+  OPENSSL_PREFIX=${openssl:location}
+perl = perl
+
+# ../../component/perl-XML-LibXSLT/buildout.cfg
+[buildout]
+extends +=
+  ../libxslt/buildout.cfg
+  ../libxml2/buildout.cfg
+  ../zlib/buildout.cfg
+[perl-XML-LibXSLT]
+recipe = slapos.recipe.build:cpan
+cpan-configuration =
+  makepl_arg='LIBS="-L${libxslt:location}/lib -Wl,-R${libxslt:location}/lib -L${zlib:location}/lib -Wl,-R${zlib:location}/lib -L${libxml2:location}/lib -Wl,-R${libxml2:location}/lib" INC="-I${libxslt:location}/include -I${libxml2:location}/include/libxml2"'
+modules =
+  S/SH/SHLOMIF/XML-LibXSLT-1.78.tar.gz
+perl = perl
+
+# ../../component/perl-Text-Iconv/buildout.cfg
+[buildout]
+extends +=
+  ../libiconv/buildout.cfg
+[perl-Text-Iconv]
+recipe = slapos.recipe.build:cpan
+cpan-configuration =
+  makepl_arg='LIBS="-L${libiconv:location}/lib -Wl,-R${libiconv:location}/lib" INC="-I${libiconv:location}/include"'
+modules =
+  M/MP/MPIOTR/Text-Iconv-1.7.tar.gz
+perl = perl
+
+# ../../component/perl-DBD-Pg/buildout.cfg
+[buildout]
+extends +=
+  ../postgresql/buildout.cfg
+[perl-DBD-Pg]
+recipe = slapos.recipe.build:cpan
+modules =
+  T/TU/TURNSTEP/DBD-Pg-2.19.3.tar.gz
+environment =
+  POSTGRES_HOME=${postgresql:location}
+perl = perl
+
+# ../../component/perl-Search-Xapian/buildout.cfg
+[buildout]
+extends +=
+  ../xapian/buildout.cfg
+[perl-Search-Xapian]
+recipe = slapos.recipe.build:cpan
+modules =
+  O/OL/OLLY/Search-Xapian-1.2.10.0.tar.gz
+environment =
+  XAPIAN_CONFIG=${xapian:location}/bin/xapian-config
+perl = perl
+
+
+
 [eggs]
 recipe = zc.recipe.egg
 eggs =

stack/caucase/buildout.cfg

@@ -95,7 +95,7 @@ futures = 3.1.1
 gitdb2 = 2.0.2
 gunicorn = 19.7.1
 slapos.recipe.template = 4.3
-slapos.toolbox = 0.78
+slapos.toolbox = 0.80
 smmap2 = 2.0.3
 
 # Required by:

stack/monitor/buildout.cfg

@@ -121,6 +121,6 @@ depends =
 PyRSS2Gen = 1.1
 cns.recipe.symlink = 0.2.3
 pycurl = 7.43.0
-slapos.toolbox = 0.78
+slapos.toolbox = 0.80
 pyasn1 = 0.3.7
 

stack/monitor/buildout.hash.cfg

@@ -14,4 +14,4 @@
 # not need these here).
 [monitor2-template]
 filename = instance-monitor.cfg.jinja2.in
-md5sum = b30c47a593299da9889035850a47c519
+md5sum = a2da18b7e1d4ae1332e19e5d1b70fcdf

stack/monitor/instance-monitor.cfg.jinja2.in

@@ -88,7 +88,7 @@ parameter-file-path = ${monitor-instance-parameter:configuration-file-path}
 parameter-list = 
   raw monitor-user ${monitor-instance-parameter:username}
   htpasswd monitor-password ${httpd-monitor-htpasswd:password-file} ${monitor-instance-parameter:username} ${httpd-monitor-htpasswd:htpasswd-path}
-  file min-free-disk-MB ${promise-check-free-disk-space:config-file}
+  file min-free-disk-MB ${promise-check-free-disk-space:config-threshold-file}
   ${monitor-instance-parameter:instance-configuration}
 # htpasswd entry:  htpasswd key password-file username htpasswd-file
 
@@ -377,13 +377,15 @@ config-monitor-url = ${monitor-instance-parameter:monitor-base-url}
 mode = 600
 
 [promise-check-free-disk-space]
-recipe = slapos.cookbook:wrapper
-command-line = {{ check_disk_space }}
-               --collectordb ${monitor-instance-parameter:collector-db}
-               --home_path ${buildout:directory}
-               --config ${:config-file}
-wrapper-path = ${directory:promises}/check-free-disk-space
-config-file = ${directory:etc}/min-free-disk-size
+recipe = slapos.cookbook:promise.plugin
+eggs =
+  slapos.toolbox
+output = ${directory:plugins}/check-free-disk-space.py
+content = 
+  from slapos.promise.plugin.check_free_disk_space import RunPromise
+mode = 600
+config-collectordb = ${monitor-instance-parameter:collector-db}
+config-threshold-file = ${directory:etc}/min-free-disk-size
 
 
 [monitor-base]

stack/resilient/buildout.cfg

@@ -125,11 +125,13 @@ mode = 0644
 # Time in minutes to wait for the backup to finish
 backup_wait_time = 10
 
-[rdiff-backup]
-eggs =
-  ${rdiff-backup-build-1.3.4:egg}
+[rdiff-backup-build]
+# use our own version
+find-links = http://www.nexedi.org/static/packages/source/rdiff-backup-1.3.4nxd2.tar.gz
+patches =
+  ${:_profile_base_location_}/rdiff-backup-1.3.4-librsync-1.0.0.patch#31fafc8bc4a00f002f52008a9f3b671f
 
 [versions]
-# 1.3.4nxd4 is invalid version string, thus pached version string is not '1.3.4nxd2+SlapOSPatched001'
-# but '1.3.4nxd4-SlapOSPatched001'.
-rdiff-backup = 1.3.4nxd4-SlapOSPatched001
+# 1.3.4nxd2 is invalid version string, thus pached version string is not '1.3.4nxd2+SlapOSPatched001'
+# but '1.3.4nxd2-SlapOSPatched001'.
+rdiff-backup = 1.3.4nxd2-SlapOSPatched001

stack/slapos.cfg

@@ -12,6 +12,7 @@ python = python2.7
 extensions +=
   slapos.rebootstrap
   slapos.extension.strip
+  slapos.extension.shared
 
 show-picked-versions = true
 
@@ -136,10 +137,11 @@ six = 1.10.0
 slapos.cookbook = 1.0.66
 slapos.core = 1.4.9
 slapos.extension.strip = 0.4
+slapos.extension.shared = 1.0
 slapos.libnetworkcache = 0.15
 slapos.rebootstrap = 4.1
-slapos.recipe.build = 0.36
-slapos.recipe.cmmi = 0.7
+slapos.recipe.build = 0.37
+slapos.recipe.cmmi = 0.8
 stevedore = 1.21.0
 unicodecsv = 0.14.1
 xml-marshaller = 0.9.7