Update rubygems to 1.3.7.

o pkgsrc changes:

  * Add patches to keep output of specification sub-command as before.
  * Make sure to 'yaml is loaded in Gem::Specification::from_yaml().


=== 1.3.7 / 2010-05-13

NOTE:

http://rubygems.org is now the default source for downloading gems.

You may have sources set via ~/.gemrc, so you should replace
http://gems.rubyforge.org with http://rubygems.org

http://gems.rubyforge.org will continue to work for the forseeable future.

New features:

* `gem` commands
  * `gem install` and `gem fetch` now report alternate platforms when a
    matching one couldn't be found.
  * `gem contents` --prefix is now the default as specified in --help.  Bug
    #27211 by Mamoru Tasaka.
  * `gem fetch` can fetch of old versions again.  Bug #27960 by Eric Hankins.
  * `gem query` and friends output now lists platforms.  Bug #27856 by Greg
    Hazel.
  * `gem server` now allows specification of multiple gem dirs for
    documentation.  Bug #27573 by Yuki Sonoda.
  * `gem unpack` can unpack gems again.  Bug #27872 by Timothy Jones.
  * `gem unpack` now unpacks remote gems.
  * --user-install is no longer the default.  If you really liked it, see
    Gem::ConfigFile to learn how to set it by default.  (This change was made
    in 1.3.6)
* RubyGems now has platform support for IronRuby.  Patch #27951 by Will Green.

Bug fixes:

* Require rubygems/custom_require if --disable-gem was set.  Bug #27700 by
  Roger Pack.
* RubyGems now protects against exceptions being raised by plugins.
* rubygems/builder now requires user_interaction.  Ruby Bug #1040 by Phillip
  Toland.
* Gem::Dependency support #version_requirements= with a warning.  Fix for old
  Rails versions.  Bug #27868 by Wei Jen Lu.
* Gem::PackageTask depends on the package dir like the other rake package
  tasks so dependencies can be hooked up correctly.

=== 1.3.6 / 2010-02-17

New features:

* `gem` commands
  * Added `gem push` and `gem owner` for interacting with modern/Gemcutter
    sources
  * `gem dep` now supports --prerelease.
  * `gem fetch` now supports --prerelease.
  * `gem server` now supports --bind.  Patch #27357 by Bruno Michel.
  * `gem rdoc` no longer overwrites built documentation.  Use --overwrite
    force rebuilding.  Patch #25982 by Akinori MUSHA.
* Captial letters are now allowed in prerelease versions.

Bug fixes:

* Development deps are no longer added to rubygems-update gem so older
  versions can update sucessfully.
* Installer bugs:
  * Prerelease gems can now depend on non-prerelease gems.
  * Development dependencies are ignored unless explicitly needed.  Bug #27608
    by Roger Pack.
* `gem` commands
  * `gem which` now fails if no paths were found.  Adapted patch #27681 by
    Caio Chassot.
  * `gem server` no longer has invalid markup.  Bug #27045 by Eric Young.
  * `gem list` and friends show both prerelease and regular gems when
    --prerelease --all is given
* Gem::Format no longer crashes on empty files.  Bug #27292 by Ian Ragsdale.
* Gem::GemPathSearcher handles nil require_paths. Patch #27334 by Roger Pack.
* Gem::RemoteFetcher no longer copies the file if it is where we want it.
  Patch #27409 by Jakub Stastny.

Deprecation Notices:

* lib/rubygems/timer.rb has been removed.
* Gem::Dependency#version_requirements is deprecated and will be removed on or
  after August 2010.
* Bulk index update is no longer supported.
* Gem::manage_gems was removed in 1.3.3.
* Time::today was removed in 1.3.3.

14 files changed, 150 insertions, 84 deletions

diff --git a/misc/rubygems/Makefile b/misc/rubygems/Makefile
index a416750e664..ae1d85f993f 100644
--- a/misc/rubygems/Makefile
+++ b/misc/rubygems/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2010/09/13 07:54:34 obache Exp $
+# $NetBSD: Makefile,v 1.34 2010/09/16 12:02:05 taca Exp $
 
-DISTNAME=	rubygems-1.3.5
-PKGREVISION=	3
+DISTNAME=	rubygems-1.3.7
 CATEGORIES=	misc ruby
