Remove unused patches

Package-Manager: portage-2.1.4.5

6 files changed, 12 insertions, 195 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/Manifest b/dev-ruby/rubygems/Manifest
index 4d211df12cdf..f7bc5cd0199b 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -1,7 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 0.8.11-install.rb.extract_files.patch 1416 RMD160 1af89ae0536a8139a849e66a71e27c205b1a5a0a SHA1 f7feb72e775ddaf48b455f66a719575306e4e09b SHA256 801106efb151be063fca60dd3eed4a981424e4a7ce65f60eb97606453ebffde2
 AUX 10rubygems 21 RMD160 02441be7de6307bbb859fbc2bf5891809fe9ecf8 SHA1 3f98150bfb39a3f3f1dfabcf2d9bf80051960d81 SHA256 8c30de9ba7f327237af47f85d8f7f6701d34c9a8780ff7303244667568ca5833
 AUX auto_gem.rb 159 RMD160 fbf261e5cf0a8450c51c33a7ad4dafbab21bd518 SHA1 8dde3d73f65998f4c5552924ad49e1441e1b211d SHA256 fe1efe24cd0ba36c55449e9623cd0be394980f37d12468624dad7ffdef72f4dc
 AUX conf.d-gem_server 81 RMD160 8c5c57e989e009b87fcb345185f3f1e3acaf517d SHA1 4d43d760253a478adbce597148ff1c4e414e8eea SHA256 aa850780bebe0e31da9732d8707a748567ca72716fd91e294dc712e71f82db2f
@@ -13,9 +12,6 @@ AUX no_post_install.patch 204 RMD160 e903ea665032f9695b7a05ec4b7b46f1351afcc2 SH
 AUX rubygems-0.9.1-no_post_install.patch 317 RMD160 5fc0efc85cacfca6a6f4f59e0d6c7c1159c0ce1a SHA1 06141b0b5b9a2b7ec51befe0b118f53b230eb5f0 SHA256 c0cad34d968f6082f637c9144fc6075a6da383d7c2828a96574e5622d6619ee6
 AUX rubygems-0.9.1-no_rdoc_install.patch 327 RMD160 088ebdd6ff4a5df74f1e741eab56cea61f90bad8 SHA1 c000e3575accede2220acec7e312821841f66d3b SHA256 2bd1d7637843b66148f50a8bb9b2c6ea55c6f19a7d25413bc978f3aac18ebcba
 AUX rubygems-0.9.4-shebang-env-fix.patch 1064 RMD160 c9532f60054199cd4c2a2e305e114a28eb929bfa SHA1 d2e4a561a53f667de6ec1f9e66b56dc18b729c63 SHA256 50402d910bf01e59f68d4aba4aedd5218ecd927d13fe2aa84fbd36b893c1c22e
-AUX rubygems-0.9.5-setup.patch 1794 RMD160 3b417ae647a187dbfa27aeca41c045a5e593400c SHA1 e3216b98fa73790c5294e429814a4afa6479d202 SHA256 1c516056489c760de1aa2bdd826c763cfb72193f9b038023499f7b08bec7579a
-AUX rubygems-1.1.0-dependency-installer-install-dir-fix.patch 664 RMD160 e065cdfb53d9ee441f2f99bec0277eceb8b1ef4c SHA1 5042cfa95c50cf882f1d6e54371763e49ef557c6 SHA256 0a3a4800cc61e6afa47f1abe9e580f90f4b8e3134e51f24cb8cf526951336744
-AUX rubygems-1.1.0-setup.patch 1522 RMD160 f29438e5caa31660f7c0059b0c91713cda492c14 SHA1 687014af8a563462e497ab386fb8f81894f3458d SHA256 ed36f08538ef915d97015d51294cdb7327ee8f0eec8b581bcd09da11ba147849
 AUX rubygems-1.1.1-setup.patch 1555 RMD160 f36324fb0b4092d7af330a55db19c2de70b8a66b SHA1 07f6c0d5f32640fdd3762c56caf184004c687d47 SHA256 9f8006fdf6d43a97773029ce695ed384ae0bd6ea3e5ad18c64c8e8ea8babc86d
 AUX rubygems-1.2.0-setup.patch 1534 RMD160 e253b5bf4b21a79e67bd4809cb0decad87240a77 SHA1 15dcec952759233a257dfb825df4ad05fac24e26 SHA256 a95b44921346f82384a5799cc92e2a4a8abde8e6073693349eb3c28d928c09c5
 AUX rubygems-1.3.1-gentoo.patch 2043 RMD160 27f3cf79db923fd7e0a8261a5e0b99c45a0a3230 SHA1 aade1ad9314e2e7ce0aa738cbb9abc485a289aa2 SHA256 3e527e27677f5725cd902f44ae4f9b5596ebeb1e0dedb561d490133ffca48191
@@ -29,12 +25,12 @@ EBUILD rubygems-0.9.4-r2.ebuild 2842 RMD160 8d26a904cc547b0b692002d078daf00a0fa0
 EBUILD rubygems-1.1.1.ebuild 2805 RMD160 b91676ccb894705fe00554f4a6fb4c6f12ccbe1f SHA1 61a06d30192dc8c71e9bee22f00e30206355504c SHA256 35619d8b9804b4a9101fd2cd65b6ca6384516a05bc5f1cec6322cf725f731985
 EBUILD rubygems-1.2.0.ebuild 2961 RMD160 8748efd437f7cd56dee4fe78ba435191fa257f4f SHA1 ab06341527a9584a435b3776eaa813b844d9f121 SHA256 ab8e6036eb8edf0904327dc5dcd3ac686d12f9638437a3ec69058f91243db96c
 EBUILD rubygems-1.3.1.ebuild 2682 RMD160 c97015e20144a4b14a47ffe12732a7803f9d5e50 SHA1 4c956e1e5bf83aba35e133391290354f1ddd4888 SHA256 7d7b478d636af62e379784444ef8c53fb3ab81575112ab58b221156af46083e3
-MISC ChangeLog 16528 RMD160 ef11aa90173e1cf4f00f0b2cb3401072f93823c3 SHA1 1d5ede973c5da8c1f1b3c7c1dee7cf0725674c5c SHA256 94f421a552a14d7673ee028ec7ac75ddb3a1278af22b832b948e2285a5f7c459
+MISC ChangeLog 16812 RMD160 e242a965e3220478d461d28c4eb0d9f9be36eac1 SHA1 1e7e8706182f397862e68080fb957f99f362fd57 SHA256 442fd54e32e5f804f6bd5466f80c811beae0a76e80e26fa5d3eca1081604c69d
 MISC metadata.xml 247 RMD160 eb1d10b4366542ce2f232dcaf7317341b6b5608f SHA1 fcb6e2a1d6cda6d45640f9c5a5dfcc0fd4f3ab3b SHA256 633ae9912e8dd27f76b9cf53f5ad0d3222db85d9a19a76da7fd5e26f40b144e3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkkdhIMACgkQCzgcb6sPj49/6QCfcriWPNxrIGngoIne5KIg6kLZ
-tkEAn0D4VQzJ8GDY5GnIRXZh5mPQWCoW
-=MvAY
+iEYEARECAAYFAkkdha8ACgkQCzgcb6sPj4//QgCgl7xhhTSIiBk7dW/IpzjdfFFe
+WX8An3gwv3Xj2lH4hJ0TmcrvWVYUiku9
+=4Lqz
 -----END PGP SIGNATURE-----
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