Version bump, rubyforge is no longer needed at runtime either. Tests needed some fixing though.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

4 files changed, 117 insertions, 2 deletions

diff --git a/dev-ruby/hoe/ChangeLog b/dev-ruby/hoe/ChangeLog
index 7582fc904b85..481607fd2210 100644
--- a/dev-ruby/hoe/ChangeLog
+++ b/dev-ruby/hoe/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/hoe
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hoe/ChangeLog,v 1.68 2010/01/06 18:48:13 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hoe/ChangeLog,v 1.69 2010/01/07 20:06:57 flameeyes Exp $
+
+*hoe-2.5.0 (07 Jan 2010)
+
+  07 Jan 2010; Diego E. Pettenò <flameeyes@gentoo.org> +hoe-2.5.0.ebuild,
+  +files/hoe-2.5.0-tests.patch:
+  Version bump, rubyforge is no longer needed at runtime either. Tests
+  needed some fixing though.
 
   06 Jan 2010; Raúl Porcel <armin76@gentoo.org> hoe-2.4.0.ebuild:
   Add ~ia64/~sparc
diff --git a/dev-ruby/hoe/Manifest b/dev-ruby/hoe/Manifest
index 5006b7d9c457..d5163eeda38c 100644
--- a/dev-ruby/hoe/Manifest
+++ b/dev-ruby/hoe/Manifest
@@ -1,9 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX hoe-2.4.0-tests.patch 923 RMD160 761865ce64b4d7219f24d135af4350f32b6e0a63 SHA1 688dc504155ab6027a8e88083b933f6eaaa10015 SHA256 7271e3834c2e881f4229484e039cb5f216ad89e5cd69d6b788610dfdd979c847
+AUX hoe-2.5.0-tests.patch 2155 RMD160 898487c6847136041b79d37127ba6ad5ebb3a28d SHA1 8dbd252b198d53ac874672f3394f5741e46fe8bf SHA256 872f08a36126c6fad69405eb529993fcef94d8134cee8f70294ddb4075fb1a54
 DIST hoe-2.3.2.gem 29696 RMD160 63862c20c7098297a92755c5bad279856468aec7 SHA1 e47df36832b0c08c8f95807acad624151d9874da SHA256 3a90318b42ce02a019c8d248dbb42a9ce281f5ef9bf4566cefe6b27128b851ab
 DIST hoe-2.3.3.gem 26624 RMD160 8ce7544a0a9796787161036112a53da0da0c11fd SHA1 1d18724ba478ba3dc1def990adf6dc010db3cfeb SHA256 35617a7435805799b5e6e3dabae655341921e03cb52b55a3fdc6e61ae1b2541a
 DIST hoe-2.4.0.gem 110592 RMD160 49b645d1a5262dabac0dfab63916f80c42774779 SHA1 9b9c0fb84588a1cd01664c95676d641e048c49be SHA256 b4ff616d19eff09be41e8af523d176c6cee4465547b1c04cb2df4627eed1e1cf
+DIST hoe-2.5.0.gem 113664 RMD160 60cde1696168764857be1b5cfc62f1a9fad4f3d4 SHA1 384af5f4a78d93cc46fa21dc56258f7ce878bd2c SHA256 b9476f4c5f6f82314520dbe9ef6e9e2777cf6bcc73ef3ad6197ab5276b369928
 EBUILD hoe-2.3.2.ebuild 532 RMD160 528316e975f7dec92e977734b3a72636bff4eed3 SHA1 0ae4d7196c722c1842dc50c7b23bba1cd3d06954 SHA256 f96e02eb37b6700305b3d47e2415be2177bc23ca2e573192c9670fd518c7afeb
 EBUILD hoe-2.3.3.ebuild 535 RMD160 1599bbf30d87ec425e5b3c972bb66620002682fe SHA1 d2bededf782180287dcf227e7123225fa5a1c82a SHA256 2911dc1a976ea2ee67f7874373712a55cfd21584eb5dee725c77f3bf30dfbf3a
 EBUILD hoe-2.4.0.ebuild 901 RMD160 1b143f5205362344013044eb49012fc2a3718035 SHA1 d8b0d099f4a0418cf535670778cd1dd8b71a0f7b SHA256 b96cd5e662e7f197f70e79e1f3b4ee47d4146c08b324ce3907a6a9242668435d
-MISC ChangeLog 8587 RMD160 f843b306dd5a096148044a077fecff0c00696ec0 SHA1 6d83e97cd0b81cecee919d647f735d394a7edac6 SHA256 eed5a7f25c756b086e2e1dc8a982efe29bfe8df5ca177a19fe3f217225fa20ee
+EBUILD hoe-2.5.0.ebuild 1143 RMD160 aaf47aad5e4611b6f43fb62417f58d06b8ffcddc SHA1 e1c63c1b841a36d2d70feacb3bcc517230407a44 SHA256 1e0a4ca05945ce5e5f6c7188e19f82f360dee6ab063b93535929d920377cc0b5
+MISC ChangeLog 8823 RMD160 e4c18b3e7712e2d3402aed10f73fa9e90bf5ab38 SHA1 f723bd6dee86fc242c2547d5000f6602620cfa4d SHA256 67cc06d7a73635c2f5feaeb8f0a8d7eb7ca8a5deba29d81e82464a035b8e194f
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAktGPtUACgkQAiZjviIA2XgY3wCfYoAOzL0bdafFufq/qSc3UIpv
+7ScAn04cmlH//QYdboHar2W966ItSkZ1
+=90V/
+-----END PGP SIGNATURE-----
diff --git a/dev-ruby/hoe/files/hoe-2.5.0-tests.patch b/dev-ruby/hoe/files/hoe-2.5.0-tests.patch
new file mode 100644
index 000000000000..f13fdc05c874
--- /dev/null
+++ b/dev-ruby/hoe/files/hoe-2.5.0-tests.patch
@@ -0,0 +1,59 @@
+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/hoe-2.5.0.ebuild b/dev-ruby/hoe/hoe-2.5.0.ebuild
new file mode 100644
index 000000000000..02bc31ed71c2
--- /dev/null
+++ b/dev-ruby/hoe/hoe-2.5.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hoe/hoe-2.5.0.ebuild,v 1.1 2010/01/07 20:06:57 flameeyes Exp $
+
+EAPI=2
+USE_RUBY="ruby18 ruby19 jruby"
+
+RUBY_FAKEGEM_TASK_DOC="docs"
+
+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="~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+# - also requires dev-ruby/hoe-seattlerb for 1.9;
+# - dev-ruby/gemcutter is an optional dependency at both runtime and
+#   test-time, at least for us;
+# - rubyforge is loaded at runtime when needed, so we don't strictly
+#   depend on it at runtime, but we need it for tests (for now);
+ruby_add_bdepend test "virtual/ruby-minitest >=dev-ruby/rubyforge-2.0.3"
+
+ruby_add_rdepend ">=dev-ruby/rake-0.8.7"
+
+all_ruby_prepare() {
+	epatch "${FILESDIR}"/${P}-tests.patch
+}