Cleanup old versions, use new syntax.

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

4 files changed, 15 insertions, 63 deletions

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