- Roll back the last patch removed by mistake and remove the correct patch.

- Bump PORTREVISION.

Submitted by:	nivit, Jonathan Weiss <jw@innerewut.de> (maintainer)

devel/ruby-gems/Makefile

@@ -7,6 +7,7 @@
 
 PORTNAME=	gems
 PORTVERSION=	1.2.0
+PORTREVISION=	1
 CATEGORIES=	devel ruby
 MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
 MASTER_SITE_SUBDIR=	ruby${PORTNAME}

devel/ruby-gems/files/patch-lib-rubygems-installer.rb

@@ -0,0 +1,11 @@
+--- lib/rubygems/installer.rb.orig	2007-12-21 08:43:06.000000000 +0800
++++ lib/rubygems/installer.rb	2007-12-27 09:04:59.000000000 +0800
+@@ -134,7 +134,7 @@
+     build_extensions
+     write_spec
+ 
+-    write_require_paths_file_if_needed
++    # write_require_paths_file_if_needed
+ 
+     # HACK remove?  Isn't this done in multiple places?
+     cached_gem = File.join @gem_home, "cache", @gem.split(/\//).pop

devel/ruby-gems/files/patch-lib-rubygems-source_info_cache.rb

@@ -1,34 +0,0 @@
---- lib/rubygems/source_info_cache.rb.orig	2007-12-11 09:16:59.000000000 +0800
-+++ lib/rubygems/source_info_cache.rb	2007-12-26 17:24:45.000000000 +0800
-@@ -70,6 +70,9 @@
-     begin
-       # Marshal loads 30-40% faster from a String, and 2MB on 20061116 is small
-       data = File.open cache_file, 'rb' do |fp| fp.read end
-+      if data.length <= 4 then
-+        raise ArgumentError, "Data too small"
-+      end
-       @cache_data = Marshal.load data
- 
-       @cache_data.each do |url, sice|
-@@ -85,11 +88,11 @@
-         end
-       end
-       @cache_data
--    rescue => e
-+    rescue => ex
-       if Gem.configuration.really_verbose then
-         say "Exception during cache_data handling: #{ex.class} - #{ex}"
-         say "Cache file was: #{cache_file}"
--        say "\t#{e.backtrace.join "\n\t"}"
-+        say "\t#{ex.backtrace.join "\n\t"}"
-       end
-       reset_cache_data
-     end
-@@ -107,6 +110,7 @@
- 
-   def reset_cache_data
-+    FileUtils.rm @cache_file
-     @cache_data = {}
-   end
- 
-   # The name of the cache file to be read