From: Christian Hofstaedtler <zeha@debian.org>
Date: Wed, 13 Jul 2016 15:51:52 +0000
Subject: Do not add system path to RUBYLIB

Bundler adds it's own installation path in front of RUBYLIB, but when
this is the system ruby path, this causes system-wide installed gems
to be used before bundler-installed gems.

Closes: #830958
Forwarded: not-needed
Origin: vendor
---
 lib/bundler.rb                | 6 ------
 lib/bundler/shared_helpers.rb | 3 ---
 2 files changed, 9 deletions(-)

Index: bundler/lib/bundler.rb
===================================================================
--- bundler.orig/lib/bundler.rb
+++ bundler/lib/bundler.rb
@@ -280,12 +280,6 @@ EOF
         env["RUBYOPT"] = env["RUBYOPT"].sub "-rbundler/setup", ""
       end
 
-      if env.key?("RUBYLIB")
-        rubylib = env["RUBYLIB"].split(File::PATH_SEPARATOR)
-        rubylib.delete(File.expand_path("..", __FILE__))
-        env["RUBYLIB"] = rubylib.join(File::PATH_SEPARATOR)
-      end
-
       env
     end
 
Index: bundler/lib/bundler/shared_helpers.rb
===================================================================
--- bundler.orig/lib/bundler/shared_helpers.rb
+++ bundler/lib/bundler/shared_helpers.rb
@@ -318,9 +318,6 @@ module Bundler
     end
 
     def set_rubylib
-      rubylib = (ENV["RUBYLIB"] || "").split(File::PATH_SEPARATOR)
-      rubylib.unshift bundler_ruby_lib
-      Bundler::SharedHelpers.set_env "RUBYLIB", rubylib.uniq.join(File::PATH_SEPARATOR)
     end
 
     def bundler_ruby_lib
