Bump and remove patch (merged upstream for release).

(Portage version: 2.2_rc62/cvs/Linux x86_64)

3 files changed, 10 insertions, 82 deletions

diff --git a/dev-ruby/amazon-ec2/ChangeLog b/dev-ruby/amazon-ec2/ChangeLog
index d004e31a955a..2511fe7ca86b 100644
--- a/dev-ruby/amazon-ec2/ChangeLog
+++ b/dev-ruby/amazon-ec2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/amazon-ec2
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/amazon-ec2/ChangeLog,v 1.1 2010/02/12 21:25:02 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/amazon-ec2/ChangeLog,v 1.2 2010/02/12 21:57:50 flameeyes Exp $
+
+*amazon-ec2-0.9.4 (12 Feb 2010)
+
+  12 Feb 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -amazon-ec2-0.9.3.ebuild, -files/amazon-ec2-0.9.3-fixes.patch,
+  +amazon-ec2-0.9.4.ebuild:
+  Bump and remove patch (merged upstream for release).
 
 *amazon-ec2-0.9.3 (12 Feb 2010)
 
diff --git a/dev-ruby/amazon-ec2/amazon-ec2-0.9.3.ebuild b/dev-ruby/amazon-ec2/amazon-ec2-0.9.4.ebuild
index 9282ec027351..be97c9348d0d 100644
--- a/dev-ruby/amazon-ec2/amazon-ec2-0.9.3.ebuild
+++ b/dev-ruby/amazon-ec2/amazon-ec2-0.9.4.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/amazon-ec2/amazon-ec2-0.9.3.ebuild,v 1.1 2010/02/12 21:25:02 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/amazon-ec2/amazon-ec2-0.9.4.ebuild,v 1.1 2010/02/12 21:57:50 flameeyes Exp $
 
 EAPI=2
 
@@ -20,7 +20,7 @@ RUBY_FAKEGEM_EXTRADOC="README.rdoc README_dev.rdoc ChangeLog"
 
 RUBY_FAKEGEM_BINWRAP="ec2sh"
 
-inherit ruby-fakegem eutils
+inherit ruby-fakegem
 
 DESCRIPTION="Library for accessing the Amazon Web Services EC2 and related"
 HOMEPAGE="http://github.com/grempe/amazon-ec2"
@@ -33,10 +33,6 @@ IUSE=""
 ruby_add_bdepend test "virtual/ruby-test-unit dev-ruby/test-spec dev-ruby/mocha"
 ruby_add_rdepend '>=dev-ruby/xml-simple-1.0.12'
 
-all_ruby_prepare() {
-	epatch "${FILESDIR}"/${P}-fixes.patch
-}
-
 each_ruby_prepare() {
 	case ${RUBY} in
 		*ruby19)
diff --git a/dev-ruby/amazon-ec2/files/amazon-ec2-0.9.3-fixes.patch b/dev-ruby/amazon-ec2/files/amazon-ec2-0.9.3-fixes.patch
deleted file mode 100644
index 95317befa212..000000000000
--- a/dev-ruby/amazon-ec2/files/amazon-ec2-0.9.3-fixes.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff --git a/Rakefile b/Rakefile
-index 2fe03f9..cc608cb 100644
---- a/Rakefile
-+++ b/Rakefile
-@@ -1,22 +1,25 @@
- require 'rubygems'
- require 'rake'
--require 'yard'
- 
--require 'jeweler'
--Jeweler::Tasks.new do |gem|
--  gem.name = "amazon-ec2"
--  gem.summary = %Q{Amazon EC2 Ruby Gem}
--  gem.description = %Q{A Ruby library for accessing the Amazon Web Services EC2, ELB, RDS, Cloudwatch, and Autoscaling API's.}
--  gem.email = "glenn@rempe.us"
--  gem.homepage = "http://github.com/grempe/amazon-ec2"
--  gem.authors = ["Glenn Rempe"]
--  gem.rdoc_options = ["--title", "amazon-ec2 documentation", "--line-numbers", "--main", "README.rdoc"]
--  gem.rubyforge_project = 'amazon-ec2'
--  gem.add_dependency('xml-simple', '>= 1.0.12')
--  gem.add_development_dependency('mocha', '>= 0.9.8')
--  gem.add_development_dependency('test-spec', '>= 0.10.0')
--  gem.add_development_dependency('rcov', '>= 0.9.6')
--  gem.add_development_dependency('perftools.rb', '>= 0.3.9')
-+begin
-+  require 'jeweler'
-+  Jeweler::Tasks.new do |gem|
-+    gem.name = "amazon-ec2"
-+    gem.summary = %Q{Amazon EC2 Ruby Gem}
-+    gem.description = %Q{A Ruby library for accessing the Amazon Web Services EC2, ELB, RDS, Cloudwatch, and Autoscaling APIs.}
-+    gem.email = "glenn@rempe.us"
-+    gem.homepage = "http://github.com/grempe/amazon-ec2"
-+    gem.authors = ["Glenn Rempe"]
-+    gem.rdoc_options = ["--title", "amazon-ec2 documentation", "--line-numbers", "--main", "README.rdoc"]
-+    gem.rubyforge_project = 'amazon-ec2'
-+    gem.add_dependency('xml-simple', '>= 1.0.12')
-+    gem.add_development_dependency('mocha', '>= 0.9.8')
-+    gem.add_development_dependency('test-spec', '>= 0.10.0')
-+    gem.add_development_dependency('rcov', '>= 0.9.6')
-+    gem.add_development_dependency('perftools.rb', '>= 0.3.9')
-+  end
-+rescue LoadError
-+  puts "Jeweler (or a dependency) not available. Install it with: [sudo] gem install jeweler"
- end
- 
- require 'rake/testtask'
-@@ -57,8 +60,13 @@ Rake::RDocTask.new do |rdoc|
-   rdoc.rdoc_files.include('lib/**/*.rb')
- end
- 
--YARD::Rake::YardocTask.new do |t|
--  #t.files   = ['lib/**/*.rb']
-+begin
-+  require 'yard'
-+  YARD::Rake::YardocTask.new do |t|
-+    #t.files   = ['lib/**/*.rb']
-+  end
-+rescue LoadError
-+  puts "YARD (or a dependency) not available. Install it with: [sudo] gem install yard"
- end
- 
- desc "Generate a perftools.rb profile"
-diff --git a/lib/AWS/EC2.rb b/lib/AWS/EC2.rb
-index f8626fa..40895a9 100644
---- a/lib/AWS/EC2.rb
-+++ b/lib/AWS/EC2.rb
-@@ -9,7 +9,7 @@ module AWS
-     if ENV['EC2_URL']
-       EC2_URL = ENV['EC2_URL']
-       VALID_HOSTS = ['https://ec2.amazonaws.com', 'https://us-east-1.ec2.amazonaws.com', 'https://us-west-1.ec2.amazonaws.com', 'https://eu-west-1.ec2.amazonaws.com']
--      raise ArgumentError, "Invalid EC2_URL environment variable : #{EC2_URL}" unless VALID_HOSTS.include?(EC2_URL)
-+      raise ArgumentError, "Invalid EC2_URL environment variable : #{EC2_URL}" unless VALID_HOSTS.include?(EC2_URL.chomp('/'))
-       DEFAULT_HOST = URI.parse(EC2_URL).host
-     else
-       # Default US API endpoint