-MASTER_SITES=	http://rubyforge.org/frs/download.php/60718/
+MASTER_SITES=	http://rubyforge.org/frs/download.php/70696/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	taca@NetBSD.org
diff --git a/misc/rubygems/PLIST b/misc/rubygems/PLIST
index a435482a459..d2c00301b31 100644
--- a/misc/rubygems/PLIST
+++ b/misc/rubygems/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2010/09/10 03:48:40 taca Exp $
+@comment $NetBSD: PLIST,v 1.15 2010/09/16 12:02:05 taca Exp $
 bin/gem${RUBY_VER}
 ${RUBY_VENDORLIB}/gauntlet_rubygems.rb
 ${RUBY_VENDORLIB}/rbconfig/datadir.rb
@@ -21,7 +21,9 @@ ${RUBY_VENDORLIB}/rubygems/commands/list_command.rb
 ${RUBY_VENDORLIB}/rubygems/commands/lock_command.rb
 ${RUBY_VENDORLIB}/rubygems/commands/mirror_command.rb
 ${RUBY_VENDORLIB}/rubygems/commands/outdated_command.rb
+${RUBY_VENDORLIB}/rubygems/commands/owner_command.rb
 ${RUBY_VENDORLIB}/rubygems/commands/pristine_command.rb
+${RUBY_VENDORLIB}/rubygems/commands/push_command.rb
 ${RUBY_VENDORLIB}/rubygems/commands/query_command.rb
 ${RUBY_VENDORLIB}/rubygems/commands/rdoc_command.rb
 ${RUBY_VENDORLIB}/rubygems/commands/search_command.rb
@@ -40,11 +42,8 @@ ${RUBY_VENDORLIB}/rubygems/defaults.rb
 ${RUBY_VENDORLIB}/rubygems/dependency.rb
 ${RUBY_VENDORLIB}/rubygems/dependency_installer.rb
 ${RUBY_VENDORLIB}/rubygems/dependency_list.rb
-${RUBY_VENDORLIB}/rubygems/digest/digest_adapter.rb
-${RUBY_VENDORLIB}/rubygems/digest/md5.rb
-${RUBY_VENDORLIB}/rubygems/digest/sha1.rb
-${RUBY_VENDORLIB}/rubygems/digest/sha2.rb
 ${RUBY_VENDORLIB}/rubygems/doc_manager.rb
+${RUBY_VENDORLIB}/rubygems/errors.rb
 ${RUBY_VENDORLIB}/rubygems/exceptions.rb
 ${RUBY_VENDORLIB}/rubygems/ext.rb
 ${RUBY_VENDORLIB}/rubygems/ext/builder.rb
@@ -55,6 +54,7 @@ ${RUBY_VENDORLIB}/rubygems/format.rb
 ${RUBY_VENDORLIB}/rubygems/gem_openssl.rb
 ${RUBY_VENDORLIB}/rubygems/gem_path_searcher.rb
 ${RUBY_VENDORLIB}/rubygems/gem_runner.rb
+${RUBY_VENDORLIB}/rubygems/gemcutter_utilities.rb
 ${RUBY_VENDORLIB}/rubygems/indexer.rb
 ${RUBY_VENDORLIB}/rubygems/install_update_options.rb
 ${RUBY_VENDORLIB}/rubygems/installer.rb
@@ -82,7 +82,6 @@ ${RUBY_VENDORLIB}/rubygems/spec_fetcher.rb
 ${RUBY_VENDORLIB}/rubygems/specification.rb
 ${RUBY_VENDORLIB}/rubygems/test_utilities.rb
 ${RUBY_VENDORLIB}/rubygems/text.rb
-${RUBY_VENDORLIB}/rubygems/timer.rb
 ${RUBY_VENDORLIB}/rubygems/uninstaller.rb
 ${RUBY_VENDORLIB}/rubygems/user_interaction.rb
 ${RUBY_VENDORLIB}/rubygems/validator.rb
diff --git a/misc/rubygems/distinfo b/misc/rubygems/distinfo
index d45339ab3b4..2e24ebf3a6c 100644
--- a/misc/rubygems/distinfo
+++ b/misc/rubygems/distinfo
@@ -1,19 +1,21 @@
-$NetBSD: distinfo,v 1.25 2010/09/10 03:48:40 taca Exp $
+$NetBSD: distinfo,v 1.26 2010/09/16 12:02:05 taca Exp $
 
