Cleanup unused patches.

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key )

6 files changed, 9 insertions, 321 deletions

diff --git a/dev-ruby/activesupport/ChangeLog b/dev-ruby/activesupport/ChangeLog
index d4788b1ef8a1..d9a27ea54287 100644
--- a/dev-ruby/activesupport/ChangeLog
+++ b/dev-ruby/activesupport/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-ruby/activesupport
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activesupport/ChangeLog,v 1.273 2014/11/17 20:12:24 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activesupport/ChangeLog,v 1.274 2014/11/18 13:44:54 mrueg Exp $
+
+  18 Nov 2014; Manuel Rüger <mrueg@gentoo.org>
+  -files/activesupport-2.3.14-unvendorize.patch,
+  -files/activesupport-2.3.15-unvendorize.patch,
+  -files/activesupport-2.3.16-unvendorize.patch,
+  -files/activesupport-2.3.5-mocha-0.9.5.patch,
+  -files/activesupport-3.0.3-mocha-0.9.5.patch:
+  Cleanup unused patches.
 
 *activesupport-4.1.8 (17 Nov 2014)
 *activesupport-4.0.12 (17 Nov 2014)
diff --git a/dev-ruby/activesupport/files/activesupport-2.3.14-unvendorize.patch b/dev-ruby/activesupport/files/activesupport-2.3.14-unvendorize.patch
deleted file mode 100644
index d84f286261c1..000000000000
--- a/dev-ruby/activesupport/files/activesupport-2.3.14-unvendorize.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-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.4.1'
--rescue Gem::LoadError
--  $:.unshift "#{File.dirname(__FILE__)}/vendor/i18n-0.4.1"
--end
-+gem 'i18n', '~> 0.4.1'
- require 'i18n'
-Index: metadata
-===================================================================
---- a/../metadata
-+++ b/../metadata
-@@ -16,7 +16,55 @@ bindir: bin
- cert_chain: []
- 
- date: 2011-08-16 00:00:00 Z
--dependencies: []
-+dependencies:
-+- !ruby/object:Gem::Dependency 
-+  name: builder
-+  prerelease: false
-+  requirement: &id001 !ruby/object:Gem::Requirement 
-+    none: false
-+    requirements: 
-+    - - "~>"
-+      - !ruby/object:Gem::Version 
-+        hash: 57
-+        segments: 
-+        - 2
-+        - 1
-+        - 2
-+        version: 2.1.2
-+  type: :runtime
-+  version_requirements: *id003
-+- !ruby/object:Gem::Dependency 
-+  name: tzinfo
-+  prerelease: false
-+  requirement: &id002 !ruby/object:Gem::Requirement 
-+    none: false
-+    requirements: 
-+    - - ">="
-+      - !ruby/object:Gem::Version 
-+        hash: 57
-+        segments: 
-+        - 0
-+        - 3
-+        - 16
-+        version: 0.3.16
-+  type: :runtime
-+  version_requirements: *id003
-+- !ruby/object:Gem::Dependency 
-+  name: i18n
-+  prerelease: false
-+  requirement: &id003 !ruby/object:Gem::Requirement 
-+    none: false
-+    requirements: 
-+    - - "~>"
-+      - !ruby/object:Gem::Version 
-+        hash: 57
-+        segments: 
-+        - 0
-+        - 4
-+        - 1
-+        version: 0.4.1
-+  type: :runtime
-+  version_requirements: *id003
- 
- description: Utility library which carries commonly used classes and goodies from the Rails framework
- email: david@loudthinking.com
diff --git a/dev-ruby/activesupport/files/activesupport-2.3.15-unvendorize.patch b/dev-ruby/activesupport/files/activesupport-2.3.15-unvendorize.patch
deleted file mode 100644
index cc7547513a33..000000000000
--- a/dev-ruby/activesupport/files/activesupport-2.3.15-unvendorize.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-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.4.1'
--rescue Gem::LoadError
--  $:.unshift "#{File.dirname(__FILE__)}/vendor/i18n-0.4.1"
--end
-+gem 'i18n', '~> 0.4.1'
- require 'i18n'
-Index: metadata
-===================================================================
---- a/metadata
-+++ b/metadata
-@@ -16,8 +16,56 @@ bindir: bin
- cert_chain: []
- 
- date: 2013-01-08 00:00:00 -08:00
- default_executable: 
--dependencies: []
-+dependencies:
-+- !ruby/object:Gem::Dependency 
-+  name: builder
-+  prerelease: false
-+  requirement: &id001 !ruby/object:Gem::Requirement 
-+    none: false
-+    requirements: 
-+    - - "~>"
-+      - !ruby/object:Gem::Version 
-+        hash: 57
-+        segments: 
-+        - 2
-+        - 1
-+        - 2
-+        version: 2.1.2
-+  type: :runtime
-+  version_requirements: *id003
-+- !ruby/object:Gem::Dependency 
-+  name: tzinfo
-+  prerelease: false
-+  requirement: &id002 !ruby/object:Gem::Requirement 
-+    none: false
-+    requirements: 
-+    - - ">="
-+      - !ruby/object:Gem::Version 
-+        hash: 57
-+        segments: 
-+        - 0
-+        - 3
-+        - 16
-+        version: 0.3.16
-+  type: :runtime
-+  version_requirements: *id003
-+- !ruby/object:Gem::Dependency 
-+  name: i18n
-+  prerelease: false
-+  requirement: &id003 !ruby/object:Gem::Requirement 
-+    none: false
-+    requirements: 
-+    - - "~>"
-+      - !ruby/object:Gem::Version 
-+        hash: 57
-+        segments: 
-+        - 0
-+        - 4
-+        - 1
-+        version: 0.4.1
-+  type: :runtime
-+  version_requirements: *id003
- 
- description: Utility library which carries commonly used classes and goodies from the Rails framework
- email: david@loudthinking.com
diff --git a/dev-ruby/activesupport/files/activesupport-2.3.16-unvendorize.patch b/dev-ruby/activesupport/files/activesupport-2.3.16-unvendorize.patch
deleted file mode 100644
index 08994bd11645..000000000000
--- a/dev-ruby/activesupport/files/activesupport-2.3.16-unvendorize.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-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.4.1'
--rescue Gem::LoadError
--  $:.unshift "#{File.dirname(__FILE__)}/vendor/i18n-0.4.1"
--end
-+gem 'i18n', '~> 0.4.1'
- require 'i18n'
-Index: metadata
-===================================================================
---- a/metadata
-+++ b/metadata
-@@ -16,5 +16,53 @@ bindir: bin
- cert_chain: []
- date: 2013-01-28 00:00:00.000000000 Z
--dependencies: []
-+dependencies:
-+- !ruby/object:Gem::Dependency 
-+  name: builder
-+  prerelease: false
-+  requirement: &id001 !ruby/object:Gem::Requirement 
-+    none: false
-+    requirements: 
-+    - - "~>"
-+      - !ruby/object:Gem::Version 
-+        hash: 57
-+        segments: 
-+        - 2
-+        - 1
-+        - 2
-+        version: 2.1.2
-+  type: :runtime
-+  version_requirements: *id003
-+- !ruby/object:Gem::Dependency 
-+  name: tzinfo
-+  prerelease: false
-+  requirement: &id002 !ruby/object:Gem::Requirement 
-+    none: false
-+    requirements: 
-+    - - ">="
-+      - !ruby/object:Gem::Version 
-+        hash: 57
-+        segments: 
-+        - 0
-+        - 3
-+        - 16
-+        version: 0.3.16
-+  type: :runtime
-+  version_requirements: *id003
-+- !ruby/object:Gem::Dependency 
-+  name: i18n
-+  prerelease: false
-+  requirement: &id003 !ruby/object:Gem::Requirement 
-+    none: false
-+    requirements: 
-+    - - "~>"
-+      - !ruby/object:Gem::Version 
-+        hash: 57
-+        segments: 
-+        - 0
-+        - 4
-+        - 1
-+        version: 0.4.1
-+  type: :runtime
-+  version_requirements: *id003
- description: Utility library which carries commonly used classes and goodies from the Rails framework
- email: david@loudthinking.com
diff --git a/dev-ruby/activesupport/files/activesupport-2.3.5-mocha-0.9.5.patch b/dev-ruby/activesupport/files/activesupport-2.3.5-mocha-0.9.5.patch
deleted file mode 100644
index 4b6381e337fd..000000000000
--- a/dev-ruby/activesupport/files/activesupport-2.3.5-mocha-0.9.5.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: activesupport-2.3.5/lib/active_support/testing/setup_and_teardown.rb
-===================================================================
---- activesupport-2.3.5.orig/lib/active_support/testing/setup_and_teardown.rb
-+++ activesupport-2.3.5/lib/active_support/testing/setup_and_teardown.rb
-@@ -45,12 +45,7 @@ module ActiveSupport
-           return if @method_name.to_s == "default_test"
- 
-           if using_mocha = respond_to?(:mocha_verify)
--            assertion_counter_klass = if defined?(Mocha::TestCaseAdapter::AssertionCounter)
--                                        Mocha::TestCaseAdapter::AssertionCounter
--                                      else
--                                        Mocha::Integration::TestUnit::AssertionCounter
--                                      end
--            assertion_counter = assertion_counter_klass.new(result)
-+            assertion_counter = Mocha::Integration::TestUnit::AssertionCounter.new(result)
-           end
- 
-           yield(Test::Unit::TestCase::STARTED, name)
diff --git a/dev-ruby/activesupport/files/activesupport-3.0.3-mocha-0.9.5.patch b/dev-ruby/activesupport/files/activesupport-3.0.3-mocha-0.9.5.patch
deleted file mode 100644
index 3292b8d21d25..000000000000
--- a/dev-ruby/activesupport/files/activesupport-3.0.3-mocha-0.9.5.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- lib/active_support/testing/setup_and_teardown.rb.~1~	2010-09-10 09:22:52.828721874 +0200
-+++ lib/active_support/testing/setup_and_teardown.rb	2010-09-10 09:29:01.825098824 +0200
-@@ -97,11 +97,7 @@
- 
-         def retrieve_mocha_counter(result) #:nodoc:
-           if respond_to?(:mocha_verify) # using mocha
--            if defined?(Mocha::TestCaseAdapter::AssertionCounter)
--              Mocha::TestCaseAdapter::AssertionCounter.new(result)
--            else
--              Mocha::Integration::TestUnit::AssertionCounter.new(result)
--            end
-+            Mocha::Integration::TestUnit::AssertionCounter.new(result)
-           end
-         end
-       end