Add ruby20. Backport test fixes.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x8883FA56A308A8D7!

3 files changed, 26 insertions, 8 deletions

diff --git a/dev-ruby/net-ssh-gateway/ChangeLog b/dev-ruby/net-ssh-gateway/ChangeLog
index 5f478fc68880..cfdef5792354 100644
--- a/dev-ruby/net-ssh-gateway/ChangeLog
+++ b/dev-ruby/net-ssh-gateway/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/net-ssh-gateway
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/net-ssh-gateway/ChangeLog,v 1.41 2014/10/11 05:25:49 mrueg Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/net-ssh-gateway/ChangeLog,v 1.42 2015/03/05 06:27:10 graaff Exp $
+
+  05 Mar 2015; Hans de Graaff <graaff@gentoo.org> net-ssh-gateway-1.2.0.ebuild:
+  Add ruby20. Backport test fixes.
 
   11 Oct 2014; Manuel Rüger <mrueg@gentoo.org> net-ssh-gateway-1.2.0-r1.ebuild:
   Add ruby21 target. Restrict tests to <mocha-1
diff --git a/dev-ruby/net-ssh-gateway/Manifest b/dev-ruby/net-ssh-gateway/Manifest
index be96072bb4a1..ebb7a3a5794a 100644
--- a/dev-ruby/net-ssh-gateway/Manifest
+++ b/dev-ruby/net-ssh-gateway/Manifest
@@ -1,7 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST net-ssh-gateway-1.1.0.gem 18432 SHA256 83c1fd0de5859df1b7f4b1e8028ff47bc5317ac5ab350bf9e2a5e616950d34a9 SHA512 c18b6d403648b38352e453811ba65ca0feca2f409d5e3fb6c11d7d4fbc176d95c2721fb750a967fa8338b47ca34f99eafe20f7e832be92b4260aa9460bd523cf WHIRLPOOL 69e06de6bbc0f48e6f19438e11e2cc16213b92baeb711544312942a21961f5795aca5cc06693c1478ea1486594935e41512294cfd211b14d269e6dd9a0aaf91e
 DIST net-ssh-gateway-1.2.0.gem 23552 SHA256 3e5ab1f9d20e44c838ee890d1ae5c756b4b9cec492bc717340d90869399113db SHA512 d387e7ab709628c79cb0c01d0428a8e7e1beddfbdd14c58b7aaff6de11f4a8a8b2cb2026de95977de830855fbed610c276a52f18469da3b4f11b51885e251f60 WHIRLPOOL f961b541b1764410c94e241f403f4595a3e987cfd76b251e95c4fe12413a84b60fce5d48c9fa4c553e85b9f0535319a7a4d2106cc976185b652b5ad351c8b09b
 EBUILD net-ssh-gateway-1.1.0-r1.ebuild 798 SHA256 0d1cacab4b3d83cecfd28e79468cf5fb30c26a948da14a89461fdc19c212e075 SHA512 35227bd34aea69dbc3d5d4ed55f3a4d2cd2b532a7b43a41e57628added515245281996da58a327a8d2534e1a6231cb483a78142a43eca418b7a6d8f345ce7986 WHIRLPOOL 45f95d17e7bd84cdd08e6de2526734e10232d61aabac24060d67e41b0f8d133cb97c9fb6c4e71f30797f692a2ccf8e61fb4f4104883180335003a0c2f56e8be9
 EBUILD net-ssh-gateway-1.2.0-r1.ebuild 921 SHA256 9560ff5a5dfe129a25d1342262abcabb014b8767cc250ddac21a2ea6174cab63 SHA512 f1f0dd71d81c3f0fd5eb4279c1566c8dadd4f10b0526d0830258eb93a8e78369089d367c66a458519eee0111f70b4caafe391ab686e2ff7176805324f160dcab WHIRLPOOL d52df9c5392c0b57b784ee695926c2f056f2156d6c8c6346b102f537c42f1f6725c645a2b798f027ec28cc139d0b1c02a37b86f2b864e4cd8a96113435d0335d
