gentoo resync : 10.11.2019

3 files changed, 0 insertions, 67 deletions

diff --git a/dev-ruby/rspec-mocks/Manifest b/dev-ruby/rspec-mocks/Manifest
index f79839e7531d..394518c39156 100644
--- a/dev-ruby/rspec-mocks/Manifest
+++ b/dev-ruby/rspec-mocks/Manifest
@@ -1,5 +1,3 @@
-AUX rspec-mocks-3.7.0-ruby25-1.patch 1164 BLAKE2B c7fe549bdbd85ab2868bc6cc02f6f6811d60b484acce08de8c7d5596ef36b6f63f63023fd2f708f0f0e855137e5d03ea283fcb2f713d755d8f067d86e8cdcf14 SHA512 ff92bd1a227a6c95c9fc04a10373f7924f09533fab56748554929a24fbd8147c82d1a3b15400f1b6ae003ebd2c0b0a4e719211fba2f43929f05cae2cc6ab894e
-AUX rspec-mocks-3.7.0-ruby25-2.patch 1496 BLAKE2B 1f03651f0f0ee76e055b3dc8f823f2b9e119d7d5f5583ddb44ed15152ec852eaacd1e78a56b401a606777ecc726f0820feb7975c2064fc22430ba28509b52016 SHA512 ed06d7c0c23ccde64393dfad26a70c698973817e077b2db592d908e55827b210bbbe4d95e1d5c92866336456ac21566a96c08d8dc7e84386c1ca8d3d25d5a445
 DIST rspec-mocks-2.99.2-git.tgz 101731 BLAKE2B 27ae180381d427b642c53c351e7b53602caba4252ddf5393949d940be8474110eb0697901afaaa878cd8d368f081c6644c0fcbce86d9d14b9f93f48c027ae808 SHA512 dd3b9394d56de8d3089db7777cda1e1a5bbdc46486876a99a8a83b602b84ba0320913d8e8dabe5e0367645eb01b943607b93e67d87cc26e380c8db6e048e4e0d
 DIST rspec-mocks-3.8.1-git.tgz 191543 BLAKE2B dae8b22a011a3563eb65d1709006169bf5dcf310749cb858f4ff20c7b82e7675a616fc427136fe5e0edeef1db0b42a1d0af1c5623eed35807e84dc355131c8cc SHA512 ec71c4b815beef315f8db329bd2b0e60cdbb1fa37939c624799c1589d94dd28f74b3d1a4c0b9025bc98a809f80d625315458351fe7dec8291bad20e79beecca8
 DIST rspec-mocks-3.8.2-git.tgz 191807 BLAKE2B 9ec44fcaad9fe1e9d75cfb84253e52411b7083070de5dbb19bcdf7c518eb2439e6493e979daf814df7b31bab8bbe72821d42eb797ab88d95e051a700b63d93b5 SHA512 42b9b952386ce862a1cc19116991ae6b4633d551db057babe2e4aa6553acb6eafbb05b98df8a5c6cb362a00025ac3ce0f43f3c4e4ea63343c8bf0dad769a3aed
diff --git a/dev-ruby/rspec-mocks/files/rspec-mocks-3.7.0-ruby25-1.patch b/dev-ruby/rspec-mocks/files/rspec-mocks-3.7.0-ruby25-1.patch
deleted file mode 100644
index 6b545ae3cf7a..000000000000
--- a/dev-ruby/rspec-mocks/files/rspec-mocks-3.7.0-ruby25-1.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 871eb31e3bfe50705ca57e754771aa1e0164f12d Mon Sep 17 00:00:00 2001
-From: Myron Marston <myron.marston@gmail.com>
-Date: Sat, 30 Dec 2017 17:45:43 -0800
-Subject: [PATCH] Skip spec that does not apply to Ruby 2.5.
-
-Ruby 2.5 has removed the ability to access top-level constants
-via a confusing nested form (e.g. `MyClass::Hash`), so we no
-longer need this spec there.
-
-For #1192.
----
- spec/rspec/mocks/mutate_const_spec.rb | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/spec/rspec/mocks/mutate_const_spec.rb b/spec/rspec/mocks/mutate_const_spec.rb
-index fe8d4128..9d80dd73 100644
---- a/spec/rspec/mocks/mutate_const_spec.rb
-+++ b/spec/rspec/mocks/mutate_const_spec.rb
-@@ -170,7 +170,7 @@ def change_const_value_to(value)
-             expect(::Hash).to equal(top_level_hash)
-           end
- 
--          it 'does not affect the ability to access the top-level constant from nested contexts', :silence_warnings do
-+          it 'does not affect the ability to access the top-level constant from nested contexts', :silence_warnings, :if => RUBY_VERSION < '2.5' do
-             top_level_hash = ::Hash
- 
-             hide_const("TestClass::Hash")
diff --git a/dev-ruby/rspec-mocks/files/rspec-mocks-3.7.0-ruby25-2.patch b/dev-ruby/rspec-mocks/files/rspec-mocks-3.7.0-ruby25-2.patch
deleted file mode 100644
index 3ac448938416..000000000000
--- a/dev-ruby/rspec-mocks/files/rspec-mocks-3.7.0-ruby25-2.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 783923d6879a2f9df9fee8ef24cecca6ac21136e Mon Sep 17 00:00:00 2001
-From: Myron Marston <myron.marston@gmail.com>
-Date: Sat, 30 Dec 2017 23:35:27 -0800
-Subject: [PATCH] Make spec less brittle.
-
-On Ruby 2.5, this spec failed, apparently due to the fact that
-Method equality has changed on 2.5 slightly. The method instances
-have always been different but 2.4 and before considered them
-equivalent. Instead, we can show that the two method objects
-_behave_ the same, which is what we really care about.
-
-Fixes #1192.
----
- spec/rspec/mocks/and_wrap_original_spec.rb | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/spec/rspec/mocks/and_wrap_original_spec.rb b/spec/rspec/mocks/and_wrap_original_spec.rb
-index df9cae46..2d4d0a8b 100644
---- a/spec/rspec/mocks/and_wrap_original_spec.rb
-+++ b/spec/rspec/mocks/and_wrap_original_spec.rb
-@@ -26,12 +26,13 @@ def results
-         }.to raise_error NameError
-       end
- 
--      it "passes in the original method" do
--        value = nil
-+      it "passes along the original method" do
-+        passed_method = nil
-         original_method = instance.method(:results)
--        allow_it.to receive(:results).and_wrap_original { |m| value = m }
-+        allow_it.to receive(:results).and_wrap_original { |m| passed_method = m }
-         instance.results
--        expect(value).to eq original_method
-+
-+        expect(passed_method.call).to eq(original_method.call)
-       end
- 
-       it "passes along the message arguments" do