Version bump, drop patch as the new version already contain the fix.

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

3 files changed, 9 insertions, 53 deletions

diff --git a/dev-ruby/samuel/ChangeLog b/dev-ruby/samuel/ChangeLog
index a85fab52e0bd..90328d9760c4 100644
--- a/dev-ruby/samuel/ChangeLog
+++ b/dev-ruby/samuel/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/samuel
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/samuel/ChangeLog,v 1.1 2010/01/12 13:58:07 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/samuel/ChangeLog,v 1.2 2010/01/13 09:18:25 flameeyes Exp $
+
+*samuel-0.3.2 (13 Jan 2010)
+
+  13 Jan 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -samuel-0.3.1.ebuild, -files/samuel-0.3.1-ruby19.patch,
+  +samuel-0.3.2.ebuild:
+  Version bump, drop patch as the new version already contain the fix.
 
 *samuel-0.3.1 (12 Jan 2010)
 
diff --git a/dev-ruby/samuel/files/samuel-0.3.1-ruby19.patch b/dev-ruby/samuel/files/samuel-0.3.1-ruby19.patch
deleted file mode 100644
index f9eb90bcd6d4..000000000000
--- a/dev-ruby/samuel/files/samuel-0.3.1-ruby19.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Index: samuel-0.3.1/test/loader_test.rb
-===================================================================
---- samuel-0.3.1.orig/test/loader_test.rb
-+++ samuel-0.3.1/test/loader_test.rb
-@@ -26,8 +26,8 @@ class LoaderTest < Test::Unit::TestCase
-       end
- 
-       should "not load HTTPClient" do
--        output = capture_output "puts defined?(HTTPClient)"
--        assert_equal "nil", output.strip
-+        output = capture_output "puts 'good' unless defined?(HTTPClient)"
-+        assert_equal "good", output.strip
-       end
-     end
- 
-@@ -40,8 +40,8 @@ class LoaderTest < Test::Unit::TestCase
-       end
- 
-       should "not load HTTPClient" do
--        output = capture_output "puts defined?(HTTPClient)"
--        assert_match "nil", output.strip
-+        output = capture_output "puts 'good' unless defined?(HTTPClient)"
-+        assert_match "good", output.strip
-       end
-     end
- 
-@@ -54,10 +54,10 @@ class LoaderTest < Test::Unit::TestCase
-       end
- 
-       should "not load Net::HTTP" do
--        output = capture_output "puts defined?(Net::HTTP)"
--        assert_match "nil", output.strip
-+        output = capture_output "puts 'good' unless defined?(Net::HTTP)"
-+        assert_match "good", output.strip
-       end
-     end
-   end
- 
--end
-\ No newline at end of file
-+end
diff --git a/dev-ruby/samuel/samuel-0.3.1.ebuild b/dev-ruby/samuel/samuel-0.3.2.ebuild
index e6b23a7477b0..68ed11c7a928 100644
--- a/dev-ruby/samuel/samuel-0.3.1.ebuild
+++ b/dev-ruby/samuel/samuel-0.3.2.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/samuel/samuel-0.3.1.ebuild,v 1.1 2010/01/12 13:58:07 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/samuel/samuel-0.3.2.ebuild,v 1.1 2010/01/13 09:18:25 flameeyes Exp $
 
 EAPI=2
 
@@ -19,14 +19,4 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-all_ruby_prepare() {
-	# check_dependencies only is available with jeweler
-	# proper fix sent upstream after release 0.3.1
-	sed -i -e '/=> :check_dependencies/s:^:#:' \
-		Rakefile || die "fix rakefile failed"
-
-	# sent upstream after release 0.3.1
-	epatch "${FILESDIR}"/${P}-ruby19.patch
-}
-
 ruby_add_bdepend test "dev-ruby/shoulda dev-ruby/fakeweb"