-SHA1 (rubygems-1.3.5.tgz) = 8545f25d00c757a310b879a2580e56d6012fc981
-RMD160 (rubygems-1.3.5.tgz) = 2d17f0de2d387bd2a034916cb79531110f3be196
-Size (rubygems-1.3.5.tgz) = 278469 bytes
-SHA1 (patch-aa) = fc267424284e9e020c9b4643330f429b1b934512
-SHA1 (patch-ab) = b4c9df1c829ba5d2159f43e999a2b696ceaea96d
+SHA1 (rubygems-1.3.7.tgz) = 68ad2970963db9893b76acc8777be72a77c4bee4
+RMD160 (rubygems-1.3.7.tgz) = 2ea8e16d1535216045798258603d5f2f9e3dbfea
+Size (rubygems-1.3.7.tgz) = 290986 bytes
+SHA1 (patch-aa) = 8fa88c8b44a792740a695571ce5e66fcbc6cbaca
+SHA1 (patch-ab) = 6e98c1d41e5bb9f824d60073354837ebf2e7d2d1
 SHA1 (patch-ac) = de613df5f7b17e3a9fe5cbc4febe6bebe479dff8
-SHA1 (patch-ad) = 3bc027ca7a020edc158e01a71d4d3b55a994e2d0
+SHA1 (patch-ad) = 8fd15e71a152e535879b945ec17a62128e59767d
 SHA1 (patch-af) = f8ba8859790d55bfadee6aadff97eda8218b5811
 SHA1 (patch-ag) = c5bfa929fe235f13577a7430d270d90129e55e57
-SHA1 (patch-ah) = d7564cce46999d2d82b1290abddc863dea2498ab
-SHA1 (patch-aj) = 5950f31e8e0c533663816bd8b8a592548f8b452b
-SHA1 (patch-ak) = aa1aceba13e9b4c7d90ba28061fac5a502a5efbe
+SHA1 (patch-ah) = e2ac7c3b589760de461190152279c71c37c0999a
+SHA1 (patch-aj) = eb079e5b072c65f8b60df33c6b53791bb5129b38
+SHA1 (patch-ak) = 07ae4c4b0585fb359802779f6b71a6f1fe0bf21b
 SHA1 (patch-al) = d0e26e23501274749831ff4bd9f4f8ff8bc774ab
-SHA1 (patch-am) = 0d77f1d03ef372b1de337e332b4d669857bc4d98
-SHA1 (patch-an) = 233524d9fc5522942989006d87afae13c46b818d
-SHA1 (patch-ao) = b1d713a0cd10cae91657440cb97c4043a00d2ff8
+SHA1 (patch-am) = 83f22425e521ac577d91c17d9b0dcb79e086dc01
+SHA1 (patch-an) = f583e03e69aba2543a2b858a376eb81fb7a4a581
+SHA1 (patch-ao) = 672f0f4c79ef3d3aee949cc0154e7071c1437e1b
 SHA1 (patch-ap) = c70cd7cf263ef53fc4fde1fd9b499563dab1325b
+SHA1 (patch-aq) = 154447711ad03c634bb83b1764d811aea5ced96c
+SHA1 (patch-ar) = 450d5d380d4bca3600183622ace1a8bbc6e4d79b
diff --git a/misc/rubygems/patches/patch-aa b/misc/rubygems/patches/patch-aa
index a79b646efe1..3de73ed99ca 100644
--- a/misc/rubygems/patches/patch-aa
+++ b/misc/rubygems/patches/patch-aa
@@ -1,10 +1,19 @@
-$NetBSD: patch-aa,v 1.8 2010/09/10 03:48:40 taca Exp $
+$NetBSD: patch-aa,v 1.9 2010/09/16 12:02:05 taca Exp $
 
+* Make sure to load YAML.
 * Avoid access nil.
 
---- lib/rubygems/specification.rb.orig	2009-05-19 17:41:16.000000000 -0700
+--- lib/rubygems/specification.rb.orig	2010-04-22 04:43:03.000000000 +0000
 +++ lib/rubygems/specification.rb
