diff options
| author |   Alex Legler <a3li@gentoo.org> | 2010-05-13 10:44:10 +0000 |
|---|---|---|
| committer | Alex Legler <a3li@gentoo.org> | 2010-05-13 10:44:10 +0000 |
| commit | 01087c1c40c8e6fdb8e118fd0fb6d6c401a1974e (patch) | |
| tree | 537623bb7b1f0c29054417936aa925a4ae758199 /dev-ruby/rubygems | |
| parent | Version bump (diff) | |
| download | gentoo-2-01087c1c40c8e6fdb8e118fd0fb6d6c401a1974e.tar.gz gentoo-2-01087c1c40c8e6fdb8e118fd0fb6d6c401a1974e.tar.bz2 gentoo-2-01087c1c40c8e6fdb8e118fd0fb6d6c401a1974e.zip | |
Revbump to fix gem loading on rubyee
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'dev-ruby/rubygems')
| -rw-r--r-- | dev-ruby/rubygems/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-ruby/rubygems/files/rubygems-rubyee.patch | 25 | ||||
| -rw-r--r-- | dev-ruby/rubygems/rubygems-1.3.6-r2.ebuild (renamed from dev-ruby/rubygems/rubygems-1.3.6-r1.ebuild) | 2 |
3 files changed, 23 insertions, 12 deletions
diff --git a/dev-ruby/rubygems/ChangeLog b/dev-ruby/rubygems/ChangeLog index acd73b8ecac2..91081ef27ab2 100644 --- 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/files/rubygems-rubyee.patch b/dev-ruby/rubygems/files/rubygems-rubyee.patch index 1ea8e259397d..da8d382429fe 100644 --- 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 index fa9d7201497e..05680991f7bf 100644 --- 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" |