[gentoo-commits] gentoo-x86 commit in dev-ruby/rubygems/files: rubygems-1.1.0-setup.patch rubygems-1.1.0-dependency-installer-install-dir-fix.patch

[Richard Brown (rbrown)]

rbrown      08/03/29 15:16:21

  Added:                rubygems-1.1.0-setup.patch
                        rubygems-1.1.0-dependency-installer-install-dir-fix.patch
  Log:
  Version bump. Fixes bug #215293
  (Portage version: 2.1.4.4)

Revision  Changes    Path
1.1                  dev-ruby/rubygems/files/rubygems-1.1.0-setup.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/rubygems/files/rubygems-1.1.0-setup.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/rubygems/files/rubygems-1.1.0-setup.patch?rev=1.1&content-type=text/plain

Index: rubygems-1.1.0-setup.patch
===================================================================
Source: Richard Brown
Upstream: no
Reason: respect --prefix properly, stop stamping on live filesystem.
--- setup.rb.orig	2008-03-27 23:09:24.000000000 +0000
+++ setup.rb	2008-03-29 09:12:32.000000000 +0000
@@ -81,8 +81,8 @@
 
   raise "invalid --prefix #{prefix.inspect}" if prefix.nil?
 
-  lib_dir = File.join prefix, 'lib'
-  bin_dir = File.join prefix, 'bin'
+  lib_dir = File.join prefix, Config::CONFIG['sitelibdir']
+  bin_dir = File.join prefix, Config::CONFIG['bindir']
 
   mkdir_p lib_dir
   mkdir_p bin_dir
@@ -187,30 +187,15 @@
   end
 end
 
-# Remove source caches
-
-require 'rubygems/source_info_cache'
-
-user_cache_file = Gem::SourceInfoCache.user_cache_file
-system_cache_file = Gem::SourceInfoCache.system_cache_file
-
-rm_f user_cache_file if File.writable? File.dirname(user_cache_file)
-rm_f system_cache_file if File.writable? File.dirname(system_cache_file)
-
 # install RDoc
 
 gem_doc_dir = File.join Gem.dir, 'doc'
 
 if File.writable? gem_doc_dir then
-  puts "Removing old RubyGems RDoc and ri"
-  Dir[File.join(Gem.dir, 'doc', 'rubygems-[0-9]*')].each do |dir|
-    rm_rf dir
-  end
-
   def run_rdoc(*args)
     args << '--quiet'
     args << '--main' << 'README'
-    args << '.' << 'README' << 'LICENSE.txt' << 'GPL.txt'
+    args << '.' << 'README'
 
     r = RDoc::RDoc.new
     r.document args
@@ -237,6 +222,7 @@
 end
 
 # Remove stubs
+if false # Don't want this
 
 def stub?(path)
   return unless File.readable? path
@@ -305,3 +291,4 @@
 puts "to remove it by hand."
 puts
 
+end



1.1                  dev-ruby/rubygems/files/rubygems-1.1.0-dependency-installer-install-dir-fix.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/rubygems/files/rubygems-1.1.0-dependency-installer-install-dir-fix.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/rubygems/files/rubygems-1.1.0-dependency-installer-install-dir-fix.patch?rev=1.1&content-type=text/plain

Index: rubygems-1.1.0-dependency-installer-install-dir-fix.patch
===================================================================
Index: lib/rubygems/dependency_installer.rb
===================================================================
--- lib/rubygems/dependency_installer.rb	(revision 1678)
+++ lib/rubygems/dependency_installer.rb	(working copy)
@@ -189,7 +189,7 @@
       say "Installing gem #{spec.full_name}" if Gem.configuration.really_verbose
 
       _, 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,



-- 
gentoo-commits@l.g.o mailing list