From: Christian Hofstaedtler <zeha@debian.org>
Date: Tue, 5 Jul 2016 10:22:08 +0200
Subject: Replace bundled libraries with system versions

Forwarded: not-needed
Origin: vendor
---
 lib/bundler/vendored_molinillo.rb  | 2 +-
 lib/bundler/vendored_persistent.rb | 2 --
 lib/bundler/vendored_thor.rb       | 4 ++--
 3 files changed, 3 insertions(+), 5 deletions(-)

--- a/lib/bundler/vendored_molinillo.rb
+++ b/lib/bundler/vendored_molinillo.rb
@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 module Bundler; end
-require "bundler/vendor/molinillo/lib/molinillo"
+require "molinillo"
--- a/lib/bundler/vendored_persistent.rb
+++ b/lib/bundler/vendored_persistent.rb
@@ -14,4 +14,4 @@ module Bundler
     end
   end
 end
-require "bundler/vendor/net-http-persistent/lib/net/http/persistent"
+require "net/http/persistent"
--- a/lib/bundler/vendored_thor.rb
+++ b/lib/bundler/vendored_thor.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 module Bundler
   def self.require_thor_actions
-    Kernel.send(:require, "bundler/vendor/thor/lib/thor/actions")
+    Kernel.send(:require, "thor/actions")
   end
 end
-require "bundler/vendor/thor/lib/thor"
+require "thor"
--- a/lib/bundler/fetcher.rb
+++ b/lib/bundler/fetcher.rb
@@ -237,7 +237,7 @@ module Bundler
           Bundler.settings[:ssl_client_cert]
         raise SSLError if needs_ssl && !defined?(OpenSSL::SSL)
 
-        con = Bundler::Persistent::Net::HTTP::Persistent.new "bundler", :ENV
+        con = Net::HTTP::Persistent.new "bundler", :ENV
         if gem_proxy = Bundler.rubygems.configuration[:http_proxy]
           con.proxy = URI.parse(gem_proxy) if gem_proxy != :no_proxy
         end
@@ -273,7 +273,7 @@ module Bundler
       Timeout::Error, EOFError, SocketError, Errno::ENETDOWN, Errno::ENETUNREACH,
       Errno::EINVAL, Errno::ECONNRESET, Errno::ETIMEDOUT, Errno::EAGAIN,
       Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError,
-      Bundler::Persistent::Net::HTTP::Persistent::Error, Zlib::BufError, Errno::EHOSTUNREACH
+      Net::HTTP::Persistent::Error, Zlib::BufError, Errno::EHOSTUNREACH
     ].freeze
 
     def bundler_cert_store
