gentoo resync : 03.03.2019

3 files changed, 0 insertions, 53 deletions

diff --git a/dev-ruby/fakeweb/Manifest b/dev-ruby/fakeweb/Manifest
index 1011b2f92fd2..ad253a66e9b4 100644
--- a/dev-ruby/fakeweb/Manifest
+++ b/dev-ruby/fakeweb/Manifest
@@ -1,5 +1,3 @@
-AUX fakeweb-ruby22.patch 870 BLAKE2B e96c9c58c5973bb4b028bb2582b40b418723df5548446288cf9df843dbf39377bf48a38416183b627ff022c2ce06f0f42fd7aa77dcf1ca51243dc5e5720b4da4 SHA512 32c5c7e3b6e6e5402ffeb809b74036de854752eded5721ea778ecd9d83b19e992ff3091ac7608e49b0984f3c26b21c95ae52489a585bb862e03f1fc201e4fa89
-AUX fakeweb-ruby23.patch 1214 BLAKE2B 4fa44c8b30adb0ff76372d7d6581f8b326e020348c07b37daa24407a959da4fabe2e51eeec01ca81a1f5abafbd87b42132e5f9aa38fed70f872c1ee18b66ca03 SHA512 3384a8fb96b34f17f929ebfb0ceb01d1238a7333058954097985928ef8bd9d5ec31002a8f2d18b65133ea48cb4309e24222bc675f15f72d869dcea062164f3f9
 DIST fakeweb-1.3.0.20170806.tar.gz 61449 BLAKE2B f015f95897383e0b65ada5a7833f7bd3fd61ae77f4ab38bf6bb47f2eecef0c778928090302e46157ae4e2fc6c3df4559e9f5c8004a6474ad8852d157aa3af6da SHA512 1871b7c9f2e4f12cd1c434ef4f760828187078a951517fe3f7a6ca5c5d6f08e3056cae2bb012eca1ba556c2f4d369cb2716c637fefee67eb723428195c482edf
 EBUILD fakeweb-1.3.0.20170806.ebuild 1320 BLAKE2B 0a3ee0cd64cada78c4d6bd6946556c900905be127600fe0efdc66707965fe443e7bb84d105a4fbd69509dfa482200dcf42327fd6c6343d862c75675bc8d3d355 SHA512 babd9a99faae1fcdbb115977c4356683babea340c9eb68d3f4edd806aa99554e5f83be39611c5209c8fa785db8ad5e0075a71f242759862d2c4461f8d684117e
 MISC metadata.xml 340 BLAKE2B 7058eef4592a28cd630ef9d8ccbd6920dae2909bb1740172464de06215a3a970e2291a855cbad1206205e90cb04bb711e4725b8d566e6388134501706168914b SHA512 4915509da84a354d665c9c59881e83356a8e8b2f7f09afdae68755484a6e575a7502f98ef8da1cffab96ff12264c048cda182f1c5042b95b058b731bf0395077
diff --git a/dev-ruby/fakeweb/files/fakeweb-ruby22.patch b/dev-ruby/fakeweb/files/fakeweb-ruby22.patch
deleted file mode 100644
index 7c44aef68922..000000000000
--- a/dev-ruby/fakeweb/files/fakeweb-ruby22.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 1647ca210691429a75eb159814f42e68c3c1ce4c Mon Sep 17 00:00:00 2001
-From: Josef Stribny <jstribny@redhat.com>
-Date: Thu, 19 Mar 2015 09:32:50 +0100
-Subject: [PATCH] Fix tests by expecting TypeError for Ruby 2.2
-
----
- test/test_fake_web.rb | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/test/test_fake_web.rb b/test/test_fake_web.rb
-index f344612..682c43d 100644
---- a/test/test_fake_web.rb
-+++ b/test/test_fake_web.rb
-@@ -35,7 +35,9 @@ def test_response_for_with_wrong_number_of_arguments
-   end
- 
-   def test_register_uri_without_domain_name
--    assert_raises URI::InvalidURIError do
-+    # Ruby 2.1 and lower raises URI::InvalidURIError
-+    # Ruby 2.2 and higher raises TypeError
-+    assert_raises URI::InvalidURIError, TypeError do
-       FakeWeb.register_uri(:get, 'test_example2.txt', fixture_path("test_example.txt"))
-     end
-   end
diff --git a/dev-ruby/fakeweb/files/fakeweb-ruby23.patch b/dev-ruby/fakeweb/files/fakeweb-ruby23.patch
deleted file mode 100644
index 0a1c6db6b3e7..000000000000
--- a/dev-ruby/fakeweb/files/fakeweb-ruby23.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From c42a354eda2f6bfe8dc7c1176e085dda6867f4d0 Mon Sep 17 00:00:00 2001
-From: Christian Hofstaedtler <christian@hofstaedtler.name>
-Date: Thu, 3 Mar 2016 17:42:30 -0300
-Subject: [PATCH] Fix tests for ruby 2.3 (new connect_nonblock call)
-
-Applies on top of the changes for 2.2 (#53).
----
- test/test_helper.rb | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/test/test_helper.rb b/test/test_helper.rb
-index e9a36af..8ce492d 100644
---- a/test/test_helper.rb
-+++ b/test/test_helper.rb
-@@ -119,7 +119,11 @@ def setup_expectations_for_real_request(options = {})
-       OpenSSL::SSL::SSLSocket.expects(:===).with(socket).returns(true).at_least_once
-       OpenSSL::SSL::SSLSocket.expects(:new).with(socket, instance_of(OpenSSL::SSL::SSLContext)).returns(socket).at_least_once
-       socket.stubs(:sync_close=).returns(true)
--      socket.expects(:connect).with().at_least_once
-+      if RUBY_VERSION >= "2.3.0"
-+        socket.expects(:connect_nonblock).with(:exception => false).at_least_once
-+      else
-+        socket.expects(:connect).with().at_least_once
-+      end
-       if RUBY_VERSION >= "2.0.0" && RUBY_PLATFORM != "java"
-         socket.expects(:session).with().at_least_once
-       end