summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-ruby/stringex')
-rw-r--r--dev-ruby/stringex/ChangeLog5
-rw-r--r--dev-ruby/stringex/stringex-2.5.2.ebuild20
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"
}