Generate our stub gem specifications again to avoid issues with differing dependencies between gem and ebuild.

(Portage version: 2.1.9.25/cvs/Linux x86_64)

4 files changed, 36 insertions, 7 deletions

diff --git a/dev-ruby/hoe/ChangeLog b/dev-ruby/hoe/ChangeLog
index c6bba22e72f3..9156575e2111 100644
--- a/dev-ruby/hoe/ChangeLog
+++ b/dev-ruby/hoe/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-ruby/hoe
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hoe/ChangeLog,v 1.99 2011/01/09 15:57:26 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hoe/ChangeLog,v 1.100 2011/01/09 16:14:18 graaff Exp $
+
+  09 Jan 2011; Hans de Graaff <graaff@gentoo.org> hoe-2.5.0.ebuild,
+  hoe-2.6.0-r1.ebuild, hoe-2.6.2.ebuild:
+  Generate our stub gem specifications again to avoid issues with differing
+  dependencies between gem and ebuild.
+
+  09 Jan 2011; Hans de Graaff <graaff@gentoo.org> hoe-2.6.2.ebuild:
+  Drop ruby19 keyword to create a stable candidate for ree18.
 
   09 Jan 2011; Hans de Graaff <graaff@gentoo.org> -hoe-2.3.2.ebuild,
   -hoe-2.6.1.ebuild:
diff --git a/dev-ruby/hoe/hoe-2.5.0.ebuild b/dev-ruby/hoe/hoe-2.5.0.ebuild
index 0b0fe0957364..ccc95ac3427f 100644
--- a/dev-ruby/hoe/hoe-2.5.0.ebuild
+++ b/dev-ruby/hoe/hoe-2.5.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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.12 2010/09/29 21:38:43 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hoe/hoe-2.5.0.ebuild,v 1.13 2011/01/09 16:14:18 graaff Exp $
 
 EAPI=2
 USE_RUBY="ruby18 jruby"
@@ -34,3 +34,10 @@ ruby_add_rdepend ">=dev-ruby/rake-0.8.7"
 all_ruby_prepare() {
 	epatch "${FILESDIR}"/${P}-tests.patch
 }
+
+all_ruby_prepare() {
+	# Remove normal metadata so that our stub gemspec is generated.
+	# This avoids problems with the gemspec requiring rubyforge and
+	# gemcutter while we don't.
+	rm ../metadata || die
+}
diff --git a/dev-ruby/hoe/hoe-2.6.0-r1.ebuild b/dev-ruby/hoe/hoe-2.6.0-r1.ebuild
index f919dd09be7a..8629d55d0b39 100644
--- a/dev-ruby/hoe/hoe-2.6.0-r1.ebuild
+++ b/dev-ruby/hoe/hoe-2.6.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hoe/hoe-2.6.0-r1.ebuild,v 1.7 2010/11/13 16:43:47 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hoe/hoe-2.6.0-r1.ebuild,v 1.8 2011/01/09 16:14:18 graaff Exp $
 
 EAPI=2
 USE_RUBY="ruby18 jruby"
@@ -32,3 +32,10 @@ RUBY_PATCHES="${P}-rubyforge-without-account.patch"
 ruby_add_bdepend "test? ( dev-ruby/minitest >=dev-ruby/rubyforge-2.0.3 )"
 
 ruby_add_rdepend ">=dev-ruby/rake-0.8.7"
+
+all_ruby_prepare() {
+	# Remove normal metadata so that our stub gemspec is generated.
+	# This avoids problems with the gemspec requiring rubyforge and
+	# gemcutter while we don't.
+	rm ../metadata || die
+}
diff --git a/dev-ruby/hoe/hoe-2.6.2.ebuild b/dev-ruby/hoe/hoe-2.6.2.ebuild
index 4c69baf2b768..bd9584c2daf1 100644
--- a/dev-ruby/hoe/hoe-2.6.2.ebuild
+++ b/dev-ruby/hoe/hoe-2.6.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hoe/hoe-2.6.2.ebuild,v 1.2 2011/01/02 10:21:33 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hoe/hoe-2.6.2.ebuild,v 1.3 2011/01/09 16:14:18 graaff Exp $
 
 EAPI=2
-USE_RUBY="ruby18 ree18 ruby19 jruby"
+USE_RUBY="ruby18 ree18 jruby"
 
 RUBY_FAKEGEM_TASK_DOC="docs"
 
@@ -32,3 +32,10 @@ RUBY_PATCHES=( "${PN}-2.6.1-test-file-ordering.patch" )
 ruby_add_bdepend "test? ( dev-ruby/minitest >=dev-ruby/rubyforge-2.0.4 )"
 
 ruby_add_rdepend ">=dev-ruby/rake-0.8.7"
+
+all_ruby_prepare() {
+	# Remove normal metadata so that our stub gemspec is generated.
+	# This avoids problems with the gemspec requiring rubyforge and
+	# gemcutter while we don't.
+	rm ../metadata || die
+}