Merge master into grid-computing

CHANGES.txt

 Changes
 =======
 
+0.78.0 (2013-04-28)
+-------------------
+
+ * LAMP stack: Allow to give application-dependent parameters to application configuration file. [Cedric de Saint Martin]
+ * zabbix-agent: Allow user to pass zabbix parameter. [Cedric de Saint Martin]
+ * kvm frontend: listen to ipv6 and ipv4. [Jean-Baptiste Petre]
+
+0.77.1 (2013-04-18)
+-------------------
+
+ * Re-release of 0.77.0.
+
+0.77.0 (2013-04-18)
+-------------------
+
+ * Allow to pass extra parameters when creating simple wrapper. [Sebastien Robin]
+ * Apache frontend: Append all rewrite module options to http as well. [Cedric de Saint Martin]
+ * Apache frontend: Add https-only support. [Cedric de Saint Martin]
+ * Apache frontend: make logrotate work by using "generic" component. [Cedric de Saint Martin]
+
+0.76.0 (2013-04-03)
+-------------------
+
+ * Add 'generic' phpconfigure recipe, allowing to configure any PHP-based app. [Cedric de Saint Martin]
+ * apache_frontend: Have more useful access_log in apache frontend. [Cedric de Saint Martin]
+ * apache_frontend: Add "SSLProxyEngine On" to http apache frontend vhost to be able to proxy https -> http. [Cedric de Saint Martin]
+ * Add first preliminary version of nginx-based reverse proxy. [Cedric de Saint Martin]
+ * Request-optional is not verbose anymore (again) if it failed. [Cedric de Saint Martin]
+ * Add possibility to fetch web ip and port from apache recipe. [Cedric de Saint Martin]
+
+0.75.0 (2013-03-26)
+-------------------
+
+ * Add backward compatibility about Partition.getInstanceGuid() in request.py. [Cedric de Saint Martin]
+ * request.py: Don't crash if resource is not ready. [Cedric de Saint Martin]
+ * Use memory-based kumofs instead of memcached to have no limitation for key length and data size. [Kazuhiko Shiozaki]
+ * Postgres: allow slapuser# to connect as postgres user. [Marco Mariani]
+ * apache_frontend: Sanitize inputs, disable Varnish cache, don't touch to custom file if already present. [Cedric de Saint Martin]
+ * Resiliency: simpler, more robust PBS recipe and promise. [Marco Mariani]
+ * Add helper method to set "location" parameter in librecipe. [Cedric de Saint Martin]
+ * Add download helper function in librecipe. [Cedric de Saint Martin]
+ * Update wrapper recipe to make it simpler and more dev-friendly. [Cedric de Saint Martin]
+ * Add configurationfile recipe. [Cedric de Saint Martin]
+ * Add request-edge recipe. [Cedric de Saint Martin]
+ * Add publishsection recipe. [Cedric de Saint Martin]
+ * Add match support for promise check_page_content. [Cedric de Saint Martin]
+
+0.74.0 (2013-03-05)
+-------------------
+
+ * Generate mysql password randomly in LAMP stack. [Alain Takoudjou]
+ * Add support for apache and haproxy to have more than one listening port. [Vincent Pelletier]
+ * Use a more consistent parameter naming in 6tunnel recipe. [Vincent Pelletier]
+ * Provide an SR-transparent way to (de)serialise master data. [Vincent Pelletier]
+ * Initial version of neoppod recipe. [Vincent Pelletier]
+ * Initial version of clusterized erp5 recipes. [Vincent Pelletier]
+ * General cleanup of the request recipe (simpler parsing, less calls to master). [Vincent Pelletier, Cedric de Saint Martin]
+
+0.73.1 (2013-02-19)
+-------------------
+
+ * softwaretype recipe: all falsy parameter values are now ignored. [Cedric de Saint Martin]
+
+0.73.0 (2013-02-18)
+-------------------
+
+ * Add mioga and apacheperl recipes. [Viktor Horvath]
+ * request.py: Properly fetch instance_guid of instance. [Cedric de Saint Martin]
+ * request.py: Only append SLA parameter to the list if the key actually exists and is not empty string. [Cedric de Saint Martin]
+
 0.72.0 (2013-02-11)
 -------------------
 
@@ -109,13 +179,13 @@ Changes
     [Antoine Catton]
 
 0.64 (2012-08-27)
-----------------
+-----------------
 
   * Fix: remove "template" recipe which was collinding with slapos.recipe.template.
     [Antoine Catton]
 
 0.63 (2012-08-22)
-----------------
+-----------------
 
   * Add the ability to run command line in shellinabox. [Antoine Catton]
   * Add the ability to run shellinabox as root. (for LXC purpose) [Antoine Catton]
@@ -173,7 +243,7 @@ Changes
   * Add slapmonitor and slapreport recipes. [Mohamadou Mbengue]
 
 0.54.1 (2012-06-18)
------------------
+-------------------
 
   * Fix 0.54 release containing wrong code in request.py.
 
