Long overdue purging of old versions.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

15 files changed, 18 insertions, 584 deletions

diff --git a/dev-ruby/rubygems/ChangeLog b/dev-ruby/rubygems/ChangeLog
index a9b8c468d7dc..9a9a0f0c236b 100644
--- a/dev-ruby/rubygems/ChangeLog
+++ b/dev-ruby/rubygems/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-ruby/rubygems
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/ChangeLog,v 1.120 2009/05/09 08:39:37 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/ChangeLog,v 1.121 2009/05/09 08:57:19 a3li Exp $
+
+  09 May 2009; Alex Legler <a3li@gentoo.org>
+  -files/rubygems-0.9.1-no_post_install.patch,
+  -files/rubygems-0.9.1-no_rdoc_install.patch, -rubygems-0.9.4-r2.ebuild,
+  -files/rubygems-0.9.4-shebang-env-fix.patch, -rubygems-1.1.1.ebuild,
+  -files/rubygems-1.1.1-setup.patch, -rubygems-1.2.0.ebuild,
+  -files/rubygems-1.2.0-setup.patch, rubygems-1.3.1.ebuild,
+  -rubygems-1.3.1-r30.ebuild, -files/no-manage_gems.patch,
+  -files/no-system-rubygems.patch, -files/no_post_install.patch:
+  Purging old versions and making repoman happy.
 
 *rubygems-1.3.3 (09 May 2009)
 
diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index d4ca159e9158..b2386519ebf6 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -6,36 +6,21 @@ AUX auto_gem.rb 159 RMD160 fbf261e5cf0a8450c51c33a7ad4dafbab21bd518 SHA1 8dde3d7
 AUX conf.d-gem_server 81 RMD160 8c5c57e989e009b87fcb345185f3f1e3acaf517d SHA1 4d43d760253a478adbce597148ff1c4e414e8eea SHA256 aa850780bebe0e31da9732d8707a748567ca72716fd91e294dc712e71f82db2f
 AUX init.d-gem_server 502 RMD160 9fe089f462edff052e6b7fa6ea3803e0178f41ef SHA1 e00ead252760613865f5e655ff2e559e7578d28f SHA256 b6166c27021880ee1509eb68092f0d3d0550adb9d6b0dcb9396c91c725c5218e
 AUX init.d-gem_server2 502 RMD160 baf764bc5ad41adce73576b2376093744ddd3917 SHA1 ad332343eab53b4be8d796999063ec2018245a4b SHA256 b7f7d215bb3dba02150dbdc431a84308010515ad4c5d9776d0dd5b99bf9a2cee
-AUX no-manage_gems.patch 472 RMD160 e70f8c939f4e35a5fb7e0ccc3935cda8089fd569 SHA1 eca009a56418bf076c1153d2a71ab4fe3a576f8a SHA256 36a4a5cca5c32185f5057934f10c28704f64ba1cb586120f20473875413b9f93
-AUX no-system-rubygems.patch 376 RMD160 05d535ae617b5d712f53883f4eaf614e3cd941c4 SHA1 74fa2092861b2e4a27d2e5c4de5c2887a99b4fe1 SHA256 94814341463b76ef1a56455ad89a880e69c276f32c07931758a5e7c7d693dac9
-AUX no_post_install.patch 204 RMD160 e903ea665032f9695b7a05ec4b7b46f1351afcc2 SHA1 ba6f291af9552df9d134d5e4ef76c70ca0a0419a SHA256 85fb8720c63c3b3ff5257acd7b3be9a370f13364c800189006f7b9d4954ad536
-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-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
 AUX rubygems-1.3.1-proxy.patch 480 RMD160 4a782791fa29525473a6ec9de91885606c0c85e7 SHA1 8cea4f1a918c8df68581955ceaf07502de8310dc SHA256 ac7d7012910041395e8855169d36cb9fba81ba060b7f1f404e03041d5e5e7634
 AUX rubygems-1.3.1-setup.patch 1534 RMD160 e253b5bf4b21a79e67bd4809cb0decad87240a77 SHA1 15dcec952759233a257dfb825df4ad05fac24e26 SHA256 a95b44921346f82384a5799cc92e2a4a8abde8e6073693349eb3c28d928c09c5
 AUX rubygems-1.3.3-gentoo.patch 1422 RMD160 e39a2042170399d0e98c772b0572026d6057353d SHA1 11cb4656b77185c78df809d3180061e5fe41139b SHA256 95e6c7ea38177b0798562be5abaf040e72db4a27f851502d91c4453890e630b0
 AUX rubygems-1.3.3-setup.patch 886 RMD160 fa4610c20574a42f2703748359dd0bf50b83892e SHA1 54fcc6dc9dd4435a1d043fdf8f10e1d0756722fe SHA256 5220a63f1c8a231a0f8d7dfa938ef4351764a76aa82cf941fdd9dd6b83c7b6bf
