- switch to zc.buildout 1.5.0 on bootstrap

 - as bootstrap is passing -S to generated bin/buildout there is not need to
   use it while invoking bin/buildout
 - as new buildout will only select non-development releases there is no need
   to pin to known release
 - fix Zope KGS issues with buildout 1.5.0
 - use distribute by default, as it is more reliable in corner cases then
   setuptools
 - inform about another way to updating local bootstrap


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@38044 20353a03-c40f-0410-a6d1-a30d3c3de9de

buildout/Makefile

@@ -16,7 +16,7 @@ software: bin/buildout
 	$(PYTHON) -SE bin/buildout $(BUILDOUT_OPT)
 
 bin/buildout:
-	$(PYTHON) -SE bootstrap/bootstrap.py
+	$(PYTHON) -SE bootstrap/bootstrap.py -d
 
 # run make assert to check that all is working
 assert: bin/python2.4

buildout/README-2.12.txt

@@ -37,7 +37,7 @@ For example:
 Run the Zope 2.12 buildout:
 
   $ cd ~/erp5.buildout
-  $ python2.6 -S bootstrap/bootstrap.py -v 1.4.3
+  $ python2.6 -S bootstrap/bootstrap.py -d -v buildout-2.12.cfg
   $ bin/buildout -v -c buildout-2.12.cfg
 
 This will download and install the software components needed to run ERP5 on
@@ -115,7 +115,7 @@ parts =
   supervisor-instance
 ^D
 $ ~/erp5.buildout/bin/bootstrap2.6      # 4
-$ python2.6 -S bin/buildout -ov         # 5
+$ bin/buildout -ov         # 5
 
 Notice how we managed to run buildout in "offline-mode" (-o). The software-home
 configuration (along with the 'extends-cache' in the 'instance-profiles'

buildout/README.txt

@@ -128,7 +128,7 @@ $ mkdir software
 $ cd software
 $ echo '[buildout]' >> buildout.cfg
 $ echo 'extends = https://svn.erp5.org/repos/public/erp5/trunk/buildout/buildout.cfg' >> buildout.cfg
-$ wget -qO - http://svn.zope.org/*checkout*/zc.buildout/trunk/bootstrap/bootstrap.py | python -S -
+$ wget -qO - http://svn.zope.org/*checkout*/zc.buildout/trunk/bootstrap/bootstrap.py | python -S - -d
 $ python -S bin/buildout
 
 Note on -S: this switch is overridden by PYTHON_PATH environment variable. In

buildout/bootstrap/README.txt

 bootstrap.py file is updated from time to time from:
   http://svn.zope.org/*checkout*/zc.buildout/trunk/bootstrap/bootstrap.py
+or:
+  http://svn.zope.org/*checkout*/zc.buildout/tags/RELEASE/bootstrap/bootstrap.py
 
 There is no need to fix it locally, all changes shall go upstream.
 Moreover buildout has ability to autoupdate itself, so local manipulations on

buildout/profiles/versions-2.12.cfg

@@ -34,3 +34,8 @@ erp5_bt5_revision = ${:erp5_products_revision}
 
 # 1.3.1 fixes environment leak
 hexagonit.recipe.cmmi >= 1.3.1
+
+# Zope KGS is incompatible with buildout 1.5.0 in case of distribute and
+# zc.buildout
+distribute >= 0.6.14
+zc.buildout >= 1.5.0