Merge remote-tracking branch 'origin/master' into erp5testnode

Conflicts:
	component/busybox/buildout.cfg
	component/ca-certificates/buildout.cfg
	component/firefox/buildout.cfg
	component/gtk-2/buildout.cfg
	component/xorg/buildout.cfg
	software/erp5testnode/software.cfg

.gitignore

@@ -9,3 +9,5 @@ eggs/
 parts/
 slapos.cookbook.egg-info
 .*.swp
+*~
+\#*\#
\ No newline at end of file

component/6tunnel/buildout.cfg

+# 6tunnel - Tunnelling for application that don't speak IPv6
+# http://toxygen.net/6tunnel/
+
+[buildout]
+parts = 6tunnel
+extends =
+  ../autoconf/buildout.cfg
+  ../automake/buildout.cfg
+
+[6tunnel]
+recipe = slapos.recipe.cmmi
+url = http://toxygen.net/6tunnel/6tunnel-0.11rc2.tar.gz
+md5sum = 74e02d4f0704b3083a01feda66033449
+configure-command =
+  aclocal
+  autoheader
+  automake --foreign
+  autoconf
+  ./configure
+configure-options =
+  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
+environment =
+  PATH=${autoconf:location}/bin:${automake:location}/bin:%(PATH)s

component/alsa/buildout.cfg

@@ -4,7 +4,7 @@ parts =
 
 [alsa]
 # Contains libasound
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.0.24.1.tar.bz2
 md5sum = 7cc05f25e1d5b65da8fb3fdcd540f226
 configure-options =

component/apache-perl/buildout.cfg

 [buildout]
-parts = apache-perl
+parts = apache-perl perl-Apache2-Request
 
 extends =
   ../apache/buildout.cfg
@@ -8,14 +8,23 @@ extends =
 
 [apache-perl]
 # Note: Shall react on each build of apache and reinstall itself
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://perl.apache.org/dist/mod_perl-2.0.5.tar.gz
 md5sum = 03d01d135a122bd8cebd0cd5b185d674
 configure-command =
   ${perl:location}/bin/perl Makefile.PL
 configure-options =
   MP_AP_PREFIX=${apache-2.2:location}
+  LIBS="-L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}"
 
+# for mod_apreq2 and Apache2::Request
+[perl-Apache2-Request]
+recipe = slapos.recipe.build:cpan
+modules =
+  I/IS/ISAAC/libapreq2-2.13.tar.gz
+perl = perl
+cpan-configuration =
+  makepl_arg = ('--with-apache2-apxs=${apache-2.2:location}/bin/apxs')
 environment =
-  # CPPFLAGS=-I${libuuid:location}/include
-  MP_CCOPTS=-L${libuuid:location}/lib
+  APR_LDFLAGS = -L${libuuid:location}/lib -Wl,-R${libuuid:location}/lib -L${libexpat:location}/lib -Wl,-R${libexpat:location}/lib -L${apache-2.2:location}/lib -Wl,-R${apache-2.2:location}/lib
+  LDFLAGS=-L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib -L${libexpat:location}/lib -Wl,-rpath=${libexpat:location}/lib -L${apache-2.2:location}/lib -Wl,-rpath=${apache-2.2:location}/lib

component/apache-php/buildout.cfg

@@ -15,32 +15,32 @@ extends =
   ../mariadb/buildout.cfg
   ../openldap/buildout.cfg
   ../pkgconfig/buildout.cfg
-  ../zip/buildout.cfg
+  ../zlib/buildout.cfg
+
 
 [apache-php]
 # Note: Shall react on each build of apache and reinstall itself
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 depends =
   ${mariadb:version}
-url = http://fr2.php.net/distributions/php-5.3.13.tar.gz
-md5sum = 179c67ce347680f468edbfc3c425476a
+  ${libpng:so_version}
+url = http://fr2.php.net/distributions/php-5.4.12.tar.bz2
+md5sum = 5c7b614242ae12e9cacca21c8ab84818
 configure-options =
   --with-apxs2=${apache:location}/bin/apxs
   --with-libxml-dir=${libxml2:location}
   --with-mysql=${mariadb:location}
   --with-zlib-dir=${zlib:location}
-  --with-bz2-dir=${bzip2:location}
+  --with-bz2=${bzip2:location}
   --with-mcrypt=${libmcrypt:location}
   --with-gd
   --with-jpeg-dir=${libjpeg:location}
   --with-png-dir=${libpng:location}
   --enable-gd-native-ttf
-  --with-ttf
   --with-freetype-dir=${freetype:location}
   --with-pdo-mysql=mysqlnd
   --with-mysqli=mysqlnd
   --with-curl=${curl:location}
-  --with-zip-dir=${zip:location}
   --with-imap=${cclient:location}
   --with-iconv-dir=${libiconv:location}
   --with-gettext=${gettext:location}
@@ -52,10 +52,8 @@ configure-options =
   --enable-session
   --enable-exif
   --enable-zip
-  --enable-bz2
   --enable-ftp
 
-
 # Changing TMPDIR is required for PEAR installation.
 # It will create a pear/temp directory under the SR instead of a shared /tmp/pear/temp.
 # XXX we could mkdir tmp there
