gentoo resync : 01.10.2021

9 files changed, 3 insertions, 222 deletions

diff --git a/dev-ruby/net-scp/Manifest b/dev-ruby/net-scp/Manifest
index 7df41b461f35..44e478314ba1 100644
--- a/dev-ruby/net-scp/Manifest
+++ b/dev-ruby/net-scp/Manifest
@@ -1,10 +1,3 @@
-AUX net-scp-1.2.1-fix-common.path 674 BLAKE2B c3ae5c5b5773855ad0fb20211cec90399e065be5dc6741b948304cd4d19a4ed70bd59bc3723cc82ea1455e18440eaeebbbe368939a39cc96075c517162878921 SHA512 4f1c3e747ff7e9cb9777706989e5e1dd9fca9a9326ff3a586356e8b8227c6d72e636f07e7ecabd483d01e7cbb215d2d3feebcecff8904aeee5643eff26739692
-AUX net-scp-1.2.1-fix-download_test.patch 621 BLAKE2B dc6604f8586948f27fce437a0d88a27e361fced5590c08ad49200ac96549688c43b5deedfc3be26433dac77a883cc0d1fa5b0f9182c6e344c54deb996cf222b3 SHA512 9f43d8f26053017c498f5927b00611a1aa45b892eca199bb964e1473e119591a97b325628e5904a92b25c2d433da105a00b7ba18aebaa96e471610ecb4f99ea9
-AUX net-scp-1.2.1-fix-download_test_2.patch 997 BLAKE2B 46d00f3fcd5b8ceb7f6925d0af5ea9e09ecdf83bc8f73626e7933a16ea2fa89e9a190b85e912a2bfa58f7a10dcb17f73bc19f568a3ce330036b703a37387fa68 SHA512 4540f52db9dfd2e549b7f98f7f3bbfeabde448fcdde4a801c16ad0e07e82f8e49acb0e753f8e43909487347d359047d91f1f8f963fe94ae20e929e2770e29d8f
-AUX net-scp-1.2.1-fix-download_test_3.patch 559 BLAKE2B 94ac112439548e66a9d1cb2a5ea6e83184aa298510d7022823e828317069faadabc74cdd80e684869b4ad2ad628fd97b43cb7e521dc5e15331a80632a6f93641 SHA512 a5de2e35c73cbfe3204c3ed1d1148fe124da8115a9662d3a942433001202cc5ba35f215090b3bc77dab7871aa0a0244e8a41727fa6237eb462b233ffc56ac70c
-AUX net-scp-1.2.1-fix-upload_tests.patch 562 BLAKE2B d6f6aaad4dca5c54158219f1a36bd20b5225280c36b90095b6f7d37ecf789465fd348c4a96bc8f5e298f40f4fcaacf224b0d680a62eed901101976293947a24c SHA512 9cbdafe10d985e7fec3368e344df526e51179db8fe24e172d367fe506de8c733c05fee8ca90e9d6d9d91b900fb056cc245146a4b4e7eaa8ad5021db6992994bd
-AUX net-scp-1.2.1-raise-correct-errors-net-ssh-4.0-compat.patch 1230 BLAKE2B 52d3657f71b06a5561e44e8d408127fefc83bf1e05097f835522719bdab0bec1139fa3332fa55d23d386ae4528318f8cded62222a8ddf39dfe216369e510839c SHA512 45b93d1a197776ee6afde01292e9b87d24d66685a72fc5311fbd504ca429f0cfb14fb9fc1f21dd9092024de17e78e26d71e8928448bdeed279eba14393949c26
-AUX net-scp-1.2.1-raise-correct-errors.patch 3046 BLAKE2B aa0e36edfdc85c944d3ba34d351abe93a7ade694e81240c47956b5767ac6491b954755ea05de27dfaaefa7ea1d628c632aeaaef6061f8017e9b2c114d923382b SHA512 0ff40b546aff5d0bec7245325d5e076de06f719512e51aadfd2f3b66f727c97164629e37b85fc0073eb7134cee3de43b4a0287e965012758c5fd997eebf9ec6e
 DIST net-scp-3.0.0.tar.gz 27947 BLAKE2B 78a1100b7602b9c09c8f06228b6e564fce15133c6cf8c9816613cb56b1d3805d9393700eb66c3710e482771e4116beae393c12ad12963b85428e21e7cf105218 SHA512 6d68b75124ccd2d387983f6d66a8b0e040132ba17d942631c806e899dff757ffae7a031a27ea0988166bf56e803c1a6175199845a848b92c7064388564e0ac79
