 @@ -1,16 +1,17 @@
-# $NetBSD: Makefile,v 1.55 2013/09/30 03:12:59 taca Exp $
+# $NetBSD: Makefile,v 1.56 2014/02/19 15:47:32 taca Exp $
 DISTNAME=	rubygems-2.0.10
 PKGREVISION=	1
 CATEGORIES=	misc ruby
 MASTER_SITES=	http://production.cf.rubygems.org/rubygems/
 EXTRACT_SUFX=	.tgz
 MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	https://rubygems.org/
 COMMENT=	Ruby standard for publishing and managing third party libraries
 LICENSE=	gnu-gpl-v2 OR ruby-license
 CONFLICTS+=	rubygems-[0-9]*
 .include "../../mk/bsd.prefs.mk"

 @@ -1,16 +1,16 @@
-$NetBSD: distinfo,v 1.44 2013/09/30 03:12:59 taca Exp $
+$NetBSD: distinfo,v 1.45 2014/02/19 15:47:32 taca Exp $
 SHA1 (rubygems-2.0.10.tgz) = e4119824649771958038b2347485df85c3a09fc6
 RMD160 (rubygems-2.0.10.tgz) = cc6c5adb29464217067eeab6e06bbb1b67d6cf42
 Size (rubygems-2.0.10.tgz) = 338280 bytes
 SHA1 (patch-aa) = ec1af229bb7cf9b36b0b5669b8c6f3d97f7ea15e
-SHA1 (patch-ab) = d9fd51322581d0d176479fb6a8f0507ad7cd2b13
+SHA1 (patch-ab) = a960d57b48397fa499c0ee1a91b534eb10574d06
 SHA1 (patch-ac) = 1a59a5d2fc090dfcf6d3bd3b9c133f0ce4a1feee
-SHA1 (patch-ad) = e44afa7a32095652ef0eea7b146827b60829aee6
+SHA1 (patch-ad) = 40819a75ae0094292417a7c682ed56abd98de1c2
 SHA1 (patch-af) = d96d5dafd830b0c94bf6c191a3274701ebc6d564
-SHA1 (patch-ag) = 5b94252ea03eba04849770bc141dfc58de932389
+SHA1 (patch-ag) = 1114e30ce7161a6aa98c3ac6c4ee81f1c22a10d8
-SHA1 (patch-ah) = de58555d7c7e942aa7925ecd1db94769dc5254a1
+SHA1 (patch-ah) = ae9cd39b900793dbb3d22bad88163750e4d120fe
 SHA1 (patch-aj) = 3b77a675470ea3702b9870843d2bb39bb6a83f3e
 SHA1 (patch-am) = 9146ece86c0bae61553c916adafb2c108f3f07a9
 SHA1 (patch-ao) = 4a8be3bdab5e465814b626d17a5f2811fbfc808c
 SHA1 (patch-test_rubygems_test__gem.rb) = 883675c1af0314c66c3d02fb9c012fac768ebb9b

 @@ -1,14 +1,14 @@
-$NetBSD: patch-ab,v 1.17 2013/09/10 16:33:29 taca Exp $
+$NetBSD: patch-ab,v 1.18 2014/02/19 15:47:32 taca Exp $
 Add install_root option for pkgsrc's rubygems support.
 --- lib/rubygems/dependency_installer.rb.orig	2013-09-09 23:41:27.000000000 +0000
 +++ lib/rubygems/dependency_installer.rb
 @@ -50,6 +50,7 @@ class Gem::DependencyInstaller
    # :format_executable:: See Gem::Installer#initialize.
    # :ignore_dependencies:: Don't install any dependencies.
    # :install_dir:: See Gem::Installer#install.
 +  # :install_root:: See Gem::Installer#install.
    # :prerelease:: Allow prerelease versions.  See #install.
    # :security_policy:: See Gem::Installer::new and Gem::Security.
    # :user_install:: See Gem::Installer.new
 @@ -25,27 +25,27 @@ Add install_root option for pkgsrc's rub
        Gem::Specification.dirs = @install_dir
 +    else
 +      @install_dir = Gem.dir
      end
      options = DEFAULT_OPTIONS.merge options
 @@ -91,7 +93,12 @@ class Gem::DependencyInstaller
      @installed_gems = []
      @toplevel_specs = nil
 -    @cache_dir = options[:cache_dir] || @install_dir
 +    @install_root = options[:install_root] || ""
 +    install_dir = @install_dir
-+    if not @install_root.empty?
++    unless @install_root.nil? or @install_root.empty?
 +      install_dir = File.join(@install_root, install_dir)
 +    end
 +    @cache_dir = options[:cache_dir] || install_dir
      # Set with any errors that SpecFetcher finds while search through
      # gemspecs for a dep
 @@ -363,6 +370,7 @@ class Gem::DependencyInstaller
                                  :format_executable   => @format_executable,
                                  :ignore_dependencies => @ignore_dependencies,
                                  :install_dir         => @install_dir,
 +                                :install_root        => @install_root,
                                  :security_policy     => @security_policy,
                                  :user_install        => @user_install,

 @@ -1,14 +1,14 @@