-@@ -812,12 +812,12 @@ class Gem::Specification
+@@ -476,6 +476,7 @@ class Gem::Specification
+   # 'input' can be anything that YAML.load() accepts: String or IO.
+ 
+   def self.from_yaml(input)
++    require 'yaml'
+     input = normalize_yaml_input input
+     spec = YAML.load input
+ 
+@@ -837,12 +838,12 @@ class Gem::Specification
      end
  
      @files.delete_if            do |file| File.directory? file end
diff --git a/misc/rubygems/patches/patch-ab b/misc/rubygems/patches/patch-ab
index 2fbe4eafc08..151e5d28c75 100644
--- a/misc/rubygems/patches/patch-ab
+++ b/misc/rubygems/patches/patch-ab
@@ -1,15 +1,15 @@
-$NetBSD: patch-ab,v 1.11 2010/09/10 03:48:40 taca Exp $
+$NetBSD: patch-ab,v 1.12 2010/09/16 12:02:05 taca Exp $
 
 Add install_root option for pkgsrc's rubygems support.
 
---- lib/rubygems/dependency_installer.rb.orig	2009-03-04 17:07:04.000000000 -0800
+--- lib/rubygems/dependency_installer.rb.orig	2010-04-22 04:43:02.000000000 +0000
 +++ lib/rubygems/dependency_installer.rb
 @@ -38,6 +38,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
+   # :prerelease:: Allow prerelease versions.  See #install.
    # :security_policy:: See Gem::Installer::new and Gem::Security.
    # :user_install:: See Gem::Installer.new
 @@ -45,7 +46,11 @@ class Gem::DependencyInstaller
@@ -36,10 +36,10 @@ Add install_root option for pkgsrc's rubygems support.
 +      install_dir = File.join(@install_root, @install_dir)
 +    end
 +    @cache_dir = options[:cache_dir] || install_dir
-   end
  
-   ##
-@@ -244,6 +254,7 @@ class Gem::DependencyInstaller
+     # Set with any errors that SpecFetcher finds while search through
+     # gemspecs for a dep
+@@ -269,6 +279,7 @@ class Gem::DependencyInstaller
                                  :format_executable   => @format_executable,
                                  :ignore_dependencies => @ignore_dependencies,
                                  :install_dir         => @install_dir,
diff --git a/misc/rubygems/patches/patch-ad b/misc/rubygems/patches/patch-ad
index 6da53d1749a..3280a18f965 100644
--- a/misc/rubygems/patches/patch-ad
+++ b/misc/rubygems/patches/patch-ad
@@ -1,10 +1,10 @@
-$NetBSD: patch-ad,v 1.6 2010/09/10 03:48:40 taca Exp $
+$NetBSD: patch-ad,v 1.7 2010/09/16 12:02:05 taca Exp $
 
 Add install_root option for pkgsrc's rubygems support.
 
---- lib/rubygems/installer.rb.orig	2009-03-31 21:06:19.000000000 -0700
+--- lib/rubygems/installer.rb.orig	2010-04-20 06:47:36.000000000 +0000
 +++ lib/rubygems/installer.rb
-@@ -85,6 +85,9 @@ class Gem::Installer
+@@ -84,6 +84,9 @@ class Gem::Installer
    #          for a signed-gems-only policy.
    # :ignore_dependencies:: Don't raise if a dependency is missing.
    # :install_dir:: The directory to install the gem into.
@@ -14,7 +14,7 @@ Add install_root option for pkgsrc's rubygems support.
    # :format_executable:: Format the executable the same as the ruby executable.
    #                      If your ruby is ruby18, foo_exec will be installed as
    #                      foo_exec18.
-@@ -100,6 +103,7 @@ class Gem::Installer
+@@ -99,6 +102,7 @@ class Gem::Installer
        :exec_format  => false,
        :force        => false,
        :install_dir  => Gem.dir,
@@ -22,7 +22,7 @@ Add install_root option for pkgsrc's rubygems support.
        :source_index => Gem.source_index,
      }.merge options
  
-@@ -114,6 +118,11 @@ class Gem::Installer
+@@ -113,6 +117,11 @@ class Gem::Installer
      @bin_dir             = options[:bin_dir]
      @development         = options[:development]
      @source_index        = options[:source_index]
@@ -34,7 +34,7 @@ Add install_root option for pkgsrc's rubygems support.
  
      begin
        @format = Gem::Format.from_file_by_path @gem, @security_policy
