Replace revision of ruby-fcgi that didn't work with Ruby 1.9 with one that skips over the extension for 1.9.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

2 files changed, 26 insertions, 7 deletions

diff --git a/dev-ruby/ruby-fcgi/ChangeLog b/dev-ruby/ruby-fcgi/ChangeLog
index d978acd582d4..274417899512 100644
--- a/dev-ruby/ruby-fcgi/ChangeLog
+++ b/dev-ruby/ruby-fcgi/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/ruby-fcgi
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-fcgi/ChangeLog,v 1.27 2009/05/10 19:27:23 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-fcgi/ChangeLog,v 1.28 2009/05/27 17:04:12 flameeyes Exp $
+
+*ruby-fcgi-0.8.7-r2 (27 May 2009)
+
+  27 May 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  -ruby-fcgi-0.8.7-r1.ebuild, +ruby-fcgi-0.8.7-r2.ebuild:
+  Replace revision of ruby-fcgi that didn't work with Ruby 1.9 with one that
+  skips over the extension for 1.9.
 
 *ruby-fcgi-0.8.7-r1 (10 May 2009)
 
diff --git a/dev-ruby/ruby-fcgi/ruby-fcgi-0.8.7-r1.ebuild b/dev-ruby/ruby-fcgi/ruby-fcgi-0.8.7-r2.ebuild
index ac65cc128bd5..0b2d9261216e 100644
--- a/dev-ruby/ruby-fcgi/ruby-fcgi-0.8.7-r1.ebuild
+++ b/dev-ruby/ruby-fcgi/ruby-fcgi-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/ruby-fcgi/ruby-fcgi-0.8.7-r1.ebuild,v 1.1 2009/05/10 19:27:23 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-fcgi/ruby-fcgi-0.8.7-r2.ebuild,v 1.1 2009/05/27 17:04:12 flameeyes Exp $
 
 inherit ruby
 
@@ -23,12 +23,24 @@ PATCHES=( "${FILESDIR}/${P}-19compat.patch" )
 # because the one in ruby.eclass does not include setting the prefix
 # for the installation step.
 
-src_install() {
-	RUBY_ECONF="${RUBY_ECONF} ${EXTRA_ECONF}"
+src_compile() {
+	# If it's not 1.8 we have no business here at all!
+	${RUBY} --version | fgrep -q 'ruby 1.8' || \
+		return 0
+
+	ruby_src_compile
+}
 
-	${RUBY} install.rb install --prefix="${D}" "$@" \
-		${RUBY_ECONF} || die "install.rb install failed"
+src_install() {
+	if ${RUBY} --version | fgrep -q 'ruby 1.8'; then
+		${RUBY} install.rb install --prefix="${D}" \
+			|| die "install.rb install failed"
+	else
+		 # Just install the fcgi.rb file, easier than trying to get to
+		 # reason with the install.rb script.
+		doruby lib/fcgi.rb || die
+	fi
 
 	cd "${S}"
-	dodoc ChangeLog README README.signals
+	dodoc ChangeLog README README.signals || die
 }