@@ -290,7 +360,7 @@ Changes
    [Cedric de Saint Martin]
 
 0.40.1 (2012-03-01)
------------------
+-------------------
 
  * Fix manifest to include files needed for apache. [Cedric de Saint Martin]
 
@@ -352,7 +422,7 @@ Changes
 -----------------
 
   * LAMP : Recipe can now call lampconfigure from slapos.toolbox which will
-   configure PHP application instance when needed. [Alain Takoudjou Kamdem]
+    configure PHP application instance when needed. [Alain Takoudjou Kamdem]
 
 0.31 (2011-10-16)
 -----------------
@@ -488,7 +558,7 @@ Changes
 -----------------
 
  * Add PHPMyAdmin software release used in SlapOS tutorials
- [Cedric de Saint Martin]
+   [Cedric de Saint Martin]
  * Add slaprunner software release [Cedric de Saint Martin]
 
 

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

@@ -8,7 +8,7 @@ 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 =

component/apache-php/buildout.cfg

@@ -15,32 +15,31 @@ 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
+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 +51,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 +62,29 @@ 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}
+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 +96,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
+recipe = slapos.recipe.cmmi
 url = http://sourceforge.net/projects/mcrypt/files/Libmcrypt/2.5.8/libmcrypt-2.5.8.tar.bz2/download
 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/buildout.cfg

@@ -21,19 +21,19 @@ md5sum = ffee70a111fd07372982b0550bbb14b7
 
 [apr-util]
 recipe = hexagonit.recipe.download
-version = 1.4.1
+version = 1.5.1
 url = http://mir2.ovh.net/ftp.apache.org/dist/apr/apr-util-${:version}.tar.bz2
-md5sum = 52b31b33fb1aa16e65ddaefc76e41151
+md5sum = 9c1db8606e520f201c451ec9a0b095f6
 
 [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
-revision = 2
+version = 2.4.4
+revision = 1
 url = http://mir2.ovh.net/ftp.apache.org/dist/httpd/httpd-${:version}.tar.bz2
-md5sum = 87aaf7bc7e8715f0455997bb8c6791aa
+md5sum = 0e712ee2119cd798c8ae39d5f11a9206
 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,7 +101,7 @@ md5sum = 4f074f035d3b37f3f3e71cd9616440f3
 
 [apache-antiloris]
 # Note: Shall react on each build of apache and reinstall itself
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://sourceforge.net/projects/mod-antiloris/files/mod_antiloris-0.4.tar.bz2/download
 md5sum = 66862bf10e9be3a023e475604a28a0b4
 patch-options = -p0
@@ -119,9 +119,9 @@ 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
+url = http://mir2.ovh.net/ftp.apache.org/dist//httpd/httpd-2.2.24.tar.gz
+md5sum = 64a3392018ad60583209a16d728180d3
 patch-options = -p1
 configure-options = --disable-static
                     --enable-authn-alias
@@ -179,7 +179,7 @@ environment =
 
 [apache-antiloris-apache-2.2]
 # Note: Shall react on each build of apache and reinstall itself
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://sourceforge.net/projects/mod-antiloris/files/mod_antiloris-0.4.tar.bz2/download
 md5sum = 66862bf10e9be3a023e475604a28a0b4
 configure-command = ${apache-2.2:location}/bin/apxs

component/aspell/buildout.cfg

@@ -3,7 +3,7 @@ parts =
   aspell
   aspell-en-dictonary
 
-extends = 
+extends =
   ../ncurses/buildout.cfg
 
 [aspell-common-dictionary]
@@ -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
+configure-command = ./configure --vars ASPELL=${aspell:location}/bin/aspell PREZIP=${aspell:location}/bin/prezip-bin
\ No newline at end of file
+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/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,7 +17,7 @@ filename = ${:_buildout_section_name_}
 download-only = true
 
 [ca-certificates]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 version = 20130119
 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

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/cloud9/buildout.cfg

@@ -51,7 +51,7 @@ md5sum = 5dc8cc28447ed3747b8a53c768d872aa
 # NODE_PATH=${:destination}/node_modules ${nodejs:node_location} ${:cloud9_js_location}
 recipe = plone.recipe.command
 stop-on-error = true
-commit = 9158bbf9e886e3b96e91239249aca66e420aa8d1
+commit = f7d102bc225c922f116d2cea52a746d64343ea59
 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};

component/cloudooo/buildout.cfg

@@ -15,14 +15,10 @@ 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
@@ -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.10.2.tar.gz
+md5sum = 097278785da7182ec0aea8769d06860c
+environment =
+  CMAKE_INCLUDE_PATH=${ncurses:location}/include
+  CMAKE_LIBRARY_PATH=${ncurses:location}/lib

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]
-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

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/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.30.0.tar.bz2
+md5sum = 0db5ec03a5001b42a2edc03bf63b5ceb
 configure-options =
   --disable-static
   --disable-ldap
@@ -27,10 +27,12 @@ configure-options =
   --disable-gopher
   --enable-ipv6
   --disable-sspi