-@@ -312,7 +321,11 @@ class Gem::Installer
+@@ -289,7 +298,11 @@ 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.
diff --git a/misc/rubygems/patches/patch-ah b/misc/rubygems/patches/patch-ah
index 53eee21e4a7..6bafbfb4b4e 100644
--- a/misc/rubygems/patches/patch-ah
+++ b/misc/rubygems/patches/patch-ah
@@ -1,10 +1,10 @@
-$NetBSD: patch-ah,v 1.6 2010/09/10 03:48:40 taca Exp $
+$NetBSD: patch-ah,v 1.7 2010/09/16 12:02:05 taca Exp $
 
 Add install_root option for pkgsrc's rubygems support.
 
---- lib/rubygems.rb.orig	2009-07-21 23:46:08.000000000 +0000
+--- lib/rubygems.rb.orig	2010-05-14 03:59:10.000000000 +0000
 +++ lib/rubygems.rb
-@@ -397,7 +397,10 @@ module Gem
+@@ -348,7 +348,10 @@ module Gem
    ##
    # The path where gem executables are to be installed.
  
@@ -16,7 +16,7 @@ Add install_root option for pkgsrc's rubygems support.
      return File.join(install_dir, 'bin') unless
        install_dir.to_s == Gem.default_dir
      Gem.default_bindir
-@@ -638,12 +641,12 @@ module Gem
+@@ -589,12 +592,12 @@ module Gem
    ##
    # The index to insert activated gem paths into the $LOAD_PATH.
    #
@@ -31,25 +31,11 @@ Add install_root option for pkgsrc's rubygems support.
  
      $LOAD_PATH.each_with_index do |path, i|
        if path.instance_variables.include?(:@gem_prelude_index) or
-@@ -749,14 +752,16 @@ module Gem
-   # The directory prefix this RubyGems was installed at.
+@@ -704,6 +707,7 @@ module Gem
+     prefix = File.dirname dir
  
-   def self.prefix
--    prefix = File.dirname File.expand_path(__FILE__)
-+    dir = File.dirname File.expand_path(__FILE__)
-+    prefix = File.dirname dir
- 
--    if File.dirname(prefix) == File.expand_path(ConfigMap[:sitelibdir]) or
--       File.dirname(prefix) == File.expand_path(ConfigMap[:libdir]) or
--       'lib' != File.basename(prefix) then
-+    if prefix == File.expand_path(ConfigMap[:sitelibdir]) or
+     if prefix == File.expand_path(ConfigMap[:sitelibdir]) or
 +       prefix == File.expand_path(ConfigMap[:vendorlibdir]) or
-+       prefix == File.expand_path(ConfigMap[:libdir]) or
-+       'lib' != File.basename(dir) then
+        prefix == File.expand_path(ConfigMap[:libdir]) or
+        'lib' != File.basename(dir) then
        nil
-     else
--      File.dirname prefix
-+      prefix
-     end
-   end
- 
diff --git a/misc/rubygems/patches/patch-aj b/misc/rubygems/patches/patch-aj
index 15685ad4320..9a6faa3d1fe 100644
--- a/misc/rubygems/patches/patch-aj
+++ b/misc/rubygems/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.5 2010/09/10 03:48:40 taca Exp $
+$NetBSD: patch-aj,v 1.6 2010/09/16 12:02:05 taca Exp $
 
 Use vendordir instead of sitedir.
 
---- lib/rubygems/defaults.rb.orig	2009-05-20 16:30:35.000000000 -0700
+--- lib/rubygems/defaults.rb.orig	2010-04-20 05:57:27.000000000 +0000
 +++ lib/rubygems/defaults.rb
 @@ -18,7 +18,7 @@ module Gem
  
@@ -11,5 +11,5 @@ Use vendordir instead of sitedir.
 -      File.join File.dirname(ConfigMap[:sitedir]), 'Gems',
 +      File.join File.dirname(ConfigMap[:vendordir]), 'Gems',
                  ConfigMap[:ruby_version]
