summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Graaff <graaff@gentoo.org>2022-09-04 12:00:37 +0200
committerHans de Graaff <graaff@gentoo.org>2022-09-04 12:54:14 +0200
commit49556be57f7fda1f3f1a50e650fd35059648a43d (patch)
treea07f5ebb9969b17e6a177265a83529a6af76f1a4 /dev-ruby/sshkit
parentdev-ruby/sprockets-rails: fix tests (diff)
downloadgentoo-49556be57f7fda1f3f1a50e650fd35059648a43d.tar.gz
gentoo-49556be57f7fda1f3f1a50e650fd35059648a43d.tar.bz2
gentoo-49556be57f7fda1f3f1a50e650fd35059648a43d.zip
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@gentoo.org>
Diffstat (limited to 'dev-ruby/sshkit')
-rw-r--r--dev-ruby/sshkit/sshkit-1.21.2.ebuild10
1 files 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