[gentoo-commits] gentoo-x86 commit in dev-ruby/activesupport/files: activesupport-2.3.8-unvendorize.patch

[Hans de Graaff (graaff)]

graaff      10/05/31 05:55:46

  Added:                activesupport-2.3.8-unvendorize.patch
  Log:
  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)

Revision  Changes    Path
1.1                  dev-ruby/activesupport/files/activesupport-2.3.8-unvendorize.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/activesupport/files/activesupport-2.3.8-unvendorize.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/activesupport/files/activesupport-2.3.8-unvendorize.patch?rev=1.1&content-type=text/plain

Index: activesupport-2.3.8-unvendorize.patch
===================================================================
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'