commit: 49556be57f7fda1f3f1a50e650fd35059648a43d Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> AuthorDate: Sun Sep 4 10:00:37 2022 +0000 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> CommitDate: Sun Sep 4 10:54:14 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49556be5
dev-ruby/sshkit: fix test deps Ensure that net-scp and net-ssh are compatible. Closes: https://bugs.gentoo.org/867661 Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org> dev-ruby/sshkit/sshkit-1.21.2.ebuild | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dev-ruby/sshkit/sshkit-1.21.2.ebuild b/dev-ruby/sshkit/sshkit-1.21.2.ebuild index 339616db4166..ab2109f97a2d 100644 --- a/dev-ruby/sshkit/sshkit-1.21.2.ebuild +++ b/dev-ruby/sshkit/sshkit-1.21.2.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -USE_RUBY="ruby26 ruby27 ruby30" +USE_RUBY="ruby27 ruby30" # There are functional tests that require vagrant boxes to be set up. RUBY_FAKEGEM_TASK_TEST="test:units" @@ -24,12 +24,14 @@ ruby_add_rdepend " >=dev-ruby/net-scp-1.1.2 " -ruby_add_bdepend "test? ( dev-ruby/minitest dev-ruby/mocha )" +ruby_add_bdepend "test? ( dev-ruby/minitest dev-ruby/mocha <dev-ruby/net-ssh-7 )" all_ruby_prepare() { sed -i -e '/bundler/I s:^:#:' Rakefile test/helper.rb || die - sed -i -e '/\(turn\|unindent\|reporters\)/I s:^:#:' \ - -e '1irequire "set"; require "pathname"' test/helper.rb || die + sed -e '/\(turn\|unindent\|reporters\)/I s:^:#:' \ + -e '1irequire "set"; require "pathname"' \ + -e '1igem "net-ssh", "<7"' \ + -i test/helper.rb || die # Fix assumption about parent directory name sed -i -e '/assert_match/ s/sshkit/sshkit.*/' test/unit/test_deprecation_logger.rb || die
