diff options
| author |   Alex Legler <a3li@gentoo.org> | 2009-05-09 08:39:38 +0000 |
|---|---|---|
| committer | Alex Legler <a3li@gentoo.org> | 2009-05-09 08:39:38 +0000 |
| commit | be867f2e6d6d9ef519c633db7bb9c9ecc684d924 (patch) | |
| tree | 989ebede6d7e9ba80fa1dddbd4959aae8edfcd40 /dev-ruby/rubygems/files | |
| parent | Fix building (bug #269075). (diff) | |
| download | gentoo-2-be867f2e6d6d9ef519c633db7bb9c9ecc684d924.tar.gz gentoo-2-be867f2e6d6d9ef519c633db7bb9c9ecc684d924.tar.bz2 gentoo-2-be867f2e6d6d9ef519c633db7bb9c9ecc684d924.zip | |
Version bump
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'dev-ruby/rubygems/files')
| -rw-r--r-- | dev-ruby/rubygems/files/rubygems-1.3.3-gentoo.patch | 31 | ||||
| -rw-r--r-- | dev-ruby/rubygems/files/rubygems-1.3.3-setup.patch | 31 |
2 files changed, 62 insertions, 0 deletions
diff --git a/dev-ruby/rubygems/files/rubygems-1.3.3-gentoo.patch b/dev-ruby/rubygems/files/rubygems-1.3.3-gentoo.patch new file mode 100644 index 000000000000..1c8c4dc34f91 --- /dev/null +++ b/dev-ruby/rubygems/files/rubygems-1.3.3-gentoo.patch @@ -0,0 +1,31 @@ +Fix a mismatch between our use of a sandbox while installing and +rubygems' assumptions on where to find already installed gems. +Patch by a3li@g.o. + +diff -ru a/lib/rubygems/dependency_installer.rb b/lib/rubygems/dependency_installer.rb +--- a/lib/rubygems/dependency_installer.rb 2009-03-05 02:07:04.000000000 +0100 ++++ b/lib/rubygems/dependency_installer.rb 2009-05-08 23:41:53.000000000 +0200 +@@ -44,7 +44,7 @@ + # :wrappers:: See Gem::Installer::new + + def initialize(options = {}) +- if options[:install_dir] then ++ if options[:install_dir] and not options[:sandbox_fix] then + spec_dir = options[:install_dir], 'specifications' + @source_index = Gem::SourceIndex.from_gems_in spec_dir + else +diff -ru a/lib/rubygems/install_update_options.rb b/lib/rubygems/install_update_options.rb +--- a/lib/rubygems/install_update_options.rb 2009-03-14 00:01:10.000000000 +0100 ++++ b/lib/rubygems/install_update_options.rb 2009-05-08 23:43:05.000000000 +0200 +@@ -86,6 +86,11 @@ + options[:include_dependencies] = value + end + ++ add_option(:"Install/Update", '--sandbox-fix', ++ 'Fix specifications lookup path [Gentoo patch]') do |value, options| ++ options[:sandbox_fix] = true ++ end ++ + add_option(:"Install/Update", '--[no-]format-executable', + 'Make installed executable names match ruby.', + 'If ruby is ruby18, foo_exec will be', diff --git a/dev-ruby/rubygems/files/rubygems-1.3.3-setup.patch b/dev-ruby/rubygems/files/rubygems-1.3.3-setup.patch new file mode 100644 index 000000000000..3306dfe28856 --- /dev/null +++ b/dev-ruby/rubygems/files/rubygems-1.3.3-setup.patch @@ -0,0 +1,31 @@ +--- lib/rubygems/commands/setup_command.rb.0 2009-04-03 02:46:29.000000000 +0200 ++++ lib/rubygems/commands/setup_command.rb 2009-05-08 23:34:19.000000000 +0200 +@@ -111,8 +111,6 @@ + + remove_old_bin_files bin_dir + +- remove_source_caches install_destdir +- + install_rdoc + + say +@@ -226,10 +224,6 @@ + if File.writable? gem_doc_dir and + (not File.exist? rubygems_doc_dir or + File.writable? rubygems_doc_dir) then +- say "Removing old RubyGems RDoc and ri" +- Dir[File.join(Gem.dir, 'doc', 'rubygems-[0-9]*')].each do |dir| +- rm_rf dir +- end + + if options[:ri] then + ri_dir = File.join rubygems_doc_dir, 'ri' +@@ -343,7 +337,7 @@ + + args << '--quiet' + args << '--main' << 'README' +- args << '.' << 'README' << 'LICENSE.txt' << 'GPL.txt' ++ args << '.' << 'README' + + r = RDoc::RDoc.new + r.document args |