Cleanup old versions, use new syntax.

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

24 files changed, 73 insertions, 486 deletions

diff --git a/dev-ruby/haml/ChangeLog b/dev-ruby/haml/ChangeLog
index b18c4fc1a890..9a15e6bee28f 100644
--- a/dev-ruby/haml/ChangeLog
+++ b/dev-ruby/haml/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/haml
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/haml/ChangeLog,v 1.42 2010/04/30 08:19:31 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/haml/ChangeLog,v 1.43 2010/05/22 13:28:36 flameeyes Exp $
+
+  22 May 2010; Diego E. Pettenò <flameeyes@gentoo.org> -haml-2.2.23.ebuild,
+  haml-2.2.24.ebuild:
+  Cleanup old versions, use new syntax.
 
 *haml-2.2.24 (30 Apr 2010)
 
diff --git a/dev-ruby/haml/haml-2.2.23.ebuild b/dev-ruby/haml/haml-2.2.23.ebuild
deleted file mode 100644
index b40e20ee59b7..000000000000
--- a/dev-ruby/haml/haml-2.2.23.ebuild
+++ /dev/null
@@ -1,44 +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/haml/haml-2.2.23.ebuild,v 1.1 2010/04/27 05:54:53 graaff Exp $
-
-EAPI=2
-
-USE_RUBY="ruby18"
-
-RUBY_FAKEGEM_TASK_DOC="doc"
-
-RUBY_FAKEGEM_EXTRADOC="CONTRIBUTING README.md"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_EXTRAINSTALL="init.rb"
-
-inherit ruby-fakegem
-
-DESCRIPTION="HAML - a ruby web page templating engine"
-HOMEPAGE="http://haml.hamptoncatlin.com/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-# TODO: haml has some emacs modes that it could be installing, in case
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/haml.gemspec/,/Task\[:package\]/s:^:#:' "${S}"/Rakefile
-}
-
-each_ruby_install() {
-	each_fakegem_install
-
-	# This is needed otherwise it fails at runtime
-	ruby_fakegem_doins VERSION VERSION_NAME
-}
-
-# The html engine requires hpricot
-ruby_add_rdepend dev-ruby/hpricot
-
-# It could use merb during testing as well, but it's not mandatory
-ruby_add_bdepend test "virtual/ruby-test-unit dev-ruby/actionpack"
-ruby_add_bdepend doc "dev-ruby/yard dev-ruby/maruku"
diff --git a/dev-ruby/haml/haml-2.2.24.ebuild b/dev-ruby/haml/haml-2.2.24.ebuild
index 3213f582e6fb..02d8399d7f03 100644
--- a/dev-ruby/haml/haml-2.2.24.ebuild
+++ b/dev-ruby/haml/haml-2.2.24.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/haml/haml-2.2.24.ebuild,v 1.1 2010/04/30 08:19:31 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/haml/haml-2.2.24.ebuild,v 1.2 2010/05/22 13:28:36 flameeyes Exp $
 
 EAPI=2
 
