10 files changed, 13 insertions, 227 deletions
diff --git a/dev-ruby/hoe/ChangeLog b/dev-ruby/hoe/ChangeLog
index eb67ec4ba80b..49886fceeae5 100644
--- a/dev-ruby/hoe/ChangeLog
+++ b/dev-ruby/hoe/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-ruby/hoe
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hoe/ChangeLog,v 1.164 2014/10/04 15:37:03 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hoe/ChangeLog,v 1.165 2014/10/29 18:48:28 mrueg Exp $
+
+  29 Oct 2014; Manuel Rüger <mrueg@gentoo.org> -files/hoe-2.10.0-test-fix.patch,
+  -files/hoe-2.5.0-tests.patch,
+  -files/hoe-2.6.0-rubyforge-without-account.patch,
+  -files/hoe-2.6.1-test-file-ordering.patch,
+  -files/hoe-2.8.0-test-file-ordering.patch, -hoe-3.11.0.ebuild,
+  -hoe-3.12.0.ebuild, hoe-2.13.0-r1.ebuild, hoe-3.13.0.ebuild:
+  Cleanup old. Drop jruby target.
 
 *hoe-3.13.0 (04 Oct 2014)
 
diff --git a/dev-ruby/hoe/files/hoe-2.10.0-test-fix.patch b/dev-ruby/hoe/files/hoe-2.10.0-test-fix.patch
deleted file mode 100644
index 62789de38eb9..000000000000
--- a/dev-ruby/hoe/files/hoe-2.10.0-test-fix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-http://rubyforge.org/tracker/?func=detail&atid=5923&aid=29320&group_id=1513
-
-diff --git a/test/test_hoe_test.rb b/test/test_hoe_test.rb
-index 8a9e613..01dc0af 100644
---- a/test/test_hoe_test.rb
-+++ b/test/test_hoe_test.rb
-@@ -13,15 +13,13 @@ class TestHoeTest < MiniTest::Unit::TestCase
-       initialize_test
- 
-       def test_globs
--        ['test/**/test_*.rb']
-+        ['test/test_hoe_test.rb']
-       end
-     end
-   end
- 
-   def test_make_test_cmd_with_different_testlibs
-     expected = ['-w -Ilib:bin:test:. -e \'require "rubygems"; %s',
--                'require "test/test_hoe.rb"; ',
--                'require "test/test_hoe_gemcutter.rb"; ',
-                 'require "test/test_hoe_test.rb"',
-                 "' -- ",
-                ].join
diff --git a/dev-ruby/hoe/files/hoe-2.5.0-tests.patch b/dev-ruby/hoe/files/hoe-2.5.0-tests.patch
deleted file mode 100644
index f13fdc05c874..000000000000
--- a/dev-ruby/hoe/files/hoe-2.5.0-tests.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Index: hoe-2.5.0/test/test_hoe_gemcutter.rb
-===================================================================
---- hoe-2.5.0.orig/test/test_hoe_gemcutter.rb
-+++ hoe-2.5.0/test/test_hoe_gemcutter.rb
-@@ -1,3 +1,5 @@
-+require "hoe"
-+begin
- require "hoe/gemcutter" unless defined? Hoe::Gemcutter
- 
- class TestHoeGemcutter < MiniTest::Unit::TestCase
-@@ -11,3 +13,5 @@ class TestHoeGemcutter < MiniTest::Unit:
- 
-   # TODO add tests for push once using Gem::Commands::Push (waiting on rubygems release)
- end
-+rescue LoadError
-+end
-Index: hoe-2.5.0/test/test_hoe.rb
-===================================================================
---- hoe-2.5.0.orig/test/test_hoe.rb
-+++ hoe-2.5.0/test/test_hoe.rb
-@@ -49,27 +49,36 @@ class TestHoe < MiniTest::Unit::TestCase
-     assert_equal 'blah', spec.rubyforge_project
-     assert_equal Gem::RubyGemsVersion, spec.rubygems_version
-     assert_match(/^Hoe.*Rakefiles$/, spec.summary)
--    assert_equal files.grep(/^test/), spec.test_files
-+    assert_equal files.grep(/^test/).sort, spec.test_files.sort
- 
-     deps = spec.dependencies.sort_by { |dep| dep.name }
- 
--    assert_equal %w(gemcutter hoe rubyforge), deps.map { |dep| dep.name }
-+    expected_deps = %w(hoe)
-+    expected_deps << "rubyforge" if Gem.loaded_specs.has_key? 'rubyforge'
-+    expected_deps << "gemcutter" if Gem.loaded_specs.has_key? 'gemcutter'
-+    expected_deps.sort!
- 
-+    assert_equal expected_deps, deps.map { |dep| dep.name }
-+
-+    if Gem.loaded_specs.has_key? 'gemcutter'
-     dep = deps.shift
-     assert_equal 'gemcutter', dep.name
-     assert_equal :development, dep.type
-     version = Gem.loaded_specs['gemcutter'].version
-     assert_equal ">= #{version}", dep.version_requirements.to_s
-+    end
- 
-     dep = deps.shift
-     assert_equal 'hoe', dep.name
-     assert_equal :development, dep.type
-     assert_equal ">= #{Hoe::VERSION}", dep.version_requirements.to_s
- 
-+    if Gem.loaded_specs.has_key? 'rubyforge'
-     dep = deps.shift
-     assert_equal 'rubyforge', dep.name
-     assert_equal :development, dep.type
-     assert_equal ">= #{::RubyForge::VERSION}", dep.version_requirements.to_s
-+    end
-   end
- 
-   def test_plugins
diff --git a/dev-ruby/hoe/files/hoe-2.6.0-rubyforge-without-account.patch b/dev-ruby/hoe/files/hoe-2.6.0-rubyforge-without-account.patch
deleted file mode 100644
index 683d44b58df7..000000000000
--- a/dev-ruby/hoe/files/hoe-2.6.0-rubyforge-without-account.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- hoe-2.6.0/lib/hoe/rubyforge.rb.account	2010-04-28 15:34:32.000000000 +0900
-+++ hoe-2.6.0/lib/hoe/rubyforge.rb	2010-04-28 16:11:18.000000000 +0900
-@@ -40,12 +40,20 @@
-     end
- 
-     if Hoe.plugins.include? :publish then
-+     begin
-       path   = File.expand_path("~/.rubyforge/user-config.yml")
-       config = YAML.load(File.read(path))
-       base   = "/var/www/gforge-projects"
-       dir    = "#{base}/#{rubyforge_name}/#{remote_rdoc_dir}"
- 
-       rdoc_locations << "#{config["username"]}@rubyforge.org:#{dir}"
-+
-+     rescue Errno::ENOENT => err
-+      hoe_ver = Hoe::VERSION
-+      msg = err.message
-+      # puts "Hoe #{hoe_ver}: warning: #{msg}"
-+     end
-+
-     end
-   end
- end
diff --git a/dev-ruby/hoe/files/hoe-2.6.1-test-file-ordering.patch b/dev-ruby/hoe/files/hoe-2.6.1-test-file-ordering.patch
deleted file mode 100644
index 130715062d36..000000000000
--- a/dev-ruby/hoe/files/hoe-2.6.1-test-file-ordering.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- test/test_hoe_gemcutter.rb.orig	2010-08-28 09:35:26.129730713 +0200
-+++ test/test_hoe_gemcutter.rb	2010-08-28 09:35:53.673730929 +0200
-@@ -1,3 +1,4 @@
-+require "hoe"
- require "hoe/gemcutter" unless defined? Hoe::Gemcutter
- 
- class TestHoeGemcutter < MiniTest::Unit::TestCase
---- test/test_hoe.rb.orig	2010-08-28 09:35:34.929980884 +0200
-+++ test/test_hoe.rb	2010-08-28 09:37:21.978230874 +0200
-@@ -49,7 +49,7 @@
-     assert_equal 'blah', spec.rubyforge_project
-     assert_equal Gem::RubyGemsVersion, spec.rubygems_version
-     assert_match(/^Hoe.*Rakefiles$/, spec.summary)
--    assert_equal files.grep(/^test/), spec.test_files
-+    assert_equal files.grep(/^test/), spec.test_files.sort
- 
-     deps = spec.dependencies.sort_by { |dep| dep.name }
- 
diff --git a/dev-ruby/hoe/files/hoe-2.8.0-test-file-ordering.patch b/dev-ruby/hoe/files/hoe-2.8.0-test-file-ordering.patch
deleted file mode 100644
index 546ebf7b15bf..000000000000
--- a/dev-ruby/hoe/files/hoe-2.8.0-test-file-ordering.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- test/test_hoe.rb.orig	2010-08-28 09:35:34.929980884 +0200
-+++ test/test_hoe.rb	2010-08-28 09:37:21.978230874 +0200
-@@ -49,7 +49,7 @@
-     assert_equal 'blah', spec.rubyforge_project
-     assert_equal Gem::RubyGemsVersion, spec.rubygems_version
-     assert_match(/^Hoe.*Rakefiles$/, spec.summary)
--    assert_equal files.grep(/^test/), spec.test_files
-+    assert_equal files.grep(/^test/), spec.test_files.sort
- 
-     deps = spec.dependencies.sort_by { |dep| dep.name }
- 
diff --git a/dev-ruby/hoe/hoe-2.13.0-r1.ebuild b/dev-ruby/hoe/hoe-2.13.0-r1.ebuild
index 54f36163e472..387456eee695 100644
--- a/dev-ruby/hoe/hoe-2.13.0-r1.ebuild
+++ b/dev-ruby/hoe/hoe-2.13.0-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hoe/hoe-2.13.0-r1.ebuild,v 1.12 2014/09/19 09:22:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hoe/hoe-2.13.0-r1.ebuild,v 1.13 2014/10/29 18:48:28 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 jruby"
+USE_RUBY="ruby19 ruby20"
 
 RUBY_FAKEGEM_TASK_DOC="docs"
 
