diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2009-12-25 14:39:03 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2009-12-25 14:39:03 +0000 |
| commit | accb9cb8a9a37a86659bc526ca7b8cbbca42b352 (patch) | |
| tree | b016aea4d5e09df944ccda4dffb6e38a29d57bf7 /dev-ruby/echoe | |
| parent | Add support for epatch_user. (diff) | |
| download | gentoo-2-accb9cb8a9a37a86659bc526ca7b8cbbca42b352.tar.gz gentoo-2-accb9cb8a9a37a86659bc526ca7b8cbbca42b352.tar.bz2 gentoo-2-accb9cb8a9a37a86659bc526ca7b8cbbca42b352.zip | |
Patch echoe not to unconditionally require gemcutter, closes bug #298048 thanks to Harris Landgarten.
(Portage version: 2.2_rc61/cvs/Linux x86_64)
Diffstat (limited to 'dev-ruby/echoe')
| -rw-r--r-- | dev-ruby/echoe/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-ruby/echoe/echoe-4.0-r1.ebuild (renamed from dev-ruby/echoe/echoe-4.0.ebuild) | 9 | ||||
| -rw-r--r-- | dev-ruby/echoe/files/echoe-4.0-optional-gemcutter.patch | 17 |
3 files changed, 30 insertions, 5 deletions
diff --git a/dev-ruby/echoe/ChangeLog b/dev-ruby/echoe/ChangeLog index 02f140bb27b5..b3bacbdee8e1 100644 --- a/dev-ruby/echoe/ChangeLog +++ b/dev-ruby/echoe/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-ruby/echoe # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/echoe/ChangeLog,v 1.1 2009/12/21 22:17:41 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/echoe/ChangeLog,v 1.2 2009/12/25 14:39:02 flameeyes Exp $ + +*echoe-4.0-r1 (25 Dec 2009) + + 25 Dec 2009; Diego E. Pettenò <flameeyes@gentoo.org> -echoe-4.0.ebuild, + +echoe-4.0-r1.ebuild, +files/echoe-4.0-optional-gemcutter.patch: + Patch echoe not to unconditionally require gemcutter, closes bug #298048 + thanks to Harris Landgarten. *echoe-4.0 (21 Dec 2009) diff --git a/dev-ruby/echoe/echoe-4.0.ebuild b/dev-ruby/echoe/echoe-4.0-r1.ebuild index 61719a862d1e..8843ce9a3e26 100644 --- a/dev-ruby/echoe/echoe-4.0.ebuild +++ b/dev-ruby/echoe/echoe-4.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/echoe/echoe-4.0.ebuild,v 1.1 2009/12/21 22:17:41 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/echoe/echoe-4.0-r1.ebuild,v 1.1 2009/12/25 14:39:02 flameeyes Exp $ EAPI=2 @@ -24,7 +24,8 @@ SLOT="0" KEYWORDS="~amd64" IUSE="" -# The gem declares gemcutter a runtime dependency as well, but it -# seems like it's never referenced directly. -# So at the end we don't seem to need that. ruby_add_rdepend "dev-ruby/highline" + +all_ruby_prepare() { + epatch "${FILESDIR}"/${P}-optional-gemcutter.patch +} diff --git a/dev-ruby/echoe/files/echoe-4.0-optional-gemcutter.patch b/dev-ruby/echoe/files/echoe-4.0-optional-gemcutter.patch new file mode 100644 index 000000000000..1235b604b382 --- /dev/null +++ b/dev-ruby/echoe/files/echoe-4.0-optional-gemcutter.patch @@ -0,0 +1,17 @@ +Index: echoe-4.0/lib/echoe.rb +=================================================================== +--- echoe-4.0.orig/lib/echoe.rb ++++ echoe-4.0/lib/echoe.rb +@@ -21,7 +21,11 @@ require "#{$HERE}/echoe/extensions" + require 'rubygems' + require 'rubygems/specification' + require "#{$HERE}/echoe/rubygems" +-require 'rubygems_plugin' ++begin ++ gem 'gemcutter' ++ require 'rubygems_plugin' ++rescue Gem::LoadError ++end + + require 'highline/import' + |