Add ruby21. Update mocha to work with all ruby targets.

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

3 files changed, 24 insertions, 23 deletions

diff --git a/dev-ruby/fakeweb/ChangeLog b/dev-ruby/fakeweb/ChangeLog
index 751c544f691f..dc2869863fe4 100644
--- a/dev-ruby/fakeweb/ChangeLog
+++ b/dev-ruby/fakeweb/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/fakeweb
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fakeweb/ChangeLog,v 1.20 2013/12/22 19:15:24 blueness Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fakeweb/ChangeLog,v 1.21 2014/04/19 07:37:27 graaff Exp $
+
+  19 Apr 2014; Hans de Graaff <graaff@gentoo.org> fakeweb-1.3.0-r1.ebuild:
+  Add ruby21. Update mocha to work with all ruby targets.
 
   22 Dec 2013; Anthony G. Basile <blueness@gentoo.org> ChangeLog:
   Fix failed gpg signiture
diff --git a/dev-ruby/fakeweb/Manifest b/dev-ruby/fakeweb/Manifest
index b391bcb4c87f..c4d8f15e4e37 100644
--- a/dev-ruby/fakeweb/Manifest
+++ b/dev-ruby/fakeweb/Manifest
@@ -2,23 +2,13 @@
 Hash: SHA256
 
 DIST fakeweb-1.3.0.gem 58368 SHA256 1ec996be13020a00b3464560c09180b424477c698f59f82edf2b99b16cfa09a8 SHA512 5785bf8e17f9b9b73a9fd2b581c6c5dcf466a5d68c2dbea593bca7cd5d385b5b1315ca777c39bce2a8077ccab6d5df7f031435c9227931c3d2a84512da9cb423 WHIRLPOOL 976e48b1e66e951a22fa28970356c3e85927027fd7262242a50ecac55771fc2ed7c1830d4dcc0566f479fa5c844a0d59b2b268ebd26ba87988f543b982e51214
