Update gentoo-defaults to install in /usr/local as root and in /home/graaff otherwise. Thanks to James Le Cuirot for the patch in bug 366153.

Package-Manager: portage-2.1.9.42/cvs/Linux x86_64

4 files changed, 21 insertions, 10 deletions

diff --git a/dev-ruby/rubygems/ChangeLog b/dev-ruby/rubygems/ChangeLog
index bceda5c72c8a..3da888f14029 100644
--- a/dev-ruby/rubygems/ChangeLog
+++ b/dev-ruby/rubygems/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/rubygems
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/ChangeLog,v 1.169 2011/05/13 17:38:02 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/ChangeLog,v 1.170 2011/05/13 17:49:31 graaff Exp $
+
+*rubygems-1.3.7-r5 (13 May 2011)
+
+  13 May 2011; Hans de Graaff <graaff@gentoo.org> -rubygems-1.3.7-r4.ebuild,
+  +rubygems-1.3.7-r5.ebuild, files/gentoo-defaults.rb:
+  Update gentoo-defaults to install in /usr/local as root and in /home/graaff
+  otherwise. Thanks to James Le Cuirot for the patch in bug 366153.
 
   13 May 2011; Hans de Graaff <graaff@gentoo.org> -rubygems-1.3.5.ebuild,
   -rubygems-1.3.6-r2.ebuild:
diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index 34d32738c94c..f73ddcc4338e 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -5,7 +5,7 @@ AUX 10rubygems 21 RMD160 02441be7de6307bbb859fbc2bf5891809fe9ecf8 SHA1 3f98150bf
 AUX auto_gem.rb 159 RMD160 fbf261e5cf0a8450c51c33a7ad4dafbab21bd518 SHA1 8dde3d73f65998f4c5552924ad49e1441e1b211d SHA256 fe1efe24cd0ba36c55449e9623cd0be394980f37d12468624dad7ffdef72f4dc
 AUX auto_gem.rb.ruby19 509 RMD160 f8ffc36e384592956e6508b952ea80110f73efe3 SHA1 498f8963c27cad7e8334b2e797c51f6ac2101b1b SHA256 f0f7f61b110955325be52d278fcc1d3f3ea395cd9523dba33af37a44fd59666d
 AUX conf.d-gem_server 81 RMD160 8c5c57e989e009b87fcb345185f3f1e3acaf517d SHA1 4d43d760253a478adbce597148ff1c4e414e8eea SHA256 aa850780bebe0e31da9732d8707a748567ca72716fd91e294dc712e71f82db2f
-AUX gentoo-defaults.rb 850 RMD160 ee838c107d956c8899b4bba4ea805e765de75461 SHA1 ade6cccba1dc134b659b2b063382d35ef4414bc6 SHA256 9b4f44aa70dd58012bcfa2e6b175e1e6300ef31c8942f08f2d078d68b1882b60
+AUX gentoo-defaults.rb 923 RMD160 c3aefef4a2eb3e830849a4c5430652586fda4132 SHA1 0a48c03d25b737553517159122f67d303d9f6363 SHA256 015221ea3dac7a5812724cfd633297bc0d99f728dad66ff99d30bac6b3794e75
 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
@@ -13,14 +13,14 @@ AUX rubygems-1.3.7-gentoo.patch 3935 RMD160 cb01379f53d78688f700c23adf4fb5bf1244
 AUX rubygems-1.3.7-ruby19.patch 8765 RMD160 2f95a4ad50e2c13b14096fa16f07c6e193caa019 SHA1 78b526d634eddfc119ec7b02c486426dcd2ad5b2 SHA256 fd438576410e0e4d7772d8762994ae04761f9535bcc097dd92bece1d17838f3c
 DIST rubygems-1.3.7.tgz 290986 RMD160 2ea8e16d1535216045798258603d5f2f9e3dbfea SHA1 68ad2970963db9893b76acc8777be72a77c4bee4 SHA256 388b90ae6273f655507b10c8ba6bee9ea72e7d49c3e610025531cb8c3ba67c9d
 EBUILD rubygems-1.3.7-r1.ebuild 3004 RMD160 80c41690c1f0c0ed286b30e717d720ace0a9a9d5 SHA1 8d852b067649b3e3e38a793a92c46b530c5f843c SHA256 010dce3a418df065d9f525e878f5152904fa14d71461e8653e7aab7b4ab4a63f
