diff options
Diffstat (limited to 'lang/ruby200-base/patches/patch-lib_rubygems_dependency__installer.rb')
| -rw-r--r-- | lang/ruby200-base/patches/patch-lib_rubygems_dependency__installer.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lang/ruby200-base/patches/patch-lib_rubygems_dependency__installer.rb b/lang/ruby200-base/patches/patch-lib_rubygems_dependency__installer.rb index 977f2205e4d..9a8451af56b 100644 --- a/lang/ruby200-base/patches/patch-lib_rubygems_dependency__installer.rb +++ b/lang/ruby200-base/patches/patch-lib_rubygems_dependency__installer.rb @@ -1,8 +1,8 @@ -$NetBSD: patch-lib_rubygems_dependency__installer.rb,v 1.1 2013/07/21 02:32:58 taca Exp $ +$NetBSD: patch-lib_rubygems_dependency__installer.rb,v 1.1.2.1 2013/12/01 11:47:59 tron Exp $ * Add install_root option for pkgsrc's rubygems support. ---- lib/rubygems/dependency_installer.rb.orig 2013-03-17 14:51:53.000000000 +0000 +--- lib/rubygems/dependency_installer.rb.orig 2013-11-13 02:59:08.000000000 +0000 +++ lib/rubygems/dependency_installer.rb @@ -50,6 +50,7 @@ class Gem::DependencyInstaller # :format_executable:: See Gem::Installer#initialize. @@ -12,7 +12,7 @@ $NetBSD: patch-lib_rubygems_dependency__installer.rb,v 1.1 2013/07/21 02:32:58 t # :prerelease:: Allow prerelease versions. See #install. # :security_policy:: See Gem::Installer::new and Gem::Security. # :user_install:: See Gem::Installer.new -@@ -57,13 +58,14 @@ class Gem::DependencyInstaller +@@ -57,12 +58,14 @@ class Gem::DependencyInstaller # :build_args:: See Gem::Installer::new def initialize(options = {}) @@ -20,16 +20,16 @@ $NetBSD: patch-lib_rubygems_dependency__installer.rb,v 1.1 2013/07/21 02:32:58 t - if options[:install_dir] then + @install_dir = options[:install_dir] ++ # HACK shouldn't change the global settings, needed for -i behavior # maybe move to the install command? See also github #442 Gem::Specification.dirs = @install_dir - Gem.ensure_gem_subdirectories @install_dir + else + @install_dir = Gem.dir end options = DEFAULT_OPTIONS.merge options -@@ -92,7 +94,12 @@ class Gem::DependencyInstaller +@@ -91,7 +94,12 @@ class Gem::DependencyInstaller @installed_gems = [] @toplevel_specs = nil @@ -43,7 +43,7 @@ $NetBSD: patch-lib_rubygems_dependency__installer.rb,v 1.1 2013/07/21 02:32:58 t # Set with any errors that SpecFetcher finds while search through # gemspecs for a dep -@@ -364,6 +371,7 @@ class Gem::DependencyInstaller +@@ -371,6 +379,7 @@ class Gem::DependencyInstaller :format_executable => @format_executable, :ignore_dependencies => @ignore_dependencies, :install_dir => @install_dir, |