Cleanup old versions, use new syntax.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 9 insertions, 60 deletions

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}"