Cleanup old versions, use new syntax.

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

23 files changed, 73 insertions, 302 deletions

diff --git a/dev-ruby/hoe/ChangeLog b/dev-ruby/hoe/ChangeLog
index ba487fa9178b..98dee4554c5c 100644
--- a/dev-ruby/hoe/ChangeLog
+++ b/dev-ruby/hoe/ChangeLog
@@ -1,6 +1,11 @@
 # 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.77 2010/05/22 13:37:34 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hoe/ChangeLog,v 1.78 2010/05/22 14:23:12 flameeyes Exp $
+
+  22 May 2010; Diego E. Pettenò <flameeyes@gentoo.org> hoe-2.3.2.ebuild,
+  -hoe-2.3.3.ebuild, -hoe-2.4.0.ebuild, hoe-2.5.0.ebuild,
+  hoe-2.6.0-r1.ebuild:
+  Cleanup old versions, use new syntax.
 
   22 May 2010; Hans de Graaff <graaff@gentoo.org> hoe-2.5.0.ebuild:
   Drop ruby19 to allow stabilization.
diff --git a/dev-ruby/hoe/hoe-2.3.2.ebuild b/dev-ruby/hoe/hoe-2.3.2.ebuild
index a4a4d6fc3716..b717d0dc5ce8 100644
--- a/dev-ruby/hoe/hoe-2.3.2.ebuild
+++ b/dev-ruby/hoe/hoe-2.3.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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.3.2.ebuild,v 1.6 2009/09/05 15:18:54 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hoe/hoe-2.3.2.ebuild,v 1.7 2010/05/22 14:23:12 flameeyes Exp $
 
 inherit gems
 
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby18"
 
 DESCRIPTION="Hoe extends rake to provide full project automation."
 HOMEPAGE="http://seattlerb.rubyforge.org/"
diff --git a/dev-ruby/hoe/hoe-2.3.3.ebuild b/dev-ruby/hoe/hoe-2.3.3.ebuild
deleted file mode 100644
index 8ac5813e44e7..000000000000
--- a/dev-ruby/hoe/hoe-2.3.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hoe/hoe-2.3.3.ebuild,v 1.2 2009/08/09 23:56:37 jer Exp $
-
-inherit gems
-
-USE_RUBY="ruby18 ruby19"
-
-DESCRIPTION="Hoe extends rake to provide full project automation."
-HOMEPAGE="http://seattlerb.rubyforge.org/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=">=dev-ruby/rake-0.8.7
-	>=dev-ruby/rubyforge-1.0.4"
-RDEPEND="${DEPEND}"
diff --git a/dev-ruby/hoe/hoe-2.4.0.ebuild b/dev-ruby/hoe/hoe-2.4.0.ebuild
deleted file mode 100644
index 2c28b63cdbb1..000000000000
--- a/dev-ruby/hoe/hoe-2.4.0.ebuild
+++ /dev/null
@@ -1,32 +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/hoe/hoe-2.4.0.ebuild,v 1.9 2010/01/13 16:20:50 ranger 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 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-# also requires dev-ruby/hoe-seattlerb for 1.9
-ruby_add_bdepend test virtual/ruby-minitest
-
-ruby_add_rdepend ">=dev-ruby/rake-0.8.7 >=dev-ruby/rubyforge-2.0.3"
-
-all_ruby_prepare() {
-	epatch "${FILESDIR}"/${P}-tests.patch
-}
diff --git a/dev-ruby/hoe/hoe-2.5.0.ebuild b/dev-ruby/hoe/hoe-2.5.0.ebuild
index f4ae597c682c..ca4594e47be6 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
 # 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.4 2010/05/22 13:37:34 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hoe/hoe-2.5.0.ebuild,v 1.5 2010/05/22 14:23:12 flameeyes Exp $
 
 EAPI=2
 USE_RUBY="ruby18 jruby"
@@ -27,7 +27,7 @@ IUSE=""
 #   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_bdepend "test? ( virtual/ruby-minitest >=dev-ruby/rubyforge-2.0.3 )"
 
 ruby_add_rdepend ">=dev-ruby/rake-0.8.7"
 