-EBUILD net-ssh-gateway-1.2.0.ebuild 797 SHA256 129a2fc9dee2e3970da49952e2085c4eb364c1fe8932b204439b4c7d332aaee3 SHA512 ac067120978147a42c2fcc96b3270c755cfde68b871e6d9b46ecd45594a0c075e3e0f17f415ef0f81dabb21df59337203a4af7885a649a6335e050ea6ac68594 WHIRLPOOL 180646e9feb2b1e6d58d4e451d30d0ec91faecca774ded1c1168820ad0b654dbf991c29a6bd168aa9cfd7dd1b79254aaa8d212b1050d81272639ad2dc7ae55df
-MISC ChangeLog 5421 SHA256 a814ab4f2206aa28dc9bf4bae36881cfd17b1b1db19206171131907adc07b303 SHA512 b3c9f94c9ff65810aa12dcf7eeb412de2491bb8dbef33e8ee1ce75e804032d96b930bf5adc743c839addd36cfcb506cbf5305711fe6a2d6824fc4524c3c63949 WHIRLPOOL 300f1a44ce83c2c7acfdc0c42f5c6c09cc318ff222f0c139bcafee0c5b48a2281fb7ecf8ce0df81edd7729bf8c15c9347794eab3b4f8088414eecc5600e07015
+EBUILD net-ssh-gateway-1.2.0.ebuild 912 SHA256 6d4ba55d19f034cbc88abe5e26bc7f15dfa3938fa245cad77d4ee3c6632c47ac SHA512 375c53a34bb52d05ab87b322c0b54fa3a238ab0121e19507f4ec09f7db341dbd18ee9c969b24b26fc69fbfef238f3f6e78dce6e206a3240dc172b3daa34af180 WHIRLPOOL 821d845bf0b724ca42bb3669f113f591364a8d9ebd71e382d4d2ddaefeb0fe498cc5522e9fa85ebe3b32bcb7e0e87f33546ee8d4532bd5ac6f3fdec50a4a46ca
+MISC ChangeLog 5538 SHA256 6fde82b34c844b60b4c095acd854d75309581b0ad2e75b04251f5c7c185c19cc SHA512 05b616d698c7b0de8e1a37b66290f9843ac457007dfcdb84d30b39b246f37173ed51aacddcc6538ff998b7dfcf64fff56eb691a07c1f36ba80afcfa7a925aa45 WHIRLPOOL 2fdabbc938afef3025baee535866a7e2700b2925bcd190457cb3e7922b667ed541c3d3d6fbfe7e9b0e694c1375e7e9ad0e03663ec7ed343820e7ff19a17282cb
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iF4EAREIAAYFAlT39z8ACgkQiIP6VqMIqNcDBAD/S/rndlSxoOk/0cQsL7mjDLuG
+uKwSLvIuDH1/xXysxeQA/2T5xe1jpjmVnPEMGS2JZ2rKl5S2a4BJGDvjrUWgbt13
+=Ez7u
+-----END PGP SIGNATURE-----
diff --git a/dev-ruby/net-ssh-gateway/net-ssh-gateway-1.2.0.ebuild b/dev-ruby/net-ssh-gateway/net-ssh-gateway-1.2.0.ebuild
index 0359ab2e81b5..1d647e6965b3 100644
--- a/dev-ruby/net-ssh-gateway/net-ssh-gateway-1.2.0.ebuild
+++ b/dev-ruby/net-ssh-gateway/net-ssh-gateway-1.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/net-ssh-gateway/net-ssh-gateway-1.2.0.ebuild,v 1.1 2013/04/13 05:57:58 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/net-ssh-gateway/net-ssh-gateway-1.2.0.ebuild,v 1.2 2015/03/05 06:27:10 graaff Exp $
 
 EAPI=4
-USE_RUBY="ruby19"
+USE_RUBY="ruby19 ruby20"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 
@@ -19,10 +19,15 @@ SLOT="2"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-ruby_add_bdepend "dev-ruby/test-unit:2"
+ruby_add_bdepend "dev-ruby/test-unit:2
+	<dev-ruby/mocha-1"
 
 ruby_add_rdepend ">=dev-ruby/net-ssh-2.6.5"
 
+all_ruby_prepare() {
+	sed -i -e "1igem 'mocha', '~>0.10'" test/gateway_test.rb || die
+}
+
 each_ruby_test() {
 	RUBYLIB=lib ruby-ng_testrb-2 test/*
 }