-$NetBSD: patch-ad,v 1.13 2013/09/10 16:33:29 taca Exp $
+$NetBSD: patch-ad,v 1.14 2014/02/19 15:47:32 taca Exp $
 * Add install_root option for pkgsrc's rubygems support.
 --- lib/rubygems/installer.rb.orig	2013-09-09 23:41:27.000000000 +0000
 +++ lib/rubygems/installer.rb
 @@ -98,6 +98,9 @@ class Gem::Installer
    #                      foo_exec18.
    # :ignore_dependencies:: Don't raise if a dependency is missing.
    # :install_dir:: The directory to install the gem into.
 +  # :install_root:: The directory to use as a buildroot for "destdir"-style
 +  #		  installation.  All paths during installation are relative
 +  #               to the buildroot.
    # :security_policy:: Use the specified security policy.  See Gem::Security
 @@ -22,20 +22,20 @@ $NetBSD: patch-ad,v 1.13 2013/09/10 16:3
 +      :only_install_dir => false,
 +      :install_root => nil,
      }.merge options
      @env_shebang         = options[:env_shebang]
 @@ -563,8 +567,13 @@ class Gem::Installer
      # If the user has asked for the gem to be installed in a directory that is
      # the system gem directory, then use the system bin directory, else create
      # (or use) a new bin dir under the gem_home.
 -    @bin_dir             = options[:bin_dir] || Gem.bindir(gem_home)
 +    install_root         = options[:install_root]
 +    @bin_dir             = options[:bin_dir] || Gem.bindir(gem_home, install_root)
      @development         = options[:development]
-+    unless install_root.nil? or install_root == ""
++    unless install_root.nil? or install_root.empty?
 +      @install_root = File.expand_path install_root
 +      @gem_home = File.join(@install_root, @gem_home)
 +    end
      @build_args          = options[:build_args] || Gem::Command.build_args
    end

 @@ -1,35 +1,35 @@
-$NetBSD: patch-ah,v 1.13 2013/09/10 16:33:29 taca Exp $
+$NetBSD: patch-ah,v 1.14 2014/02/19 15:47:32 taca Exp $
 Add install_root option for pkgsrc's rubygems support.
 --- lib/rubygems.rb.orig	2013-09-09 23:41:27.000000000 +0000
 +++ lib/rubygems.rb
 @@ -291,11 +291,17 @@ module Gem
    ##
    # The path where gem executables are to be installed.
 -  def self.bindir(install_dir=Gem.dir)
 +  def self.bindir(install_dir=Gem.dir, install_root=nil)
      # TODO: move to Gem::Dirs
 -    return File.join install_dir, 'bin' unless
 -      install_dir.to_s == Gem.default_dir.to_s
 -    Gem.default_bindir
 +    if install_dir.to_s == Gem.default_dir.to_s
 +      install_dir = Gem.default_bindir
 +    else
 +      install_dir = File.join install_dir, 'bin'
 +    end
-+    unless install_root.nil?
++    unless install_root.nil? or install_root.empty?
 +      install_dir = File.join install_root, install_dir
 +    end
 +    install_dir
    end
    ##
 @@ -551,12 +557,12 @@ module Gem
    ##
    # The index to insert activated gem paths into the $LOAD_PATH.
+   #
 -  # Defaults to the site lib directory unless gem_prelude.rb has loaded paths,
 +  # Defaults to the vendor lib directory unless gem_prelude.rb has loaded paths,
    # then it inserts the activated gem's paths before the gem_prelude.rb paths

 @@ -1,31 +1,31 @@
-$NetBSD: patch-ag,v 1.10 2013/06/11 14:55:54 taca Exp $
+$NetBSD: patch-ag,v 1.11 2014/02/19 15:47:32 taca Exp $
 Add install_root option for pkgsrc's rubygems support.
 --- lib/rubygems/uninstaller.rb.orig	2013-02-12 20:04:55.000000000 +0000
 +++ lib/rubygems/uninstaller.rb
 @@ -51,6 +51,11 @@ class Gem::Uninstaller
      @force_ignore      = options[:ignore]
      @bin_dir           = options[:bin_dir]
      @format_executable = options[:format_executable]
 +    install_root = options[:install_root]
-+    unless install_root.nil? or install_root == ""
++    unless install_root.nil? or install_root.empty?
 +      @install_root = File.expand_path install_root
 +      @gem_home = File.join(@install_root, @gem_home)
 +    end
      # Indicate if development dependencies should be checked when
      # uninstalling. (default: false)
 @@ -199,7 +204,11 @@ class Gem::Uninstaller
               end
      if remove then
 -      bin_dir = @bin_dir || Gem.bindir(spec.base_dir)
 +      bin_dir = @bin_dir || (Gem.bindir @gem_home, @install_root)
++
-+      unless @install_root.nil? or @install_root == ""
++      unless @install_root.nil? or @install_root.empty?
 +        bindir = File.join(@install_root, bindir)
 +      end
        raise Gem::FilePermissionError, bin_dir unless File.writable? bin_dir