commit: 376b8914ff063abd7d9d3e9d97d474b09cdfd474 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Thu Jan 30 15:19:44 2020 +0000 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> CommitDate: Sun May 10 07:16:18 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=376b8914
dev-ruby/rack: remove unused patch(es) Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org> dev-ruby/rack/files/rack-1.2.1-gentoo.patch | 13 -------- .../rack/files/rack-1.6-rewindable-ruby23.patch | 38 ---------------------- 2 files changed, 51 deletions(-) diff --git a/dev-ruby/rack/files/rack-1.2.1-gentoo.patch b/dev-ruby/rack/files/rack-1.2.1-gentoo.patch deleted file mode 100644 index 82ea127a8cb..00000000000 --- a/dev-ruby/rack/files/rack-1.2.1-gentoo.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/lib/rack/rewindable_input.rb b/lib/rack/rewindable_input.rb -index accd96b..d71fde6 100644 ---- a/lib/rack/rewindable_input.rb -+++ b/lib/rack/rewindable_input.rb -@@ -94,7 +94,7 @@ module Rack - end - - def filesystem_has_posix_semantics? -- RUBY_PLATFORM !~ /(mswin|mingw|cygwin|java)/ -+ RUBY_PLATFORM !~ /(mswin|mingw|cygwin|java)/ && RUBY_VERSION < '1.9.1' - end - end - end diff --git a/dev-ruby/rack/files/rack-1.6-rewindable-ruby23.patch b/dev-ruby/rack/files/rack-1.6-rewindable-ruby23.patch deleted file mode 100644 index 9d36a7328e2..00000000000 --- a/dev-ruby/rack/files/rack-1.6-rewindable-ruby23.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 11b5a15dd1c8a41d87eb73df7bb99a3affecd787 Mon Sep 17 00:00:00 2001 -From: deepj <[email protected]> -Date: Mon, 25 May 2015 22:41:31 +0200 -Subject: [PATCH] Clean up Rack::Rewindable - ---- - lib/rack/rewindable_input.rb | 11 ----------- - 1 file changed, 11 deletions(-) - -diff --git a/lib/rack/rewindable_input.rb b/lib/rack/rewindable_input.rb -index 64efdda..dd6b784 100644 ---- a/lib/rack/rewindable_input.rb -+++ b/lib/rack/rewindable_input.rb -@@ -57,15 +57,6 @@ def close - - private - -- # Ruby's Tempfile class has a bug. Subclass it and fix it. -- class Tempfile < ::Tempfile -- def _close -- @tmpfile.close if @tmpfile -- @data[1] = nil if @data -- @tmpfile = nil -- end -- end -- - def make_rewindable - # Buffer all data into a tempfile. Since this tempfile is private to this - # RewindableInput object, we chmod it so that nobody else can read or write -@@ -77,8 +68,6 @@ def make_rewindable - @rewindable_io.set_encoding(Encoding::BINARY) if @rewindable_io.respond_to?(:set_encoding) - @rewindable_io.binmode - if filesystem_has_posix_semantics? -- # Use ::File.unlink as 1.9.1 Tempfile has a bug where unlink closes the file! -- ::File.unlink @rewindable_io.path - raise 'Unlink failed. IO closed.' if @rewindable_io.closed? - @unlinked = true - end
