summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Graaff <graaff@gentoo.org>2014-11-01 09:31:00 +0000
committerHans de Graaff <graaff@gentoo.org>2014-11-01 09:31:00 +0000
commita1291a054111c775ae15cb0ae826583a93886ed0 (patch)
tree1c217f12455f04a26029ce1116c73022afcd9f85 /dev-ruby/merb-helpers
parentAvoid obsolete rake task, fixing bug 527354. (diff)
downloadgentoo-2-a1291a054111c775ae15cb0ae826583a93886ed0.tar.gz
gentoo-2-a1291a054111c775ae15cb0ae826583a93886ed0.tar.bz2
gentoo-2-a1291a054111c775ae15cb0ae826583a93886ed0.zip
Avoid obsolete rake task, fixing bug 527348. Add ruby20.
(Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!)
Diffstat (limited to 'dev-ruby/merb-helpers')
-rw-r--r--dev-ruby/merb-helpers/ChangeLog5
-rw-r--r--dev-ruby/merb-helpers/merb-helpers-1.1.3.ebuild8
2 files changed, 10 insertions, 3 deletions
diff --git a/dev-ruby/merb-helpers/ChangeLog b/dev-ruby/merb-helpers/ChangeLog
index b082d456dca0..b5d9b9886b71 100644
--- a/dev-ruby/merb-helpers/ChangeLog
+++ b/dev-ruby/merb-helpers/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-ruby/merb-helpers
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/merb-helpers/ChangeLog,v 1.6 2014/04/25 00:54:04 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/merb-helpers/ChangeLog,v 1.7 2014/11/01 09:31:00 graaff Exp $
+
+ 01 Nov 2014; Hans de Graaff <graaff@gentoo.org> merb-helpers-1.1.3.ebuild:
+ Avoid obsolete rake task, fixing bug 527348. Add ruby20.
25 Apr 2014; Manuel Rüger <mrueg@gentoo.org> merb-helpers-1.1.3.ebuild:
Remove ruby18 support. EAPI bump.
diff --git a/dev-ruby/merb-helpers/merb-helpers-1.1.3.ebuild b/dev-ruby/merb-helpers/merb-helpers-1.1.3.ebuild
index 49b02638a2e3..2c0672f198e4 100644
--- a/dev-ruby/merb-helpers/merb-helpers-1.1.3.ebuild
+++ b/dev-ruby/merb-helpers/merb-helpers-1.1.3.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/merb-helpers/merb-helpers-1.1.3.ebuild,v 1.3 2014/04/25 00:54:04 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/merb-helpers/merb-helpers-1.1.3.ebuild,v 1.4 2014/11/01 09:31:00 graaff Exp $
EAPI=5
-USE_RUBY="ruby19"
+USE_RUBY="ruby19 ruby20"
RUBY_FAKEGEM_TASK_TEST="spec"
@@ -27,3 +27,7 @@ RESTRICT="test"
ruby_add_bdepend "test? ( dev-ruby/rspec:0 )"
ruby_add_rdepend "~dev-ruby/merb-core-${PV}"
+
+all_ruby_prepare() {
+ sed -i -e 's:rake/rdoctask:rdoc/task:' Rakefile || die
+}