Drop jruby. Add ruby22. Restrict tests since they fail with Psych as YAML provider.

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

diff --git a/dev-ruby/erubis/ChangeLog b/dev-ruby/erubis/ChangeLog
index 7ec44301c1042a0c6dc4eec9ae89d7456fb1a1c0..74f8b949209252091910341ce4465b12067a1065 100644 (file)
--- a/dev-ruby/erubis/ChangeLog
+++ b/dev-ruby/erubis/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/erubis
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/erubis/ChangeLog,v 1.31 2014/06/14 11:20:53 mrueg Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/erubis/ChangeLog,v 1.32 2015/03/20 13:51:10 graaff Exp $
+
+  20 Mar 2015; Hans de Graaff <graaff@gentoo.org> erubis-2.7.0-r2.ebuild:
+  Drop jruby. Add ruby22. Restrict tests since they fail with Psych as YAML
+  provider.
 
   14 Jun 2014; Manuel Rüger <mrueg@gentoo.org> -erubis-2.7.0.ebuild:
   Cleanup old.

diff --git a/dev-ruby/erubis/Manifest b/dev-ruby/erubis/Manifest
index 59a914408edfe555b9304f4eb95d901db51cd3dc..3b474143c64ea885736fee03593290cfcde54d99 100644 (file)
--- a/dev-ruby/erubis/Manifest
+++ b/dev-ruby/erubis/Manifest
@@ -1,5 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST erubis-2.7.0.gem 173056 SHA256 63653f5174a7997f6f1d6f465fbe1494dcc4bdab1fb8e635f6216989fb1148ba SHA512 49b08b28656acaf3b0c88fe064bb0d5f79fd08b834d7eba9294217b0893c5a0244ac5dd54de0e52dd17e828a0110e54b29e8c2d75171d527da957917344a0f27 WHIRLPOOL f58bbb85bcd4182eb0301ead30138b948322015df6853e2ca2ea272dfda20c980108b032f29d1304e2bb17dd4b0ee22fb69e57f374588fac2428d5ea4df4dfff
 EBUILD erubis-2.7.0-r1.ebuild 1557 SHA256 c6d43aa0a0aa039e5a82f637ad96a2c6844e71302c3b76505fded26d2103ed95 SHA512 4d8bade1b612473b20e5ceae5bfb9fb8a718b08cf624b018187d6d2add8b053d84c06c92fe053e7beb1da1d5f0bf5e3caa5dfd754b864f2182e3e03eb78bc739 WHIRLPOOL 947273dc44ee89ed03285a1295793bdd4e23a57069420a185b64f1407cefc17cfc07cb7109aafca761fc365428678e70048b33e2c2b65a2aa74b71f99d52a8bc
-EBUILD erubis-2.7.0-r2.ebuild 1658 SHA256 f992ce9800fd93a364dd87f270b6ff2454892431631b1d36777c70ce7f931c2e SHA512 9f89520fe35aebe40d6fb875000d00bc2c575e4a7c281a4d5419fdd3f02f52673d35aea99b18296263eabaaaf36ae302da56cb2b48591590813c8b2bd134eb9b WHIRLPOOL 6a1f9f2b4f2b925a9c31d82ecbc4024b17a6ca347b1418136da0cdaeaab1ed4da3e89f0b1e71003054f55c0bc29bfe29517352e2186071887bf344c65d3de28a
-MISC ChangeLog 3896 SHA256 ba487eb038de9cdb30b3fa1765d8db1beb69dddcd9559dda41ad73ee7927d810 SHA512 9498491c4bb29c769488952c8e2bf04d5aa5bcc556f47e5b815b63777e1ffa4380f2264f0676200c1bd87b69e47911f35a96b93b929a2e7db9436491d79c5829 WHIRLPOOL 6b542d3d8dc1c2a84893bc3c14f0801a390d4a2f8b583d4f3928cb8631359896e2abecfdc38ecc5cdbe0ddb0ea7f41a881be093c432dadafa48f874b20cd3eeb
+EBUILD erubis-2.7.0-r2.ebuild 1206 SHA256 fff02d01563ea2e08bb1c3aac427bf01888af606bee82502e18c814cb3580d0d SHA512 81b6cdcddbbd013d0f8cfb0492fbd772945270ba1de18c73db4e556f0d66ed86eaf5d78550ad79f4f42418b2185264830693f893593682b04f555f5f6bada94b WHIRLPOOL 7e58ba4c087f0a9c8c5307a11f961c42e8bd8544d7816235755175b5607ae32378815383e8c1d2a5bcd2ef102aa3f748535186cba048d428be15bcc2a819554b
+MISC ChangeLog 4060 SHA256 a67760e82ce156a10e5f872b7b0646717ba462c84b5bbfd96e0e522c9b594d6a SHA512 fd52f68e4c072306861f6dd46f7543d24067bb791aab38f2fdb27bf07477221263be7c8acef8825976ea357fa9c040c2fdb8e49b8283a60e4254ce6b3a129c40 WHIRLPOOL 30ebe7f41e52f04500099ef1b7bf985280709d0b42aaefb65fcbfb39d86d529f8801b50146f5277b87cc6782f0182a92f27c939572657f135d4b03bda158b6c5
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iF4EAREIAAYFAlUMJc8ACgkQiIP6VqMIqNeowQD+NkCC4+xdUHqp0RYh/comQfTQ
+misIv7yLTvDI8ntwnSkA/jh/TcjX3SKXT9G7CPSDq2OwvldlYduPs2jziBwKk0oR
+=x8do
+-----END PGP SIGNATURE-----

diff --git a/dev-ruby/erubis/erubis-2.7.0-r2.ebuild b/dev-ruby/erubis/erubis-2.7.0-r2.ebuild
index ab77c65e67e538e334c76e530f56fb01b7aa0a2e..76c9a6921c90b596015c90154d557e3cf42f1818 100644 (file)
--- a/dev-ruby/erubis/erubis-2.7.0-r2.ebuild
+++ b/dev-ruby/erubis/erubis-2.7.0-r2.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/erubis/erubis-2.7.0-r2.ebuild,v 1.1 2014/04/19 09:08:07 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/erubis/erubis-2.7.0-r2.ebuild,v 1.2 2015/03/20 13:51:10 graaff Exp $
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21 jruby"
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST=""
@@ -22,6 +22,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
+# http://rubyforge.org/tracker/index.php?func=detail&aid=29484&group_id=1320&atid=5201
+# Tests are not compatible with Psych as YAML module.
+RESTRICT="test"
+
 ruby_add_rdepend ">=dev-ruby/abstract-1.0.0"
 
 all_ruby_prepare() {
@@ -31,29 +35,6 @@ all_ruby_prepare() {
        sed -i -e '/test-users-guide/ s:^:#:' test/test.rb || die
 }
 
-each_ruby_prepare() {
-       case ${RUBY} in
-               *jruby)
-                       # Avoid test on jruby that fails different on syntax error.
-                       sed -i -e '/test_syntax2/,/^  end/ s:^:#:' test/test-main.rb || die
-                       ;;
-       esac
-}
-
 each_ruby_test() {
-       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."
-                       ;;
-               *ruby20)
-                       einfo "Tests are not compatible with ruby 2.0.0 with Psych as YAML module."
-                       ;;
-               *ruby21)
-                       einfo "Tests are not compatible with ruby 2.1.x with Psych as YAML module."
-                       ;;
-               *)
-                       PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -I. test/test.rb || die
-                       ;;
-       esac
+       PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -I. test/test.rb || die
 }