Update to ruby-gems-1.3.0.

Initial diff for 1.2.0 from Jeremy Evans.
Some hints from sturm@.

devel/ruby-gems/Makefile

@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.14 2008/06/17 22:42:59 bernd Exp $
+# $OpenBSD: Makefile,v 1.15 2008/09/28 15:45:17 bernd Exp $
 
 COMMENT=	package management framework for the Ruby language
 
-V=		1.1.1
+V=		1.3.0
 DISTNAME=	rubygems-$V
 PKGNAME= 	ruby-gems-$V
 CATEGORIES=	devel
@@ -25,6 +25,8 @@ CONFIGURE_STYLE=ruby setup
 MAKE_ENV=	GEM_HOME=${PREFIX}/lib/ruby/gems/${MODRUBY_REV} \
 		RUBYLIB=${PREFIX}/lib/ruby/site_ruby/${MODRUBY_REV}
 
+PORTHOME = 	${WRKDIR}
+
 SUBST_VARS=	DISTNAME
 
 REGRESS_DEPENDS=::devel/ruby-rake
@@ -32,6 +34,9 @@ REGRESS_DEPENDS=::devel/ruby-rake
 do-configure:
 do-build:
 
+pre-install:
+	@${SUBST_CMD} ${WRKSRC}/lib/rubygems/config_file.rb
+
 do-install:
 	 @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${RUBY} setup.rb install \
 		--prefix=${PREFIX}

devel/ruby-gems/distinfo

@@ -1,5 +1,5 @@
-MD5 (rubygems-1.1.1.tgz) = GnfFtrKTo8zVJh3BIGQczA==
-RMD160 (rubygems-1.1.1.tgz) = JktsJmf9dMERtohtoTsyS8OR6qg=
-SHA1 (rubygems-1.1.1.tgz) = 4erRH6KSj7S3hxwX/RGGGYyXwRo=
-SHA256 (rubygems-1.1.1.tgz) = KxzoLIYp5Fg8j+sSSM/dEiByBvF0pKrCrDC20GtmZOE=
-SIZE (rubygems-1.1.1.tgz) = 423308
+MD5 (rubygems-1.3.0.tgz) = Y9PfwDhxDq9TK2oTMiURWg==
+RMD160 (rubygems-1.3.0.tgz) = DC3wBkg+BUeaL4KTZ/CmydvDQcs=
+SHA1 (rubygems-1.3.0.tgz) = OZ9V19a1f6V1trf2EmTt7Xm+a28=
+SHA256 (rubygems-1.3.0.tgz) = smGlsWStAAzNrJvqDpz1V2IlECXOTptiRqJGm/i45lo=
+SIZE (rubygems-1.3.0.tgz) = 257641

devel/ruby-gems/patches/patch-lib_rubygems_commands_install_command_rb

@@ -1,16 +1,15 @@
-$OpenBSD: patch-lib_rubygems_commands_install_command_rb,v 1.2 2008/06/17 22:42:59 bernd Exp $
+$OpenBSD: patch-lib_rubygems_commands_install_command_rb,v 1.3 2008/09/28 15:45:18 bernd Exp $
 
 This is for GEM_SKIPDEPENDS in ruby.port.mk.
 
---- lib/rubygems/commands/install_command.rb.orig	Sat Apr 19 14:48:07 2008
-+++ lib/rubygems/commands/install_command.rb	Sat Apr 19 14:49:37 2008
-@@ -62,7 +62,8 @@ class Gem::Commands::InstallCommand < Gem::Command
-       :install_dir => options[:install_dir],
-       :security_policy => options[:security_policy],
+--- lib/rubygems/commands/install_command.rb.orig	Thu Sep 11 01:54:41 2008
++++ lib/rubygems/commands/install_command.rb	Sun Sep 28 14:22:33 2008
+@@ -76,6 +76,8 @@ version is also installed.
        :wrappers => options[:wrappers],
--      :bin_dir => options[:bin_dir]
-+      :bin_dir => options[:bin_dir],
-+      :skip_dependencies => options[:skip_dependencies]
+       :bin_dir => options[:bin_dir],
+       :development => options[:development],
++      :skip_dependencies => options[:skip_dependencies],
++      :default_source_index => options[:default_source_index]
      }
  
      exit_code = 0

devel/ruby-gems/patches/patch-lib_rubygems_config_file_rb

