From 7bb058a0009dfdc430f96ed3eacf7fb8aa8bb508 Mon Sep 17 00:00:00 2001
From: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date: Mon, 7 Sep 2015 17:24:32 +0200
Subject: [PATCH] use slapos.recipe.build:download instead of deprecated
 slapos.recipe.download.

---
 component/boinc-client/buildout.cfg                 | 4 ++--
 software/ajaxplorer/software.cfg                    | 3 +--
 software/boinc-client/software.cfg                  | 1 -
 software/boinc/software.cfg                         | 2 +-
 software/bonjourgrid/software.cfg                   | 6 +++---
 software/etherpad-lite/common.cfg                   | 4 ++--
 software/html5as/software.cfg                       | 8 ++++----
 software/kvm/software.cfg                           | 1 -
 software/lamp-template/software.cfg                 | 2 +-
 software/slapos-in-partition/common.cfg             | 4 ++--
 software/slapos-in-partition/software.cfg           | 1 -
 software/slaprunner/common.cfg                      | 4 ++--
 software/slaprunner/software.cfg                    | 1 -
 software/unstable/MediaWiki/software.cfg            | 3 +--
 software/unstable/b2evolution/software.cfg          | 1 -
 software/unstable/cmsmadesimple/software.cfg        | 1 -
 software/unstable/condor/software.cfg               | 7 +++----
 software/unstable/coppermine/software.cfg           | 3 +--
 software/unstable/dokuwiki/software.cfg             | 2 +-
 software/unstable/dotclear/software.cfg             | 3 +--
 software/unstable/dotproject/software.cfg           | 3 +--
 software/unstable/drupal/software.cfg               | 2 +-
 software/unstable/eSKUeL/software.cfg               | 1 -
 software/unstable/ezpublish/software.cfg            | 1 -
 software/unstable/fengoffice/software.cfg           | 2 +-
 software/unstable/fluxbb/software.cfg               | 2 +-
 software/unstable/glpi/software.cfg                 | 2 +-
 software/unstable/hexaglobe-watermarking/common.cfg | 4 ++--
 software/unstable/joomla/software.cfg               | 2 +-
 software/unstable/lifetype/software.cfg             | 2 +-
 software/unstable/magento/software.cfg              | 1 -
 software/unstable/net2ftp/software.cfg              | 5 ++---
 software/unstable/openX/software.cfg                | 1 -
 software/unstable/opengoo/software.cfg              | 2 +-
 software/unstable/os-commerce/software.cfg          | 1 -
 software/unstable/phpbb/software.cfg                | 1 -
 software/unstable/phpbms/software.cfg               | 4 ++--
 software/unstable/phpfin/software.cfg               | 2 +-
 software/unstable/phpip/software.cfg                | 2 +-
 software/unstable/phpmyadmin/software.cfg           | 3 +--
 software/unstable/phpnuke/software.cfg              | 3 +--
 software/unstable/pimcore/software.cfg              | 1 -
 software/unstable/piwigo/software.cfg               | 3 +--
 software/unstable/piwik/software.cfg                | 1 -
 software/unstable/pixelpost/software.cfg            | 2 +-
 software/unstable/prestashop/software.cfg           | 1 -
 software/unstable/proactive/software.cfg            | 2 +-
 software/unstable/punbb/software.cfg                | 3 +--
 software/unstable/simpleMachineForum/software.cfg   | 1 -
 software/unstable/spip/software.cfg                 | 1 -
 software/unstable/statusnet/software.cfg            | 1 -
 software/unstable/sugar-crm/software.cfg            | 1 -
 software/unstable/tiki/software.cfg                 | 1 -
 software/unstable/trac-svn/software.cfg             | 3 +--
 software/unstable/tt-rss/software.cfg               | 6 +++---
 software/unstable/xellplan/software.cfg             | 2 +-
 software/unstable/xoops/software.cfg                | 1 -
 software/unstable/zencart/software.cfg              | 3 +--
 software/unstable/zikula/software.cfg               | 2 +-
 software/wordpress/software.cfg                     | 2 +-
 stack/boinc/buildout.cfg                            | 3 +--
 stack/lamp.cfg                                      | 1 -
 stack/lamp/buildout.cfg                             | 1 -
 stack/lapp/buildout.cfg                             | 1 -
 stack/resilient/buildout.cfg                        | 6 +++---
 65 files changed, 59 insertions(+), 97 deletions(-)

diff --git a/component/boinc-client/buildout.cfg b/component/boinc-client/buildout.cfg
index 0c0c50469..89ec5921c 100644
--- a/component/boinc-client/buildout.cfg
+++ b/component/boinc-client/buildout.cfg
@@ -17,7 +17,7 @@ extends =
   ../../stack/slapos.cfg
 
 [download-boinc]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build: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_}
@@ -36,7 +36,7 @@ ld_library = ${curl:location}/lib:${openssl:location}/lib:${zlib:location}/lib
 location = ${buildout:parts-directory}/BOINC
 
 [boinc-patch]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/boinc-abs-path.patch
 md5sum = 412acedfbcdc8a9a7f196a02465da248
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
diff --git a/software/ajaxplorer/software.cfg b/software/ajaxplorer/software.cfg
index c2a8ea4f6..4f4df2ccf 100644
--- a/software/ajaxplorer/software.cfg
+++ b/software/ajaxplorer/software.cfg
@@ -73,7 +73,7 @@ md5sum = c5695762361b801c284ee23a150cd1f1
 mode = 0644
 
 [template-httpd-conf]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/templates/${:filename}
 mode = 0644
 filename = apache.conf.in
@@ -86,6 +86,5 @@ numpy = 1.6.2
 # websockify 0.4.1 doesn't install well
 websockify = 0.3.0
 plone.recipe.command = 1.1
-slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.4.2
 z3c.recipe.mkdir = 0.5
diff --git a/software/boinc-client/software.cfg b/software/boinc-client/software.cfg
index 85bbeeb4e..2df0226bd 100644
--- a/software/boinc-client/software.cfg
+++ b/software/boinc-client/software.cfg
@@ -28,5 +28,4 @@ mode = 0644
 
 [versions]
 plone.recipe.command = 1.1
-slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.4.2
diff --git a/software/boinc/software.cfg b/software/boinc/software.cfg
index 4fca2f119..4efe303b2 100644
--- a/software/boinc/software.cfg
+++ b/software/boinc/software.cfg
@@ -32,7 +32,7 @@ app-name = upper_case
 version = 1.00
 
 [template-base]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 download-only = true
 mode = 0644
 
diff --git a/software/bonjourgrid/software.cfg b/software/bonjourgrid/software.cfg
index 6a3dfb91b..b16e9fb9d 100644
--- a/software/bonjourgrid/software.cfg
+++ b/software/bonjourgrid/software.cfg
@@ -78,7 +78,7 @@ app-name = upper_case
 version = 1.00
 
 [template-base]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 download-only = true
 mode = 0644
 
@@ -124,7 +124,7 @@ md5sum = 42985a425369e4f93211cfaad21d8eb8
 mode = 0644
 
 [description-file]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 mode = 0644
 url = ${:_profile_base_location_}/condor_job/submit
 filename = submit
@@ -132,7 +132,7 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
 md5sum = 8180d88348b89b55216f8dd4475a9eea
 
 [executable]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 mode = 0774
 url = ${:_profile_base_location_}/condor_job/simple
 filename = simple
diff --git a/software/etherpad-lite/common.cfg b/software/etherpad-lite/common.cfg
index c59bad0dd..2923ca54d 100644
--- a/software/etherpad-lite/common.cfg
+++ b/software/etherpad-lite/common.cfg
@@ -63,7 +63,7 @@ output = ${buildout:directory}/template-etherpad-lite.cfg
 mode = 0644
 
 [template-conf]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/templates/${:filename}
 mode = 0644
 filename = settings.json.in
@@ -71,7 +71,7 @@ md5sum = 19ab39e6b3256c82fd54ce074488b136
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 
 [template-run-script]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/templates/${:filename}
 mode = 0644
 filename = run.sh.in
diff --git a/software/html5as/software.cfg b/software/html5as/software.cfg
index 1d90f1146..98c2bf051 100644
--- a/software/html5as/software.cfg
+++ b/software/html5as/software.cfg
@@ -35,7 +35,7 @@ md5sum = 41cb6178f760238ca276854873ef9364
 mode = 0644
 
 [template_nginx_conf]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/templates/nginx_conf.in
 md5sum = 61dc4c82bf48563228ce4dea6c5c6319
 filename = nginx_conf.in
@@ -43,7 +43,7 @@ mode = 0644
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 
 [template_launcher]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/templates/launcher.in
 md5sum = acf5bb55ceac2e826259d28ed5c1de3a
 filename = launcher.in
@@ -51,7 +51,7 @@ mode = 0644
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 
 [template_downloader]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/templates/downloader.in
 md5sum = 9779e2db6c73d282f802b3407b390ede
 filename = downloader.in
@@ -59,7 +59,7 @@ mode = 0644
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 
 [template_mime_types]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/templates/mime_types.in
 md5sum = 4ef94a7b458d885cd79ba0b930a5727e
 filename = mime_types.in
diff --git a/software/kvm/software.cfg b/software/kvm/software.cfg
index b702f3adb..aaf667ae1 100644
--- a/software/kvm/software.cfg
+++ b/software/kvm/software.cfg
@@ -13,7 +13,6 @@ ecdsa = 0.13
 gitdb = 0.6.4
 plone.recipe.command = 1.1
 pycrypto = 2.6.1
-slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.7
 smmap = 0.9.0
 erp5.util = 0.4.43
diff --git a/software/lamp-template/software.cfg b/software/lamp-template/software.cfg
index c15070855..b1917fc47 100644
--- a/software/lamp-template/software.cfg
+++ b/software/lamp-template/software.cfg
@@ -12,7 +12,7 @@ md5sum = Student may put here md5sum of this file, this is good idea
 strip-top-level-dir = true
 
 [application-template]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/template/REPLACE_ME_BY_APPLICATION_TEMPLATE_NAME
 #md5sum = Student may put here md5sum of this file, this is good idea
 filename = template.in
diff --git a/software/slapos-in-partition/common.cfg b/software/slapos-in-partition/common.cfg
index 2455d4648..1e7e556fa 100644
--- a/software/slapos-in-partition/common.cfg
+++ b/software/slapos-in-partition/common.cfg
@@ -52,7 +52,7 @@ context =
 
 [slapos-configuration-file-template]
 # Download the template of slapos.cfg
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/template/slapos.cfg.in
 #md5sum = 
 target = ${buildout:directory}/slapos.cfg.in
@@ -61,7 +61,7 @@ mode = 0644
 
 [httpd-configuration-file-template]
 # Download the template of httpd.conf
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/template/httpd.conf.in
 mode = 0644
 #md5sum = 
diff --git a/software/slapos-in-partition/software.cfg b/software/slapos-in-partition/software.cfg
index 6c794aa18..73e0ab6ef 100644
--- a/software/slapos-in-partition/software.cfg
+++ b/software/slapos-in-partition/software.cfg
@@ -11,5 +11,4 @@ extends = common.cfg
 Pygments = 1.6
 collective.recipe.environment = 0.2.0
 collective.recipe.template = 1.10
-slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.7
diff --git a/software/slaprunner/common.cfg b/software/slaprunner/common.cfg
index 8906773d6..8485ec605 100644
--- a/software/slaprunner/common.cfg
+++ b/software/slaprunner/common.cfg
@@ -88,7 +88,7 @@ md5sum = 994e355d713f90bcc17e4b54da65f354
 mode = 0644
 
 [template-resilient]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/instance-resilient.cfg.jinja2
 md5sum = aa9a99235571729ab93360c4712efa12
 filename = instance-resilient.cfg.jinja2
@@ -119,7 +119,7 @@ filename = httpd_conf.in
 mode = 0644
 
 [template_launcher]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/launcher.in
 md5sum = 525e37ea8b2acf6209869999b15071a6
 filename = launcher.in
diff --git a/software/slaprunner/software.cfg b/software/slaprunner/software.cfg
index 82b9a5457..440c2a2a6 100644
--- a/software/slaprunner/software.cfg
+++ b/software/slaprunner/software.cfg
@@ -20,7 +20,6 @@ gunicorn = 19.3.0
 plone.recipe.command = 1.1
 prettytable = 0.7.2
 pycrypto = 2.6.1
-slapos.recipe.download = 1.0.dev-r3447
 slapos.recipe.template = 2.8
 slapos.toolbox = 0.52
 smmap = 0.9.0
diff --git a/software/unstable/MediaWiki/software.cfg b/software/unstable/MediaWiki/software.cfg
index c3a375321..4e90c6eca 100644
--- a/software/unstable/MediaWiki/software.cfg
+++ b/software/unstable/MediaWiki/software.cfg
@@ -16,7 +16,7 @@ extends =
   ../../stack/lamp.cfg
 
 [mediawiki-patch]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/patch/mediawiki-1.17.0.config.patch
 md5sum = fd606666ac9fc54cb84cda8cf08edef4
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
@@ -62,7 +62,6 @@ meld3 = 0.6.7
 plone.recipe.command = 1.1
 slapos.cookbook = 0.34
 slapos.recipe.build = 0.7
-slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.2
 slapos.toolbox = 0.10
 
diff --git a/software/unstable/b2evolution/software.cfg b/software/unstable/b2evolution/software.cfg
index 4f2481de2..474c59fc9 100644
--- a/software/unstable/b2evolution/software.cfg
+++ b/software/unstable/b2evolution/software.cfg
@@ -47,7 +47,6 @@ meld3 = 0.6.7
 plone.recipe.command = 1.1
 slapos.cookbook = 0.34
 slapos.recipe.build = 0.7
-slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.2
 slapos.toolbox = 0.10
 
diff --git a/software/unstable/cmsmadesimple/software.cfg b/software/unstable/cmsmadesimple/software.cfg
index cf9c61a57..26daf0545 100644
--- a/software/unstable/cmsmadesimple/software.cfg
+++ b/software/unstable/cmsmadesimple/software.cfg
@@ -46,7 +46,6 @@ meld3 = 0.6.7
 plone.recipe.command = 1.1
 slapos.cookbook = 0.34
 slapos.recipe.build = 0.7
-slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.2
 slapos.toolbox = 0.10
 
diff --git a/software/unstable/condor/software.cfg b/software/unstable/condor/software.cfg
index adad10dc0..820b4ce9b 100644
--- a/software/unstable/condor/software.cfg
+++ b/software/unstable/condor/software.cfg
@@ -27,7 +27,7 @@ md5sum = 42985a425369e4f93211cfaad21d8eb8
 mode = 0644
 
 [description-file]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 mode = 0644
 url = ${:_profile_base_location_}/template/submit
 filename = submit
@@ -35,7 +35,7 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
 md5sum = 8180d88348b89b55216f8dd4475a9eea
 
 [executable]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 mode = 0774
 url = ${:_profile_base_location_}/template/simple
 filename = simple
@@ -60,7 +60,6 @@ pytz = 2013b
 slapos.core = 0.35.1
 slapos.recipe.build = 0.11.6
 slapos.recipe.cmmi = 0.1.1
-slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.4.2
 xml-marshaller = 0.9.7
 slapos.cookbook=0.78.1
@@ -91,4 +90,4 @@ unittest2 = 0.5.1
 
 # Required by:
 # slapos.core==0.35.1
-zope.interface = 4.0.5
\ No newline at end of file
+zope.interface = 4.0.5
diff --git a/software/unstable/coppermine/software.cfg b/software/unstable/coppermine/software.cfg
index a33087bcd..f5cd70050 100644
--- a/software/unstable/coppermine/software.cfg
+++ b/software/unstable/coppermine/software.cfg
@@ -18,7 +18,7 @@ url = http://freefr.dl.sourceforge.net/project/coppermine/Coppermine/1.5.x/cpg1.
 md5sum = 76402aea7821aaaf67c571869373186e
 
 [application-template]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/template/coppermine.inc.php.in
 md5sum = c97345b7f3c060b825e1925e2be3c2c1
 filename = template.in
@@ -57,7 +57,6 @@ meld3 = 0.6.7
 plone.recipe.command = 1.1
 slapos.cookbook = 0.34
 slapos.recipe.build = 0.7
-slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.2
 slapos.toolbox = 0.10
 
diff --git a/software/unstable/dokuwiki/software.cfg b/software/unstable/dokuwiki/software.cfg
index eba6e3a3b..837b402ad 100644
--- a/software/unstable/dokuwiki/software.cfg
+++ b/software/unstable/dokuwiki/software.cfg
@@ -12,7 +12,7 @@ md5sum = a910ebb2fcca13c0337ed672304c4ad4
 strip-top-level-dir = true
   
 [application-template]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/mysql.conf.php.in
 md5sum = 11c6793aa8c5bf7151886d1670796a22
 download-only = True
