Merge branch 'erp5-component' into erp5

852f2ddc · Kazuhiko Shiozaki · d3338d6e · b85542f8 · 852f2ddc · 852f2ddc
Commit 852f2ddc authored Jan 23, 2014 by Kazuhiko Shiozaki
37 changed files
--- a/component/apache-php/buildout.cfg
+++ b/component/apache-php/buildout.cfg
@@ -116,7 +116,7 @@ environment =

 [libmcrypt]
 recipe = slapos.recipe.cmmi
-url = http://sourceforge.net/projects/mcrypt/files/Libmcrypt/2.5.8/libmcrypt-2.5.8.tar.bz2/download
+url = http://downloads.sourceforge.net/project/mcrypt/Libmcrypt/2.5.8/libmcrypt-2.5.8.tar.bz2
 md5sum = c4f491dd411a09e9de3b8702ea6f73eb

 [xml-rpc]

--- a/component/apache/buildout.cfg
+++ b/component/apache/buildout.cfg
@@ -102,7 +102,7 @@ md5sum = 4f074f035d3b37f3f3e71cd9616440f3
 [apache-antiloris]
 # Note: Shall react on each build of apache and reinstall itself
 recipe = slapos.recipe.cmmi
-url = http://sourceforge.net/projects/mod-antiloris/files/mod_antiloris-0.4.tar.bz2/download
+url = http://downloads.sourceforge.net/project/mod-antiloris/mod_antiloris-0.4.tar.bz2
 md5sum = 66862bf10e9be3a023e475604a28a0b4
 patch-options = -p0
 patches =
@@ -110,6 +110,7 @@ patches =
 depends =
  ${apache:version}
  ${apache:revision}
+  ${gdbm:version}
  ${mod_antiloris-apache-2.4.patch:md5sum}
 configure-command = ${apache:location}/bin/apxs
 configure-options = -c mod_antiloris.c
@@ -181,7 +182,7 @@ environment =
 [apache-antiloris-apache-2.2]
 # Note: Shall react on each build of apache and reinstall itself
 recipe = slapos.recipe.cmmi
-url = http://sourceforge.net/projects/mod-antiloris/files/mod_antiloris-0.4.tar.bz2/download
+url = http://downloads.sourceforge.net/project/mod-antiloris/mod_antiloris-0.4.tar.bz2
 md5sum = 66862bf10e9be3a023e475604a28a0b4
 depends =
  ${apache-2.2:version}

--- a/component/boost-lib/buildout.cfg
+++ b/component/boost-lib/buildout.cfg
@@ -2,21 +2,12 @@
 parts =
  boost-lib

-[boost-lib-download]
-recipe = hexagonit.recipe.download
+[boost-lib]
+recipe = slapos.recipe.cmmi
 url = http://downloads.sourceforge.net/sourceforge/boost/boost_1_43_0.tar.gz
 md5sum = 734565ca4819bf04bd8e903e116c3fb1
-strip-top-level-dir = true
-
-[boost-lib]
-recipe = plone.recipe.command
-source = ${boost-lib-download:location}
-destination = ${buildout:parts-directory}/${:_buildout_section_name_}
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
-stop-on-error = true
-command =
-  rm -fr ${:destination} &&
-  mkdir -p ${:destination} &&
-  cd ${:source} &&
-  ./bootstrap.sh --prefix=${:location} &&
-  ./bjam install
+configure-command = ./bootstrap.sh --prefix=${:location}
+make-binary =
+make-options =
+make-targets = ./bjam link=shared install
--- a/component/ca-certificates/buildout.cfg
+++ b/component/ca-certificates/buildout.cfg
@@ -18,10 +18,10 @@ download-only = true

 [ca-certificates]
 recipe = slapos.recipe.cmmi
-version = 20130119
+version = 20130906
 url = ftp://ftp.free.fr/mirrors/ftp.debian.org/pool/main/c/ca-certificates/ca-certificates_${:version}.tar.gz
 patch-binary = ${patch:location}/bin/patch
-md5sum = 1fbbec2028a33cf865b79c204aa2e626
+md5sum = 67d42b6be21c616a8b7d3d85d95ae912
 patches =
  ${ca-certificates-sbin-dir.patch:location}/${ca-certificates-sbin-dir.patch:filename}
 patch-options = -p0

--- a/component/cmake/buildout.cfg
+++ b/component/cmake/buildout.cfg
@@ -7,8 +7,8 @@ parts =

 [cmake]
 recipe = slapos.recipe.cmmi
-url = http://www.cmake.org/files/v2.8/cmake-2.8.10.2.tar.gz
-md5sum = 097278785da7182ec0aea8769d06860c
+url = http://www.cmake.org/files/v2.8/cmake-2.8.12.1.tar.gz
+md5sum = 9d38cd4e2c94c3cea97d0e2924814acc
 environment =
  CMAKE_INCLUDE_PATH=${ncurses:location}/include
  CMAKE_LIBRARY_PATH=${ncurses:location}/lib
--- a/component/fastjar/buildout.cfg
+++ b/component/fastjar/buildout.cfg
@@ -5,7 +5,7 @@ extends =

 [fastjar]
 recipe = slapos.recipe.cmmi
-url = http://sourceforge.net/projects/fastjar/files/fastjar/0.94/fastjar-0.94.tar.gz/download
+url = http://downloads.sourceforge.net/project/fastjar/fastjar/0.94/fastjar-0.94.tar.gz
 md5sum = 14d4bdfac236e347d806c6743dba48c6
 environment =
  CPPFLAGS=-I${zlib:location}/include

--- a/component/fontconfig/buildout.cfg
+++ b/component/fontconfig/buildout.cfg
@@ -13,8 +13,9 @@ parts =

 [fontconfig]
 recipe = slapos.recipe.cmmi
