Patched borken dispatch.fcgi, added some helpful einfo about upgrading from 0.10

(Portage version: 2.0.51.19)

4 files changed, 48 insertions, 8 deletions

diff --git a/dev-ruby/rails/ChangeLog b/dev-ruby/rails/ChangeLog
index 0363bd8bdf1d..0664fa2c0811 100644
--- a/dev-ruby/rails/ChangeLog
+++ b/dev-ruby/rails/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/rails
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails/ChangeLog,v 1.7 2005/03/22 20:05:06 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails/ChangeLog,v 1.8 2005/03/25 04:04:53 pythonhead Exp $
+
+  25 Mar 2005; Rob Cakebread <pythonhead@gentoo.org>
+  +files/rails-0.11.0-dispatch.fcgi.diff, rails-0.11.0.ebuild:
+  Patched borken dispatch.fcgi, added some helpful einfo about upgrading from
+  0.10
 
 *rails-0.11.0 (22 Mar 2005)
 
diff --git a/dev-ruby/rails/Manifest b/dev-ruby/rails/Manifest
index 7a45624c38aa..d42fa4d3aed4 100644
--- a/dev-ruby/rails/Manifest
+++ b/dev-ruby/rails/Manifest
@@ -1,10 +1,11 @@
-MD5 045d88293f571daf97daae650f5b8b92 rails-0.10.0-r1.ebuild 1158
 MD5 7cd0d58b54b5130dcb6ab812e53148da rails-0.9.5.ebuild 917
-MD5 da7e9df498582bf679abbadabdf1471b rails-0.11.0.ebuild 1131
-MD5 a466ff97a9d7354ccc2ba957a71349af rails-0.10.1.ebuild 1129
-MD5 faa10e590bb9f927524b9e90881ed6c3 ChangeLog 1069
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
-MD5 937edc8b22617c57edda938e9d6e5445 files/digest-rails-0.9.5 59
+MD5 886e5886ce5bf883df24fc0bea581181 ChangeLog 1271
+MD5 045d88293f571daf97daae650f5b8b92 rails-0.10.0-r1.ebuild 1158
+MD5 a466ff97a9d7354ccc2ba957a71349af rails-0.10.1.ebuild 1129
+MD5 b70867b6c2a78105236669682caa1a8b rails-0.11.0.ebuild 1338
 MD5 e7525516e42eccce38edf56245e77f36 files/digest-rails-0.10.0-r1 60
+MD5 937edc8b22617c57edda938e9d6e5445 files/digest-rails-0.9.5 59
 MD5 b90ec8b0a5b4c6f49320babf37ffe62a files/digest-rails-0.10.1 60
 MD5 d1fcc78a6710f38b21e3c155deb9a9cf files/digest-rails-0.11.0 60
+MD5 05171dcf63f00b01f8c046973afd873b files/rails-0.11.0-dispatch.fcgi.diff 766
diff --git a/dev-ruby/rails/files/rails-0.11.0-dispatch.fcgi.diff b/dev-ruby/rails/files/rails-0.11.0-dispatch.fcgi.diff
new file mode 100644
index 000000000000..45addc1dd951
--- /dev/null
+++ b/dev-ruby/rails/files/rails-0.11.0-dispatch.fcgi.diff
@@ -0,0 +1,25 @@
+--- dispatches/ORIG.dispatch.fcgi	2005-03-24 19:44:51.681931600 -0800
++++ dispatches/dispatch.fcgi	2005-03-24 19:45:25.256827440 -0800
+@@ -1,6 +1,5 @@
+ #!/usr/local/bin/ruby
+ 
+-FASTCGI_CRASH_LOG_PATH = "#{RAILS_ROOT}/log/fastcgi.crash.log"
+ 
+ def dispatcher_error(e, msg = "")
+   error_message = "[#{Time.now}] Dispatcher failed to catch: #{e} (#{e.class})\n  #{e.backtrace.join("\n  ")}\n#{msg}"
+@@ -14,6 +13,8 @@
+   require 'dispatcher'
+   require 'fcgi'
+ 
++  FASTCGI_CRASH_LOG_PATH = "#{RAILS_ROOT}/log/fastcgi.crash.log"
++
+   FCGI.each_cgi do |cgi| 
+     begin
+       Dispatcher.dispatch(cgi)
+@@ -23,4 +24,4 @@
+   end
+ rescue Object => fcgi_error
+   dispatcher_error(fcgi_error, "FCGI process #{$$} killed by this error\n")
+-end
+\ No newline at end of file
++end
diff --git a/dev-ruby/rails/rails-0.11.0.ebuild b/dev-ruby/rails/rails-0.11.0.ebuild
index 25c0cec73b4b..a3d423c425bc 100644
--- a/dev-ruby/rails/rails-0.11.0.ebuild
+++ b/dev-ruby/rails/rails-0.11.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails/rails-0.11.0.ebuild,v 1.1 2005/03/22 20:05:06 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails/rails-0.11.0.ebuild,v 1.2 2005/03/25 04:04:53 pythonhead Exp $
 
 inherit ruby gems
 
@@ -25,11 +25,20 @@ DEPEND="=dev-lang/ruby-1.8*
 	mysql? ( >=dev-ruby/mysql-ruby-2.5 )
 	postgres? ( >=dev-ruby/ruby-postgres-0.7.1 )"
 
+src_install() {
+	gems_src_install
+	cd ${D}/usr/lib/ruby/gems/1.8/gems/${P}
+	#Fixes fastcgi bug where RAILS_ROOT isn't defined
+	epatch ${FILESDIR}/${P}-dispatch.fcgi.diff
+}
 
 pkg_postinst() {
 	einfo "If you have an existing Rails 0.9.5 application you'd like to"
 	einfo "upgrade to 0.11.0 please follow these instructions:"
 	einfo "http://manuals.rubyonrails.com/read/book/15"
-	einfo
+	einfo "*"
+	einfo "If you need to upgrade an existing 0.10.* app to 0.11.0 cd to the app's"
+	einfo "directory and run 'rails . --skip'"
+
 }