diff --git a/software/unstable/dotclear/software.cfg b/software/unstable/dotclear/software.cfg
index 54535a7dc..4c2daf0ce 100644
--- a/software/unstable/dotclear/software.cfg
+++ b/software/unstable/dotclear/software.cfg
@@ -18,7 +18,7 @@ url = http://download.dotclear.net/latest-2.0.tar.gz
 md5sum = 4ca12cbd12228ceee0b7c0f697e1ff09
 
 [application-template]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/template/dotclear.inc.php.in
 md5sum = c97345b7f3c060b825e1925e2be3c2c1
 filename = template.in
@@ -57,7 +57,6 @@ meld3 = 0.6.7
 plone.recipe.command = 1.1
 slapos.cookbook = 0.34
 slapos.recipe.build = 0.7
-slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.2
 slapos.toolbox = 0.10
 
diff --git a/software/unstable/dotproject/software.cfg b/software/unstable/dotproject/software.cfg
index 8eeeed6ed..abb11a963 100644
--- a/software/unstable/dotproject/software.cfg
+++ b/software/unstable/dotproject/software.cfg
@@ -18,7 +18,7 @@ url = http://downloads.sourceforge.net/project/dotproject/dotproject/dotProject%
 md5sum = d283fad3fc541e7ffda07151efc64bf8
 
 [application-template]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/template/config.inc.php.in
 md5sum = b78545a6928978c5990021ac68e26be0
 filename = template.in
@@ -57,7 +57,6 @@ meld3 = 0.6.7
 plone.recipe.command = 1.1
 slapos.cookbook = 0.34
 slapos.recipe.build = 0.7
-slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.2
 slapos.toolbox = 0.10
 
diff --git a/software/unstable/drupal/software.cfg b/software/unstable/drupal/software.cfg
index ac4e60da5..f4b08620c 100644
--- a/software/unstable/drupal/software.cfg
+++ b/software/unstable/drupal/software.cfg
@@ -24,7 +24,7 @@ recipe = cp.recipe.cmd
 install_cmd = patch ${application:location}/modules/system/system.theme.css <${download-patch-hide-dbsetup:location}/${download-patch-hide-dbsetup:filename}
 
 [application-template]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/settings.php.in
 md5sum = b0ef5548c3ac1de8ca56882e51e6eb6d
 download-only = True
diff --git a/software/unstable/eSKUeL/software.cfg b/software/unstable/eSKUeL/software.cfg
index 2d253f486..5e467d3c0 100644
--- a/software/unstable/eSKUeL/software.cfg
+++ b/software/unstable/eSKUeL/software.cfg
@@ -46,7 +46,6 @@ meld3 = 0.6.7
 plone.recipe.command = 1.1
 slapos.cookbook = 0.34
 slapos.recipe.build = 0.7
-slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.2
 slapos.toolbox = 0.10
 
diff --git a/software/unstable/ezpublish/software.cfg b/software/unstable/ezpublish/software.cfg
index 689a26af2..10e20f04a 100644
--- a/software/unstable/ezpublish/software.cfg
+++ b/software/unstable/ezpublish/software.cfg
@@ -46,7 +46,6 @@ meld3 = 0.6.7
 plone.recipe.command = 1.1
 slapos.cookbook = 0.34
 slapos.recipe.build = 0.7
-slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.2
 slapos.toolbox = 0.10
 
diff --git a/software/unstable/fengoffice/software.cfg b/software/unstable/fengoffice/software.cfg
index b0b49fed4..34770f649 100644
--- a/software/unstable/fengoffice/software.cfg
+++ b/software/unstable/fengoffice/software.cfg
@@ -11,7 +11,7 @@ md5sum = f3b15616e1111f0114b084cdaa0dc3cd
 strip-top-level-dir = false
 
 [application-template]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/config-form.php.in
 md5sum = a32f1c8b14b8de2ecae40e71f710f384
 download-only = True
diff --git a/software/unstable/fluxbb/software.cfg b/software/unstable/fluxbb/software.cfg
index 24e5abcbd..fdb6a6706 100644
--- a/software/unstable/fluxbb/software.cfg
+++ b/software/unstable/fluxbb/software.cfg
@@ -24,7 +24,7 @@ url = ${:_profile_base_location_}/configure-fluxbb.py
 filename = configure-fluxbb.py
 
 [application-template]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/template/config.inc.php.in
 filename = template.in
 mode = 0644
diff --git a/software/unstable/glpi/software.cfg b/software/unstable/glpi/software.cfg
index 729bda3eb..1beb10c61 100644
--- a/software/unstable/glpi/software.cfg
+++ b/software/unstable/glpi/software.cfg
@@ -11,7 +11,7 @@ md5sum = 3f9cfb11c09c457a0f0a8fa1563b45a7
 
 
 [application-template]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/dummy-config.php.in
 md5sum = d41d8cd98f00b204e9800998ecf8427e
 download-only = True
diff --git a/software/unstable/hexaglobe-watermarking/common.cfg b/software/unstable/hexaglobe-watermarking/common.cfg
index 86c205404..05bdcbb78 100644
--- a/software/unstable/hexaglobe-watermarking/common.cfg
+++ b/software/unstable/hexaglobe-watermarking/common.cfg
@@ -29,7 +29,7 @@ eggs =
   slapos.toolbox
 
 [watermarkadmin.ini.in]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/template/${:_buildout_section_name_}
 md5sum = 2edc2acd102a465a0f21d8cd982ba4bf
 download-only = true
@@ -38,7 +38,7 @@ mode = 0644
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 
 [nginx.conf.in]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/template/${:_buildout_section_name_}
 md5sum = 7e41dfcb633ce52be42457ffd5b123d8
 download-only = true