-url = http://fontconfig.org/release/fontconfig-2.10.2.tar.bz2
-md5sum = 2f239690057d1438aa282e051f721d08
+url = http://fontconfig.org/release/fontconfig-2.11.0.tar.bz2
+md5sum = 000bd4baf7aefa828e03414d0c8c7dc5
+pkg_config_depends = ${freetype:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig
 # XXX-Cedric : should we use --with-add-fonts={somefont:location}/share,{someotherfont:location}/share?
 configure-options =
  --disable-static
@@ -23,6 +24,6 @@ configure-options =
  --with-default-fonts=${fonts:location}
 environment =
  PATH=${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${freetype:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${:pkg_config_depends}
  CPPFLAGS=-I${zlib:location}/include -I${bzip2:location}/include
  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib
--- a/component/freetype/buildout.cfg
+++ b/component/freetype/buildout.cfg
@@ -12,13 +12,16 @@ parts =

 [freetype]
 recipe = slapos.recipe.cmmi
-url = http://download.savannah.gnu.org/releases/freetype/freetype-2.5.0.1.tar.bz2
-md5sum = c72e9010b1d986d556fc0b2b5fcbf31a
+url = http://download.savannah.gnu.org/releases/freetype/freetype-2.5.2.tar.bz2
+md5sum = 10e8f4d6a019b124088d18bc26123a25
 depends =
  ${libpng:so_version}
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
 configure-options =
  --disable-static
 environment =
  CPPFLAGS=-I${bzip2:location}/include -I${zlib:location}/include
  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
  PATH=${libpng:location}/bin:%(PATH)s
+make-targets =
+  install && ln -s . ${:location}/include/freetype2/freetype
--- a/component/gdbm/buildout.cfg
+++ b/component/gdbm/buildout.cfg
@@ -4,11 +4,12 @@ parts =

 [gdbm]
 recipe = slapos.recipe.cmmi
-version = 1.10
+version = 1.11
 url = ftp://ftp.gnu.org/gnu/gdbm/gdbm-${:version}.tar.gz
-md5sum = 88770493c2559dc80b561293e39d3570
+md5sum = 72c832680cf0999caedbe5b265c8c1bd
 configure-options =
  --disable-static
+  --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

--- a/component/ghostscript/buildout.cfg
+++ b/component/ghostscript/buildout.cfg
 [buildout]
 extends =
  ../fontconfig/buildout.cfg
+  ../freetype/buildout.cfg
  ../libjpeg/buildout.cfg
  ../libtiff/buildout.cfg
+  ../libxml2/buildout.cfg
  ../pkgconfig/buildout.cfg

 parts = ghostscript
@@ -11,6 +13,7 @@ parts = ghostscript
 recipe = slapos.recipe.cmmi
 depends =
  ${libtiff:version}
+pkg_config_depends = ${libtiff:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${fontconfig:pkg_config_depends}
 configure-options =
  --disable-cups
  --disable-threadsafe
@@ -23,17 +26,17 @@ configure-options =
 make-options = -j1
 environment =
  PATH=${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${fontconfig:location}/lib/pkgconfig:${libtiff:location}/lib/pkgconfig
-  LDFLAGS=-Wl,-rpath=${fontconfig:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -Wl,-rpath=${libtiff:location}/lib
-  LD_LIBRARY_PATH=${fontconfig:location}/lib:${libtiff:location}/lib
+  PKG_CONFIG_PATH=${:pkg_config_depends}
+  LDFLAGS=-Wl,-rpath=${fontconfig:location}/lib -Wl,-rpath=${freetype:location}/lib -Wl,-rpath=${libtiff:location}/lib
+  LD_LIBRARY_PATH=${fontconfig:location}/lib:${freetype:location}/lib:${libtiff:location}/lib:${libxml2:location}/lib

 [ghostscript]
 <= ghostscript-9

 [ghostscript-9]
 <= ghostscript-common
-url = http://downloads.ghostscript.com/public/ghostscript-9.07.tar.bz2
-md5sum = eea27befc1e85bef6d4768202f6b03a5
+url = http://downloads.ghostscript.com/public/ghostscript-9.10.tar.bz2
+md5sum = 7179bb1ed4f6f453147e6f7e1f210ce8

 [ghostscript-fonts]
 recipe = hexagonit.recipe.download

--- a/component/giflib/buildout.cfg
+++ b/component/giflib/buildout.cfg
@@ -4,8 +4,8 @@ parts =

 [giflib]
 recipe = slapos.recipe.cmmi
-url = http://prdownloads.sourceforge.net/giflib/giflib-4.2.0.tar.bz2?download
-md5sum = 711ad48551ee14db7c200b5f402df849
+url = http://downloads.sourceforge.net/project/giflib/giflib-4.x/giflib-4.2.3.tar.bz2
+md5sum = be1f5749c24644257a88c9f42429343d
 configure-options =
  --without-x
  --disable-x11

--- a/component/git/buildout.cfg
+++ b/component/git/buildout.cfg
@@ -13,8 +13,8 @@ parts =

 [git]
 recipe = slapos.recipe.cmmi
-url = http://git-core.googlecode.com/files/git-1.8.2.3.tar.gz
-md5sum = 03ebfd403a8cf355da0e3f15e53b8925
+url = http://git-core.googlecode.com/files/git-1.8.5.3.tar.gz
+md5sum = 57b966065882f83ef5879620a1e329ca
 configure-options =
  --with-curl=${curl:location}
  --with-openssl=${openssl:location}

--- a/component/glib/buildout.cfg
+++ b/component/glib/buildout.cfg
 [buildout]
 extends =
  ../gettext/buildout.cfg
+  ../libffi/buildout.cfg
+  ../xz-utils/buildout.cfg
  ../zlib/buildout.cfg
+parts =
+  glib

 [glib]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnome.org/pub/gnome/sources/glib/2.28/glib-2.28.8.tar.bz2
-md5sum = 789e7520f71c6a4bf08bc683ec764d24
+url = http://ftp.gnome.org/pub/gnome/sources/glib/2.39/glib-2.39.3.tar.xz
+md5sum = c8ddc045e12cfafdea607c138f3f8429
 configure-options =
  --disable-static
  --disable-selinux
  --disable-fam
  --disable-xattr
-
+  --disable-man
 environment =
-  CPPFLAGS=-I${zlib:location}/include -I${gettext:location}/include
-  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib
-  PATH=${gettext:location}/bin:%(PATH)s
+  PATH=${gettext:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  CPPFLAGS=-I${gettext:location}/include -I${zlib:location}/include
+  LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+  LIBFFI_CFLAGS=-I${libffi:location}/lib/libffi-${libffi:version}/include
+  LIBFFI_LIBS= -L${libffi:location}/lib -Wl,-rpath=${libffi:location}/lib -lffi

 [x86-cygwin-glib]
 patches =

--- a/component/glibmm/buildout.cfg
+++ b/component/glibmm/buildout.cfg
+[buildout]
+extends =
+  ../gettext/buildout.cfg
+  ../glib/buildout.cfg
+  ../libsigc/buildout.cfg
+  ../pkgconfig/buildout.cfg
+  ../xz-utils/buildout.cfg
+parts =
+  glibmm
+
+[glibmm]
+recipe = slapos.recipe.cmmi
+url = http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.39/glibmm-2.39.3.tar.xz
+md5sum = 4cd63bdb100b4ddc4c69504d1cec62f7
+pkg_config_depends = ${glib:location}/lib/pkgconfig:${libsigc:location}/lib/pkgconfig
+configure-options =
+  --disable-documentation
+environment =
+  PATH=${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${:pkg_config_depends}
+  CPPFLAGS=-I${gettext:location}/include
+  LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib
--- a/component/graphviz/buildout.cfg
+++ b/component/graphviz/buildout.cfg
@@ -5,6 +5,7 @@
 parts =
  graphviz
 extends =
+  ../bzip2/buildout.cfg
  ../fontconfig/buildout.cfg
  ../freetype/buildout.cfg
  ../libpng/buildout.cfg
@@ -20,6 +21,7 @@ url = http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.36.0.tar.gz
 md5sum = 1f41664dba0c93109ac8b71216bf2b57
 depends =
  ${libpng:so_version}
+pkg_config_depends = ${pango:location}/lib/pkgconfig:${pango:pkg_config_depends}
 configure-options =
  --with-included-ltdl
  --with-zincludedir=${zlib:location}/include
@@ -62,6 +64,6 @@ configure-options =
  --without-glut
 environment =
  PATH=${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${cairo:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig:${pango:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${:pkg_config_depends}
  CPPFLAGS=-I${zlib:location}/include
-  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
--- a/component/gtk-2/buildout.cfg
+++ b/component/gtk-2/buildout.cfg
 [buildout]
-extends = 
+extends =
+  ../bzip2/buildout.cfg
+  ../fontconfig/buildout.cfg
+  ../freetype/buildout.cfg
+  ../gettext/buildout.cfg
  ../glib/buildout.cfg
-  ../pkgconfig/buildout.cfg
+  ../libjpeg/buildout.cfg
  ../libpng/buildout.cfg
+  ../libtiff/buildout.cfg
+  ../libxml2/buildout.cfg
+  ../pkgconfig/buildout.cfg
  ../xorg/buildout.cfg
+  ../xz-utils/buildout.cfg
  ../zlib/buildout.cfg
-  ../freetype/buildout.cfg
-  ../fontconfig/buildout.cfg
-  ../gettext/buildout.cfg
-  ../libtiff/buildout.cfg
-  ../libjpeg/buildout.cfg
-    
+
 parts =
  gtk-2

 [cairo]
 recipe = slapos.recipe.cmmi
-url = http://cairographics.org/releases/cairo-1.10.2.tar.gz
-md5sum = f101a9e88b783337b20b2e26dfd26d5f
+url = http://cairographics.org/releases/cairo-1.12.16.tar.xz
+md5sum = a1304edcdc99282f478b995ee5f8f854
 depends =
  ${libpng:so_version}
-configure-options = 
+pkg_config_depends = ${libXext:location}/lib/pkgconfig:${libXext:pkg_config_depends}:${libpng:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${fontconfig:pkg_config_depends}:${pixman:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig
+configure-options =
+  --disable-static
+  --disable-gtk-doc-html
  --enable-tee=yes
  --enable-xlib=yes
-environment = 
-  PATH=${freetype:location}/bin:${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXrender:location}/lib/pkgconfig
-  CPPFLAGS=-I${libpng:location}/include/ -I${zlib:location}/include -I${libX11:location}/include/ -I${xproto:location}/include -I${kbproto:location}/include -I${libXrender:location}/include -I${render:location}/include
-  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${libXrender:location}/lib -Wl,-rpath=${libXrender:location}/lib -L${libX11:location}/lib
-  LD_LIBRARY_PATH=${render:location}/lib:${libX11:location}/lib:${libXrender:location}/lib
+  --disable-xlib-xrender
+  --disable-xcb
+  --enable-ft
+  --enable-fc
+environment =
+  PATH=${freetype:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${:pkg_config_depends}
+  CPPFLAGS=-I${zlib:location}/include
+  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+
+[harfbuzz]
+recipe = slapos.recipe.cmmi
+url = http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-0.9.25.tar.bz2
+md5sum = 491b631239f51dcd4f7934775306c4e7
+pkg_config_depends = ${cairo:location}/lib/pkgconfig:${cairo:pkg_config_depends}
+configure-options =
+  --disable-static
+  --disable-gtk-doc-html
+  --with-cairo
+  --with-freetype
+environment =
+  PATH=${glib:location}/bin:${freetype:location}/bin:${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${:pkg_config_depends}
+  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib

 [pango]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnome.org/pub/gnome/sources/pango/1.29/pango-1.29.3.tar.bz2
-md5sum = be4e3891353fae6b62a6f8d7689c4266
+url = http://ftp.gnome.org/pub/gnome/sources/pango/1.36/pango-1.36.1.tar.xz
+md5sum = 9e0d3a1ea395172f8c39ba98a4d2081a
 depends =
  ${libpng:so_version}
-configure-options = 
+pkg_config_depends = ${harfbuzz:location}/lib/pkgconfig:${harfbuzz:pkg_config_depends}
+configure-options =
  --disable-static
-# XXX-Cedric : Why, god, why do I have to supply the -lXrender option to linker?
-environment = 
-  PATH=${glib:location}/bin:${freetype:location}/bin:${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${cairo:location}/lib/pkgconfig:${libXrender:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig
-  CPPFLAGS=-I${cairo:location}/include/cairo -I${libX11:location}/include/X11 -I${libxcb:location}/include/xcb -I${libXau:location}/include/X11 -I${bzip2:location}/include -L${libXrender:location}/include -I${zlib:location}/include
-  LDFLAGS=-L${cairo:location}/lib -Wl,-rpath=${cairo:location}/lib -L${libX11:location}/lib -Wl,-rpath=${libX11:location}/lib -L${libxcb:location}/lib -Wl,-rpath=${libxcb:location}/lib -L${libXau:location}/lib -Wl,-rpath=${libXau:location}/lib -L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${libXrender:location}/lib -Wl,-rpath=${libXrender:location}/lib -lXrender -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
-  LD_LIBRARY_PATH=${render:location}/lib:${libX11:location}/lib:${libXrender:location}/lib
+  --disable-gtk-doc-html
+environment =
+  PATH=${glib:location}/bin:${freetype:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${:pkg_config_depends}
+  CPPFLAGS=-I${bzip2:location}/include -I${zlib:location}/include
+  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib

 [gdk-pixbuf]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.24/gdk-pixbuf-2.24.0.tar.bz2
-md5sum = d8ece3a4ade4a91c768328620e473ab8
-configure-options = 
+url = http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.30/gdk-pixbuf-2.30.3.tar.xz
+md5sum = 81161cc895eb43afd9ae7354b87e2261
+pkg_config_depends = ${glib:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libX11:pkg_config_depends}
+configure-options =
  --disable-static
  --without-libintl-prefix
-environment = 
-  PATH=${glib:location}/bin:${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${gettext:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${cairo:location}/lib/pkgconfig
+  --with-x11
+environment =
+  PATH=${glib:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${:pkg_config_depends}
  CPPFLAGS=-I${libtiff:location}/include -I${libjpeg:location}/include -I${libpng:location}/include
  LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${glib:location}/lib -Wl,-rpath=${glib:location}/lib -L${libtiff:location}/lib -Wl,-rpath=${libtiff:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${libpng:location}/lib -Wl,-rpath=${libpng:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
  LD_LIBRARY_PATH=${glib:location}/lib:${gettext:location}/lib
-  
+
 [atk]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnome.org/pub/gnome/sources/atk/2.0/atk-2.0.1.tar.bz2
-md5sum = 87f20b78deaedef858ac54358c0786b1
-environment = 
-  PATH=${glib:location}/bin:${pkgconfig:location}/bin:%(PATH)s
+url = http://ftp.gnome.org/pub/gnome/sources/atk/2.11/atk-2.11.5.tar.xz
+md5sum = 4981a8f1e4627c07b00905216889439b
+environment =
+  PATH=${glib:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
  PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig
  LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${glib:location}/lib -Wl,-rpath=${gettext:location}/lib
  LD_LIBRARY_PATH=${glib:location}/lib:${gettext:location}/lib

 [gtk-2]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-2.24.6.tar.bz2
-md5sum = 421100f6597e613234f8dead6091a9fe
+url = http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-2.24.22.tar.xz
+md5sum = 5fbbfb7637bbd571a572a2dae0e736d2
 depends =
  ${libpng:so_version}
-configure-options = 
+pkg_config_depends = ${pango:location}/lib/pkgconfig:${pango:pkg_config_depends}:${atk:location}/lib/pkgconfig:${gdk-pixbuf:location}/lib/pkgconfig
+configure-options =
  --disable-static
+  --disable-glibtest
  --disable-cups
  --disable-papi
  --enable-explicit-deps
  --disable-xinerama
-environment = 
-  PATH=${gdk-pixbuf:location}/bin:${glib:location}/bin:${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${cairo:location}/lib/pkgconfig:${atk:location}/lib/pkgconfig:${gdk-pixbuf:location}/lib/pkgconfig:${pango:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libXrender:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xcbproto:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig
-  CPPFLAGS=-I${libtiff:location}/include -I${libjpeg:location}/include -I${libpng:location}/include -I${libX11:location}/include/ -I${xproto:location}/include -I${kbproto:location}/include -I${libXrender:location}/include -I${render:location}/include -I${libXext:location}/include -I${cairo:location}/include/cairo -I${zlib:location}/include -I${bzip2:location}/include -I${libXdmcp:location}/include -I${glib:location}/include/gio-unix-2.0 -I${glib:location}/include/glib-2.0 -I${glib:location}/include -I${atk:location}/include/atk-1.0
-  LDFLAGS=-L${libtiff:location}/lib -Wl,-rpath=${libtiff:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${libpng:location}/lib -Wl,-rpath=${libpng:location}/lib -L${libX11:location}/lib -Wl,-rpath=${libX11:location}/lib -L${xproto:location}/lib -Wl,-rpath=${xproto:location}/lib -L${kbproto:location}/lib -Wl,-rpath=${kbproto:location}/lib -L${libXrender:location}/lib -Wl,-rpath=${libXrender:location}/lib -L${render:location}/lib -Wl,-rpath=${render:location}/lib -L${libXext:location}/lib -Wl,-rpath=${libXext:location}/lib -L${cairo:location}/lib -Wl,-rpath=${cairo:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${libXdmcp:location}/lib -Wl,-rpath=${libXdmcp:location}/lib -L${glib:location}/lib -Wl,-rpath=${glib:location}/lib  -L${atk:location}/lib -Wl,-rpath=${atk:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib
-  LD_LIBRARY_PATH=${glib:location}/lib:${gettext:location}/lib:${libX11:location}/lib
+  --disable-gtk-doc-html
+environment =
+  PATH=${gdk-pixbuf:location}/bin:${glib:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${:pkg_config_depends}
+# not taken from pkg-config result...
+  CPPFLAGS=-I${libX11:location}/include/ -I${xproto:location}/include -I${kbproto:location}/include -I${libXrender:location}/include -I${render:location}/include -I${libXext:location}/include
+  LDFLAGS=-L${libX11:location}/lib -L${libXext:location}/lib -L${libXrender:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
--- a/component/gtkmm/buildout.cfg
+++ b/component/gtkmm/buildout.cfg
+[buildout]
+extends =
+  ../bzip2/buildout.cfg
+  ../fontconfig/buildout.cfg
+  ../freetype/buildout.cfg
+  ../gtk-2/buildout.cfg
+  ../libpng/buildout.cfg
+  ../libxml2/buildout.cfg
+  ../xorg/buildout.cfg
+  ../xz-utils/buildout.cfg
+  ../zlib/buildout.cfg
+parts =
+  gtkmm
+
+[cairomm]
+recipe = slapos.recipe.cmmi
+url = http://cairographics.org/releases/cairomm-1.10.0.tar.gz
+md5sum = 9c63fb1c04c8ecd3c5e6473075b8c39f
+depends =
+  ${libpng:so_version}
+pkg_config_depends = ${cairo:location}/lib/pkgconfig:${cairo:pkg_config_depends}:${libsigc:location}/lib/pkgconfig
+configure-options =
+  --disable-static
+  --disable-documentation
+environment =
+  PATH=${freetype:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${:pkg_config_depends}
+  CPPFLAGS=-I${libX11:location}/include -I${libXrender:location}/include -I${render:location}/include -I${xproto:location}/include
+  LDFLAGS=-L${libX11:location}/lib -Wl,-rpath=${libX11:location}/lib -L${libXext:location}/lib -Wl,-rpath=${libXext:location}/lib -L${libXrender:location}/lib -Wl,-rpath=${libXrender:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+
+[pangomm]
+recipe = slapos.recipe.cmmi
+url = ftp://ftp.gnome.org/pub/gnome/sources/pangomm/2.34/pangomm-2.34.0.tar.xz
+md5sum = 2c702caede167323c9ed9eed2b933098
+pkg_config_depends = ${pango:location}/lib/pkgconfig:${pango:pkg_config_depends}:${glibmm:location}/lib/pkgconfig:${glibmm:pkg_config_depends}:${cairomm:location}/lib/pkgconfig
+configure-options =
+  --disable-static
+  --disable-documentation
+environment =
+  PATH=${glib:location}/bin:${freetype:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${:pkg_config_depends}
+  LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib
+
+[atkmm]
+recipe = slapos.recipe.cmmi
+url = http://ftp.gnome.org/pub/gnome/sources/atkmm/2.22/atkmm-2.22.7.tar.xz
+md5sum = fec7db3fc47ba2e0c95d130ec865a236
+pkg_config_depends = ${glib:location}/lib/pkgconfig:${atk:location}/lib/pkgconfig:${libsigc:location}/lib/pkgconfig:${glibmm:location}/lib/pkgconfig:
+configure-options =
+  --disable-static
+  --disable-documentation
+environment =
+  PATH=${glib:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${:pkg_config_depends}
+  LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib
+
+[gtkmm]
+recipe = slapos.recipe.cmmi
+url = http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.24/gtkmm-2.24.4.tar.xz
+md5sum = b9ac60c90959a71095f07f84dd39961d
+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}
+configure-options =
+  --disable-static
+  --disable-documentation
+environment =
+  PATH=${gdk-pixbuf:location}/bin:${glib:location}/bin:${gtk-2:location}/bin:${pango:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${:pkg_config_depends}
+  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
--- a/component/imagemagick/buildout.cfg
+++ b/component/imagemagick/buildout.cfg
@@ -8,6 +8,7 @@ extends =
  ../fontconfig/buildout.cfg
  ../freetype/buildout.cfg
  ../ghostscript/buildout.cfg
+  ../lcms/buildout.cfg
  ../librsvg/buildout.cfg
  ../libjpeg/buildout.cfg
  ../libpng/buildout.cfg
@@ -31,12 +32,14 @@ filename = imagemagick-6.6.6-1-no-gsx-gsc-probe.patch

 [imagemagick]
 recipe = slapos.recipe.cmmi
-url = http://ftp.vim.org/ImageMagick/ImageMagick-6.8.2-6.tar.xz
-md5sum = ee01558201041a9978dd14b1db946ce8
+version = 6.8.8-2
+url = http://ftp.vim.org/ImageMagick/ImageMagick-${:version}.tar.xz
+md5sum = d11e1c732add731ff368b2dffcd004b4
 depends =
  ${libtiff:version}
  ${libpng:so_version}
  ${webp:so_version}
+pkg_config_depends = ${fontconfig:location}/lib/pkgconfig:${fontconfig:pkg_config_depends}:${xz-utils:location}/lib/pkgconfig
 configure-options =
  --disable-static
  --without-x
@@ -51,7 +54,7 @@ configure-options =
  --without-gslib
  --without-gvc
  --without-lcms
-  --without-lcms2
+  --with-lcms2
  --without-lqr
  --without-openexr
  --without-pango
@@ -68,6 +71,6 @@ patches =
  ${imagemagick-6.6.6-1-no-gsx-gsc-probe.patch:location}/${imagemagick-6.6.6-1-no-gsx-gsc-probe.patch:filename}
 environment =
  PATH=${freetype:location}/bin:${ghostscript:location}/bin:${librsvg:location}/bin:${libxml2:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${xz-utils:location}/lib/pkgconfig
-  CPPFLAGS=-I${bzip2:location}/include -I${zlib:location}/include -I${jbigkit:location}/include -I${libjpeg:location}/include -I${libtiff:location}/include -I${libpng:location}/include -I${jasper:location}/include -I${freetype:location}/include -I${webp:location}/include
-  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${jbigkit:location}/lib -Wl,-rpath=${jbigkit:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${libtiff:location}/lib -Wl,-rpath=${libtiff:location}/lib -L${libpng:location}/lib -Wl,-rpath=${libpng:location}/lib -L${jasper:location}/lib -Wl,-rpath=${jasper:location}/lib -L${freetype:location}/lib -Wl,-rpath=${freetype:location}/lib -L${webp:location}/lib -Wl,-rpath=${webp:location}/lib
+  PKG_CONFIG_PATH=${:pkg_config_depends}
+  CPPFLAGS=-I${bzip2:location}/include -I${zlib:location}/include -I${jbigkit:location}/include -I${libjpeg:location}/include -I${libtiff:location}/include -I${libpng:location}/include -I${jasper:location}/include -I${freetype:location}/include -I${webp:location}/include -I${lcms2:location}/include
+  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${jbigkit:location}/lib -Wl,-rpath=${jbigkit:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${libtiff:location}/lib -Wl,-rpath=${libtiff:location}/lib -L${libpng:location}/lib -Wl,-rpath=${libpng:location}/lib -L${jasper:location}/lib -Wl,-rpath=${jasper:location}/lib -L${freetype:location}/lib -Wl,-rpath=${freetype:location}/lib -L${webp:location}/lib -Wl,-rpath=${webp:location}/lib -L${lcms2:location}/lib -Wl,-rpath=${lcms2:location}/lib
--- a/component/inkscape/buildout.cfg
+++ b/component/inkscape/buildout.cfg
+[buildout]
+parts = inkscape
+extends =
+  ../boost-lib/buildout.cfg
+  ../bzip2/buildout.cfg
+  ../freetype/buildout.cfg
+  ../garbage-collector/buildout.cfg
+  ../gcc/buildout.cfg
+  ../gettext/buildout.cfg
+  ../glibmm/buildout.cfg
+  ../gtk-2/buildout.cfg
+  ../gtkmm/buildout.cfg
+  ../intltool/buildout.cfg
+  ../libpng/buildout.cfg
+  ../libsigc/buildout.cfg
+  ../libxml2/buildout.cfg
+  ../libxslt/buildout.cfg
+  ../perl/buildout.cfg
+  ../pkgconfig/buildout.cfg
+  ../popt/buildout.cfg
+  ../xorg/buildout.cfg
+  ../zlib/buildout.cfg
+
+[gsl]
+recipe = slapos.recipe.cmmi
+url = ftp://ftp.gnu.org/gnu/gsl/gsl-1.16.tar.gz
+md5sum = e49a664db13d81c968415cd53f62bc8b
+configure-options =
+  --disable-static
+environment =
+  PATH=${glib:location}/bin:${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${atk:location}/lib/pkgconfig:${libsigc:location}/lib/pkgconfig:${glibmm:location}/lib/pkgconfig:
+  LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib
+
+[inkscape.patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+md5sum = 1bdb1154e98c08cb676445b625d7cec0
+download-only = true
+filename = inkscape-0.48.4.patch
+
+[inkscape]
+recipe = slapos.recipe.cmmi
+url = http://sourceforge.net/projects/inkscape/files/inkscape/0.48.4/inkscape-0.48.4.tar.bz2
+md5sum = 47bd8546e42ba396624eef9eb66b9b6c
+depends =
+  ${libpng:so_version}
+pkg_config_depends = ${gtkmm:location}/lib/pkgconfig:${gtkmm:pkg_config_depends}:${gsl:location}/lib/pkgconfig:${popt:location}/lib/pkgconfig:${garbage-collector:location}/lib/pkgconfig:${libxslt:location}/lib/pkgconfig
+patch-options = -p0
+patches =
+  ${inkscape.patch:location}/${inkscape.patch:filename}
+configure-options =
+  --disable-lcms
+  --without-gnome-vfs
+  --without-perl
+  --without-python
+environment =
+  PATH=${freetype:location}/bin:${gdk-pixbuf:location}/bin:${gettext:location}/bin:${glib:location}/bin:${intltool:location}/bin:${libxml2:location}/bin:${pkgconfig:location}/bin:${pango:location}/bin:${perl:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${:pkg_config_depends}
+  CPPFLAGS=-I${boost-lib:location}/include -I${cairo:location}/include -I${garbage-collector:location}/include -I${libpng:location}/include -I${popt:location}/include  -I${zlib:location}/include
+# rpath seems not taken from pkgconfig...
+  LDFLAGS=-L${atk:location}/lib -Wl,-rpath=${atk:location}/lib -L${atkmm:location}/lib -Wl,-rpath=${atkmm:location}/lib -L${boost-lib:location}/lib -Wl,-rpath=${boost-lib:location}/lib -L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${cairo:location}/lib -Wl,-rpath=${cairo:location}/lib -L${cairomm:location}/lib -Wl,-rpath=${cairomm:location}/lib -L${fontconfig:location}/lib -Wl,-rpath=${fontconfig:location}/lib -L${freetype:location}/lib -Wl,-rpath=${freetype:location}/lib -L${garbage-collector:location}/lib -Wl,-rpath=${garbage-collector:location}/lib -L${gdk-pixbuf:location}/lib -Wl,-rpath=${gdk-pixbuf:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${glib:location}/lib -Wl,-rpath=${glib:location}/lib -L${glibmm:location}/lib -Wl,-rpath=${glibmm:location}/lib -L${gsl:location}/lib -Wl,-rpath=${gsl:location}/lib -L${gtk-2:location}/lib -Wl,-rpath=${gtk-2:location}/lib -L${gtkmm:location}/lib -Wl,-rpath=${gtkmm:location}/lib -L${libX11:location}/lib -Wl,-rpath=${libX11:location}/lib -L${libXext:location}/lib -Wl,-rpath=${libXext:location}/lib -L${libpng:location}/lib -Wl,-rpath=${libpng:location}/lib -L${libsigc:location}/lib -Wl,-rpath=${libsigc:location}/lib -L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib -L${libxslt:location}/lib -Wl,-rpath=${libxslt:location}/lib -L${pango:location}/lib -Wl,-rpath=${pango:location}/lib -L${pangomm:location}/lib -Wl,-rpath=${pangomm:location}/lib -L${popt:location}/lib -Wl,-rpath=${popt:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
--- a/component/inkscape/inkscape-0.48.4.patch
+++ b/component/inkscape/inkscape-0.48.4.patch
+--- src/widgets/desktop-widget.h~       2011-07-08 20:25:09.000000000 +0200
+++ src/widgets/desktop-widget.h        2014-01-17 13:22:48.503773743 +0100
+@@ -239,7 +239,7 @@
+ private:
+     GtkWidget *tool_toolbox;
+     GtkWidget *aux_toolbox;
+-    GtkWidget *commands_toolbox,;
+    GtkWidget *commands_toolbox;
+     GtkWidget *snap_toolbox;
+ 
+     static void init(SPDesktopWidget *widget);
--- a/component/lcms/buildout.cfg
+++ b/component/lcms/buildout.cfg
+# Little CMS - Great color at small footprint
+# http://www.littlecms.com
+
+[buildout]
+extends =
+  ../jbigkit/buildout.cfg
+  ../libjpeg/buildout.cfg
+  ../libtiff/buildout.cfg
+  ../zlib/buildout.cfg
+
+parts =
+  lcms2
+
+[lcms2]
+recipe = slapos.recipe.cmmi
+url = http://downloads.sourceforge.net/project/lcms/lcms/2.5/lcms2-2.5.tar.gz
+md5sum = 396d106600251441ff195fcaa277d10b
+depends =
+  ${libpng:so_version}
+  ${libtiff:version}
+configure-options =
+  --disable-static
+environment =
+  CPPFLAGS=-I${libjpeg:location}/include -I${libtiff:location}/include -I${zlib:location}/include
+  LDFLAGS=-L${jbigkit:location}/lib -Wl,-rpath=${jbigkit:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${libtiff:location}/lib -Wl,-rpath=${libtiff:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
--- a/component/libdmtx/buildout.cfg
+++ b/component/libdmtx/buildout.cfg
@@ -25,6 +25,7 @@ url = http://prdownloads.sourceforge.net/libdmtx/dmtx-utils-0.7.4.tar.bz2
 md5sum = b132ab9fb1d289869469b8bb4959a08a
 depends =
  ${libpng:so_version}
+  ${imagemagick:version}
 configure-options =
  --disable-static
 environment =

--- a/component/libexpat/buildout.cfg
+++ b/component/libexpat/buildout.cfg
@@ -4,7 +4,7 @@ parts =

 [libexpat]
 recipe = slapos.recipe.cmmi
-url = http://sourceforge.net/projects/expat/files/expat/2.1.0/expat-2.1.0.tar.gz/download
+url = http://downloads.sourceforge.net/project/expat/expat/2.1.0/expat-2.1.0.tar.gz
 md5sum = dd7dab7a5fea97d2a6a43f511449b7cd
 configure-options =
  --disable-static
--- a/component/libffi/buildout.cfg
+++ b/component/libffi/buildout.cfg
+[buildout]
+parts =
+  libffi
+
+[libffi]
+recipe = slapos.recipe.cmmi
+version = 3.0.13
+url = ftp://sourceware.org/pub/libffi/libffi-${:version}.tar.gz
+md5sum = 45f3b6dbc9ee7c7dfbbbc5feba571529
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+configure-options =
+  --disable-static
+# on x86_64 OpenSuse, libraries are installed under parts/libffi/lib64.
+make-targets =
+  install && cp -av ${:location}/lib64/* ${:location}/lib/ || true
--- a/component/librsvg/buildout.cfg
+++ b/component/librsvg/buildout.cfg
@@ -14,6 +14,8 @@ extends =
 recipe = slapos.recipe.cmmi
 url = http://ftp.gnome.org/pub/gnome/sources/libcroco/0.6/libcroco-0.6.8.tar.xz
 md5sum = 767e73c4174f75b99695d4530fd9bb80
+configure-options =
+  --disable-static
 environment =
  PATH=${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
  PKG_CONFIG_PATH=${pkgconfig:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig
@@ -21,11 +23,11 @@ environment =

 [librsvg]
 recipe = slapos.recipe.cmmi
-version = 2.36.1
-url = http://ftp.gnome.org/pub/GNOME/sources/librsvg/2.36/librsvg-2.36.4.tar.xz
-md5sum = 3c94524c8ccf668e30b236f409239f54
+url = http://ftp.gnome.org/pub/GNOME/sources/librsvg/2.40/librsvg-2.40.1.tar.xz
+md5sum = a31eb5d66c3fe94d888a6b17a287ea42
 depends =
  ${libpng:so_version}
+pkg_config_depends = ${pango:location}/lib/pkgconfig:${pango:pkg_config_depends}:${zlib:location}/lib/pkgconfig:${gdk-pixbuf:location}/lib/pkgconfig:${libcroco:location}/lib/pkgconfig
 configure-options =
  --disable-static
  --disable-gtk-theme
@@ -36,5 +38,5 @@ configure-options =
  --enable-introspection=no
 environment =
  PATH=${gdk-pixbuf:location}/bin:${glib:location}/bin:${libxml2:location}/bin:${pkgconfig:location}/bin:${pango:location}/bin:${xz-utils:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${cairo:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${gdk-pixbuf:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libXrender:location}/lib/pkgconfig:${libcroco:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig:${pango:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${:pkg_config_depends}
  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${zlib:location}/lib
--- a/component/libsigc/buildout.cfg
+++ b/component/libsigc/buildout.cfg
+[buildout]
+extends =
+  ../m4/buildout.cfg
+
+parts =
+  libsigc
+
+[libsigc]
+recipe = slapos.recipe.cmmi
+url = http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.3/libsigc++-2.3.1.tar.xz
+md5sum = 06a0569e8ba161d3428e7daa838682f8
+configure-options =
+  --disable-documentation
+environment =
+  PATH=${m4:location}/bin:%(PATH)s
--- a/component/openssl/buildout.cfg
+++ b/component/openssl/buildout.cfg
@@ -32,6 +32,8 @@ download-only = true
 recipe = slapos.recipe.cmmi
 url = https://www.openssl.org/source/openssl-1.0.1f.tar.gz
 md5sum = f26b09c028a0541cab33da697d522b25
+depends =
+  ${ca-certificates:version}
 patch-binary = ${patch:location}/bin/patch
 patches =
  ${openssl-nodoc.patch:location}/${openssl-nodoc.patch:filename}

--- a/component/pcre/buildout.cfg
+++ b/component/pcre/buildout.cfg
@@ -4,8 +4,8 @@ parts =

 [pcre]
 recipe = slapos.recipe.cmmi
-url = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.32.tar.bz2
-md5sum = 62f02a76bb57a40bc66681760ed511d5
+url = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.34.tar.bz2
+md5sum = 5439e321351bddd5533551bbce128d07
 configure-options =
  --disable-static
  --enable-unicode-properties
--- a/component/poppler/buildout.cfg
+++ b/component/poppler/buildout.cfg
@@ -8,6 +8,7 @@ extends =
  ../libjpeg/buildout.cfg
  ../libpng/buildout.cfg
  ../libtiff/buildout.cfg
+  ../libxml2/buildout.cfg
  ../pkgconfig/buildout.cfg
  ../zlib/buildout.cfg

@@ -31,6 +32,6 @@ configure-options =
  --enable-zlib
 environment =
  PATH=${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${fontconfig:location}/lib/pkgconfig:${fontconfig:pkg_config_depends}:${libpng:location}/lib/pkgconfig
  CPPFLAGS=-I${bzip2:location}/include -I${libjpeg:location}/include -I${libpng:location}/include -I${libtiff:location}/include -I${zlib:location}/include
  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${jbigkit:location}/lib -Wl,-rpath=${jbigkit:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${libtiff:location}/lib -Wl,-rpath=${libtiff:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
--- a/component/python-2.7/buildout.cfg
+++ b/component/python-2.7/buildout.cfg
@@ -4,6 +4,7 @@ extends =
  ../gdbm/buildout.cfg
  ../gettext/buildout.cfg
  ../libexpat/buildout.cfg
+  ../libffi/buildout.cfg
  ../ncurses/buildout.cfg
  ../openssl/buildout.cfg
  ../readline/buildout.cfg
@@ -44,6 +45,7 @@ configure-options =
  --enable-ipv6
  --enable-unicode=ucs4
  --with-system-expat
+  --with-system-ffi
  --with-threads
 # Profiled build:
 make-binary =
@@ -53,5 +55,5 @@ make-targets = make profile-opt && make install
 # which would otherwise load the system libmagic.so with ctypes
 environment =
  PATH=${xz-utils:location}/bin:%(PATH)s
-  CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${libexpat:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${bzip2:location}/include  -I${gdbm:location}/include -I${openssl:location}/include -I${sqlite3:location}/include -I${gettext:location}/include
-  LDFLAGS=-L${zlib:location}/lib -L${readline:location}/lib -L${libexpat:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${file:location}/lib
+  CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${libexpat:location}/include -I${libffi:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${bzip2:location}/include  -I${gdbm:location}/include -I${openssl:location}/include -I${sqlite3:location}/include -I${gettext:location}/include
+  LDFLAGS=-L${zlib:location}/lib -L${readline:location}/lib -L${libexpat:location}/lib -L${libffi:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${libffi:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${file:location}/lib
--- a/component/sqlite3/buildout.cfg
+++ b/component/sqlite3/buildout.cfg
@@ -5,8 +5,8 @@ parts =

 [sqlite3]
 recipe = slapos.recipe.cmmi
-url = http://www.sqlite.org/2013/sqlite-autoconf-3080100.tar.gz
-md5sum = 8b5a0a02dfcb0c7daf90856a5cfd485a
+url = http://www.sqlite.org/2013/sqlite-autoconf-3080200.tar.gz
+md5sum = f62206713e6a08d4ccbc60b1fd712a1a
 configure-options =
  --disable-static
  --enable-readline

--- a/component/varnish/buildout.cfg
+++ b/component/varnish/buildout.cfg
@@ -17,7 +17,7 @@ extends =

 [varnish-2.0]
 recipe = slapos.recipe.cmmi
-url = http://sourceforge.net/projects/varnish/files/varnish/2.0.6/varnish-2.0.6.tar.gz/download
+url = http://downloads.sourceforge.net/project/varnish/varnish/2.0.6/varnish-2.0.6.tar.gz
 md5sum = d91dc21c636db61c69b5e8f061c5bb95
 configure-options =
  --disable-static

--- a/component/xorg/buildout.cfg
+++ b/component/xorg/buildout.cfg
@@ -132,8 +132,9 @@ environment =
 recipe = slapos.recipe.cmmi
 url = http://www.x.org/releases/X11R7.7/src/everything/libXext-1.3.1.tar.bz2
 md5sum = 71251a22bc47068d60a95f50ed2ec3cf
+pkg_config_depends = ${libX11:location}/lib/pkgconfig:${libX11:pkg_config_depends}
 environment =
-  PKG_CONFIG_PATH=${kbproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${:pkg_config_depends}
  LD_LIBRARY_PATH=${libX11:location}/lib
  PATH=${pkgconfig:location}/bin:%(PATH)s
 # Warning: do *not* enable -fPIC CFLAGS for this library. Even if it fails and ld asks you to enable it. This will not solve your problem, and create an unexpected (by build chain) setup (all .o will be position-independant code).
@@ -159,6 +160,7 @@ md5sum = 677ea8523eec6caca86121ad2dca0b71
 recipe = slapos.recipe.cmmi
 url = http://www.x.org/releases/X11R7.7/src/everything/libX11-1.5.0.tar.bz2
 md5sum = 78b4b3bab4acbdf0abcfca30a8c70cc6
+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
 configure-options =
  --disable-static
  --enable-loadable-i18n
@@ -169,9 +171,8 @@ configure-options =
  --without-xmlto
  --without-fop
 environment =
-  PKG_CONFIG_PATH=${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:${xproto:location}/lib/pkgconfig:${xtrans:location}/share/pkgconfig
  PATH=${pkgconfig:location}/bin:%(PATH)s
-
+  PKG_CONFIG_PATH=${:pkg_config_depends}

 # Below is stuff for xserver

@@ -247,6 +248,8 @@ md5sum = 9959fe0bfb22a0e7260433b8d199590a
 recipe = slapos.recipe.cmmi
 url = http://xorg.freedesktop.org/archive/individual/lib/pixman-0.32.4.tar.bz2
 md5sum = cdb566504fe9daf6728c7b03cc7ea228
+configure-options =
+  --disable-static

 [libfontenc]
 recipe = slapos.recipe.cmmi
@@ -307,12 +310,12 @@ md5sum = d43c2afc69937655d13c02588c9ff974

 [libXrender]
 recipe = slapos.recipe.cmmi
-url = http://xlibs.freedesktop.org/release/libXrender-0.9.0.tar.bz2
-md5sum = ce7cda009aa0b10a73637941d44ae789
+url = http://www.x.org/releases/X11R7.7/src/everything/libXrender-0.9.7.tar.bz2
+md5sum = ee62f4c7f0f16ced4da63308963ccad2
 configure-options =
  --disable-static
 environment =
-  PKG_CONFIG_PATH=${kbproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${render:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${kbproto:location}/lib/pkgconfig:${renderproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${render:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig
  PATH=${pkgconfig:location}/bin:%(PATH)s

 [libXinerama]
@@ -439,7 +442,7 @@ url = http://www.x.org/releases/X11R7.7/src/everything/libXcursor-1.1.13.tar.bz2
 md5sum = 52efa81b7f26c8eda13510a2fba98eea
 environment =
  PATH=${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${render:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${fixesproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${xfixes:location}/lib/pkgconfig:${libXrender:location}/lib/pkgconfig:${renderproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${render:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${fixesproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${xfixes:location}/lib/pkgconfig:${libXrender:location}/lib/pkgconfig:${renderproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${renderproto:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig

 [xwd]
 recipe = slapos.recipe.cmmi

--- a/component/xz-utils/buildout.cfg
+++ b/component/xz-utils/buildout.cfg
@@ -4,5 +4,5 @@ parts =

 [xz-utils]
 recipe = slapos.recipe.cmmi
-url = http://tukaani.org/xz/xz-5.0.4.tar.gz
-md5sum = df3df690aef18384e1e031be7ec3a964
+url = http://tukaani.org/xz/xz-5.0.5.tar.bz2
+md5sum = db44efe0d53ac4317627624b98c63da0
--- a/component/zabbix/buildout.cfg
+++ b/component/zabbix/buildout.cfg
@@ -4,8 +4,8 @@ parts =

 [zabbix-agent]
 recipe = slapos.recipe.cmmi
-url = http://prdownloads.sourceforge.net/zabbix/zabbix-2.0.5.tar.gz?download
-md5sum = 0c0721c31889b63bce9aa556bcb927e8
+url = http://downloads.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stable/2.0.10/zabbix-2.0.10.tar.gz
+md5sum = 49297c0ac61858fd75ab9ea18ca6cdbb
 configure-options =
  --enable-agent
  --enable-ipv6
--- a/component/zip/buildout.cfg
+++ b/component/zip/buildout.cfg
@@ -3,7 +3,7 @@ parts = zip

 [zip]
 recipe = slapos.recipe.cmmi
-url = http://sourceforge.net/projects/infozip/files/Zip%203.x%20%28latest%29/3.0/zip30.tar.gz/download
+url = http://downloads.sourceforge.net/project/infozip/Zip%203.x%20%28latest%29/3.0/zip30.tar.gz
 md5sum = 7b74551e63f8ee6aab6fbc86676c0d37
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 configure-command = true

--- a/stack/erp5/buildout.cfg
+++ b/stack/erp5/buildout.cfg
@@ -33,6 +33,7 @@ extends =
  ../../component/hookbox/buildout.cfg
  ../../component/librsvg/buildout.cfg
  ../../component/imagemagick/buildout.cfg
+  ../../component/inkscape/buildout.cfg
  ../../component/kumo/buildout.cfg
  ../../component/libdmtx/buildout.cfg
  ../../component/libpng/buildout.cfg
@@ -85,6 +86,7 @@ parts =
  mariadb
  mroonga-mariadb
  imagemagick
+  inkscape
  libdmtx
  dmtx-utils
  kumo
@@ -611,7 +613,7 @@ zope.app.publication = 3.14.0
 zope.app.testing = 3.8.1

 # Pinned versions
-Flask = 0.9
+Flask = 0.10.1
 GitPython = 0.3.2.RC1
 MySQL-python = 1.2.5
 PIL = 1.1.7
@@ -628,8 +630,8 @@ Products.ZSQLMethods = 2.13.4
 PyPDF2 = 1.19
 StructuredText = 2.11.1
 WSGIUtils = 0.7
-Werkzeug = 0.8.3
-apache-libcloud = 0.12.4
+Werkzeug = 0.9.4
+apache-libcloud = 0.13.3
 async = 0.6.1
 atomize = 0.1.1
 cElementTree = 1.0.5-20051216
@@ -652,6 +654,7 @@ huBarcode = 0.63
 inotifyx = 0.2.0
 ipdb = 0.8
 ipython = 1.1.0
+itsdangerous = 0.23
 meld3 = 0.6.10
 netaddr = 0.7.10
 netifaces = 0.8_1
@@ -660,7 +663,7 @@ plone.recipe.command = 1.1
 ply = 3.4
 polib = 1.0.3
 psutil = 1.2.1
-pyflakes = 0.7.2
+pyflakes = 0.7.3
 python-ldap = 2.4.13
 python-magic = 0.4.6
 qrcode = 4.0.4
@@ -674,7 +677,7 @@ slapos.toolbox = 0.38.1
 smmap = 0.8.2
 socketpool = 0.5.3
 spyne = 2.10.9
-supervisor = 3.0b2
+supervisor = 3.0
 threadframe = 0.2
 timerserver = 2.0.2
 urlnorm = 1.1.2