gentoo resync : 25.08.2020

3 files changed, 0 insertions, 71 deletions

diff --git a/dev-ruby/net-sftp/Manifest b/dev-ruby/net-sftp/Manifest
index e0e5937193e5..100a3760c4e1 100644
--- a/dev-ruby/net-sftp/Manifest
+++ b/dev-ruby/net-sftp/Manifest
@@ -1,6 +1,3 @@
-AUX net-sftp-2.1.2-net-ssh-4.patch 1628 BLAKE2B 1dc8caef775ca06c80f485732acdceeedc10aaa96e33c1c6c59ce5e1596a71a229aecb06092b3a265288ae46469d1c72b4a0de8ec3d50cba5fe0947158c3181e SHA512 dc4e99f13e32698bbcfe1b07e2ec4baa1ed9beec5bc3816c016f26b053f7134bb9646dc538a0d03f2f3bda4d8d51d9742a5be54dfc6f9340cf2861e296492855
-DIST net-sftp-2.1.2.gem 67584 BLAKE2B 6b8e15f42c7a18f8c9aa7118e5822281eda6505c34697282cc9c52375ea0e4042f3045f41c2e9a15b8fd20f02946bfe6f3ad557aa5859a8e54e4c0ae8bd1d53d SHA512 126a9537a4ac45150096db4d46ad19e0d8a1833fef3733a1b66ff01463c0d109415f0ef807706ff88be8c5c1395bbd4620e529f06e3c9f746a4ed6ec2cb7d18d
 DIST net-sftp-3.0.0.tar.gz 63542 BLAKE2B e09e209aa0d102a6da7611cabf49970c9a4e572d51946d5dc0688879db97c92e8a39713dd0011a4234391ff0ab685a978c491917c041f7d10a8f092fde5c876a SHA512 c28411cfa8522dec893fe7a1588a16bb761a9d7692c81c453d9a9ad817988637614c6afd754db8547e845a16062882e2b7e95974b889631676f092d9e84b83e7
-EBUILD net-sftp-2.1.2-r4.ebuild 583 BLAKE2B 805645d80ea7d4e3e06ca3ddb57ac144f8dbb333bc7cfdbd1c8e6a1db760ec53a3526c73fb2ba84bfd420d50e2615b70d2d8c11977d5a7623d8f44cc6fcbd76f SHA512 123341bbb0bdd4c85530b479ef602fd4b8bbe77cb91e3b5780643cbbab1a367c0590a31be3c41f614ada76a7a262d8cecbba7af18ae1f86df10f64e05e132f5f
 EBUILD net-sftp-3.0.0.ebuild 829 BLAKE2B 6eb91a452747e78a68c4b3cb27fc1e3fe3aff7403acb68eada666fe40d91202c7d266337a8c4b1655aed2304f177414de1c6674143a50dc6bf8588cef4c165a2 SHA512 da479b4ba05ef64da244581341e13d1160c0fa6e6e60d38b2b982f3f58d6942603aa007c93a36b61bdcf5bfefcad8625f09b3e19530dfbbf93c786795e4409bc
 MISC metadata.xml 342 BLAKE2B b52478d886842e044705cc42c177577f111b2c01140b58d322107ecaf20bc1b5db9763ec0f0e67397118515690f452b51c1e14dcf6bada17d7c5f18889571b07 SHA512 3ece29fffeee2912d0bc06514adca69c2bdfa95bd88173d4f42cf0aee00944adc71bfaec6df543f0c1fc1717b7a808459f30894977154f7acce289dfb491f6d9
diff --git a/dev-ruby/net-sftp/files/net-sftp-2.1.2-net-ssh-4.patch b/dev-ruby/net-sftp/files/net-sftp-2.1.2-net-ssh-4.patch
deleted file mode 100644
index d510153ba8d5..000000000000
--- a/dev-ruby/net-sftp/files/net-sftp-2.1.2-net-ssh-4.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 9870b32d31bbe5cddceead54c64f71e4fd91779e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
-Date: Mon, 27 Feb 2017 15:00:30 +0100
-Subject: [PATCH] Fix compatiblity with net-ssh 4.0+
-
----
- test/test_download.rb | 4 +++-
- test/test_session.rb  | 6 ++++--
- 2 files changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/test/test_download.rb b/test/test_download.rb
-index d4a5f0b..d9582b6 100644
---- a/test/test_download.rb
-+++ b/test/test_download.rb
-@@ -139,7 +139,9 @@ def test_download_file_should_transfer_remote_to_local_buffer
- 
-   def test_download_directory_to_buffer_should_fail
-     expect_sftp_session :server_version => 3
--    assert_raises(ArgumentError) { sftp.download("/path/to/remote", StringIO.new, :recursive => true) }
-+    Net::SSH::Test::Extensions::IO.with_test_extension do
-+      assert_raises(ArgumentError) { sftp.download("/path/to/remote", StringIO.new, :recursive => true) }
-+    end
-   end
- 
-   private
-diff --git a/test/test_session.rb b/test/test_session.rb
-index a59058a..c398436 100644
---- a/test/test_session.rb
-+++ b/test/test_session.rb
-@@ -660,8 +660,10 @@ def test_unblock_bang_should_block_and_return_response
- 
-     def assert_not_implemented(server_version, command, *args)
-       expect_sftp_session :server_version => 1
--      sftp.connect!
--      assert_raises(NotImplementedError) { sftp.send(command, *args) }
-+      Net::SSH::Test::Extensions::IO.with_test_extension do
-+        sftp.connect!
-+        assert_raises(NotImplementedError) { sftp.send(command, *args) }
-+      end
-     end
- 
-     def assert_command_with_callback(command, *args)
diff --git a/dev-ruby/net-sftp/net-sftp-2.1.2-r4.ebuild b/dev-ruby/net-sftp/net-sftp-2.1.2-r4.ebuild
deleted file mode 100644
index c3a90e27d991..000000000000
--- a/dev-ruby/net-sftp/net-sftp-2.1.2-r4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="SFTP in pure Ruby"
-HOMEPAGE="https://github.com/net-ssh/net-sftp"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-PATCHES=( "${FILESDIR}/${P}-net-ssh-4.patch" )
-
-ruby_add_rdepend "dev-ruby/net-ssh:4"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/mocha-0.13
-	)"