@@ -0,0 +1,12 @@
+$OpenBSD: patch-lib_rubygems_config_file_rb,v 1.1 2008/09/28 15:45:18 bernd Exp $
+--- lib/rubygems/config_file.rb.orig	Wed Sep 17 18:21:42 2008
++++ lib/rubygems/config_file.rb	Sat Sep 27 23:02:54 2008
+@@ -41,7 +41,7 @@ class Gem::ConfigFile
+ 
+       path.strip
+     rescue LoadError
+-      '/etc'
++      '${SYSCONFDIR}'
+     end
+ 
+   SYSTEM_WIDE_CONFIG_FILE = File.join system_config_path, 'gemrc'

devel/ruby-gems/patches/patch-lib_rubygems_dependency_installer_rb

@@ -1,10 +1,10 @@
-$OpenBSD: patch-lib_rubygems_dependency_installer_rb,v 1.2 2008/06/17 22:42:59 bernd Exp $
+$OpenBSD: patch-lib_rubygems_dependency_installer_rb,v 1.3 2008/09/28 15:45:18 bernd Exp $
 
 This is for GEM_SKIPDEPENDS in ruby.port.mk.
 
---- lib/rubygems/dependency_installer.rb.orig	Sat Apr 19 14:49:10 2008
-+++ lib/rubygems/dependency_installer.rb	Sat Apr 19 14:50:57 2008
-@@ -18,7 +18,8 @@ class Gem::DependencyInstaller
+--- lib/rubygems/dependency_installer.rb.orig	Tue Aug 12 23:50:22 2008
++++ lib/rubygems/dependency_installer.rb	Sun Sep 28 13:47:49 2008
+@@ -21,7 +21,8 @@ class Gem::DependencyInstaller
      :format_executable => false, # HACK dup
      :ignore_dependencies => false,
      :security_policy => nil, # HACK NoSecurity requires OpenSSL.  AlmostNo? Low?
@@ -14,21 +14,30 @@ This is for GEM_SKIPDEPENDS in ruby.port.mk.
    }
  
    ##
-@@ -46,6 +47,7 @@ class Gem::DependencyInstaller
+@@ -42,7 +43,7 @@ class Gem::DependencyInstaller
+   # :wrappers:: See Gem::Installer::new
+ 
+   def initialize(options = {})
+-    if options[:install_dir] then
++    if options[:install_dir] and not options[:default_source_index] then
+       spec_dir = options[:install_dir], 'specifications'
+       @source_index = Gem::SourceIndex.from_gems_in spec_dir
+     else
+@@ -61,6 +62,7 @@ class Gem::DependencyInstaller
      @security_policy = options[:security_policy]
+     @user_install = options[:user_install]
      @wrappers = options[:wrappers]
-     @bin_dir = options[:bin_dir]
 +    @skip_dependencies = options[:skip_dependencies]
  
      @installed_gems = []
-   end
-@@ -205,7 +207,8 @@ class Gem::DependencyInstaller
-                                 :install_dir => @install_dir,
-                                 :security_policy => @security_policy,
-                                 :wrappers => @wrappers,
--                                :bin_dir => @bin_dir
-+                                :bin_dir => @bin_dir,
-+                                :skip_dependencies => @skip_dependencies
+ 
+@@ -244,7 +246,8 @@ class Gem::DependencyInstaller
+                                 :security_policy     => @security_policy,
+                                 :source_index        => @source_index,
+                                 :user_install        => @user_install,
+-                                :wrappers            => @wrappers
++                                :wrappers            => @wrappers,
++                                :skip_dependencies   => @skip_dependencies
  
        spec = inst.install
  

devel/ruby-gems/patches/patch-lib_rubygems_install_update_options_rb

@@ -1,17 +1,22 @@
-$OpenBSD: patch-lib_rubygems_install_update_options_rb,v 1.2 2008/06/17 22:42:59 bernd Exp $
+$OpenBSD: patch-lib_rubygems_install_update_options_rb,v 1.3 2008/09/28 15:45:18 bernd Exp $
 
 This is for GEM_SKIPDEPENDS in ruby.port.mk.
 
