Add ruby21 target, require <mocha-1.0

Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64

3 files changed, 13 insertions, 26 deletions

diff --git a/dev-ruby/shoulda-context/ChangeLog b/dev-ruby/shoulda-context/ChangeLog
index 84fc4ca7f9d9..ce7eba9b0eda 100644
--- a/dev-ruby/shoulda-context/ChangeLog
+++ b/dev-ruby/shoulda-context/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/shoulda-context
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/shoulda-context/ChangeLog,v 1.7 2014/08/18 01:42:40 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/shoulda-context/ChangeLog,v 1.8 2014/10/10 22:46:37 mrueg Exp $
+
+  10 Oct 2014; Manuel Rüger <mrueg@gentoo.org> shoulda-context-1.1.6.ebuild:
+  Add ruby21 target, require <mocha-1.0
 
   18 Aug 2014; Anthony G. Basile <blueness@gentoo.org>
   shoulda-context-1.1.6.ebuild:
diff --git a/dev-ruby/shoulda-context/Manifest b/dev-ruby/shoulda-context/Manifest
index a26517d67162..541306d68bcc 100644
--- a/dev-ruby/shoulda-context/Manifest
+++ b/dev-ruby/shoulda-context/Manifest
@@ -1,24 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST shoulda-context-1.1.6.gem 21504 SHA256 6fef28c38b63b39ae761c6f73dd1c11a6184dd5f36e2080cc3e6bdabf6845ed7 SHA512 71c6a567c807f8eda0b7b619f092326a928bb9df181ca18424f2fbbef8e7fdf8bac5990e22f68d936e7bebcab569d9c32ede5264108e914cc84e2ce40908572f WHIRLPOOL 6194f644a6d0da7cefe643c46c05a4399e21f27df72a45a19500c8128add12be7d156cd1b92a52be26d795e77d2ff1b301db0d891817911b2373fdf6039fc234
-EBUILD shoulda-context-1.1.6.ebuild 865 SHA256 2424ffb4216a67e537bebc92ed9837458836df6873a5bdaba6b351067fb51435 SHA512 c31b5da44f375c0ede0faaf5f3a1f0a5c6b3b03cc833313e0c8e19cff2befecbb0779681ec5283f4e6e1872981a633c8f298fa22793486b56afc4f05c39def00 WHIRLPOOL 4cf96775da00b5fd8cb973857e79a459a50ec680812b66543f34df987b31ea7f0eafd9453872999f22f18cd429a1419c5b87bc27e9ead5814549c0adf24fecdc
-MISC ChangeLog 1168 SHA256 2f21dbaf52c14fea2fa7c62e046c8db858bca006b24364fb0a946ff13d24a443 SHA512 f2b1962957d4f1d2c42070dd0d87defb5d532ad424a4f796ccd096fe3a15b1c782ce5209b1b3f027a1ed949447eae16b3830086d10e2fc9faf0808fdcbbdc723 WHIRLPOOL 2d4f5cdac338442ded2f1ff80de08a1d35adba1c0943e26a2e99c21c73ece7e09560ffd5c5bc809f025f88e10dbb4dc466d0a37f9ed9056f70d98bbe850edad5
+EBUILD shoulda-context-1.1.6.ebuild 963 SHA256 6701aade84e2cdffb9dfe13999acd3a81d45acf3bda33a74d5e3184ee90deb6d SHA512 cbaf9d2ac127948816d39e7918ed9847906a06276ebefd5335ee83e66a2150a46fa0575dda810f23ca65a6295959759eea2e9697fc98ec71c81d187b33b747b7 WHIRLPOOL 487e31adb1f95e7ef49fc3f9aa2e212069c2691935b3cd989e2efc479c2122a24a805c98aed096e4158c460da16ae96859c95ff863bbf2c03f630873bf3fcf6c
+MISC ChangeLog 1284 SHA256 922ee4c854d8ce8154474978b155ad4e600c0f1e9097939c92128d8f5c763275 SHA512 fdc2f7de7b52c9aa60134f787397f7530c74eb077eb00c89ac27585d563f9a8089fbcc7125aab67e1855a89ccc3f87223cfaa9fdfa05d4f9e52009d02a2f18c0 WHIRLPOOL bdef67b4f6d7dd7d2922436957cfe0b6275d82513a372d18a8b86cb5ce6cf8a3b60adf79fd3b2c051fb87ce63f6766e64632f0b5cd7caaab80fcc254c45cf281
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAEBCAAGBQJT8VqlAAoJEJOE+m71LUu6ljIQAJuSx48L3xrhiiJEt1m1bmTX
-G69y3r56t8WZ5Tw5vo/Y8Bgu0tUuXwQ59OinTjMh/pRCQfxSO6BaXli6uZ0Q59Kx
-sQR4hAFC2BT4z4pcJkbBKCm49dCsVywv/X6FJ8N+81ydpHbO6McUuzStqH2ywxA4
-8iJIpa1EHYiGluEDx5w3LeUcpoTD4k2tLqZHIPZIWYu18gdhhabCE9vXcpjWjbXc
-6XuBqs5FXEQr71UdVOq+o9MGRjlWkNxXhOCEq38XlLAcWSQRHTSeaJmXtlsBKIEF
-8hDaZ9KyrP1GYn+EjSjqndPari1NsZGvcKc5++5JF6/C46W72pWhcfb6zkqh2lwC
-i/BC2lUjhDr7I3K3wcwWuUlLlb1OJ0Y9+vV5JP8dbTaBBCAMOgx6OKeyrfWB+9WN
-oVW+vdowXLZEV7jMbJ+c5EG7+en6uJEMkgMajfq5XrevI4J8hEBt9db4bhGUhsou
-jlDYEYs4diGVYHmbsA4/4sMnyh1NcTH8xTRJT2cvS2A/gGskKdWdKFSt9JZxMyPZ
-VDyWAOo1zdnZbLdSVqRRU6Buiswf0tE8waWOOjPIh2325UUMh3bvNrTNhCsAwplg
-sNr3dgFvy9rNnHxBIyM9hNuBMbsLxjp145ovli+Jx0H5UBfMjj+Yk7y4ApIR7a6I
-Bt7u1b4S1FSQ3b6qHbp+
-=R2RW
------END PGP SIGNATURE-----
diff --git a/dev-ruby/shoulda-context/shoulda-context-1.1.6.ebuild b/dev-ruby/shoulda-context/shoulda-context-1.1.6.ebuild
index 595d013e1c2d..39210426ae82 100644
--- a/dev-ruby/shoulda-context/shoulda-context-1.1.6.ebuild
+++ b/dev-ruby/shoulda-context/shoulda-context-1.1.6.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/shoulda-context/shoulda-context-1.1.6.ebuild,v 1.4 2014/08/18 01:42:40 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/shoulda-context/shoulda-context-1.1.6.ebuild,v 1.5 2014/10/10 22:46:37 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 jruby"
+USE_RUBY="ruby19 ruby20 ruby21 jruby"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="CONTRIBUTING.md README.md"
@@ -25,8 +25,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64"
 IUSE="doc test"
 
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 dev-ruby/mocha )"
+ruby_add_bdepend "test? ( dev-ruby/test-unit:2 
+	<dev-ruby/mocha-1 )"
 
+all_ruby_prepare() {
+	sed -i -e "1igem 'mocha', '~>0.10'\n" test/test_helper.rb || die
+}
 each_ruby_test() {
 	ruby-ng_testrb-2 -Itest test/shoulda/*_test.rb || die
 }