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

component/fontconfig/buildout.cfg

@@ -15,7 +15,7 @@ parts =
 recipe = slapos.recipe.cmmi
 url = http://fontconfig.org/release/fontconfig-2.11.1.tar.bz2
 md5sum = 824d000eb737af6e16c826dd3b2d6c90
-pkg_config_depends = ${freetype:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig
+pkg_config_depends = ${freetype: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

component/freetype/buildout.cfg

@@ -5,6 +5,7 @@
 extends =
   ../bzip2/buildout.cfg
   ../libpng/buildout.cfg
+  ../pkgconfig/buildout.cfg
   ../zlib/buildout.cfg
 
 parts =
@@ -14,14 +15,16 @@ parts =
 recipe = slapos.recipe.cmmi
 url = http://download.savannah.gnu.org/releases/freetype/freetype-2.5.3.tar.bz2
 md5sum = d6b60f06bfc046e43ab2a6cbfd171d65
+pkg_config_depends = ${zlib:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig
 depends =
   ${libpng:so_version}
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 configure-options =
   --disable-static
 environment =
+  PATH=${pkgconfig: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
-  PATH=${libpng:location}/bin:%(PATH)s
 make-targets =
   install && ln -s . ${:location}/include/freetype2/freetype

component/gtk-2/buildout.cfg

@@ -41,8 +41,8 @@ environment =
 
 [harfbuzz]
 recipe = slapos.recipe.cmmi
-url = http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-0.9.25.tar.bz2
-md5sum = 491b631239f51dcd4f7934775306c4e7
+url = http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-0.9.28.tar.bz2
+md5sum = accbeb679f39d839038b95a87e40870e
 pkg_config_depends = ${cairo:location}/lib/pkgconfig:${cairo:pkg_config_depends}
 configure-options =
   --disable-static

stack/erp5/buildout.cfg

@@ -731,7 +731,7 @@ paramiko = 1.13.0
 plone.recipe.command = 1.1
 ply = 3.4
 polib = 1.0.4
-pprofile = 1.7.1
+pprofile = 1.7.2
 psutil = 2.1.1
 pyflakes = 0.8.1
 pylint = 1.2.1