Revert "Replace zc.buildout requirements with slapos.buildout."

This reverts commit 826d7796.

bootstrap/bootstrap.py

@@ -205,7 +205,7 @@ env = dict(
     os.environ,
     PYTHONPATH=setup_requirement_path)
 
-requirement = 'slapos.buildout'
+requirement = 'zc.buildout'
 version = options.version
 if version is None and not options.accept_buildout_test_releases:
     # Figure out the most recent final version of zc.buildout.

setup.py

@@ -68,7 +68,7 @@ debug = %(name)s.testrecipes:Debug
 """ % dict(name=name)
 
 setup(
-    name = 'slapos.buildout',
+    name = name,
     version = version,
     author = "Jim Fulton",
     author_email = "jim@zope.com",

src/zc/buildout/buildout.py

@@ -344,7 +344,7 @@ class Buildout(UserDict.DictMixin):
 
         # Get a base working set for our distributions that corresponds to the
         # stated desires in the configuration.
-        distributions = ['setuptools', 'slapos.buildout']
+        distributions = ['setuptools', 'zc.buildout']
         if options.get('offline') == 'true':
             ws = zc.buildout.easy_install.working_set(
                 distributions, options['executable'],
@@ -366,7 +366,7 @@ class Buildout(UserDict.DictMixin):
 
         # Now copy buildout and setuptools eggs, and record destination eggs:
         entries = []
-        for name in 'setuptools', 'slapos.buildout':
+        for name in 'setuptools', 'zc.buildout':
             r = pkg_resources.Requirement.parse(name)
             dist = ws.find(r)
             if dist.precedence == pkg_resources.DEVELOP_DIST:
@@ -388,7 +388,7 @@ class Buildout(UserDict.DictMixin):
         # Ideally the (possibly) new version of buildout would get a
         # chance to write the script.  Not sure how to do that.
         ws = pkg_resources.WorkingSet(entries)
-        ws.require('slapos.buildout')
+        ws.require('zc.buildout')
         partsdir = os.path.join(options['parts-directory'], 'buildout')
         if not os.path.exists(partsdir):
             os.mkdir(partsdir)
@@ -409,7 +409,7 @@ class Buildout(UserDict.DictMixin):
             script_initialization = ''
         zc.buildout.easy_install.sitepackage_safe_scripts(
             options['bin-directory'], ws, options['executable'], partsdir,
-            reqs=['slapos.buildout'], relative_paths=relative_paths,
+            reqs=['zc.buildout'], relative_paths=relative_paths,
             include_site_packages=self.include_site_packages,
             script_initialization=script_initialization,
             exec_sitecustomize=self.exec_sitecustomize,

src/zc/buildout/easy_install.py

@@ -78,7 +78,7 @@ setuptools_loc = pkg_resources.working_set.find(
 # Include buildout and setuptools eggs in paths.  We prevent dupes just to
 # keep from duplicating any log messages about them.
 buildout_loc = pkg_resources.working_set.find(
-    pkg_resources.Requirement.parse('slapos.buildout')).location
+    pkg_resources.Requirement.parse('zc.buildout')).location
 buildout_and_setuptools_path = [setuptools_loc]
 if os.path.normpath(setuptools_loc) != os.path.normpath(buildout_loc):
     buildout_and_setuptools_path.append(buildout_loc)