summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2006-06-02 13:28:16 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2006-06-02 13:28:16 +0000
commit8a4a0b06e4a9b3862337e9b623c8be443f224b39 (patch)
tree0f480799657cd7fa354ac1c728f52bd743dd7635 /dev-ruby/rails
parentRevision bump to use genpatches-2.6.16-11. (diff)
downloadgentoo-2-8a4a0b06e4a9b3862337e9b623c8be443f224b39.tar.gz
gentoo-2-8a4a0b06e4a9b3862337e9b623c8be443f224b39.tar.bz2
gentoo-2-8a4a0b06e4a9b3862337e9b623c8be443f224b39.zip
Add patch to fix rdoc call with rake 0.7. Thanks to Stephen Tallowitz in bug #132692.
(Portage version: 2.1_rc3-r5)
Diffstat (limited to 'dev-ruby/rails')
-rw-r--r--dev-ruby/rails/ChangeLog7
-rw-r--r--dev-ruby/rails/files/rails-1.0.0-rdoc-rake-0.7.patch13
-rw-r--r--dev-ruby/rails/rails-1.0.0.ebuild12
3 files changed, 30 insertions, 2 deletions
diff --git a/dev-ruby/rails/ChangeLog b/dev-ruby/rails/ChangeLog
index c42bdde7961a..6d327020c4c9 100644
--- a/dev-ruby/rails/ChangeLog
+++ b/dev-ruby/rails/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-ruby/rails
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails/ChangeLog,v 1.47 2006/05/16 05:11:32 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails/ChangeLog,v 1.48 2006/06/02 13:28:16 flameeyes Exp $
+
+ 02 Jun 2006; Diego Pettenò <flameeyes@gentoo.org>
+ +files/rails-1.0.0-rdoc-rake-0.7.patch, rails-1.0.0.ebuild:
+ Add patch to fix rdoc call with rake 0.7. Thanks to Stephen Tallowitz in bug
+ #132692.
16 May 2006; Joshua Jackson <tsunam@gentoo.org> rails-1.1.2.ebuild:
x86 stable; bug #133003
diff --git a/dev-ruby/rails/files/rails-1.0.0-rdoc-rake-0.7.patch b/dev-ruby/rails/files/rails-1.0.0-rdoc-rake-0.7.patch
new file mode 100644
index 000000000000..3618d4ce2f88
--- /dev/null
+++ b/dev-ruby/rails/files/rails-1.0.0-rdoc-rake-0.7.patch
@@ -0,0 +1,13 @@
+Index: rails-1.0.0/lib/tasks/documentation.rake
+===================================================================
+--- rails-1.0.0.orig/lib/tasks/documentation.rake
++++ rails-1.0.0/lib/tasks/documentation.rake
+@@ -2,7 +2,7 @@ desc "Generate documentation for the app
+ Rake::RDocTask.new("appdoc") { |rdoc|
+ rdoc.rdoc_dir = 'doc/app'
+ rdoc.title = "Rails Application Documentation"
+- rdoc.options << '--line-numbers --inline-source'
++ rdoc.options << '--line-numbers' << '--inline-source'
+ rdoc.rdoc_files.include('doc/README_FOR_APP')
+ rdoc.rdoc_files.include('app/**/*.rb')
+ }
diff --git a/dev-ruby/rails/rails-1.0.0.ebuild b/dev-ruby/rails/rails-1.0.0.ebuild
index f08e7acfa279..e48ace1844c4 100644
--- a/dev-ruby/rails/rails-1.0.0.ebuild
+++ b/dev-ruby/rails/rails-1.0.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails/rails-1.0.0.ebuild,v 1.6 2006/03/31 12:04:27 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails/rails-1.0.0.ebuild,v 1.7 2006/06/02 13:28:16 flameeyes Exp $
inherit ruby gems
@@ -25,3 +25,13 @@ DEPEND=">=dev-lang/ruby-1.8.2
sqlite? ( >=dev-ruby/sqlite-ruby-2.2.2 )
mysql? ( >=dev-ruby/mysql-ruby-2.7 )
postgres? ( >=dev-ruby/ruby-postgres-0.7.1 )"
+
+src_install() {
+ gems_src_install
+
+ # gems extract and install the data all in one step, so we have to patch it
+ # here, it's not compiled anyway
+ cd "${D}/${GEMSDIR}/gems/"
+ epatch "${FILESDIR}/${P}-rdoc-rake-0.7.patch"
+}
+