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, 19 insertions, 22 deletions

diff --git a/dev-ruby/samuel/ChangeLog b/dev-ruby/samuel/ChangeLog
index ab6b54cb8ed8..3341bad14a25 100644
--- a/dev-ruby/samuel/ChangeLog
+++ b/dev-ruby/samuel/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/samuel
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/samuel/ChangeLog,v 1.19 2013/12/22 19:16:32 blueness Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/samuel/ChangeLog,v 1.20 2014/04/19 07:35:34 graaff Exp $
+
+  19 Apr 2014; Hans de Graaff <graaff@gentoo.org> samuel-0.3.3-r1.ebuild:
+  Add ruby21. Update mocha to work with all ruby targets.
 
   22 Dec 2013; Anthony G. Basile <blueness@gentoo.org> samuel-0.3.3-r1.ebuild:
   Fix failed gpg signiture
diff --git a/dev-ruby/samuel/Manifest b/dev-ruby/samuel/Manifest
index d74c6294265b..54073106ca28 100644
--- a/dev-ruby/samuel/Manifest
+++ b/dev-ruby/samuel/Manifest
@@ -2,24 +2,14 @@
 Hash: SHA256
 
 DIST samuel-0.3.3.gem 12800 SHA256 a0a566e27f654aff0af30f34d80153201619ba9fc5c80ac891c9719d2f84a048 SHA512 3c668a45ac6eb58d236722f1d9f23cfa02d54506309427ad4c6ee2909a6d3def109246c7f7f98a9c26cda0ac74b54c610c4cc0fc18110bf9b45d1aa461f37f57 WHIRLPOOL 9d90f09fd34c48b9213ddc15c1432d400c44e950f717da9ad536477d9bb3d6fddca6c5ab728bacfdc4f9cd0af983c4191cd952c0a5ff0bad403ff15366c6b151
-EBUILD samuel-0.3.3-r1.ebuild 1037 SHA256 fbb7b3d85406ed7b811735b46dee4b6892575544617b2b357b31b6f615d39f1c SHA512 6611b10668ea39fd5b532106cd5b9c9847968dacce7072aeea0e00166d2af273d35a0e6dedf3b664ce8ebfcdee70a0893ac0499151d624da5b9d43f4fac735e0 WHIRLPOOL cf5c581311c564c04ee51b88008bb1eed41d824ae5b8ebf9fbbed074d2c52e18b61a2fc108faf7df29943ddda7ffd014cb2f3d3388977e070e0a8a49916a677f
+EBUILD samuel-0.3.3-r1.ebuild 1185 SHA256 28310131a6e597c8fc1cad9c0c60b724f20631e5af244047f39b552cfb624d33 SHA512 c50d3657bc6393e17f36ed9fb7684dad38232925be4d9ef6e3369c14b1de1f1b95aed035b46657744eb0eb01eb112fab6a19b3edd153b2f155767dcc3d4e1ad3 WHIRLPOOL 3ed89cb751b4c21dec02287e0f1b7b347614d406c1cbee453cefa85e7b5a6dcebc8634e8424a4b7ba329764dba239d3a7a3e17c1471078ec40df4323c46e65ac
 EBUILD samuel-0.3.3.ebuild 1024 SHA256 73343a68e940d71fb185415b188505a88cda04074b40207d5b7f47a829a63e79 SHA512 6b3875199dafa51eb2ff0a857b0d0aa66304a711c852823ce57ec07f18e3706e352ba79ced9c9c2d2933b84c957aa844faf282d05d0136fd0d63eb114b1b06f9 WHIRLPOOL dbc276107015be9f7afc0fcda59fd99f8a29af64ad3a44a3d441cd1dadef5df1dd18fdf7cc08767bb6362ac2cb71a3c0a051acc03734a23c22b30e103bb99b44