diff --git a/dev-ruby/hoe/hoe-2.6.0-r1.ebuild b/dev-ruby/hoe/hoe-2.6.0-r1.ebuild
index 2f6e2c3b522d..353d35620be0 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
 # 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.1 2010/05/09 11:31:59 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hoe/hoe-2.6.0-r1.ebuild,v 1.2 2010/05/22 14:23:12 flameeyes Exp $
 
 EAPI=2
 USE_RUBY="ruby18 ruby19 jruby"
@@ -29,6 +29,6 @@ RUBY_PATCHES="${P}-rubyforge-without-account.patch"
 #   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_bdepend "test? ( virtual/ruby-minitest >=dev-ruby/rubyforge-2.0.3 )"
 
 ruby_add_rdepend ">=dev-ruby/rake-0.8.7"
diff --git a/dev-ruby/rails/ChangeLog b/dev-ruby/rails/ChangeLog
index 025cc78da8fe..5eadf4f7f519 100644
--- a/dev-ruby/rails/ChangeLog
+++ b/dev-ruby/rails/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/rails
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails/ChangeLog,v 1.172 2010/02/21 00:30:14 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails/ChangeLog,v 1.173 2010/05/22 14:36:13 flameeyes Exp $
+
+  22 May 2010; Diego E. Pettenò <flameeyes@gentoo.org> rails-2.3.5.ebuild,
+  -rails-2.3.5-r1.ebuild, rails-2.3.5-r2.ebuild:
+  Cleanup old versions, use new syntax.
 
   21 Feb 2010; Jonathan Callen <abcd@gentoo.org> rails-2.3.5-r2.ebuild:
   Transfer prefix keywords (no other changes)
diff --git a/dev-ruby/rails/rails-2.3.5-r1.ebuild b/dev-ruby/rails/rails-2.3.5-r1.ebuild
deleted file mode 100644
index 6ac89400591c..000000000000
--- a/dev-ruby/rails/rails-2.3.5-r1.ebuild
+++ /dev/null
@@ -1,79 +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/rails/rails-2.3.5-r1.ebuild,v 1.5 2010/02/13 20:47:49 armin76 Exp $
-
-EAPI=2
-USE_RUBY="ruby18"
-
-RUBY_FAKEGEM_EXTRAINSTALL="builtin configs dispatches environments helpers html"
-RUBY_FAKEGEM_EXTRADOC="README CHANGELOG"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-# gem lacks tests
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="ruby on rails is a web-application and persistance framework"
-HOMEPAGE="http://www.rubyonrails.org"
-
-LICENSE="MIT"
-SLOT="2.3"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE=""
-
-RDEPEND=">=app-admin/eselect-rails-0.15"
-
-ruby_add_rdepend ">=dev-ruby/rake-0.8.3
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activeresource-${PV}
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionmailer-${PV}
-	~dev-ruby/actionpack-${PV}"
-ruby_add_bdepend doc dev-ruby/redcloth
-ruby_add_bdepend test dev-ruby/mocha
-
-all_ruby_prepare() {
-	sed -i -e '/horo/d' Rakefile || die
-}
-
-all_ruby_compile() {
-	all_fakegem_compile
-
-	# fails for missing template when using the gem distribution
-	#if use doc; then
-	#	pushd guides
-	#	ruby rails_guides.rb || die "guide generation failed"
-	#	popd
-	#fi
-}
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper rails rails-${PV}
-
-	if use doc; then
-		#pushd guides/output
-		#docinto guides
-		#dohtml -r *
-		#popd
-
-		pushd doc
-		docinto api
-		dohtml -r *
-		popd
-	fi
-}
-
-pkg_postinst() {
-	elog "To select between slots of rails, use:"
-	elog "\teselect rails"
-
-	eselect rails update
-}
-
-pkg_postrm() {
-	eselect rails update
-}
diff --git a/dev-ruby/rails/rails-2.3.5-r2.ebuild b/dev-ruby/rails/rails-2.3.5-r2.ebuild
index b1c00c882a28..47b8c803c1db 100644
--- a/dev-ruby/rails/rails-2.3.5-r2.ebuild
+++ b/dev-ruby/rails/rails-2.3.5-r2.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/rails/rails-2.3.5-r2.ebuild,v 1.2 2010/02/21 00:30:14 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails/rails-2.3.5-r2.ebuild,v 1.3 2010/05/22 14:36:13 flameeyes Exp $
 
 EAPI=2
 USE_RUBY="ruby18"