diff --git a/software/unstable/joomla/software.cfg b/software/unstable/joomla/software.cfg
index f650b8f9f..237f441b9 100644
--- a/software/unstable/joomla/software.cfg
+++ b/software/unstable/joomla/software.cfg
@@ -9,7 +9,7 @@ md5sum = 3aa7d7b58bfa4eec3c3724209894d14e
 strip-top-level-dir = false
   
 [application-template]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/database.xml-in
 md5sum = 6ae063318a251b70ae7d037e3ae375d6
 download-only = True
diff --git a/software/unstable/lifetype/software.cfg b/software/unstable/lifetype/software.cfg
index 16cade6e8..f6123c761 100644
--- a/software/unstable/lifetype/software.cfg
+++ b/software/unstable/lifetype/software.cfg
@@ -14,7 +14,7 @@ extends =
   ../../stack/lamp.cfg
 
 [lifetype-patch]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/lifetype_for_mysql5.patch
 md5sum = c52bea61ea452b9f3caa82426a5819e5
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
diff --git a/software/unstable/magento/software.cfg b/software/unstable/magento/software.cfg
index 55b22e342..d353960d6 100644
--- a/software/unstable/magento/software.cfg
+++ b/software/unstable/magento/software.cfg
@@ -45,7 +45,6 @@ meld3 = 0.6.7
 plone.recipe.command = 1.1
 slapos.cookbook = 0.34
 slapos.recipe.build = 0.7
-slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.2
 slapos.toolbox = 0.10
 
diff --git a/software/unstable/net2ftp/software.cfg b/software/unstable/net2ftp/software.cfg
index a0a87e1e4..c09d6880a 100644
--- a/software/unstable/net2ftp/software.cfg
+++ b/software/unstable/net2ftp/software.cfg
@@ -20,7 +20,7 @@ md5sum = 5a2741b5881f3f229a788958dc6cdf10
 extract-directory = files_to_upload
 
 [configure-script]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 url = ${:_profile_base_location_}/configure.py
 md5sum = f7e1766468f7a8d51d311541164c3ff4
@@ -28,7 +28,7 @@ filename = configure.py
 mode = 0744
 
 [application-template]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/template/net2ftp.inc.php.in
 md5sum = 5ad3b2b42affd83229f0666c480b90cb
 filename = template.in
@@ -70,7 +70,6 @@ meld3 = 0.6.7
 plone.recipe.command = 1.1
 slapos.cookbook = 0.34
 slapos.recipe.build = 0.7
-slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.2
 slapos.toolbox = 0.10
 
diff --git a/software/unstable/openX/software.cfg b/software/unstable/openX/software.cfg
index 4fdf38b0f..295e3014c 100644
--- a/software/unstable/openX/software.cfg
+++ b/software/unstable/openX/software.cfg
@@ -46,7 +46,6 @@ meld3 = 0.6.7
 plone.recipe.command = 1.1
 slapos.cookbook = 0.34
 slapos.recipe.build = 0.7
-slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.2
 slapos.toolbox = 0.10
 
diff --git a/software/unstable/opengoo/software.cfg b/software/unstable/opengoo/software.cfg
index 44e811d43..f9836ae14 100644
--- a/software/unstable/opengoo/software.cfg
+++ b/software/unstable/opengoo/software.cfg
@@ -11,7 +11,7 @@ md5sum = 79ddfc24f01bc843a8275463e63e96b0
 strip-top-level-dir = true
 
 [application-template]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/config-form.php.in
 md5sum = 5d6ee1a23e1a5e762412a4867095b9e1
 download-only = True
diff --git a/software/unstable/os-commerce/software.cfg b/software/unstable/os-commerce/software.cfg
index fadeccde1..dccb79d4a 100644
--- a/software/unstable/os-commerce/software.cfg
+++ b/software/unstable/os-commerce/software.cfg
@@ -47,7 +47,6 @@ meld3 = 0.6.7
 plone.recipe.command = 1.1
 slapos.cookbook = 0.34
 slapos.recipe.build = 0.7
-slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.2
 slapos.toolbox = 0.10
 
diff --git a/software/unstable/phpbb/software.cfg b/software/unstable/phpbb/software.cfg
index 0f5509ce7..8490b04b0 100644
--- a/software/unstable/phpbb/software.cfg
+++ b/software/unstable/phpbb/software.cfg
@@ -49,7 +49,6 @@ meld3 = 0.6.7
 plone.recipe.command = 1.1
 slapos.cookbook = 0.34
 slapos.recipe.build = 0.7
-slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.2
 slapos.toolbox = 0.10
 
diff --git a/software/unstable/phpbms/software.cfg b/software/unstable/phpbms/software.cfg
index ee3197481..71170ef7e 100644
--- a/software/unstable/phpbms/software.cfg
+++ b/software/unstable/phpbms/software.cfg
@@ -14,7 +14,7 @@ extends =
   ../../stack/lamp.cfg
 
 [phpbms-patch]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/phpbms_for_mysql5.patch
 md5sum = ddf323ac00e9e486cea8b8cc4277e065
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
@@ -32,7 +32,7 @@ on_update = true
 cmds= patch -d ${application:location} -p1 < ${phpbms-patch:location}/${phpbms-patch:filename}
 
 [application-template]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/template/settings.php.in
 filename = template.in
 mode = 0644
diff --git a/software/unstable/phpfin/software.cfg b/software/unstable/phpfin/software.cfg
index 86df43da3..e6081925e 100644
--- a/software/unstable/phpfin/software.cfg
+++ b/software/unstable/phpfin/software.cfg
@@ -25,7 +25,7 @@ filename = configure-phpfin.py
 download-only = True
 
 [application-template]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/template/connection.inc.in
 #md5sum = Student may put here md5sum of this file, this is good idea
 download-only = True
