Update misc/rubygems to 1.1.1. Changes from version 1.1.0 include:

* Gem.prefix now returns non-nil only when RubyGems was installed outside
  sitelibdir or libdir.
* The `gem server` gem list now correctly links to gem details.
* `gem update --system` now passes --no-format-executable to setup.rb.
* Gem::SourceIndex#refresh! now works with multiple gem repositories.
* Downloaded gems now go into --install-dir's cache directory.
* Various fixes to downloading gem metadata.
* `gem install --force` now ignores network errors too.
* `gem pristine` now rebuilds extensions.
* `gem update --system` now works on virgin Apple ruby.
* Gem::RemoteFetcher handles Errno::ECONNABORTED.

5 files changed, 41 insertions, 41 deletions

diff --git a/misc/rubygems/Makefile b/misc/rubygems/Makefile
index 77fa867b6f5..2b93952dd33 100644
--- a/misc/rubygems/Makefile
+++ b/misc/rubygems/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2008/03/31 15:40:43 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2008/04/13 06:01:59 jlam Exp $
 
-DISTNAME=	rubygems-1.1.0
+DISTNAME=	rubygems-1.1.1
 CATEGORIES=	misc ruby
-MASTER_SITES=	http://rubyforge.org/frs/download.php/34638/
+MASTER_SITES=	http://rubyforge.org/frs/download.php/35283/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	minskim@NetBSD.org
diff --git a/misc/rubygems/distinfo b/misc/rubygems/distinfo
index e8e0a816b3d..f09d576ab50 100644
--- a/misc/rubygems/distinfo
+++ b/misc/rubygems/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.15 2008/03/31 15:40:43 jlam Exp $
+$NetBSD: distinfo,v 1.16 2008/04/13 06:01:59 jlam Exp $
 
-SHA1 (rubygems-1.1.0.tgz) = 2379e510267ed1c979987a618c9f139e58266d28
-RMD160 (rubygems-1.1.0.tgz) = 934b6ee3dfcd68b4ac93616ce40c4921d3f2e766
-Size (rubygems-1.1.0.tgz) = 426191 bytes
+SHA1 (rubygems-1.1.1.tgz) = e1ead11fa2928fb4b7871c17fd1186198c97c11a
+RMD160 (rubygems-1.1.1.tgz) = 264b6c2667fd74c111b6886da13b324bc391eaa8
+Size (rubygems-1.1.1.tgz) = 423308 bytes
 SHA1 (patch-aa) = 43d31663301d537f4fb25df61f499e59efefc60c
-SHA1 (patch-ab) = 7713e164288dd8010867808085acba8e55b50845
+SHA1 (patch-ab) = e5c3bcdb1220067b7fb6f45bd0311894e683c8b9
 SHA1 (patch-ac) = e007358881509523f2c2821ced208f5bd9b5a232
 SHA1 (patch-ad) = b7e9a459ccb0305591db97ab7214ddc5befa24f0
-SHA1 (patch-ae) = 033fc1465fd689a5c814f7a58843945bc2fe020f
+SHA1 (patch-ae) = 5aea3680a24b444b9eb6bf8ae6af24ac89ce695e
 SHA1 (patch-af) = c18ecbbf52cdd68543cd1e11742045f0295dc337
 SHA1 (patch-ag) = 699d5830c20f0f026b074e5ef4546853df022136
-SHA1 (patch-ah) = da89120c46f4f5dda46861af06bce7e6e8595c4f
+SHA1 (patch-ah) = a28e462e368a02194006fe2e5fb7855f97164661
diff --git a/misc/rubygems/patches/patch-ab b/misc/rubygems/patches/patch-ab
index dacd0d14678..674e7ecd9c0 100644
--- a/misc/rubygems/patches/patch-ab
+++ b/misc/rubygems/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.6 2008/03/31 15:40:43 jlam Exp $
+$NetBSD: patch-ab,v 1.7 2008/04/13 06:01:59 jlam Exp $
 
---- lib/rubygems/dependency_installer.rb.orig	2008-03-20 21:00:57.000000000 -0400
+--- lib/rubygems/dependency_installer.rb.orig	2008-04-04 21:10:11.000000000 -0400
 +++ lib/rubygems/dependency_installer.rb
 @@ -33,6 +33,7 @@ class Gem::DependencyInstaller
    # :format_executable:: See Gem::Installer#initialize.
@@ -32,17 +32,16 @@ $NetBSD: patch-ab,v 1.6 2008/03/31 15:40:43 jlam Exp $
      source_index = Gem::SourceIndex.from_gems_in spec_dir
  
      @gems_to_install.each do |spec|