-DIST rubygems-0.9.4.tgz 204841 RMD160 6ee02db45173f05e6f8c5b1ecd5af832fb8601f8 SHA1 904080d36e34d7a6969c3cef228380eb82688d2a SHA256 b4d47bcfe2f3b08f7c3bb659a2f4e34a3fa9c1135ba98ad3272753753c354e5c
-DIST rubygems-1.1.1.tgz 423308 RMD160 264b6c2667fd74c111b6886da13b324bc391eaa8 SHA1 e1ead11fa2928fb4b7871c17fd1186198c97c11a SHA256 2b1ce82c8629e4583c8feb1248cfdd12207206f174a4aac2ac30b6d06b6664e1
-DIST rubygems-1.2.0.tgz 246920 RMD160 c66444cc3f372f7170ba1d8ef3c456052acb2bde SHA1 89f8e35f03e1e8057cc8e237f2df025642653dde SHA256 28af450a85fd74ae8bd315023cbeeff98a132720978fa009199f6c95f4bb372d
 DIST rubygems-1.3.1.tgz 263748 RMD160 898f33bf49ac6d29d8980cb4feaf30ade0125248 SHA1 a21ae466146bffb28ece05cddbdced0b908ca74f SHA256 361f02e9e3bf1b6625f0e2146553b12c3003d36336cacba51410740f544a8d3b
 DIST rubygems-1.3.3.tgz 292766 RMD160 a9dffb8b93e1ef5cc0679a1555d0899859d770a3 SHA1 395de32c37518041f0bea242fa343f521b8dc100 SHA256 22744ae3994939a198707b9d573d19432c34960220afd2d196ed718bfebee6d7
-EBUILD rubygems-0.9.4-r2.ebuild 2842 RMD160 8d26a904cc547b0b692002d078daf00a0fa0d1be SHA1 fe835d08c081dd4e445448c58d08f42f8c34b8a6 SHA256 0fad8cfc0cf3a294bc8d1138f26cf86af4f0f8c9cded6ca7f271d0f32b6ee43e
-EBUILD rubygems-1.1.1.ebuild 2805 RMD160 b91676ccb894705fe00554f4a6fb4c6f12ccbe1f SHA1 61a06d30192dc8c71e9bee22f00e30206355504c SHA256 35619d8b9804b4a9101fd2cd65b6ca6384516a05bc5f1cec6322cf725f731985
-EBUILD rubygems-1.2.0.ebuild 2959 RMD160 e29bb2b6c8a7ed9a4dbb984987eaa2f0d895618f SHA1 ef6ecf37365fce9ae378bc25679e0767e2822899 SHA256 85b9db90828b89184b8a3872b423e2b2eca84f13e7dbaede13fd82bef8b882a8
-EBUILD rubygems-1.3.1-r30.ebuild 3186 RMD160 bb5002a10a1c38d4408db3c6c68cc365c96a101d SHA1 9b2c9325f8ec5e2b2b5b1b8cb130419db9209108 SHA256 c7f2fe7cb53b07c1afbfdac8200cb045591c3f0668ed9afbf081b900b50fdba4
-EBUILD rubygems-1.3.1.ebuild 2675 RMD160 a9536a0c6668d4fac836a806b3634b5165ae6144 SHA1 a1963024a84cb2bb4534212cbd09e10c5afcac9b SHA256 164e7397245832d0e78478e6e56e98bdf8bea7b7163d7ec6ba0f5e23f0dbf8bf
+EBUILD rubygems-1.3.1.ebuild 2692 RMD160 939c06d8f9012240bd5b6ea3064cb8f61542b232 SHA1 427ce6a6afe5f5cacc93cc2f1cd3508e2ebd16e9 SHA256 09aef68efa11323e0c61fad32d50878d1e27af3fc19f6c4eaa9829690af44e47
 EBUILD rubygems-1.3.3.ebuild 3178 RMD160 530120512b07478a6e082f041b58c198e33d599d SHA1 b29a0b20a2bd6555772b737a3010ea06739a188d SHA256 d20f9b159764a2e1fa3c6623b5c79f1a2a6a475e929f01cf22dbe975052fa33d
