Cleanup rbenv mess.

6 files changed, 1 insertions, 29 deletions

diff --git a/Library/Formula/rbenv-default-gems.rb b/Library/Formula/rbenv-default-gems.rb
index c4702e39e..0e7d1e197 100644
--- a/Library/Formula/rbenv-default-gems.rb
+++ b/Library/Formula/rbenv-default-gems.rb
@@ -12,12 +12,5 @@ class RbenvDefaultGems < Formula
 
   def install
     prefix.install Dir['*']
-    ln_sf opt_prefix, "#{HOMEBREW_PREFIX}/var/lib/rbenv/plugins/#{name}"
-  end
-
-  def caveats; <<-EOS.undent
-    As you are using Homebrew's directories for `rbenv` rather than ~/.rbenv
-    place the `default-gems` file in #{HOMEBREW_PREFIX}/opt/rbenv.
-    EOS
   end
 end
diff --git a/Library/Formula/rbenv-gem-rehash.rb b/Library/Formula/rbenv-gem-rehash.rb
index 69d9b029f..cc19cb485 100644
--- a/Library/Formula/rbenv-gem-rehash.rb
+++ b/Library/Formula/rbenv-gem-rehash.rb
@@ -9,8 +9,6 @@ class RbenvGemRehash < Formula
 
   def install
     prefix.install Dir['*']
-
-    ln_sf opt_prefix, "#{HOMEBREW_PREFIX}/var/lib/rbenv/plugins/#{name}"
   end
 
   def caveats; <<-EOS.undent
diff --git a/Library/Formula/rbenv-gemset.rb b/Library/Formula/rbenv-gemset.rb
index ec8328c73..571dc4ac8 100644
--- a/Library/Formula/rbenv-gemset.rb
+++ b/Library/Formula/rbenv-gemset.rb
@@ -11,7 +11,5 @@ class RbenvGemset < Formula
 
   def install
     prefix.install Dir['*']
-
-    ln_sf opt_prefix, "#{HOMEBREW_PREFIX}/var/lib/rbenv/plugins/#{name}"
   end
 end
diff --git a/Library/Formula/rbenv-vars.rb b/Library/Formula/rbenv-vars.rb
index 22304b631..079454cf2 100644
--- a/Library/Formula/rbenv-vars.rb
+++ b/Library/Formula/rbenv-vars.rb
@@ -11,7 +11,5 @@ class RbenvVars < Formula
 
   def install
     prefix.install Dir['*']
-
-    ln_sf opt_prefix, "#{HOMEBREW_PREFIX}/var/lib/rbenv/plugins/#{name}"
   end
 end
diff --git a/Library/Formula/rbenv.rb b/Library/Formula/rbenv.rb
index 34965878f..146a5c769 100644
--- a/Library/Formula/rbenv.rb
+++ b/Library/Formula/rbenv.rb
@@ -10,13 +10,6 @@ class Rbenv < Formula
   def install
     inreplace 'libexec/rbenv', '/usr/local', HOMEBREW_PREFIX
     prefix.install Dir['*']
-
-    var_lib = var/'lib/rbenv'
-    ['plugins', 'versions'].each do |dir|
-      var_dir = var_lib/dir
-      var_dir.mkpath
-      ln_sf var_dir, (prefix/dir)
-    end
   end
 
   def caveats; <<-EOS.undent
@@ -24,7 +17,7 @@ class Rbenv < Formula
       if which rbenv > /dev/null; then eval "$(rbenv init -)"; fi
 
     To use Homebrew's directories rather than ~/.rbenv add to your profile:
-      export RBENV_ROOT=#{opt_prefix}
+      export RBENV_ROOT=#{var}/rbenv
     EOS
   end
 end
diff --git a/Library/Formula/ruby-build.rb b/Library/Formula/ruby-build.rb
index 45767bb4d..7589cba65 100644
--- a/Library/Formula/ruby-build.rb
+++ b/Library/Formula/ruby-build.rb
@@ -7,16 +7,8 @@ class RubyBuild < Formula
 
   head 'https://github.com/sstephenson/ruby-build.git'
 
-  option "without-rbenv", "Don't install as an rbenv plugin"
-
-  depends_on 'rbenv' unless build.include? 'without-rbenv'
-
   def install
     ENV['PREFIX'] = prefix
     system "./install.sh"
-
-    unless build.include? 'without-rbenv'
-      ln_sf opt_prefix, "#{HOMEBREW_PREFIX}/var/lib/rbenv/plugins/#{name}"
-    end
   end
 end