Gentoo Archives: gentoo-commits

From: Hans de Graaff <graaff@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/rack/files/
Date: Sun, 10 May 2020 07:16:59
Message-Id: 1589094978.376b8914ff063abd7d9d3e9d97d474b09cdfd474.graaff@gentoo
1 commit: 376b8914ff063abd7d9d3e9d97d474b09cdfd474
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Thu Jan 30 15:19:44 2020 +0000
4 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
5 CommitDate: Sun May 10 07:16:18 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=376b8914
7
8 dev-ruby/rack: remove unused patch(es)
9
10 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
11 Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>
12
13 dev-ruby/rack/files/rack-1.2.1-gentoo.patch | 13 --------
14 .../rack/files/rack-1.6-rewindable-ruby23.patch | 38 ----------------------
15 2 files changed, 51 deletions(-)
16
17 diff --git a/dev-ruby/rack/files/rack-1.2.1-gentoo.patch b/dev-ruby/rack/files/rack-1.2.1-gentoo.patch
18 deleted file mode 100644
19 index 82ea127a8cb..00000000000
20 --- a/dev-ruby/rack/files/rack-1.2.1-gentoo.patch
21 +++ /dev/null
22 @@ -1,13 +0,0 @@
23 -diff --git a/lib/rack/rewindable_input.rb b/lib/rack/rewindable_input.rb
24 -index accd96b..d71fde6 100644
25 ---- a/lib/rack/rewindable_input.rb
26 -+++ b/lib/rack/rewindable_input.rb
27 -@@ -94,7 +94,7 @@ module Rack
28 - end
29 -
30 - def filesystem_has_posix_semantics?
31 -- RUBY_PLATFORM !~ /(mswin|mingw|cygwin|java)/
32 -+ RUBY_PLATFORM !~ /(mswin|mingw|cygwin|java)/ && RUBY_VERSION < '1.9.1'
33 - end
34 - end
35 - end
36
37 diff --git a/dev-ruby/rack/files/rack-1.6-rewindable-ruby23.patch b/dev-ruby/rack/files/rack-1.6-rewindable-ruby23.patch
38 deleted file mode 100644
39 index 9d36a7328e2..00000000000
40 --- a/dev-ruby/rack/files/rack-1.6-rewindable-ruby23.patch
41 +++ /dev/null
42 @@ -1,38 +0,0 @@
43 -From 11b5a15dd1c8a41d87eb73df7bb99a3affecd787 Mon Sep 17 00:00:00 2001
44 -From: deepj <deepjungle.maca@×××××.com>
45 -Date: Mon, 25 May 2015 22:41:31 +0200
46 -Subject: [PATCH] Clean up Rack::Rewindable
47 -
48 ----
49 - lib/rack/rewindable_input.rb | 11 -----------
50 - 1 file changed, 11 deletions(-)
51 -
52 -diff --git a/lib/rack/rewindable_input.rb b/lib/rack/rewindable_input.rb
53 -index 64efdda..dd6b784 100644
54 ---- a/lib/rack/rewindable_input.rb
55 -+++ b/lib/rack/rewindable_input.rb
56 -@@ -57,15 +57,6 @@ def close
57 -
58 - private
59 -
60 -- # Ruby's Tempfile class has a bug. Subclass it and fix it.
61 -- class Tempfile < ::Tempfile
62 -- def _close
63 -- @tmpfile.close if @tmpfile
64 -- @data[1] = nil if @data
65 -- @tmpfile = nil
66 -- end
67 -- end
68 --
69 - def make_rewindable
70 - # Buffer all data into a tempfile. Since this tempfile is private to this
71 - # RewindableInput object, we chmod it so that nobody else can read or write
72 -@@ -77,8 +68,6 @@ def make_rewindable
73 - @rewindable_io.set_encoding(Encoding::BINARY) if @rewindable_io.respond_to?(:set_encoding)
74 - @rewindable_io.binmode
75 - if filesystem_has_posix_semantics?
76 -- # Use ::File.unlink as 1.9.1 Tempfile has a bug where unlink closes the file!
77 -- ::File.unlink @rewindable_io.path
78 - raise 'Unlink failed. IO closed.' if @rewindable_io.closed?
79 - @unlinked = true
80 - end