-EBUILD fakeweb-1.3.0-r1.ebuild 1342 SHA256 cf13d5f06623e2a57cda1792f06bd22bdac51b61da73c30a3e9262aada312532 SHA512 75a772f43f2ec8886ac9c7c866fd9e92e0a222488c633624f23a579d0b348ba261e2b9b68ac747028157924a92bf51f4446fe4ff8cbfb1a4c31d3921df6b2c94 WHIRLPOOL f7b949ef537c1ca60c8a9090efbad0bf15cdced3d9c8f0397efe3c2ddf3a3a7866f8b2897790e00b1d6913876f7bd8df1b602c0c11e4a853a570105e5624e3af
-MISC ChangeLog 2610 SHA256 d312bad039054688c47b3cb6834cf5a35a1c4814928e17f91e79416976c80bf8 SHA512 bbf7183203e88968429f92b73c5171149e0409b7d2779e7f33beb8b860e31bf3c2e3c7d734d1ab03cf10e363feea3a7bca61815074cc3a691e7c6f1b17d9efb0 WHIRLPOOL bbc2efb148f2f9197f069661d844bfc7c2934e4ff9c79c05b3b2eb4ee665a6ef6ef3ded09eba1e825864131166b5bb2cb4b4fa73f195bc158de01fc5175a6852
+EBUILD fakeweb-1.3.0-r1.ebuild 1592 SHA256 6237996d0323747652d49bb06237de4a566eb920a9350e65b96078dfb08a5006 SHA512 9222567c3ab6b1bcfd3ebc581601d653b8eac763805c65d600c19f4ffbef985edb7645792ab3ba22ca8032965774c7476c3f4645d88bb9cb0e0b6593014c1e91 WHIRLPOOL 58f7ae6b66f19c584727e29513dace26fe84852ff9dd9ada64035d170cdf57e0f8ecd2e052e7c8fb4bfda740e4fce1a4cc320beef6b23ff765e337c8e5de46ff
+MISC ChangeLog 2742 SHA256 1f6c0817f784946662f06d0b4078d5df2067a8de4740565daabc4937890b7a65 SHA512 63605bd409206f0e655a853915265e33fc40e38bb531118e3d03feee7551d0cfb62c7bb0838a98aeb1c425b8d60f879c9fe36f560a7a062ffcd30a1423a462fb WHIRLPOOL 5916e2a19e3b5e9d7e4bd23003bf0226fa580af161687762d42463f2c0ed2641191b81c7280703a8e94667717b7e38645af44c5a20d2f14fceaec13fd3ed3139
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJStzp/AAoJEJOE+m71LUu6n94P/jes0Y1Ip5NrRPnDqxn73iwT
-hWUrHvzUzqkN9IMa/dZkNDD+/EtqFfKP3WZm8L6J1qR+ogdT2901pPxlp+rWquuN
-uZyMFrlcKKKWNOraP8x9kzS6qAQTH+jjnRfq2lsZp1T8wi24iHukYceyuK2ZlX0P
-rb/JMbiur8tEIk1itctmgsM+7CKqMIIaJ42bcJfXNTRStNRLOcYEoRGEDYpthxFZ
-JgkIM0h4tmRa2VRswuPdH7UZeN7Vc71Pvve5GBvA6wz+vWqzEv7evsJDVDntTveo
-Opecjvay1ItWwjHENAz3LxnTz6tq6Sce/UsDuuAAkFn4vzjlk9/6UCdtJB1CkxQ+
-aoQwV/Iu8GmHcaxTaQmxxhtkW2yxQs4P1vkERZ/rNtiKZbEKKjwhkwUtPTObJokw
-4gfgFYJyWUvEWAzIOlaeg1VtY3GxQ3+h6zvYur/GkxX8dzr/r2UEKpS+lpLtix2Y
-Ys42QdMg9qxqSyk6rGH2xDnkbTTLh6O7QQxhgA8OndCcpQPATuhkSPzvX/s6MpuE
-XmL6gYEgxgFssaHZRm9Jw5E02pe/7q4cn7fh4VsQSnv8qnXTeaD1N/NU6hUoFCFu
-zaIGulC2ZS/UUt8RFo+dEJMvt4OjCrHBxfbFOkZtr4YXAYBWRx30gp1P1kCcpNEd
-fJlrdXhaQb1m5TQpxgfk
-=bop/
+iF4EAREIAAYFAlNSJ7gACgkQiIP6VqMIqNdGNgEAk9GIbO8YvL7ljgMWoVR+HSxx
+uwatdfT8EJl1p0IkbSoA/2NfIppYoGc1zpPq5Kqqy6uE8x4LX8FtWXAzv4YdMubE
+=NkVM
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/fakeweb/fakeweb-1.3.0-r1.ebuild b/dev-ruby/fakeweb/fakeweb-1.3.0-r1.ebuild
index e558416b23dd..820398addfeb 100644
--- a/dev-ruby/fakeweb/fakeweb-1.3.0-r1.ebuild
+++ b/dev-ruby/fakeweb/fakeweb-1.3.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fakeweb/fakeweb-1.3.0-r1.ebuild,v 1.2 2013/12/22 19:14:19 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fakeweb/fakeweb-1.3.0-r1.ebuild,v 1.3 2014/04/19 07:37:27 graaff Exp $
 
 EAPI=5
 
-USE_RUBY="ruby18 ruby19 ruby20 jruby"
+USE_RUBY="ruby19 ruby20 ruby21 jruby"
 
 RUBY_FAKEGEM_DOCDIR="html"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
@@ -21,7 +21,8 @@ IUSE=""
 
 ruby_add_bdepend "
 	test? (
-		dev-ruby/mocha:0.12
+		dev-ruby/mocha:0.13
+		dev-ruby/test-unit
 		dev-ruby/samuel
 		dev-ruby/right_http_connection
 	)"
@@ -35,15 +36,22 @@ all_ruby_prepare() {
 	sed -i -e 's/sdoc/rdoc/' -e '/template/d' Rakefile || die
 
 	# Require an old enough version of mocha
-	sed -i -e '1igem "mocha", "~> 0.12.0"' test/test_helper.rb || die
+	sed -i -e '1igem "mocha", "~> 0.13.0"' test/test_helper.rb || die
+
+	# Use the test-unit gem to make jruby compatible with newer mocha.
+	sed -i -e '1igem "test-unit"' test/test_helper.rb || die
 }
 
 each_ruby_prepare() {
 	case ${RUBY} in
-		*ruby20)
+		*ruby2[01])
 			# Tests fail on mocking of TCPSocket, but fakeweb itself
 			# actually works as evidenced by the thor test suite.
 			rm test/test_fake_web_open_uri.rb test/test_allow_net_connect.rb test/test_fake_web.rb || die
 			;;
+		*jruby)
+			# jruby has different deprecation warnings
+			rm test/test_deprecations.rb || die
+			;;
 	esac
 }