@@ -32,8 +32,9 @@ ruby_add_rdepend ">=dev-ruby/rake-0.8.3
 	~dev-ruby/activesupport-${PV}
 	~dev-ruby/actionmailer-${PV}
 	~dev-ruby/actionpack-${PV}"
-ruby_add_bdepend doc dev-ruby/redcloth
-ruby_add_bdepend test dev-ruby/mocha
+ruby_add_bdepend "
+	doc? ( dev-ruby/redcloth )
+	test? ( dev-ruby/mocha )"
 
 all_ruby_prepare() {
 	sed -i -e '/horo/d' Rakefile || die
diff --git a/dev-ruby/rails/rails-2.3.5.ebuild b/dev-ruby/rails/rails-2.3.5.ebuild
index 98d8e45c7a66..b9d95fb0f399 100644
--- a/dev-ruby/rails/rails-2.3.5.ebuild
+++ b/dev-ruby/rails/rails-2.3.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails/rails-2.3.5.ebuild,v 1.5 2009/12/19 14:24:48 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails/rails-2.3.5.ebuild,v 1.6 2010/05/22 14:36:13 flameeyes Exp $
 
 inherit ruby gems
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby18"
 
 DESCRIPTION="ruby on rails is a web-application and persistance framework"
 HOMEPAGE="http://www.rubyonrails.org"
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"
diff --git a/dev-ruby/redcloth/ChangeLog b/dev-ruby/redcloth/ChangeLog
index 9ff69eee4932..bf15f9ac94fe 100644
--- a/dev-ruby/redcloth/ChangeLog
+++ b/dev-ruby/redcloth/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/redcloth
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/redcloth/ChangeLog,v 1.42 2010/05/01 16:58:30 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/redcloth/ChangeLog,v 1.43 2010/05/22 14:29:25 flameeyes Exp $
+
+  22 May 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  redcloth-4.1.9.ebuild, -redcloth-4.2.2-r3.ebuild, redcloth-4.2.3.ebuild:
+  Cleanup old versions, use new syntax.
 
 *redcloth-4.2.3 (01 May 2010)
 
diff --git a/dev-ruby/redcloth/redcloth-4.1.9.ebuild b/dev-ruby/redcloth/redcloth-4.1.9.ebuild
index fcf2b74f6542..ee4cfb44e683 100644
--- a/dev-ruby/redcloth/redcloth-4.1.9.ebuild
+++ b/dev-ruby/redcloth/redcloth-4.1.9.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/redcloth/redcloth-4.1.9.ebuild,v 1.4 2010/02/13 20:17:41 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/redcloth/redcloth-4.1.9.ebuild,v 1.5 2010/05/22 14:29:25 flameeyes Exp $
 
 inherit ruby gems
 
@@ -14,6 +14,6 @@ SLOT="0"
 KEYWORDS="amd64 ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby18"
 
 S=${WORKDIR}/${MY_P}
diff --git a/dev-ruby/redcloth/redcloth-4.2.2-r3.ebuild b/dev-ruby/redcloth/redcloth-4.2.2-r3.ebuild
deleted file mode 100644
index aa62071929cd..000000000000
--- a/dev-ruby/redcloth/redcloth-4.2.2-r3.ebuild
+++ /dev/null
@@ -1,57 +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/redcloth/redcloth-4.2.2-r3.ebuild,v 1.5 2010/02/13 20:17:41 armin76 Exp $
-
-EAPI=2
-
-# jruby → released tarballs and gems don't have support for it so we
-# have to use the git snapshots, on the other hand, it doesn't seem to
-# build fine right now, so we're probably going to wait for next
-# release.
-USE_RUBY="ruby18 ruby19"
-
-RUBY_FAKEGEM_NAME="RedCloth"
-
-RUBY_FAKEGEM_TASK_TEST="spec"
-RUBY_FAKEGEM_TASK_DOC="docs"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_EXTRADOC="README CHANGELOG"
-
-RUBY_FAKEGEM_REQUIRE_PATHS="lib/case_sensitive_require"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A module for using Textile in Ruby"
-HOMEPAGE="http://redcloth.org/"
-SRC_URI="http://github.com/Flameeyes/redcloth/tarball/9e1025baf6bde57658d6794ec792e406444b4f7c -> ${RUBY_FAKEGEM_NAME}-git-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-DEPEND="dev-util/ragel"
-RDEPEND=""
-
-# Yes this is a snapshot from my own repository, let's just keep it at
-# this for now.
-S="${WORKDIR}/Flameeyes-redcloth-9e1025b"
-
-# rspec is needed for the Rakefile to work if not patched; should
-# probably be reported upstream to fix
-ruby_add_bdepend '>=dev-ruby/echoe-3.0.1 dev-ruby/rspec'
-
-ruby_add_bdepend test "dev-ruby/diff-lcs"
-
-all_ruby_prepare() {
-	# We need to do this to avoid re-compilation when running tests
-	sed -i \
-		-e '/task :spec/s|, :compile||' \
-		Rakefile || die "Rakefile fixes failed"
-}
-
-each_ruby_compile() {
-	${RUBY} -S rake compile || die "build failed"
-}
diff --git a/dev-ruby/redcloth/redcloth-4.2.3.ebuild b/dev-ruby/redcloth/redcloth-4.2.3.ebuild
index 69204465dd3b..258c05855e05 100644
--- a/dev-ruby/redcloth/redcloth-4.2.3.ebuild
+++ b/dev-ruby/redcloth/redcloth-4.2.3.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/redcloth/redcloth-4.2.3.ebuild,v 1.1 2010/05/01 16:58:30 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/redcloth/redcloth-4.2.3.ebuild,v 1.2 2010/05/22 14:29:25 flameeyes Exp $
 
 EAPI=2
 
@@ -36,8 +36,13 @@ RDEPEND="$RDEPEND"
 
 S="${WORKDIR}/jgarber-${PN}-*"
 
-ruby_add_bdepend 'dev-ruby/rake >=dev-ruby/echoe-3.0.1'
-ruby_add_bdepend test "dev-ruby/rspec dev-ruby/diff-lcs"
+ruby_add_bdepend "
+	dev-ruby/rake
+	>=dev-ruby/echoe-3.0.1
+	test? (
+		dev-ruby/rspec
+		dev-ruby/diff-lcs
+	)"
 
 pkg_setup() {
 	# Export the VERBOSE variable to avoid remapping of stdout and
diff --git a/dev-ruby/ruby-hmac/ChangeLog b/dev-ruby/ruby-hmac/ChangeLog
index ca4b7d8b40f0..5f36b076905c 100644
--- a/dev-ruby/ruby-hmac/ChangeLog
+++ b/dev-ruby/ruby-hmac/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/ruby-hmac
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-hmac/ChangeLog,v 1.2 2010/02/22 20:03:14 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-hmac/ChangeLog,v 1.3 2010/05/22 14:27:05 flameeyes Exp $
+
+  22 May 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -ruby-hmac-0.3.2.ebuild, ruby-hmac-0.4.0.ebuild:
+  Cleanup old versions, use new syntax.
 
 *ruby-hmac-0.4.0 (22 Feb 2010)
 
diff --git a/dev-ruby/ruby-hmac/ruby-hmac-0.3.2.ebuild b/dev-ruby/ruby-hmac/ruby-hmac-0.3.2.ebuild
deleted file mode 100644
index 5822a979225f..000000000000
--- a/dev-ruby/ruby-hmac/ruby-hmac-0.3.2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-hmac/ruby-hmac-0.3.2.ebuild,v 1.1 2009/05/16 09:58:37 graaff Exp $
-
-inherit gems
-
-DESCRIPTION="A common interface to HMAC functionality as documented in RFC2104."
-HOMEPAGE="http://ruby-hmac.rubyforge.org/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-USE_RUBY="ruby18"
-
-DEPEND=">=dev-ruby/rubygems-1.3.0"
diff --git a/dev-ruby/ruby-hmac/ruby-hmac-0.4.0.ebuild b/dev-ruby/ruby-hmac/ruby-hmac-0.4.0.ebuild
index 55713c340573..0f3f11176f75 100644
--- a/dev-ruby/ruby-hmac/ruby-hmac-0.4.0.ebuild
+++ b/dev-ruby/ruby-hmac/ruby-hmac-0.4.0.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/ruby-hmac/ruby-hmac-0.4.0.ebuild,v 1.1 2010/02/22 20:03:14 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-hmac/ruby-hmac-0.4.0.ebuild,v 1.2 2010/05/22 14:27:05 flameeyes Exp $
 
 EAPI="2"
 USE_RUBY="ruby18"
@@ -18,5 +18,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-ruby_add_bdepend doc ">=dev-ruby/hoe-2.5.0"
-ruby_add_bdepend test ">=dev-ruby/hoe-2.5.0 virtual/ruby-test-unit"
+ruby_add_bdepend "
+	doc? ( >=dev-ruby/hoe-2.5.0 )
+	test? (
+		>=dev-ruby/hoe-2.5.0
+		virtual/ruby-test-unit
+	)"
diff --git a/dev-ruby/ruby-liquid/ChangeLog b/dev-ruby/ruby-liquid/ChangeLog
index 718f112a58b9..a619e5b3bb26 100644
--- a/dev-ruby/ruby-liquid/ChangeLog
+++ b/dev-ruby/ruby-liquid/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/ruby-liquid
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-liquid/ChangeLog,v 1.6 2010/01/16 19:18:22 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-liquid/ChangeLog,v 1.7 2010/05/22 14:22:02 flameeyes Exp $
+
+  22 May 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -ruby-liquid-2.0.0.ebuild, ruby-liquid-2.0.0-r1.ebuild:
+  Cleanup old versions, use new syntax.
 
 *ruby-liquid-2.0.0-r1 (16 Jan 2010)
 
diff --git a/dev-ruby/ruby-liquid/ruby-liquid-2.0.0-r1.ebuild b/dev-ruby/ruby-liquid/ruby-liquid-2.0.0-r1.ebuild
index cbf66aacf6ad..6621fa4ea14e 100644
--- a/dev-ruby/ruby-liquid/ruby-liquid-2.0.0-r1.ebuild
+++ b/dev-ruby/ruby-liquid/ruby-liquid-2.0.0-r1.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/ruby-liquid/ruby-liquid-2.0.0-r1.ebuild,v 1.1 2010/01/16 19:18:22 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-liquid/ruby-liquid-2.0.0-r1.ebuild,v 1.2 2010/05/22 14:22:02 flameeyes Exp $
 
 EAPI="2"
 USE_RUBY="ruby18"
@@ -26,5 +26,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86-fbsd ~x86"
 IUSE=""
 
-ruby_add_bdepend doc dev-ruby/hoe
-ruby_add_bdepend test dev-ruby/hoe
+ruby_add_bdepend "
+	doc? ( dev-ruby/hoe )
+	test? ( dev-ruby/hoe )"
diff --git a/dev-ruby/ruby-liquid/ruby-liquid-2.0.0.ebuild b/dev-ruby/ruby-liquid/ruby-liquid-2.0.0.ebuild
deleted file mode 100644
index ea890e9f339d..000000000000
--- a/dev-ruby/ruby-liquid/ruby-liquid-2.0.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-liquid/ruby-liquid-2.0.0.ebuild,v 1.2 2009/10/23 15:41:50 mr_bones_ Exp $
-
-inherit gems
-
-MY_P="${P/ruby-/}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Template engine for Ruby"
-HOMEPAGE="http://www.liquidmarkup.org/"
-SRC_URI="http://gems.rubyforge.org/gems/${MY_P}.gem"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~amd64 ~x86-fbsd ~x86"
-IUSE=""
-
-USE_RUBY="ruby18 ruby19"