[gentoo-commits] proj/ruby-overlay:master commit in: dev-ruby/rake/files/, dev-ruby/rake/

["Manuel Rüger" <mrueg@gentoo.org>]

commit:     45404f38cd9671a015da8d67af7380a2451f480f
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 12 22:30:13 2014 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Sat Apr 12 22:30:13 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/ruby-overlay.git;a=commit;h=45404f38

[dev-ruby/rake] Version bump. Remove old.

Package-Manager: portage-2.2.10

---
 dev-ruby/rake/ChangeLog                            |  6 ++
 dev-ruby/rake/files/rake-10.1.0-ruby-1.8-fix.patch | 66 ----------------------
 .../{rake-10.1.0.ebuild => rake-10.2.2.ebuild}     | 13 ++---
 3 files changed, 11 insertions(+), 74 deletions(-)

diff --git a/dev-ruby/rake/ChangeLog b/dev-ruby/rake/ChangeLog
index 6f1fde0..e3ccf8f 100644
--- a/dev-ruby/rake/ChangeLog
+++ b/dev-ruby/rake/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*rake-10.2.2 (12 Apr 2014)
+
+  12 Apr 2014; Manuel Rüger <mrueg@gentoo.org> +rake-10.2.2.ebuild,
+  -files/rake-10.1.0-ruby-1.8-fix.patch, -rake-10.1.0.ebuild:
+  [dev-ruby/rake] Version bump. Remove old.
+
   01 Jan 2014; Hans de Graaff <graaff@gentoo.org> rake-10.1.0.ebuild:
   EAPI=5. Add ruby21. Drop session and flexmock dependencies. They are
   mentioned in the documentation but not actually used.

diff --git a/dev-ruby/rake/files/rake-10.1.0-ruby-1.8-fix.patch b/dev-ruby/rake/files/rake-10.1.0-ruby-1.8-fix.patch
deleted file mode 100644
index ee47902..0000000
--- a/dev-ruby/rake/files/rake-10.1.0-ruby-1.8-fix.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-commit 514da2cec2ef3ca821c444f6b7b24f51bdd6e5d4
-Author: Jim Weirich <jim.weirich@gmail.com>
-Date:   Wed Jul 10 08:40:04 2013 -0400
-
-    Cleanup for 1.8.7 syntax.
-
-diff --git a/test/test_rake_backtrace.rb b/test/test_rake_backtrace.rb
-index 8db3b5a..9a9c9e5 100644
---- a/test/test_rake_backtrace.rb
-+++ b/test/test_rake_backtrace.rb
-@@ -12,6 +12,8 @@ class TestBacktraceSuppression < Rake::TestCase
- 
-   def test_system_dir_suppressed
-     path = RbConfig::CONFIG['rubylibprefix']
-+    skip if path.nil?
-+
-     paths = [path + ":12"]
- 
-     actual = Rake::Backtrace.collapse(paths)
-@@ -21,6 +23,8 @@ class TestBacktraceSuppression < Rake::TestCase
- 
-   def test_near_system_dir_isnt_suppressed
-     path = RbConfig::CONFIG['rubylibprefix']
-+    skip if path.nil?
-+
-     paths = [" " + path + ":12"]
- 
-     actual = Rake::Backtrace.collapse(paths)
-diff --git a/test/test_rake_clean.rb b/test/test_rake_clean.rb
-index a6539fb..1dc7974 100644
---- a/test/test_rake_clean.rb
-+++ b/test/test_rake_clean.rb
-@@ -15,7 +15,7 @@ class TestRakeClean < Rake::TestCase
-     file_name = create_undeletable_file
- 
-     out, _ = capture_io do
--      Rake::Cleaner.cleanup(file_name, verbose: false)
-+      Rake::Cleaner.cleanup(file_name, :verbose => false)
-     end
-     assert_match(/failed to remove/i, out)
- 
-@@ -40,7 +40,7 @@ class TestRakeClean < Rake::TestCase
-     file_name = File.join(dir_name, "deleteme")
-     FileUtils.chmod(0777, dir_name)
-     FileUtils.chmod(0777, file_name)
--    Rake::Cleaner.cleanup(file_name, verbose: false)
--    Rake::Cleaner.cleanup(dir_name, verbose: false)
-+    Rake::Cleaner.cleanup(file_name, :verbose => false)
-+    Rake::Cleaner.cleanup(dir_name, :verbose => false)
-   end
- end
-diff --git a/test/test_rake_path_map.rb b/test/test_rake_path_map.rb
-index b76a949..038ba1f 100644
---- a/test/test_rake_path_map.rb
-+++ b/test/test_rake_path_map.rb
-@@ -156,8 +156,8 @@ class TestRakePathMap < Rake::TestCase
-       "src/org/onstepback/proj/A.java".pathmap("%{src,bin}d/%n.class"))
-     assert_equal(
-       "src_work/bin/org/onstepback/proj/A.class",
--      "src_work/src/org/onstepback/proj/A.java"
--        .pathmap('%{\bsrc\b,bin}X.class'))
-+      "src_work/src/org/onstepback/proj/A.java".
-+        pathmap('%{\bsrc\b,bin}X.class'))
-     assert_equal(
-       ".depends.bak",
-       ".depends".pathmap("%X.bak"))

diff --git a/dev-ruby/rake/rake-10.1.0.ebuild b/dev-ruby/rake/rake-10.2.2.ebuild
similarity index 79%
rename from dev-ruby/rake/rake-10.1.0.ebuild
rename to dev-ruby/rake/rake-10.2.2.ebuild
index 86b4dc4..cbd2492 100644
--- a/dev-ruby/rake/rake-10.1.0.ebuild
+++ b/dev-ruby/rake/rake-10.2.2.ebuild
@@ -3,7 +3,7 @@
 # $Header: /var/cvsroot/gentoo-x86/dev-ruby/rake/rake-0.9.6.ebuild,v 1.5 2013/09/05 15:46:18 jer Exp $
 
 EAPI=5
-USE_RUBY="ruby18 ruby19 ruby20 ruby21 jruby"
+USE_RUBY="ruby19 ruby20 ruby21 jruby"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="CHANGES README.rdoc TODO"
@@ -20,15 +20,12 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="doc"
 
-DEPEND="${DEPEND} app-arch/gzip"
-RDEPEND="${RDEPEND}"
-
-#This fix is already on upstream and will be fixed on next release
-#https://github.com/jimweirich/rake/commit/514da2cec2ef3ca821c444f6b7b24f51bdd6e5d4
-RUBY_PATCHES=( "${P}-ruby-1.8-fix.patch" )
+DEPEND+=" app-arch/gzip"
 
 ruby_add_bdepend "doc? ( dev-ruby/rdoc )
-	test? ( virtual/ruby-minitest )"
+	test? ( >=dev-ruby/hoe-3.7
+		virtual/ruby-minitest
+		)"
 
 all_ruby_prepare() {
 	# Decompress the file. The compressed version has errors, ignore them.