diff options
| author |   Hans de Graaff <graaff@gentoo.org> | 2014-04-19 10:52:33 +0000 |
|---|---|---|
| committer | Hans de Graaff <graaff@gentoo.org> | 2014-04-19 10:52:33 +0000 |
| commit | 38e50761de25ab925323d5c9370bd2831af66fdd (patch) | |
| tree | cacdc2d4fd3494fd7a429e9c35a5ba29381bd62a /dev-ruby/stringex | |
| parent | Support substituting ${PYTHON_USEDEP} in python_gen_cond_dep(). (diff) | |
| download | gentoo-2-38e50761de25ab925323d5c9370bd2831af66fdd.tar.gz gentoo-2-38e50761de25ab925323d5c9370bd2831af66fdd.tar.bz2 gentoo-2-38e50761de25ab925323d5c9370bd2831af66fdd.zip | |
Add ruby20, ruby21 again. Fix test invocation.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!)
Diffstat (limited to 'dev-ruby/stringex')
| -rw-r--r-- | dev-ruby/stringex/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-ruby/stringex/stringex-2.5.2.ebuild | 20 |
2 files changed, 19 insertions, 6 deletions
diff --git a/dev-ruby/stringex/ChangeLog b/dev-ruby/stringex/ChangeLog index 732e97f08ad1..4a9db61a503c 100644 --- a/dev-ruby/stringex/ChangeLog +++ b/dev-ruby/stringex/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-ruby/stringex # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/stringex/ChangeLog,v 1.21 2014/04/14 09:49:56 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/stringex/ChangeLog,v 1.22 2014/04/19 10:52:33 graaff Exp $ + + 19 Apr 2014; Hans de Graaff <graaff@gentoo.org> stringex-2.5.2.ebuild: + Add ruby20, ruby21 again. Fix test invocation. *stringex-2.5.2 (14 Apr 2014) diff --git a/dev-ruby/stringex/stringex-2.5.2.ebuild b/dev-ruby/stringex/stringex-2.5.2.ebuild index 0e59198c9384..58225de17d29 100644 --- a/dev-ruby/stringex/stringex-2.5.2.ebuild +++ b/dev-ruby/stringex/stringex-2.5.2.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/stringex/stringex-2.5.2.ebuild,v 1.1 2014/04/14 09:49:56 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/stringex/stringex-2.5.2.ebuild,v 1.2 2014/04/19 10:52:33 graaff Exp $ EAPI=5 -USE_RUBY="ruby19" +USE_RUBY="ruby19 ruby20 ruby21" 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.2 - dev-ruby/sqlite3 dev-ruby/redcloth dev-ruby/test-unit:2 )" +USE_RUBY="ruby19" ruby_add_bdepend "test? ( >=dev-ruby/activerecord-3 dev-ruby/sqlite3 )" + +each_ruby_prepare() { + case ${RUBY} in + *ruby2[01]) + # 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" + ruby-ng_testrb-2 -Ilib -Itest test/unit/*/*_test.rb test/performance/*_test.rb || die "tests failed" } |