diff --git a/dev-ruby/hoe/hoe-3.11.0.ebuild b/dev-ruby/hoe/hoe-3.11.0.ebuild
deleted file mode 100644
index 8389cb519591..000000000000
--- a/dev-ruby/hoe/hoe-3.11.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hoe/hoe-3.11.0.ebuild,v 1.2 2014/08/05 16:00:43 mrueg Exp $
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 jruby"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.txt Manifest.txt README.txt"
-
-RUBY_FAKEGEM_EXTRAINSTALL="template"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Hoe extends rake to provide full project automation"
-HOMEPAGE="http://seattlerb.rubyforge.org/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.3:5 )"
-
-ruby_add_rdepend ">=dev-ruby/rake-0.8.7 >=dev-ruby/rdoc-4.0"
-
-all_ruby_prepare() {
-	# Skip isolation
-	sed -i -e '/isolate/ s:^:#:' Rakefile || die
-
-	# Skip test depending on specifics of gem command name
-	sed -i -e '/test_nosudo/,/^  end/ s:^:#:' test/test_hoe.rb || die
-
-	# Gem.bin_wrapper does not work as expected on Gentoo.
-	sed -i -e 's/Gem.bin_wrapper//' lib/hoe/rcov.rb lib/hoe/publish.rb test/test_hoe_publish.rb || die
-}
-
-all_ruby_compile() {
-	all_fakegem_compile
-
-	rdoc --title "seattlerb's hoe-3.5.1 Documentation" -o doc --main README.txt lib History.txt Manifest.txt README.txt || die
-}
diff --git a/dev-ruby/hoe/hoe-3.12.0.ebuild b/dev-ruby/hoe/hoe-3.12.0.ebuild
deleted file mode 100644
index e789be2d636f..000000000000
--- a/dev-ruby/hoe/hoe-3.12.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hoe/hoe-3.12.0.ebuild,v 1.2 2014/08/05 16:00:43 mrueg Exp $
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 jruby"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.rdoc Manifest.txt README.rdoc"
-
-RUBY_FAKEGEM_EXTRAINSTALL="template"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Hoe extends rake to provide full project automation"
-HOMEPAGE="http://seattlerb.rubyforge.org/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.3:5 )"
-
-ruby_add_rdepend ">=dev-ruby/rake-0.8.7 >=dev-ruby/rdoc-4.0"
-
-all_ruby_prepare() {
-	# Skip isolation
-	sed -i -e '/isolate/ s:^:#:' Rakefile || die
-
-	# Skip test depending on specifics of gem command name
-	sed -i -e '/test_nosudo/,/^  end/ s:^:#:' test/test_hoe.rb || die
-
-	# Gem.bin_wrapper does not work as expected on Gentoo.
-	sed -i -e 's/Gem.bin_wrapper//' lib/hoe/rcov.rb lib/hoe/publish.rb test/test_hoe_publish.rb || die
-}
-
-all_ruby_compile() {
-	all_fakegem_compile
-
-	rdoc --title "seattlerb's hoe-3.5.1 Documentation" -o doc --main README.txt lib History.txt Manifest.txt README.txt || die
-}
diff --git a/dev-ruby/hoe/hoe-3.13.0.ebuild b/dev-ruby/hoe/hoe-3.13.0.ebuild
index 3590e9da5531..708884713d40 100644
--- a/dev-ruby/hoe/hoe-3.13.0.ebuild
+++ b/dev-ruby/hoe/hoe-3.13.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hoe/hoe-3.13.0.ebuild,v 1.1 2014/10/04 15:37:03 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hoe/hoe-3.13.0.ebuild,v 1.2 2014/10/29 18:48:28 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 jruby"
+USE_RUBY="ruby19 ruby20 ruby21"
 
 RUBY_FAKEGEM_TASK_DOC=""