+  --without-gnutls
   --with-ssl=${openssl:location}
   --with-zlib=${zlib:location}
   --without-nss
   --without-libssh2
+  --without-librtmp
   --without-libidn
 
 environment =

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

@@ -3,7 +3,7 @@
 parts = dash
 
 [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 =

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

@@ -9,7 +9,7 @@ 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

component/dropbear/buildout.cfg

@@ -40,7 +40,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.

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/fastjar/buildout.cfg

@@ -4,7 +4,7 @@ extends =
   ../zlib/buildout.cfg
 
 [fastjar]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://sourceforge.net/projects/fastjar/files/fastjar/0.94/fastjar-0.94.tar.gz/download
 md5sum = 14d4bdfac236e347d806c6743dba48c6
 environment =

component/ffmpeg/buildout.cfg

@@ -12,14 +12,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 =
@@ -29,7 +29,7 @@ environment =
   PKG_CONFIG_PATH=${libogg:location}/lib/pkgconfig
 
 [libtheora]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.bz2
 md5sum = 292ab65cedd5021d6b7ddd117e07cd8e
 configure-options =
@@ -39,11 +39,11 @@ environment =
   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 +52,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 +62,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 +70,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/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

@@ -22,8 +22,8 @@ depends =
   ${liberation-fonts:location}
   ${ipaex-fonts:location}
 
-x86 = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/11.0/linux-i686/fr/firefox-11.0.tar.bz2 a7e9c614ddac993476ef771afaedf568
-x86-64 = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/11.0/linux-x86_64/fr/firefox-11.0.tar.bz2 b358865c08145211314a62660e871614
+x86 = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/18.0.2/linux-i686/en-US/firefox-18.0.2.tar.bz2 9eb4dcf2e9578203a16da3c70817ccb2
+x86-64 = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/18.0.2/linux-x86_64/en-US/firefox-18.0.2.tar.bz2 29903172f6fd788f04dbeb27b9193fe6
 
 script =
   if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ')
@@ -34,9 +34,9 @@ script =
   wrapper = open(wrapper_location, 'w')
   wrapper.write("""#!${dash:location}/bin/dash
   cd %(location)s
-  export LD_LIBRARY_PATH=%(location)s:${libXrender: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/:${libpng:location}/lib/:${libSM:location}/lib/:${libICE:location}/lib:${libxml2:location}/lib:${openssl:location}/lib
+  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/:${libpng:location}/lib/:${libSM:location}/lib/:${libICE:location}/lib:${libxml2:location}/lib:${openssl:location}/lib
   export PATH=${fontconfig:location}/bin:$PATH
   exec %(location)s/firefox $*""")
   wrapper.close()
-  os.chmod(wrapper_location, 0777)
+  os.chmod(wrapper_location, 0755)
 

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,17 @@ 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.10.2.tar.bz2
+md5sum = 2f239690057d1438aa282e051f721d08
 # 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=${freetype:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig
   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,8 +14,8 @@ 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
@@ -23,8 +23,8 @@ destination = ${fonts:location}/${:_buildout_section_name_}
 [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://ossipedia.ipa.go.jp/ipafont/ipaexfont/IPAexfont00201.php
+md5sum = 7bf84182a04a9632268dbcb03f100d05
 destination = ${fonts:location}/${:_buildout_section_name_}
 
 [ipa-fonts]

component/freetype/buildout.cfg

@@ -10,9 +10,9 @@ 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.4.11.tar.bz2
+md5sum = b93435488942486c8d0ca22e8f768034
 configure-options =
   --disable-static
 environment =

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,7 +31,7 @@ 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
 md5sum = 5667111f53150618b0fa522ffc53fc3e
@@ -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,54 +74,11 @@ 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]
-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
-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
-  --disable-multilib
-  --with-gmp=${gmp:location}
-  --with-mpfr=${mpfr:location}
-  --with-mpc=${mpc:location}
-  --with-ecj-jar=${ecj:location}/${ecj:filename}
-  --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
-# 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
+recipe = slapos.recipe.cmmi
 path = ${gcc-source:location}
 md5sum = bb3265edf0fa7543e50cedb93e04e427
 patches =
@@ -145,11 +86,11 @@ patches =
 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
+# as slapos.recipe.cmmi is using shell expansion in subproceses
 # backticks are working
 configure-options =
   --disable-bootstrap
-  --enable-languages="c,c++,java"
+  --enable-languages="c,c++"
   --disable-multilib
   --with-gmp=${gmp:location}
   --with-mpfr=${mpfr:location}

component/gdbm/buildout.cfg

@@ -3,7 +3,7 @@ parts =
   gdbm
 
 [gdbm]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 version = 1.10
 url = ftp://ftp.gnu.org/gnu/gdbm/gdbm-${:version}.tar.gz
 md5sum = 88770493c2559dc80b561293e39d3570

component/gettext/buildout.cfg

@@ -6,22 +6,10 @@ 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.2.1.tar.gz
+md5sum = 034c8103b14654ebd300fadac44d6f14
 
 configure-options =
   --disable-static

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

@@ -8,14 +8,17 @@ extends =
 parts = ghostscript
 
 [ghostscript-common]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 depends =
   ${libtiff:version}
 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 =
@@ -29,5 +32,11 @@ environment =
 
 [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.07.tar.bz2
+md5sum = eea27befc1e85bef6d4768202f6b03a5
+
+[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,7 +3,7 @@ parts =
   giflib
 
 [giflib]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://prdownloads.sourceforge.net/giflib/giflib-4.2.0.tar.bz2?download
 md5sum = 711ad48551ee14db7c200b5f402df849
 configure-options =

component/git/buildout.cfg

@@ -11,7 +11,7 @@ parts =
   git
 
 [git]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://git-core.googlecode.com/files/git-1.7.12.tar.gz
 md5sum = ceb1a6b17a3e33bbc70eadf8fce5876c
 configure-options =

component/glib/buildout.cfg

@@ -4,7 +4,7 @@ extends =
   ../zlib/buildout.cfg
 
 [glib]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://ftp.gnome.org/pub/gnome/sources/glib/2.28/glib-2.28.8.tar.bz2
 md5sum = 789e7520f71c6a4bf08bc683ec764d24
 configure-options =

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 = 
+extends =
   ../readline/buildout.cfg
   ../ncurses/buildout.cfg
   ../zlib/buildout.cfg
@@ -7,12 +7,12 @@ extends =
 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 =
@@ -23,8 +23,8 @@ environment =
 
 [gnutls]
 # XXX-Cedric : update to latest gnutls
-recipe = hexagonit.recipe.cmmi
-url = ftp://ftp.gnupg.org/gcrypt/gnutls/v2.8/gnutls-2.8.6.tar.bz2
+recipe = slapos.recipe.cmmi
+url = ftp://ftp.gnutls.org/gcrypt/gnutls/v2.8/gnutls-2.8.6.tar.bz2
 md5sum = eb0a6d7d3cb9ac684d971c14f9f6d3ba
 configure-options =
   --with-libgcrypt-prefix=${gcrypt:location}

component/graphviz/buildout.cfg

@@ -13,7 +13,7 @@ extends =
   ../zlib/buildout.cfg
 
 [graphviz]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.28.0.tar.gz
 md5sum = 8d26c1171f30ca3b1dc1b429f7937e58
 configure-options =

component/grep/buildout.cfg

 [buildout]
 extends =
   ../pcre/buildout.cfg
+  ../xz-utils/buildout.cfg
 parts =
   grep
 
 [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.14.tar.xz
+md5sum = d4a3f03849d1e17ce56ab76aa5a24cab
 environment =
+  PATH=${xz-utils:location}/bin:%(PATH)s
   CPPFLAGS=-I${pcre:location}/include
   LDFLAGS=-L${pcre:location}/lib -Wl,-rpath=${pcre:location}/lib

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 = 3.0.3
+url = http://packages.groonga.org/source/groonga/groonga-${:version}.tar.gz
+md5sum = 19dbee5393b2f9c793c4caae5ba81bec
 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.3
+url = http://packages.groonga.org/source/groonga-normalizer-mysql/groonga-normalizer-mysql-${:version}.tar.gz
+md5sum = 3f266c608017eb1b2e24b6bac1801ab2
+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/gtk-2/buildout.cfg

@@ -15,11 +15,12 @@ parts =
   gtk-2
 
 [cairo]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://cairographics.org/releases/cairo-1.10.2.tar.gz
 md5sum = f101a9e88b783337b20b2e26dfd26d5f
 configure-options = 
   --enable-tee=yes
+  --enable-xlib=no
 environment = 
   PATH=${freetype:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXrender:location}/lib/pkgconfig
@@ -28,7 +29,7 @@ environment =
   LD_LIBRARY_PATH=${render:location}/lib:${libX11:location}/lib:${libXrender:location}/lib
 
 [pango]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://ftp.gnome.org/pub/gnome/sources/pango/1.29/pango-1.29.3.tar.bz2
 md5sum = be4e3891353fae6b62a6f8d7689c4266
 configure-options = 
@@ -36,13 +37,13 @@ configure-options =
 # XXX-Cedric : Why, god, why do I have to supply the -lXrender option to linker?
 environment = 
   PATH=${glib:location}/bin:${freetype:location}/bin:${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${cairo:location}/lib/pkgconfig::${libXrender:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${cairo:location}/lib/pkgconfig:${libXrender:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig
   CPPFLAGS=-I${cairo:location}/include/cairo -I${libX11:location}/include/X11 -I${libxcb:location}/include/xcb -I${libXau:location}/include/X11 -I${bzip2:location}/include -L${libXrender:location}/include -I${zlib:location}/include
   LDFLAGS=-L${cairo:location}/lib -Wl,-rpath=${cairo:location}/lib -L${libX11:location}/lib -Wl,-rpath=${libX11:location}/lib -L${libxcb:location}/lib -Wl,-rpath=${libxcb:location}/lib -L${libXau:location}/lib -Wl,-rpath=${libXau:location}/lib -L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${libXrender:location}/lib -Wl,-rpath=${libXrender:location}/lib -lXrender -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
   LD_LIBRARY_PATH=${render:location}/lib:${libX11:location}/lib:${libXrender:location}/lib
 
 [gdk-pixbuf]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.24/gdk-pixbuf-2.24.0.tar.bz2
 md5sum = d8ece3a4ade4a91c768328620e473ab8
 configure-options = 
@@ -56,7 +57,7 @@ environment =
   LD_LIBRARY_PATH=${glib:location}/lib:${gettext:location}/lib
   
 [atk]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://ftp.gnome.org/pub/gnome/sources/atk/2.0/atk-2.0.1.tar.bz2
 md5sum = 87f20b78deaedef858ac54358c0786b1
 environment = 
@@ -66,7 +67,7 @@ environment =
   LD_LIBRARY_PATH=${glib:location}/lib:${gettext:location}/lib
 
 [gtk-2]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-2.24.6.tar.bz2
 md5sum = 421100f6597e613234f8dead6091a9fe
 configure-options = 

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.5.tar.xz
+md5sum = 2a431e169b6f62f7332ef6d47cc53bae
+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.23.tar.gz
+md5sum = 6535d5e58037ada4b58b439cebe03c79
 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

@@ -13,9 +13,12 @@ extends =
   ../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 +30,11 @@ download-only = true
 filename = imagemagick-6.6.6-1-no-gsx-gsc-probe.patch
 
 [imagemagick]
-recipe = hexagonit.recipe.cmmi
-url = ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-6.8.1-10.tar.bz2
-md5sum = cde56988f9d2208d9d61815cc23665b4
+recipe = slapos.recipe.cmmi
+url = http://ftp.vim.org/ImageMagick/ImageMagick-6.8.2-6.tar.xz
+md5sum = ee01558201041a9978dd14b1db946ce8
 depends =
   ${libtiff:version}
-  ${librsvg:version}
 configure-options =
   --disable-static
   --without-x
@@ -49,22 +51,21 @@ configure-options =
   --without-lcms
   --without-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=${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${xz-utils:location}/lib/pkgconfig
+  CPPFLAGS=-I${bzip2:location}/include -I${zlib:location}/include -I${jbigkit:location}/include -I${libjpeg:location}/include -I${libtiff:location}/include -I${libpng:location}/include -I${jasper:location}/include -I${freetype:location}/include -I${webp:location}/include
+  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${jbigkit:location}/lib -Wl,-rpath=${jbigkit:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${libtiff:location}/lib -Wl,-rpath=${libtiff:location}/lib -L${libpng:location}/lib -Wl,-rpath=${libpng:location}/lib -L${jasper:location}/lib -Wl,-rpath=${jasper:location}/lib -L${freetype:location}/lib -Wl,-rpath=${freetype:location}/lib -L${webp:location}/lib -Wl,-rpath=${webp:location}/lib

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/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/leptonica/buildout.cfg

@@ -10,7 +10,7 @@ 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
 configure-command =

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

@@ -12,14 +12,14 @@ parts =
   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
 configure-options =

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,7 +3,7 @@ parts =
   libexpat
 
 [libexpat]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://sourceforge.net/projects/expat/files/expat/2.1.0/expat-2.1.0.tar.gz/download
 md5sum = dd7dab7a5fea97d2a6a43f511449b7cd
 configure-options =

component/libiconv/buildout.cfg

@@ -17,4 +17,4 @@ 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
+md5sum = e34509b1623cec449dfeb73d7ce9c6c6
\ No newline at end of file

component/libjpeg/buildout.cfg

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

component/libmemcached/buildout.cfg

@@ -17,7 +17,7 @@ url = http://launchpad.net/libmemcached/1.0/0.44/+download/libmemcached-0.44.tar
 md5sum = e6bd825c46fa080b550f90f9001cba8c
 
 [libmemcached-common]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 configure-options =
   --without-docs
   --without-memcached

component/libpng/buildout.cfg

 [buildout]
 extends =
+  ../xz-utils/buildout.cfg
   ../zlib/buildout.cfg
 
 parts =
@@ -7,10 +8,11 @@ parts =
   libpng
 
 [libpng-common]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 configure-options =
   --disable-static
 environment =
+  PATH=${xz-utils:location}/bin:%(PATH)s
   CPPFLAGS =-I${zlib:location}/include
   LDFLAGS =-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
 
@@ -21,5 +23,5 @@ md5sum = 717caa58e9c71a80820eb38c4f4d6ec3
 
 [libpng]
 <= libpng-common
-url = http://download.sourceforge.net/libpng/libpng-1.5.12.tar.bz2
-md5sum = d87f9c34ccab8242c00e41925839f6c9
+url = http://download.sourceforge.net/libpng/libpng-1.5.14.tar.xz
+md5sum = 94284b01d62ca43c5eb3f6702db08ed8

component/libreoffice-bin/buildout.cfg

@@ -12,15 +12,14 @@ find-links =
 [libreoffice-bin]
 recipe = slapos.recipe.build
 # here, two %s are used, first one is for directory name (eg. x86_64), and second one is for filename (eg. x86-64).
-version = 3.5.6
-#url = http://download.documentfoundation.org/libreoffice/stable/${:version}/rpm/%s/LibO_${:version}_Linux_%s_install-rpm_en-US.tar.gz
-url = http://ftp.psu.ac.th/pub/libreoffice/${:version}/rpm/%s/LibO_${:version}_Linux_%s_install-rpm_en-US.tar.gz
+version = 3.6.5
+url = http://download.documentfoundation.org/libreoffice/stable/${:version}/rpm/%s/LibO_${:version}_Linux_%s_install-rpm_en-US.tar.gz
 # supported architectures md5sums
-md5sum_x86 = 079609188b86ede3b3eebe2b75862b31
-md5sum_x86-64 = 6a559fa9c62c810464254d129bd2dc17
+md5sum_x86 = 9575c9a567d48a9feeaed2f915bfdf7f
+md5sum_x86-64 = 302e326f2b2a524a78994705ea782770
 
 # where office code can be found?
-officedir = libreoffice3.5
+officedir = libreoffice3.6
 
 # script to install
 script =

component/librsvg/buildout.cfg

 [buildout]
 parts = librsvg
-extends = 
+extends =
   ../bzip2/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../libxml2/buildout.cfg
   ../zlib/buildout.cfg
   ../gtk-2/buildout.cfg
   ../xorg/buildout.cfg
+  ../xz-utils/buildout.cfg
 
 [libcroco]
-recipe = hexagonit.recipe.cmmi
-url = http://ftp.gnome.org/pub/gnome/sources/libcroco/0.6/libcroco-0.6.3.tar.bz2
-md5sum = e1e93eeff4367c896f3959af34ba20eb
+recipe = slapos.recipe.cmmi
+url = http://ftp.gnome.org/pub/gnome/sources/libcroco/0.6/libcroco-0.6.8.tar.xz
+md5sum = 767e73c4174f75b99695d4530fd9bb80
 environment =
-  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PATH=${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${pkgconfig:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig
   LDFLAGS=-Wl,-rpath=${zlib:location}/lib
 
 [librsvg]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 version = 2.36.1
-url = http://www.nexedi.org/static/tarballs/librsvg/librsvg-${:version}.tar.gz
-md5sum = 699cb7124d319035346e69782baa7c36
-# The original source provided by gnome is tar.xz and it is not a supported compression
-# on hexagonit.recipe.cmmi neither by slapos.recipe.build, so keep alternative source
-# with tar.gz format as a temporary alternative for this.
-# url = http://ftp.acc.umu.se/pub/GNOME/sources/librsvg/2.36/librsvg-2.36.1.tar.xz
+url = http://ftp.gnome.org/pub/GNOME/sources/librsvg/2.36/librsvg-2.36.4.tar.xz
+md5sum = 3c94524c8ccf668e30b236f409239f54
 configure-options =
   --disable-static
   --disable-gtk-theme
@@ -34,7 +31,7 @@ configure-options =
   --disable-tools
   --disable-gtk-doc-html
   --enable-introspection=no
-environment = 
-  PATH=${gdk-pixbuf:location}/bin:${glib:location}/bin:${libxml2:location}/bin:${pkgconfig:location}/bin:${pango:location}/bin:%(PATH)s
+environment =
+  PATH=${gdk-pixbuf:location}/bin:${glib:location}/bin:${libxml2:location}/bin:${pkgconfig:location}/bin:${pango:location}/bin:${xz-utils:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${cairo:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${gdk-pixbuf:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libXrender:location}/lib/pkgconfig:${libcroco:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig:${pango:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig
   LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${zlib:location}/lib

component/librsync/buildout.cfg

@@ -7,7 +7,7 @@ parts =
   librsync
 
 [librsync]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://downloads.sourceforge.net/sourceforge/librsync/librsync-0.9.7.tar.gz
 md5sum = 24cdb6b78f45e0e83766903fd4f6bc84
 configure-options =

component/libtiff/buildout.cfg

@@ -8,7 +8,7 @@ parts =
   libtiff
 
 [libtiff]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 version = 4.0.3
 url = http://www.imagemagick.org/download/delegates/tiff-${:version}.tar.gz
 md5sum = 051c1068e6a0627f461948c365290410

component/libtool/buildout.cfg

@@ -2,7 +2,7 @@
 parts = libtool
 
 [libtool]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 md5sum = d2f3b7d4627e69e13514a40e72a24d50
 url = http://ftp.gnu.org/gnu/libtool/libtool-2.4.2.tar.gz
 configure-options =

component/libuuid/buildout.cfg

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

component/libxml2/buildout.cfg

@@ -7,9 +7,9 @@ parts =
   libxml2
 
 [libxml2]
-recipe = hexagonit.recipe.cmmi
-url = ftp://ftp.xmlsoft.org/libxml2/libxml2-2.8.0.tar.gz
-md5sum = c62106f02ee00b6437f0fb9d370c1093
+recipe = slapos.recipe.cmmi
+url = ftp://ftp.xmlsoft.org/libxml2/libxml2-2.9.1.tar.gz
+md5sum = 9c0cfef285d5c4a5c80d00904ddab380
 configure-options =
   --disable-static
   --without-python

component/libxslt/buildout.cfg

 [buildout]
 extends =
   ../libxml2/buildout.cfg
-  ../pkgconfig/buildout.cfg
   ../zlib/buildout.cfg
 
 parts =
   libxslt
 
 [libxslt]
-url = ftp://xmlsoft.org/libxslt/libxslt-1.1.26.tar.gz
-md5sum = e61d0364a30146aaa3001296f853b2b9
-recipe = hexagonit.recipe.cmmi
+url = ftp://xmlsoft.org/libxslt/libxslt-1.1.28.tar.gz
+md5sum = 9667bf6f9310b957254fdcf6596600b7
+recipe = slapos.recipe.cmmi
 configure-options =
   --disable-static
   --with-libxml-prefix=${libxml2:location}
@@ -19,7 +18,5 @@ configure-options =
   --without-debug
   --without-debugger
 environment =
-  PATH=${pkgconfig:location}/bin:%(PATH)s
-  CPPFLAGS=-I${zlib:location}/include
-  LDFLAGS=-Wl,-rpath=${zlib:location}/lib
-  PKG_CONFIG_PATH=${libxml2:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig
+  CPPFLAGS=-I${zlib:location}/include -I${libxml2:location}/include 
+  LDFLAGS=-L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib

component/libyaml/buildout.cfg

@@ -4,6 +4,6 @@ parts =
   libyaml
 
 [libyaml]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://pyyaml.org/download/libyaml/yaml-0.1.4.tar.gz
 md5sum = 36c852831d02cf90508c29852361d01b

component/logrotate/buildout.cfg

@@ -11,7 +11,7 @@ md5sum = 6beac248c978b767d4bccc1b7eebe6bd
 filename = ${:_buildout_section_name_}
 
 [logrotate]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = https://fedorahosted.org/releases/l/o/logrotate/logrotate-3.7.9.tar.gz
 md5sum = eeba9dbca62a9210236f4b83195e4ea5
 patch-options = -p1

component/lxc/buildout.cfg

@@ -32,7 +32,7 @@ download-only = true
 md5sum = 8d3706a9bd60b6ebfea33998644b1a99
 
 [lxc-0.8]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://lxc.sourceforge.net/download/lxc/lxc-0.8.0-rc2.tar.gz
 md5sum = 9bd6988542fd7dd198d056ef3a2db9f6
 patch-binary = ${patch:location}/bin/patch

component/lynx/buildout.cfg

@@ -2,6 +2,6 @@
 parts = lynx
 
 [lynx]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 md5sum = 124253e635f7c76bdffc47b9d036c812
 url = http://lynx.isc.org/lynx2.8.7/lynx2.8.7.tar.gz

component/m4/buildout.cfg

@@ -15,6 +15,6 @@ patch-options = -p1
 patches =
   ${m4-drop.gets.patch:location}/${m4-drop.gets.patch:filename}
 
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://ftp.gnu.org/gnu/m4/m4-1.4.16.tar.bz2
 md5sum = 8a7cef47fecab6272eb86a6be6363b2f

component/mariadb/buildout.cfg

@@ -24,11 +24,11 @@ filename = mariadb_5.5_create_system_tables__no_test.patch
 download-only = true
 
 [mariadb]
-recipe = hexagonit.recipe.cmmi
-version = 5.5.28a
+recipe = slapos.recipe.cmmi
+version = 5.5.30
 revision = 1
 url = http://downloads.askmonty.org/f/mariadb-${:version}/kvm-tarbake-jaunty-x86/mariadb-${:version}.tar.gz/from/http://ftp.osuosl.org/pub/mariadb
-md5sum = a2d20a040ef1e49944a4ffe65ed7fefa
+md5sum = 39d4da4dabc8bda012517b3587dee6f8
 # compile directory is required to build mysql plugins.
 keep-compile-dir = true
 patch-options = -p0
@@ -61,19 +61,18 @@ environment =
 [mroonga-mariadb]
 # mroonga - a storage engine for MySQL. It provides fast fulltext search feature to all MySQL users.
 # http://mroonga.github.com/
-recipe = hexagonit.recipe.cmmi
-url = https://github.com/downloads/mroonga/mroonga/mroonga-2.06.tar.gz
-md5sum = 89ce640a57ed8f2161b8358ff4c29c66
+recipe = slapos.recipe.cmmi
+url = http://packages.groonga.org/source/mroonga/mroonga-3.03.tar.gz
+md5sum = daa1547259145b05b4cdee6b513bf8c8
 configure-options =
   --with-mysql-source=${mariadb:location}__compile__/mariadb-${mariadb:version}
   --with-mysql-config=${mariadb:location}/bin/mysql_config
 depends =
   ${mariadb:version}
   ${mariadb:revision}
+  ${groonga-normalizer-mysql:version}
 environment =
   PATH=${groonga:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   CPPFLAGS=-I${groonga:location}/include/groonga
   LDFLAGS=-L${groonga:location}/lib
-  PKG_CONFIG_PATH=${groonga:location}/lib/pkgconfig
-  CXXFLAGS=-Wno-deprecated
-# CXXFLAGS workaround: avoid depracation warning in order to compile on gcc 4.7+
+  PKG_CONFIG_PATH=${groonga:location}/lib/pkgconfig:${groonga-normalizer-mysql:location}/lib/pkgconfig

component/membase/buildout.cfg

@@ -34,7 +34,7 @@ recipe = hexagonit.recipe.download
 strip-top-level-dir = true
 
 [membase-component-common]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 path = ${membase-source:location}/${:component}
 prefix = ${membase:location}
 configure-options =

component/memcached/buildout.cfg

@@ -20,7 +20,7 @@ download-only = true
 md5sum = fd98d0cbfc4d3a25ac9808472fbe62f8
 
 [memcached]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://memcached.googlecode.com/files/memcached-1.4.8.tar.gz
 md5sum = b7104e269511621c2777367d6d6315fe
 patches =

component/memstrike/buildout.cfg

@@ -10,7 +10,7 @@ parts =
   memstrike
 
 [memstrike]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 path = ${memstrikesource:location}
 configure-command =
   ./bootstrap

component/mesa/buildout.cfg

@@ -7,7 +7,7 @@ parts =
 
 [libdrm]
 #does not seem to compile with -jX
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://dri.freedesktop.org/libdrm/libdrm-2.4.26.tar.bz2
 md5sum = 062569426773f69b11a47a7712bba770
 configure-options = 
@@ -18,7 +18,7 @@ environment =
 
 
 [mesa]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = ftp://ftp.freedesktop.org//pub/mesa/7.11/MesaLib-7.11.tar.bz2
 md5sum = ff03aca82d0560009a076a87c888cf13
 configure-options = 

component/mydumper/buildout.cfg

@@ -59,10 +59,10 @@ script =
     call(['make'], cwd=workdir, env=env)
     call(['make', 'install'], cwd=workdir, env=env)
 
-# XXX-Antoine: here's what I did using hexagonit.recipe.cmmi.
+# XXX-Antoine: here's what I did using slapos.recipe.cmmi.
 # and it wasn't working !
 #[mydumper]
-#recipe = hexagonit.recipe.cmmi
+#recipe = slapos.recipe.cmmi
 #url = http://launchpad.net/mydumper/0.2/0.2.3/+download/mydumper-0.2.3.tar.gz
 #md5sum = 36e6a1c97a9634a6882ddaac5e2697d5
 #strip-top-level-dir = true

component/mysql-5.1/buildout.cfg

@@ -29,7 +29,7 @@ filename = mysql_create_system_tables__no_test.patch
 download-only = true
 
 [mysql-5.1]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 version = 5.1.58
 url = http://mysql.he.net/Downloads/MySQL-5.1/mysql-${:version}.tar.gz
 md5sum = ae5aef506088e521e4b1cc4f668e96d2
@@ -74,7 +74,7 @@ environment =
   LDFLAGS =-L${readline:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${readline:location}/lib
 
 [groonga-storage-engine-mysql-5.1]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://github.com/downloads/mroonga/mroonga/groonga-storage-engine-1.0.0.tar.gz
 md5sum = 289b8b7919e790599ea79b6fe9270e04
 configure-options =

component/mysql-5.5/buildout.cfg

@@ -32,7 +32,7 @@ filename = mysql_create_system_tables__no_test.patch
 download-only = true
 
 [mysql-5.5]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 version = 5.5.16
 url = http://mysql.he.net/Downloads/MySQL-5.5/mysql-${:version}.tar.gz
 md5sum = 462ab3752dd666ec06ca32f92673b59e
@@ -63,7 +63,7 @@ environment =
   LDFLAGS=-L${libaio:location}/lib
 
 [groonga-storage-engine-mysql-5.5]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://github.com/downloads/mroonga/mroonga/groonga-storage-engine-1.0.0.tar.gz
 md5sum = 289b8b7919e790599ea79b6fe9270e04
 configure-options =

component/mysql-tritonn-5.0/buildout.cfg

@@ -18,7 +18,7 @@ parts =
     mysql-tritonn-5.0
 
 [senna]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.nexedi.org/static/tarballs/senna/senna-r1311.tar.gz
 md5sum = 1cc51554789f81a9e5208da04a5c2f4c
 configure-command =
@@ -50,7 +50,7 @@ filename = mysql-5.0.87-sphinx-1.10.diff
 download-only = true
 
 [mysql-tritonn-5.0]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.nexedi.org/static/tarballs/mysql/mysql-5.0.87.tar.gz
 md5sum = 65e6229cc98b6a8d4c5206d7fe16c7be
 # configure: how to avoid searching for my.cnf?