Update test dependencies to rails:4.2. Add ruby21 support. Remove old.

Package-Manager: portage-2.2.18/cvs/Linux x86_64

3 files changed, 18 insertions, 13 deletions

diff --git a/dev-ruby/haml/ChangeLog b/dev-ruby/haml/ChangeLog
index 0785d2c60445..7ff7058a356d 100644
--- a/dev-ruby/haml/ChangeLog
+++ b/dev-ruby/haml/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/haml
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/haml/ChangeLog,v 1.99 2015/04/16 23:21:34 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/haml/ChangeLog,v 1.100 2015/05/06 15:12:21 mrueg Exp $
+
+*haml-4.0.6-r1 (06 May 2015)
+
+  06 May 2015; Manuel Rüger <mrueg@gentoo.org> +haml-4.0.6-r1.ebuild,
+  -haml-4.0.5.ebuild:
+  Update test dependencies to rails:4.2. Add ruby21 support. Remove old.
 
 *haml-4.0.6 (16 Apr 2015)
 
diff --git a/dev-ruby/haml/Manifest b/dev-ruby/haml/Manifest
index b958c523d55c..0a85f2424907 100644
--- a/dev-ruby/haml/Manifest
+++ b/dev-ruby/haml/Manifest
@@ -1,11 +1,10 @@
 AUX haml-3.1.6-sass.patch 568 SHA256 bf1d8387aab6f23fe2a35ab1157c03bf316492090d365fa6f12b1f1a5266e71c SHA512 bf8878954ec4195eb90bd857b2aae47a97fcbad704e9361b894b612917da6407b3bbc460bdf4c8327f34be37b7c0e1a6599e545a408a6d57b3f744ca91d52ee2 WHIRLPOOL 26ad7a3016c497a469bba7d23e8784883bb6d270924fafe56067d66ed9ab210e6cb85d4752265153d8b474ca85f6fef3a934a39350becfc8a41a7fae953fe307
 DIST haml-3.1.8.gem 367616 SHA256 44f69d51810cfc5a0ffbb03fdc646afb2c2f4f841eacfab87caba02b59ae1617 SHA512 cb65e4b6b4eaf31b0d81376e819baf3a8e5216baa18fca744ac3297d207f26120c6571693459e06490dab587e7936624d14852504dd502de39dac3052181d4e7 WHIRLPOOL e6ea1e5f3074ec72d69ee99eeefacdea3dc36ff89ac6f29ae5e4fc0cc826ace375688a6126b1739e5bde0722fe0cf321f87561f68214ee72f5c60e1f8115c5a8
 DIST haml-4.0.3.gem 115712 SHA256 d94e937e5bc92da72e1d101e1ba983a5a84eb84b1981709b93fdfc349b833fd1 SHA512 1ecca4187a53071e17d4536ea7983d273a13630b66789640052da86376146a3f119175cc050c7fa7eeddc996f7bf0ad6728f215284fcb6918c82326c5a516f79 WHIRLPOOL 79aca5570b293617049fdc9981a7c85e7011b092485e2cd4688659e495c22718fbd2339e389efd08024b95f685436b80cbaf497d9f31388ebc59b275c0c3e57f
-DIST haml-4.0.5.gem 116736 SHA256 05b1cde6e0d770e800cb74f6bf1212446bc4573bbbfecc4002e1085c2658bff6 SHA512 2fe8658584ae08504a52a1d7a6b01fbfce5b65547328b90ed89f0276c74ac28ec34757d4a64886e6dfa6749ed2692e27ff24e7cb6b475e69a5628f02fbb779a9 WHIRLPOOL 161a008951eeb5f044ebacba70a48085a3c61fa2c538022a472f23fe22a31c4927cb1145c38996e960775a60a6fc950be7715515419363b0c0ee51ea65448c3a
 DIST haml-4.0.6.gem 115712 SHA256 2ede5f8a1f38d98e71daf570d836ec0db18e1c6187c383a50fb7eb2223beff23 SHA512 a58d3de9efb6ac80a504152a4ca71914681a334d802301c9c8954890e97b031d771f4ac5127713d5e1c1e051d6c74fb7c9d55b6b6e7166743e95ed33685be1c4 WHIRLPOOL 0b821983baa267ae03dee990b2432562601af4fe2c84d4f8f9a46133817470c97baef47098ed78f714b9eda5dae75d4cba4a8059398d9f9acf018633a713e4ab
 EBUILD haml-3.1.8-r2.ebuild 1614 SHA256 d891e904631ad8460ded8c21fbb47f522d41bb1d3a36015dfceff3e12632d4eb SHA512 8f8f89b6bfe5a5e7d284f9b7192b6bf12a4a2fbcd8dfb6539cd5ca2f7749c714c763eab2191b9776c32b41e2406939b4425065bb4f7618772deffa21cfc646ac WHIRLPOOL 287cd7d5b60d27632d808917cd6fcf0ec24a3533be4f39338fbdcce66d93ab39f02e5eaf415027fd5a288c4bcfc78f9cd3e5b0f1a58e3384761dfb74ea2c2f09
 EBUILD haml-4.0.3.ebuild 1063 SHA256 cd39c8bc9f722575f8ad04bdea67a02603941f7568f617858c88a3962ee8641a SHA512 558a2fab7a4ce7141ace23089b26d7fe5966ab052f56659a2491056ea14d0d392fc89b3979308aef4dc7ad7d2dd7571220aaf225615323529a77febd1b2fe198 WHIRLPOOL aad001e837f6d7d5f68bd67b89062b2e2665ba985cacdf510fff5ef5a93b9c8a420f602deb211b19cb15232635ab92d0dc676c27b220771eb8df1d4d2835641a
