graaff      14/04/19 10:52:33

  Modified:             ChangeLog stringex-2.5.2.ebuild
  Log:
  Add ruby20, ruby21 again. Fix test invocation.
  
  (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 
0x8883FA56A308A8D7!)

Revision  Changes    Path
1.22                 dev-ruby/stringex/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/stringex/ChangeLog?rev=1.22&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/stringex/ChangeLog?rev=1.22&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/stringex/ChangeLog?r1=1.21&r2=1.22

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/stringex/ChangeLog,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ChangeLog   14 Apr 2014 09:49:56 -0000      1.21
+++ ChangeLog   19 Apr 2014 10:52:33 -0000      1.22
@@ -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 <[email protected]> stringex-2.5.2.ebuild:
+  Add ruby20, ruby21 again. Fix test invocation.
 
 *stringex-2.5.2 (14 Apr 2014)
 



1.2                  dev-ruby/stringex/stringex-2.5.2.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/stringex/stringex-2.5.2.ebuild?rev=1.2&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/stringex/stringex-2.5.2.ebuild?rev=1.2&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/stringex/stringex-2.5.2.ebuild?r1=1.1&r2=1.2

Index: stringex-2.5.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/stringex/stringex-2.5.2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- stringex-2.5.2.ebuild       14 Apr 2014 09:49:56 -0000      1.1
+++ stringex-2.5.2.ebuild       19 Apr 2014 10:52:33 -0000      1.2
@@ -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 @@
 # 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"
 }




Reply via email to