Version bump, the patches merged.

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

4 files changed, 14 insertions, 42 deletions

diff --git a/dev-ruby/echoe/ChangeLog b/dev-ruby/echoe/ChangeLog
index 65033b87d59e..282c2ba61296 100644
--- a/dev-ruby/echoe/ChangeLog
+++ b/dev-ruby/echoe/ChangeLog
@@ -1,6 +1,12 @@
 # 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.15 2010/05/01 16:58:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/echoe/ChangeLog,v 1.16 2010/05/01 20:05:23 flameeyes Exp $
+
+*echoe-4.3.1 (01 May 2010)
+
+  01 May 2010; Diego E. Pettenò <flameeyes@gentoo.org> -echoe-4.3.ebuild,
+  +echoe-4.3.1.ebuild, -files/echoe-4.3-gentoo.patch:
+  Version bump, the patches merged.
 
   01 May 2010; Diego E. Pettenò <flameeyes@gentoo.org>
   -files/echoe-4.0-optional-gemcutter.patch, echoe-4.3.ebuild,
diff --git a/dev-ruby/echoe/Manifest b/dev-ruby/echoe/Manifest
index 2ad86b2983a5..afb13e875ce7 100644
--- a/dev-ruby/echoe/Manifest
+++ b/dev-ruby/echoe/Manifest
@@ -1,15 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-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 822 RMD160 215dd1afa060d4ef867d8f49650b78acfff337fb SHA1 a8f7c3f265f00d800df865c20717ba2d62bb5503 SHA256 d42d032ef3596833a32310622e2fa56aa28f77119036ce835c9b5b6d1b5bce4d
-MISC ChangeLog 2342 RMD160 5758b89967c10603cf4bf31972ca8fb8d0bedbd7 SHA1 4995cc5da3fe20c693aa1dc3d23728a30de03909 SHA256 425f85310800f3b8666278f3b4f07c4c46c06e6b466c86b6487e74fe82d5aba1
+DIST echoe-4.3.1.gem 28160 RMD160 d2be1fdebf97315b7571125eda886dd5ee138a06 SHA1 a47173a4827aef484396c8664cd7a3a9e37e6556 SHA256 5a4a83fb780a53c7acc3a89cfa52234d8d7d47eb13eaf9b5bd4f7ad84bb6fcea
+EBUILD echoe-4.3.1.ebuild 760 RMD160 05afbdbdd888aa693719be0203472549af7ba6c7 SHA1 e0080df9d70851c046a46343f7c0aa0a88ec1203 SHA256 b257d7e9346ffe38e01d17f2526234b8b280794829413c4feb9c3adfd0fd09e2
+MISC ChangeLog 2536 RMD160 59c8558b9233d560ab8422109658432962bd8f9e SHA1 103a9353bf0574d672551eef9d9c9e8ffa3991e3 SHA256 29d1cf8e17ed7d3c7a604aaf15b582eff06dfba1bf7a21ab89967978be9d40dc
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkvcXV4ACgkQAiZjviIA2XgE3ACdG12HL1K86dwskzlXtGtZzzB6
-m6UAmgI6ob5I1IROVOeNLt5wZXMxuK1w
-=TfiM
+iEYEARECAAYFAkvciUMACgkQAiZjviIA2XgCzgCgxgXOWK+dVEfHQ6faqyL+9Eu3
+ST4AnAxR7zNG5H30drmNWGbCxLCHtFvY
+=J9tj
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/echoe/echoe-4.3.ebuild b/dev-ruby/echoe/echoe-4.3.1.ebuild
index 221f539d04f3..f877a09adba0 100644
--- a/dev-ruby/echoe/echoe-4.3.ebuild
+++ b/dev-ruby/echoe/echoe-4.3.1.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.2 2010/05/01 16:58:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/echoe/echoe-4.3.1.ebuild,v 1.1 2010/05/01 20:05:23 flameeyes Exp $
 
 EAPI=2
 
@@ -25,7 +25,3 @@ KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/highline dev-ruby/rubyforge"
-
-all_ruby_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-}
diff --git a/dev-ruby/echoe/files/echoe-4.3-gentoo.patch b/dev-ruby/echoe/files/echoe-4.3-gentoo.patch
deleted file mode 100644
index 0bfd0c0c401d..000000000000
--- a/dev-ruby/echoe/files/echoe-4.3-gentoo.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-unchanged:
---- 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'
- 
-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