Avoid errors if RSpec is not installed.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 43 insertions, 15 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/Manifest b/dev-ruby/echoe/Manifest
index 094a063e5edb..2ad86b2983a5 100644
--- a/dev-ruby/echoe/Manifest
+++ b/dev-ruby/echoe/Manifest
@@ -1,15 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX echoe-4.0-optional-gemcutter.patch 442 RMD160 b7d2d9c3288fc4afe63b378ca635e6230a7bdedb SHA1 f9fdb898dcf4e3119df0f0f6266c718d21a26a6d SHA256 b4a1f6c370dc1abea461b32a3b1d3e03f5cdc5334b13b96737a5b96c28469393
+AUX echoe-4.3-gentoo.patch 676 RMD160 b0b9b23239fb2982306033b7795c20cb5c40f19c SHA1 5b93c05c02f41d0a34c62a08124b255e75bff367 SHA256 4ac85adb9e350833e88a236c493499417005ec2b4ec465e6e5689097989ace7f
 DIST echoe-4.3.gem 28160 RMD160 96c3cc86a9ebf8329601d7285d40d1ab20023199 SHA1 0717fc3a0fd908206624b5def012dc641f7bba4e SHA256 2901cfe4b3789d9c96aa815a8359c79443e9a90e454e3a50839a16a7af562863
-EBUILD echoe-4.3.ebuild 836 RMD160 d53325fc72a8f1919a215d1a1efbe0dca1c90769 SHA1 71b884441bfb5dbb612fa6f49fa9e7c34df216ca SHA256 9ab8424bad8c115c59f34333b2a623fa8fe2f3c1ddb7d0e7a1677becafd354e5
-MISC ChangeLog 2144 RMD160 9d8bd76d27adcbdf449229d749c55b18b4510ab4 SHA1 9c97443193948914027139359035a78d0a849664 SHA256 c934029a92fd9801ebd0f63f9e429663e64418afc1b16e08569970533869d0ed
+EBUILD echoe-4.3.ebuild 822 RMD160 215dd1afa060d4ef867d8f49650b78acfff337fb SHA1 a8f7c3f265f00d800df865c20717ba2d62bb5503 SHA256 d42d032ef3596833a32310622e2fa56aa28f77119036ce835c9b5b6d1b5bce4d
+MISC ChangeLog 2342 RMD160 5758b89967c10603cf4bf31972ca8fb8d0bedbd7 SHA1 4995cc5da3fe20c693aa1dc3d23728a30de03909 SHA256 425f85310800f3b8666278f3b4f07c4c46c06e6b466c86b6487e74fe82d5aba1
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkvSoGgACgkQeM7EJeUH71MzSwCeKwIhTodvNXJPWrGMg+gCrZ8H
-YGYAn0tdcE5P/PrLUT/Iq43WKWUyy55Y
-=FruF
+iEYEARECAAYFAkvcXV4ACgkQAiZjviIA2XgE3ACdG12HL1K86dwskzlXtGtZzzB6
+m6UAmgI6ob5I1IROVOeNLt5wZXMxuK1w
+=TfiM
 -----END PGP SIGNATURE-----
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
diff --git a/dev-ruby/redcloth/Manifest b/dev-ruby/redcloth/Manifest
index 9cb9ae66f6e1..158ba9a295c2 100644
--- a/dev-ruby/redcloth/Manifest
+++ b/dev-ruby/redcloth/Manifest
@@ -1,8 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX redcloth-4.2.3-gentoo.patch 548 RMD160 8e9aa63178d0e15b1e42bab01fae5b188e0549e8 SHA1 98607f4ced2b5da2bba0de050cac7275e4d4f8fb SHA256 41c88d2889457213f5f8141362188c400134798a56e04411cc0d0281b6a3b22a
 DIST RedCloth-4.1.9.gem 282624 RMD160 7ab36b02e02dde716f953a9a058beadf2467e3c7 SHA1 0d47a2b72b160bc7c94a0cab4d8e96702aee3e61 SHA256 c941749edf68eec58143eab251573f3a287921864ec2d3e1dd9820a029c5af4f
-DIST RedCloth-4.2.2.gem 224256 RMD160 c291b7e3e6402af989c78121ac5aaac22465a794 SHA1 d1de295099a0e839abff7ecc6e33f96c0a023bc4 SHA256 eef5c4351dbc4b1fa62f0521abbe4c6f4fd551ad14c23955458195efbb7ee743
 DIST RedCloth-git-4.2.2.tgz 97593 RMD160 bcedbfd33269ba67e40577c665f7363f6d9d5bb5 SHA1 8e32d151938a533e106377e2674a50d8211ff64a SHA256 fb6df95a60017edf802f713cbeb0269ce9e8431fc18c0d1a36bcc918eeeed04c
+DIST RedCloth-git-4.2.3.tgz 106441 RMD160 705b5408fd5d0460ce633cb576424024d1c8b3cb SHA1 e1e80979cc055891b498207fcc46fd1f3645eaad SHA256 389818fa439d7cde9ad121bc344e6acde0b010ea856f769d68d007db57ead035
 EBUILD redcloth-4.1.9.ebuild 549 RMD160 2e56d4b8ba8cc5fcc11a6fd38e11859b19997178 SHA1 b431f8f9924c584cdc2277ab20acb1fa82c2a898 SHA256 5bc7624bb2c56914cdd92078bd12d01c01d0b227828264580c15794a8d99a328
 EBUILD redcloth-4.2.2-r3.ebuild 1678 RMD160 639161ef3af879452c3a7329d707f3ca25f5ba7b SHA1 ee567c259370300f52389efc978b17d725091676 SHA256 8a7c2f24694ce799936be3ce8e180872ddf0c6d11a03c0d2d48e46a139010587
-EBUILD redcloth-4.2.2.ebuild 552 RMD160 cb854d19c9f076fc29e9b91d732b9ed53d20332e SHA1 604c8d986a57d666ff47525ebef38d5fef3d2561 SHA256 767d85bd157193e7475d4eb0bacc7b8795f16f8e70bfed07c10a4d442cd5b311
-MISC ChangeLog 5608 RMD160 34267c1f5ba1d36028da11097e51078a147c07c2 SHA1 a422f1f336e639476a31b384db3187f385d9dae3 SHA256 7aacc1d2bc3b9dd27f7f43af4865467dbfa6e8680e07223bde10a5b1d243084d
+EBUILD redcloth-4.2.3.ebuild 1615 RMD160 8e8a84caea20de4160b6c700bf601bc64e59693f SHA1 cc114f2351e4a833a97f008912e0b37810044791 SHA256 3e430c92d5de989c398a8514976bd68a0ddcc38d0810fdf370bbef9cecf6fd69
+MISC ChangeLog 5853 RMD160 a9cfc74212dd3aea498bc006415ec29ce39e4b07 SHA1 3114c793eb63f2627c2b44677aec6a8705215cc1 SHA256 c17af7e0859ec71e72b90ec0d236e4cfa178fa14ce4ae8d6a141acf67c790786
 MISC metadata.xml 158 RMD160 097f8145a9994f98be4971b43b23b9e5e8bccb66 SHA1 7ac646714b1ab83fda98f3ccdd8b48a31c148b27 SHA256 70b396ab3c7a63a81cb895b7728bd9eccdc9770afdb9919f2c54694b685f7032
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkvcXXgACgkQAiZjviIA2Xj/vACg7fPSOW5iH21XdMrXE5n7qlkW
+Bw4An1mGpdC3djgsAUpdgiY5CZqZS3Qo
+=cndG
+-----END PGP SIGNATURE-----