Disable the automagic use of ruby-debug and mandatory use of rspec 1.x, then use the rspec recipe for tests. This allows dropping the jeweler dependency during tests at least.

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

2 files changed, 13 insertions, 5 deletions

diff --git a/dev-ruby/rest-client/ChangeLog b/dev-ruby/rest-client/ChangeLog
index 5d7f6948917b..374c217b3255 100644
--- a/dev-ruby/rest-client/ChangeLog
+++ b/dev-ruby/rest-client/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/rest-client
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rest-client/ChangeLog,v 1.12 2012/08/11 10:42:55 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rest-client/ChangeLog,v 1.13 2012/08/13 17:29:17 flameeyes Exp $
+
+  13 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  rest-client-1.6.7-r1.ebuild:
+  Disable the automagic use of ruby-debug and mandatory use of rspec 1.x, then
+  use the rspec recipe for tests. This allows dropping the jeweler dependency
+  during tests at least.
 
 *rest-client-1.6.7-r1 (11 Aug 2012)
 
@@ -54,4 +60,3 @@
   03 Jul 2010; Benedikt Böhm <hollow@gentoo.org> +rest-client-1.5.1.ebuild,
   +metadata.xml:
   initial ebuild, thanks to Gábor Vészi
-
diff --git a/dev-ruby/rest-client/rest-client-1.6.7-r1.ebuild b/dev-ruby/rest-client/rest-client-1.6.7-r1.ebuild
index d88479833dfc..ff3402c67195 100644
--- a/dev-ruby/rest-client/rest-client-1.6.7-r1.ebuild
+++ b/dev-ruby/rest-client/rest-client-1.6.7-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rest-client/rest-client-1.6.7-r1.ebuild,v 1.1 2012/08/11 10:42:55 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rest-client/rest-client-1.6.7-r1.ebuild,v 1.2 2012/08/13 17:29:17 flameeyes Exp $
 
 EAPI=4
 USE_RUBY="ruby18 ruby19 ree18"
 
-RUBY_FAKEGEM_TASK_TEST="spec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
 RUBY_FAKEGEM_EXTRADOC="history.md README.rdoc"
 
@@ -22,11 +22,14 @@ IUSE=""
 RUBY_PATCHES=( "${FILESDIR}/rest-client-1.6.7-ruby19.patch" )
 
 ruby_add_bdepend "doc? ( dev-ruby/jeweler )"
-ruby_add_bdepend "test? ( dev-ruby/jeweler dev-ruby/rspec:0 dev-ruby/webmock )"
+ruby_add_bdepend "test? ( dev-ruby/webmock )"
 
 ruby_add_rdepend ">=dev-ruby/mime-types-1.16"
 
 all_ruby_prepare() {
 	# Remove spec that requires network access.
 	rm spec/integration/request_spec.rb || die
+
+	# Remove forced requirement of rspec 1.x and ruby-debug.
+	sed -i -e '/\(spec\|ruby-debug\)/d' spec/base.rb || die
 }