| 1 |
a3li 09/03/21 10:12:08 |
| 2 |
|
| 3 |
Added: ruby19-rubygems-gentoo.patch |
| 4 |
ruby19-rubygems-proxy.patch |
| 5 |
Log: |
| 6 |
Adding Ruby 1.9.1 for preliminary testing |
| 7 |
(Portage version: 2.2_rc26/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-lang/ruby/files/ruby19-rubygems-gentoo.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ruby/files/ruby19-rubygems-gentoo.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ruby/files/ruby19-rubygems-gentoo.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: ruby19-rubygems-gentoo.patch |
| 16 |
=================================================================== |
| 17 |
diff -ru a/lib/rubygems/commands/install_command.rb b/lib/rubygems/commands/install_command.rb |
| 18 |
--- a/lib/rubygems/commands/install_command.rb 2008-09-11 01:54:41.000000000 +0200 |
| 19 |
+++ b/lib/rubygems/commands/install_command.rb 2008-09-28 10:24:27.000000000 +0200 |
| 20 |
@@ -76,6 +76,7 @@ |
| 21 |
:wrappers => options[:wrappers], |
| 22 |
:bin_dir => options[:bin_dir], |
| 23 |
:development => options[:development], |
| 24 |
+ :sandbox_fix => options[:sandbox_fix], |
| 25 |
} |
| 26 |
|
| 27 |
exit_code = 0 |
| 28 |
diff -ru a/lib/rubygems/dependency_installer.rb b/lib/rubygems/dependency_installer.rb |
| 29 |
--- a/lib/rubygems/dependency_installer.rb 2008-08-12 23:50:22.000000000 +0200 |
| 30 |
+++ b/lib/rubygems/dependency_installer.rb 2008-09-28 10:22:21.000000000 +0200 |
| 31 |
@@ -40,9 +40,10 @@ |
| 32 |
# :security_policy:: See Gem::Installer::new and Gem::Security. |
| 33 |
# :user_install:: See Gem::Installer.new |
| 34 |
# :wrappers:: See Gem::Installer::new |
| 35 |
+ # :sandbox_fix:: Gentoo patch to repair compatibility |
| 36 |
|
| 37 |
def initialize(options = {}) |
| 38 |
- if options[:install_dir] then |
| 39 |
+ if options[:install_dir] and not options[:sandbox_fix] then |
| 40 |
spec_dir = options[:install_dir], 'specifications' |
| 41 |
@source_index = Gem::SourceIndex.from_gems_in spec_dir |
| 42 |
else |
| 43 |
diff -ru a/lib/rubygems/install_update_options.rb b/lib/rubygems/install_update_options.rb |
| 44 |
--- a/lib/rubygems/install_update_options.rb 2008-06-24 20:56:30.000000000 +0200 |
| 45 |
+++ b/lib/rubygems/install_update_options.rb 2008-09-28 10:24:09.000000000 +0200 |
| 46 |
@@ -83,6 +83,11 @@ |
| 47 |
options[:include_dependencies] = value |
| 48 |
end |
| 49 |
|
| 50 |
+ add_option(:"Install/Update", '--sandbox-fix', |
| 51 |
+ 'Fix specifications lookup path [Gentoo patch]') do |value, options| |
| 52 |
+ options[:sandbox_fix] = true |
| 53 |
+ end |
| 54 |
+ |
| 55 |
add_option(:"Install/Update", '--[no-]format-executable', |
| 56 |
'Make installed executable names match ruby.', |
| 57 |
'If ruby is ruby18, foo_exec will be', |
| 58 |
|
| 59 |
|
| 60 |
|
| 61 |
1.1 dev-lang/ruby/files/ruby19-rubygems-proxy.patch |
| 62 |
|
| 63 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ruby/files/ruby19-rubygems-proxy.patch?rev=1.1&view=markup |
| 64 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ruby/files/ruby19-rubygems-proxy.patch?rev=1.1&content-type=text/plain |
| 65 |
|
| 66 |
Index: ruby19-rubygems-proxy.patch |
| 67 |
=================================================================== |
| 68 |
--- lib/rubygems/remote_fetcher.rb.1 2008-06-21 23:21:17.000000000 +0200 |
| 69 |
+++ lib/rubygems/remote_fetcher.rb 2008-09-23 20:37:24.000000000 +0200 |
| 70 |
@@ -195,7 +195,7 @@ |
| 71 |
|
| 72 |
return nil if env_proxy.nil? or env_proxy.empty? |
| 73 |
|
| 74 |
- uri = URI.parse env_proxy |
| 75 |
+ uri = URI.parse normalize_uri env_proxy |
| 76 |
|
| 77 |
if uri and uri.user.nil? and uri.password.nil? then |
| 78 |
# Probably we have http_proxy_* variables? |
Archives