-EBUILD net-scp-3.0.0.ebuild 1044 BLAKE2B 4b912bba9210feeca1e1ac81819f7b920f380bb98729a80e470370bb6f947bb3c77201a4f9019cffd3d1d30d3bf01c6153a76842b25aad5ce48c3e8ab21b255e SHA512 e479a59f0cf1ef81d87c8144d667303ebf66223e9b610ca6300fdde2802c0a2386e9116ba484551f7316803b633f4588563a0ab26f2a0512613882aca4715339
+EBUILD net-scp-3.0.0.ebuild 1075 BLAKE2B 22d944d5ac6cc21a52a015c4cffa5b79257fd61cd755e2eb71ccbb6842e71e6964755cee00c1736940c631e0c8195538fe888ae665270390d4e85edca36e27d4 SHA512 23957869864256205298eea94f51b95401a31f0feaa3cb2452a3d1c72df4f3f3b18d8fedf0ac94dac1b75f27f62ba8b6abdbcf933ee40d8ca1412b9de7b11f54
 MISC metadata.xml 342 BLAKE2B ba5eb772d406d96ea5c4c0fdbc0ba183e44c26e950f55b54174519f25a0555a05e0eb1d1e09dd7fd91ab3a6732480225016c18e538489c5c65ad68261d3d21c4 SHA512 3bfa5a64b5bd0121a284d48b56a3914173f2562c84dbbedcbc0bb309910f68e1d3434037f21b962947c3f7cd162509bdaa9b04bb4ff550b61a4e26274bf078cf
