Don't run tests for ruby 1.9.3 since its default Psych module can't handle the YAML...

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

diff --git a/dev-ruby/erubis/ChangeLog b/dev-ruby/erubis/ChangeLog
index 189c3799635f30f7e91552786211209296b61f91..a508c57f554df98da1681f3c82556ebb34717764 100644 (file)
--- a/dev-ruby/erubis/ChangeLog
+++ b/dev-ruby/erubis/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/erubis
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/erubis/ChangeLog,v 1.13 2011/09/09 08:17:43 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/erubis/ChangeLog,v 1.14 2011/12/29 14:55:17 graaff Exp $
+
+  29 Dec 2011; Hans de Graaff <graaff@gentoo.org> erubis-2.7.0.ebuild:
+  Don't run tests for ruby 1.9.3 since its default Psych module can't handle
+  the YAML used.
 
   09 Sep 2011; Fabian Groffen <grobian@gentoo.org> erubis-2.7.0.ebuild:
   Marked ~sparc-solaris

diff --git a/dev-ruby/erubis/Manifest b/dev-ruby/erubis/Manifest
index 1ff995b82602e180c032aafd6e5c653a33d85bba..17d5d9d17bf927bd2f50774fef8ea0709212c911 100644 (file)
--- a/dev-ruby/erubis/Manifest
+++ b/dev-ruby/erubis/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 DIST erubis-2.6.6.gem 163840 RMD160 e3053b862cc6f9b4e28014691708bed80caf1815 SHA1 f044e9500a272d4fb2e40368c352350bf92f46f5 SHA256 75773bf89a65c3941560d91191ccfd3e69a2c9251b8610375ae18cf58912cda7
 DIST erubis-2.7.0.gem 173056 RMD160 d127d4b22006298814c960f6c8f06b799891eca0 SHA1 fb37414e8454f45a5674caa2a61707df46b370e9 SHA256 63653f5174a7997f6f1d6f465fbe1494dcc4bdab1fb8e635f6216989fb1148ba
 EBUILD erubis-2.6.6-r1.ebuild 1301 RMD160 2b769d6fc2483e7b7c65fb09c810fbd92fd1d39d SHA1 799e0e75b514ef4cee03de86b87bdd21ede6bbe4 SHA256 8d2ac75710080b026ca6dbd953c891708eada1ea21bab96a54ffd64afdf03cb1
 EBUILD erubis-2.6.6.ebuild 1013 RMD160 74543be06dd0f51ff2dd0189b449caabc2082457 SHA1 8013159970920b205c944e1ffc975ce43544a2ee SHA256 ceb2d2eb47e0e9720328e64e750919b6fee13a25aaaf19e811036de975ed474a
-EBUILD erubis-2.7.0.ebuild 1340 RMD160 5e5629168d2ead2ec9467bba930ad015a25080f6 SHA1 25ebe5cd2bd8da892c9e357385c4c1f06af83f25 SHA256 6060af6041b07793c147ec25c55773bc09174545e7a40c406ce5bcd0992dbb19
-MISC ChangeLog 1740 RMD160 58fd29f629f507caa7203b4e9505724570810fd3 SHA1 61f828a97bebf5fa4f17c333a369c8cce3dfc6b8 SHA256 e4c4de184d3bf143844de79239c7d5ada70c08c629360613c014544140aba624
+EBUILD erubis-2.7.0.ebuild 1564 RMD160 17e81625228d0a3c811daa9d29e1fb299bf7aea0 SHA1 bd7bf4b2c7e1eaee66fa15f2f13245cfe7e2481c SHA256 dc2977aaef606a5c1b3c81a60ec76e71fb635bf5b4d6d23f6017b1c6ea0cfba1
+MISC ChangeLog 1905 RMD160 ac221409fdfe2b43ab759c8906cc53bfcd2d982c SHA1 ebb6f39cfa9c98f7b53553ba0409397610f413ba SHA256 5594d82bdccdf4d5ed99bf3d2f476ffff9ed5a6f12d7bc2f3d2072a1c6d90dcd
 MISC metadata.xml 158 RMD160 097f8145a9994f98be4971b43b23b9e5e8bccb66 SHA1 7ac646714b1ab83fda98f3ccdd8b48a31c148b27 SHA256 70b396ab3c7a63a81cb895b7728bd9eccdc9770afdb9919f2c54694b685f7032
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (SunOS)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk5py7AACgkQX3X2B8XHTonbvgCdHb9yIgLG2mv5rZnlJkQ4til1
-0HIAn28pAhMc6Gm7Q5FWQfX3CmCuZzq/
-=MWSF
+iF4EAREIAAYFAk78f1oACgkQiIP6VqMIqNd5mwD+LZa/KKp3vEIuPrrawadhgT1M
+Tkg1ctp8EABiKqnGU64A+QGc16dAYPhGnIePOP/i9Jm6YBMZ+0ueTW4njjc/TT95
+=ehKE
 -----END PGP SIGNATURE-----

diff --git a/dev-ruby/erubis/erubis-2.7.0.ebuild b/dev-ruby/erubis/erubis-2.7.0.ebuild
index 35c6da594cc6f18ae09bdb8fe58e420d862ebd23..f26c68ae606f3ab5b6dec711e4c64a77c98e241e 100644 (file)
--- a/dev-ruby/erubis/erubis-2.7.0.ebuild
+++ b/dev-ruby/erubis/erubis-2.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/erubis/erubis-2.7.0.ebuild,v 1.4 2011/09/09 08:17:43 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/erubis/erubis-2.7.0.ebuild,v 1.5 2011/12/29 14:55:17 graaff Exp $
 
 EAPI="2"
 
@@ -41,5 +41,13 @@ each_ruby_prepare() {
 }
 
 each_ruby_test() {
-       PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} test/test.rb || die
+       case ${RUBY} in
+               # http://rubyforge.org/tracker/index.php?func=detail&aid=29484&group_id=1320&atid=5201
+               *ruby19)
+                       einfo "Tests are not compatible with ruby 1.9.3 with Psych as YAML module."
+                       ;;
+               *)
+                       PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -I. test/test.rb || die
+                       ;;
+       esac
 }