---- lib/rubygems/install_update_options.rb.orig	Sat Apr 19 14:51:46 2008
-+++ lib/rubygems/install_update_options.rb	Sat Apr 19 14:52:29 2008
-@@ -89,6 +89,11 @@ module Gem::InstallUpdateOptions
-                'foo_exec18') do |value, options|
-       options[:format_executable] = value
+--- lib/rubygems/install_update_options.rb.orig	Tue Jun 24 20:56:30 2008
++++ lib/rubygems/install_update_options.rb	Sun Sep 28 13:46:26 2008
+@@ -102,6 +102,16 @@ module Gem::InstallUpdateOptions
+                 "dependencies") do |value, options|
+       options[:development] = true
      end
 +
 +    add_option(:"Install/Update", '-S', '--skip-dependencies DEPENDENCIES',
 +               'Skip the given dependencies') do |value, options|
 +      options[:skip_dependencies] = value.split(' ')
++    end
++
++    add_option(:"Install/Update", '--default-source-index',
++                'Use the default source-index') do |value, options|
++      options[:default_source_index] = true
 +    end
    end
  

devel/ruby-gems/patches/patch-lib_rubygems_installer_rb

@@ -1,21 +1,21 @@
-$OpenBSD: patch-lib_rubygems_installer_rb,v 1.6 2008/06/17 22:42:59 bernd Exp $
+$OpenBSD: patch-lib_rubygems_installer_rb,v 1.7 2008/09/28 15:45:18 bernd Exp $
 
 This is for GEM_SKIPDEPENDS in ruby.port.mk.
 
---- lib/rubygems/installer.rb.orig	Sat Apr 19 14:52:49 2008
-+++ lib/rubygems/installer.rb	Sat Apr 19 14:53:52 2008
-@@ -76,6 +76,7 @@ class Gem::Installer
-     @security_policy = options[:security_policy]
-     @wrappers = options[:wrappers]
+--- lib/rubygems/installer.rb.orig	Tue Sep 23 06:01:38 2008
++++ lib/rubygems/installer.rb	Sat Sep 27 23:05:48 2008
+@@ -109,6 +109,7 @@ class Gem::Installer
      @bin_dir = options[:bin_dir]
+     @development = options[:development]
+     @source_index = options[:source_index]
 +    @skip_dependencies = options[:skip_dependencies]
  
      begin
        @format = Gem::Format.from_file_by_path @gem, @security_policy
-@@ -120,7 +121,12 @@ class Gem::Installer
+@@ -194,7 +195,12 @@ class Gem::Installer
+         deps |= @spec.development_dependencies if @development
  
-       unless @ignore_dependencies then
-         @spec.dependencies.each do |dep_gem|
+         deps.each do |dep_gem|
 -          ensure_dependency @spec, dep_gem
 +          if @skip_dependencies && @skip_dependencies.include?(dep_gem.name)
 +            say "Skipping '#{dep_gem.name}' dependency."

devel/ruby-gems/patches/patch-setup_rb

@@ -1,24 +1,12 @@
-$OpenBSD: patch-setup_rb,v 1.2 2008/06/17 22:42:59 bernd Exp $
---- setup.rb.orig	Sat Apr 19 14:46:21 2008
-+++ setup.rb	Sat Apr 19 14:47:22 2008
-@@ -94,7 +94,7 @@ else
-     lib_dir = Gem::ConfigMap[:sitelibdir]
+$OpenBSD: patch-setup_rb,v 1.3 2008/09/28 15:45:18 bernd Exp $
+--- setup.rb.orig	Fri Jul 11 10:08:08 2008
++++ setup.rb	Sat Sep 27 23:02:54 2008
+@@ -131,7 +131,7 @@ else
+     lib_dir = Gem::ConfigMap[site_or_vendor]
      bin_dir = Gem::ConfigMap[:bindir]
    else
 -    lib_dir = File.join prefix, 'lib'
 +    lib_dir = ENV['RUBYLIB']
      bin_dir = File.join prefix, 'bin'
- 
-     mkdir_p lib_dir
-@@ -261,8 +261,9 @@ end
- puts "As of RubyGems 0.8.0, library stubs are no longer needed."
- puts "Searching $LOAD_PATH for stubs to optionally delete (may take a while)"
- 
--gemfiles = Dir[File.join("{#{($LOAD_PATH).join(',')}}", '**', '*.rb')]
--gemfiles = gemfiles.map { |file| File.expand_path file }.uniq
-+#gemfiles = Dir[File.join("{#{($LOAD_PATH).join(',')}}", '**', '*.rb')]
-+#gemfiles = gemfiles.map { |file| File.expand_path file }.uniq
-+gemfiles = []
- 
- puts "...done."
- 
+   end
+ end