From fe113e8f10781436d727ea7a2613be897577800c Mon Sep 17 00:00:00 2001 From: Hans de Graaff Date: Fri, 25 Oct 2013 09:05:58 +0000 Subject: Add ruby20, but skip the rails tests and dependencies for now so we can resolve circular dependencies first. (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!) --- dev-ruby/stringex/stringex-2.0.8.ebuild | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) (limited to 'dev-ruby/stringex/stringex-2.0.8.ebuild') diff --git a/dev-ruby/stringex/stringex-2.0.8.ebuild b/dev-ruby/stringex/stringex-2.0.8.ebuild index 29f4a9d57a3e..f19d4908cd30 100644 --- a/dev-ruby/stringex/stringex-2.0.8.ebuild +++ b/dev-ruby/stringex/stringex-2.0.8.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/stringex/stringex-2.0.8.ebuild,v 1.2 2013/08/24 16:26:05 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/stringex/stringex-2.0.8.ebuild,v 1.3 2013/10/25 09:05:58 graaff Exp $ EAPI=5 -USE_RUBY="ruby18 ruby19" +USE_RUBY="ruby18 ruby19 ruby20" RUBY_FAKEGEM_DOC_DIR="rdoc" RUBY_FAKEGEM_EXTRADOC="README.rdoc" @@ -24,13 +24,23 @@ IUSE="test" # USE flags at all. ruby_add_bdepend " test? ( - >=dev-ruby/activerecord-3 - dev-ruby/sqlite3 dev-ruby/redcloth dev-ruby/test-unit:2 )" -each_ruby_test() { - # rake seems to break this - ruby-ng_testrb-2 -Ilib -Itest test/{unit,performance}/*_test.rb || die "tests failed" +USE_RUBY="ruby18 ruby19" ruby_add_bdepend "test? ( >=dev-ruby/activerecord-3 dev-ruby/sqlite3 )" + +each_ruby_prepare() { + case ${RUBY} in + *ruby20) + # Avoid tests depending on Rails until we have a version + # keyworded. + rm -rf test/unit/{acts_as_url,localization}* || die + ;; + esac } + +#each_ruby_test() { +# # rake seems to break this +# ruby-ng_testrb-2 -Ilib -Itest test/{unit,performance}/*_test.rb || die "tests failed" +#} -- cgit v1.2.3-65-gdbad