Fix default gem binaries directory that would point to /usr/local for user installations as well, causing permission errors. Revbump to update the changes.

Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64

4 files changed, 18 insertions, 10 deletions

diff --git a/dev-ruby/rubygems/ChangeLog b/dev-ruby/rubygems/ChangeLog
index b028cc4b0710..527da554b7f7 100644
--- a/dev-ruby/rubygems/ChangeLog
+++ b/dev-ruby/rubygems/ChangeLog
@@ -1,6 +1,14 @@
 # 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.178 2011/10/22 11:40:05 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/ChangeLog,v 1.179 2011/10/31 09:14:03 a3li Exp $
+
+*rubygems-1.8.10-r1 (31 Oct 2011)
+
+  31 Oct 2011; Alex Legler <a3li@gentoo.org> -rubygems-1.8.10.ebuild,
+  +rubygems-1.8.10-r1.ebuild, files/gentoo-defaults.rb:
+  Fix default gem binaries directory that would point to /usr/local for user
+  installations as well, causing permission errors. Revbump to update the
+  changes.
 
   22 Oct 2011; Hans de Graaff <graaff@gentoo.org> -rubygems-1.8.5.ebuild,
   -rubygems-1.8.7.ebuild:
diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index e3ee34e3dee2..95e4b7cee016 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 923 RMD160 c3aefef4a2eb3e830849a4c5430652586fda4132 SHA1 0a48c03d25b737553517159122f67d303d9f6363 SHA256 015221ea3dac7a5812724cfd633297bc0d99f728dad66ff99d30bac6b3794e75
+AUX gentoo-defaults.rb 972 RMD160 c14ba14188b674a71f9fc84919b2dcbd7f9756c3 SHA1 a4eded51030576cb4c8f26d74c4ad637664ba42d SHA256 c0f821041391c262754a5caf7314562137218119eb3510b7edfc070462c3ca57
 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
@@ -17,13 +17,13 @@ DIST rubygems-1.8.10.tgz 249683 RMD160 2c7dc4bc5459a0b2cf771c9398f750cfe0dbcbf5
 EBUILD rubygems-1.3.7-r1.ebuild 2999 RMD160 f3ccf17a65925a8cc36c28d4506c1fc96458c418 SHA1 1d680bc39228c81c3656b4f9e2676e839d7bc3be SHA256 bc3cd7ffa76b9947e05f55f70c3972db65eb013dfa5b76a2e88bbb41d0fdd5b7
 EBUILD rubygems-1.3.7-r5.ebuild 3747 RMD160 990a3b8c8babbd04865a4cc464dc33ada66b07c0 SHA1 c62b9d262fa101fa12e74028b97c831349550789 SHA256 cf302064dc8c48da252d8e33dc0b8c92009030af7da2e476bfcc63a9b40cdfeb
 EBUILD rubygems-1.3.7.ebuild 2995 RMD160 154085ac99dcb1efa2c581df8cd4c67c2fc43dae SHA1 facdf12e411b45651c40e00f9659cd6828ec85f5 SHA256 8047192b5e43b59eeaa0f9ee07f319b3bda6451c1d205cc3740b4385dca9cb73
-EBUILD rubygems-1.8.10.ebuild 3526 RMD160 579032358c12df42d585b5e24f96697da6760545 SHA1 6ca7982562bdfb8d674e637e791d6386c354daaf SHA256 36c134d781f50a9fd4437e306b2ee5d0ead3430938842a3f781f9820ae2538c6
-MISC ChangeLog 28407 RMD160 c8118da8fb8f2fc6b7c17a3e020139b9b3085791 SHA1 79c7e2cc46445ef574d0b7fc5df69ba4f6b724cc SHA256 38896c0c12b8ab1652833f766a32ec709264da2645a67b99b7a102baae593cbc
+EBUILD rubygems-1.8.10-r1.ebuild 3527 RMD160 ec58dab8e1be696021cc0a2aa0b8a1777450dd2d SHA1 31c695d1c31aca854648230ecb38408420748b29 SHA256 cadaaf36cfd953069f0b1690ab49d3844812dd88168c2ff15fe49af43260e54f
+MISC ChangeLog 28729 RMD160 a54325b2b58c2e82c61687bc8d534d12ec771720 SHA1 8c907c0ca876ef221ff73ab0b02785dbf2c871fe SHA256 c1e2d5a9aee637e90629bd62ea6b42c3dbacdaf4aba42e44243d0f6fce7a5510
 MISC metadata.xml 247 RMD160 eb1d10b4366542ce2f232dcaf7317341b6b5608f SHA1 fcb6e2a1d6cda6d45640f9c5a5dfcc0fd4f3ab3b SHA256 633ae9912e8dd27f76b9cf53f5ad0d3222db85d9a19a76da7fd5e26f40b144e3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk6iq5sACgkQiIP6VqMIqNe/xwD/Tj5pWlncyuTm6c84kNGZMKkw
-vNBRrw11VOje75be3WEA/Rd8c6gEp3mEqEa7+cwu+iRC4LhpD0On5k6wW7tsHmLJ
-=/baz
+iF4EAREIAAYFAk6uZuMACgkQ3Ca6Xy8+rvTM7AD9FIv28tzcP3uMcJXw4Hmb+qb+
+APpa/+RDSw36zZwgpWYA/1ryfNMw3hoRnAKS48nllFNaXyOo60i6NWW3hGpPkyd6
+=Epg3
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/rubygems/files/gentoo-defaults.rb b/dev-ruby/rubygems/files/gentoo-defaults.rb
index 3702333b76cc..a645f4868281 100644
--- a/dev-ruby/rubygems/files/gentoo-defaults.rb
+++ b/dev-ruby/rubygems/files/gentoo-defaults.rb
@@ -21,7 +21,7 @@ module Gem
 
     undef :default_bindir
     def default_bindir
-      "@GENTOO_PORTAGE_EPREFIX@/usr/local/bin"
+      Process.euid == 0 ? "@GENTOO_PORTAGE_EPREFIX@/usr/local/bin" : File.join(user_dir, 'bin')
     end
 
     undef :ruby_engine
diff --git a/dev-ruby/rubygems/rubygems-1.8.10.ebuild b/dev-ruby/rubygems/rubygems-1.8.10-r1.ebuild
index 2c4e9326805e..d122ce4b1f10 100644
--- a/dev-ruby/rubygems/rubygems-1.8.10.ebuild
+++ b/dev-ruby/rubygems/rubygems-1.8.10-r1.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.8.10.ebuild,v 1.3 2011/10/22 11:39:00 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-1.8.10-r1.ebuild,v 1.1 2011/10/31 09:14:03 a3li Exp $
 
 EAPI="4"