summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2009-12-17 14:15:23 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2009-12-17 14:15:23 +0000
commit6e0ad19c5645d5fd602d2547b28fc387c4e5e35e (patch)
tree267d728ba5faf5318e9ba17430c3b28768aaa412 /dev-ruby/rake
parentVersion bump. (diff)
downloadgentoo-2-6e0ad19c5645d5fd602d2547b28fc387c4e5e35e.tar.gz
gentoo-2-6e0ad19c5645d5fd602d2547b28fc387c4e5e35e.tar.bz2
gentoo-2-6e0ad19c5645d5fd602d2547b28fc387c4e5e35e.zip
Fix bug #297237: remember to load rake from the build directory since it might not be installed. Also make sure to respect the doc USE flag (slipped away in the previous fixes).
(Portage version: 2.2_rc59/cvs/Linux x86_64)
Diffstat (limited to 'dev-ruby/rake')
-rw-r--r--dev-ruby/rake/ChangeLog8
-rw-r--r--dev-ruby/rake/rake-0.8.7-r2.ebuild10
2 files changed, 13 insertions, 5 deletions
diff --git a/dev-ruby/rake/ChangeLog b/dev-ruby/rake/ChangeLog
index 6e34aeab5ec6..af1c16007d0a 100644
--- a/dev-ruby/rake/ChangeLog
+++ b/dev-ruby/rake/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-ruby/rake
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rake/ChangeLog,v 1.86 2009/12/16 17:51:49 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rake/ChangeLog,v 1.87 2009/12/17 14:15:23 flameeyes Exp $
+
+ 17 Dec 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+ rake-0.8.7-r2.ebuild:
+ Fix bug #297237: remember to load rake from the build directory since it
+ might not be installed. Also make sure to respect the doc USE flag
+ (slipped away in the previous fixes).
16 Dec 2009; Diego E. Pettenò <flameeyes@gentoo.org>
rake-0.8.7-r2.ebuild:
diff --git a/dev-ruby/rake/rake-0.8.7-r2.ebuild b/dev-ruby/rake/rake-0.8.7-r2.ebuild
index e1e259360778..fa0c1f596e46 100644
--- a/dev-ruby/rake/rake-0.8.7-r2.ebuild
+++ b/dev-ruby/rake/rake-0.8.7-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rake/rake-0.8.7-r2.ebuild,v 1.3 2009/12/16 17:51:49 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rake/rake-0.8.7-r2.ebuild,v 1.4 2009/12/17 14:15:23 flameeyes Exp $
EAPI=2
USE_RUBY="ruby18 ruby19 jruby"
@@ -17,18 +17,20 @@ SRC_URI="mirror://rubyforge/${PN}/${P}.tgz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="bash-completion"
+IUSE="bash-completion doc"
#ruby_add_bdepend test dev-ruby/flexmock
RESTRICT="test"
all_ruby_compile() {
- bin/rake rdoc || die "doc generation failed"
+ if use doc; then
+ ruby -Ilib bin/rake rdoc || die "doc generation failed"
+ fi
}
each_ruby_test() {
- ${RUBY} bin/rake test || die "tests failed"
+ ${RUBY} -Ilib bin/rake test || die "tests failed"
}
all_ruby_install() {