diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2010-05-01 16:58:04 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2010-05-01 16:58:04 +0000 |
| commit | a7e24e56a9b2719828b68da4b27af7c01f878076 (patch) | |
| tree | ce6d1fee9c605388b3f2e91f726d623a7872d05c /dev-ruby | |
| parent | version bump (diff) | |
| download | gentoo-2-a7e24e56a9b2719828b68da4b27af7c01f878076.tar.gz gentoo-2-a7e24e56a9b2719828b68da4b27af7c01f878076.tar.bz2 gentoo-2-a7e24e56a9b2719828b68da4b27af7c01f878076.zip | |
Avoid errors if RSpec is not installed.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'dev-ruby')
| -rw-r--r-- | dev-ruby/echoe/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-ruby/echoe/echoe-4.3.ebuild | 4 | ||||
| -rw-r--r-- | dev-ruby/echoe/files/echoe-4.3-gentoo.patch (renamed from dev-ruby/echoe/files/echoe-4.0-optional-gemcutter.patch) | 16 |
3 files changed, 22 insertions, 5 deletions
diff --git a/dev-ruby/echoe/ChangeLog b/dev-ruby/echoe/ChangeLog index ceb5a6ac62bd..65033b87d59e 100644 --- a/dev-ruby/echoe/ChangeLog +++ b/dev-ruby/echoe/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-ruby/echoe # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/echoe/ChangeLog,v 1.14 2010/04/24 07:40:19 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/echoe/ChangeLog,v 1.15 2010/05/01 16:58:04 flameeyes Exp $ + + 01 May 2010; Diego E. Pettenò <flameeyes@gentoo.org> + -files/echoe-4.0-optional-gemcutter.patch, echoe-4.3.ebuild, + +files/echoe-4.3-gentoo.patch: + Avoid errors if RSpec is not installed. 24 Apr 2010; Hans de Graaff <graaff@gentoo.org> -echoe-4.2.ebuild: Remove old version. diff --git a/dev-ruby/echoe/echoe-4.3.ebuild b/dev-ruby/echoe/echoe-4.3.ebuild index 44ef6cbaa243..221f539d04f3 100644 --- a/dev-ruby/echoe/echoe-4.3.ebuild +++ b/dev-ruby/echoe/echoe-4.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/echoe/echoe-4.3.ebuild,v 1.1 2010/03/14 14:00:03 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/echoe/echoe-4.3.ebuild,v 1.2 2010/05/01 16:58:04 flameeyes Exp $ EAPI=2 @@ -27,5 +27,5 @@ IUSE="" ruby_add_rdepend "dev-ruby/highline dev-ruby/rubyforge" all_ruby_prepare() { - epatch "${FILESDIR}"/${PN}-4.0-optional-gemcutter.patch + epatch "${FILESDIR}"/${P}-gentoo.patch } diff --git a/dev-ruby/echoe/files/echoe-4.0-optional-gemcutter.patch b/dev-ruby/echoe/files/echoe-4.3-gentoo.patch index 1235b604b382..0bfd0c0c401d 100644 --- a/dev-ruby/echoe/files/echoe-4.0-optional-gemcutter.patch +++ b/dev-ruby/echoe/files/echoe-4.3-gentoo.patch @@ -1,5 +1,4 @@ -Index: echoe-4.0/lib/echoe.rb -=================================================================== +unchanged: --- echoe-4.0.orig/lib/echoe.rb +++ echoe-4.0/lib/echoe.rb @@ -21,7 +21,11 @@ require "#{$HERE}/echoe/extensions" @@ -15,3 +14,16 @@ Index: echoe-4.0/lib/echoe.rb require 'highline/import' +only in patch2: +unchanged: +--- a/lib/echoe.rb ++++ b/lib/echoe.rb +@@ -723,7 +723,7 @@ private + task :default => :test + end + +- if spec_pattern.any? ++ if defined? Spec and spec_pattern.any? + desc "Run the spec suite" + Spec::Rake::SpecTask.new('spec') do |t| + t.spec_files = spec_pattern |