diff --git a/dev-ruby/net-scp/files/net-scp-1.2.1-fix-common.path b/dev-ruby/net-scp/files/net-scp-1.2.1-fix-common.path
deleted file mode 100644
index ee262d238cbf..000000000000
--- a/dev-ruby/net-scp/files/net-scp-1.2.1-fix-common.path
+++ /dev/null
@@ -1,28 +0,0 @@
---- test/common.rb	2018-01-21 16:23:07.384173147 +0100
-+++ test/common.rb	2018-01-21 16:20:34.084172782 +0100
-@@ -1,11 +1,11 @@
- require 'test/unit'
- require 'mocha/setup'
- 
--begin
--  gem 'net-ssh', ">= 2.0.0"
--  require 'net/ssh'
--rescue LoadError
--  $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../../net-ssh/lib"
-+#begin
-+#  #gem 'net-ssh', ">= 2.0.0"
-+#  require 'net/ssh'
-+#rescue LoadError
-+#  $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../../net-ssh/lib"
- 
-   begin
-     require 'net/ssh'
-@@ -14,7 +14,7 @@
-   rescue LoadError => e
-     abort "could not load net/ssh v2 (#{e.inspect})"
-   end
--end
-+#end
- 
- $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../lib"
- 
diff --git a/dev-ruby/net-scp/files/net-scp-1.2.1-fix-download_test.patch b/dev-ruby/net-scp/files/net-scp-1.2.1-fix-download_test.patch
deleted file mode 100644
index a138fcdb5573..000000000000
--- a/dev-ruby/net-scp/files/net-scp-1.2.1-fix-download_test.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- test/test_download.rb	2018-01-22 02:08:00.000013728 +0100
-+++ test/test_download.rb.1	2018-01-22 02:11:49.820014276 +0100
-@@ -70,12 +70,12 @@
-     end
- 
-     error = nil
--    assert_scripted do
--      begin
--        scp.download!("/path/to/remote.txt")
--      rescue
--        error = $!
--      end
-+    Net::SSH::Test::Extensions::IO.with_test_extension do
-+    begin
-+      scp.download!("/path/to/remote.txt")
-+    rescue
-+      error = $!
-+    end
-     end
-     assert_equal Net::SCP::Error, error.class
-     assert_equal "SCP did not finish successfully (1): File not found: /path/to/remote.txt\n", error.message
diff --git a/dev-ruby/net-scp/files/net-scp-1.2.1-fix-download_test_2.patch b/dev-ruby/net-scp/files/net-scp-1.2.1-fix-download_test_2.patch
deleted file mode 100644
index 55a8e5f16bcd..000000000000
--- a/dev-ruby/net-scp/files/net-scp-1.2.1-fix-download_test_2.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- test/test_download.rb	2018-01-22 02:26:56.440016436 +0100
-+++ test/test_download.rb	2018-01-22 02:32:46.076017270 +0100
-@@ -116,7 +116,9 @@
- 
-   def test_download_io_with_recursive_should_raise_error
-     expect_scp_session "-f -r /path/to/remote.txt"
--    assert_raises(Net::SCP::Error) { scp.download!("/path/to/remote.txt", StringIO.new, :recursive => true) }
-+    Net::SSH::Test::Extensions::IO.with_test_extension do
-+      assert_raises(Net::SCP::Error) { scp.download!("/path/to/remote.txt", StringIO.new, :recursive => true) }
-+    end
-   end
- 
-   def test_download_io_with_preserve_should_ignore_preserve
-@@ -154,8 +156,9 @@
-       channel.sends_ok
-       channel.gets_data "D0755 0 remote\n"
-     end
--
--    assert_raises(Net::SCP::Error) { scp.download!("/path/to/remote") }
-+    Net::SSH::Test::Extensions::IO.with_test_extension do
-+      assert_raises(Net::SCP::Error) { scp.download!("/path/to/remote") }
-+    end
-   end
- 
-   def test_download_should_raise_error_if_gets_not_ok
diff --git a/dev-ruby/net-scp/files/net-scp-1.2.1-fix-download_test_3.patch b/dev-ruby/net-scp/files/net-scp-1.2.1-fix-download_test_3.patch
deleted file mode 100644
index 12df02c1f00e..000000000000
--- a/dev-ruby/net-scp/files/net-scp-1.2.1-fix-download_test_3.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- test/test_download.rb	2018-01-22 02:35:45.200017696 +0100
-+++ test/test_download.rb.1	2018-01-22 02:38:40.000018113 +0100
-@@ -217,8 +217,10 @@
-       channel.gets_data "E\n"
-       channel.sends_ok
-     end
--
--    scp.download!("/path/to/remote", "/path/to/local", :recursive => true, :ssh => { :verbose => :debug })
-+    
-+    Net::SSH::Test::Extensions::IO.with_test_extension do
-+      scp.download!("/path/to/remote", "/path/to/local", :recursive => true, :ssh => { :verbose => :debug })
-+    end
-     assert_equal "a" * 1234, file.io.string
-   end
- 
diff --git a/dev-ruby/net-scp/files/net-scp-1.2.1-fix-upload_tests.patch b/dev-ruby/net-scp/files/net-scp-1.2.1-fix-upload_tests.patch
deleted file mode 100644
index 73c34359afc2..000000000000
--- a/dev-ruby/net-scp/files/net-scp-1.2.1-fix-upload_tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- test/test_upload.rb	2018-01-22 08:15:30.996002204 +0100
-+++ test/test_upload.rb.1	2018-01-22 08:18:09.328002581 +0100
-@@ -155,8 +155,9 @@
-     expect_scp_session("-t /path/to/remote") do |channel|
-       channel.gets_ok
-     end
--
--    assert_raises(Net::SCP::Error) { scp.upload!("/path/to/local", "/path/to/remote") }
-+    Net::SSH::Test::Extensions::IO.with_test_extension do
-+      assert_raises(Net::SCP::Error) { scp.upload!("/path/to/local", "/path/to/remote") }
-+    end
-   end
- 
-   def test_upload_empty_directory_should_create_directory_and_finish
diff --git a/dev-ruby/net-scp/files/net-scp-1.2.1-raise-correct-errors-net-ssh-4.0-compat.patch b/dev-ruby/net-scp/files/net-scp-1.2.1-raise-correct-errors-net-ssh-4.0-compat.patch
deleted file mode 100644
index 3431f06b7cff..000000000000
--- a/dev-ruby/net-scp/files/net-scp-1.2.1-raise-correct-errors-net-ssh-4.0-compat.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- test/test_download.rb	2018-01-22 01:47:38.932010818 +0100
-+++ test/test_download.rb.1	2018-01-22 01:49:14.552011046 +0100
-@@ -205,9 +205,11 @@
-       channel.sends_ok
-       channel.gets_data "\1"
-     end
--
--    e = assert_raises(Net::SCP::Error) { scp.download!("/path/to/remote.txt", "/path/to/local.txt") }
--    assert_equal("\1", e.message)
-+    
-+    Net::SSH::Test::Extensions::IO.with_test_extension do
-+      e = assert_raises(Net::SCP::Error) { scp.download!("/path/to/remote.txt", "/path/to/local.txt") }
-+      assert_equal("\1", e.message)
-+    end
-   end
- 
-   def test_download_directory_should_raise_error_if_local_exists_and_is_not_directory
-@@ -223,8 +225,10 @@
-       channel.sends_ok
-     end
-     
--    e = assert_raises(Net::SCP::Error) { scp.download!("/path/to/remote", "/path/to/local", :recursive => true) }
--    assert_match(/exists and is not a directory/, e.message)
-+    Net::SSH::Test::Extensions::IO.with_test_extension do
-+      e = assert_raises(Net::SCP::Error) { scp.download!("/path/to/remote", "/path/to/local", :recursive => true) }
-+      assert_match(/exists and is not a directory/, e.message)
-+    end
-   end
- 
-   def test_download_directory_should_create_directory_and_files_locally
diff --git a/dev-ruby/net-scp/files/net-scp-1.2.1-raise-correct-errors.patch b/dev-ruby/net-scp/files/net-scp-1.2.1-raise-correct-errors.patch
deleted file mode 100644
index a23164ef8185..000000000000
--- a/dev-ruby/net-scp/files/net-scp-1.2.1-raise-correct-errors.patch
+++ /dev/null
@@ -1,80 +0,0 @@
---- README.rdoc
-+++ README.rdoc
-@@ -42,7 +42,7 @@ In a nutshell:
-   data = Net::SCP::download!("remote.host.com", "username", "/remote/path")
- 
-   # use a persistent connection to transfer files
--  Net::SCP.start("remote.host.com", "username", :ssh => { :password => "password" }) do |scp|
-+  Net::SCP.start("remote.host.com", "username", :password => "password") do |scp|
-     # upload a file to a remote server
-     scp.upload! "/local/path", "/remote/path"
- 
---- lib/net/scp.rb
-+++ lib/net/scp.rb
-@@ -395,7 +395,7 @@ module Net
-       def await_response_state(channel)
-         return if channel[:buffer].available == 0
-         c = channel[:buffer].read_byte
--        raise "#{c.chr}#{channel[:buffer].read}" if c != 0
-+        raise Net::SCP::Error, "#{c.chr}#{channel[:buffer].read}" if c != 0
-         channel[:next], channel[:state] = nil, channel[:next]
-         send("#{channel[:state]}_state", channel)
-       end
---- lib/net/scp/download.rb
-+++ lib/net/scp/download.rb
-@@ -129,7 +129,7 @@ module Net; class SCP
-       channel[:local] = File.join(channel[:local], directive[:name])
- 
-       if File.exists?(channel[:local]) && !File.directory?(channel[:local])
--        raise "#{channel[:local]} already exists and is not a directory"
-+        raise Net::SCP::Error, "#{channel[:local]} already exists and is not a directory"
-       elsif !File.exists?(channel[:local])
-         Dir.mkdir(channel[:local], directive[:mode] | 0700)
-       end
-@@ -162,4 +162,4 @@ module Net; class SCP
-     end
-   end
- 
--end; end
-\ No newline at end of file
-+end; end
---- test/test_download.rb
-+++ test/test_download.rb
-@@ -158,6 +158,37 @@ class TestDownload < Net::SCP::TestCase
-     assert_raises(Net::SCP::Error) { scp.download!("/path/to/remote") }
-   end
- 
-+  def test_download_should_raise_error_if_gets_not_ok
-+    prepare_file("/path/to/local.txt", "")
-+
-+    expect_scp_session "-f /path/to/remote.txt" do |channel|
-+      channel.sends_ok
-+      channel.gets_data "C0666 0 remote.txt\n"
-+      channel.sends_ok
-+      channel.gets_data "\1"
-+    end
-+
-+    e = assert_raises(Net::SCP::Error) { scp.download!("/path/to/remote.txt", "/path/to/local.txt") }
-+    assert_equal("\1", e.message)
-+  end
-+
-+  def test_download_directory_should_raise_error_if_local_exists_and_is_not_directory
-+    File.stubs(:exists?).with("/path/to/local").returns(true)
-+    File.stubs(:exists?).with("/path/to/local/remote").returns(true)
-+    File.stubs(:directory?).with("/path/to/local/remote").returns(false)
-+
-+    expect_scp_session "-f -r /path/to/remote" do |channel|
-+      channel.sends_ok
-+      channel.gets_data "D0755 0 remote\n"
-+      channel.sends_ok
-+      channel.gets_data "E\n"
-+      channel.sends_ok
-+    end
-+    
-+    e = assert_raises(Net::SCP::Error) { scp.download!("/path/to/remote", "/path/to/local", :recursive => true) }
-+    assert_match(/exists and is not a directory/, e.message)
-+  end
-+
-   def test_download_directory_should_create_directory_and_files_locally
-     file = nil
-     prepare_directory "/path/to/local" do |dir|
diff --git a/dev-ruby/net-scp/net-scp-3.0.0.ebuild b/dev-ruby/net-scp/net-scp-3.0.0.ebuild
index a544e4500fd7..2a3098587cf8 100644
--- a/dev-ruby/net-scp/net-scp-3.0.0.ebuild
+++ b/dev-ruby/net-scp/net-scp-3.0.0.ebuild
@@ -20,7 +20,8 @@ SRC_URI="https://github.com/net-ssh/net-scp/archive/v${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
+IUSE="test"
+RESTRICT="!test? ( test )"
 
 ruby_add_bdepend "
 	doc? ( || ( dev-ruby/net-ssh:6 dev-ruby/net-ssh:5 ) )