aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorAdam Vandenberg2013-08-06 21:01:51 -0700
committerAdam Vandenberg2013-09-11 22:05:32 -0700
commit06e5e7a7abd719b4707481b2a76ea640ac843dad (patch)
tree7486e8eecd52c5277b0b49fc62794d84cd534a80 /Library
parent4d3253d92930db6c39cf3daf46fcc5b20071e6e0 (diff)
downloadhomebrew-06e5e7a7abd719b4707481b2a76ea640ac843dad.tar.bz2
pypy: use resource
Diffstat (limited to 'Library')
-rw-r--r--Library/Formula/pypy.rb14
1 files changed, 6 insertions, 8 deletions
diff --git a/Library/Formula/pypy.rb b/Library/Formula/pypy.rb
index 5427b833c..bfabe5930 100644
--- a/Library/Formula/pypy.rb
+++ b/Library/Formula/pypy.rb
@@ -1,10 +1,5 @@
require 'formula'
-class Setuptools < Formula
- url 'https://pypi.python.org/packages/source/s/setuptools/setuptools-1.1.4.tar.gz'
- sha1 'b8bf9c2b8a114045598f0e16681d6a63a4d6cdf9'
-end
-
class Pypy < Formula
homepage 'http://pypy.org/'
url 'https://bitbucket.org/pypy/pypy/downloads/pypy-2.1-osx64.tar.bz2'
@@ -13,6 +8,11 @@ class Pypy < Formula
depends_on :arch => :x86_64
+ resource 'setuptools' do
+ url 'https://pypi.python.org/packages/source/s/setuptools/setuptools-1.1.4.tar.gz'
+ sha1 'b8bf9c2b8a114045598f0e16681d6a63a4d6cdf9'
+ end
+
def install
rmtree 'site-packages'
@@ -39,9 +39,7 @@ class Pypy < Formula
# $ easy_install pip
# $ pip install --upgrade setuptools
# to get newer versions of setuptools outside of Homebrew.
- Setuptools.new.brew do
- system "#{bin}/pypy", "setup.py", "install"
- end
+ resource('setuptools').stage { system "#{bin}/pypy", "setup.py", "install" }
# Symlink to easy_install_pypy.
unless (scripts_folder+'easy_install_pypy').exist?