diff --git a/software/unstable/phpip/software.cfg b/software/unstable/phpip/software.cfg
index 30d79eacc..8b4f9b5e8 100644
--- a/software/unstable/phpip/software.cfg
+++ b/software/unstable/phpip/software.cfg
@@ -17,7 +17,7 @@ url = http://flomoto.free.fr/phpip/phpip_11-05-11.tar.gz
 md5sum = 94fe615f61fbb5ef0fcbf60a44ac5093
 
 [application-template]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/template/database.php.in
 #md5sum = Student may put here md5sum of this file, this is good idea
 download-only = True
diff --git a/software/unstable/phpmyadmin/software.cfg b/software/unstable/phpmyadmin/software.cfg
index 0860c11df..9a283b123 100644
--- a/software/unstable/phpmyadmin/software.cfg
+++ b/software/unstable/phpmyadmin/software.cfg
@@ -25,7 +25,7 @@ url = http://downloads.sourceforge.net/project/phpmyadmin/phpMyAdmin/3.3.10/phpM
 md5sum = cb7a632fb4f10a180ead15f7f90087f1
 
 [application-template]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/phpmyadmin.inc.php.in
 md5sum = caab45c34c75661c214f4628ff545bb4
 filename = template.in
@@ -57,7 +57,6 @@ meld3 = 0.6.7
 plone.recipe.command = 1.1
 slapos.cookbook = 0.34
 slapos.recipe.build = 0.7
-slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.2
 slapos.toolbox = 0.10
 
diff --git a/software/unstable/phpnuke/software.cfg b/software/unstable/phpnuke/software.cfg
index 78c17feff..89d37088d 100644
--- a/software/unstable/phpnuke/software.cfg
+++ b/software/unstable/phpnuke/software.cfg
@@ -19,7 +19,7 @@ md5sum = d448586c651c811a137280b435c4e05c
 extract-directory = html
 
 [application-template]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/template/phpnuke.inc.php.in
 #md5sum = Student may put here md5sum of this file, this is good idea
 filename = template.in
@@ -58,7 +58,6 @@ meld3 = 0.6.7
 plone.recipe.command = 1.1
 slapos.cookbook = 0.34
 slapos.recipe.build = 0.7
-slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.2
 slapos.toolbox = 0.10
 
diff --git a/software/unstable/pimcore/software.cfg b/software/unstable/pimcore/software.cfg
index 2fb58bda5..99ad19ddd 100644
--- a/software/unstable/pimcore/software.cfg
+++ b/software/unstable/pimcore/software.cfg
@@ -46,7 +46,6 @@ meld3 = 0.6.7
 plone.recipe.command = 1.1
 slapos.cookbook = 0.34
 slapos.recipe.build = 0.7
-slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.2
 slapos.toolbox = 0.10
 
diff --git a/software/unstable/piwigo/software.cfg b/software/unstable/piwigo/software.cfg
index bf490653d..5ac62e775 100644
--- a/software/unstable/piwigo/software.cfg
+++ b/software/unstable/piwigo/software.cfg
@@ -18,7 +18,7 @@ url = http://piwigo.org/download/dlcounter.php?code=latest
 md5sum = 13870130dcdda90bf2d2e3c20a49b04f
 
 [application-template]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/template/piwigo.inc.php.in
 md5sum = 8ca6d1408b468c6836cd0edaf02688e5
 download-only = True
@@ -58,7 +58,6 @@ meld3 = 0.6.7
 plone.recipe.command = 1.1
 slapos.cookbook = 0.34
 slapos.recipe.build = 0.7
-slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.2
 slapos.toolbox = 0.10
 
diff --git a/software/unstable/piwik/software.cfg b/software/unstable/piwik/software.cfg
index 98b799453..9990997a4 100644
--- a/software/unstable/piwik/software.cfg
+++ b/software/unstable/piwik/software.cfg
@@ -48,7 +48,6 @@ meld3 = 0.6.7
 plone.recipe.command = 1.1
 slapos.cookbook = 0.34
 slapos.recipe.build = 0.7
-slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.2
 slapos.toolbox = 0.10
 
diff --git a/software/unstable/pixelpost/software.cfg b/software/unstable/pixelpost/software.cfg
index 140ba1fab..a1aef8404 100644
--- a/software/unstable/pixelpost/software.cfg
+++ b/software/unstable/pixelpost/software.cfg
@@ -14,7 +14,7 @@ extends =
   ../../stack/lamp.cfg
 
 [pixelpost-patch]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/pixelpost_for_mysql5.patch
 md5sum = 100883ebbe4973883a710996b91f5d23
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
diff --git a/software/unstable/prestashop/software.cfg b/software/unstable/prestashop/software.cfg
index 0d3db0504..006f0866e 100644
--- a/software/unstable/prestashop/software.cfg
+++ b/software/unstable/prestashop/software.cfg
@@ -49,7 +49,6 @@ meld3 = 0.6.7
 plone.recipe.command = 1.1
 slapos.cookbook = 0.34
 slapos.recipe.build = 0.7
-slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.2
 slapos.toolbox = 0.10
 
diff --git a/software/unstable/proactive/software.cfg b/software/unstable/proactive/software.cfg
index d1f6a4a9c..94f01e7ed 100644
--- a/software/unstable/proactive/software.cfg
+++ b/software/unstable/proactive/software.cfg
@@ -23,7 +23,7 @@ url = http://www-sop.inria.fr/oasis/amedro/public/PABundle.tar.gz
 #md5sum = 776f78e9058d4b5dc86351bf45305c45
 
 #[java-download]
-#recipe = slapos.recipe.download
+#recipe = slapos.recipe.build:download
 ## 64bit self extracting
 ##url = http://javadl.sun.com/webapps/download/AutoDL?BundleId=43875
 ##md5sum = e4143387e31838a51df76774d102f49a
