summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Graaff <graaff@gentoo.org>2013-09-22 17:55:03 +0000
committerHans de Graaff <graaff@gentoo.org>2013-09-22 17:55:03 +0000
commit1908f1de67667f8bc76ad18811f41465634771c7 (patch)
tree9d06ebff5acaa14e077bcbcca938fc87f221bab5
parentVersion bump. (diff)
downloadgentoo-2-1908f1de67667f8bc76ad18811f41465634771c7.tar.gz
gentoo-2-1908f1de67667f8bc76ad18811f41465634771c7.tar.bz2
gentoo-2-1908f1de67667f8bc76ad18811f41465634771c7.zip
Drop dependency on broken and deprecated heckle.
(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!)
-rw-r--r--dev-ruby/rspec/ChangeLog5
-rw-r--r--dev-ruby/rspec/rspec-1.3.2.ebuild10
2 files changed, 9 insertions, 6 deletions
diff --git a/dev-ruby/rspec/ChangeLog b/dev-ruby/rspec/ChangeLog
index 27a50eab37bd..afc9533c12a2 100644
--- a/dev-ruby/rspec/ChangeLog
+++ b/dev-ruby/rspec/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-ruby/rspec
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec/ChangeLog,v 1.153 2013/08/11 07:50:47 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec/ChangeLog,v 1.154 2013/09/22 17:55:03 graaff Exp $
+
+ 22 Sep 2013; Hans de Graaff <graaff@gentoo.org> rspec-1.3.2.ebuild:
+ Drop dependency on broken and deprecated heckle.
11 Aug 2013; Hans de Graaff <graaff@gentoo.org> -rspec-1.3.1-r1.ebuild:
Cleanup.
diff --git a/dev-ruby/rspec/rspec-1.3.2.ebuild b/dev-ruby/rspec/rspec-1.3.2.ebuild
index acdf245972bf..cbab5baba27b 100644
--- a/dev-ruby/rspec/rspec-1.3.2.ebuild
+++ b/dev-ruby/rspec/rspec-1.3.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec/rspec-1.3.2.ebuild,v 1.14 2013/08/03 07:40:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec/rspec-1.3.2.ebuild,v 1.15 2013/09/22 17:55:03 graaff Exp $
EAPI=2
USE_RUBY="ruby18 ruby19 jruby"
@@ -44,10 +44,6 @@ USE_RUBY="ruby18 ree18 ruby19" \
>=dev-ruby/fakefs-0.2.1 )"
USE_RUBY="ruby19" ruby_add_bdepend "test? ( =dev-ruby/test-unit-1.2.3 )"
-# the testsuite skips over heckle for Ruby 1.9 so we only request it for 1.8
-USE_RUBY="ruby18 ree18" \
- ruby_add_bdepend "test? ( >=dev-ruby/heckle-1.4.3 )"
-
all_ruby_prepare() {
# Avoid dependency on git.
sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
@@ -64,6 +60,10 @@ all_ruby_prepare() {
# Support ruby 1.9.3
cp spec/spec/runner/formatter/html_formatted-1.9.2.html spec/spec/runner/formatter/html_formatted-1.9.3.html || die
cp spec/spec/runner/formatter/text_mate_formatted-1.9.2.html spec/spec/runner/formatter/text_mate_formatted-1.9.3.html || die
+
+ # Drop heckle dependency.
+ rm spec/spec/runner/heckler_spec.rb spec/spec/runner/heckle_runner_spec.rb || die
+ sed -i -e '381,398 s:^:#:' spec/spec/runner/option_parser_spec.rb || die
}
src_test() {