-EBUILD rubygems-1.3.7-r4.ebuild 3588 RMD160 2643e49c46187695137079c14186824fd51b8647 SHA1 a95f2895e98a1b47992e5b11285667fbd0e732bc SHA256 7f5d7e61949f2812c55b97066d0bc98d7d80fd05abeb6a30082488c2c3db68a3
+EBUILD rubygems-1.3.7-r5.ebuild 3587 RMD160 4af52c3db8af94f4a4a256c462cf119b1f182a60 SHA1 39c7b6f3d75c93aa6f41d4a523805b5721ae4967 SHA256 5624507958912ce152a338c7c8e75c6c06e1606ff4042026338d27591c99ffd6
 EBUILD rubygems-1.3.7.ebuild 2995 RMD160 154085ac99dcb1efa2c581df8cd4c67c2fc43dae SHA1 facdf12e411b45651c40e00f9659cd6828ec85f5 SHA256 8047192b5e43b59eeaa0f9ee07f319b3bda6451c1d205cc3740b4385dca9cb73
-MISC ChangeLog 26777 RMD160 f3bfab0c26e49de7fc5fbc867278fe07c0b636a9 SHA1 10a80ad605537b60ca630e5c13f0226a48831e1f SHA256 47121e4d1ef99f4f0949378e6c9305e8350bafdd522240c86311f10d5b04d9c1
+MISC ChangeLog 27090 RMD160 413ae44651d9ac13b472dc67776dbd555f2e0114 SHA1 7c75ca8e4b788d2a516671d5f5756b57e7561a83 SHA256 b9f52d1011dac90ed8b7c537ba5984f376cb70aa4ce3567de22d6be78c462260
 MISC metadata.xml 247 RMD160 eb1d10b4366542ce2f232dcaf7317341b6b5608f SHA1 fcb6e2a1d6cda6d45640f9c5a5dfcc0fd4f3ab3b SHA256 633ae9912e8dd27f76b9cf53f5ad0d3222db85d9a19a76da7fd5e26f40b144e3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk3NbIQACgkQrnu0mw69Jkrw3AD9E3JZx2S59sDOKmFqeXWXZag5
-ogk+bB3zNKftRtBk2dAA/iuJgv0Lm9EgMLsPuV6vw6AEz42iD0bRLks9Jr8zGcbA
-=aEH2
+iF4EAREIAAYFAk3NbzEACgkQrnu0mw69JkqHvgD/R792QueJIByBQCFIs8B7oN01
+/BSuesXgVTvfVm8Edv8A/RfbhnVtyrCT7aJXAN4VacXh2QSHA8DRF55rCfG0/PWO
+=Zl93
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/rubygems/files/gentoo-defaults.rb b/dev-ruby/rubygems/files/gentoo-defaults.rb
index 2f0bbae734f6..3702333b76cc 100644
--- a/dev-ruby/rubygems/files/gentoo-defaults.rb
+++ b/dev-ruby/rubygems/files/gentoo-defaults.rb
@@ -5,14 +5,18 @@ module Gem
       ConfigMap[:sitelibdir].gsub('site_ruby', 'gems')
     end
 
+    def local_dir
+      portage_gems_dir.gsub('@GENTOO_PORTAGE_EPREFIX@/usr', '@GENTOO_PORTAGE_EPREFIX@/usr/local')
+    end
+ 
     undef :default_dir
     def default_dir
-      portage_gems_dir.gsub('@GENTOO_PORTAGE_EPREFIX@/usr', '@GENTOO_PORTAGE_EPREFIX@/usr/local')
+      Process.euid == 0 ? local_dir : user_dir
     end
 
     undef :default_path
     def default_path
-      [user_dir, default_dir, portage_gems_dir]
+      [user_dir, local_dir, portage_gems_dir]
     end
 
     undef :default_bindir
diff --git a/dev-ruby/rubygems/rubygems-1.3.7-r4.ebuild b/dev-ruby/rubygems/rubygems-1.3.7-r5.ebuild
index 772905a1a8ed..23c804c82688 100644
--- a/dev-ruby/rubygems/rubygems-1.3.7-r4.ebuild
+++ b/dev-ruby/rubygems/rubygems-1.3.7-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-1.3.7-r4.ebuild,v 1.6 2011/05/03 11:13:38 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-1.3.7-r5.ebuild,v 1.1 2011/05/13 17:49:31 graaff Exp $
 
 EAPI="3"