diff --git a/software/unstable/punbb/software.cfg b/software/unstable/punbb/software.cfg
index ed21e74ee..cbf4bc05c 100644
--- a/software/unstable/punbb/software.cfg
+++ b/software/unstable/punbb/software.cfg
@@ -18,7 +18,7 @@ url = http://punbb.informer.com/download/punbb-1.3.6.tar.gz
 md5sum = 7bb3f570cb6a61f8c3e3e25e750fd29d
 
 [application-template]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/template/punbb.inc.php.in
 #md5sum = Student may put here md5sum of this file, this is good idea
 filename = template.in
@@ -57,7 +57,6 @@ meld3 = 0.6.7
 plone.recipe.command = 1.1
 slapos.cookbook = 0.34
 slapos.recipe.build = 0.7
-slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.2
 slapos.toolbox = 0.10
 
diff --git a/software/unstable/simpleMachineForum/software.cfg b/software/unstable/simpleMachineForum/software.cfg
index 448bc3dd0..c9349fcf9 100644
--- a/software/unstable/simpleMachineForum/software.cfg
+++ b/software/unstable/simpleMachineForum/software.cfg
@@ -47,7 +47,6 @@ meld3 = 0.6.7
 plone.recipe.command = 1.1
 slapos.cookbook = 0.34
 slapos.recipe.build = 0.7
-slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.2
 slapos.toolbox = 0.10
 
diff --git a/software/unstable/spip/software.cfg b/software/unstable/spip/software.cfg
index ba2ebade0..39477c252 100644
--- a/software/unstable/spip/software.cfg
+++ b/software/unstable/spip/software.cfg
@@ -46,7 +46,6 @@ meld3 = 0.6.7
 plone.recipe.command = 1.1
 slapos.cookbook = 0.34
 slapos.recipe.build = 0.7
-slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.2
 slapos.toolbox = 0.10
 
diff --git a/software/unstable/statusnet/software.cfg b/software/unstable/statusnet/software.cfg
index f28ed5d7e..29e208d74 100644
--- a/software/unstable/statusnet/software.cfg
+++ b/software/unstable/statusnet/software.cfg
@@ -46,7 +46,6 @@ meld3 = 0.6.7
 plone.recipe.command = 1.1
 slapos.cookbook = 0.34
 slapos.recipe.build = 0.7
-slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.2
 slapos.toolbox = 0.10
 
diff --git a/software/unstable/sugar-crm/software.cfg b/software/unstable/sugar-crm/software.cfg
index ed9a448ac..76f6591fb 100644
--- a/software/unstable/sugar-crm/software.cfg
+++ b/software/unstable/sugar-crm/software.cfg
@@ -46,7 +46,6 @@ meld3 = 0.6.7
 plone.recipe.command = 1.1
 slapos.cookbook = 0.34
 slapos.recipe.build = 0.7
-slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.2
 slapos.toolbox = 0.10
 
diff --git a/software/unstable/tiki/software.cfg b/software/unstable/tiki/software.cfg
index 71d44fd37..a310a089c 100644
--- a/software/unstable/tiki/software.cfg
+++ b/software/unstable/tiki/software.cfg
@@ -46,7 +46,6 @@ meld3 = 0.6.7
 plone.recipe.command = 1.1
 slapos.cookbook = 0.34
 slapos.recipe.build = 0.7
-slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.2
 slapos.toolbox = 0.10
 
diff --git a/software/unstable/trac-svn/software.cfg b/software/unstable/trac-svn/software.cfg
index 3f21c4dcd..411482906 100644
--- a/software/unstable/trac-svn/software.cfg
+++ b/software/unstable/trac-svn/software.cfg
@@ -95,7 +95,7 @@ md5sum = 4ea69039e41ff45bffe8f2620bdf187c
 mode = 0644
 
 [template-download]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/templates/${:filename}
 mode = 0644
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
@@ -178,7 +178,6 @@ docutils = 0.10
 gitdb = 0.5.4
 plone.recipe.command = 1.1
 pycrypto = 2.6
-slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.4.2
 slapos.toolbox = 0.34.0
 smmap = 0.8.2
diff --git a/software/unstable/tt-rss/software.cfg b/software/unstable/tt-rss/software.cfg
index 0866ce7b7..a42234ea9 100644
--- a/software/unstable/tt-rss/software.cfg
+++ b/software/unstable/tt-rss/software.cfg
@@ -12,7 +12,7 @@ md5sum = efd7eec1629db379896fb7e74bba400e
 strip-top-level-dir = true
 
 [application-template]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/template/config.php.in
 #md5sum = Student may put here md5sum of this file, this is good idea
 filename = template.in
@@ -24,7 +24,7 @@ location = config.php
 
 
 [sql-script]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 url = ${:_profile_base_location_}/script/tt-rss.sql
 #md5sum = c4d5f87d8f02cad3f20e679160195f48
@@ -33,7 +33,7 @@ mode = 0744
 
 # XXX Should disappear and be integrated into apachephpconfigure
 [configure-script]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 url = ${:_profile_base_location_}/configure-tt-rss.py
 #md5sum = c4d5f87d8f02cad3f20e679160195f48
diff --git a/software/unstable/xellplan/software.cfg b/software/unstable/xellplan/software.cfg
index 0c55008bd..0c0797a80 100644
--- a/software/unstable/xellplan/software.cfg
+++ b/software/unstable/xellplan/software.cfg
@@ -17,7 +17,7 @@ url = http://sunet.dl.sourceforge.net/project/xellplan/xellplan/xellplan-1.3/xel
 md5sum = 37880217917367eb2d4a0a33c4a7fb65
 
 [application-template]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/template/sfx.php.in
 filename = template.in
 mode = 0644
