Version bump, fix test dependencies.

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

4 files changed, 22 insertions, 45 deletions

diff --git a/dev-ruby/faraday/ChangeLog b/dev-ruby/faraday/ChangeLog
index 387a849a8df5..dc403295ccf0 100644
--- a/dev-ruby/faraday/ChangeLog
+++ b/dev-ruby/faraday/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/faraday
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/faraday/ChangeLog,v 1.3 2010/04/30 20:23:21 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/faraday/ChangeLog,v 1.4 2010/05/13 12:10:29 flameeyes Exp $
+
+*faraday-0.4.5 (13 May 2010)
+
+  13 May 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -faraday-0.4.3.ebuild, -files/faraday-0.4.3-gentoo.patch,
+  +faraday-0.4.5.ebuild, +files/faraday-0.4.5-gentoo.patch:
+  Version bump, fix test dependencies.
 
   30 Apr 2010; Diego E. Pettenò <flameeyes@gentoo.org>
   faraday-0.4.3.ebuild:
diff --git a/dev-ruby/faraday/faraday-0.4.3.ebuild b/dev-ruby/faraday/faraday-0.4.5.ebuild
index 69f15fcaae72..58570e1eb8e8 100644
--- a/dev-ruby/faraday/faraday-0.4.3.ebuild
+++ b/dev-ruby/faraday/faraday-0.4.5.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/faraday/faraday-0.4.3.ebuild,v 1.3 2010/04/30 20:23:21 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/faraday/faraday-0.4.5.ebuild,v 1.1 2010/05/13 12:10:29 flameeyes Exp $
 
 EAPI="2"
 
@@ -22,7 +22,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-ruby_add_rdepend "dev-ruby/rack dev-ruby/addressable"
+ruby_add_rdepend ">=dev-ruby/rack-1.0.1 >=dev-ruby/addressable-2.1.1"
 ruby_add_bdepend test "virtual/ruby-test-unit"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/faraday/files/faraday-0.4.3-gentoo.patch b/dev-ruby/faraday/files/faraday-0.4.3-gentoo.patch
deleted file mode 100644
index 22e7ae613fbb..000000000000
--- a/dev-ruby/faraday/files/faraday-0.4.3-gentoo.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/Rakefile b/Rakefile
-index 61daa8b..1138f0f 100644
---- a/Rakefile
-+++ b/Rakefile
-@@ -38,8 +40,6 @@ rescue LoadError
-   end
- end
- 
--task :test => :check_dependencies
--
- task :default => :test
- 
- require 'rake/rdoctask'
-diff --git a/lib/faraday/connection.rb b/lib/faraday/connection.rb
-index dbda09a..f441d42 100644
---- a/lib/faraday/connection.rb
-+++ b/lib/faraday/connection.rb
-@@ -173,12 +173,12 @@ module Faraday
-     #
-     def build_url(url, params = nil)
-       uri          = URI.parse(url.to_s)
--      uri.host   ||= @host
--      uri.port   ||= @port
--      uri.scheme ||= @scheme
-       if @path_prefix && uri.path !~ /^\//
-         uri.path = "#{@path_prefix.size > 1 ? @path_prefix : nil}/#{uri.path}"
-       end
-+      uri.host   ||= @host
-+      uri.port   ||= @port
-+      uri.scheme ||= @scheme
-       replace_query(uri, params)
-       uri
-     end
---- faraday-0.4.3.orig/test/helper.rb
-+++ faraday-0.4.3/test/helper.rb
-@@ -1,6 +1,4 @@
- require 'rubygems'
--gem 'rack',        '~> 1.1.0'
--gem 'addressable', '2.1.1'
- 
- require 'test/unit'
- if ENV['LEFTRIGHT']
diff --git a/dev-ruby/faraday/files/faraday-0.4.5-gentoo.patch b/dev-ruby/faraday/files/faraday-0.4.5-gentoo.patch
new file mode 100644
index 000000000000..4aadf55444f6
--- /dev/null
+++ b/dev-ruby/faraday/files/faraday-0.4.5-gentoo.patch
@@ -0,0 +1,12 @@
+Index: faraday-0.4.5/test/helper.rb
+===================================================================
+--- faraday-0.4.5.orig/test/helper.rb
++++ faraday-0.4.5/test/helper.rb
+@@ -1,6 +1,6 @@
+ require 'rubygems'
+ gem 'rack',        '>= 1.0.1'
+-gem 'addressable', '2.1.1'
++gem 'addressable', '>= 2.1.1'
+ 
+ require 'test/unit'
+ if ENV['LEFTRIGHT']