Add ruby21. Avoid kramdown tests due to differences in quoting.

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

3 files changed, 25 insertions, 7 deletions

diff --git a/dev-ruby/tilt/ChangeLog b/dev-ruby/tilt/ChangeLog
index 75814907f4a6..c19c224badc8 100644
--- a/dev-ruby/tilt/ChangeLog
+++ b/dev-ruby/tilt/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/tilt
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tilt/ChangeLog,v 1.30 2014/04/05 14:30:10 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tilt/ChangeLog,v 1.31 2014/04/20 05:57:18 graaff Exp $
+
+  20 Apr 2014; Hans de Graaff <graaff@gentoo.org> tilt-1.4.1.ebuild:
+  Add ruby21. Avoid kramdown tests due to differences in quoting.
 
   05 Apr 2014; Manuel Rüger <mrueg@gentoo.org> tilt-1.3.3.ebuild,
   tilt-1.4.1.ebuild:
diff --git a/dev-ruby/tilt/Manifest b/dev-ruby/tilt/Manifest
index 51832a741765..cdabc18f4fbd 100644
--- a/dev-ruby/tilt/Manifest
+++ b/dev-ruby/tilt/Manifest
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX tilt-1.3.2-thread_id.patch 830 SHA256 5cbdf308a81374dd6bacdc959f77149d6f06a3bce38ef5710adaaeeb3e9a895f SHA512 e988421d602ac35edb956ef940efb7c81b8f39bdbf457e9338b35c9b6ecbebc1ede57327ae0c7d1f2093c07db80f9debcbacf41f728394d81a2033d995a41034 WHIRLPOOL 50546f50b2375470190c118aab766baa7c19d2e6bb1a5e2aeb76ab1cfde843752dee53dcc9e32452321baa053b195ca025ed13a08bbbd1b26739db0cba15a28c
 AUX tilt-1.3.3-yajl-test.patch 1271 SHA256 0d6b137c9333c092436bde716b3779a8ea1ba0494aa280b54ebacf95e6b4447a SHA512 93b99903d8974d01362abe8c0fc00f5dc64341a70c7608a5ba2f5e3ed31c9c6f1171a507a90abf5fc0ee7a7187ab3dd9cbe553bbc94545e2ea70f6f14ead2526 WHIRLPOOL 6a656e71bf145a224f4982f08ee889a59986e557f15bf81336cc3debbbbb23d89281913a0e72fa531f7deb6efbbef2d0ea83f0d561ee69f37e7b4e64f062cf70
 DIST tilt-1.3.3.gem 36352 SHA256 48af9536c7699dc0f8f50ba2432b627a3f47f9702d2d25d48dfc2d4a2da20da3 SHA512 6f1b23694d1a459869d581baf9f1f8bcc60218f5cd99fea3ae57d3104b1ab0857dcbf801ad636afb42985c4574427fed7039dc92da094c8761a9861a0ac65e74 WHIRLPOOL 7a5a9afcacc56b4d1dd9617e29a243cc54d607c15e34f319ee469a1bac1d90f949608dc8b4ae6d9b17858460f8cf0b06f23c037afd1e49e506ca838ebe36750c
 DIST tilt-1.4.1.gem 42496 SHA256 39820562c4f5db45fe18de87ccc30a0e77a998bf5334b1d8c10a2f7dbc1f5903 SHA512 10fec263596d0e18a7a1440a7edfa08a161526cc46cc70427bc251951c447c40b4a4e8675e9162a9ed288879682b4aceeeb35b48cf3f4925921025194543363f WHIRLPOOL 5d70949358b97e867cdec160bd3c3726dabfec94bfeadc3a12f17463d378779d8502dda6458c7deb92bd3d9def91e306077ef806a7f75bd6c892554739ce46e9
 EBUILD tilt-1.3.3.ebuild 1488 SHA256 5af512ba6614d08c9fe8212ea9a84b7e264f4ba8136b98ee406a9616a845498a SHA512 74a7708a6c734cfec5d5621040e7f0f51d12b0fca37d5a5e7de5cdd581e78f966b8350e8f26c740d50d0ea340b849ce32972e451bae969eb0c366baf2af5eb96 WHIRLPOOL 3884de4f944df881a687d73f547d0d17c698d5eecb5f4377b5c7fba90feda3fbea504b4e93ce34a8c960bd756f23a8acc9d4c6bfbbe35cbd4fa3132b1d125582