-     # 1.9.2dev reverted to 1.8 style path
-     elsif RUBY_VERSION > '1.9' and RUBY_VERSION < '1.9.2' then
+     elsif ConfigMap[:rubylibprefix] then
+       File.join(ConfigMap[:rubylibprefix], 'gems',
diff --git a/misc/rubygems/patches/patch-ak b/misc/rubygems/patches/patch-ak
index b59e71be76c..71d1253442f 100644
--- a/misc/rubygems/patches/patch-ak
+++ b/misc/rubygems/patches/patch-ak
@@ -1,10 +1,10 @@
-$NetBSD: patch-ak,v 1.4 2010/09/10 03:48:40 taca Exp $
+$NetBSD: patch-ak,v 1.5 2010/09/16 12:02:05 taca Exp $
 
 Use vendordir instead of sitedir.
 
---- test/test_gem.rb.orig	2009-07-05 17:26:22.000000000 +0000
+--- test/test_gem.rb.orig	2010-04-20 05:57:21.000000000 +0000
 +++ test/test_gem.rb
-@@ -425,18 +425,18 @@ class TestGem < RubyGemTestCase
+@@ -426,18 +426,18 @@ class TestGem < RubyGemTestCase
      Gem::ConfigMap[:libdir] = orig_libdir
    end
  
diff --git a/misc/rubygems/patches/patch-am b/misc/rubygems/patches/patch-am
index 2f9abc362cc..85d44a010b5 100644
--- a/misc/rubygems/patches/patch-am
+++ b/misc/rubygems/patches/patch-am
@@ -1,26 +1,26 @@
-$NetBSD: patch-am,v 1.1 2010/09/10 03:48:40 taca Exp $
+$NetBSD: patch-am,v 1.2 2010/09/16 12:02:05 taca Exp $
 
 Make sure to setup under DESTDIR.
 
---- lib/rubygems/commands/setup_command.rb.orig	2009-06-26 00:43:45.000000000 +0000
+--- lib/rubygems/commands/setup_command.rb.orig	2010-04-20 06:47:36.000000000 +0000
 +++ lib/rubygems/commands/setup_command.rb
-@@ -117,7 +117,7 @@ By default, this RubyGems will install g
+@@ -118,7 +118,7 @@ By default, this RubyGems will install g
  
-     say "RubyGems #{Gem::VERSION} installed"
+     uninstall_old_gemcutter
  
 -    install_rdoc
 +    install_rdoc install_destdir
  
      say
      if @verbose then
-@@ -228,16 +228,20 @@ TEXT
+@@ -229,16 +229,20 @@ TEXT
      end
    end
  
 -  def install_rdoc
 +  def install_rdoc(install_destdir)
      gem_doc_dir = File.join Gem.dir, 'doc'
-     rubygems_name = "rubygems-#{Gem::RubyGemsVersion}"
+     rubygems_name = "rubygems-#{Gem::VERSION}"
      rubygems_doc_dir = File.join gem_doc_dir, rubygems_name
  
 +    unless install_destdir.empty?
diff --git a/misc/rubygems/patches/patch-an b/misc/rubygems/patches/patch-an
index dbd9311748c..45da647a940 100644
--- a/misc/rubygems/patches/patch-an
+++ b/misc/rubygems/patches/patch-an
@@ -1,8 +1,8 @@
-$NetBSD: patch-an,v 1.1 2010/09/10 03:48:40 taca Exp $
+$NetBSD: patch-an,v 1.2 2010/09/16 12:02:05 taca Exp $
 
 Add install_root option for pkgsrc's rubygems support.
 
---- lib/rubygems/commands/unpack_command.rb.orig	2009-06-22 22:54:36.000000000 +0000
+--- lib/rubygems/commands/unpack_command.rb.orig	2010-04-20 06:46:32.000000000 +0000
 +++ lib/rubygems/commands/unpack_command.rb
 @@ -12,6 +12,10 @@ class Gem::Commands::UnpackCommand < Gem
            :version => Gem::Requirement.default,
@@ -12,12 +12,12 @@ Add install_root option for pkgsrc's rubygems support.
 +      options[:install_root] = value
 +    end
 +
-     add_option('--target=DIR', 'target directory for unpacking') do |value, options|
+     add_option('--target=DIR',
+                'target directory for unpacking') do |value, options|
        options[:target] = value
-     end
-@@ -44,7 +48,8 @@ class Gem::Commands::UnpackCommand < Gem
-         basename = File.basename(path).sub(/\.gem$/, '')
-         target_dir = File.expand_path File.join(options[:target], basename)
+@@ -56,7 +60,8 @@ class Gem::Commands::UnpackCommand < Gem
+         basename = File.basename path, '.gem'
+         target_dir = File.expand_path basename, options[:target]
          FileUtils.mkdir_p target_dir
 -        Gem::Installer.new(path, :unpack => true).unpack target_dir
 +        Gem::Installer.new(path, :unpack => true,
diff --git a/misc/rubygems/patches/patch-ao b/misc/rubygems/patches/patch-ao
index c41cc8dbba7..a5e8c53ba94 100644
--- a/misc/rubygems/patches/patch-ao
+++ b/misc/rubygems/patches/patch-ao
@@ -1,10 +1,10 @@
-$NetBSD: patch-ao,v 1.1 2010/09/10 03:48:40 taca Exp $
+$NetBSD: patch-ao,v 1.2 2010/09/16 12:02:05 taca Exp $
 
 Don't hard code config file's path for gem.
 
---- lib/rubygems/config_file.rb.orig	2009-06-25 21:37:14.000000000 +0000
+--- lib/rubygems/config_file.rb.orig	2010-02-16 04:14:16.000000000 +0000
 +++ lib/rubygems/config_file.rb
-@@ -29,26 +29,7 @@ class Gem::ConfigFile
+@@ -45,26 +45,7 @@ class Gem::ConfigFile
  
    PLATFORM_DEFAULTS = {}
  
diff --git a/misc/rubygems/patches/patch-aq b/misc/rubygems/patches/patch-aq
new file mode 100644
index 00000000000..cf65b00f9d9
--- /dev/null
+++ b/misc/rubygems/patches/patch-aq
@@ -0,0 +1,53 @@
+$NetBSD: patch-aq,v 1.1 2010/09/16 12:02:05 taca Exp $
+
+* Keep backward compatible with 1.3.5 for "gem spec" output.
+
+--- lib/rubygems/dependency.rb.orig	2010-04-20 05:57:25.000000000 +0000
++++ lib/rubygems/dependency.rb
+@@ -58,14 +58,14 @@ class Gem::Dependency
+     end
+ 
+     @name        = name
+-    @requirement = Gem::Requirement.create requirements
++    requirement = Gem::Requirement.create requirements
+     @type        = type
+     @prerelease  = false
+ 
+     # This is for Marshal backwards compatability. See the comments in
+     # +requirement+ for the dirty details.
+ 
+-    @version_requirements = @requirement
++    @version_requirements = requirement
+   end
+ 
+   ##
+@@ -107,7 +107,10 @@ class Gem::Dependency
+   # What does this dependency require?
+ 
+   def requirement
+-    return @requirement if defined?(@requirement) and @requirement
++    if defined?(@requirement) and @requirement
++      @version_requirements = @requirement
++      remove_instance_variable :@requirement
++    end
+ 
+     # @version_requirements and @version_requirement are legacy ivar
+     # names, and supported here because older gems need to keep
+@@ -130,7 +133,7 @@ class Gem::Dependency
+       @version_requirements = Gem::Requirement.new version
+     end
+ 
+-    @requirement = @version_requirements if defined?(@version_requirements)
++    @version_requirements if defined?(@version_requirements)
+   end
+ 
+   ##
+@@ -168,7 +171,7 @@ class Gem::Dependency
+          "and will be removed on or after August 2010.  " \
+          "Use Gem::Dependency.new."
+ 
+-    @requirement = Gem::Requirement.create requirements
++    @version_requirements = Gem::Requirement.create requirements
+   end
+ 
+   def == other # :nodoc:
diff --git a/misc/rubygems/patches/patch-ar b/misc/rubygems/patches/patch-ar
new file mode 100644
index 00000000000..54ed27e9801
--- /dev/null
+++ b/misc/rubygems/patches/patch-ar
@@ -0,0 +1,18 @@
+$NetBSD: patch-ar,v 1.1 2010/09/16 12:02:05 taca Exp $
+
+* Keep backward compatible with 1.3.5 for "gem spec" output.
+
+--- lib/rubygems/version.rb.orig	2010-04-20 05:57:26.000000000 +0000
++++ lib/rubygems/version.rb
+@@ -227,6 +227,11 @@ class Gem::Version
+     [version]
+   end
+ 
++  # also YAML property 
++  def to_yaml_properties
++    ['@version']
++  end
++
+   ##
+   # Load custom marshal format. It's a string for backwards (RubyGems
+   # 1.3.5 and earlier) compatibility.