Add a two fixes from ruby-2.0.0/rubygems 1.8.25.

* Allow multiple conditions for requirement of gem's specification since
  some newer gem already use this feature.

4 files changed, 45 insertions, 6 deletions

diff --git a/lang/ruby193-base/Makefile b/lang/ruby193-base/Makefile
index 643e78eb5c6..650949fedf3 100644
--- a/lang/ruby193-base/Makefile
+++ b/lang/ruby193-base/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2013/01/31 15:56:14 taca Exp $
+# $NetBSD: Makefile,v 1.22 2013/02/02 08:11:53 taca Exp $
 #
 
 DISTNAME=	${RUBY_DISTNAME}
 PKGNAME=	${RUBY_PKGPREFIX}-base-${RUBY_VERSION_FULL}
+PKGREVISION=	1
 CATEGORIES=	lang ruby
 MASTER_SITES=	${MASTER_SITE_RUBY}
 
diff --git a/lang/ruby193-base/distinfo b/lang/ruby193-base/distinfo
index ade575f1f60..eadaee0cd20 100644
--- a/lang/ruby193-base/distinfo
+++ b/lang/ruby193-base/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2013/01/31 15:56:14 taca Exp $
+$NetBSD: distinfo,v 1.15 2013/02/02 08:11:53 taca Exp $
 
 SHA1 (ruby-1.9.3-p374.tar.bz2) = fde7f6d286fcb27135d29963f04f5d0e066195f7
 RMD160 (ruby-1.9.3-p374.tar.bz2) = bb3beabef451d958a27a743aa138ce6704d5cab1
@@ -18,8 +18,9 @@ SHA1 (patch-lib_rubygems_dependency__installer.rb) = 572775dd430619f93168732ad31
 SHA1 (patch-lib_rubygems_doc__manager.rb) = 4b2d70e5dfaeff1f1b70ff27f1084065dcc742d3
 SHA1 (patch-lib_rubygems_install__update__options.rb) = 74f81900c92bc3c7a663a112cccf6ff88b6ae180
 SHA1 (patch-lib_rubygems_installer.rb) = cec82bd0c5255a2a23799273c7a2835e2bef7e33
-SHA1 (patch-lib_rubygems_specification.rb) = 1c39cabe198607661052511162c32b0293ffc30a
+SHA1 (patch-lib_rubygems_specification.rb) = bc1f844153d00623349ea2d703a979001c9986ec
 SHA1 (patch-lib_rubygems_uninstaller.rb) = bde19710968f80e56760288d09870a08f3a4ec52
+SHA1 (patch-lib_rubygems_version.rb) = 3ec26651ba8f2e6bbd4527e8c0a2f5944833264f
 SHA1 (patch-man_erb.1) = 210aa77328689868162566bf01e3ba261dec0c2b
 SHA1 (patch-man_irb.1) = 899fdd973bb2491cf7f606ee68ffa6cdbe42f725
 SHA1 (patch-man_ri.1) = 3283b897b8ed36933ccecce158bcb3463d667aff
diff --git a/lang/ruby193-base/patches/patch-lib_rubygems_specification.rb b/lang/ruby193-base/patches/patch-lib_rubygems_specification.rb
index d2f3fa5c5f4..1c9bf5324bf 100644
--- a/lang/ruby193-base/patches/patch-lib_rubygems_specification.rb
+++ b/lang/ruby193-base/patches/patch-lib_rubygems_specification.rb
@@ -1,10 +1,13 @@
-$NetBSD: patch-lib_rubygems_specification.rb,v 1.2 2012/04/22 08:17:16 taca Exp $
+$NetBSD: patch-lib_rubygems_specification.rb,v 1.3 2013/02/02 08:11:53 taca Exp $
 
 Changes for pkgsrc environment:
 
 * Allow some attributes to nil.
 * Relax date/time format.
 
+And allow multiple conditions for requirement from Ruby 2.0.0 and
+Rubygem 1.8.25.
+
 --- lib/rubygems/specification.rb.orig	2012-04-19 22:43:16.000000000 +0000
 +++ lib/rubygems/specification.rb
 @@ -118,6 +118,12 @@ class Gem::Specification
@@ -29,7 +32,26 @@ Changes for pkgsrc environment:
                  Time.utc($1.to_i, $2.to_i, $3.to_i)
  
                # Workaround for where the date format output from psych isn't
-@@ -1987,7 +1993,24 @@ class Gem::Specification
+@@ -1720,7 +1726,9 @@ class Gem::Specification
+     when Numeric           then obj.inspect
+     when true, false, nil  then obj.inspect
+     when Gem::Platform     then "Gem::Platform.new(#{obj.to_a.inspect})"
+-    when Gem::Requirement  then "Gem::Requirement.new(#{obj.to_s.inspect})"
++    when Gem::Requirement  then
++      list = obj.as_list
++      "Gem::Requirement.new(#{ruby_code(list.size == 1 ? obj.to_s : list)})"
+     else raise Gem::Exception, "ruby_code case not handled: #{obj.class}"
+     end
+   end
+@@ -1946,6 +1954,7 @@ class Gem::Specification
+       ast = builder.tree
+ 
+       io = StringIO.new
++      io.set_encoding Encoding::UTF_8 if Object.const_defined? :Encoding
+ 
+       Psych::Visitors::Emitter.new(io).accept(ast)
+ 
+@@ -1987,7 +1996,24 @@ class Gem::Specification
      normalize
  
      nil_attributes = self.class.non_nil_attributes.find_all do |name|
@@ -55,7 +77,7 @@ Changes for pkgsrc environment:
      end
  
      unless nil_attributes.empty? then
-@@ -2090,10 +2113,15 @@ class Gem::Specification
+@@ -2090,10 +2116,15 @@ class Gem::Specification
        raise Gem::InvalidSpecificationException, "#{lazy} is not a summary"
      end
  
diff --git a/lang/ruby193-base/patches/patch-lib_rubygems_version.rb b/lang/ruby193-base/patches/patch-lib_rubygems_version.rb
new file mode 100644
index 00000000000..12b38242505
--- /dev/null
+++ b/lang/ruby193-base/patches/patch-lib_rubygems_version.rb
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_rubygems_version.rb,v 1.1 2013/02/02 08:11:54 taca Exp $
+
+A small fix from Ruby 2.0.0 and Rubygem 1.8.25.
+
+--- lib/rubygems/version.rb.orig	2012-04-19 22:43:16.000000000 +0000
++++ lib/rubygems/version.rb
+@@ -187,7 +187,7 @@ class Gem::Version
+     raise ArgumentError, "Malformed version number string #{version}" unless
+       self.class.correct?(version)
+ 
+-    @version = version.to_s
++    @version = version.to_s.dup
+     @version.strip!
+   end
+