-EBUILD tilt-1.4.1.ebuild 1006 SHA256 82d4f44051403d8ddee7f92dce1a914ace861ce999450971e52b8a0717d469c1 SHA512 9b73854ce52456a5b93d1f6029c3398e71b38caa4136e21fa97f58f7448356df9ea13596789085868fda038782d262e2a9ef36d009080ab04fb36ffc50f7c289 WHIRLPOOL 69f3400f0a3bcf5444c802bb3f5b86439e71312dffe1dcf4da2a2b3370efd3eceaf7b6ec39d011793f49327de5490fc75431c4d68376205025cee27bd94e605a
-MISC ChangeLog 3785 SHA256 392928593b9923bb43413f6ffe9b6505d06077e031acd13807b5bfbf583521e6 SHA512 e6afc6b9aa13782fc3d3aef5fe6fa4b45c485a4114953a06ec101e42bf23fc655a3e740ac97d3ae1643161c701baa4702cebecd649d1ab9162d9f1401c42dd4b WHIRLPOOL 5a4fec77342722671da39c9d1a9893dadd663ebf568bac35a9637fe2b36962e6134acaff4392973ab8f5226e3937fc6546381b8df7954f96bfd0e4a094957cec
+EBUILD tilt-1.4.1.ebuild 1143 SHA256 e248e0da0ea1de481f80a50d9810f5e713150a26ea8fd2659ae9cd1242526a6b SHA512 4fff597a42a01a6d32eb3af35c3375e8319742cc639aa636f8a179cd768ed563c85ec75ddfaa492bacfbcc13da61d19f16ff95d1398cb3f0a290c0101b91a841 WHIRLPOOL 6acfc72d679ecf34531d066021f4207f2edc0026df278dc44f9865ed2604c7d449431cd2d682df6778a4cf11fb982e1ef7768c267c084feb6e3a3c16e9269752
+MISC ChangeLog 3922 SHA256 9aa565f8cde0b9a0a644d9ace26534fa454fb3b72fa20ae47ce327c8d6b04b00 SHA512 d3235cc3c030a195e01a17390b55c3b84fd460dfc63fdfbe76ada079d54c1d4c867739c5e0e0319eb8230fd7525232a017eb71240c9accb69291fcaf577f9492 WHIRLPOOL ae18a216051cfb6b4c1c5815ab9da542156eea6f3082b2d9f6accb73956ef76898539c90e255beff6ba79e17bea89a158bca909af4380cf42b038828686a649b
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iF4EAREIAAYFAlNTYcgACgkQiIP6VqMIqNdHfwD8CQZPeGQAnrKwPa8QJXvWwc3+
+Be7LVOhqOWhVp7cm7YsBAI/NrJZbKDQ3P1xZE9ZcYBuwrZOt0YHh78Kz/5lSccVd
+=YdHs
+-----END PGP SIGNATURE-----
diff --git a/dev-ruby/tilt/tilt-1.4.1.ebuild b/dev-ruby/tilt/tilt-1.4.1.ebuild
index 78de5df7fb3b..7f0e55596a43 100644
--- a/dev-ruby/tilt/tilt-1.4.1.ebuild
+++ b/dev-ruby/tilt/tilt-1.4.1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tilt/tilt-1.4.1.ebuild,v 1.4 2014/04/05 14:30:10 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tilt/tilt-1.4.1.ebuild,v 1.5 2014/04/20 05:57:18 graaff Exp $
 
 EAPI=5
 
 # jruby fails tests
-USE_RUBY="ruby19 ruby20"
+USE_RUBY="ruby19 ruby20 ruby21"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README.md TEMPLATES.md"
@@ -27,8 +27,13 @@ ruby_add_bdepend "test? (
 	dev-ruby/nokogiri
 	dev-ruby/radius )"
 
-# Most dependencies are optional: skip haml for ruby20 because haml
-# depends on rails.
+# Most dependencies are optional: skip haml for ruby20 and ruby21
+# because haml depends on rails.
 USE_RUBY="ruby19" ruby_add_bdepend "test? ( dev-ruby/haml )"
 
 ruby_add_rdepend ">=dev-ruby/builder-2.0.0"
+
+all_ruby_prepare() {
+	# Recent kramdown versions handle quoting differently.
+	rm test/tilt_kramdown_test.rb || die
+}