Revbump to fix gem loading on rubyee

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

diff --git a/dev-ruby/rubygems/ChangeLog b/dev-ruby/rubygems/ChangeLog
index acd73b8ecac2f0de81511f72856dfa4b7336d7b5..91081ef27ab20d3db33553c10e2e4c0e581d991a 100644 (file)
--- a/dev-ruby/rubygems/ChangeLog
+++ b/dev-ruby/rubygems/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/rubygems
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/ChangeLog,v 1.138 2010/05/01 10:28:10 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/ChangeLog,v 1.139 2010/05/13 10:44:09 a3li Exp $
+
+*rubygems-1.3.6-r2 (13 May 2010)
+
+  13 May 2010; Alex Legler <a3li@gentoo.org> -rubygems-1.3.6-r1.ebuild,
+  +rubygems-1.3.6-r2.ebuild, files/rubygems-rubyee.patch:
+  Revbump to fix gem loading on rubyee
 
   01 May 2010; Alex Legler <a3li@gentoo.org> rubygems-1.3.6-r1.ebuild:
   Add stricter dependency on ruby19

diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index 8117cdc3c1a71859639a30c7378d0d16c4478568..4b85ca35bb68d0f84e31aceeda5c0216008b70e9 100644 (file)
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -12,20 +12,20 @@ AUX init.d-gem_server 502 RMD160 9fe089f462edff052e6b7fa6ea3803e0178f41ef SHA1 e
 AUX init.d-gem_server2 502 RMD160 baf764bc5ad41adce73576b2376093744ddd3917 SHA1 ad332343eab53b4be8d796999063ec2018245a4b SHA256 b7f7d215bb3dba02150dbdc431a84308010515ad4c5d9776d0dd5b99bf9a2cee
 AUX rubygems-1.3.3-gentoo.patch 1422 RMD160 e39a2042170399d0e98c772b0572026d6057353d SHA1 11cb4656b77185c78df809d3180061e5fe41139b SHA256 95e6c7ea38177b0798562be5abaf040e72db4a27f851502d91c4453890e630b0
 AUX rubygems-1.3.5-setup.patch 942 RMD160 69e8714f72482387019bad7b9254110c6bb8b957 SHA1 ba58de08e29731de4ce820f7d8e4c60de2fcee6e SHA256 d3e7c43ff20a649d1c731e27b0791f110b920201a28607091da0166495709b97
-AUX rubygems-rubyee.patch 847 RMD160 0c9833ed05a17c70764efc1b39260d3421de7dcd SHA1 96305bbd9a3ea5c07e790d9b731d4af27b514be7 SHA256 a0321e3e10ab112031921de24b4d2b6a64c37ea6e0d7c28518a8f1cbf15ec80a
+AUX rubygems-rubyee.patch 949 RMD160 7a819de691d457fdef426176534be97444b9a983 SHA1 deffcf777502399058b091b0f05feed8cdbc79ca SHA256 50af5257189b42c7795eaa33b83feed5b46949a1620a1b18ea289c1326dfd2a8
 DIST rubygems-1.3.5.tgz 278469 RMD160 2d17f0de2d387bd2a034916cb79531110f3be196 SHA1 8545f25d00c757a310b879a2580e56d6012fc981 SHA256 c0928cc1ae54dedfb5f57ad3829882c1f90e42bc17bf50491aa6f93a937546ac
 DIST rubygems-1.3.6.tgz 285167 RMD160 f2aa5155a79f07a3f9106e90a4d1e4d39d31cc5a SHA1 ad6606d1eae82cb69381e4f5b2022d2f3f2733f3 SHA256 5c6e6ca672b68acccb8f898670f1661307dea8668fc7f71bb421cab51208d7b0
 EBUILD rubygems-1.3.5-r1.ebuild 2809 RMD160 beafa61db1cc38a9ddfdb33ec70109bfbf1310c8 SHA1 1118c3f668f1fea1b4e6e74a051a668d8c78f42c SHA256 08cc7b6c18304a5a99d7527525ca8825b8828884a70a7d66325bf6bfa43ee089
 EBUILD rubygems-1.3.5-r3.ebuild 3028 RMD160 67e906d35784d62dd31203b582fadeb904890ee9 SHA1 3caf5fc719c79205805bed6082d40dc9ab70d816 SHA256 8b28ca2c63cd22bdd010b1eec9fcc15f5900210e5740b9aaefe02faf6a706028
 EBUILD rubygems-1.3.5.ebuild 3166 RMD160 95a7edee644212eabf8a86f1dc42d06c14a3deed SHA1 8c1b5af2fd039e655628a1884697883824b0bafc SHA256 14822c8c0b156a93a8ab2215b5502f7cea55c2cbce8a57b5ddd7eec2753338b1
-EBUILD rubygems-1.3.6-r1.ebuild 3183 RMD160 d9313f86630082c599de8860a7a7359a6944692b SHA1 c23425ac97eba00244b95ee7ab66dc74a95e285d SHA256 52ab4f05edae00160747f1cccbdb8d09a62680bb18ff2c0d9fb8f6efdc962aae
+EBUILD rubygems-1.3.6-r2.ebuild 3183 RMD160 d9b47f1563ffb645ec2e3f8b9689310e56508ee3 SHA1 08a6ab5ac99e18038cec36ffcbd6c1f977fb6f2f SHA256 214e34d2624ac4c8ec70048aa39ba4796bf53da34a78b076d5d193f77d059640
 EBUILD rubygems-1.3.6.ebuild 3096 RMD160 3abcac49900105943cbf2bbde168c97d088b162d SHA1 f598b8ab87f175ead2cb73ed599c37bfe6094fe4 SHA256 492d0c250fb3a7c5d84d52301c7ca4e4eaa942d452cbcf096c5fefe69e4c8ea9
