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

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 171 insertions, 7 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/Manifest b/dev-util/cucumber/Manifest
index dcab69566d0f..2beb9192ad4e 100644
--- a/dev-util/cucumber/Manifest
+++ b/dev-util/cucumber/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+AUX cucumber-0.7.3-remove-rspec2.patch 2751 RMD160 49552ddea8ef7565402bcb52939c458d76a2ad34 SHA1 e9e9cb2d069e7c58387a9d736faaa836fb335c45 SHA256 5858aa5d98a7e43cfd085d691d70084352f243ffae6019990a5b1a5f135fa989
 DIST cucumber-0.6.4.gem 219136 RMD160 13139a1828b8469c205aa0b0c4b7e0aa3acd9760 SHA1 ad46a0d4c67dfda881da4f967b735eef3c4dabec SHA256 7708ac59462661ddf970c1389625a162d44b72fdd396f45373a697a3fe172d32
 DIST cucumber-0.7.3.gem 205312 RMD160 14724fa8b2436cc2381bda9ad433f60942449806 SHA1 0057116d831a133bebb4e4e511c97d4bc67c77e0 SHA256 67e39fa5d95446b73240b69928e39774131ef84fefb66b5682c35eb95af7a9e0
 EBUILD cucumber-0.6.4.ebuild 1552 RMD160 c08d61016aef2e0e63bdb1ac25ea112055da3d24 SHA1 e7d5be6a0542a36c99c580fefdff4ff772d8f320 SHA256 77f0e3098d55aeb31166be825df2edb4f91ffa84d6675bf1f2162f942c85a63d
+EBUILD cucumber-0.7.3-r1.ebuild 1692 RMD160 cfdfb2050c2543051e9cf8968ddeab25ecf74078 SHA1 e9eca68e989bc1d63f73c4a818ba48999954e452 SHA256 6d64521d6ce43d0aa0aa48147b1a59af892b410f371722af1483e31ff52eabac
 EBUILD cucumber-0.7.3.ebuild 1540 RMD160 84652de40d9262cbfc3068ec202758d66736598e SHA1 9093a00ccd71a97b6c1b2de371482ec4ec64a9ad SHA256 610fa6fc9835de1ee6cbdccaca7b3f3610cbfd81cd599abda19a6defc98dd065
-MISC ChangeLog 5258 RMD160 f06d77fd4dac894b6854bd10284b74f671d2e052 SHA1 2c2c45663ad6a6bdf8d58dbac3df33631a4acc3a SHA256 0ec5c28748a9902366f37738c3192aed7d32aa54a542ee703c5c390f4e992d75
+MISC ChangeLog 5489 RMD160 5f0fe0f7d3619acd91fe6ce2a92b227c98cb7f87 SHA1 c60b3153ad593dfcd8297bcf7b00ae2eb47eef8d SHA256 a0f3e6a585d227a48b06eec5ca9f4fb6d27298fd881d3d64ab0ffdef9b5a8c1e
 MISC metadata.xml 222 RMD160 c395116c51764efaa671a0f89a7d8992ecbe7304 SHA1 2095e0ced2657346964271e45cc69027b0ccd49d SHA256 0adb6b2a2a8cc78f3d28b8b629db9d9e5731f21da86168ae88eeadc8b82d3225
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkwAvcMACgkQeM7EJeUH71ObfQCcDbPjSOqqKi20mzgZbZuDsMaA
-618An34MOwNHfasQYuDazPmitpBZCUgf
-=wp13
+iF4EAREIAAYFAkyMxqwACgkQZihJkut28SttsAEAj0kQD97y6tpW0C3iZq8Z/GPt
+nywg7NJW8wJrh5xhjZkA/2TJQAWMWcmUD6ioUJDprqOXxI1feR1Rzu3RYJlSqdej
+=e275
 -----END PGP SIGNATURE-----
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