Add ree18. Remove early-beta support for rspec-2 which no longer works.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 163 insertions, 1 deletions

diff --git a/dev-util/cucumber/ChangeLog b/dev-util/cucumber/ChangeLog
index 1668894c3143..e51b43473e20 100644
--- a/dev-util/cucumber/ChangeLog
+++ b/dev-util/cucumber/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/cucumber
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cucumber/ChangeLog,v 1.32 2010/05/29 07:09:42 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cucumber/ChangeLog,v 1.33 2010/09/12 12:25:11 graaff Exp $
+
+*cucumber-0.7.3-r1 (12 Sep 2010)
+
+  12 Sep 2010; Hans de Graaff <graaff@gentoo.org> +cucumber-0.7.3-r1.ebuild,
+  +files/cucumber-0.7.3-remove-rspec2.patch:
+  Add ree18. Remove early-beta support for rspec-2 which no longer works.
 
   29 May 2010; Hans de Graaff <graaff@gentoo.org> -cucumber-0.5.3.ebuild,
   -cucumber-0.6.3.ebuild, -cucumber-0.7.2.ebuild:
diff --git a/dev-util/cucumber/cucumber-0.7.3-r1.ebuild b/dev-util/cucumber/cucumber-0.7.3-r1.ebuild
new file mode 100644
index 000000000000..0d231403011c
--- /dev/null
+++ b/dev-util/cucumber/cucumber-0.7.3-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cucumber/cucumber-0.7.3-r1.ebuild,v 1.1 2010/09/12 12:25:11 graaff Exp $
+
+EAPI=2
+USE_RUBY="ruby18 ree18"
+
+# Documentation task depends on sdoc which we currently don't have.
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST="spec cucumber"
+RUBY_FAKEGEM_EXTRADOC="History.txt README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Executable feature scenarios"
+HOMEPAGE="http://github.com/aslakhellesoy/cucumber/wikis"
+LICENSE="Ruby"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+IUSE="examples"
+
+ruby_add_bdepend test ">=dev-ruby/rspec-1.3.0 >=dev-ruby/nokogiri-1.4.1"
+
+ruby_add_rdepend "
+	>=dev-ruby/builder-2.1.2
+	>=dev-ruby/diff-lcs-1.1.2
+	>=dev-ruby/gherkin-1.0.27
+	>=dev-ruby/json-1.2.4
+	>=dev-ruby/term-ansicolor-1.0.4
+"
+
+all_ruby_prepare() {
+	# Remove features checking for optional dependencies that we currently
+	# don't have in our tree.
+	rm -f features/drb_server_integration.feature features/cucumber_cli.feature || die "Unable to remove unsupported features."
+
+	# Remove rspec 2.x support since it is based on a very early beta
+	# and no longer compatible.
+	epatch "${FILESDIR}/${P}-remove-rspec2.patch"
+}
+
+each_ruby_install() {
+	each_fakegem_install
+
+	ruby_fakegem_doins VERSION.yml
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	if use examples; then
+		cp -pPR examples "${D}/usr/share/doc/${PF}" || die "Failed installing example files."
+	fi
+}
+
+pkg_postinst() {
+	ewarn "Cucumber 0.7.x has minor parsing incompatibilities. Check the upgrade guide"
+	ewarn "for details: http://wiki.github.com/aslakhellesoy/cucumber/upgrading"
+}
diff --git a/dev-util/cucumber/files/cucumber-0.7.3-remove-rspec2.patch b/dev-util/cucumber/files/cucumber-0.7.3-remove-rspec2.patch
new file mode 100644
index 000000000000..5f1f8b26f15e
--- /dev/null
+++ b/dev-util/cucumber/files/cucumber-0.7.3-remove-rspec2.patch
@@ -0,0 +1,96 @@
+--- gem_tasks/rspec.rake.~1~	2010-09-12 12:55:56.549346307 +0200
++++ gem_tasks/rspec.rake	2010-09-12 12:56:40.796472416 +0200
+@@ -1,13 +1,3 @@
+-begin
+-  require 'rspec/core/rake_task'
+-
+-  desc "Run RSpec"
+-  Rspec::Core::RakeTask.new do |t|
+-    t.rcov = ENV['RCOV']
+-    t.rcov_opts = %w{--exclude osx\/objc,gems\/,spec\/}
+-    t.verbose = true
+-  end
+-rescue LoadError => e
+   require 'spec/rake/spectask'
+ 
+   desc "Run RSpec"
+@@ -17,4 +7,3 @@
+     t.rcov_opts = %w{--exclude osx\/objc,gems\/,spec\/}
+     t.verbose = true
+   end
+-end
+--- lib/cucumber/rspec/diffing.rb.~1~	2010-09-12 12:55:56.276767180 +0200
++++ lib/cucumber/rspec/diffing.rb	2010-09-12 13:00:05.884598738 +0200
+@@ -2,16 +2,9 @@
+ 
+ options = OpenStruct.new(:diff_format => :unified, :context_lines => 3)
+ 
+-begin
+-  # RSpec >=2.0
+-  require 'rspec/expectations'
+-  require 'rspec/expectations/differs/default'
+-  Rspec::Expectations.differ = ::Rspec::Expectations::Differs::Default.new(options)
+-rescue LoadError => try_rspec_1_2_4_or_higher
+   begin
+     require 'spec/expectations'
+     require 'spec/runner/differs/default'
+     Spec::Expectations.differ = Spec::Expectations::Differs::Default.new(options)
+   rescue LoadError => give_up
+   end
+-end
+--- spec/spec_helper.rb.~1~	2010-09-12 12:55:56.280518419 +0200
++++ spec/spec_helper.rb	2010-09-12 13:02:14.329221958 +0200
+@@ -4,16 +4,6 @@
+ 
+ require 'rubygems'
+ 
+-begin
+-  require 'rspec'
+-  require 'rspec/autorun'
+-  Rspec.configure do |c|
+-    c.color_enabled = true
+-    c.before(:each) do
+-      ::Term::ANSIColor.coloring = true
+-    end
+-  end
+-rescue LoadError
+   require 'spec'
+   require 'spec/autorun'
+   Spec::Runner.configure do |c|
+@@ -21,7 +11,6 @@
+       ::Term::ANSIColor.coloring = true
+     end
+   end
+-end
+ 
+ require 'cucumber'
+ $KCODE='u' unless Cucumber::RUBY_1_9
+--- features/support/env.rb.~1~	2010-09-12 12:55:56.272596255 +0200
++++ features/support/env.rb	2010-09-12 13:03:37.824881422 +0200
+@@ -1,10 +1,6 @@
+ require 'rubygems'
+ require 'tempfile'
+-begin
+-  require 'rspec/expectations'
+-rescue LoadError
+   require 'spec/expectations'
+-end
+ require 'fileutils'
+ require 'forwardable'
+ require 'cucumber/formatter/unicode'
+--- cucumber.yml.~1~	2010-09-12 13:06:35.832722414 +0200
++++ cucumber.yml	2010-09-12 13:07:58.896848344 +0200
+@@ -2,13 +2,8 @@
+ rerun = File.file?('rerun.txt') ? IO.read('rerun.txt') : ""
+ rerun_opts = rerun.to_s.strip.empty? ? "--format progress features" : "--format pretty #{rerun}"
+ std_opts = "--format progress features --strict --tags ~@wip"
+-begin
+-  require 'rspec/expectations'
+-  std_opts << ' --tags ~@rspec1'
+-rescue LoadError
+   # rspec 1
+   std_opts << ' --tags ~@rspec2'
+-end
+ %>
+ default: <%= std_opts %>
+ jruby: <%= std_opts %> --tags ~@spork --tags ~@wire