-MISC ChangeLog 17905 RMD160 56e9f55a30f1f333348ac08418afa6e05f718890 SHA1 af423b57714f86fbf3ef00d91d2c0fa241ffa682 SHA256 c229d3b8102cb4d07d5d7de6afaaecb3789d2996eb14b756c3e23497e6b9fd45
+MISC ChangeLog 18437 RMD160 d3331ea5a85159910a8ee8d5ae8577f4caf8cb30 SHA1 d7ff1ea44db274c92db1f8b2fbfa5e6b3a86fee3 SHA256 9761dc5a4f8bdd9cb032505da21fad4fd3a3e55156964db92f987ef9ea90bcd9
 MISC metadata.xml 247 RMD160 eb1d10b4366542ce2f232dcaf7317341b6b5608f SHA1 fcb6e2a1d6cda6d45640f9c5a5dfcc0fd4f3ab3b SHA256 633ae9912e8dd27f76b9cf53f5ad0d3222db85d9a19a76da7fd5e26f40b144e3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkoFQVkACgkQk3qunHEll7Mn9gCfaktVSv+gWp70MeSrOSIq8DD7
-t14An1DrbetBNYJE99ZdMXh68E1RPQR1
-=i8DD
+iEYEARECAAYFAkoFRXcACgkQk3qunHEll7ONIwCgxzBrYbbXruA3TxLJGYSXddvB
+iSEAn2NDyRBmy+0ZU+m3s3jmWLx9OtKM
+=P7lx
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/rubygems/files/no-manage_gems.patch b/dev-ruby/rubygems/files/no-manage_gems.patch
deleted file mode 100644
index 9f9d7e60e5a4..000000000000
--- a/dev-ruby/rubygems/files/no-manage_gems.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur rubygems-0.8.11/post-install.rb rubygems-0.8.11.new/post-install.rb
---- rubygems-0.8.11/post-install.rb	2005-07-10 06:18:40.000000000 +0700
-+++ rubygems-0.8.11.new/post-install.rb	2007-01-26 22:05:18.000000000 +0700
-@@ -61,7 +61,8 @@
- def install_sources
-   $: << "lib"
-   require 'rubygems'
--  Gem::manage_gems
-+  require 'rubygems/builder'
-+  require 'rubygems/installer'
-   Dir.chdir("pkgs/sources") do
-     load "sources.gemspec"
-     spec = Gem.sources_spec
diff --git a/dev-ruby/rubygems/files/no-system-rubygems.patch b/dev-ruby/rubygems/files/no-system-rubygems.patch
deleted file mode 100644
index 96855466ae87..000000000000
--- a/dev-ruby/rubygems/files/no-system-rubygems.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur rubygems-0.9.0/post-install.rb rubygems-0.9.0.new/post-install.rb
---- rubygems-0.9.0/post-install.rb	2006-06-07 10:39:53.000000000 +0700
-+++ rubygems-0.9.0.new/post-install.rb	2007-01-28 16:53:13.000000000 +0700
-@@ -65,7 +65,7 @@
- end
- 
- def install_sources
--  $: << "lib"
-+  $:.unshift "lib"
-   require 'rubygems'
-   Gem::manage_gems
-   Dir.chdir("pkgs/sources") do
diff --git a/dev-ruby/rubygems/files/no_post_install.patch b/dev-ruby/rubygems/files/no_post_install.patch
deleted file mode 100644
index 68de503828f9..000000000000
--- a/dev-ruby/rubygems/files/no_post_install.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- post-install.rb.orig	2005-10-20 10:46:25.000000000 -0500
-+++ post-install.rb	2005-10-20 10:46:29.000000000 -0500
-@@ -71,6 +71,5 @@
- end
- 
- install_windows_batch_files
--remove_stubs
- install_sources
- 
diff --git a/dev-ruby/rubygems/files/rubygems-0.9.1-no_post_install.patch b/dev-ruby/rubygems/files/rubygems-0.9.1-no_post_install.patch
deleted file mode 100644
index 4324d004b7f1..000000000000
--- a/dev-ruby/rubygems/files/rubygems-0.9.1-no_post_install.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -ur rubygems-0.9.1/post-install.rb rubygems-0.9.1.new/post-install.rb
---- rubygems-0.9.1/post-install.rb	2007-01-16 07:31:27.000000000 +0700
-+++ rubygems-0.9.1.new/post-install.rb	2007-01-17 20:05:04.000000000 +0700
-@@ -117,5 +117,4 @@
- remove_old_rdoc
- install_rdoc
- install_windows_batch_files
--remove_stubs
- 
diff --git a/dev-ruby/rubygems/files/rubygems-0.9.1-no_rdoc_install.patch b/dev-ruby/rubygems/files/rubygems-0.9.1-no_rdoc_install.patch
deleted file mode 100644
index a7bb19a43dc2..000000000000
--- a/dev-ruby/rubygems/files/rubygems-0.9.1-no_rdoc_install.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur rubygems-0.9.1/post-install.rb rubygems-0.9.1.new/post-install.rb
---- rubygems-0.9.1/post-install.rb	2007-01-17 20:18:48.000000000 +0700
-+++ rubygems-0.9.1.new/post-install.rb	2007-01-17 20:18:24.000000000 +0700
-@@ -114,7 +114,5 @@
- end
- 
- install_sources
--remove_old_rdoc
--install_rdoc
- install_windows_batch_files
- 
diff --git a/dev-ruby/rubygems/files/rubygems-0.9.4-shebang-env-fix.patch b/dev-ruby/rubygems/files/rubygems-0.9.4-shebang-env-fix.patch
deleted file mode 100644
index 944d542e5196..000000000000
--- a/dev-ruby/rubygems/files/rubygems-0.9.4-shebang-env-fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-This patch is taken from r1441 of rubygems's SVN repository to fix
-rewriting of /usr/bin/env shebang patch with additional arguments to
-the ruby interpreter. Without the patch the regexp would not match,
-leaving the /usr/bin/env in place. This causes problems on platforms
-that pass the remainder of the shebang line as a single argument, such
-as Linux. See bug #199378 for all the details.
-
-This patch should no longer be needed with rubygems 0.9.5.
-
---- lib/rubygems/installer.rb.~1~	2007-05-10 21:01:45.000000000 +0200
-+++ lib/rubygems/installer.rb	2007-11-18 14:18:31.000000000 +0100
-@@ -254,7 +254,7 @@
-         path_to_ruby = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name'])
-         if first_line =~ /^#!/
-           # Preserve extra words on shebang line, like "-w".  Thanks RPA.
--          shebang = first_line.sub(/\A\#!\s*\S*ruby\S*/, "#!" + path_to_ruby)
-+          shebang = first_line.sub(/\A\#!.*?ruby\S*/, "#!" + path_to_ruby)
-         else
-           # Create a plain shebang line.
-           shebang = "#!" + path_to_ruby
diff --git a/dev-ruby/rubygems/files/rubygems-1.1.1-setup.patch b/dev-ruby/rubygems/files/rubygems-1.1.1-setup.patch
deleted file mode 100644
index 061137077ac8..000000000000
--- a/dev-ruby/rubygems/files/rubygems-1.1.1-setup.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- setup.rb.orig	2008-04-11 07:18:01.000000000 +0100
-+++ setup.rb	2008-04-11 07:14:53.000000000 +0100
-@@ -94,8 +94,8 @@
-     lib_dir = Gem::ConfigMap[:sitelibdir]
-     bin_dir = Gem::ConfigMap[:bindir]
-   else
--    lib_dir = File.join prefix, 'lib'
--    bin_dir = File.join prefix, 'bin'
-+    lib_dir = File.join prefix, Gem::ConfigMap[:sitelibdir]
-+    bin_dir = File.join prefix, Gem::ConfigMap[:bindir]
- 
-     mkdir_p lib_dir
-     mkdir_p bin_dir
-@@ -201,16 +201,6 @@
-   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'
-@@ -220,15 +210,11 @@
- if File.writable? gem_doc_dir and
-    (not File.exist? rubygems_doc_dir or
-     File.writable? rubygems_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
-@@ -251,6 +237,7 @@
- end
- 
- # Remove stubs
-+if false # Don't want this
- 
- def stub?(path)
-   return unless File.readable? path
-@@ -319,3 +306,4 @@
- puts "to remove it by hand."
- puts
- 
-+end
diff --git a/dev-ruby/rubygems/files/rubygems-1.2.0-setup.patch b/dev-ruby/rubygems/files/rubygems-1.2.0-setup.patch
deleted file mode 100644
index 3b76ad3f9990..000000000000
--- a/dev-ruby/rubygems/files/rubygems-1.2.0-setup.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- setup.rb.~1~	2008-06-22 01:51:11.000000000 +0200
-+++ setup.rb	2008-06-28 09:05:54.923666929 +0200
-@@ -128,8 +128,8 @@
-     lib_dir = Gem::ConfigMap[site_or_vendor]
-     bin_dir = Gem::ConfigMap[:bindir]
-   else
--    lib_dir = File.join prefix, 'lib'
--    bin_dir = File.join prefix, 'bin'
-+    lib_dir = File.join prefix, Gem::ConfigMap[site_or_vendor]
-+    bin_dir = File.join prefix, Gem::ConfigMap[:bindir]
-   end
- end
- 
-@@ -240,19 +240,6 @@
-   end
- end
- 
--# Remove source caches
--if install_destdir.empty?
--  require 'rubygems/source_info_cache'
--
--  user_cache_file = File.join(install_destdir,
--                              Gem::SourceInfoCache.user_cache_file)
--  system_cache_file = File.join(install_destdir,
--                                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)
--end
--
- # install RDoc
- 
- gem_doc_dir = File.join Gem.dir, 'doc'
-@@ -262,10 +249,6 @@
- if File.writable? gem_doc_dir and
-    (not File.exist? rubygems_doc_dir or
-     File.writable? rubygems_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)
-     begin
-@@ -277,7 +260,7 @@
- 
-     args << '--quiet'
-     args << '--main' << 'README'
--    args << '.' << 'README' << 'LICENSE.txt' << 'GPL.txt'
-+    args << '.' << 'README'
- 
-     r = RDoc::RDoc.new
-     r.document args
diff --git a/dev-ruby/rubygems/rubygems-0.9.4-r2.ebuild b/dev-ruby/rubygems/rubygems-0.9.4-r2.ebuild
deleted file mode 100644
index ac437a223737..000000000000
--- a/dev-ruby/rubygems/rubygems-0.9.4-r2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-0.9.4-r2.ebuild,v 1.7 2008/06/29 06:56:40 graaff Exp $
-
-inherit ruby
-
-DESCRIPTION="Centralized Ruby extension management system"
-HOMEPAGE="http://rubyforge.org/projects/rubygems/"
-LICENSE="Ruby"
-
-# Needs to be installed first
-RESTRICT="test"
-
-# The URL depends implicitly on the version, unfortunately. Even if you
-# change the filename on the end, it still downloads the same file.
-SRC_URI="http://rubyforge.org/frs/download.php/20989/${P}.tgz"
-
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-SLOT="0"
-IUSE="doc server examples"
-DEPEND=">=dev-lang/ruby-1.8"
-PDEPEND="server? ( dev-ruby/builder )" # index_gem_repository.rb
-
-PATCHES="${FILESDIR}/${PN}-0.9.1-no_post_install.patch
-	${FILESDIR}/${P}-shebang-env-fix.patch
-	${FILESDIR}/no-system-rubygems.patch"
-USE_RUBY="ruby18"
-
-src_unpack() {
-	ruby_src_unpack
-	use doc || epatch "${FILESDIR}/${PN}-0.9.1-no_rdoc_install.patch"
-}
-
-src_compile() {
-	${RUBY} setup.rb config --libruby="/usr/$(get_libdir)/ruby" || die "setup.rb config failed"
-	${RUBY} setup.rb setup || die "setup.rb setup failed"
-}
-
-src_test() {
-	# Currently RESTRICTed because rubygems needs to be installed
-	# When I work out how to get around that I'll remove the RETRICT
-
-	#for i in test/{test,functional}*.rb; do
-	#	ruby -I pkgs/sources/lib/ -I lib ${i} # || die "$i failed"
-	#done
-	ruby setup.rb test || die "test failed"
-}
-
-src_install() {
-	# RUBYOPT=-rauto_gem without rubygems installed will cause ruby to fail, bug #158455
-	export RUBYOPT="${GENTOO_RUBYOPT}"
-
-	# Fix GEM_HOME to install sources.gem
-	ver=$(${RUBY} -r rbconfig -e 'print Config::CONFIG["ruby_version"]')
-	export GEM_HOME="${D}usr/$(get_libdir)/ruby/gems/${ver}"
-
-	${RUBY} setup.rb install --prefix="${D}" || die "setup.rb install failed"
-	erubydoc
-	cp "${FILESDIR}/auto_gem.rb" "${D}"/$(${RUBY} -r rbconfig -e 'print Config::CONFIG["sitedir"]')
-	keepdir /usr/$(get_libdir)/ruby/gems/$ver/doc
-	doenvd "${FILESDIR}/10rubygems"
-
-	if use server; then
-		newinitd "${FILESDIR}/init.d-gem_server" gem_server
-		newconfd "${FILESDIR}/conf.d-gem_server" gem_server
-	fi
-}
-
-pkg_postinst()
-{
-	ewarn "If you have previously switched to using ruby18_with_gems using ruby-config, this"
-	ewarn "package has removed that file and makes it unnecessary anymore."
-	ewarn "Please use ruby-config to revert back to ruby18."
-}
-
-pkg_postrm()
-{
-	ewarn "If you have uninstalled dev-ruby/rubygems. Ruby applications are unlikely"
-	ewarn "to run in current shells because of missing auto_gem."
-	ewarn "Please run \"unset RUBYOPT\" in your shells before using ruby"
-	ewarn "or start new shells"
-	ewarn
-	ewarn "If you have not uninstalled dev-ruby/rubygems, please do not unset "
-	ewarn "RUBYOPT"
-}
diff --git a/dev-ruby/rubygems/rubygems-1.1.1.ebuild b/dev-ruby/rubygems/rubygems-1.1.1.ebuild
deleted file mode 100644
index a5caceab0e31..000000000000
--- a/dev-ruby/rubygems/rubygems-1.1.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-1.1.1.ebuild,v 1.9 2008/07/04 00:09:39 jer Exp $
-
-inherit ruby
-
-DESCRIPTION="Centralized Ruby extension management system"
-HOMEPAGE="http://rubyforge.org/projects/rubygems/"
-LICENSE="|| ( Ruby GPL-2 )"
-
-# Needs to be installed first
-RESTRICT="test"
-
-# The URL depends implicitly on the version, unfortunately. Even if you
-# change the filename on the end, it still downloads the same file.
-SRC_URI="mirror://rubyforge/${PN}/${P}.tgz"
-
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-SLOT="0"
-IUSE="doc server"
-DEPEND=">=dev-lang/ruby-1.8"
-PDEPEND="server? ( dev-ruby/builder )" # index_gem_repository.rb
-
-USE_RUBY="ruby18"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-setup.patch"
-}
-
-src_compile() {
-	# Allowing ruby_src_compile would be bad with the new setup.rb
-	:
-}
-
-src_install() {
-	# RUBYOPT=-rauto_gem without rubygems installed will cause ruby to fail, bug #158455
-	export RUBYOPT="${GENTOO_RUBYOPT}"
-
-	ver=$(${RUBY} -r rbconfig -e 'print Config::CONFIG["ruby_version"]')
-
-	# rubygems tries to create GEM_HOME if it doesn't exist, upsetting sandbox,
-	# bug #202109
-	export GEM_HOME="${D}/usr/$(get_libdir)/ruby/gems/${ver}"
-	keepdir /usr/$(get_libdir)/ruby/gems/$ver/{doc,gems,cache,specifications}
-
-	myconf=""
-	if ! use doc; then
-		myconf="${myconf} --no-ri"
-		myconf="${myconf} --no-rdoc"
-	fi
-
-	${RUBY} setup.rb $myconf --prefix="${D}" || die "setup.rb install failed"
-
-	dosym gem18 /usr/bin/gem || die "dosym gem failed"
-
-	dodoc README || die "dodoc README failed"
-
-	cp "${FILESDIR}/auto_gem.rb" "${D}"/$(${RUBY} -r rbconfig -e 'print Config::CONFIG["sitedir"]') || die "cp auto_gem.rb failed"
-	doenvd "${FILESDIR}/10rubygems" || die "doenvd 10rubygems failed"
-
-	if use server; then
-		newinitd "${FILESDIR}/init.d-gem_server2" gem_server || die "newinitd failed"
-		newconfd "${FILESDIR}/conf.d-gem_server" gem_server || die "newconfd failed"
-	fi
-}
-
-pkg_postinst()
-{
-	SOURCE_CACHE="/usr/$(get_libdir)/ruby/gems/$ver/source_cache"
-	if [[ -e "${SOURCE_CACHE}" ]]; then
-		rm "${SOURCE_CACHE}"
-	fi
-
-	ewarn "If you have previously switched to using ruby18_with_gems using ruby-config, this"
-	ewarn "package has removed that file and makes it unnecessary anymore."
-	ewarn "Please use ruby-config to revert back to ruby18."
-}
-
-pkg_postrm()
-{
-	ewarn "If you have uninstalled dev-ruby/rubygems. Ruby applications are unlikely"
-	ewarn "to run in current shells because of missing auto_gem."
-	ewarn "Please run \"unset RUBYOPT\" in your shells before using ruby"
-	ewarn "or start new shells"
-	ewarn
-	ewarn "If you have not uninstalled dev-ruby/rubygems, please do not unset "
-	ewarn "RUBYOPT"
-}
diff --git a/dev-ruby/rubygems/rubygems-1.2.0.ebuild b/dev-ruby/rubygems/rubygems-1.2.0.ebuild
deleted file mode 100644
index 376dbb073631..000000000000
--- a/dev-ruby/rubygems/rubygems-1.2.0.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-1.2.0.ebuild,v 1.12 2008/12/02 22:36:35 ranger Exp $
-
-inherit ruby
-
-DESCRIPTION="Centralized Ruby extension management system"
-HOMEPAGE="http://rubyforge.org/projects/rubygems/"
-LICENSE="|| ( Ruby GPL-2 )"
-
-# Needs to be installed first
-RESTRICT="test"
-
-# The URL depends implicitly on the version, unfortunately. Even if you
-# change the filename on the end, it still downloads the same file.
-SRC_URI="mirror://rubyforge/${PN}/${P}.tgz"
-
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-SLOT="0"
-IUSE="doc server"
-DEPEND=">=dev-lang/ruby-1.8"
-PDEPEND="server? ( dev-ruby/builder )" # index_gem_repository.rb
-
-USE_RUBY="ruby18"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-setup.patch"
-}
-
-src_compile() {
-	# Allowing ruby_src_compile would be bad with the new setup.rb
-	:
-}
-
-src_install() {
-	# RUBYOPT=-rauto_gem without rubygems installed will cause ruby to fail, bug #158455
-	export RUBYOPT="${GENTOO_RUBYOPT}"
-	ewarn "RUBYOPT=${RUBYOPT}"
-
-	ver=$(${RUBY} -r rbconfig -e 'print Config::CONFIG["ruby_version"]')
-
-	# rubygems tries to create GEM_HOME if it doesn't exist, upsetting
-	# sandbox, bug #202109. Since 1.2.0 we also need to set GEM_PATH
-	# for this reason, bug #230163.
-	export GEM_HOME="${D}/usr/$(get_libdir)/ruby/gems/${ver}"
-	export GEM_PATH="${GEM_HOME}/"
-	keepdir /usr/$(get_libdir)/ruby/gems/$ver/{doc,gems,cache,specifications}
-
-	myconf=""
-	if ! use doc; then
-		myconf="${myconf} --no-ri"
-		myconf="${myconf} --no-rdoc"
-	fi
-
-	${RUBY} setup.rb $myconf --prefix="${D}" || die "setup.rb install failed"
-
-	dosym gem18 /usr/bin/gem || die "dosym gem failed"
-
-	dodoc README ChangeLog TODO || die "dodoc README failed"
-
-	cp "${FILESDIR}/auto_gem.rb" "${D}"/$(${RUBY} -r rbconfig -e 'print Config::CONFIG["sitedir"]') || die "cp auto_gem.rb failed"
-	doenvd "${FILESDIR}/10rubygems" || die "doenvd 10rubygems failed"
-
-	if use server; then
-		newinitd "${FILESDIR}/init.d-gem_server2" gem_server || die "newinitd failed"
-		newconfd "${FILESDIR}/conf.d-gem_server" gem_server || die "newconfd failed"
-	fi
-}
-
-pkg_postinst()
-{
-	SOURCE_CACHE="/usr/$(get_libdir)/ruby/gems/$ver/source_cache"
-	if [[ -e "${SOURCE_CACHE}" ]]; then
-		rm "${SOURCE_CACHE}"
-	fi
-
-	ewarn "If you have previously switched to using ruby18_with_gems using ruby-config, this"
-	ewarn "package has removed that file and makes it unnecessary anymore."
-	ewarn "Please use ruby-config to revert back to ruby18."
-}
-
-pkg_postrm()
-{
-	ewarn "If you have uninstalled dev-ruby/rubygems. Ruby applications are unlikely"
-	ewarn "to run in current shells because of missing auto_gem."
-	ewarn "Please run \"unset RUBYOPT\" in your shells before using ruby"
-	ewarn "or start new shells"
-	ewarn
-	ewarn "If you have not uninstalled dev-ruby/rubygems, please do not unset "
-	ewarn "RUBYOPT"
-}
diff --git a/dev-ruby/rubygems/rubygems-1.3.1-r30.ebuild b/dev-ruby/rubygems/rubygems-1.3.1-r30.ebuild
deleted file mode 100644
index cce9f05ca3cc..000000000000
--- a/dev-ruby/rubygems/rubygems-1.3.1-r30.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-1.3.1-r30.ebuild,v 1.1 2009/03/21 09:50:56 a3li Exp $
-
-inherit ruby
-
-DESCRIPTION="Centralized Ruby extension management system"
-HOMEPAGE="http://rubyforge.org/projects/rubygems/"
-LICENSE="|| ( Ruby GPL-2 )"
-
-# Needs to be installed first
-RESTRICT="test"
-
-# The URL depends implicitly on the version, unfortunately. Even if you
-# change the filename on the end, it still downloads the same file.
-SRC_URI="mirror://rubyforge/${PN}/${P}.tgz"
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-SLOT="0"
-IUSE="doc server"
-DEPEND="=dev-lang/ruby-1.8*"
-PDEPEND="server? ( dev-ruby/builder )" # index_gem_repository.rb
-
-USE_RUBY="ruby18"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-setup.patch"
-	epatch "${FILESDIR}/${P}-proxy.patch"
-	# Fixes a new "feature" that would prevent us from recognizing installed
-	# gems inside the sandbox
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-}
-
-src_compile() {
-	# Allowing ruby_src_compile would be bad with the new setup.rb
-	:
-}
-
-src_install() {
-	# RUBYOPT=-rauto_gem without rubygems installed will cause ruby to fail, bug #158455
-	export RUBYOPT="${GENTOO_RUBYOPT}"
-	ewarn "RUBYOPT=${RUBYOPT}"
-
-	# Force ebuild to use Ruby 1.8
-	export RUBY="/usr/bin/ruby18"
-
-	ver=$(${RUBY} -r rbconfig -e 'print Config::CONFIG["ruby_version"]')
-
-	# rubygems tries to create GEM_HOME if it doesn't exist, upsetting sandbox,
-	# bug #202109. Since 1.2.0 we also need to set GEM_PATH
-	# for this reason, bug #230163.
-	export GEM_HOME="${D}/usr/$(get_libdir)/ruby/gems/${ver}"
-	export GEM_PATH="${GEM_HOME}/"
-	keepdir /usr/$(get_libdir)/ruby/gems/$ver/{doc,gems,cache,specifications}
-
-	myconf=""
-	if ! use doc; then
-		myconf="${myconf} --no-ri"
-		myconf="${myconf} --no-rdoc"
-	fi
-
-	${RUBY} setup.rb $myconf --prefix="${D}" || die "setup.rb install failed"
-
-	dodoc README || die "dodoc README failed"
-
-	cp "${FILESDIR}/auto_gem.rb" "${D}"/$(${RUBY} -r rbconfig -e 'print Config::CONFIG["sitedir"]') || die "cp auto_gem.rb failed"
-	doenvd "${FILESDIR}/10rubygems" || die "doenvd 10rubygems failed"
-
-	if use server; then
-		newinitd "${FILESDIR}/init.d-gem_server2" gem_server || die "newinitd failed"
-		newconfd "${FILESDIR}/conf.d-gem_server" gem_server || die "newconfd failed"
-	fi
-}
-
-pkg_postinst()
-{
-	SOURCE_CACHE="/usr/$(get_libdir)/ruby/gems/$ver/source_cache"
-	if [[ -e "${SOURCE_CACHE}" ]]; then
-		rm "${SOURCE_CACHE}"
-	fi
-
-	if [[ ! -n $(readlink "${ROOT}"usr/bin/gem) ]] ; then
-		eselect ruby set ruby18
-	fi
-
-	ewarn
-	ewarn "This ebuild is compatible to eselect-ruby"
-	ewarn "To switch between available Ruby profiles, execute as root:"
-	ewarn "\teselect ruby set ruby(18|19|...)"
-	ewarn
-}
-
-pkg_postrm()
-{
-	ewarn "If you have uninstalled dev-ruby/rubygems, Ruby applications are unlikely"
-	ewarn "to run in current shells because of missing auto_gem."
-	ewarn "Please run \"unset RUBYOPT\" in your shells before using ruby"
-	ewarn "or start new shells"
-	ewarn
-	ewarn "If you have not uninstalled dev-ruby/rubygems, please do not unset "
-	ewarn "RUBYOPT"
-}
diff --git a/dev-ruby/rubygems/rubygems-1.3.1.ebuild b/dev-ruby/rubygems/rubygems-1.3.1.ebuild
index 5b0a87d2d3ad..bab447f1ee9e 100644
--- a/dev-ruby/rubygems/rubygems-1.3.1.ebuild
+++ b/dev-ruby/rubygems/rubygems-1.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-1.3.1.ebuild,v 1.7 2009/01/10 15:52:59 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-1.3.1.ebuild,v 1.8 2009/05/09 08:57:19 a3li Exp $
 
 inherit ruby
 
@@ -17,6 +17,7 @@ KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 SLOT="0"
 IUSE="doc server"
 DEPEND=">=dev-lang/ruby-1.8"
+RDEPEND="${DEPEND}"
 PDEPEND="server? ( dev-ruby/builder )" # index_gem_repository.rb
 
 USE_RUBY="ruby18"