Remove unused patches

(Portage version: 2.1.4.5)

5 files changed, 8 insertions, 187 deletions

diff --git a/dev-ruby/rubygems/ChangeLog b/dev-ruby/rubygems/ChangeLog
index de480c9fb141..bc6b8bc23e7f 100644
--- a/dev-ruby/rubygems/ChangeLog
+++ b/dev-ruby/rubygems/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/rubygems
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/ChangeLog,v 1.110 2008/11/14 14:00:23 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/ChangeLog,v 1.111 2008/11/14 14:05:29 graaff Exp $
+
+  14 Nov 2008; Hans de Graaff <graaff@gentoo.org>
+  -files/0.8.11-install.rb.extract_files.patch,
+  -files/rubygems-0.9.5-setup.patch,
+  -files/rubygems-1.1.0-dependency-installer-install-dir-fix.patch,
+  -files/rubygems-1.1.0-setup.patch:
+  Remove patches that are no longer in use
 
 *rubygems-1.3.1 (14 Nov 2008)
 
diff --git a/dev-ruby/rubygems/files/0.8.11-install.rb.extract_files.patch b/dev-ruby/rubygems/files/0.8.11-install.rb.extract_files.patch
deleted file mode 100644
index d1e3779bf4ee..000000000000
--- a/dev-ruby/rubygems/files/0.8.11-install.rb.extract_files.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Index: lib/rubygems/installer.rb
-===================================================================
---- lib/rubygems/installer.rb	(revision 1195)
-+++ lib/rubygems/installer.rb	(working copy)
-@@ -7,6 +7,8 @@ require 'rubygems/dependency_list'
- 
- module Gem
- 
-+  class InstallError < Gem::Exception; end
-+
-   class DependencyRemovalException < Gem::Exception; end
- 
-   ##
-@@ -321,14 +323,20 @@ TEXT
-     #
-     def extract_files(directory, format)
-       require 'fileutils'
--      wd = Dir.getwd
--      Dir.chdir directory do
--        format.file_entries.each do |entry, file_data|
--          path = entry['path']
--          FileUtils.mkdir_p File.dirname(path)
--          File.open(path, "wb") do |out|
--            out.write file_data
--          end
-+      format.file_entries.each do |entry, file_data|
-+        path = entry['path']
-+        if path =~ /\A\// then # for extra sanity
-+          raise Gem::InstallError,
-+                "attempt to install file into #{entry['path'].inspect}"
-+        end
-+        path = File.expand_path File.join(directory, path)
-+        if path !~ /\A#{Regexp.escape(File.expand_path(directory))}/ then
-+          raise Gem::InstallError,
-+                "attempt to install file into #{entry['path'].inspect}"
-+        end
-+        FileUtils.mkdir_p File.dirname(path)
-+        File.open(path, "wb") do |out|
-+          out.write file_data
-         end
-       end
-     end
diff --git a/dev-ruby/rubygems/files/rubygems-0.9.5-setup.patch b/dev-ruby/rubygems/files/rubygems-0.9.5-setup.patch
deleted file mode 100644
index 789c68018fca..000000000000
--- a/dev-ruby/rubygems/files/rubygems-0.9.5-setup.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-Index: setup.rb
-===================================================================
---- setup.rb	(revision 1542)
-+++ setup.rb	(working copy)
-@@ -72,8 +72,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
-@@ -173,26 +173,12 @@
-   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 user_cache_file if File.writable? user_cache_file
--rm system_cache_file if File.writable? system_cache_file
--
- # install RDoc
- 
--gem_doc_dir = File.join Gem.dir, 'doc'
-+gem_doc_dir = File.join prefix, Gem.dir, 'doc'
- 
-+unless ARGV.include? '--no-rdoc'
- 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'
-@@ -204,7 +190,7 @@
- 
-   rubygems_name = "rubygems-#{Gem::RubyGemsVersion}"
- 
--  doc_dir = File.join Gem.dir, 'doc', rubygems_name
-+  doc_dir = File.join prefix, Gem.dir, 'doc', rubygems_name
- 
-   unless ARGV.include? '--no-ri' then
-     ri_dir = File.join doc_dir, 'ri'
-@@ -221,8 +207,10 @@
-   puts "Skipping RDoc generation, #{gem_doc_dir} not writable"
-   puts "Set the GEM_HOME environment variable if you want RDoc generated"
- end
-+end
- 
- # Remove stubs
-+if false # Don't want this
- 
- def stub?(path)
-   return unless File.readable? path
-@@ -268,3 +256,4 @@
-   puts "No library stubs found."
- end
- 
-+end
-
diff --git a/dev-ruby/rubygems/files/rubygems-1.1.0-dependency-installer-install-dir-fix.patch b/dev-ruby/rubygems/files/rubygems-1.1.0-dependency-installer-install-dir-fix.patch
deleted file mode 100644
index 145882cda178..000000000000
--- a/dev-ruby/rubygems/files/rubygems-1.1.0-dependency-installer-install-dir-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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,
diff --git a/dev-ruby/rubygems/files/rubygems-1.1.0-setup.patch b/dev-ruby/rubygems/files/rubygems-1.1.0-setup.patch
deleted file mode 100644
index 08fc331bfcc8..000000000000
--- a/dev-ruby/rubygems/files/rubygems-1.1.0-setup.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-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