-MISC ChangeLog 2525 SHA256 71d02ffeae07727e2d14ce2118c0130c7697e2624a393621099fa05575256463 SHA512 f4528de8b586a287ce6c15312867d94b7bb6c3c5c67495dbd27a1406e6a7e0c8c1d2d9eecb2ddbf3b53d92968f670ad2ba26500832858e93a31daae10d9910ce WHIRLPOOL 1f65d35deeb1d989f19b30cbd5fc1fddbab434e990442316fe68e81169059560379012c08588ad1ba38e7b0e56d3d655d3611973e40ff3aae372a40dd272f1a9
+MISC ChangeLog 2656 SHA256 cde61884b33b14887cf4ea15ecd72ff7ac0bb05e94bd80cd4c6ae6291e650e9d SHA512 f2db786dddb570a27dfbafc3a5c0024265bcba9b5ce015036b842b3ed1c5c4dad2343aa92c9a596450f95d7b24811980b16a4eeb5bb4445fe4bc2a5e33ba45c7 WHIRLPOOL 8fe9547b18608ad72b1b89c3733924888d6ff5eff85af1ae05bbb5d2f11c3a0745590f2d21db0c3c4d82433292a9b07c9471f4cd7924464dc173ccbde2f208df
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIbBAEBCAAGBQJStzq9AAoJEJOE+m71LUu6FOMP9jVfKnJjugH68g8b+S0/4/Ok
-g5N39SPXGwTWuq00yovTJ8yh81tXgP92k9RnKnNPp2FVPlWSE09O+IRkFOZFtdp+
-31kmGt8Aqa1Og7bwIPai+0LoD2MrOSOn96PJ+9j/vsArfLiCFLk8ghN/jFWo00rG
-AlpKiiafv7UI1KUeb7GY+MKAJ4Tn6BFq2TUs2cIn6CUFyC80EAwHBhlmy4M1mMyJ
-8zxGxgkc2BFtq/SO86qHuZWKacT3Asgf0AePrSKMaGmObKocR9Cdbil70or1tG9r
-WTXlY7y7cIVimrWSWN50ayiiyqxeKPkCQ0NWN5sAIykH1zaOQ5unsTRIuE3l9q+m
-bTqXTommnT+IkE7aLyJ1B1OifRLfyHXCfBDWD/Oqe5h9n8B8mvaAZSIteyCsruiV
-E7+FpeD+miWuha1bD5fIoLTVKHRHRtvc/00kP4naz0RMQVuJKH7ghgXocVapV5yE
-j6rFEteSMZf6GCaM6eKCOSrVYro9O1F3d2YUXdyQ9B7EiW8CF5aKfRwj0RiACdlg
-9Wnk15snVibh52fPkgp4weDxQQ+2o3X52+xoTKPVEg2G6/IFuWmfQdf4CYB6xS4o
-dRRtnfUQPJMMYr3NzPXGcywwv2EuFBl528fLQRJcambMNO/wxCuvKc7OGkJYK1yS
-ANuqLh0ijhDB2RcY20E=
-=cAsj
+iF4EAREIAAYFAlNSJ00ACgkQiIP6VqMIqNdZcAEAincDicnTbo730SFHMYZDn9uR
+Qouanu2cX7XWzl42pnUBAIPMDMHf+9Tu8oK8Jrklq/IpT2rLm9uFrnVCN7PI7RpD
+=BdqO
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/samuel/samuel-0.3.3-r1.ebuild b/dev-ruby/samuel/samuel-0.3.3-r1.ebuild
index 3a37e343ba4a..b0c25c21a56b 100644
--- a/dev-ruby/samuel/samuel-0.3.3-r1.ebuild
+++ b/dev-ruby/samuel/samuel-0.3.3-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/samuel/samuel-0.3.3-r1.ebuild,v 1.2 2013/12/22 19:16:32 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/samuel/samuel-0.3.3-r1.ebuild,v 1.3 2014/04/19 07:35:34 graaff Exp $
 
 EAPI=5
 
-USE_RUBY="ruby18 ruby19 ruby20 jruby"
+USE_RUBY="ruby19 ruby20 ruby21 jruby"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
@@ -23,7 +23,8 @@ ruby_add_bdepend "
 		>=dev-ruby/shoulda-2.11.3
 		>=dev-ruby/fakeweb-1.3
 		>=dev-ruby/httpclient-2.2.3
-		dev-ruby/mocha:0.12
+		dev-ruby/mocha:0.13
+		dev-ruby/test-unit:2
 	)"
 
 all_ruby_prepare() {
@@ -36,5 +37,8 @@ all_ruby_prepare() {
 	sed -i -e 's:8000:64888:g' test/*.rb || 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
 }