Gentoo Archives: gentoo-commits

From: "Diego Petteno (flameeyes)" <flameeyes@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-ruby/echoe/files: echoe-4.3-gentoo.patch echoe-4.0-optional-gemcutter.patch
Date: Sat, 01 May 2010 16:58:10
Message-Id: 20100501165805.1BB922C120@corvid.gentoo.org
1 flameeyes 10/05/01 16:58:04
2
3 Added: echoe-4.3-gentoo.patch
4 Removed: echoe-4.0-optional-gemcutter.patch
5 Log:
6 Avoid errors if RSpec is not installed.
7 (Portage version: 2.2_rc67/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 dev-ruby/echoe/files/echoe-4.3-gentoo.patch
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/echoe/files/echoe-4.3-gentoo.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/echoe/files/echoe-4.3-gentoo.patch?rev=1.1&content-type=text/plain
14
15 Index: echoe-4.3-gentoo.patch
16 ===================================================================
17 unchanged:
18 --- echoe-4.0.orig/lib/echoe.rb
19 +++ echoe-4.0/lib/echoe.rb
20 @@ -21,7 +21,11 @@ require "#{$HERE}/echoe/extensions"
21 require 'rubygems'
22 require 'rubygems/specification'
23 require "#{$HERE}/echoe/rubygems"
24 -require 'rubygems_plugin'
25 +begin
26 + gem 'gemcutter'
27 + require 'rubygems_plugin'
28 +rescue Gem::LoadError
29 +end
30
31 require 'highline/import'
32
33 only in patch2:
34 unchanged:
35 --- a/lib/echoe.rb
36 +++ b/lib/echoe.rb
37 @@ -723,7 +723,7 @@ private
38 task :default => :test
39 end
40
41 - if spec_pattern.any?
42 + if defined? Spec and spec_pattern.any?
43 desc "Run the spec suite"
44 Spec::Rake::SpecTask.new('spec') do |t|
45 t.spec_files = spec_pattern