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 | 586dc1ac02612dbad47452d47bf4072d64056333 (patch) | |
tree | 8127603742c2b8cae823833730b48471353b8e55 /dev-ruby/echoe | |
parent | Add support for epatch_user. (diff) | |
download | historical-586dc1ac02612dbad47452d47bf4072d64056333.tar.gz historical-586dc1ac02612dbad47452d47bf4072d64056333.tar.bz2 historical-586dc1ac02612dbad47452d47bf4072d64056333.zip |
Patch echoe not to unconditionally require gemcutter, closes bug #298048 thanks to Harris Landgarten.
Package-Manager: portage-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/Manifest | 13 | ||||
-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 |
4 files changed, 37 insertions, 11 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/Manifest b/dev-ruby/echoe/Manifest index b82326b0c3e3..9d6aba1b3a5d 100644 --- a/dev-ruby/echoe/Manifest +++ b/dev-ruby/echoe/Manifest @@ -1,14 +1,15 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX echoe-4.0-optional-gemcutter.patch 442 RMD160 b7d2d9c3288fc4afe63b378ca635e6230a7bdedb SHA1 f9fdb898dcf4e3119df0f0f6266c718d21a26a6d SHA256 b4a1f6c370dc1abea461b32a3b1d3e03f5cdc5334b13b96737a5b96c28469393 DIST echoe-4.0.gem 27648 RMD160 a7f5e48a5232c2fcec51fae71a8603e6c98978af SHA1 c31617dc6b07b7dbc13e0519044ef0e5473c0141 SHA256 d3f186116a2849ddb6f0c21de6a5e8bb2cea5a8fa061e9949751a51435900bc0 -EBUILD echoe-4.0.ebuild 838 RMD160 95c07a3907bf8de3b9511924fa53e5002ec709f4 SHA1 f0143018fa612d72ec94b265bccf46fc4bde3b32 SHA256 e5162693b22a5ba484c71030337adab21458a0b27448a53e6b163fa8f686061f -MISC ChangeLog 373 RMD160 c194bf581f43bb34a0a2c80f5e147bde437a4496 SHA1 fdf757bff553be97d0dfcf8c8eeb47051c1d4af6 SHA256 a4c99c275744ccfe90f217e5557884f2d7876a59c99d86c490b79adb95029bbb +EBUILD echoe-4.0-r1.ebuild 762 RMD160 73ed1eaac232c8da2e7a49bd080bc9f6a3881760 SHA1 22aebf5150b6288496e1c5f16bf4bce6f85d755d SHA256 603acad6e907f5c0f608de6699bdc81d5880ca1e9dca4266cacc16e4116b13f7 +MISC ChangeLog 651 RMD160 9af298bd773292dd26dcd8c17ed75a9d89ef9189 SHA1 f2738931251ec3a5a71109dbfa3494ce9462c6a9 SHA256 773a066a1bb5c5a85bc6a62a69b458440681213d3ad48ad5b2d62f065e5237c3 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.13 (GNU/Linux) +Version: GnuPG v2.0.14 (GNU/Linux) -iEYEARECAAYFAksv8/sACgkQAiZjviIA2XhFlwCgp5cMUPw7kfgjWDX50in2hANc -zH4AoNF0CG0pRoQ76Ri6X3tbNXgmAAlG -=Qobr +iEYEARECAAYFAks0zoQACgkQAiZjviIA2Xg3XgCfSYW8hVfizShAqd2sZquf2pDj +Ik8AoKOAUjExSYXf2St0waUtdV53Uqyz +=Kchh -----END PGP SIGNATURE----- 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' + |