Cleanup unused patches.

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

3 files changed, 0 insertions, 139 deletions

diff --git a/dev-ruby/actionpack/files/actionpack-2.3.10-i18n-0.4.2.patch b/dev-ruby/actionpack/files/actionpack-2.3.10-i18n-0.4.2.patch
deleted file mode 100644
index 95efd54f5f42..000000000000
--- a/dev-ruby/actionpack/files/actionpack-2.3.10-i18n-0.4.2.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Add additional shoulda expectations to cover apparently changed
-semantics from i18n 0.4.1 > 0.4.2. It's not clear what changed
-exactly, and it could well be a bug in actionpack which doesn't seem
-to pass the locale along to all calls in some of these methods. Not
-investigated further yet since all Rails development is aimed at Rails
-3.
-
-
---- test/template/number_helper_i18n_test.rb.~1~	2011-02-20 15:51:40.792064192 +0100
-+++ test/template/number_helper_i18n_test.rb	2011-02-20 16:42:56.067596179 +0100
-@@ -20,6 +20,8 @@
-   end
- 
-   def test_number_to_currency_translates_currency_formats
-+    I18n.expects(:translate).twice.with(:'number.format', {:locale => nil, :raise => true}).returns({})
-+    I18n.expects(:translate).with(:'number.precision.format', {:locale => nil, :raise => true}).returns({})
-     I18n.expects(:translate).with(:'number.format', :locale => 'en', :raise => true).returns(@number_defaults)
-     I18n.expects(:translate).with(:'number.currency.format', :locale => 'en',
-                                   :raise => true).returns(@currency_defaults)
-@@ -27,6 +29,7 @@
-   end
- 
-   def test_number_with_precision_translates_number_formats
-+    I18n.expects(:translate).with(:'number.format', {:locale => nil, :raise => true}).returns({})
-     I18n.expects(:translate).with(:'number.format', :locale => 'en', :raise => true).returns(@number_defaults)
-     I18n.expects(:translate).with(:'number.precision.format', :locale => 'en',
-                                   :raise => true).returns(@precision_defaults)
-@@ -39,6 +42,8 @@
-   end
- 
-   def test_number_to_percentage_translates_number_formats
-+    I18n.expects(:translate).twice.with(:'number.format', {:locale => nil, :raise => true}).returns({})
-+    I18n.expects(:translate).with(:'number.precision.format', {:locale => nil, :raise => true}).returns({})
-     I18n.expects(:translate).with(:'number.format', :locale => 'en', :raise => true).returns(@number_defaults)
-     I18n.expects(:translate).with(:'number.percentage.format', :locale => 'en',
-                                   :raise => true).returns(@percentage_defaults)
-@@ -46,6 +51,8 @@
-   end
- 
-   def test_number_to_human_size_translates_human_formats
-+    I18n.expects(:translate).twice.with(:'number.format', {:locale => nil, :raise => true}).returns({})
-+    I18n.expects(:translate).with(:'number.precision.format', {:locale => nil, :raise => true}).returns({})
-     I18n.expects(:translate).with(:'number.format', :locale => 'en', :raise => true).returns(@number_defaults)
-     I18n.expects(:translate).with(:'number.human.format', :locale => 'en',
-                                   :raise => true).returns(@human_defaults)
diff --git a/dev-ruby/actionpack/files/actionpack-2.3.11-rails3.patch b/dev-ruby/actionpack/files/actionpack-2.3.11-rails3.patch
deleted file mode 100644
index b958d463fc4c..000000000000
--- a/dev-ruby/actionpack/files/actionpack-2.3.11-rails3.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- test/abstract_unit.rb.~1~	2011-02-10 08:12:37.551582393 +0100
-+++ test/abstract_unit.rb	2011-02-10 08:13:37.845418027 +0100
-@@ -19,6 +19,10 @@
-   # Debugging disabled. `gem install ruby-debug` to enable.
- end
- 
-+gem 'activesupport', '~> 2.3'
-+gem 'actionmailer', '~> 2.3'
-+gem 'activerecord', '~> 2.3'
-+
- require 'action_controller'
- require 'action_controller/cgi_ext'
- require 'action_controller/test_process'
diff --git a/dev-ruby/actionpack/files/actionpack-2.3.8-custom-cookie-fix.patch b/dev-ruby/actionpack/files/actionpack-2.3.8-custom-cookie-fix.patch
deleted file mode 100644
index ecfe4d68546c..000000000000
--- a/dev-ruby/actionpack/files/actionpack-2.3.8-custom-cookie-fix.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 09e81c7069341ab219ddbd74817feea4a09b8172 Mon Sep 17 00:00:00 2001
-From: Jesse Storimer <jstorimer@gmail.com>
-Date: Tue, 1 Jun 2010 08:35:25 -0400
-Subject: [PATCH] CookieStore should preserve the Set-Cookie header Array [#4743 state:resolved]
-
----
- .../lib/action_controller/session/cookie_store.rb  |    7 ++-----
- .../test/controller/session/cookie_store_test.rb   |   18 ++++++++++++++++--
- 2 files changed, 18 insertions(+), 7 deletions(-)
-
-diff --git a/actionpack/lib/action_controller/session/cookie_store.rb b/actionpack/lib/action_controller/session/cookie_store.rb
-index 3d21e81..2fcee56 100644
---- a/actionpack/lib/action_controller/session/cookie_store.rb
-+++ b/actionpack/lib/action_controller/session/cookie_store.rb
-@@ -114,11 +114,8 @@ module ActionController
-           end
- 
-           cookie = build_cookie(@key, cookie.merge(options))
--          unless headers[HTTP_SET_COOKIE].blank?
--            headers[HTTP_SET_COOKIE] << "\n#{cookie}"
--          else
--            headers[HTTP_SET_COOKIE] = cookie
--          end
-+          headers[HTTP_SET_COOKIE] = [] if headers[HTTP_SET_COOKIE].blank?
-+          headers[HTTP_SET_COOKIE] << cookie
-         end
- 
-         [status, headers, body]
-diff --git a/actionpack/test/controller/session/cookie_store_test.rb b/actionpack/test/controller/session/cookie_store_test.rb
-index 5ef8eec..02e9ed2 100644
---- a/actionpack/test/controller/session/cookie_store_test.rb
-+++ b/actionpack/test/controller/session/cookie_store_test.rb
-@@ -44,6 +44,12 @@ class CookieStoreTest < ActionController::IntegrationTest
-       head :ok
-     end
- 
-+    def set_session_value_and_cookie
-+      cookies["foo"] = "bar"
-+      session[:foo] = "bar"
-+      render :text => Rack::Utils.escape(Verifier.generate(session.to_hash))
-+    end
-+
-     def rescue_action(e) raise end
-   end
- 
-@@ -96,7 +102,7 @@ class CookieStoreTest < ActionController::IntegrationTest
-     with_test_route_set do
-       get '/set_session_value'
-       assert_response :success
--      assert_equal "_myapp_session=#{response.body}; path=/; HttpOnly",
-+      assert_equal ["_myapp_session=#{response.body}; path=/; HttpOnly"],
-         headers['Set-Cookie']
-    end
-   end
-@@ -164,7 +170,7 @@ class CookieStoreTest < ActionController::IntegrationTest
-       get '/set_session_value'
-       assert_response :success
-       session_payload = response.body
--      assert_equal "_myapp_session=#{response.body}; path=/; HttpOnly",
-+      assert_equal ["_myapp_session=#{response.body}; path=/; HttpOnly"],
-         headers['Set-Cookie']
- 
-       get '/call_reset_session'
-@@ -193,6 +199,14 @@ class CookieStoreTest < ActionController::IntegrationTest
-     end
-   end
- 
-+  def test_setting_session_value_and_cookie
-+    with_test_route_set do
-+      get '/set_session_value_and_cookie'
-+      assert_response :success
-+      assert_equal({"_myapp_session" => response.body, "foo" => "bar"}, cookies)
-+   end
-+  end
-+
-   private
-     def with_test_route_set
-       with_routing do |set|
--- 
-1.7.1
-