@@ -65,26 +63,30 @@ environment =
   PATH=${pkgconfig:location}/bin:${bzip2:location}/bin:${libxml2:location}/bin:%(PATH)s
   LDFLAGS =-L${bzip2:location}/lib -Wl,-rpath -Wl,${bzip2:location}/lib -L${libtool:location}/lib -Wl,-rpath -Wl,${libtool:location}/lib -L${mariadb:location}/lib -Wl,-rpath -Wl,${mariadb:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -L${libmcrypt:location}/lib -Wl,-rpath -Wl,${libmcrypt:location}/libblkid
   TMPDIR=${buildout:parts-directory}/${:_buildout_section_name_}
-
+  HOME=${apache:location}
 
 
 
 [apache-php-postgres]
-<=apache-php
+# Note: Shall react on each build of apache and reinstall itself
+recipe = slapos.recipe.cmmi
+depends =
+   ${postgresql:url}
+   ${libpng:so_version}
+url = http://fr2.php.net/distributions/php-5.4.12.tar.bz2
+md5sum = 5c7b614242ae12e9cacca21c8ab84818
 configure-options =
   --with-apxs2=${apache:location}/bin/apxs
   --with-libxml-dir=${libxml2:location}
   --with-zlib-dir=${zlib:location}
-  --with-bz2-dir=${bzip2:location}
+  --with-bz2=${bzip2:location}
   --with-mcrypt=${libmcrypt:location}
   --with-gd
   --with-jpeg-dir=${libjpeg:location}
   --with-png-dir=${libpng:location}
   --enable-gd-native-ttf
-  --with-ttf
   --with-freetype-dir=${freetype:location}
   --with-curl=${curl:location}
-  --with-zip-dir=${zip:location}
   --with-imap=${cclient:location}
   --with-iconv-dir=${libiconv:location}
   --with-gettext=${gettext:location}
@@ -96,17 +98,28 @@ configure-options =
   --enable-session
   --enable-exif
   --enable-zip
-  --enable-bz2
   --enable-ftp
   --with-pgsql=${postgresql:location}
 
+# Changing TMPDIR is required for PEAR installation.
+# It will create a pear/temp directory under the SR instead of a shared /tmp/pear/temp.
+# XXX we could mkdir tmp there
+
+environment =
+  PKG_CONFIG_PATH=${libxml2:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig
+  PATH=${pkgconfig:location}/bin:${bzip2:location}/bin:${libxml2:location}/bin:%(PATH)s
+  LDFLAGS =-L${bzip2:location}/lib -Wl,-rpath -Wl,${bzip2:location}/lib -L${libtool:location}/lib -Wl,-rpath -Wl,${libtool:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -L${libmcrypt:location}/lib -Wl,-rpath -Wl,${libmcrypt:location}/libblkid
+  TMPDIR=${buildout:parts-directory}/${:_buildout_section_name_}
+  HOME=${apache:location}
+
+
 
 [libmcrypt]
-recipe = hexagonit.recipe.cmmi
-url = http://sourceforge.net/projects/mcrypt/files/Libmcrypt/2.5.8/libmcrypt-2.5.8.tar.bz2/download
+recipe = slapos.recipe.cmmi
+url = http://downloads.sourceforge.net/project/mcrypt/Libmcrypt/2.5.8/libmcrypt-2.5.8.tar.bz2
 md5sum = c4f491dd411a09e9de3b8702ea6f73eb
 
 [xml-rpc]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://downloads.sourceforge.net/project/phpxmlrpc/phpxmlrpc/2.2.2/xmlrpc-2.2.2.tar.gz
 md5sum = 59a644c636c6d98267d0c99b406ae9e8

component/apache-wsgi/buildout.cfg

+[buildout]
+
+extends = 
+  ../apache/buildout.cfg
+  ../python-2.7/buildout.cfg
+  ../bzip2/buildout.cfg
+  ../gdbm/buildout.cfg
+  ../gettext/buildout.cfg
+  ../libexpat/buildout.cfg
+  ../ncurses/buildout.cfg
+  ../openssl/buildout.cfg
+  ../readline/buildout.cfg
+  ../sqlite3/buildout.cfg
+  ../zlib/buildout.cfg
+  ../file/buildout.cfg
+
+parts =
+  apache-wsgi
+
+[python2.7]
+configure-options =
+  --enable-shared
+  --disable-static
+  --enable-ipv6
+  --enable-unicode=ucs4
+  --with-system-expat
+  --with-threads
+
+environment =
+  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
+  LD_RUN_PATH=${buildout:parts-directory}/${:_buildout_section_name_}/lib
+  
+[apache-wsgi]
+recipe = hexagonit.recipe.cmmi
+url = http://modwsgi.googlecode.com/files/mod_wsgi-3.4.tar.gz
+md5sum = f42d69190ea0c337ef259cbe8d94d985
+configure-options =
+  --with-apxs=${apache:location}/bin/apxs
+  --with-python=${python2.7:location}/bin/python2.7
+environment =
+  CPPFLAGS = -I${python2.7:location}/include/python2.7
+  LDFLAGS = -L${python2.7:location}/lib

component/apache/buildout.cfg

@@ -15,25 +15,25 @@ extends =
 
 [apr]
 recipe = hexagonit.recipe.download
-version = 1.4.6
+version = 1.5.0
 url = http://mir2.ovh.net/ftp.apache.org/dist/apr/apr-${:version}.tar.bz2
-md5sum = ffee70a111fd07372982b0550bbb14b7
+md5sum = cc93bd2c12d0d037f68e21cc6385dc31
 
 [apr-util]
 recipe = hexagonit.recipe.download
-version = 1.4.1
+version = 1.5.3
 url = http://mir2.ovh.net/ftp.apache.org/dist/apr/apr-util-${:version}.tar.bz2
-md5sum = 52b31b33fb1aa16e65ddaefc76e41151
+md5sum = 6f3417691c7a27090f36e7cf4d94b36e
 
 [apache]
 # inspired on http://old.aclark.net/team/aclark/blog/a-lamp-buildout-for-wordpress-and-other-php-apps/
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 depends =
   ${gdbm:version}
-version = 2.4.3
+version = 2.4.7
 revision = 1
 url = http://mir2.ovh.net/ftp.apache.org/dist/httpd/httpd-${:version}.tar.bz2
-md5sum = 87aaf7bc7e8715f0455997bb8c6791aa
+md5sum = 170d7fb6fe5f28b87d1878020a9ab94e
 configure-command = cp -ar ${apr:location}/apr-${apr:version} srclib/apr/; cp -ar ${apr-util:location}/apr-util-${apr-util:version} srclib/apr-util; ./configure
 configure-options = --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
                     --disable-static
@@ -101,8 +101,8 @@ md5sum = 4f074f035d3b37f3f3e71cd9616440f3
 
 [apache-antiloris]
 # Note: Shall react on each build of apache and reinstall itself
-recipe = hexagonit.recipe.cmmi
-url = http://sourceforge.net/projects/mod-antiloris/files/mod_antiloris-0.4.tar.bz2/download
+recipe = slapos.recipe.cmmi
+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
@@ -119,9 +120,10 @@ make-targets =
 
 [apache-2.2]
 # inspired on http://old.aclark.net/team/aclark/blog/a-lamp-buildout-for-wordpress-and-other-php-apps/
-recipe = hexagonit.recipe.cmmi
-url = http://mir2.ovh.net/ftp.apache.org/dist//httpd/httpd-2.2.22.tar.gz
-md5sum = d77fa5af23df96a8af68ea8114fa6ce1
+recipe = slapos.recipe.cmmi
+version = 2.2.26
+url = http://mir2.ovh.net/ftp.apache.org/dist/httpd/httpd-${:version}.tar.bz2
+md5sum = 254eda547f8d624604e4bf403241e617
 patch-options = -p1
 configure-options = --disable-static
                     --enable-authn-alias
@@ -149,6 +151,7 @@ configure-options = --disable-static
                     --enable-proxy-scgi
                     --enable-dav
                     --enable-dav-fs
+                    --enable-dav-lock
                     --enable-so
                     --enable-ssl
                     --with-included-apr
@@ -178,9 +181,11 @@ environment =
 
 [apache-antiloris-apache-2.2]
 # Note: Shall react on each build of apache and reinstall itself
-recipe = hexagonit.recipe.cmmi
-url = http://sourceforge.net/projects/mod-antiloris/files/mod_antiloris-0.4.tar.bz2/download
+recipe = slapos.recipe.cmmi
+url = http://downloads.sourceforge.net/project/mod-antiloris/mod_antiloris-0.4.tar.bz2
 md5sum = 66862bf10e9be3a023e475604a28a0b4
+depends =
+  ${apache-2.2:version}
 configure-command = ${apache-2.2:location}/bin/apxs
 configure-options = -c mod_antiloris.c
 make-binary = ${:configure-command}

component/aspell/buildout.cfg

@@ -14,12 +14,19 @@ update-command = ${:command}
 stop-on-error = yes
 
 [aspell]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
+revision = 1
 url = http://ftp.gnu.org/gnu/aspell/aspell-0.60.6.1.tar.gz
 md5sum = e66a9c9af6a60dc46134fdacf6ce97d7
+environment =
+  CPPFLAGS=-I${ncurses:location}/include
+  LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib
 
 [aspell-en-dictionary]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = ftp://ftp.gnu.org/gnu/aspell/dict/en/aspell6-en-7.1-0.tar.bz2
 md5sum = beba5e8f3afd3ed1644653bb685b2dfb
 configure-command = ./configure --vars ASPELL=${aspell:location}/bin/aspell PREZIP=${aspell:location}/bin/prezip-bin
+depends =
+  ${aspell:url}
+  ${aspell:revision}

component/attr/buildout.cfg

@@ -3,7 +3,7 @@
 parts = attr
 
 [attr]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = ftp://ftp.igh.cnrs.fr/pub/nongnu/attr/attr-2.4.46.src.tar.gz
 md5sum = db557c17fdfa4f785333ecda08654010
 configure-options =

component/autoconf/buildout.cfg

@@ -6,7 +6,7 @@ parts =
   autoconf
 
 [autoconf]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.gz
 md5sum = 82d05e03b93e45f5a39b828dc9c6c29b
 environment =

component/automake/buildout.cfg

@@ -2,12 +2,13 @@
 extends =
   ../autoconf/buildout.cfg
   ../perl/buildout.cfg
+  ../xz-utils/buildout.cfg
 parts =
   automake
 
 [automake]
-recipe = hexagonit.recipe.cmmi
-md5sum = e620cb9e0259159341c0e0d6b712b67a
-url = http://ftp.gnu.org/gnu/automake/automake-1.12.2.tar.gz
+recipe = slapos.recipe.cmmi
+md5sum = 140e084223bf463a24c1a28427c6aec7
+url = http://ftp.gnu.org/gnu/automake/automake-1.12.6.tar.xz
 environment =
-  PATH =${autoconf:location}/bin:${perl:location}/bin:%(PATH)s
+  PATH =${autoconf:location}/bin:${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s

component/bash/buildout.cfg

@@ -3,6 +3,6 @@ parts =
   bash
 
 [bash]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = ftp://ftp.gnu.org/gnu/bash/bash-4.2.tar.gz
 md5sum = 3fb927c7c33022f1c327f14a81c0d4b0

component/binutils/buildout.cfg

@@ -3,6 +3,6 @@ parts =
   binutils
 
 [binutils]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://ftp.gnu.org/gnu/binutils/binutils-2.21.1.tar.bz2
 md5sum = bde820eac53fa3a8d8696667418557ad

component/bison/buildout.cfg

@@ -17,7 +17,7 @@ patch-options = -p1
 patches =
   ${bison-drop.gets.patch:location}/${bison-drop.gets.patch:filename}
 
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://ftp.gnu.org/gnu/bison/bison-2.5.tar.bz2
 md5sum = 9dba20116b13fc61a0846b0058fbe004
 environment =

component/boinc-client/boinc-abs-path.patch

+--- a/client/scripts/Makefile.am  2012-08-24 12:11:10.400291229 +0200
++++ b/client/scripts/Makefile.am  2012-09-10 15:21:01.973773228 +0200
+@@ -2,16 +2,16 @@
+
+ install-exec-hook:
+ 	chmod +x boinc-client
+-	$(INSTALL) -d $(DESTDIR)/etc/init.d
+-	$(INSTALL) -b boinc-client $(DESTDIR)/etc/init.d/boinc-client
++	$(INSTALL) -d $(DESTDIR)$(exec_prefix)/etc/init.d
++	$(INSTALL) -b boinc-client $(DESTDIR)$(exec_prefix)/etc/init.d/boinc-client
+ 	if [ -d /etc/sysconfig ] ; then \
+-	  $(INSTALL) -d $(DESTDIR)/etc/sysconfig ; \
+-	  $(INSTALL) boinc-client.conf $(DESTDIR)/etc/sysconfig/boinc-client ; \
++	  $(INSTALL) -d $(DESTDIR)$(exec_prefix)/etc/sysconfig ; \
++	  $(INSTALL) boinc-client.conf $(DESTDIR)$(exec_prefix)/etc/sysconfig/boinc-client ; \
+ 	elif [ -d /etc/default ] ; then \
+-	  $(INSTALL) -d $(DESTDIR)/etc/default ; \
+-	  $(INSTALL) boinc-client.conf $(DESTDIR)/etc/default/boinc-client ; \
++	  $(INSTALL) -d $(DESTDIR)$(exec_prefix)/etc/default ; \
++	  $(INSTALL) boinc-client.conf $(DESTDIR)$(exec_prefix)/etc/default/boinc-client ; \
+ 	else \
+-	  $(INSTALL) -d $(DESTDIR)/etc ; \
+-	  $(INSTALL) boinc-client.conf $(DESTDIR)/etc/boinc-client.conf ; \
++	  $(INSTALL) -d $(DESTDIR)$(exec_prefix)/etc ; \
++	  $(INSTALL) boinc-client.conf $(DESTDIR)$(exec_prefix)/etc/boinc-client.conf ; \
+ 	fi
+ 
\ No newline at end of file

component/boinc-client/buildout.cfg

+[buildout]
+
+parts =
+  boinc
+
+extends =
+  ../curl/buildout.cfg
+  ../openssl/buildout.cfg
+  ../zlib/buildout.cfg
+  ../subversion/buildout.cfg
+  ../m4/buildout.cfg
+  ../automake/buildout.cfg
+  ../libtool/buildout.cfg
+  ../pkgconfig/buildout.cfg
+  ../openldap/buildout.cfg
+  ../gnutls/buildout.cfg
+  ../../stack/slapos.cfg
+
+[download-boinc]
+recipe = slapos.recipe.download
+url = http://boinc.berkeley.edu/dl/boinc_7.0.28_x86_64-pc-linux-gnu.sh
+md5sum = efdfd115ae69227ceb6118ca09777988
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+filename = boinc_7.0.28_x86_64-pc-linux-gnu.sh
+mode = 0744
+
+[boinc-bin]
+recipe = plone.recipe.command
+on_install = true
+on_update = true
+command = cp ${download-boinc:location}/${download-boinc:filename} ${buildout:parts-directory} && \
+  cd ${buildout:parts-directory} && \
+  ./${download-boinc:filename}
+#boinc client is a binary: write LD_LABRARY_PATH
+ld_library = ${curl:location}/lib:${openssl:location}/lib:${zlib:location}/lib
+location = ${buildout:parts-directory}/BOINC
+
+[boinc-patch]
+recipe = slapos.recipe.download
+url = ${:_profile_base_location_}/boinc-abs-path.patch
+md5sum = 412acedfbcdc8a9a7f196a02465da248
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+filename = boinc-abs-path.patch
+
+
+#checkout boinc package from svn repository
+[boinc-package]
+recipe = plone.recipe.command
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+tarball = ${buildout:parts-directory}/boinc.tar.gz
+svnversion = ${subversion:location}/bin/svnversion
+command = ${subversion:location}/bin/svn co --revision 26162 http://boinc.berkeley.edu/svn/branches/server_stable ${:location} && \
+  sed -i 's#/usr/bin/svnversion#${:svnversion}#' ${:location}/tools/make_project && \
+  cd ${:location} && rm -f ${:tarball} && tar -cvzf ${:tarball} .
+update-command = 
+
+# Compile now boinc client
+[boinc]
+recipe = slapos.recipe.cmmi
+url = ${boinc-package:tarball}
+configure-command =
+  echo 'AC_PROG_OBJCXX' >> configure.ac
+  aclocal -I${pkgconfig:location}/share/aclocal -I${libtool:location}/share/aclocal
+  ./_autosetup
+  ./configure
+
+configure-options =
+  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
+  --disable-fcgi
+  --disable-shared
+  --enable-static
+  --with-pic
+  --disable-manager
+  --disable-server
+  --with-pkg-config
+  --with-ssl=${openssl:location}
+  --with-libldap=${openldap:location}/lib
+  --with-libgnutls=${gnutls:location}/lib
+  --with-libcurl=${curl:location}/lib
+  --with-x=no
+
+patches =
+  ${boinc-patch:location}/${boinc-patch:filename}
+
+patch-options = -p1
+
+environment =
+  PATH=${pkgconfig:location}/bin:${automake:location}/bin:${autoconf:location}/bin:${libtool:location}/bin:${subversion:location}/bin:${curl:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig
+  M4=${m4:location}/bin/m4
+  CFLAGS=-fPIC
+  CPPFLAGS=-I${openssl:location}/include -I${zlib:location}/include
+  LDFLAGS = -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+  ACLOCAL_PATH=${pkgconfig:location}/share/aclocal:${libtool:location}/share/aclocal

component/boinc/buildout.cfg

+[buildout]
+
+parts=
+  mariadb
+  boinc  
+
+extends =
+  ../subversion/buildout.cfg
+  ../m4/buildout.cfg
+  ../automake/buildout.cfg
+  ../libtool/buildout.cfg
+  ../pkgconfig/buildout.cfg
+  ../openssl/buildout.cfg
+  ../cyrus-sasl/buildout.cfg
+  ../openldap/buildout.cfg
+  ../gnutls/buildout.cfg
+  ../mariadb/buildout.cfg
+  ../curl/buildout.cfg
+  ../../stack/slapos.cfg
+
+[mariadb]
+# Compile dir is for plugins, not needed in boinc
+keep-compile-dir = false
+
+#checkout boinc package from svn repository
+[boinc-package]
+recipe = plone.recipe.command
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+tarball = ${buildout:parts-directory}/boinc.tar.gz
+svnversion = ${subversion:location}/bin/svnversion
+command = ${subversion:location}/bin/svn co --revision 26162 http://boinc.berkeley.edu/svn/branches/server_stable ${:location} && \
+  sed -i 's#/usr/bin/svnversion#${:svnversion}#' ${:location}/tools/make_project && \
+  sed -i "20i\#include <unistd.h>" ${:location}/tools/process_input_template.cpp && \
+  sed -i "25i\#include <unistd.h>" ${:location}/sched/single_job_assimilator.cpp && \
+  sed -i "27i\#include <unistd.h>" ${:location}/tools/create_work.cpp && \
+  sed -i 's#--prefix=$(prefix)#--prefix=/$(prefix)#' ${:location}/py/Makefile.am && \
+  sed -i 's#parent::base_escape_string#@parent::base_escape_string#' ${:location}/html/inc/boinc_db.inc
+  cd ${:location} && rm -f ${:tarball} && tar -cvzf ${:tarball} .
+update-command = 
+
+# Compile now boinc
+# When installing boinc python module, path /srv/slapgrid/... is strip to srv/slapgrid... It is why
+# we need to set --prefix="/${buildout:parts-directory}/${:_buildout_section_name_}"
+[boinc]
+recipe = slapos.recipe.cmmi
+url = ${boinc-package:tarball}
+keep-compile-dir = true
+source = ${buildout:parts-directory}/${:_buildout_section_name_}__compile__
+configure-command =  
+  echo 'AC_PROG_OBJCXX' >> configure.ac
+  aclocal -I${pkgconfig:location}/share/aclocal -I${libtool:location}/share/aclocal
+  ./_autosetup
+  ./configure
+configure-options = 
+  --prefix="${buildout:parts-directory}/${:_buildout_section_name_}"
+  --disable-fcgi
+  --disable-shared
+  --enable-static
+  --disable-manager
+  --disable-client
+  --with-pkg-config
+  --with-ssl=${openssl:location}
+  --with-libsasl2=${cyrus-sasl:location}/lib
+  --with-libldap=${openldap:location}/lib
+  --with-libgnutls=${gnutls:location}/lib
+  --with-libcurl=${curl:location}/lib
+  --with-x=no
+
+
+environment =
+  PATH=${pkgconfig:location}/bin:${automake:location}/bin:${autoconf:location}/bin:${libtool:location}/bin:${subversion:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig
+  M4=${m4:location}/bin/m4
+  CPPFLAGS=-I${openssl:location}/include -I${mariadb:location}/include
+  LDFLAGS = -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${mariadb:location}/lib -Wl,-rpath=${mariadb:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+  MYSQL_CONFIG=${mariadb:location}/bin/mysql_config
+  ACLOCAL_PATH=${pkgconfig:location}/share/aclocal:${libtool:location}/share/aclocal
+
+  
\ No newline at end of file

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

component/bzip2/buildout.cfg

@@ -10,7 +10,7 @@ download-only = true
 filename = bzip2-hooks.py
 
 [bzip2]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz
 md5sum = 00b516f4704d4a7cb50a1d97e6e8e15b
 configure-command = true

component/ca-certificates/buildout.cfg

@@ -17,11 +17,11 @@ filename = ${:_buildout_section_name_}
 download-only = true
 
 [ca-certificates]
-recipe = hexagonit.recipe.cmmi
-version = 20130119
+recipe = slapos.recipe.cmmi
+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

component/ccache/buildout.cfg

@@ -2,7 +2,7 @@
 parts = ccache
 
 [ccache-common]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 
 [ccache]
 <= ccache-3.1

component/cclient/buildout.cfg

@@ -17,7 +17,7 @@ md5sum = 42c77fdd5d7a976fc302b93aadb3da98
 filename = imap-2007f.patch
 
 [cclient]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = ftp://ftp.cac.washington.edu/imap/imap-2007f.tar.gz
 md5sum = 2126fd125ea26b73b20f01fcd5940369
 configure-command = true

component/chromium/buildout.cfg

@@ -36,7 +36,7 @@ script =
   wrapper_location = os.path.join("%(location)s", "chrome-slapos")
   wrapper = open(wrapper_location, 'w')
   wrapper.write("""#!/bin/sh
-  export LD_LIBRARY_PATH=${libXrender:location}/lib/:${fontconfig:location}/lib/:${dbus:location}/lib/:${dbus-glib:location}/lib/:${pango:location}/lib:${cairo:location}/lib:${glib:location}/lib:${gtk-2:location}/lib:${atk:location}/lib:${gdk-pixbuf:location}/lib:${libXt:location}/lib:${gtk-2:location}/lib:${libpng:location}/lib:%(location)s
+  export LD_LIBRARY_PATH=${libXrender:location}/lib/:${fontconfig:location}/lib/:${dbus:location}/lib/:${dbus-glib:location}/lib/:${pango:location}/lib:${cairo:location}/lib:${glib:location}/lib:${gtk-2:location}/lib:${atk:location}/lib:${gdk-pixbuf:location}/lib:${libXt:location}/lib:${gtk-2:location}/lib:${libpng15:location}/lib:%(location)s
   %(location)s/chrome""")
   wrapper.flush()
   wrapper.close()

component/cloud9/buildout.cfg

@@ -19,7 +19,7 @@ recipe = slapos.recipe.build:npm
 packages = sm@0.2.11
 node = nodejs
 environment =
-  PATH=${nodejs:location}/bin:%(PATH)s
+  PATH=${nodejs-0.6:location}/bin:%(PATH)s
 
 [cloud9-stable]
 # Online IDE written in javascript/node.js
@@ -44,6 +44,40 @@ filename = cloud9-session-directory.patch
 download-only = true
 md5sum = 5dc8cc28447ed3747b8a53c768d872aa
 
+[cloud9-socket.patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+filename = cloud9-socket.patch
+download-only = true
+md5sum = c581456cb3a76841898f79f9600e3a1e
+
+[cloud9-file-already-exist.patch]
+# This patch prevents the error "File already exists"
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+filename = cloud9-file_already_exist.patch
+download-only = true
+md5sum = 0bc104af8176388d60cbf884b72c8318
+
+[cloud9-remove-all-listeners.patch]
+# This patch prevents cloud9 to die every
+# time a tab is closed
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+filename = cloud9-removeAllListeners.patch
+download-only = true
+md5sum = 357915330d677f4917140e02a55646b7
+
+[cloud9-git-download]
+recipe = slapos.recipe.build:gitclone
+repository = https://github.com/ajaxorg/cloud9.git
+revision = f7d102bc225c922f116d2cea52a746d64343ea59
+location = ${buildout:parts-directory}/cloud9
+git-executable = ${git:location}/bin/git
+develop = true
+use-cache = true
+ignore-ssl-certificate = true
+
 [cloud9-git]
 # Online IDE written in javascript/node.js
 # URL : c9.io
@@ -51,13 +85,10 @@ md5sum = 5dc8cc28447ed3747b8a53c768d872aa
 # NODE_PATH=${:destination}/node_modules ${nodejs:node_location} ${:cloud9_js_location}
 recipe = plone.recipe.command
 stop-on-error = true
-commit = 6b0112363dd0f9523430808394a162d3cc699550
-repository = https://github.com/ajaxorg/cloud9.git
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-environment = export GIT_SSL_NO_VERIFY=true; export PATH=${git:location}/bin:${nodejs:location}/bin:${node-sm:location}/node_modules/sm/bin:$PATH; export CPPFLAGS="-I${libxml2:location}/include -I${nodejs:location}/include"; export LDFLAGS="-L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib"; export HOME=${:location};
-command = ${:environment} (git clone --quiet ${:repository} ${:location} && cd ${:location} && git reset --hard ${:commit} && ${node-sm:location}/node_modules/.bin/sm install && patch -p1 < ${cloud9-session-directory.patch:location}/${cloud9-session-directory.patch:filename}) || (rm -fr ${:location}; exit 1)
-update-command =
-executable = ${:location}/server.js
+environment = export GIT_SSL_NO_VERIFY=true; export PATH=${git:location}/bin:${nodejs-0.6:location}/bin:${node-sm:location}/node_modules/.bin/:$PATH; export CPPFLAGS="-I${libxml2:location}/include -I${nodejs-0.6:location}/include"; export LDFLAGS="-L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib"; export HOME=${cloud9-git-download:location};
+command = ${:environment} (cd ${cloud9-git-download:location} && ${node-sm:location}/node_modules/.bin/sm install && patch -p1 < ${cloud9-session-directory.patch:location}/${cloud9-session-directory.patch:filename} && patch -p1 < ${cloud9-socket.patch:location}/${cloud9-socket.patch:filename} && patch -p1 < ${cloud9-file-already-exist.patch:location}/${cloud9-file-already-exist.patch:filename} && patch -p1 < ${cloud9-remove-all-listeners.patch:location}/${cloud9-remove-all-listeners.patch:filename}) || (rm -fr ${cloud9-git-download:location}; exit 1)
+update-command = true
+executable = ${cloud9-git-download:location}/server.js
 
 [cloud9-npm]
 # Online IDE written in javascript/node.js

component/cloud9/cloud9-file_already_exist.patch

+diff --git a/node_modules/vfs-local/localfs.js b/node_modules/vfs-local/localfs.js
+index 7ce9981..1dd07b7 100644
+--- a/node_modules/vfs-local/localfs.js
++++ b/node_modules/vfs-local/localfs.js
+@@ -677,7 +677,7 @@ module.exports = function setup(fsOptions) {
+                     else {
+                         var err = new Error("File already exists.");
+                         err.code = "EEXIST";
+-                        callback(err);
++                        //callback(err);
+                     }
+                 });
+             });

component/cloud9/cloud9-removeAllListeners.patch

+diff --git a/plugins-server/cloud9.ide.watcher/file_watcher.js b/plugins-server/cloud9.ide.watcher/file_watcher.
+index b7ed7da..36dcd05 100644
+--- a/plugins-server/cloud9.ide.watcher/file_watcher.js
++++ b/plugins-server/cloud9.ide.watcher/file_watcher.js
+@@ -69,11 +69,11 @@ util.inherits(FileWatcher, EventEmitter);
+ 
+     this.close = function() {
+         if (this.watcher) {
+-            this.watcher.removeAllListeners();
++            //this.watcher.removeAllListeners();
+             this.watcher.close();
+             this.emit("close");
+         }
+         this.watcher = null;
+     };
+ 
+-}).call(FileWatcher.prototype);
+\ No newline at end of file
++}).call(FileWatcher.prototype);
+

component/cloud9/cloud9-socket.patch

+diff --git a/node_modules/smith.io/node_modules/engine.io/node_modules/engine.io-client/dist/engine.io-dev.js b/node_modules/smith.io/node_modules/engine.io/node_modules/engine.io-client/dist/engine.io-dev.js
+index fa7e54a..14b8e67 100644
+--- a/node_modules/smith.io/node_modules/engine.io/node_modules/engine.io-client/dist/engine.io-dev.js
++++ b/node_modules/smith.io/node_modules/engine.io/node_modules/engine.io-client/dist/engine.io-dev.js
+@@ -2126,7 +2126,7 @@ Polling.prototype.uri = function () {
+     query = '?' + query;
+   }
+ 
+-  return schema + '://' + this.host + port + this.path + query;
++  return this.path + query;
+ };
+ 
+ });require.register("transports/websocket.js", function(module, exports, require, global){

component/cloudooo/buildout.cfg

@@ -15,18 +15,14 @@ update-command = ${:command}
 command = grep parts ${buildout:develop-eggs-directory}/cloudooo.egg-link
 
 [cloudooo-repository]
-recipe = plone.recipe.command
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-stop-on-error = true
+recipe = slapos.recipe.build:gitclone
 repository = http://git.erp5.org/repos/cloudooo.git
 branch = master
-revision =
-command = ${git:location}/bin/git clone --quiet -b ${:branch} ${:repository} ${:location} && if [ -n ${:revision} ]; then cd ${:location} && ${git:location}/bin/git reset --quiet --hard ${:revision} ; fi
-update-command = cd ${:location} && ${git:location}/bin/git pull --quiet && if [ -n ${:revision} ]; then cd ${:location} && ${git:location}/bin/git reset --quiet --hard ${:revision} ; fi
+git-executable = ${git:location}/bin/git
 
 [cloudooo]
 recipe = zc.recipe.egg
-python = python2.6
+python = python2.7
 extra-paths = ${cloudooo-repository:location}
 eggs =
   ${lxml-python:egg}
@@ -44,4 +40,4 @@ scripts =
   paster=cloudooo_paster
   runCloudoooUnitTest
   runCloudoooTestSuite
-ugly-depend-on = ${cloudooo-repository:command} ${cloudooo-repository:update-command} ${cloudooo-check-recipe:command}
+ugly-depend-on = ${cloudooo-repository:recipe} ${cloudooo-repository:repository} ${cloudooo-check-recipe:command}

component/cmake/buildout.cfg

 [buildout]
+extends =
+  ../ncurses/buildout.cfg
+
 parts =
   cmake
 
 [cmake]
-recipe = hexagonit.recipe.cmmi
-url = http://www.cmake.org/files/v2.8/cmake-2.8.8.tar.gz
-md5sum = ba74b22c788a0c8547976b880cd02b17
+recipe = slapos.recipe.cmmi
+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

component/condor/buildout.cfg

+[buildout]
+
+parts = 
+  condor
+
+extends =
+  ../libexpat/buildout.cfg
+  ../kerberos/buildout.cfg
+  ../perl/buildout.cfg
+  ../java/buildout.cfg
+  ../openldap/buildout.cfg
+  ../dash/buildout.cfg
+  ../zlib/buildout.cfg
+  ../../stack/slapos.cfg
+
+[condor]
+recipe = slapos.recipe.build
+slapos_promise =
+  directory:bin
+  directory:etc
+  directory:examples
+  directory:include
+  directory:lib
+  directory:libexec
+  directory:man
+  directory:src
+  directory:sbin
+  
+depends =
+  ${libexpat:location}
+  ${kerberos:location}
+  ${perl:location}
+  ${openldap:location}
+  ${java:location}
+  ${dash:location}
+  ${zlib:location}
+
+x86 = http://parrot.cs.wisc.edu//symlink/20130530031504/7/7.9/7.9.5/28b36a94ad1a405bac689a76b6c353a7/condor-7.9.5-x86_Debian6-unstripped.tar.gz 227059bb9bebc9033665bb246d90a7bb
+x86-64 = http://parrot.cs.wisc.edu//symlink/20130530031504/7/7.9/7.9.5/7000a12f9a22765b457e2958762871d5/condor-7.9.5-x86_64_Debian6-stripped.tar.gz 30fa4cebabb8ff4971c769f4ef74ba68
+
+script =
+  if not self.options.get('path'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ')
+  extract_dir = self.extract(self.download(self.options['url'], self.options.get('md5sum')))
+  workdir = guessworkdir(extract_dir)
+  self.copyTree(workdir, "%(location)s")
+  
\ No newline at end of file

component/coreutils/buildout.cfg

 [buildout]
+extends =
+  ../xz-utils/buildout.cfg
 parts =
-  coreutils
-
-[coreutils-drop.gets.patch]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-md5sum = 63c2299d92d23e4748abb9668b7e62ea
-download-only = true
-filename = drop.gets.patch
+  coreutils-output
 
 [coreutils]
-virtual-depends = ${coreutils-drop.gets.patch:md5sum}
-recipe = hexagonit.recipe.cmmi
-url = http://ftp.gnu.org/gnu/coreutils/coreutils-8.12.tar.gz
-md5sum = fce7999953a67243d00d75cc86dbcaa6
-
-patch-options = -p1
-patches =
-  ${coreutils-drop.gets.patch:location}/${coreutils-drop.gets.patch:filename}
-
+recipe = slapos.recipe.cmmi
+url = http://ftp.gnu.org/gnu/coreutils/coreutils-8.21.tar.xz
+md5sum = 065ba41828644eca5dd8163446de5d64
 configure-options =
   --prefix=${buildout:parts-directory}/${:_buildout_section_name_} --enable-install-program=tr,basename,uname,cat,cp,ls
 environment =
+  PATH=${xz-utils:location}/bin:%(PATH)s
   LDFLAGS =-Wl,--as-needed
+
+[coreutils-output]
+# Shared binary location to ease migration
+recipe = plone.recipe.command
+stop-on-error = true
+update-command = ${:command}
+command = ${:test} -x ${:test} -a -x ${:cat} -a -x ${:rm} -a -x ${:echo} -a -x ${:date} -a -x ${:md5sum} -a -x ${:basename}
+test = ${coreutils:location}/bin/test
+cat = ${coreutils:location}/bin/cat
+rm = ${coreutils:location}/bin/rm
+echo = ${coreutils:location}/bin/echo
+date = ${coreutils:location}/bin/date
+md5sum = ${coreutils:location}/bin/md5sum
+basename = ${coreutils:location}/bin/basename

component/coreutils/drop.gets.patch

-diff -ur coreutils-8.12.old/lib/stdio.in.h coreutils-8.12/lib/stdio.in.h
---- coreutils-8.12.old/lib/stdio.in.h	2011-04-25 11:01:29.000000000 +0200
-+++ coreutils-8.12/lib/stdio.in.h	2012-07-23 16:02:17.591610452 +0200
-@@ -181,7 +181,9 @@
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
- #undef gets
-+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !__GLIBC_PREREQ(2, 16)
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-+#endif
- 
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@

component/corosync/buildout.cfg

@@ -5,7 +5,7 @@ parts =
   corocosync
 
 [corosync]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = ftp://ftp:downloads@corosync.org/downloads/corosync-1.3.1/corosync-1.3.1.tar.gz
 md5sum = c58459a009a3a9d0b9c00e276a190d90
 environment =

component/couchdb/buildout.cfg

@@ -10,7 +10,7 @@ extends =
 parts = couchdb
 
 [couchdb]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://mir2.ovh.net/ftp.apache.org/dist//couchdb/1.1.1/apache-couchdb-1.1.1.tar.gz
 md5sum = cd126219b9cb69a4c521abd6960807a6
 configure-options =

component/cpio/buildout.cfg

@@ -15,6 +15,6 @@ virtual-depends =
 patch-options = -p1
 patches =
   ${cpio-drop.gets.patch:location}/${cpio-drop.gets.patch:filename}
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://ftp.gnu.org/gnu/cpio/cpio-2.11.tar.bz2
 md5sum = 20fc912915c629e809f80b96b2e75d7d

component/cuneiform/buildout.cfg

@@ -5,7 +5,7 @@ extends =
 parts = cuneiform
 
 [cuneiform]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://launchpad.net/cuneiform-linux/1.0/1.0/+download/cuneiform-linux-1.0.0.tar.bz2
 md5sum = 785232ffffad7d82446fbac08a1c3ef9
 location = ${buildout:parts-directory}/${:_buildout_section_name_}

component/cups/buildout.cfg

+[buildout]
+extends =
+  ../zlib/buildout.cfg
+parts =
+  cups
+
+# for now we build and install library and header files only.
+[cups]
+recipe = slapos.recipe.cmmi
+url = http://www.cups.org/software/1.7.1/cups-1.7.1-source.tar.bz2
+md5sum = 55277c40fd4b7183dc3671d39c5c42b7
+configure-options =
+  --disable-static
+  --disable-dbus
+  --disable-gssapi
+  --disable-ssl
+  --disable-pam
+  --disable-avahi
+  --disable-dnssd
+  --disable-launchd
+  --disable-browsing
+  --disable-default-shared
+  --disable-raw-printing
+  --disable-webif
+make-options =
+  libs
+make-targets =
+  install-headers
+  install-libs
+environment =
+  CPPFLAGS=-I${zlib:location}/include
+  DSOFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib

component/curl/buildout.cfg

@@ -10,9 +10,9 @@ parts =
   curl
 
 [curl]
-recipe = hexagonit.recipe.cmmi
-url = http://curl.haxx.se/download/curl-7.24.0.tar.bz2
-#md5sum = 5f6d50c4d4ee38c57fe37e3cff75adbd
+recipe = slapos.recipe.cmmi
+url = http://curl.haxx.se/download/curl-7.35.0.tar.bz2
+md5sum = c18fbdd031adb0529ae09fce399f2d10
 configure-options =
   --disable-static
   --disable-ldap
@@ -27,11 +27,16 @@ configure-options =
   --disable-gopher
   --enable-ipv6
   --disable-sspi
+  --without-gnutls
+  --without-spnego
   --with-ssl=${openssl:location}
   --with-zlib=${zlib:location}
   --without-nss
+  --without-libmetalink
   --without-libssh2
+  --without-librtmp
   --without-libidn
+  --without-nghttp2
 
 environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s

component/cyrus-sasl/buildout.cfg

@@ -4,24 +4,10 @@ parts =
 extends =
   ../zlib/buildout.cfg
 
-[cyrus-sasl-gcc4.4-patch]
-# patch available thanks to Gentoo packagers
-# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-gcc44.patch?revision=1.2
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-md5sum = 5deb4d67b53ecba20c7887fc8fdebee1
-filename = cyrus-sasl-2.1.22-gcc44.patch
-download-only = true
-
 [cyrus-sasl]
-recipe = hexagonit.recipe.cmmi
-url = ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.23.tar.gz
-md5sum = 2eb0e48106f0e9cd8001e654f267ecbc
-
-patches =
-  ${cyrus-sasl-gcc4.4-patch:location}/${cyrus-sasl-gcc4.4-patch:filename}
-patch-options =
-  -p1
+recipe = slapos.recipe.cmmi
+url = ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.26.tar.gz
+md5sum = a7f4e5e559a0e37b3ffc438c9456e425
 
 configure-options =
   --disable-digest

component/dash/buildout.cfg

 [buildout]
+extends = 
+  ../coreutils/buildout.cfg
 
-parts = dash
+parts = dash-output
 
 [dash]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.7.tar.gz
 md5sum = f6cedb10ae7258adb5ab17a10ae80d51
 configure-options =
   --disable-static
   --disable-fnmatch
   --disable-glob
+
+[dash-output]
+# Shared binary location to ease migration
+recipe = plone.recipe.command
+stop-on-error = true
+update-command = ${:command}
+command = ${coreutils-output:test} -x ${:dash}
+dash = ${dash:location}/bin/dash

component/dbus/buildout.cfg

@@ -8,7 +8,7 @@ parts =
   dbus
 
 [dbus]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://dbus.freedesktop.org/releases/dbus/dbus-1.4.10.tar.gz
 md5sum = 402a2f8102bedbe236e2891b2b0f31c2
 configure-options = 
@@ -20,7 +20,7 @@ environment =
   LDFLAGS=-L${libexpat:location}/lib
 
 [dbus-glib]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.94.tar.gz
 md5sum = e1f1506a6f4941e67bffd614b1ad5af6
 environment =

component/dcron/buildout.cfg

 [buildout]
-parts = dcron
+extends = 
+  ../coreutils/buildout.cfg
+
+parts = dcron-output
+
+[dcron-hooks-download]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+md5sum = 860e914dff4108b47565965fe5ebc7b5
+download-only = true
+filename = dcron-hooks.py
 
 [dcron-patch-nonroot]
 recipe = hexagonit.recipe.download
-md5sum = 2f5b22dc1cbe81060a9c28e6f5c06e8b
+md5sum = d5408ab682b65cc1eda40d588fcd7db8
 url = ${:_profile_base_location_}/${:filename}
 filename = dcron-4.4.noroot.no.globals.patch
 download-only = true
 
 [dcron]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.jimpryor.net/linux/releases/dcron-4.4.tar.gz
 md5sum = 02d848ba043a9df5bf2102a9f4bc04bd
 configure-command = true
@@ -18,3 +28,13 @@ patches =
 patch-options = -p1
 make-options =
   PREFIX=${buildout:parts-directory}/${:_buildout_section_name_}
+post-make-hook = ${dcron-hooks-download:location}/${dcron-hooks-download:filename}:post_make_hook
+
+[dcron-output]
+# Shared binary location to ease migration
+recipe = plone.recipe.command
+stop-on-error = true
+update-command = ${:command}
+command = ${coreutils-output:test} -x ${:crond} -a -x ${:crontab} -a ! -u ${:crontab}
+crond = ${dcron:location}/sbin/crond
+crontab = ${dcron:location}/bin/crontab

component/dcron/dcron-4.4.noroot.no.globals.patch

-# Patch for making dcron usable without root user, as a local service
 diff -ru dcron-4.4.org/chuser.c dcron-4.4/chuser.c
 --- dcron-4.4.org/chuser.c	2010-01-18 16:27:31.000000000 +0100
-+++ dcron-4.4/chuser.c	2011-04-01 11:19:19.000000000 +0200
++++ dcron-4.4/chuser.c	2013-07-18 18:17:16.342147418 +0200
 @@ -14,47 +14,6 @@
  int
  ChangeUser(const char *user, char *dochdir)
@@ -53,7 +52,16 @@ diff -ru dcron-4.4.org/chuser.c dcron-4.4/chuser.c
  
 diff -ru dcron-4.4.org/crontab.c dcron-4.4/crontab.c
 --- dcron-4.4.org/crontab.c	2010-01-18 16:27:31.000000000 +0100
-+++ dcron-4.4/crontab.c	2011-04-01 11:19:19.000000000 +0200
++++ dcron-4.4/crontab.c	2013-07-18 18:18:07.768535485 +0200
+@@ -88,7 +88,7 @@
+ 				break;
+ 			case 'c':
+ 				/* getopt guarantees optarg != 0 here */
+-				if (*optarg != 0 && getuid() == geteuid()) {
++				if (*optarg != 0) {
+ 					CDir = optarg;
+ 				} else {
+ 					printlogf(0, "-c option: superuser only");
 @@ -316,9 +316,6 @@
  
  	close(filedes[0]);
@@ -75,7 +83,7 @@ diff -ru dcron-4.4.org/crontab.c dcron-4.4/crontab.c
  				ptr = PATH_VI;
 diff -ru dcron-4.4.org/job.c dcron-4.4/job.c
 --- dcron-4.4.org/job.c	2010-01-18 16:27:31.000000000 +0100
-+++ dcron-4.4/job.c	2011-04-01 11:19:19.000000000 +0200
++++ dcron-4.4/job.c	2013-07-18 18:17:16.342147418 +0200
 @@ -62,14 +62,6 @@
  		 * Change running state to the user in question
  		 */
@@ -108,7 +116,7 @@ diff -ru dcron-4.4.org/job.c dcron-4.4/job.c
  		/*
 diff -ru dcron-4.4.org/Makefile dcron-4.4/Makefile
 --- dcron-4.4.org/Makefile	2010-01-18 16:27:31.000000000 +0100
-+++ dcron-4.4/Makefile	2011-04-01 11:19:35.000000000 +0200
++++ dcron-4.4/Makefile	2013-07-18 18:17:16.342147418 +0200
 @@ -3,7 +3,6 @@
  
  # these variables can be configured by e.g. `make SCRONTABS=/different/path`

component/dcron/dcron-hooks.py

+import os
+import shutil
+def post_make_hook(options, buildout):
+  crontab_path = os.path.join(options['location'], 'bin', 'crontab')
+  os.chmod(crontab_path, 0750)

component/dropbear/buildout.cfg

@@ -7,9 +7,10 @@
 [buildout]
 extends = 
   ../zlib/buildout.cfg
+  ../coreutils/buildout.cfg
 
 parts =
-  dropbear
+  dropbear-output
 
 [dropbear-userspace-patch]
 recipe = hexagonit.recipe.download
@@ -40,7 +41,7 @@ filename = dropbear-0.53.1-static_build_fix.patch
 download-only = true
 
 [dropbear]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 md5sum = 0284ea239083f04c8b874e08e1aca243
 # XXX: We still use an old version of dropbear instead of the last one
 #      in order have all patches working.
@@ -63,3 +64,12 @@ patches=
 
 patch-options=
   -p1
+
+[dropbear-output]
+# Shared binary location to ease migration
+recipe = plone.recipe.command
+stop-on-error = true
+update-command = ${:command}
+command = ${coreutils-output:test} -x ${:ssh} -a -x ${:keygen}
+ssh = ${dropbear:location}/bin/dbclient
+keygen = ${dropbear:location}/bin/dropbearkey

component/erlang/buildout.cfg

@@ -8,7 +8,7 @@ extends =
 parts = erlang
 
 [erlang]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.erlang.org/download/otp_src_R14B04.tar.gz
 md5sum = 4b469729f103f52702bfb1fb24529dc0
 configure-options =

component/faketime/buildout.cfg

+#  faketime - report faked system time to programs without having to change the system-wide time
+#  http://www.code-wizards.com/projects/libfaketime
+
+[buildout]
+parts = faketime
+
+[faketime]
+recipe = slapos.recipe.cmmi
+url = http://www.code-wizards.com/projects/libfaketime/libfaketime-0.9.1.tar.gz
+md5sum = ce3f996dfd5826b4ac62f1a7cc36ea27
+configure-command = true
+make-options =
+  PREFIX=${buildout:parts-directory}/${:_buildout_section_name_}
+make-binary = make -e -C src
+make-targets = install
+post-install = sed -i -e "16c\FTPL_PATH=${buildout:parts-directory}/${:_buildout_section_name_}/lib/faketime" ${buildout:parts-directory}/${:_buildout_section_name_}/bin/faketime

component/fastjar/buildout.cfg

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

component/ffmpeg/buildout.cfg

@@ -2,6 +2,7 @@
 extends = 
   ../bzip2/buildout.cfg
   ../libpng/buildout.cfg
+  ../patch/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../zlib/buildout.cfg
 
@@ -12,14 +13,14 @@ parts =
 <= ffmpeg-0.8
 
 [libogg]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://downloads.xiph.org/releases/ogg/libogg-1.2.2.tar.gz
 md5sum = 5a9fcabc9a1b7c6f1cd75ddc78f36c56
 configure-options =
   --disable-static
 
 [libvorbis]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.2.tar.bz2
 md5sum = 798a4211221073c1409f26eac4567e8b
 configure-options =
@@ -28,22 +29,33 @@ environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${libogg:location}/lib/pkgconfig
 
+[libtheora-png_sizeof.patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+filename = libtheora-png_sizeof.patch
+md5sum = eaa1454081b50f05b59495a12f52b0d5
+download-only = true
+
 [libtheora]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.bz2
 md5sum = 292ab65cedd5021d6b7ddd117e07cd8e
+depends =
+  ${libpng:so_version}
+patches = ${libtheora-png_sizeof.patch:location}/${libtheora-png_sizeof.patch:filename}
+patch-options = -p1
 configure-options =
   --disable-static
 environment = 
-  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PATH=${patch:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${libogg:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig:${libvorbis:location}/lib/pkgconfig
 
 [yasm]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.tortall.net/projects/yasm/releases/yasm-1.1.0.tar.gz
 
 [libvpx]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://webm.googlecode.com/files/libvpx-v0.9.6.tar.bz2
 md5sum = 383f3f07a76099682abb43f79b692b72
 configure-options = 
@@ -52,7 +64,7 @@ environment =
   PATH=${yasm:location}/bin:%(PATH)s
 
 [libx264]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20111005-2245-stable.tar.bz2
 md5sum = f86260b2ea6d6cb5186937c9363891d7
 configure-options =
@@ -62,7 +74,7 @@ environment =
   PATH=${yasm:location}/bin:%(PATH)s
 
 [lame]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://prdownloads.sourceforge.net/lame/lame-3.98.4.tar.gz
 md5sum = 8e9866ad6b570c6c95c8cba48060473f
 configure-options =
@@ -70,14 +82,14 @@ configure-options =
   --disable-gtktest
 
 [opencore-amr]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://prdownloads.sourceforge.net/opencore-amr/opencore-amr/opencore-amr-0.1.2.tar.gz
 md5sum = 8e8b8b253eb046340ff7b6bf7a6ccd3e
 configure-options =
   --disable-static
 
 [ffmpeg-0.8]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://ffmpeg.org/releases/ffmpeg-0.8.5.tar.bz2
 md5sum = 726877b19ece7ea64def8b7e6727e182
 configure-options = 

component/ffmpeg/libtheora-png_sizeof.patch

+--- libtheora-1.1.1/examples/png2theora.c.orig        2009-08-23 03:14:04.000000000 +0900
++++ libtheora-1.1.1/examples/png2theora.c     2013-07-16 12:40:07.629087870 +0900
+@@ -462,9 +462,9 @@
+   png_set_strip_alpha(png_ptr);
+ 
+   row_data = (png_bytep)png_malloc(png_ptr,
+-    3*height*width*png_sizeof(*row_data));
++    3*height*width*sizeof(*row_data));
+   row_pointers = (png_bytep *)png_malloc(png_ptr,
+-    height*png_sizeof(*row_pointers));
++    height*sizeof(*row_pointers));
+   for(y = 0; y < height; y++) {
+     row_pointers[y] = row_data + y*(3*width);
+   }

component/file/buildout.cfg

@@ -7,7 +7,7 @@ extends =
   ../zlib/buildout.cfg
 
 [file]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = ftp://ftp.astron.com/pub/file/file-5.11.tar.gz
 md5sum = 16a407bd66d6c7a832f3a5c0d609c27b
 configure-options =

component/firefox/buildout.cfg

@@ -7,7 +7,6 @@ extends =
   ../gtk-2/buildout.cfg
   ../libpng/buildout.cfg
   ../dash/buildout.cfg
-  ../openssl/buildout.cfg
 
 parts =
   firefox
@@ -25,9 +24,10 @@ depends =
   ${liberation-fonts:location}
   ${ipaex-fonts:location}
 
-version = 26.0
-x86 = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${:version}/linux-i686/en-US/firefox-${:version}.tar.bz2 92f89c9e4f8325e947de8918efb18e55
-x86-64 = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${:version}/linux-x86_64/en-US/firefox-${:version}.tar.bz2 4b74154431b8a3766fad4fe4fe1f9f7c
+version = 27.0
+
+x86 = http://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-i686/en-US/firefox-${:version}.tar.bz2 2711961e5fcccbb224625a77fd0f4422
+x86-64 = http://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-x86_64/en-US/firefox-${:version}.tar.bz2 ea3eb21e260647bfbe5f308bff74d6f0
 
 script =
   if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ')
@@ -38,7 +38,7 @@ script =
   wrapper = open(wrapper_location, 'w')
   wrapper.write("""#!${dash:location}/bin/dash
   cd %(location)s
-  export LD_LIBRARY_PATH=%(location)s:${libXrender:location}/lib:${dbus:location}/lib:${dbus-glib:location}/lib:${freetype:location}/lib:${fontconfig:location}/lib:${libX11:location}/lib:${bzip2:location}/lib:${libXext:location}/lib:${libXt:location}/lib:${zlib:location}/lib:${libXcursor:location}/lib:${gtk-2:location}/lib:${cairo:location}/lib:${pango:location}/lib:${glib:location}/lib:${atk:location}/lib:${gdk-pixbuf:location}/lib:${alsa:location}/lib:${libpng12:location}/lib:${libSM:location}/lib:${libICE:location}/lib:${libxml2:location}/lib:${openssl:location}/lib
+  export LD_LIBRARY_PATH=%(location)s:${alsa:location}/lib:${atk:location}/lib:${bzip2:location}/lib:${cairo:location}/lib:${dbus:location}/lib:${dbus-glib:location}/lib:${fontconfig:location}/lib:${freetype:location}/lib:${gdk-pixbuf:location}/lib:${gettext:location}/lib:${glib:location}/lib:${gtk-2:location}/lib:${harfbuzz:location}/lib:${libICE:location}/lib:${libSM:location}/lib:${libX11:location}/lib:${libXau:location}/lib:${libXcursor:location}/lib:${libXext:location}/lib:${libXrender:location}/lib:${libXt:location}/lib:${libffi:location}/lib:${libpng:location}/lib:${libtool:location}/lib:${libuuid:location}/lib:${libxcb:location}/lib:${libxml2:location}/lib:${pango:location}/lib:${pixman:location}/lib:${xfixes:location}/lib:${zlib:location}/lib
   export PATH=${fontconfig:location}/bin:$PATH
   exec %(location)s/firefox $*""")
   wrapper.close()

component/flare/buildout.cfg

@@ -7,7 +7,7 @@ parts =
   flare
 
 [flare]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://labs.gree.jp/data/source/flare-1.0.9.tgz
 md5sum = e59ccce1ba29e7edf6f665561678d5c8
 configure-options =

component/flex/buildout.cfg

@@ -5,7 +5,7 @@ parts =
   flex
 
 [flex]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://downloads.sourceforge.net/project/flex/flex/flex-2.5.35/flex-2.5.35.tar.gz
 md5sum = 201d3f38758d95436cbc64903386de0b
 environment =

component/fontconfig/buildout.cfg

@@ -12,18 +12,18 @@ parts =
   fontconfig
 
 [fontconfig]
-recipe = hexagonit.recipe.cmmi
-url = http://fontconfig.org/release/fontconfig-2.9.0.tar.gz
-md5sum = 26c83855ed256b5c032baae032fadc4f
+recipe = slapos.recipe.cmmi
+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
   --disable-docs
   --enable-libxml2
   --with-default-fonts=${fonts:location}
-  --with-freetype-config=${freetype:location}/bin/freetype-config
 environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${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/fonts/buildout.cfg

@@ -14,23 +14,23 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
 [liberation-fonts]
 recipe = hexagonit.recipe.download
 strip-top-level-dir = true
-url = https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-1.07.0.tar.gz
-md5sum = 8150db1c6e27cacdfd524b563b85b69e
+url = https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-2.00.1.tar.gz
+md5sum = 5c781723a0d9ed6188960defba8e91cf
 destination = ${fonts:location}/${:_buildout_section_name_}
 
 # IPAex and IPA Font - Japanese fonts provided by IPA
-# http://ossipedia.ipa.go.jp/ipafont/index.html
+# http://ipafont.ipa.go.jp/
 [ipaex-fonts]
 recipe = hexagonit.recipe.download
 strip-top-level-dir = true
-url = http://info.openlab.ipa.go.jp/ipafont/fontdata/IPAexfont00103.zip
-md5sum = ac67b2fc3aab7f683d89f0070df284e7
+url = http://ipafont.ipa.go.jp/ipaexfont/IPAexfont00201.php
+md5sum = 7bf84182a04a9632268dbcb03f100d05
 destination = ${fonts:location}/${:_buildout_section_name_}
 
 [ipa-fonts]
 recipe = hexagonit.recipe.download
 strip-top-level-dir = true
-url = http://info.openlab.ipa.go.jp/ipafont/fontdata/IPAfont00303.zip
+url = http://ipafont.ipa.go.jp/ipafont/IPAfont00303.php
 md5sum = 39a828acf27790adbe4944dfb4d94bb1
 destination = ${fonts:location}/${:_buildout_section_name_}
 

component/freetype/buildout.cfg

@@ -4,17 +4,24 @@
 [buildout]
 extends =
   ../bzip2/buildout.cfg
+  ../libpng/buildout.cfg
   ../zlib/buildout.cfg
 
 parts =
   freetype
 
 [freetype]
-recipe = hexagonit.recipe.cmmi
-url = http://download.savannah.gnu.org/releases/freetype/freetype-2.4.9.tar.bz2
-md5sum = 77a893dae81fd5b896632715ca041179
+recipe = slapos.recipe.cmmi
+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

component/garbage-collector/buildout.cfg

@@ -2,7 +2,7 @@
 parts = garbage-collector
 
 [garbage-collector]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 md5sum = 2ff9924c7249ef7f736ecfe6f08f3f9b
 url = http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-7.1.tar.gz
 configure-options =

component/gcc/buildout.cfg

@@ -10,7 +10,7 @@ parts =
   gcc
 
 [mpfr]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.mpfr.org/mpfr-3.0.1/mpfr-3.0.1.tar.bz2
 md5sum = bfbecb2eacb6d48432ead5cfc3f7390a
 configure-options =
@@ -20,7 +20,7 @@ environment =
   LDFLAGS=-Wl,-rpath=${gmp:location}/lib
 
 [mpc]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.multiprecision.org/mpc/download/mpc-0.9.tar.gz
 md5sum = 0d6acab8d214bd7d1fbbc593e83dd00d
 configure-options =
@@ -31,9 +31,9 @@ environment =
   LDFLAGS=-Wl,-rpath=${mpfr:location}/lib -Wl,-rpath=${gmp:location}/lib
 
 [ppl]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 # we should use version 0.10.x for gcc-4.5
-url = http://www.cs.unipr.it/ppl/Download/ftp/releases/0.10.2/ppl-0.10.2.tar.bz2
+url = http://bugseng.com/products/ppl/download/ftp/releases/0.10.2/ppl-0.10.2.tar.bz2
 md5sum = 5667111f53150618b0fa522ffc53fc3e
 configure-options =
   --with-libgmp-prefix=${gmp:location}
@@ -44,7 +44,7 @@ environment =
   LDFLAGS=-Wl,-rpath=${gmp:location}/lib
 
 [cloog-ppl]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = ftp://gcc.gnu.org/pub/gcc/infrastructure/cloog-ppl-0.15.9.tar.gz
 md5sum = 806e001d1b1a6b130069ff6274900af5
 configure-options =
@@ -55,13 +55,6 @@ environment =
   PATH=${m4:location}/bin:%(PATH)s
   LDFLAGS=-Wl,-rpath=${gmp:location}/lib -Wl,-rpath=${ppl:location}/lib
 
-[ecj]
-recipe = hexagonit.recipe.download
-download-only = true
-url = ftp://sourceware.org/pub/java/ecj-4.5.jar
-md5sum = d7cd6a27c8801e66cbaa964a039ecfdb
-filename = ecj.jar
-
 [gcc-download]
 hack-revision = ${gcc-interconnection-workaround:hack-revision}
 recipe = hexagonit.recipe.download
@@ -70,15 +63,6 @@ md5sum = 8e0b5c12212e185f3e4383106bfa9cc6
 strip-top-level-dir = True
 destination = ${gcc-source:location}
 
-[gcc-java-download]
-hack-revision = ${gcc-interconnection-workaround:hack-revision}
-recipe = hexagonit.recipe.download
-url = http://www.mirrorservice.org/sites/sourceware.org/pub/gcc/releases/gcc-4.5.3/gcc-java-4.5.3.tar.bz2
-md5sum = 08e045fdbdc22ac9af3aec3b8d16dbab
-strip-top-level-dir = True
-destination = ${gcc-source:location}
-ignore-existing = true
-
 [gcc-source]
 hack-revision = ${gcc-interconnection-workaround:hack-revision}
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
@@ -90,78 +74,50 @@ url = ${:_profile_base_location_}/${:filename}
 filename = ${:_buildout_section_name_}
 download-only = true
 
-[gcc-java-pre-4.4.patch]
-recipe = hexagonit.recipe.download
-md5sum = 9a563576126d9fcf234ef29c2fc7df76
-url = ${:_profile_base_location_}/${:filename}
-filename = ${:_buildout_section_name_}
-download-only = true
-
-[gcc-java-minimal]
+[gcc]
 hack-revision = ${gcc-interconnection-workaround:hack-revision}
 depends =
   ${gcc-download:location}
-  ${gcc-java-download:location}
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 path = ${gcc-source:location}
 md5sum = bb3265edf0fa7543e50cedb93e04e427
 patches =
   ${gcc-multiarch.patch:location}/${gcc-multiarch.patch:filename}
-  ${gcc-java-pre-4.4.patch:location}/${gcc-java-pre-4.4.patch:filename}
 patch-options = -p2
 configure-command = make clean \\; make distclean \\; ./configure
-# GMP does not correctly detect achitecture so it have to be given
-# as hexagonit.recipe.cmmi is using shell expansion in subproceses
-# backticks are working
 configure-options =
   --disable-bootstrap
-  --enable-languages=java
+  --enable-languages="c,c++"
   --disable-multilib
   --with-gmp=${gmp:location}
   --with-mpfr=${mpfr:location}
   --with-mpc=${mpc:location}
-  --with-ecj-jar=${ecj:location}/${ecj:filename}
+  --with-ppl=${ppl:location}
+  --with-cloog=${cloog-ppl:location}
   --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
-  --without-ppl
-  --without-cloog
-
 environment =
-  CPPFLAGS =-I${mpfr:location}/include -I${gmp:location}/include -I${mpc:location}/include
-  LDFLAGS =-L${mpfr:location}/lib -Wl,-rpath=${mpfr:location}/lib -L${gmp:location}/lib -Wl,-rpath=${gmp:location}/lib -Wl,-rpath=${mpc:location}/lib
-  PATH=${zip:location}/bin:%(PATH)s
+  LDFLAGS=-Wl,-rpath=${mpfr:location}/lib -Wl,-rpath=${gmp:location}/lib -Wl,-rpath=${mpc:location}/lib -Wl,-rpath=${ppl:location}/lib -Wl,-rpath=${cloog-ppl:location}/lib
 # make install does not work when several core are used
 make-targets = install -j1
 
-[gcc]
-hack-revision = ${gcc-interconnection-workaround:hack-revision}
-depends =
-  ${gcc-download:location}
-  ${gcc-java-download:location}
-recipe = hexagonit.recipe.cmmi
-path = ${gcc-source:location}
-md5sum = bb3265edf0fa7543e50cedb93e04e427
+[gcc-minimal]
+recipe = slapos.recipe.cmmi
+url = http://ftp.gnu.org/gnu/gcc/gcc-4.5.4/gcc-core-4.5.4.tar.bz2
+md5sum = ca62e442629a9a7710f5d797bf1b521c
 patches =
   ${gcc-multiarch.patch:location}/${gcc-multiarch.patch:filename}
 patch-options = -p2
-configure-command = make clean \\; make distclean \\; ./configure
-# GMP does not correctly detect achitecture so it have to be given
-# as hexagonit.recipe.cmmi is using shell expansion in subproceses
-# backticks are working
 configure-options =
   --disable-bootstrap
-  --enable-languages="c,c++,java"
+  --enable-languages=c
   --disable-multilib
   --with-gmp=${gmp:location}
   --with-mpfr=${mpfr:location}
   --with-mpc=${mpc:location}
-  --with-ppl=${ppl:location}
-  --with-cloog=${cloog-ppl:location}
-  --with-ecj-jar=${ecj:location}/${ecj:filename}
-  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
-
+  --without-ppl
+  --without-cloog
 environment =
-  LDFLAGS=-Wl,-rpath=${mpfr:location}/lib -Wl,-rpath=${gmp:location}/lib -Wl,-rpath=${mpc:location}/lib -Wl,-rpath=${ppl:location}/lib -Wl,-rpath=${cloog-ppl:location}/lib
-  PATH=${zip:location}/bin:%(PATH)s
+  LDFLAGS=-Wl,-rpath=${mpfr:location}/lib -Wl,-rpath=${gmp:location}/lib -Wl,-rpath=${mpc:location}/lib
 # make install does not work when several core are used
 make-targets = install -j1
 

component/gdbm/buildout.cfg

@@ -3,12 +3,13 @@ parts =
   gdbm
 
 [gdbm]
-recipe = hexagonit.recipe.cmmi
-version = 1.10
+recipe = slapos.recipe.cmmi
+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

component/gettext/buildout.cfg

@@ -6,26 +6,15 @@ extends =
   ../libxml2/buildout.cfg
   ../zlib/buildout.cfg
 
-[gettext-drop.gets.patch]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-md5sum = 1a17a2e6c1539927304379dfa0f149c5
-download-only = true
-filename = drop.gets.patch
-
 [gettext]
-virtual-depends = ${gettext-drop.gets.patch:md5sum}
-recipe = hexagonit.recipe.cmmi
-url = http://ftp.gnu.org/pub/gnu/gettext/gettext-0.18.1.1.tar.gz
-md5sum = 3dd55b952826d2b32f51308f2f91aa89
-
-patch-options = -p1
-patches =
-  ${gettext-drop.gets.patch:location}/${gettext-drop.gets.patch:filename}
+recipe = slapos.recipe.cmmi
+url = http://ftp.gnu.org/pub/gnu/gettext/gettext-0.18.3.2.tar.gz
+md5sum = 241aba309d07aa428252c74b40a818ef
 
 configure-options =
   --disable-static
   --disable-java
+  --disable-native-java
   --disable-csharp
   --with-libncurses-prefix=${ncurses:location}
   --with-libxml2-prefix=${libxml2:location}
@@ -34,6 +23,8 @@ configure-options =
   --disable-acl
   --disable-openmp
   --without-git
+  --without-bz2
+  --without-xz
 
 environment =
   CPPFLAGS=-I${libxml2:location}/include -I${zlib:location}/include -I${ncurses:location}/include

component/gettext/drop.gets.patch

-diff -ur gettext-0.18.1.1.orig/gettext-runtime/gnulib-lib/stdio.in.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/stdio.in.h
---- gettext-0.18.1.1.orig/gettext-runtime/gnulib-lib/stdio.in.h	2010-05-17 21:56:12.000000000 +0200
-+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/stdio.in.h	2012-07-20 17:42:29.940524198 +0200
-@@ -141,7 +141,9 @@
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
- #undef gets
-+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !__GLIBC_PREREQ(2, 16)
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-+#endif
- 
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
-diff -ur gettext-0.18.1.1.orig/gettext-tools/gnulib-lib/stdio.in.h gettext-0.18.1.1/gettext-tools/gnulib-lib/stdio.in.h
---- gettext-0.18.1.1.orig/gettext-tools/gnulib-lib/stdio.in.h	2010-05-24 11:42:46.000000000 +0200
-+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/stdio.in.h	2012-07-20 17:45:20.550461064 +0200
-@@ -141,7 +141,9 @@
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
- #undef gets
-+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !__GLIBC_PREREQ(2, 16)
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-+#endif
- 
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
-diff -ur gettext-0.18.1.1.orig/gettext-tools/libgettextpo/stdio.in.h gettext-0.18.1.1/gettext-tools/libgettextpo/stdio.in.h
---- gettext-0.18.1.1.orig/gettext-tools/libgettextpo/stdio.in.h	2010-05-17 21:58:03.000000000 +0200
-+++ gettext-0.18.1.1/gettext-tools/libgettextpo/stdio.in.h	2012-07-20 17:45:15.937129402 +0200
-@@ -141,7 +141,9 @@
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
- #undef gets
-+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !__GLIBC_PREREQ(2, 16)
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-+#endif
- 
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@

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
 
 [ghostscript-common]
-recipe = hexagonit.recipe.cmmi
+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
   --with-system-libtiff
+  --without-libidn
   --without-x
   --with-drivers=FILES
+  --with-fontpath=${ghostscript-fonts:location}
 # it seems that parallel build sometimes fails for ghostscript.
 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.06.tar.bz2
-md5sum = 46f9ebe40dc52755287b30704270db11
+url = http://downloads.ghostscript.com/public/ghostscript-9.10.tar.bz2
+md5sum = 7179bb1ed4f6f453147e6f7e1f210ce8
+
+[ghostscript-fonts]
+recipe = hexagonit.recipe.download
+url = http://downloads.sourceforge.net/project/gs-fonts/gs-fonts/8.11%20%28base%2035%2C%20GPL%29/ghostscript-fonts-std-8.11.tar.gz
+md5sum = 6865682b095f8c4500c54b285ff05ef6
+strip-top-level-dir = true

component/giflib/buildout.cfg

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

component/git/buildout.cfg

@@ -4,6 +4,7 @@
 [buildout]
 extends =
   ../curl/buildout.cfg
+  ../gettext/buildout.cfg
   ../libexpat/buildout.cfg
   ../openssl/buildout.cfg
   ../zlib/buildout.cfg
@@ -11,9 +12,9 @@ parts =
   git
 
 [git]
-recipe = hexagonit.recipe.cmmi
-url = http://git-core.googlecode.com/files/git-1.7.12.tar.gz
-md5sum = ceb1a6b17a3e33bbc70eadf8fce5876c
+recipe = slapos.recipe.cmmi
+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}

component/glib/buildout.cfg

 [buildout]
 extends =
   ../gettext/buildout.cfg
+  ../libffi/buildout.cfg
+  ../xz-utils/buildout.cfg
   ../zlib/buildout.cfg
+parts =
+  glib
 
 [glib]
-recipe = hexagonit.recipe.cmmi
-url = http://ftp.gnome.org/pub/gnome/sources/glib/2.28/glib-2.28.8.tar.bz2
-md5sum = 789e7520f71c6a4bf08bc683ec764d24
+recipe = slapos.recipe.cmmi
+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 =
+  ${:_profile_base_location_}/cygwin-glib-2.28.8-src.patch

component/glib/cygwin-glib-2.28.8-src.patch

+--- glib/gstrfuncs.c~	2012-12-30 14:51:30.000000000 +0800
++++ glib/gstrfuncs.c	2012-12-30 14:51:50.203125000 +0800
+@@ -1423,7 +1423,7 @@
+ #ifdef HAVE_STRSIGNAL
+   const char *msg_locale;
+ 
+-#if defined(G_OS_BEOS) || defined(G_WITH_CYGWIN)
++#if defined(G_OS_BEOS) 
+ extern const char *strsignal(int);
+ #else
+   /* this is declared differently (const) in string.h on BeOS */

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

component/gmp/buildout.cfg

@@ -6,12 +6,12 @@ parts =
   gmp
 
 [gmp]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 # we should use version 4.x for ppl-0.10
 url = ftp://ftp.gmplib.org/pub/gmp-4.3.2/gmp-4.3.2.tar.bz2
 md5sum = dd60683d7057917e34630b4a787932e8
 # GMP does not correctly detect achitecture so it have to be given
-# as hexagonit.recipe.cmmi is using shell expansion in subproceses
+# as slapos.recipe.cmmi is using shell expansion in subproceses
 # backticks are working
 configure-options =
   --build=`uname -m`-linux

component/gnutls/buildout.cfg

 [buildout]
 extends =
-  ../readline/buildout.cfg
+  ../gmp/buildout.cfg
+  ../nettle/buildout.cfg
   ../ncurses/buildout.cfg
+  ../readline/buildout.cfg
+  ../xz-utils/buildout.cfg
   ../zlib/buildout.cfg
 
 parts = gnutls
 
 [gpg-error]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.10.tar.gz
 md5sum = 7c2710ef439f82ac429b88fec88e9a4c
 
 [gcrypt]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.5.0.tar.gz
 md5sum = 78f8f8bec4580f75b25816f7896d0389
 configure-options =
@@ -22,14 +25,13 @@ environment =
   LDFLAGS=-lgpg-error -L${gpg-error:location}/lib -Wl,-rpath=${gpg-error:location}/lib
 
 [gnutls]
-# XXX-Cedric : update to latest gnutls
-recipe = hexagonit.recipe.cmmi
-url = ftp://ftp.gnupg.org/gcrypt/gnutls/gnutls-2.8.6.tar.bz2
-md5sum = eb0a6d7d3cb9ac684d971c14f9f6d3ba
+recipe = slapos.recipe.cmmi
+url = ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/gnutls-3.2.0.tar.xz
+md5sum = e0cba4ddd923420026ff9739b3bc069a
 configure-options =
   --with-libgcrypt-prefix=${gcrypt:location}
   --disable-static
 environment =
-  CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${gcrypt:location}/include -I${gpg-error:location}/include
-  LDFLAGS=-lgcrypt -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${gcrypt:location}/lib -Wl,-rpath=${gcrypt:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${gpg-error:location}/lib -Wl,-rpath=${gpg-error:location}/lib
-  PKG_CONFIG=${zlib:location}/lib/pkgconfig
+  PATH=${xz-utils:location}/bin:%(PATH)s
+  CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${gmp:location}/include -I${gcrypt:location}/include -I${gpg-error:location}/include -I${nettle:location}/include
+  LDFLAGS=-lgcrypt -L${gmp:location}/lib -Wl,-rpath=${gmp:location}/lib -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${gcrypt:location}/lib -Wl,-rpath=${gcrypt:location}/lib -L${nettle:location}/lib -Wl,-rpath=${nettle:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${gpg-error:location}/lib -Wl,-rpath=${gpg-error:location}/lib

component/graphviz/buildout.cfg

@@ -9,23 +9,28 @@ extends =
   ../fontconfig/buildout.cfg
   ../freetype/buildout.cfg
   ../libpng/buildout.cfg
+  ../glib/buildout.cfg
+  ../gtk-2/buildout.cfg
   ../pkgconfig/buildout.cfg
+  ../xorg/buildout.cfg
   ../zlib/buildout.cfg
 
 [graphviz]
-recipe = hexagonit.recipe.cmmi
-url = http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.28.0.tar.gz
-md5sum = 8d26c1171f30ca3b1dc1b429f7937e58
+recipe = slapos.recipe.cmmi
+url = http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.36.0.tar.gz
+md5sum = 1f41664dba0c93109ac8b71216bf2b57
+depends =
+  ${libpng:so_version}
+pkg_config_depends = ${pango:location}/lib/pkgconfig:${pango:pkg_config_depends}
 configure-options =
   --with-included-ltdl
-  --with-pngincludedir=${libpng:location}/include
-  --with-pnglibdir=${libpng:location}/lib
   --with-zincludedir=${zlib:location}/include
   --with-zlibdir=${zlib:location}/lib
   --with-freetype2
   --with-fontconfig
   --disable-swig
   --disable-sharp
+  --disable-go
   --disable-guile
   --disable-io
   --disable-java
@@ -40,16 +45,25 @@ configure-options =
   --without-x
   --without-expat
   --without-devil
+  --without-webp
+  --without-poppler
   --without-rsvg
   --without-ghostscript
   --without-visio
-  --without-pangocairo
+  --with-pangocairo
   --without-lasi
   --without-glitz
-  --without-jpeg
+  --without-gdk
+  --without-gtk
+  --without-gts
+  --without-ann
+  --without-glade
+  --without-ming
+  --without-qt
+  --without-libgd
   --without-glut
 environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig
-  CPPFLAGS=-I${bzip2:location}/include -I${zlib:location}/include
+  PKG_CONFIG_PATH=${:pkg_config_depends}
+  CPPFLAGS=-I${zlib:location}/include
   LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib

component/grep/buildout.cfg

 [buildout]
 extends =
   ../pcre/buildout.cfg
+  ../coreutils/buildout.cfg
+  ../xz-utils/buildout.cfg
 parts =
-  grep
+  grep-output
 
 [grep]
-recipe = hexagonit.recipe.cmmi
-url = http://ftp.gnu.org/gnu/grep/grep-2.9.tar.gz
-md5sum = 03e3451a38b0d615cb113cbeaf252dc0
+recipe = slapos.recipe.cmmi
+url = http://ftp.gnu.org/gnu/grep/grep-2.16.tar.xz
+md5sum = 502350a6c8f7c2b12ee58829e760b44d
 environment =
+  PATH=${xz-utils:location}/bin:%(PATH)s
   CPPFLAGS=-I${pcre:location}/include
   LDFLAGS=-L${pcre:location}/lib -Wl,-rpath=${pcre:location}/lib
+
+[grep-output]
+# Shared binary location to ease migration
+recipe = plone.recipe.command
+stop-on-error = true
+update-command = ${:command}
+command = ${coreutils-output:test} -x ${:grep}
+grep = ${grep:location}/bin/grep

component/groff/buildout.cfg

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

component/groonga/buildout.cfg

@@ -5,10 +5,15 @@
 parts =
   groonga
 
+extends =
+  ../pkgconfig/buildout.cfg
+  ../zlib/buildout.cfg
+
 [groonga]
-recipe = hexagonit.recipe.cmmi
-url = http://packages.groonga.org/source/groonga/groonga-2.0.6.tar.gz
-md5sum = 64467d1ab8d5e0df8348a636972a95a7
+recipe = slapos.recipe.cmmi
+version = 4.0.0
+url = http://packages.groonga.org/source/groonga/groonga-${:version}.tar.gz
+md5sum = 63d1ae3453719f7bef06a30f8966e886
 configure-options =
   --disable-static
   --disable-glibtest
@@ -16,3 +21,20 @@ configure-options =
   --disable-document
   --disable-groonga-httpd
   --without-mecab
+environment =
+  CPPFLAGS =-I${zlib:location}/include
+  LDFLAGS =-Wl,-rpath=${zlib:location}/lib -L${zlib:location}/lib
+
+[groonga-normalizer-mysql]
+recipe = slapos.recipe.cmmi
+version = 1.0.6
+url = http://packages.groonga.org/source/groonga-normalizer-mysql/groonga-normalizer-mysql-${:version}.tar.gz
+md5sum = 12740a835cfdf4b0dac66c3f2f152d84
+location = ${groonga:location}
+depends =
+  ${groonga:version}
+configure-options =
+  --disable-static
+environment =
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${groonga:location}/lib/pkgconfig

component/gtkmm/buildout.cfg

+[buildout]
+extends =
+  ../bzip2/buildout.cfg
+  ../fontconfig/buildout.cfg
+  ../freetype/buildout.cfg
+  ../glibmm/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

component/gzip/buildout.cfg

 [buildout]
+extends =
+  ../xz-utils/buildout.cfg
 parts =
   gzip
 
-[gzip-drop.gets.patch]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-md5sum = d9b1156f912c8cf006f140482918ebc9
-download-only = true
-filename = drop.gets.patch
-
 [gzip]
-virtual-depends = ${gzip-drop.gets.patch:md5sum}
-recipe = hexagonit.recipe.cmmi
-
-patch-options = -p1
-patches =
-  ${gzip-drop.gets.patch:location}/${gzip-drop.gets.patch:filename}
-
-url = ftp://ftp.gnu.org/pub/gnu/gzip/gzip-1.4.tar.gz
-md5sum = e381b8506210c794278f5527cba0e765
+recipe = slapos.recipe.cmmi
+url = ftp://ftp.gnu.org/pub/gnu/gzip/gzip-1.6.tar.xz
+md5sum = da981f86677d58a106496e68de6f8995
+environment =
+  PATH=${xz-utils:location}/bin:%(PATH)s

component/haproxy/buildout.cfg

@@ -8,9 +8,9 @@ extends =
 parts = haproxy
 
 [haproxy]
-recipe = hexagonit.recipe.cmmi
-url = http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.22.tar.gz
-md5sum = a0b007c76f6a78524f3b3dd5e704979c
+recipe = slapos.recipe.cmmi
+url = http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.24.tar.gz
+md5sum = 86422620faa9759907563d5e0524b98c
 configure-command = true
 # If the system is running on Linux 2.6, we use "linux26" as the TARGET,
 # otherwise use "generic".

component/icu/buildout.cfg

@@ -3,7 +3,7 @@
 parts = icu4c
 
 [icu4c]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 url = http://download.icu-project.org/files/icu4c/4.8.1.1/icu4c-4_8_1_1-src.tgz
 md5sum = ea93970a0275be6b42f56953cd332c17

component/imagemagick/buildout.cfg

@@ -8,14 +8,18 @@ extends =
   ../fontconfig/buildout.cfg
   ../freetype/buildout.cfg
   ../ghostscript/buildout.cfg
+  ../lcms/buildout.cfg
   ../librsvg/buildout.cfg
   ../libjpeg/buildout.cfg
   ../libpng/buildout.cfg
   ../libtiff/buildout.cfg
   ../libtool/buildout.cfg
+  ../libxml2/buildout.cfg
   ../jasper/buildout.cfg
   ../jbigkit/buildout.cfg
   ../pkgconfig/buildout.cfg
+  ../webp/buildout.cfg
+  ../xz-utils/buildout.cfg
   ../zlib/buildout.cfg
 
 [imagemagick-6.6.6-1-no-gsx-gsc-probe.patch]
@@ -27,12 +31,15 @@ download-only = true
 filename = imagemagick-6.6.6-1-no-gsx-gsc-probe.patch
 
 [imagemagick]
-recipe = hexagonit.recipe.cmmi
-url = http://ftp.vim.org/ImageMagick/ImageMagick-6.8.1-9.tar.bz2
-md5sum = cde56988f9d2208d9d61815cc23665b4
+recipe = slapos.recipe.cmmi
+version = 6.8.8-2
+url = http://ftp.vim.org/ImageMagick/ImageMagick-${:version}.tar.xz
+md5sum = d11e1c732add731ff368b2dffcd004b4
 depends =
   ${libtiff:version}
-  ${librsvg: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
@@ -47,24 +54,23 @@ configure-options =
   --without-gslib
   --without-gvc
   --without-lcms
-  --without-lcms2
+  --with-lcms2
   --without-lqr
-  --without-lzma
   --without-openexr
   --without-pango
+  --without-rsvg
   --without-wmf
-  --without-xml
   --with-bzlib=${bzip2:location}
   --with-zlib=${zlib:location}
   --with-ltdl-include=${libtool:location}/include
   --with-ltdl-lib=${libtool:location}/lib
-  --with-rsvg=${librsvg:location}
+  --with-gs-font-dir=${ghostscript-fonts:location}
   --with-frozenpaths
 patch-options = -p1
 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:${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${fontconfig:location}/lib/pkgconfig:${librsvg: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
-  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
+  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=${: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

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

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);

component/intltool/buildout.cfg

@@ -8,7 +8,7 @@ parts =
   intltool
 
 [intltool]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://edge.launchpad.net/intltool/trunk/0.41.1/+download/intltool-0.41.1.tar.gz
 md5sum = d6c91bf06681919ccfdf3624035b75dc
 depends =

component/jasper/buildout.cfg

@@ -5,7 +5,7 @@ parts =
   jasper
 
 [jasper]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-1.900.1.zip
 md5sum = a342b2b4495b3e1394e161eb5d85d754
 # jasper configure script is not executable by default

component/java/buildout.cfg

@@ -41,7 +41,7 @@ script =
   (download_dir, filename) = os.path.split(download_file)
   auto_extract_bin = os.path.join(extract_dir, filename)
   shutil.move(download_file, auto_extract_bin)
-  os.chmod(auto_extract_bin, 0777)
+  os.chmod(auto_extract_bin, 0755)
   subprocess.call([auto_extract_bin])
   self.cleanup_dir_list.append(extract_dir)
   workdir = guessworkdir(extract_dir)

component/jbigkit/buildout.cfg

@@ -19,7 +19,7 @@ filename = jbigkit-2.0-build.patch
 md5sum = e974958e9331735c07478e9c2dde8795
 
 [jbigkit]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.cl.cam.ac.uk/~mgk25/download/jbigkit-2.0.tar.gz
 md5sum = 3dd87f605abb1a97a22dc79d8b3e8f6c
 patch-options =

component/jsl/buildout.cfg

+# jsl - command line javascript lint
+# http://javascriptlint.com/
+
+[buildout]
+parts = jsl
+
+[jsl]
+recipe = slapos.recipe.build
+url = http://www.javascriptlint.com/download/jsl-0.3.0-src.tar.gz
+md5sum = 2b94ffa4fab07acabe0c5e73cd49bcdf
+script =
+  location = %(location)r
+  self.failIfPathExists(location)
+  import sys
+  url = self.options['url']
+  md5sum = self.options['md5sum']
+  extract_dir = self.extract(self.download(url, md5sum))
+  workdir = guessworkdir(extract_dir)
+  os.chdir(os.path.join(workdir, 'src'))
+  os.system('make -f Makefile.ref -j 1 DIST="%(location)s" all export')

component/kerberos/buildout.cfg

+[buildout]
+
+parts =
+    kerberos
+
+extends = 
+  ../../component/bison/buildout.cfg
+
+[kerberos-package]
+recipe = hexagonit.recipe.download
+url = http://web.mit.edu/kerberos/dist/krb5/1.11/krb5-1.11.1-signed.tar
+md5sum = 76c6bed945c5771674357cfd4a08e3f5
+
+[kerberos]
+recipe = hexagonit.recipe.cmmi
+url = ${kerberos-package:location}/krb5-1.11.1.tar.gz
+configure-command = src/configure
+configure-options =
+    --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
+
+environment =
+  PATH=${bison:location}/bin:%(PATH)s
\ No newline at end of file

component/kumo/buildout.cfg

@@ -30,6 +30,7 @@ md5sum = 46148e9536222d0ad2ef36777c55714d
 patches = ${kumo-ipv6-multiip-patch-download:location}/${kumo-ipv6-multiip-patch-download:filename}
 patch-options = -p1
 configure-options =
+  --enable-tcadb
   --with-tokyocabinet=${tokyocabinet:location}
   --with-msgpack=${messagepack:location}
 

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

component/leptonica/buildout.cfg

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

component/libaio/buildout.cfg

@@ -3,7 +3,7 @@ parts =
   libaio
 
 [libaio]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 # originally located at http://www.kernel.org/pub/linux/libs/aio/
 url = http://ftp.free.fr/mirrors/ftp.debian.org/pool/main/liba/libaio/libaio_0.3.109.orig.tar.gz
 md5sum = 435a5b16ca6198eaf01155263d855756

component/libdb/buildout.cfg

@@ -9,7 +9,7 @@ download-only=true
 filename = libdb-hooks.py
 
 [libdb]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://download.oracle.com/berkeley-db/db-4.5.20.tar.gz
 md5sum = b0f1c777708cb8e9d37fb47e7ed3312d
 pre-configure-hook = ${libdb-hooks-download:location}/${libdb-hooks-download:filename}:pre_configure_hook

component/libdmtx/buildout.cfg

@@ -6,22 +6,26 @@ extends =
   ../bzip2/buildout.cfg
   ../imagemagick/buildout.cfg
   ../jbigkit/buildout.cfg
+  ../libpng/buildout.cfg
   ../zlib/buildout.cfg
 parts =
   libdmtx
   dmtx-utils
 
 [libdmtx]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://prdownloads.sourceforge.net/libdmtx/libdmtx-0.7.4.tar.bz2
 md5sum = d3a4c0becd92895eb606dbdb78b023e2
 configure-options =
   --disable-static
 
 [dmtx-utils]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://prdownloads.sourceforge.net/libdmtx/dmtx-utils-0.7.4.tar.bz2
 md5sum = b132ab9fb1d289869469b8bb4959a08a
+depends =
+  ${libpng:so_version}
+  ${imagemagick:version}
 configure-options =
   --disable-static
 environment =

component/libevent/buildout.cfg

@@ -2,7 +2,7 @@
 parts = libevent
 
 [libevent]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.monkey.org/~provos/libevent-1.4.13-stable.tar.gz
 md5sum = 0b3ea18c634072d12b3c1ee734263664
 configure-options =

component/libexpat/buildout.cfg

@@ -3,8 +3,8 @@ parts =
   libexpat
 
 [libexpat]
-recipe = hexagonit.recipe.cmmi
-url = http://sourceforge.net/projects/expat/files/expat/2.1.0/expat-2.1.0.tar.gz/download
+recipe = slapos.recipe.cmmi
+url = http://downloads.sourceforge.net/project/expat/expat/2.1.0/expat-2.1.0.tar.gz
 md5sum = dd7dab7a5fea97d2a6a43f511449b7cd
 configure-options =
   --disable-static

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

component/libiconv/buildout.cfg

@@ -2,7 +2,19 @@
 parts =
   libiconv
 
+[libiconv.gets.patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+md5sum = 8a20d8afe0617fce56f77537d2b84621
+download-only = true
+filename = libiconv.gets.patch
+
 [libiconv]
-recipe = hexagonit.recipe.cmmi
+virtual-depends =
+  ${libiconv.gets.patch:md5sum}
+patch-options = -p1
+patches =
+  ${libiconv.gets.patch:location}/${libiconv.gets.patch:filename}
+recipe = slapos.recipe.cmmi
 url = http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.14.tar.gz
 md5sum = e34509b1623cec449dfeb73d7ce9c6c6

component/libiconv/libiconv.gets.patch

+--- libiconv-1.14.orig/srclib/stdio.in.h        2011-08-07 13:42:06.000000000 +0000
++++ libiconv-1.14/srclib/stdio.in.h     2013-01-09 19:56:21.115819812 +0000
+@@ -680,22 +680,7 @@
+ #endif
+ 
+ #if @GNULIB_GETS@
+-# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
+-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+-#   undef gets
+-#   define gets rpl_gets
+-#  endif
+-_GL_FUNCDECL_RPL (gets, char *, (char *s) _GL_ARG_NONNULL ((1)));
+-_GL_CXXALIAS_RPL (gets, char *, (char *s));
+-# else
+-_GL_CXXALIAS_SYS (gets, char *, (char *s));
+-#  undef gets
+-# endif
+-_GL_CXXALIASWARN (gets);
+-/* It is very rare that the developer ever has full control of stdin,
+-   so any use of gets warrants an unconditional warning.  Assume it is
+-   always declared, since it is required by C89.  */
+-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
++#undef gets
+ #endif