@@ -40,5 +40,12 @@ each_ruby_install() {
 ruby_add_rdepend dev-ruby/hpricot
 
 # It could use merb during testing as well, but it's not mandatory
-ruby_add_bdepend test "virtual/ruby-test-unit dev-ruby/actionpack"
-ruby_add_bdepend doc "dev-ruby/yard dev-ruby/maruku"
+ruby_add_bdepend "
+	test? (
+		virtual/ruby-test-unit
+		dev-ruby/actionpack
+	)
+	doc? (
+		dev-ruby/yard
+		dev-ruby/maruku
+	)"
diff --git a/dev-ruby/heckle/ChangeLog b/dev-ruby/heckle/ChangeLog
index aceac8bfe559..b867139eef51 100644
--- a/dev-ruby/heckle/ChangeLog
+++ b/dev-ruby/heckle/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/heckle
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/heckle/ChangeLog,v 1.11 2010/02/13 19:19:51 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/heckle/ChangeLog,v 1.12 2010/05/22 13:31:48 flameeyes Exp $
+
+  22 May 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -heckle-1.4.3.ebuild, heckle-1.4.3-r1.ebuild:
+  Cleanup old versions, use new syntax.
 
   13 Feb 2010; Raúl Porcel <armin76@gentoo.org> heckle-1.4.3.ebuild,
   heckle-1.4.3-r1.ebuild:
diff --git a/dev-ruby/heckle/heckle-1.4.3-r1.ebuild b/dev-ruby/heckle/heckle-1.4.3-r1.ebuild
index 766c12690c01..a6375f6e9cb9 100644
--- a/dev-ruby/heckle/heckle-1.4.3-r1.ebuild
+++ b/dev-ruby/heckle/heckle-1.4.3-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/heckle/heckle-1.4.3-r1.ebuild,v 1.5 2010/02/13 19:19:51 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/heckle/heckle-1.4.3-r1.ebuild,v 1.6 2010/05/22 13:31:48 flameeyes Exp $
 
 EAPI=2
 
@@ -23,8 +23,12 @@ IUSE=""
 ruby_add_rdepend ">=dev-ruby/ruby2ruby-1.1.6
 	>=dev-ruby/parsetree-2.0.0
 	>=dev-ruby/zentest-3.5.2"
-ruby_add_bdepend doc dev-ruby/hoe
-ruby_add_bdepend test "dev-ruby/hoe virtual/ruby-test-unit"
+ruby_add_bdepend "
+	doc? ( dev-ruby/hoe )
+	test? (
+		dev-ruby/hoe
+		virtual/ruby-test-unit
+	)"
 
 src_compile() {
 	chmod 0755 ${WORKDIR/work/homedir} || die "Failed to fix permissions on home"
diff --git a/dev-ruby/heckle/heckle-1.4.3.ebuild b/dev-ruby/heckle/heckle-1.4.3.ebuild
deleted file mode 100644
index 314c0f1d565f..000000000000
--- a/dev-ruby/heckle/heckle-1.4.3.ebuild
+++ /dev/null
@@ -1,21 +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/heckle/heckle-1.4.3.ebuild,v 1.3 2010/02/13 19:19:51 armin76 Exp $
-
-inherit ruby gems
-
-DESCRIPTION="Unit Test Sadism"
-HOMEPAGE="http://seattlerb.rubyforge.org/"
-SRC_URI="http://gems.rubyforge.org/gems/${P}.gem"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-USE_RUBY="ruby18"
-
-DEPEND=">=dev-ruby/ruby2ruby-1.1.6
-	>=dev-ruby/parsetree-2.0.0
-	>=dev-ruby/zentest-3.5.2"
-RDEPEND="${DEPEND}"
diff --git a/dev-ruby/hpricot/ChangeLog b/dev-ruby/hpricot/ChangeLog
index e73fc4b3f8c2..62592696e65f 100644
--- a/dev-ruby/hpricot/ChangeLog
+++ b/dev-ruby/hpricot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/hpricot
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hpricot/ChangeLog,v 1.20 2010/02/01 16:39:24 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hpricot/ChangeLog,v 1.21 2010/05/22 13:33:37 flameeyes Exp $
+
+  22 May 2010; Diego E. Pettenò <flameeyes@gentoo.org> -hpricot-0.8.ebuild,
+  -hpricot-0.8.2.ebuild, hpricot-0.8.2-r1.ebuild:
+  Cleanup old versions, use new syntax.
 
 *hpricot-0.8.2-r1 (01 Feb 2010)
 
diff --git a/dev-ruby/hpricot/hpricot-0.8.2-r1.ebuild b/dev-ruby/hpricot/hpricot-0.8.2-r1.ebuild
index 0d4263736fcc..82eef8dbeccb 100644
--- a/dev-ruby/hpricot/hpricot-0.8.2-r1.ebuild
+++ b/dev-ruby/hpricot/hpricot-0.8.2-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/hpricot/hpricot-0.8.2-r1.ebuild,v 1.1 2010/02/01 16:39:24 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hpricot/hpricot-0.8.2-r1.ebuild,v 1.2 2010/05/22 13:33:37 flameeyes Exp $
 
 EAPI=2
 
@@ -21,11 +21,12 @@ IUSE=""
 
 # Probably needs the same jdk as JRuby but I'm not sure how to express
 # that just yet.
-DEPEND="dev-util/ragel
+DEPEND="${DEPEND}
+	dev-util/ragel
 	ruby_targets_jruby? ( >=virtual/jdk-1.5 )"
 
-ruby_add_bdepend dev-ruby/rake
-ruby_add_bdepend test virtual/ruby-test-unit
+ruby_add_bdepend "dev-ruby/rake
+	test? ( virtual/ruby-test-unit )"
 
 all_ruby_prepare() {
 	# Fix issue #11 from upstream
diff --git a/dev-ruby/hpricot/hpricot-0.8.2.ebuild b/dev-ruby/hpricot/hpricot-0.8.2.ebuild
deleted file mode 100644
index 84709e30835d..000000000000
--- a/dev-ruby/hpricot/hpricot-0.8.2.ebuild
+++ /dev/null
@@ -1,39 +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/hpricot/hpricot-0.8.2.ebuild,v 1.3 2010/01/16 08:33:22 fauli Exp $
-
-EAPI=2
-
-USE_RUBY="ruby18 ruby19 jruby"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A fast and liberal HTML parser for Ruby."
-HOMEPAGE="http://wiki.github.com/why/hpricot"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-# Probably needs the same jdk as JRuby but I'm not sure how to express
-# that just yet.
-DEPEND="dev-util/ragel
-	ruby_targets_jruby? ( >=virtual/jdk-1.5 )"
-
-ruby_add_bdepend dev-ruby/rake
-ruby_add_bdepend test virtual/ruby-test-unit
-
-each_ruby_compile() {
-	case $(basename ${RUBY}) in
-		jruby)
-			${RUBY} -S rake compile_java || die "rake compile failed"
-			;;
-		*)
-			${RUBY} -S rake compile || die "rake compile failed"
-			;;
-	esac
-}
diff --git a/dev-ruby/hpricot/hpricot-0.8.ebuild b/dev-ruby/hpricot/hpricot-0.8.ebuild
deleted file mode 100644
index 83e40be959fa..000000000000
--- a/dev-ruby/hpricot/hpricot-0.8.ebuild
+++ /dev/null
@@ -1,70 +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/hpricot/hpricot-0.8.ebuild,v 1.2 2009/05/09 12:24:23 flameeyes Exp $
-
-EAPI=2
-
-inherit ruby
-
-GITHUB_USER=why
-
-USE_RUBY="ruby18"
-
-DESCRIPTION="A fast and liberal HTML parser for Ruby."
-HOMEPAGE="http://wiki.github.com/why/hpricot"
-
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="doc test"
-
-DEPEND="dev-util/ragel
-	dev-ruby/rake"
-RDEPEND=">=dev-lang/ruby-1.8.4"
-
-dofakegemspec() {
-	cat - > "${T}"/${P}.gemspec <<EOF
-Gem::Specification.new do |s|
-  s.name = "${PN}"
-  s.version = "${PV}"
-  s.summary = "${DESCRIPTION}"
-  s.homepage = "${HOMEPAGE}"
-end
-EOF
-
-	insinto $(${RUBY} -r rbconfig -e 'print Config::CONFIG["vendorlibdir"]' | sed -e 's:vendor_ruby:gems:')/specifications
-	doins "${T}"/${P}.gemspec || die "Unable to install fake gemspec"
-}
-
-src_compile() {
-	rake compile || die "rake failed"
-
-	if use doc; then
-		rake rdoc || die "rake rdoc failed"
-	fi
-}
-
-src_test() {
-	for ruby in $USE_RUBY; do
-		[[ -n `type -p $ruby` ]] || continue
-		$ruby $(type -p rake) test || die "testsuite failed"
-	done
-}
-
-src_install() {
-	pushd lib
-	doruby -r *.rb hpricot || die "doruby failed"
-	exeinto $(${RUBY} -r rbconfig -e 'print Config::CONFIG["sitearchdir"]')
-	doexe *.so || die "doruby failed"
-	popd
-
-	if use doc; then
-		dohtml -r doc/* || die "dohtml failed"
-	fi
-
-	dodoc CHANGELOG README || die "dodoc failed"
-
-	dofakegemspec
-}
diff --git a/dev-ruby/json/ChangeLog b/dev-ruby/json/ChangeLog
index 9ec4ec8b06d7..38a23046730e 100644
--- a/dev-ruby/json/ChangeLog
+++ b/dev-ruby/json/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/json
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/ChangeLog,v 1.28 2010/05/19 19:48:33 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/ChangeLog,v 1.29 2010/05/22 13:36:28 flameeyes Exp $
+
+  22 May 2010; Diego E. Pettenò <flameeyes@gentoo.org> -json-1.2.0.ebuild,
+  json-1.2.2.ebuild, -json-1.2.3.ebuild, -json-1.2.4.ebuild,
+  -json-1.4.2.ebuild, json-1.4.3.ebuild:
+  Cleanup old versions, use new syntax.
 
   19 May 2010; Raúl Porcel <armin76@gentoo.org> json-1.2.2.ebuild:
   ia64/sparc stable wrt #316883
diff --git a/dev-ruby/json/json-1.2.0.ebuild b/dev-ruby/json/json-1.2.0.ebuild
deleted file mode 100644
index 1bf3a31aeaf3..000000000000
--- a/dev-ruby/json/json-1.2.0.ebuild
+++ /dev/null
@@ -1,15 +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/json/json-1.2.0.ebuild,v 1.1 2009/12/04 07:37:52 graaff Exp $
-
-inherit gems
-
-USE_RUBY="ruby18"
-
-DESCRIPTION="A JSON implementation as a Ruby extension."
-HOMEPAGE="http://json.rubyforge.org/"
-LICENSE="|| ( Ruby GPL-2 )"
-
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-IUSE=""
diff --git a/dev-ruby/json/json-1.2.2.ebuild b/dev-ruby/json/json-1.2.2.ebuild
index 2c10dc658310..c92dd8633310 100644
--- a/dev-ruby/json/json-1.2.2.ebuild
+++ b/dev-ruby/json/json-1.2.2.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/json/json-1.2.2.ebuild,v 1.4 2010/05/19 19:48:33 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/json-1.2.2.ebuild,v 1.5 2010/05/22 13:36:28 flameeyes Exp $
 
 EAPI=2
 USE_RUBY="ruby18"
@@ -20,11 +20,12 @@ KEYWORDS="~amd64 ~hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-s
 SLOT="0"
 IUSE=""
 
-RDEPEND=""
-DEPEND="dev-util/ragel"
+RDEPEND="${RDEPEND}"
+DEPEND="${DEPEND}
+	dev-util/ragel"
 
-ruby_add_bdepend test virtual/ruby-test-unit
-ruby_add_bdepend dev-ruby/rake
+ruby_add_bdepend "dev-ruby/rake
+	test? ( virtual/ruby-test-unit )"
 
 all_ruby_prepare() {
 	# Avoid building the extension twice!
diff --git a/dev-ruby/json/json-1.2.3.ebuild b/dev-ruby/json/json-1.2.3.ebuild
deleted file mode 100644
index 3b3fdfd96850..000000000000
--- a/dev-ruby/json/json-1.2.3.ebuild
+++ /dev/null
@@ -1,64 +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/json/json-1.2.3.ebuild,v 1.1 2010/04/04 06:54:38 graaff Exp $
-
-EAPI=2
-USE_RUBY="ruby18 ruby19 jruby"
-
-RUBY_FAKEGEM_TASK_DOC="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES TODO README"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A JSON implementation as a Ruby extension."
-HOMEPAGE="http://json.rubyforge.org/"
-LICENSE="|| ( Ruby GPL-2 )"
-SRC_URI="mirror://rubygems/${P}.gem"
-
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="dev-util/ragel"
-
-ruby_add_bdepend test virtual/ruby-test-unit
-ruby_add_bdepend dev-ruby/rake
-
-all_ruby_prepare() {
-	# Avoid building the extension twice!
-	sed -i \
-		-e 's| => :compile_ext||' \
-		-e 's| => :clean||' \
-		Rakefile || die "rakefile fix failed"
-}
-
-each_ruby_compile() {
-	if [[ $(basename ${RUBY}) != "jruby" ]]; then
-		${RUBY} -S rake compile_ext || die "extension compile failed"
-	fi
-}
-
-each_ruby_test() {
-	# We have to set RUBYLIB because otherwise the tests will run
-	# against the sytem-installed json; at the same time, we cannot
-	# use the -I parameter because rake won't let it pass to the
-	# testrb call that is executed down the road.
-
-	RUBYLIB="${RUBYLIB}${RUBYLIB+:}lib:ext/json/ext" \
-		${RUBY} -S rake test_pure || die "pure ruby tests failed"
-
-	if [[ $(basename ${RUBY}) != "jruby" ]]; then
-		RUBYLIB="${RUBYLIB}${RUBYLIB+:}lib:ext/json/ext" \
-			${RUBY} -Ilib:ext/json/ext -S rake test_ext || die " ruby extension tests failed"
-	fi
-}
-
-each_ruby_install() {
-	each_fakegem_install
-	if [[ $(basename ${RUBY}) != "jruby" ]]; then
-		ruby_fakegem_newins ext/json/ext/generator.so lib/json/generator.so
-		ruby_fakegem_newins ext/json/ext/parser.so lib/json/parser.so
-	fi
-}
diff --git a/dev-ruby/json/json-1.2.4.ebuild b/dev-ruby/json/json-1.2.4.ebuild
deleted file mode 100644
index 6de72cf9cc5f..000000000000
--- a/dev-ruby/json/json-1.2.4.ebuild
+++ /dev/null
@@ -1,64 +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/json/json-1.2.4.ebuild,v 1.1 2010/04/11 06:54:26 graaff Exp $
-
-EAPI=2
-USE_RUBY="ruby18 ruby19 jruby"
-
-RUBY_FAKEGEM_TASK_DOC="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES TODO README"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A JSON implementation as a Ruby extension."
-HOMEPAGE="http://json.rubyforge.org/"
-LICENSE="|| ( Ruby GPL-2 )"
-SRC_URI="mirror://rubygems/${P}.gem"
-
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="dev-util/ragel"
-
-ruby_add_bdepend test virtual/ruby-test-unit
-ruby_add_bdepend dev-ruby/rake
-
-all_ruby_prepare() {
-	# Avoid building the extension twice!
-	sed -i \
-		-e 's| => :compile_ext||' \
-		-e 's| => :clean||' \
-		Rakefile || die "rakefile fix failed"
-}
-
-each_ruby_compile() {
-	if [[ $(basename ${RUBY}) != "jruby" ]]; then
-		${RUBY} -S rake compile_ext || die "extension compile failed"
-	fi
-}
-
-each_ruby_test() {
-	# We have to set RUBYLIB because otherwise the tests will run
-	# against the sytem-installed json; at the same time, we cannot
-	# use the -I parameter because rake won't let it pass to the
-	# testrb call that is executed down the road.
-
-	RUBYLIB="${RUBYLIB}${RUBYLIB+:}lib:ext/json/ext" \
-		${RUBY} -S rake test_pure || die "pure ruby tests failed"
-
-	if [[ $(basename ${RUBY}) != "jruby" ]]; then
-		RUBYLIB="${RUBYLIB}${RUBYLIB+:}lib:ext/json/ext" \
-			${RUBY} -Ilib:ext/json/ext -S rake test_ext || die " ruby extension tests failed"
-	fi
-}
-
-each_ruby_install() {
-	each_fakegem_install
-	if [[ $(basename ${RUBY}) != "jruby" ]]; then
-		ruby_fakegem_newins ext/json/ext/generator.so lib/json/generator.so
-		ruby_fakegem_newins ext/json/ext/parser.so lib/json/parser.so
-	fi
-}
diff --git a/dev-ruby/json/json-1.4.2.ebuild b/dev-ruby/json/json-1.4.2.ebuild
deleted file mode 100644
index 3d161e4783dc..000000000000
--- a/dev-ruby/json/json-1.4.2.ebuild
+++ /dev/null
@@ -1,64 +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/json/json-1.4.2.ebuild,v 1.1 2010/04/30 08:30:03 graaff Exp $
-
-EAPI=2
-USE_RUBY="ruby18 ruby19 jruby"
-
-RUBY_FAKEGEM_TASK_DOC="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES TODO README"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A JSON implementation as a Ruby extension."
-HOMEPAGE="http://json.rubyforge.org/"
-LICENSE="|| ( Ruby GPL-2 )"
-SRC_URI="mirror://rubygems/${P}.gem"
-
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="dev-util/ragel"
-
-ruby_add_bdepend test virtual/ruby-test-unit
-ruby_add_bdepend dev-ruby/rake
-
-all_ruby_prepare() {
-	# Avoid building the extension twice!
-	sed -i \
-		-e 's| => :compile_ext||' \
-		-e 's| => :clean||' \
-		Rakefile || die "rakefile fix failed"
-}
-
-each_ruby_compile() {
-	if [[ $(basename ${RUBY}) != "jruby" ]]; then
-		${RUBY} -S rake compile_ext || die "extension compile failed"
-	fi
-}
-
-each_ruby_test() {
-	# We have to set RUBYLIB because otherwise the tests will run
-	# against the sytem-installed json; at the same time, we cannot
-	# use the -I parameter because rake won't let it pass to the
-	# testrb call that is executed down the road.
-
-	RUBYLIB="${RUBYLIB}${RUBYLIB+:}lib:ext/json/ext" \
-		${RUBY} -S rake test_pure || die "pure ruby tests failed"
-
-	if [[ $(basename ${RUBY}) != "jruby" ]]; then
-		RUBYLIB="${RUBYLIB}${RUBYLIB+:}lib:ext/json/ext" \
-			${RUBY} -Ilib:ext/json/ext -S rake test_ext || die " ruby extension tests failed"
-	fi
-}
-
-each_ruby_install() {
-	each_fakegem_install
-	if [[ $(basename ${RUBY}) != "jruby" ]]; then
-		ruby_fakegem_newins ext/json/ext/generator.so lib/json/generator.so
-		ruby_fakegem_newins ext/json/ext/parser.so lib/json/parser.so
-	fi
-}
diff --git a/dev-ruby/json/json-1.4.3.ebuild b/dev-ruby/json/json-1.4.3.ebuild
index 07a35439a116..377adf5f701e 100644
--- a/dev-ruby/json/json-1.4.3.ebuild
+++ b/dev-ruby/json/json-1.4.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/json/json-1.4.3.ebuild,v 1.1 2010/05/07 05:43:53 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/json-1.4.3.ebuild,v 1.2 2010/05/22 13:36:28 flameeyes Exp $
 
 EAPI=2
 USE_RUBY="ruby18 ruby19 jruby"
@@ -20,11 +20,12 @@ KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x8
 SLOT="0"
 IUSE=""
 
-RDEPEND=""
-DEPEND="dev-util/ragel"
+RDEPEND="${RDEPEND}"
+DEPEND="${DEPEND}
+	dev-util/ragel"
 
-ruby_add_bdepend test virtual/ruby-test-unit
-ruby_add_bdepend dev-ruby/rake
+ruby_add_bdepend "dev-ruby/rake
+	test? ( virtual/ruby-test-unit )"
 
 all_ruby_prepare() {
 	# Avoid building the extension twice!
diff --git a/dev-ruby/mocha/ChangeLog b/dev-ruby/mocha/ChangeLog
index c084e1f37cb5..b4cdfa4108e5 100644
--- a/dev-ruby/mocha/ChangeLog
+++ b/dev-ruby/mocha/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/mocha
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mocha/ChangeLog,v 1.17 2010/01/16 14:29:11 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mocha/ChangeLog,v 1.18 2010/05/22 13:38:18 flameeyes Exp $
+
+  22 May 2010; Diego E. Pettenò <flameeyes@gentoo.org> -mocha-0.9.8.ebuild,
+  -mocha-0.9.8-r1.ebuild, mocha-0.9.8-r2.ebuild:
+  Cleanup old versions, use new syntax.
 
   16 Jan 2010; Raúl Porcel <armin76@gentoo.org> mocha-0.9.8-r2.ebuild:
   Add ~ia64/~sparc wrt #300372
diff --git a/dev-ruby/mocha/mocha-0.9.8-r1.ebuild b/dev-ruby/mocha/mocha-0.9.8-r1.ebuild
deleted file mode 100644
index 3d58a0dc8132..000000000000
--- a/dev-ruby/mocha/mocha-0.9.8-r1.ebuild
+++ /dev/null
@@ -1,38 +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/mocha/mocha-0.9.8-r1.ebuild,v 1.2 2009/12/30 13:26:43 armin76 Exp $
-
-EAPI=2
-USE_RUBY="ruby18 ruby19 jruby"
-
-RUBY_FAKEGEM_TASK_TEST="test:units"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README RELEASE"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby library for mocking and stubbing using a syntax like that of JMock, and SchMock"
-HOMEPAGE="http://mocha.rubyforge.org/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~sparc ~x86"
-IUSE=""
-
-ruby_add_bdepend test virtual/ruby-test-unit
-
-all_ruby_compile() {
-	all_fakegem_compile
-
-	if use doc; then
-		rake examples || die
-	fi
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc examples/*.rb || die
-}
diff --git a/dev-ruby/mocha/mocha-0.9.8-r2.ebuild b/dev-ruby/mocha/mocha-0.9.8-r2.ebuild
index 76e04857cac8..48dfa874fc5c 100644
--- a/dev-ruby/mocha/mocha-0.9.8-r2.ebuild
+++ b/dev-ruby/mocha/mocha-0.9.8-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/mocha/mocha-0.9.8-r2.ebuild,v 1.4 2010/01/16 14:29:11 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mocha/mocha-0.9.8-r2.ebuild,v 1.5 2010/05/22 13:38:18 flameeyes Exp $
 
 EAPI=2
 USE_RUBY="ruby18 ruby19 jruby"
@@ -20,8 +20,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
-ruby_add_bdepend test virtual/ruby-test-unit
-ruby_add_bdepend doc dev-ruby/coderay
+ruby_add_bdepend "
+	test? ( virtual/ruby-test-unit )
+	doc? ( dev-ruby/coderay )"
 
 all_ruby_compile() {
 	all_fakegem_compile
diff --git a/dev-ruby/mocha/mocha-0.9.8.ebuild b/dev-ruby/mocha/mocha-0.9.8.ebuild
deleted file mode 100644
index 243bc20cf7c3..000000000000
--- a/dev-ruby/mocha/mocha-0.9.8.ebuild
+++ /dev/null
@@ -1,18 +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/mocha/mocha-0.9.8.ebuild,v 1.2 2009/12/30 13:26:43 armin76 Exp $
-
-inherit gems
-
-USE_RUBY="ruby18"
-
-DESCRIPTION="A Ruby library for mocking and stubbing using a syntax like that of JMock, and SchMock"
-HOMEPAGE="http://mocha.rubyforge.org/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="dev-ruby/rake"
-RDEPEND="${DEPEND}"
diff --git a/dev-ruby/net-sftp/ChangeLog b/dev-ruby/net-sftp/ChangeLog
index e62462604fd5..309540f6df5c 100644
--- a/dev-ruby/net-sftp/ChangeLog
+++ b/dev-ruby/net-sftp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/net-sftp
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/net-sftp/ChangeLog,v 1.39 2010/02/28 08:09:41 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/net-sftp/ChangeLog,v 1.40 2010/05/22 13:40:38 flameeyes Exp $
+
+  22 May 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -net-sftp-2.0.4.ebuild, net-sftp-2.0.4-r1.ebuild:
+  Cleanup old versions, use new syntax.
 
   28 Feb 2010; Hans de Graaff <graaff@gentoo.org> -net-sftp-1.1.1.ebuild:
   Remove masked version.
diff --git a/dev-ruby/net-sftp/net-sftp-2.0.4-r1.ebuild b/dev-ruby/net-sftp/net-sftp-2.0.4-r1.ebuild
index 35cb217245e3..345c186eedee 100644
--- a/dev-ruby/net-sftp/net-sftp-2.0.4-r1.ebuild
+++ b/dev-ruby/net-sftp/net-sftp-2.0.4-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/net-sftp/net-sftp-2.0.4-r1.ebuild,v 1.2 2010/01/30 17:39:52 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/net-sftp/net-sftp-2.0.4-r1.ebuild,v 1.3 2010/05/22 13:40:38 flameeyes Exp $
 
 EAPI="2"
 USE_RUBY="ruby18"
@@ -21,5 +21,6 @@ IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/net-ssh-2.0.17-r1"
 
-ruby_add_bdepend doc dev-ruby/echoe
-ruby_add_bdepend test dev-ruby/echoe
+ruby_add_bdepend "
+	doc? ( dev-ruby/echoe )
+	test? ( dev-ruby/echoe )"
diff --git a/dev-ruby/net-sftp/net-sftp-2.0.4.ebuild b/dev-ruby/net-sftp/net-sftp-2.0.4.ebuild
deleted file mode 100644
index a605d08cff7c..000000000000
--- a/dev-ruby/net-sftp/net-sftp-2.0.4.ebuild
+++ /dev/null
@@ -1,17 +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/net-sftp/net-sftp-2.0.4.ebuild,v 1.2 2010/01/04 10:52:40 fauli Exp $
-
-inherit gems
-
-DESCRIPTION="SFTP in pure Ruby"
-HOMEPAGE="http://net-ssh.rubyforge.org/"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-USE_RUBY="ruby18"
-
-RDEPEND=">=dev-ruby/net-ssh-2.0.9"
-DEPEND="${RDEPEND}"