[gentoo-commits] repo/gentoo:master commit in: dev-ruby/net-sftp/

[Hans de Graaff]

commit:     7c033f806593e6dc45112ec494ee531bae94f810
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 22 19:10:22 2018 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sun Apr 22 19:13:11 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c033f80

dev-ruby/net-sftp: also allow net-ssh:3

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-ruby/net-sftp/net-sftp-2.1.2-r2.ebuild | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/dev-ruby/net-sftp/net-sftp-2.1.2-r2.ebuild 
b/dev-ruby/net-sftp/net-sftp-2.1.2-r2.ebuild
index 0fea846c2c4..06d83b14fd7 100644
--- a/dev-ruby/net-sftp/net-sftp-2.1.2-r2.ebuild
+++ b/dev-ruby/net-sftp/net-sftp-2.1.2-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.rdoc"
 
@@ -16,9 +16,13 @@ SLOT="2"
 KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~x64-solaris ~x86-solaris"
 IUSE=""
 
-ruby_add_rdepend ">=dev-ruby/net-ssh-2.6.5"
+ruby_add_rdepend "|| ( dev-ruby/net-ssh:3 dev-ruby/net-ssh:2.6 )"
 
 ruby_add_bdepend "
        test? (
                >=dev-ruby/mocha-0.13
        )"
+
+all_ruby_prepare() {
+       sed -i -e '1i gem "net-ssh", "< 4"' test/common.rb || die
+}