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
commit64e1aad65ee468b1628ee2f610fa9bbe8aa87236 (patch)
tree4b3017d513ecbe0e3b895d140ecc928146dcf29f /dev-ruby
parentRevision bump to use genpatches-2.6.16-11. (diff)
downloadhistorical-64e1aad65ee468b1628ee2f610fa9bbe8aa87236.tar.gz
historical-64e1aad65ee468b1628ee2f610fa9bbe8aa87236.tar.bz2
historical-64e1aad65ee468b1628ee2f610fa9bbe8aa87236.zip
Add patch to fix rdoc call with rake 0.7. Thanks to Stephen Tallowitz in bug #132692.
Package-Manager: portage-2.1_rc3-r5
Diffstat (limited to 'dev-ruby')
-rw-r--r--dev-ruby/rails/ChangeLog7
-rw-r--r--dev-ruby/rails/Manifest42
-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
4 files changed, 53 insertions, 21 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/Manifest b/dev-ruby/rails/Manifest
index 6c4e11ec6f0d..b9339b8ee779 100644
--- a/dev-ruby/rails/Manifest
+++ b/dev-ruby/rails/Manifest
@@ -1,31 +1,35 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-DIST rails-1.0.0.gem 128512 RMD160 8f957402f1360ed2d58287a0db2e087be44bb27a SHA256 52b06ee61c4826f545f6e4e6c33eef8f8772f6a1f5ce66a812abab2b5388aed2 size 128512
-DIST rails-1.1.0.gem 142336 RMD160 2df62e04b64f2b88423730f5c8bf4adfbe54cc7f SHA256 b4d455cb02eae13ec3b48abbd95cfeaf5c05cd092ab9fe4fd809636d1bab3e6c size 142336
-DIST rails-1.1.1.gem 145920 RMD160 0151c08fae0e0c39f41d0e7c0bb8196840ef2203 SHA256 6c54ca011610c17c1c0ad6816480b596b008f450b875141ebd10ed65b0e4d3df size 145920
-DIST rails-1.1.2.gem 144896 RMD160 ad99236cdf95111a2dda5919f863c8c9d62496c4 SHA256 1ffd33463d5ed4aa4079f46816dd08af3028f361e623be57a6dec9784263f26f size 144896
-EBUILD rails-1.0.0.ebuild 963 RMD160 d6c85fe3762994f75ef973e15fb0ea5a472b21f7 SHA1 1582f8e2762f85a4d6c616a6079c4151fb3f49c1 SHA256 968c75c725120f0d44f15b84b4788ec83339f32aec164329acc4ed47d2291277 size 963
-MD5 1b245428d43c60333880f15e84272811 rails-1.0.0.ebuild 963
-RMD160 d6c85fe3762994f75ef973e15fb0ea5a472b21f7 rails-1.0.0.ebuild 963
-SHA256 968c75c725120f0d44f15b84b4788ec83339f32aec164329acc4ed47d2291277 rails-1.0.0.ebuild 963
-EBUILD rails-1.1.0.ebuild 1015 RMD160 2d6c20cbb65533daf98e086418fef2d1913ee020 SHA1 9387e3bd381e1da4d9905e7ef478114ef7feb8a5 SHA256 a80d4321832610a80d9b4cb092e5f34c8e600257536a982d99297621fe9550b1 size 1015
+AUX rails-1.0.0-rdoc-rake-0.7.patch 592 RMD160 c6ebbe8af78567a0b7442314039ceb2ea6cc9c01 SHA1 bec34b7c1328ff3c1f982a1657f833dc826885c3 SHA256 ceb27cd17751068f13f0304ce920ae5c4e9fcc3b18f1eed60cfbff50bfdbbc80
+MD5 7ec822e965fdef65abb73efbff2a7153 files/rails-1.0.0-rdoc-rake-0.7.patch 592
+RMD160 c6ebbe8af78567a0b7442314039ceb2ea6cc9c01 files/rails-1.0.0-rdoc-rake-0.7.patch 592
+SHA256 ceb27cd17751068f13f0304ce920ae5c4e9fcc3b18f1eed60cfbff50bfdbbc80 files/rails-1.0.0-rdoc-rake-0.7.patch 592
+DIST rails-1.0.0.gem 128512 RMD160 8f957402f1360ed2d58287a0db2e087be44bb27a SHA1 95c190169ebdde5aeb3daf83ac2b0aed0445e3ba SHA256 52b06ee61c4826f545f6e4e6c33eef8f8772f6a1f5ce66a812abab2b5388aed2
+DIST rails-1.1.0.gem 142336 RMD160 2df62e04b64f2b88423730f5c8bf4adfbe54cc7f SHA256 b4d455cb02eae13ec3b48abbd95cfeaf5c05cd092ab9fe4fd809636d1bab3e6c
+DIST rails-1.1.1.gem 145920 RMD160 0151c08fae0e0c39f41d0e7c0bb8196840ef2203 SHA256 6c54ca011610c17c1c0ad6816480b596b008f450b875141ebd10ed65b0e4d3df
+DIST rails-1.1.2.gem 144896 RMD160 ad99236cdf95111a2dda5919f863c8c9d62496c4 SHA1 383080957dba7f141b6e7deebccceb140a6ccc19 SHA256 1ffd33463d5ed4aa4079f46816dd08af3028f361e623be57a6dec9784263f26f
+EBUILD rails-1.0.0.ebuild 1192 RMD160 22c268cfe3f81739ba4378a88468c33444237f2e SHA1 3be4414af61deb366a25fe2e614ff5ef40b3a442 SHA256 22595bcb3a8248d7927741d0a9f412e57ff9d25de1e1227c3a4687cc7f89fae7
+MD5 801fbb8b256ac879e03b50a3ac884978 rails-1.0.0.ebuild 1192
+RMD160 22c268cfe3f81739ba4378a88468c33444237f2e rails-1.0.0.ebuild 1192
+SHA256 22595bcb3a8248d7927741d0a9f412e57ff9d25de1e1227c3a4687cc7f89fae7 rails-1.0.0.ebuild 1192
+EBUILD rails-1.1.0.ebuild 1015 RMD160 2d6c20cbb65533daf98e086418fef2d1913ee020 SHA1 9387e3bd381e1da4d9905e7ef478114ef7feb8a5 SHA256 a80d4321832610a80d9b4cb092e5f34c8e600257536a982d99297621fe9550b1
MD5 fed511ecaac091e6dee26088512b012b rails-1.1.0.ebuild 1015
RMD160 2d6c20cbb65533daf98e086418fef2d1913ee020 rails-1.1.0.ebuild 1015
SHA256 a80d4321832610a80d9b4cb092e5f34c8e600257536a982d99297621fe9550b1 rails-1.1.0.ebuild 1015
-EBUILD rails-1.1.1.ebuild 1012 RMD160 28f67fcbc2bcd66be854ea3c406546474f116727 SHA1 fdef2ce4c17e5652770077577684484ca7f68b40 SHA256 7462ac6e7f0e97d39986d983ea4a62e3834994ff4f9bb876017e870ab07d0c36 size 1012
+EBUILD rails-1.1.1.ebuild 1012 RMD160 28f67fcbc2bcd66be854ea3c406546474f116727 SHA1 fdef2ce4c17e5652770077577684484ca7f68b40 SHA256 7462ac6e7f0e97d39986d983ea4a62e3834994ff4f9bb876017e870ab07d0c36
MD5 49c1b8a522bd45e14233591c4aed51a9 rails-1.1.1.ebuild 1012
RMD160 28f67fcbc2bcd66be854ea3c406546474f116727 rails-1.1.1.ebuild 1012
SHA256 7462ac6e7f0e97d39986d983ea4a62e3834994ff4f9bb876017e870ab07d0c36 rails-1.1.1.ebuild 1012
-EBUILD rails-1.1.2.ebuild 1028 RMD160 3ae6731b27e85eb110e8148b3a989f8943273bc8 SHA1 300e7fccd43e86ca10ef72825cc728eb1f6c3a83 SHA256 0382984007104e6601e1bd1062a876f01d1470487592157b00166fb391c4efe6 size 1028
+EBUILD rails-1.1.2.ebuild 1028 RMD160 3ae6731b27e85eb110e8148b3a989f8943273bc8 SHA1 300e7fccd43e86ca10ef72825cc728eb1f6c3a83 SHA256 0382984007104e6601e1bd1062a876f01d1470487592157b00166fb391c4efe6
MD5 05a46ddbf7fffbedbdb8de4522897a15 rails-1.1.2.ebuild 1028
RMD160 3ae6731b27e85eb110e8148b3a989f8943273bc8 rails-1.1.2.ebuild 1028
SHA256 0382984007104e6601e1bd1062a876f01d1470487592157b00166fb391c4efe6 rails-1.1.2.ebuild 1028
-MISC ChangeLog 5825 RMD160 1f6f9a0e0adb61a6e16eee1d462da8ea14a7f6a6 SHA1 79294a537ff3ea7224362f64b326de031634776c SHA256 538fec73b8b07d0a41bc59a7c542329fd85fee4c4ee2a041fc10d9f917dbb2de size 5825
-MD5 0942543a6ad65912c8ca60ea341b0727 ChangeLog 5825
-RMD160 1f6f9a0e0adb61a6e16eee1d462da8ea14a7f6a6 ChangeLog 5825
-SHA256 538fec73b8b07d0a41bc59a7c542329fd85fee4c4ee2a041fc10d9f917dbb2de ChangeLog 5825
-MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c size 157
+MISC ChangeLog 6034 RMD160 885d0ec3ce18de5c8266e54c703d29e8ec49bdff SHA1 1935392adf43045587aefe4a7ab261c56d44f6f9 SHA256 13bf686e9300ad745386d846beb5812d78d980ddb760f40b9365d7b8a6271cab
+MD5 536c8aeb52424733468d72d008ba9365 ChangeLog 6034
+RMD160 885d0ec3ce18de5c8266e54c703d29e8ec49bdff ChangeLog 6034
+SHA256 13bf686e9300ad745386d846beb5812d78d980ddb760f40b9365d7b8a6271cab ChangeLog 6034
+MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 metadata.xml 157
SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c metadata.xml 157
@@ -44,7 +48,7 @@ SHA256 2284a6688ee15ed090318d000613a94400c9b81f048d52a06d11f93681c634b8 files/di
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (GNU/Linux)
-iD8DBQFEaV8OSENan+PfizARAv0yAJ0fv4W7uEz0Jo6RQQGItgq8CFcTlACfSH6T
-NdFVj9NfpdwzIyERZxnMtY4=
-=d2xO
+iD8DBQFEgDz3AiZjviIA2XgRAimVAKCKWmwD0M3EsX1ZoX98LolazHitCACeMv2F
+IyzTmkBToI6/+yWzAI9DGnU=
+=LFyd
-----END PGP SIGNATURE-----
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"
+}
+