diff options
author | Diego Elio Pettenò <flameeyes@gentoo.org> | 2011-02-02 13:28:42 +0000 |
---|---|---|
committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2011-02-02 13:28:42 +0000 |
commit | ec7b9cb6438463544d12dee7743903d3f3cfa9d7 (patch) | |
tree | 0ebef8898e0832b511c1ac7f7a56016c5c1e6da1 /dev-ruby/builder | |
parent | mask ayatana use flag globally (diff) | |
download | gentoo-2-ec7b9cb6438463544d12dee7743903d3f3cfa9d7.tar.gz gentoo-2-ec7b9cb6438463544d12dee7743903d3f3cfa9d7.tar.bz2 gentoo-2-ec7b9cb6438463544d12dee7743903d3f3cfa9d7.zip |
Add patch to fix tests with Ruby 1.9.2 and add ruby19 compatibility.
(Portage version: 2.2.0_alpha19/cvs/Linux x86_64)
Diffstat (limited to 'dev-ruby/builder')
-rw-r--r-- | dev-ruby/builder/ChangeLog | 6 | ||||
-rw-r--r-- | dev-ruby/builder/builder-3.0.0.ebuild | 6 | ||||
-rw-r--r-- | dev-ruby/builder/files/builder-3.0.0+ruby-1.9.2.patch | 30 |
3 files changed, 39 insertions, 3 deletions
diff --git a/dev-ruby/builder/ChangeLog b/dev-ruby/builder/ChangeLog index 957cb6e9f71b..a0481e91dd9c 100644 --- a/dev-ruby/builder/ChangeLog +++ b/dev-ruby/builder/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-ruby/builder # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/builder/ChangeLog,v 1.54 2011/01/02 08:53:05 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/builder/ChangeLog,v 1.55 2011/02/02 13:28:42 flameeyes Exp $ + + 02 Feb 2011; Diego E. Pettenò <flameeyes@gentoo.org> builder-3.0.0.ebuild, + +files/builder-3.0.0+ruby-1.9.2.patch: + Add patch to fix tests with Ruby 1.9.2 and add ruby19 compatibility. *builder-3.0.0 (02 Jan 2011) diff --git a/dev-ruby/builder/builder-3.0.0.ebuild b/dev-ruby/builder/builder-3.0.0.ebuild index 50df6e94960c..898f0ce7c383 100644 --- a/dev-ruby/builder/builder-3.0.0.ebuild +++ b/dev-ruby/builder/builder-3.0.0.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/builder/builder-3.0.0.ebuild,v 1.1 2011/01/02 08:53:05 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/builder/builder-3.0.0.ebuild,v 1.2 2011/02/02 13:28:42 flameeyes Exp $ EAPI=2 -USE_RUBY="ruby18 ree18 jruby" +USE_RUBY="ruby18 ruby19 ree18 jruby" RUBY_FAKEGEM_TASK_TEST="test_all" @@ -27,4 +27,6 @@ all_ruby_prepare() { # Remove file that should not be part of the distribution. rm test/test_cssbuilder.rb || die + + epatch "${FILESDIR}"/${P}+ruby-1.9.2.patch } diff --git a/dev-ruby/builder/files/builder-3.0.0+ruby-1.9.2.patch b/dev-ruby/builder/files/builder-3.0.0+ruby-1.9.2.patch new file mode 100644 index 000000000000..5d627d75f436 --- /dev/null +++ b/dev-ruby/builder/files/builder-3.0.0+ruby-1.9.2.patch @@ -0,0 +1,30 @@ +From 770b5acf1736297669d000d1f673ba287ef1d95e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@gmail.com> +Date: Wed, 2 Feb 2011 14:20:00 +0100 +Subject: [PATCH] Skip blankslate tests even when using minitest. + +At least with Ruby 1.9.2's minitest, simply defining the suite method is +not going to be enough to skip over these tests; instead use the skip +method if it's available. +--- + test/test_blankslate.rb | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/test/test_blankslate.rb b/test/test_blankslate.rb +index a46eeb6..222b9bc 100644 +--- a/test/test_blankslate.rb ++++ b/test/test_blankslate.rb +@@ -89,6 +89,10 @@ class TestBlankSlate < Test::Unit::TestCase + end + + def setup ++ if Object::const_defined?(:BasicObject) and respond_to?(:skip) ++ skip "BlankSlate is not used in this environment" ++ end ++ + @bs = BlankSlate.new + end + +-- +1.7.4 + |