-EBUILD haml-4.0.5.ebuild 1372 SHA256 fcdc98cd8927a39bf8a8d042e631eebdb1d11a05581514ac72050b232e4e621c SHA512 40ce1a664530401fce4265a6d985f9efec870479c17b73d681298bbbd2516ea8e2aadde2df79fe222238a162a9caacbee4018c718cfebb9673f0dfb97b55b05d WHIRLPOOL 9f8513296b360ca5f31225375f7eb91889b02ee290e64dd228bda0a06d04c3c074684a9e201bd74720af20009672ea1a511feae979da477e0608afab648df058
+EBUILD haml-4.0.6-r1.ebuild 1379 SHA256 1845102a97571eaeb6558b630b874451b5793e90fac649f91ab76613b99768d8 SHA512 1dc5db09d7444154f0b90bb15fcce72b44c4a191cb7cc9b1d9119355a73ab0a0925d986d6b3bd0ff544a8180dc0831bf6aec2ee255857f50108f0052a8ba4a1a WHIRLPOOL a56eb37de64db599786104751516624dc0c44baea60a260953a28b93087918a6123acd6c67397ef8fa7d991e00f19b71b36030a8c7f64b21b10705390f5a1788
 EBUILD haml-4.0.6.ebuild 1369 SHA256 a66a3c052b6f8de017ccfa545dcaa78d7d75d85b3c87f0ce87eb7376fa19cccc SHA512 c011c97bbb57c4a4c5d63cf07c73a43117475b3b91ea6cf173db5580b581f1ff5562d873a04b30410060ef3e47f1f3ce846e0b27c36f2c998109c8ddfe088963 WHIRLPOOL 5191b875b4eb3b27bee72e3e7a89bd863b110b22520cc171919418e41aaf6cccdba31db904ed879d60e82aeea467ebae7858f7e074d53ab51a295892b0c123e6
-MISC ChangeLog 13674 SHA256 cc1655377acd5c9548e3ee48c01f5a5316267453868b1f76205ce1ea8905143d SHA512 6afa907b70d6d11667cda6480cab8db9f009191b15e42c341c0933ca9349015077985e1eabf38197341d43b887b5277cbb773688a1cb167cc2b32d767b982e20 WHIRLPOOL b0d2cf97874dcb4d6e321a85e9de1c6f4fd001677952483a299913cc5533a08e7ab46df2d02ab88ac20e99c7c53411ba33586e1a416a755d787c7bda7194d58b
+MISC ChangeLog 13872 SHA256 39d3abfbd2f7a6a32b89edbcd8798a2e48f4cc339345c815fca32eb75bf34de6 SHA512 0c852652c2c0584325aa24b30f552f90e7322f03685c31342bda6b5cddccd0b53270c8362a93b035ea229415c14d2cf0ec6a8d2fd35f3754d8c38c4c0d063983 WHIRLPOOL a8dc6cd08e2dd5eacc8388b27ce039930712ab74521e0b4ad8e41e9bcdc82510ef04fdcd168fa210d22d663faf45ff04a9af59c31a214c1bbc5cd9239b3a8774
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
diff --git a/dev-ruby/haml/haml-4.0.5.ebuild b/dev-ruby/haml/haml-4.0.6-r1.ebuild
index 46f94fb4106a..d373bd4dca2c 100644
--- a/dev-ruby/haml/haml-4.0.5.ebuild
+++ b/dev-ruby/haml/haml-4.0.6-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 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/haml/haml-4.0.5.ebuild,v 1.2 2014/08/15 14:01:04 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/haml/haml-4.0.6-r1.ebuild,v 1.1 2015/05/06 15:12:21 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20"
+USE_RUBY="ruby19 ruby20 ruby21"
 
 RUBY_FAKEGEM_TASK_TEST="test"
 RUBY_FAKEGEM_TASK_DOC="-Ilib doc"
@@ -29,9 +29,9 @@ ruby_add_rdepend "dev-ruby/tilt"
 
 ruby_add_bdepend "
 	test? (
-		dev-ruby/minitest:0
+		dev-ruby/minitest:5
 		dev-ruby/nokogiri
-		dev-ruby/rails:3.2
+		dev-ruby/rails:4.2
 	)
 	doc? (
 		dev-ruby/yard
@@ -40,10 +40,10 @@ ruby_add_bdepend "
 
 all_ruby_prepare() {
 	sed -i -e '/bundler/ s:^:#:' \
-		-e 's/gem "minitest"/gem "minitest", "~>4.0"/'\
-		-e '1igem "actionpack", "~>3.2"'\
-		-e '1igem "activesupport", "~>3.2"'\
-		-e '1igem "railties", "~>3.2"'\
+		-e 's/gem "minitest"/gem "minitest", "~>5.0"/'\
+		-e '1igem "actionpack", "~>4.2"'\
+		-e '1igem "activesupport", "~>4.2"'\
+		-e '1igem "railties", "~>4.2"'\
 		test/test_helper.rb || die
 	# Remove test that fails when RedCloth is available
 	sed -i -e "/should raise error when a Tilt filters dependencies are unavailable for extension/,+9 s/^/#/"\