versionup : fontconfig, gtk+ related, ghostscript.

also revert "revert libXrender version because building cairo-1.10.2 failed."
also cleanup PKG_CONFIG_PATH.
also cleanup boost-lib recipe.

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 link=shared install
+configure-command = ./bootstrap.sh --prefix=${:location}
+make-binary =
+make-options =
+make-targets = ./bjam link=shared install

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

component/ghostscript/buildout.cfg

@@ -3,6 +3,7 @@ extends =
   ../fontconfig/buildout.cfg
   ../libjpeg/buildout.cfg
   ../libtiff/buildout.cfg
+  ../libxml2/buildout.cfg
   ../pkgconfig/buildout.cfg
 
 parts = ghostscript
@@ -11,6 +12,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 +25,16 @@ 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=-L${fontconfig:location}/lib -Wl,-rpath=${fontconfig:location}/lib -L${libtiff:location}/lib -Wl,-rpath=${libtiff: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

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 =

component/glibmm/buildout.cfg

 [buildout]
 extends =
+  ../gettext/buildout.cfg
   ../glib/buildout.cfg
   ../libsigc/buildout.cfg
   ../pkgconfig/buildout.cfg
@@ -9,10 +10,13 @@ parts =
 
 [glibmm]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.28/glibmm-2.28.2.tar.xz
-md5sum = 7bbc4ad1c4f79dec0ee79e6daea4bb03
+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=${glib:location}/lib/pkgconfig:${libsigc:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${:pkg_config_depends}
+  CPPFLAGS=-I${gettext:location}/include
+  LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib

component/graphviz/buildout.cfg

@@ -20,6 +20,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 +63,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

component/gtkmm/buildout.cfg

@@ -4,6 +4,7 @@ extends =
   ../freetype/buildout.cfg
   ../gtk-2/buildout.cfg
   ../libpng/buildout.cfg
+  ../libxml2/buildout.cfg
   ../xorg/buildout.cfg
   ../xz-utils/buildout.cfg
 parts =
@@ -15,46 +16,50 @@ 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=${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig::${libpng:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXrender:location}/lib/pkgconfig:${cairo:location}/lib/pkgconfig:${libsigc:location}/lib/pkgconfig
+  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${libXrender:location}/lib -Wl,-rpath=${libXrender:location}/lib
+  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
 
 [pangomm]
 recipe = slapos.recipe.cmmi
-url = ftp://ftp.gnome.org/pub/gnome/sources/pangomm/2.28/pangomm-2.28.4.tar.xz
-md5sum = f4fe0905ee56e1ff0205005e61d2a66f
+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=${glib:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${cairo:location}/lib/pkgconfig:${pango:location}/lib/pkgconfig:${libsigc:location}/lib/pkgconfig:${glibmm:location}/lib/pkgconfig:${cairomm:location}/lib/pkgconfig:${libXrender:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig
+  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.6.tar.xz
-md5sum = 30f8e34c92b14f17ba3029937b2f218a
+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=${glib:location}/lib/pkgconfig:${atk:location}/lib/pkgconfig:${libsigc:location}/lib/pkgconfig:${glibmm:location}/lib/pkgconfig:
+  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=${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:${cairomm:location}/lib/pkgconfig:${pangomm:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${glibmm:location}/lib/pkgconfig:${libsigc:location}/lib/pkgconfig:${gtk-2:location}/lib/pkgconfig::${atkmm:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${:pkg_config_depends}

component/imagemagick/buildout.cfg

@@ -37,6 +37,7 @@ 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
@@ -68,6 +69,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
+  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
   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

component/inkscape/buildout.cfg

@@ -44,6 +44,7 @@ url = http://sourceforge.net/projects/inkscape/files/inkscape/0.48.4/inkscape-0.
 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}
@@ -54,7 +55,7 @@ configure-options =
   --without-python
 environment =
   PATH=${freetype:location}/bin:${gdk-pixbuf: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=${cairo:location}/lib/pkgconfig:${cairomm:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${gdk-pixbuf:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${intltool: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:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${garbage-collector:location}/lib/pkgconfig:${libsigc:location}/lib/pkgconfig:${libxslt:location}/lib/pkgconfig:${glibmm:location}/lib/pkgconfig:${atk:location}/lib/pkgconfig:${gtk-2:location}/lib/pkgconfig:${atkmm:location}/lib/pkgconfig:${pangomm:location}/lib/pkgconfig:${gtkmm:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig:${gsl:location}/lib/pkgconfig:${popt:location}/lib/pkgconfig
+  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
 # rpath seems not taken from pkgconfig...
   LDFLAGS=-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${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

component/librsvg/buildout.cfg

@@ -23,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
@@ -38,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

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

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
 
@@ -309,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]
@@ -441,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