-MISC ChangeLog 21066 RMD160 a9fcc17b8fe5bfd1ea4b125d40b949a22564ba01 SHA1 903c9eee1033085cf45e35bf26b071d13fcbca3d SHA256 0a8036a5f9cfd36a56cdf32edbc07e8598d2f8724a229df9d238edd0e8a54371
+MISC ChangeLog 21270 RMD160 398bb38dc35784185e2958b52d533fe0963ac00d SHA1 5628d4c9eb3d9035ad2b62a86c863990a7904d27 SHA256 abbbd58a1353ffc33f8b35c695aa89b07ddc082bc8688d68f9882e36e6f28b41
 MISC metadata.xml 247 RMD160 eb1d10b4366542ce2f232dcaf7317341b6b5608f SHA1 fcb6e2a1d6cda6d45640f9c5a5dfcc0fd4f3ab3b SHA256 633ae9912e8dd27f76b9cf53f5ad0d3222db85d9a19a76da7fd5e26f40b144e3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkvcAkAACgkQ+tgfDpkAy6CXdwCePwCs3Ko0soYsx/qSrvKtM5ex
-TTkAnjchzQUgj2C/89FYW+ndNCSjFK0q
-=LOnY
+iEYEARECAAYFAkvr2AUACgkQ+tgfDpkAy6Cp5gCeOI5z+R2uZ0KYtp1kw/F3hu9C
+GysAn3kiV4TWguqHk2wqTkMpcD+i8WP/
+=sjEZ
 -----END PGP SIGNATURE-----

diff --git a/dev-ruby/rubygems/files/rubygems-rubyee.patch b/dev-ruby/rubygems/files/rubygems-rubyee.patch
index 1ea8e259397dfaf87965dc98b08f581e7c33005a..da8d382429fe4eb93f871525bf7b3c6ffa595922 100644 (file)
--- a/dev-ruby/rubygems/files/rubygems-rubyee.patch
+++ b/dev-ruby/rubygems/files/rubygems-rubyee.patch
@@ -1,23 +1,28 @@
-This patch makes RubyGems look inside ${libdir}/ruby${executable_suffix} for
-gems. This separates vanilla MRI 1.8 from REE. --a3li
+This patch makes RubyGems look inside ${libdir}/rubyee/ for
+Gems. This separates vanilla MRI 1.8 from REE. --a3li
 
---- lib/rubygems/defaults.rb.orig      2009-04-04 07:59:16.000000000 +0200
-+++ lib/rubygems/defaults.rb   2009-04-04 08:01:09.000000000 +0200
-@@ -21,7 +21,7 @@
-       File.join File.dirname(ConfigMap[:sitedir]), 'Gems',
-                 ConfigMap[:ruby_version]
+--- lib/rubygems/defaults.rb.orig      2010-05-13 12:33:03.771476368 +0200
++++ lib/rubygems/defaults.rb   2010-05-13 12:32:50.395473295 +0200
+@@ -1,3 +1,4 @@
++# This file is altered for Ruby Enterprise Edition on Gentoo.
+ module Gem
+ 
+   @post_install_hooks   ||= []
+@@ -25,7 +26,7 @@
+       File.join(ConfigMap[:libdir], ConfigMap[:ruby_install_name], 'gems',
+                 ConfigMap[:ruby_version])
      else
 -      File.join(ConfigMap[:libdir], ruby_engine, 'gems',
-+      File.join(ConfigMap[:libdir], default_exec_format % 'ruby', 'gems',
++      File.join(ConfigMap[:sitedir].gsub(/site_ruby\/?$/, ''), 'gems',
                  ConfigMap[:ruby_version])
      end
    end
-@@ -30,7 +30,7 @@
+@@ -34,7 +35,7 @@
    # Path for gems in the user's home directory
  
    def self.user_dir
 -    File.join(Gem.user_home, '.gem', ruby_engine,
-+    File.join(Gem.user_home, '.gem', default_exec_format % 'ruby',
++    File.join(Gem.user_home, '.gem', 'rubyee',
                ConfigMap[:ruby_version])
    end
  

diff --git a/dev-ruby/rubygems/rubygems-1.3.6-r1.ebuild b/dev-ruby/rubygems/rubygems-1.3.6-r2.ebuild
similarity index 98%
rename from dev-ruby/rubygems/rubygems-1.3.6-r1.ebuild
rename to dev-ruby/rubygems/rubygems-1.3.6-r2.ebuild
index fa9d7201497ea8bc3239d9ac86beb5f70f7677ba..05680991f7bff157926e583ec29ba8aeb73718c2 100644 (file)
--- a/dev-ruby/rubygems/rubygems-1.3.6-r1.ebuild
+++ b/dev-ruby/rubygems/rubygems-1.3.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-1.3.6-r1.ebuild,v 1.2 2010/05/01 10:28:10 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-1.3.6-r2.ebuild,v 1.1 2010/05/13 10:44:09 a3li Exp $
 
 EAPI="2"