-@@ -189,7 +196,8 @@ class Gem::DependencyInstaller
-       say "Installing gem #{spec.full_name}" if Gem.configuration.really_verbose
- 
+@@ -191,7 +198,7 @@ class Gem::DependencyInstaller
        _, source_uri = @specs_and_sources.assoc spec
--      local_gem_path = Gem::RemoteFetcher.fetcher.download spec, source_uri
-+      local_gem_path = Gem::RemoteFetcher.fetcher.download spec, source_uri,
-+                                                           install_dir
- 
-       inst = Gem::Installer.new local_gem_path,
-                                 :env_shebang => @env_shebang,
-@@ -197,6 +205,7 @@ class Gem::DependencyInstaller
+       begin
+         local_gem_path = Gem::RemoteFetcher.fetcher.download spec, source_uri,
+-                                                             @install_dir
++                                                             install_dir
+       rescue Gem::RemoteFetcher::FetchError
+         next if @force
+         raise
+@@ -203,6 +210,7 @@ class Gem::DependencyInstaller
                                  :format_executable => @format_executable,
                                  :ignore_dependencies => @ignore_dependencies,
                                  :install_dir => @install_dir,
diff --git a/misc/rubygems/patches/patch-ae b/misc/rubygems/patches/patch-ae
index a40b0e4cc6a..b9275957b62 100644
--- a/misc/rubygems/patches/patch-ae
+++ b/misc/rubygems/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.2 2008/03/31 15:40:43 jlam Exp $
+$NetBSD: patch-ae,v 1.3 2008/04/13 06:01:59 jlam Exp $
 
---- setup.rb.orig	2008-03-27 19:09:24.000000000 -0400
+--- setup.rb.orig	2008-04-01 19:22:20.000000000 -0400
 +++ setup.rb
-@@ -34,6 +34,9 @@ if ARGV.include? '--help' or ARGV.includ
+@@ -37,6 +37,9 @@ if ARGV.include? '--help' or ARGV.includ
    puts "  --prefix=DIR           Prefix path for installing RubyGems"
    puts "                         Will not affect gem repository location"
    puts
@@ -12,17 +12,19 @@ $NetBSD: patch-ae,v 1.2 2008/03/31 15:40:43 jlam Exp $
    puts "  --no-format-executable Force installation as `gem`"
    puts
    puts "  --no-rdoc              Don't build RDoc for RubyGems"
-@@ -83,11 +86,30 @@ else
- 
-   lib_dir = File.join prefix, 'lib'
-   bin_dir = File.join prefix, 'bin'
-+end
-+
+@@ -96,11 +99,30 @@ else
+   else
+     lib_dir = File.join prefix, 'lib'
+     bin_dir = File.join prefix, 'bin'
+-
+-    mkdir_p lib_dir
+-    mkdir_p bin_dir
+   end
+ end
++ 
 +unless ARGV.grep(/^--install-root/).empty? then
 +  install_root = nil
- 
--  mkdir_p lib_dir
--  mkdir_p bin_dir
++
 +  install_root_arg = ARGV.grep(/^--install-root=/).first
 +  if install_root_arg =~ /^--install-root=(.*)/ then
 +    install_root = $1
@@ -37,11 +39,10 @@ $NetBSD: patch-ae,v 1.2 2008/03/31 15:40:43 jlam Exp $
 +
 +  bin_dir = File.join(install_root, bin_dir)
 +  lib_dir = File.join(install_root, lib_dir)
- end
- 
++end
++
 +mkdir_p lib_dir
 +mkdir_p bin_dir
-+
+ 
  Dir.chdir 'lib' do
    lib_files = Dir[File.join('**', '*rb')]
- 
diff --git a/misc/rubygems/patches/patch-ah b/misc/rubygems/patches/patch-ah
index afd1ce67fe2..1680a11e7d5 100644
--- a/misc/rubygems/patches/patch-ah
+++ b/misc/rubygems/patches/patch-ah
@@ -1,6 +1,6 @@
-$NetBSD: patch-ah,v 1.1 2008/03/31 15:40:43 jlam Exp $
+$NetBSD: patch-ah,v 1.2 2008/04/13 06:01:59 jlam Exp $
 
---- lib/rubygems.rb.orig	2008-03-28 21:05:55.000000000 -0400
+--- lib/rubygems.rb.orig	2008-04-09 17:18:31.000000000 -0400
 +++ lib/rubygems.rb
 @@ -213,7 +213,13 @@ module Gem
    ##
@@ -15,5 +15,5 @@ $NetBSD: patch-ah,v 1.1 2008/03/31 15:40:43 jlam Exp $
 +      install_dir = install_dir_path.expand_path File::SEPARATOR
 +    end
      return File.join(install_dir, 'bin') unless
-     install_dir.to_s == Gem.default_dir
+       install_dir.to_s == Gem.default_dir
      Gem.default_bindir