Cleanup old versions, use new syntax.

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

3 files changed, 12 insertions, 50 deletions

diff --git a/dev-ruby/rdoc/ChangeLog b/dev-ruby/rdoc/ChangeLog
index 1b859f0fe1bd..61fdbe4e8732 100644
--- a/dev-ruby/rdoc/ChangeLog
+++ b/dev-ruby/rdoc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/rdoc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rdoc/ChangeLog,v 1.28 2010/04/26 14:25:52 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rdoc/ChangeLog,v 1.29 2010/05/22 14:31:45 flameeyes Exp $
+
+  22 May 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -rdoc-2.4.3-r1.ebuild, rdoc-2.5.6.ebuild:
+  Cleanup old versions, use new syntax.
 
 *rdoc-2.5.6 (26 Apr 2010)
 
diff --git a/dev-ruby/rdoc/rdoc-2.4.3-r1.ebuild b/dev-ruby/rdoc/rdoc-2.4.3-r1.ebuild
deleted file mode 100644
index 44ee5b46c285..000000000000
--- a/dev-ruby/rdoc/rdoc-2.4.3-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rdoc/rdoc-2.4.3-r1.ebuild,v 1.7 2010/02/21 00:32:13 abcd 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 RI.txt"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="An extended version of the RDoc library from Ruby 1.8"
-HOMEPAGE="http://rubyforge.org/projects/rdoc/"
-SRC_URI="mirror://rubyforge/${PN}/${P}.tgz"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend test dev-ruby/hoe
-ruby_add_bdepend test virtual/ruby-minitest
-ruby_add_bdepend doc dev-ruby/hoe
-
-all_ruby_install() {
-	all_fakegem_install
-
-	for bin in rdoc ri; do
-		ruby_fakegem_binwrapper $bin /usr/bin/$bin-2
-	done
-}
-
-each_ruby_test() {
-	# `rake test' would fail when rdoc is not yet installed.
-	# Setting $rdoc_rakefile fixes this.
-	${RUBY} -w -Ilib:ext:bin:test \
-		-e 'require "rubygems"; require	"minitest/autorun"; \
-		$rdoc_rakefile = true; Dir.glob("test/test*.rb").each \
-		{|t| require t }' || die "Tests failed for ${RUBY}"
-}
diff --git a/dev-ruby/rdoc/rdoc-2.5.6.ebuild b/dev-ruby/rdoc/rdoc-2.5.6.ebuild
index 88c1c9d280df..7f2ce0e786b2 100644
--- a/dev-ruby/rdoc/rdoc-2.5.6.ebuild
+++ b/dev-ruby/rdoc/rdoc-2.5.6.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/rdoc/rdoc-2.5.6.ebuild,v 1.1 2010/04/26 14:25:52 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rdoc/rdoc-2.5.6.ebuild,v 1.2 2010/05/22 14:31:45 flameeyes Exp $
 
 EAPI=2
 USE_RUBY="ruby18 ruby19 jruby"
@@ -23,9 +23,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-solaris"
 IUSE=""
 
-ruby_add_bdepend test dev-ruby/hoe
-ruby_add_bdepend test virtual/ruby-minitest
-ruby_add_bdepend doc dev-ruby/hoe
+ruby_add_bdepend "
+	doc? ( >=dev-ruby/hoe-2.5.0 )
+	test? (
+		>=dev-ruby/hoe-2.5.0
+		virtual/ruby-minitest
+	)"
 
 all_ruby_prepare() {
 	epatch "${FILESDIR}/${P}-ruby19.patch"