Blacklist setuptools in favor of distribute.

2 files changed, 8 insertions, 27 deletions

diff --git a/Library/Formula/setuptools.rb b/Library/Formula/setuptools.rb
deleted file mode 100644
index 0cb91342f..000000000
--- a/Library/Formula/setuptools.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-require 'formula'
-
-class Setuptools <Formula
-  url 'http://pypi.python.org/packages/source/s/setuptools/setuptools-0.6c11.tar.gz'
-  homepage 'http://pypi.python.org/pypi/setuptools'
-  md5 '7df2a529a074f613b509fb44feefe74e'
-  version '0.6c11'
-
-  def install
-    dest=prefix+'lib/setuptools'
-    FileUtils.mkdir_p dest
-    ENV.append 'PYTHONPATH', dest, ":"
-    system "python", "setup.py", "install", "--prefix=#{prefix}", "--install-lib=#{dest}"
-
-    site_packages = `python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"`.chomp
-    pth = Pathname.new site_packages+'/homebrew.pth'
-    ohai "Writing #{pth} to enable setuptools"
-    data = DATA.read
-    data.sub! "HOMEBREW_SETUPTOOLS_PATH", dest
-    pth.unlink if pth.exist?
-    pth.write data
-  end
-end
-
-__END__
-# Please dont't modify this file, Homebrew will overwrite it.
-import site; site.addsitedir('HOMEBREW_SETUPTOOLS_PATH')
diff --git a/Library/Homebrew/brew.h.rb b/Library/Homebrew/brew.h.rb
index aaa1fd9e2..41ba4280f 100644
--- a/Library/Homebrew/brew.h.rb
+++ b/Library/Homebrew/brew.h.rb
@@ -18,6 +18,14 @@ def check_for_blacklisted_formula names
       Mercurial can be install thusly:
         brew install pip && pip install mercurial
     EOS
+
+    when 'setuptools' then abort <<-EOS.undent
+      When working with a Homebrew-built Python, distribute is preferred
+      over setuptools, and can be used as the prequisite for pip.
+
+      Install distribute using:
+        brew install distribute
+    EOS
     end
   end
 end