Version bump, remove old versions, restrict tests again, remove jruby support for now, even though the ebuild is ready to handle it properly this time.

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

6 files changed, 69 insertions, 113 deletions

diff --git a/dev-ruby/rcov/ChangeLog b/dev-ruby/rcov/ChangeLog
index 311c262382ee..8490736f2918 100644
--- a/dev-ruby/rcov/ChangeLog
+++ b/dev-ruby/rcov/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-ruby/rcov
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rcov/ChangeLog,v 1.10 2009/12/28 12:15:33 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rcov/ChangeLog,v 1.11 2009/12/29 19:29:13 flameeyes Exp $
+
+*rcov-0.9.7.1 (29 Dec 2009)
+
+  29 Dec 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  -rcov-0.8.1.2.0.ebuild, -rcov-0.9.6.ebuild, -rcov-0.9.6-r1.ebuild,
+  -rcov-0.9.7.ebuild, +rcov-0.9.7.1.ebuild:
+  Version bump, remove old versions, restrict tests again, remove jruby
+  support for now, even though the ebuild is ready to handle it properly
+  this time.
 
 *rcov-0.9.7 (28 Dec 2009)
 
diff --git a/dev-ruby/rcov/rcov-0.8.1.2.0.ebuild b/dev-ruby/rcov/rcov-0.8.1.2.0.ebuild
deleted file mode 100644
index 2d21a556cafa..000000000000
--- a/dev-ruby/rcov/rcov-0.8.1.2.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rcov/rcov-0.8.1.2.0.ebuild,v 1.1 2007/11/23 11:37:12 graaff Exp $
-
-inherit ruby gems
-
-DESCRIPTION="A ruby code coverage analysis tool"
-HOMEPAGE="http://eigenclass.org/hiki.rb?rcov"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND=">=dev-lang/ruby-1.8.3"
diff --git a/dev-ruby/rcov/rcov-0.9.6-r1.ebuild b/dev-ruby/rcov/rcov-0.9.6-r1.ebuild
deleted file mode 100644
index e01b0f73428c..000000000000
--- a/dev-ruby/rcov/rcov-0.9.6-r1.ebuild
+++ /dev/null
@@ -1,44 +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/rcov/rcov-0.9.6-r1.ebuild,v 1.1 2009/12/25 15:24:23 flameeyes Exp $
-
-EAPI=2
-
-USE_RUBY="ruby18 ruby19 jruby"
-
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="THANKS BLURB"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A ruby code coverage analysis tool"
-HOMEPAGE="http://eigenclass.org/hiki.rb?rcov"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-# TODO: both emacs and vim support are present in this package, they
-# should probably be added to the ebuild as well.
-IUSE=""
-
-# tests fail because the gem does not package the needed files, and
-# there is no tag in github to fetch a tarball.
-# http://github.com/relevance/rcov/issues/#issue/36
-RESTRICT=test
-
-each_ruby_compile() {
-	if [[ $(basename ${RUBY}) != "jruby" ]]; then
-		${RUBY} -S rake ext/rcovrt/rcovrt.so || die "build failed"
-	fi
-}
-
-each_ruby_install() {
-	each_fakegem_install
-
-	if [[ $(basename ${RUBY}) != "jruby" ]]; then
-		ruby_fakegem_newins ext/rcovrt/rcovrt.so lib/rcovrt.so
-	fi
-}
diff --git a/dev-ruby/rcov/rcov-0.9.6.ebuild b/dev-ruby/rcov/rcov-0.9.6.ebuild
deleted file mode 100644
index 0159b239dc78..000000000000
--- a/dev-ruby/rcov/rcov-0.9.6.ebuild
+++ /dev/null
@@ -1,14 +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/rcov/rcov-0.9.6.ebuild,v 1.1 2009/12/05 08:32:25 graaff Exp $
-
-inherit ruby gems
-
-DESCRIPTION="A ruby code coverage analysis tool"
-HOMEPAGE="http://eigenclass.org/hiki.rb?rcov"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-USE_RUBY="ruby18"
diff --git a/dev-ruby/rcov/rcov-0.9.7.1.ebuild b/dev-ruby/rcov/rcov-0.9.7.1.ebuild
new file mode 100644
index 000000000000..4676066399b9
--- /dev/null
+++ b/dev-ruby/rcov/rcov-0.9.7.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rcov/rcov-0.9.7.1.ebuild,v 1.1 2009/12/29 19:29:13 flameeyes Exp $
+
+EAPI=2
+
+# jruby → is supported but there is something strange, maybe we need a
+# newer version of it.
+USE_RUBY="ruby18 ruby19"
+
+RUBY_FAKEGEM_TASK_TEST="test_rcovrt"
+
+RUBY_FAKEGEM_DOCDIR="rdoc"
+RUBY_FAKEGEM_EXTRADOC="THANKS BLURB"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="A ruby code coverage analysis tool"
+HOMEPAGE="http://eigenclass.org/hiki.rb?rcov"
+SRC_URI="http://github.com/relevance/${PN}/tarball/release_$(replace_all_version_separators _) -> ${P}.tgz"
+
+S="${WORKDIR}/relevance-${PN}-6f33de1"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+# TODO: both emacs and vim support are present in this package, they
+# should probably be added to the ebuild as well.
+IUSE=""
+
+# Tests are currently failing but upstream says it should be fine, I
+# think it's a bug in their code but we'll see.
+RESTRICT=test
+
+all_ruby_prepare() {
+	# Without this change, testing will always cause the extension to
+	# be rebuilt, and we don't want that.
+	sed -i -e '/:test_rcovrt =>/s| => \[.*\]||' Rakefile || "Rakefile fix failed"
+
+	# remove pre-packaged jar file (d'oh!)
+	rm lib/rcovrt.jar || die
+}
+
+each_ruby_compile() {
+	if [[ $(basename ${RUBY}) = "jruby" ]]; then
+		${RUBY} -S rake lib/rcovrt.jar || die "build failed"
+	else
+		${RUBY} -S rake ext/rcovrt/rcovrt.so || die "build failed"
+	fi
+}
+
+each_ruby_install() {
+	each_fakegem_install
+
+	if [[ $(basename ${RUBY}) != "jruby" ]]; then
+		ruby_fakegem_newins ext/rcovrt/rcovrt.so lib/rcovrt.so
+	fi
+}
diff --git a/dev-ruby/rcov/rcov-0.9.7.ebuild b/dev-ruby/rcov/rcov-0.9.7.ebuild
deleted file mode 100644
index 730e1f243ee8..000000000000
--- a/dev-ruby/rcov/rcov-0.9.7.ebuild
+++ /dev/null
@@ -1,39 +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/rcov/rcov-0.9.7.ebuild,v 1.1 2009/12/28 12:15:33 flameeyes Exp $
-
-EAPI=2
-
-USE_RUBY="ruby18 ruby19 jruby"
-
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="THANKS BLURB"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A ruby code coverage analysis tool"
-HOMEPAGE="http://eigenclass.org/hiki.rb?rcov"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-# TODO: both emacs and vim support are present in this package, they
-# should probably be added to the ebuild as well.
-IUSE=""
-
-each_ruby_compile() {
-	if [[ $(basename ${RUBY}) != "jruby" ]]; then
-		${RUBY} -S rake ext/rcovrt/rcovrt.so || die "build failed"
-	fi
-}
-
-each_ruby_install() {
-	each_fakegem_install
-
-	if [[ $(basename ${RUBY}) != "jruby" ]]; then
-		ruby_fakegem_newins ext/rcovrt/rcovrt.so lib/rcovrt.so
-	fi
-}