Move to use the new framework for rspec handling. This does not fix tests but at least simplifies the testing part. Also remove unused file.

(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)

3 files changed, 10 insertions, 29 deletions

diff --git a/dev-ruby/treetop/ChangeLog b/dev-ruby/treetop/ChangeLog
index 2367918178b3..7403abb88c50 100644
--- a/dev-ruby/treetop/ChangeLog
+++ b/dev-ruby/treetop/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/treetop
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/treetop/ChangeLog,v 1.36 2012/05/01 18:24:23 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/treetop/ChangeLog,v 1.37 2012/08/01 14:46:56 flameeyes Exp $
+
+  01 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  -files/treetop-1.4.7-fix-tmpdir.patch, treetop-1.4.10-r1.ebuild:
+  Move to use the new framework for rspec handling. This does not fix tests but
+  at least simplifies the testing part. Also remove unused file.
 
   01 May 2012; Raúl Porcel <armin76@gentoo.org> treetop-1.4.9.ebuild,
   treetop-1.4.10.ebuild:
@@ -144,4 +149,3 @@
   08 Aug 2009; Hans de Graaff <graaff@gentoo.org> +treetop-1.3.0.ebuild,
   +metadata.xml:
   Initial import from my overlay. Dependency of forthcoming cucumber.
-
diff --git a/dev-ruby/treetop/files/treetop-1.4.7-fix-tmpdir.patch b/dev-ruby/treetop/files/treetop-1.4.7-fix-tmpdir.patch
deleted file mode 100644
index f7fa882c15cb..000000000000
--- a/dev-ruby/treetop/files/treetop-1.4.7-fix-tmpdir.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/spec/compiler/tt_compiler_spec.rb b/spec/compiler/tt_compiler_spec.rb
-index a453ad5..946691c 100644
---- a/spec/compiler/tt_compiler_spec.rb
-+++ b/spec/compiler/tt_compiler_spec.rb
-@@ -8,11 +8,13 @@ ENV['PATH'] = File.expand_path(File.dirname(__FILE__) + '../../../bin' +
- $LOAD_PATH.unshift(File.expand_path('../../../../lib', __FILE__))
- 
- describe "The 'tt' comand line compiler" do
-+  before(:each) do
-+    @tmpdir = Dir.tmpdir
-+  end
- 
-   context 'when processing a single grammar file' do
-     before(:each) do
-       # create a fresh but dumb grammar file for each example
--      @tmpdir = Dir.tmpdir
-       @test_base = "dumb-#{rand(1000)}"
-       @test_path = "#{@tmpdir}/#{@test_base}"
-       @test_grammar = "#{@test_path}.tt"
diff --git a/dev-ruby/treetop/treetop-1.4.10-r1.ebuild b/dev-ruby/treetop/treetop-1.4.10-r1.ebuild
index f28af5283e99..ef91c2df969e 100644
--- a/dev-ruby/treetop/treetop-1.4.10-r1.ebuild
+++ b/dev-ruby/treetop/treetop-1.4.10-r1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/treetop/treetop-1.4.10-r1.ebuild,v 1.3 2012/03/11 14:37:10 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/treetop/treetop-1.4.10-r1.ebuild,v 1.4 2012/08/01 14:46:56 flameeyes Exp $
 
 EAPI=4
-USE_RUBY="ruby18 ree18 ruby19"
+
 # jruby fails tests, not investigated yet.
+USE_RUBY="ruby18 ree18 ruby19"
 
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
 RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST="none"
-
 RUBY_FAKEGEM_DOCDIR="doc"
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
@@ -25,10 +25,6 @@ IUSE=""
 ruby_add_bdepend "test? ( >=dev-ruby/rr-0.10.2 dev-ruby/rspec:2 dev-ruby/activesupport )"
 ruby_add_rdepend ">=dev-ruby/polyglot-0.3.1"
 
-each_ruby_test() {
-	${RUBY} -S rspec spec || die
-}
-
 all_ruby_install() {
 	all_fakegem_install