summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Graaff <graaff@gentoo.org>2014-11-01 09:29:33 +0000
committerHans de Graaff <graaff@gentoo.org>2014-11-01 09:29:33 +0000
commite9343df4ecd2a7a3255966d8bb1c6d21960fe4af (patch)
treeac139bc6c015bb54084f5de1ae54236bedfb2336 /dev-ruby/merb-core
parentIndicate ruby21 status. (diff)
downloadgentoo-2-e9343df4ecd2a7a3255966d8bb1c6d21960fe4af.tar.gz
gentoo-2-e9343df4ecd2a7a3255966d8bb1c6d21960fe4af.tar.bz2
gentoo-2-e9343df4ecd2a7a3255966d8bb1c6d21960fe4af.zip
Avoid obsolete rake task, fixing bug 527354.
(Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!)
Diffstat (limited to 'dev-ruby/merb-core')
-rw-r--r--dev-ruby/merb-core/ChangeLog5
-rw-r--r--dev-ruby/merb-core/merb-core-1.1.3-r1.ebuild5
2 files changed, 8 insertions, 2 deletions
diff --git a/dev-ruby/merb-core/ChangeLog b/dev-ruby/merb-core/ChangeLog
index 3fccfeb08e56..9282685c916f 100644
--- a/dev-ruby/merb-core/ChangeLog
+++ b/dev-ruby/merb-core/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-ruby/merb-core
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/merb-core/ChangeLog,v 1.9 2014/05/21 02:02:07 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/merb-core/ChangeLog,v 1.10 2014/11/01 09:29:33 graaff Exp $
+
+ 01 Nov 2014; Hans de Graaff <graaff@gentoo.org> merb-core-1.1.3-r1.ebuild:
+ Avoid obsolete rake task, fixing bug 527354.
21 May 2014; Manuel Rüger <mrueg@gentoo.org> merb-core-1.1.3-r1.ebuild:
Remove ruby18 target.
diff --git a/dev-ruby/merb-core/merb-core-1.1.3-r1.ebuild b/dev-ruby/merb-core/merb-core-1.1.3-r1.ebuild
index efe651d53812..a2515880d4b1 100644
--- a/dev-ruby/merb-core/merb-core-1.1.3-r1.ebuild
+++ b/dev-ruby/merb-core/merb-core-1.1.3-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/merb-core/merb-core-1.1.3-r1.ebuild,v 1.2 2014/05/21 02:02:07 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/merb-core/merb-core-1.1.3-r1.ebuild,v 1.3 2014/11/01 09:29:33 graaff Exp $
EAPI=5
USE_RUBY="ruby19 ruby20"
@@ -38,4 +38,7 @@ all_ruby_prepare() {
# Remove unpackaged tool so that we can use the Rakefile.
sed -i -e '/annotation_extract/d' -e 's#spec/rake/spectask#rspec/core/rake_task#'\
-e 's#Spec::Rake::SpecTask#RSpec::Core::RakeTask#' Rakefile || die
+
+ # Avoid obsolete rake task.
+ sed -i -e 's:rake/rdoctask:rdoc/task:' Rakefile || die
}