diff --git a/software/unstable/xoops/software.cfg b/software/unstable/xoops/software.cfg
index 93c5c0048..c09259c72 100644
--- a/software/unstable/xoops/software.cfg
+++ b/software/unstable/xoops/software.cfg
@@ -47,7 +47,6 @@ meld3 = 0.6.7
 plone.recipe.command = 1.1
 slapos.cookbook = 0.34
 slapos.recipe.build = 0.7
-slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.2
 slapos.toolbox = 0.10
 
diff --git a/software/unstable/zencart/software.cfg b/software/unstable/zencart/software.cfg
index 0cb366895..6c63efd73 100644
--- a/software/unstable/zencart/software.cfg
+++ b/software/unstable/zencart/software.cfg
@@ -21,7 +21,7 @@ md5sum = e0a5fb39078321ced7f5a9c193f30927
 strip-top-level-dir = true
 
 [configure-script]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 url = ${:_profile_base_location_}/configure.py
 filename = configure.py
@@ -59,7 +59,6 @@ meld3 = 0.6.7
 plone.recipe.command = 1.1
 slapos.cookbook = 0.34
 slapos.recipe.build = 0.7
-slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.2
 slapos.toolbox = 0.10
 
diff --git a/software/unstable/zikula/software.cfg b/software/unstable/zikula/software.cfg
index 06078ed28..b7124a0f6 100644
--- a/software/unstable/zikula/software.cfg
+++ b/software/unstable/zikula/software.cfg
@@ -18,7 +18,7 @@ url = http://ci.zikula.org/job/Zikula-1.2.8/17/artifact/build/archive/Zikula-1.2
 md5sum = bc453d665605f954f1497586ccd6d267
 
 [configure-script]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 url = ${:_profile_base_location_}/configure-zikula.py
 md5sum = c4d5f87d8f02cad3f20e679160195f48
diff --git a/software/wordpress/software.cfg b/software/wordpress/software.cfg
index 49768150b..82dc0ec57 100644
--- a/software/wordpress/software.cfg
+++ b/software/wordpress/software.cfg
@@ -7,7 +7,7 @@ url = http://wordpress.org/wordpress-3.5.1.tar.gz
 md5sum = 409889c98b13cbdbb9fd121df859ae3e
 
 [application-template]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/wp-config.php.in
 md5sum = 0d62b28125ca3c780db0b547199953f2
 download-only = True
diff --git a/stack/boinc/buildout.cfg b/stack/boinc/buildout.cfg
index ce365f6b2..44e173fec 100644
--- a/stack/boinc/buildout.cfg
+++ b/stack/boinc/buildout.cfg
@@ -46,7 +46,7 @@ output = ${buildout:directory}/template-mariadb.cfg
 mode = 0644
 
 [template-httpd-conf]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/template/${:filename}
 mode = 0644
 filename = apache.in
@@ -69,7 +69,6 @@ apache-libcloud = 0.12.4
 async = 0.6.1
 gitdb = 0.5.4
 plone.recipe.command = 1.1
-slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.4.2
 slapos.toolbox = 0.40.4
 smmap = 0.8.2
diff --git a/stack/lamp.cfg b/stack/lamp.cfg
index d42b9644b..fb928fbba 100644
--- a/stack/lamp.cfg
+++ b/stack/lamp.cfg
@@ -44,7 +44,6 @@ apache-libcloud = 0.9.1
 async = 0.6.1
 gitdb = 0.5.4
 plone.recipe.command = 1.1
-slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.3
 slapos.toolbox = 0.40.4
 smmap = 0.8.2
diff --git a/stack/lamp/buildout.cfg b/stack/lamp/buildout.cfg
index 47b297e5b..6116e1492 100644
--- a/stack/lamp/buildout.cfg
+++ b/stack/lamp/buildout.cfg
@@ -187,7 +187,6 @@ async = 0.6.1
 gitdb = 0.5.4
 pycrypto = 2.6
 rdiff-backup = 1.0.5
-slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.4.2
 slapos.toolbox = 0.40.4
 smmap = 0.8.2
diff --git a/stack/lapp/buildout.cfg b/stack/lapp/buildout.cfg
index d0870ff26..5c0fcd649 100644
--- a/stack/lapp/buildout.cfg
+++ b/stack/lapp/buildout.cfg
@@ -184,7 +184,6 @@ cp.recipe.cmd = 0.4
 gitdb = 0.5.4
 plone.recipe.command = 1.1
 pycrypto = 2.6
-slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.4.2
 slapos.toolbox = 0.40.4
 smmap = 0.8.2
diff --git a/stack/resilient/buildout.cfg b/stack/resilient/buildout.cfg
index 7e0861b00..6c6b82929 100644
--- a/stack/resilient/buildout.cfg
+++ b/stack/resilient/buildout.cfg
@@ -67,14 +67,14 @@ md5sum = 0e6a95e7a9b38d402f94c11b7d10397e
 mode = 0644
 
 [template-replicated]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/template-replicated.cfg.in
 md5sum = 0641a65142fe0f624bf7c112081c2527
 mode = 0644
 destination = ${buildout:directory}/template-replicated.cfg.in
 
 [template-parts]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/template-parts.cfg.in
 md5sum = 071b1034ee8f5cc14f79b16fdeba2813
 mode = 0644
@@ -90,7 +90,7 @@ md5sum = d21472f0e58f928fb827f2cbf22c4d4a
 output = ${buildout:directory}/instance-frozen.cfg
 
 [resilient-web-takeover-cgi-script-download]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/resilient-web-takeover-cgi-script.py.in
 md5sum = 3aa7624af1196062d7d01946d4de9f0e
 mode = 0644
-- 
2.30.9