diff options
| author |   Hans de Graaff <graaff@gentoo.org> | 2010-05-31 05:55:46 +0000 |
|---|---|---|
| committer | Hans de Graaff <graaff@gentoo.org> | 2010-05-31 05:55:46 +0000 |
| commit | 7d32b5741abfaebd89946334b5b9843cc591bcc7 (patch) | |
| tree | d023fea916767512a3fbaee835380bcdf401e651 /dev-ruby/activesupport/files | |
| parent | Forced tests to be run sequentially as intended, fixes bug 314963. (diff) | |
| download | gentoo-2-7d32b5741abfaebd89946334b5b9843cc591bcc7.tar.gz gentoo-2-7d32b5741abfaebd89946334b5b9843cc591bcc7.tar.bz2 gentoo-2-7d32b5741abfaebd89946334b5b9843cc591bcc7.zip | |
Bump for Rails 2.3.8. Drop hppa/ppc/ppc64/x86-fbsd keywords due to new unkeyworded dependency.
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'dev-ruby/activesupport/files')
| -rw-r--r-- | dev-ruby/activesupport/files/activesupport-2.3.8-unvendorize.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/dev-ruby/activesupport/files/activesupport-2.3.8-unvendorize.patch b/dev-ruby/activesupport/files/activesupport-2.3.8-unvendorize.patch new file mode 100644 index 000000000000..866611857449 --- /dev/null +++ b/dev-ruby/activesupport/files/activesupport-2.3.8-unvendorize.patch @@ -0,0 +1,35 @@ +Index: activesupport-2.3.5/lib/active_support/vendor.rb +=================================================================== +--- activesupport-2.3.5.orig/lib/active_support/vendor.rb ++++ activesupport-2.3.5/lib/active_support/vendor.rb +@@ -1,11 +1,7 @@ + # Prefer gems to the bundled libs. + require 'rubygems' + +-begin +- gem 'builder', '~> 2.1.2' +-rescue Gem::LoadError +- $:.unshift "#{File.dirname(__FILE__)}/vendor/builder-2.1.2" +-end ++gem 'builder', '~> 2.1.2' + require 'builder' + + begin +@@ -14,15 +10,7 @@ rescue Gem::LoadError + $:.unshift "#{File.dirname(__FILE__)}/vendor/memcache-client-1.7.4" + end + +-begin +- gem 'tzinfo', '~> 0.3.12' +-rescue Gem::LoadError +- $:.unshift "#{File.dirname(__FILE__)}/vendor/tzinfo-0.3.12" +-end ++gem 'tzinfo', '~> 0.3.12' + +-begin +- gem 'i18n', '>= 0.3.3' +-rescue Gem::LoadError +- $:.unshift "#{File.dirname(__FILE__)}/vendor/i18n-0.3.7" +-end ++gem 'i18n', '~> 0.3.3' + require 'i18n' |