Add ruby20. Drop ppc64 for bug 465948.

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

3 files changed, 18 insertions, 23 deletions

diff --git a/dev-ruby/samuel/ChangeLog b/dev-ruby/samuel/ChangeLog
index a6a0b293085d..6ed6a3cf7654 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.16 2013/01/15 07:09:22 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/samuel/ChangeLog,v 1.17 2013/11/17 13:55:23 graaff Exp $
+
+  17 Nov 2013; Hans de Graaff <graaff@gentoo.org> samuel-0.3.3.ebuild:
+  Add ruby20. Drop ppc64 for bug 465948.
 
   15 Jan 2013; Rick Farina <zerochaos@gentoo.org> samuel-0.3.3.ebuild:
   adding ~arm keywords to net-analyzer/metasploit rdeps
diff --git a/dev-ruby/samuel/Manifest b/dev-ruby/samuel/Manifest
index 20d2925fceea..0aa3b484d596 100644
--- a/dev-ruby/samuel/Manifest
+++ b/dev-ruby/samuel/Manifest
@@ -1,24 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST samuel-0.3.3.gem 12800 SHA256 a0a566e27f654aff0af30f34d80153201619ba9fc5c80ac891c9719d2f84a048 SHA512 3c668a45ac6eb58d236722f1d9f23cfa02d54506309427ad4c6ee2909a6d3def109246c7f7f98a9c26cda0ac74b54c610c4cc0fc18110bf9b45d1aa461f37f57 WHIRLPOOL 9d90f09fd34c48b9213ddc15c1432d400c44e950f717da9ad536477d9bb3d6fddca6c5ab728bacfdc4f9cd0af983c4191cd952c0a5ff0bad403ff15366c6b151
-EBUILD samuel-0.3.3.ebuild 952 SHA256 f6e32c1465f7d8c0744060c779f6e4da244792edaabef1cbdcc430bbb2ab199a SHA512 0f35bc82a099aecc9ff2c40e0330a89034411bcf3c6305e12507385ebd4e1b738a148cf922778d0d0c1678a490e21a83d870ac4ef0e39eb7736d14e13b882b90 WHIRLPOOL 6527bb994571c362958fbb0bf40628b85a6902c2a9360558ed8bf2daec0aca20a982df4de498912e249b19cf6fbb7f9e124cfbdf2a8d2cfffdb9f34b4b02fcc6
-MISC ChangeLog 2130 SHA256 e9579f0e7ad2b6c2eb90768dd2e5dd74216e380161b763e839c80d82776aeade SHA512 018b6b7bf3f1e914cbf74369c51d5e40c9ae290f9710b362e4fd221ca4c844f7afec305566cd79b359484e9604fb5310fef5395ecf88a331d83b2bcbcb99731f WHIRLPOOL 3b2535f6a8791022c4116a7cdb7b55ec5ae6b70ff2a7aec64496d7f24d9f788bab7b981eb68348df4189d69e05661595a19cc899e38b03b2a82c2ec4a775450d
+EBUILD samuel-0.3.3.ebuild 1025 SHA256 03c0dcd1654939d687ab0f50117e61ad61cc8df54d8650fcd3eec9c44d1f6ab5 SHA512 06add4cacff3d7eb13bb269fa80e8e61eb85cdab69e7679eea2f1dd6ff7c3f4fca10bbdb7d38cf0546bf73d1622bb37a15d458686a3471728ccdd0c64c52534a WHIRLPOOL 5022f155b7d457dfaf131b88e3df0084155f694d5cc45daa2e9e5ad7104512d936fa9efab07968192d90f4089afa6a3f7b5ff901ed2317809fb41725ea535543
+MISC ChangeLog 2240 SHA256 116407a7541842b3d7743da9296ff3625700c8b7874471ea4e18ec47f469ff0a SHA512 ced2a403484f2aff73c3d888b3ed4b5e088a83b53c7a709f0ab8dc95ad8102f5d92124139ec14511e64a3514332ef224790a09df5f61fcee257544b37c8d3c1a WHIRLPOOL 4459106cc6aafd13f077c19a409d30fbdaa559750f279ff638ede96e8154353337d7db06935eed90517235002e117494ae5429677df8e57d609121b051b77831
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJQ9QDmAAoJEKXdFCfdEflKsQ8P/2FYOhtA2FaaL9jqmgA5kAAw
-JBICSv/xBmLTVQpcBUMPO9h2izp8VTzEuvs5XEx5ZLpjEasOkLaIMfS/LRYIILh6
-CVKlBuK6LQBZIHITNE2goK43dVIx7gCa52lA2h+2Ug4ygv8HGySXqTU9SjY68l96
-opVzBpUiygWZhIvuRfDxZ/0H9onQVpW5XpjXKZo7wYRgJsi7lzS9bBGiGViQ/4ww
-MSjMweBW0Z+2lBNnyFTN4cisuVRTRRw2Zgy9WAlo6rJH9EruXcjD0EQikvAPSPjc
-CWP7uL18ell518cwoxyzUFT89d1HBSXxSH2ONjJbFvowPrHnHgpDbuSwvnkoSHmt
-oMqDzo2ZrqduqIpV911jpWXp3G3jeAKFsS3xc6BsLioE8TfMQLqnspnQh2X56aes
-5wZSFXr3KCfh9DalF0ne8zvOwUC0wR4vHPaj5h26IPEXFlZhybxleXMfcUJiZsPr
-zZYf5Up/jCsSmQW6EElOS9ZDxqnxQNEplln06KxXG8toBJSkmFCmo0HTcSd8fFea
-oI46nlLYLqmQCC3VjquseoqjQ11AaXjGbX3vr8kj/Q6XwLCJWkozIvZfDUzZ9DnK
-9xRhgUHQA+pOcbLT262b+vCZL26AAjSSvIpd5ONfnIaIqODA0l+DzteNW2K9U/X+
-XvbRAu0Krwe+3JpSV3J9
-=sFo7
+iF4EAREIAAYFAlKIytIACgkQiIP6VqMIqNdUTwEAjVE29mPkVwwrsypclh5LkWIi
++P+lelRHsRt8UpyqytkA/3ZaTGCoBkLsY6TWEtdRSi+3PXDSfurcJViZTzzlAmNF
+=k1gQ
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/samuel/samuel-0.3.3.ebuild b/dev-ruby/samuel/samuel-0.3.3.ebuild
index cf64f8e48ec9..05978bc65ef1 100644
--- a/dev-ruby/samuel/samuel-0.3.3.ebuild
+++ b/dev-ruby/samuel/samuel-0.3.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 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.ebuild,v 1.3 2013/01/15 07:09:22 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/samuel/samuel-0.3.3.ebuild,v 1.4 2013/11/17 13:55:23 graaff Exp $
 
 EAPI=4
 
-USE_RUBY="ruby18 ree18 ruby19 jruby"
+USE_RUBY="ruby18 ruby19 ruby20 jruby"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
@@ -15,7 +15,7 @@ HOMEPAGE="http://github.com/chrisk/samuel"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
 IUSE=""
 
 ruby_add_bdepend "
@@ -23,8 +23,7 @@ ruby_add_bdepend "
 		>=dev-ruby/shoulda-2.11.3
 		>=dev-ruby/fakeweb-1.3
 		>=dev-ruby/httpclient-2.2.3
-		>=dev-ruby/mocha-0.10.0
-		virtual/ruby-test-unit
+		dev-ruby/mocha:0.12
 	)"
 
 all_ruby_prepare() {
@@ -35,4 +34,7 @@ all_ruby_prepare() {
 	# Change the default port from 8000 to 64888 to sidestep Issue #10.
 	# https://github.com/chrisk/samuel/issues/10
 	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
 }