Version bump, bug 236064.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 133 insertions, 3 deletions

diff --git a/dev-ruby/ruby-fcgi/ChangeLog b/dev-ruby/ruby-fcgi/ChangeLog
index e28046ace5fc..d978acd582d4 100644
--- a/dev-ruby/ruby-fcgi/ChangeLog
+++ b/dev-ruby/ruby-fcgi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/ruby-fcgi
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-fcgi/ChangeLog,v 1.26 2008/12/05 09:48:32 armin76 Exp $
+# 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 $
+
+*ruby-fcgi-0.8.7-r1 (10 May 2009)
+
+  10 May 2009; Alex Legler <a3li@gentoo.org> +ruby-fcgi-0.8.7-r1.ebuild,
+  +files/ruby-fcgi-0.8.7-19compat.patch:
+  Version bump, bug 236064.
 
   05 Dec 2008; Raúl Porcel <armin76@gentoo.org> ruby-fcgi-0.8.7.ebuild:
   ia64/sparc stable wrt #249386
diff --git a/dev-ruby/ruby-fcgi/Manifest b/dev-ruby/ruby-fcgi/Manifest
index c662438ec543..a09fd6f4db2f 100644
--- a/dev-ruby/ruby-fcgi/Manifest
+++ b/dev-ruby/ruby-fcgi/Manifest
@@ -1,6 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX ruby-fcgi-0.8.7-19compat.patch 2161 RMD160 4f2cfc14be6b2dfbb944e4191be4151833727c2e SHA1 42c48d926e7a64e59b0fbb26e462ed87361f3b3b SHA256 28f2e2fd9c83ef92372e52aa64ed7ddab4708cac948274e002d5c6cef3b0d80c
 DIST ruby-fcgi-0.8.6.tar.gz 16077 RMD160 2617c7b07ac552f61287762644f34535e9404789 SHA1 f72d43b69aa7d10a535b30870afe279758944333 SHA256 23d337c921d85c220e850c1f53d2991cfc6acdedd4042ed9b38e61276f4071b3
 DIST ruby-fcgi-0.8.7.tar.gz 19206 RMD160 c52e55fa75b8ee3371d6bc92130eb056173205ed SHA1 724d01553d35738268b13a93df1b5bb01f2d2b81 SHA256 b899273796471363931cee9ee41bbb3cb340c69fa8f25f056687fc7b5b03caa7
 EBUILD ruby-fcgi-0.8.6.ebuild 505 RMD160 244c0480125aa36658be7b55e191611f5b29e40b SHA1 5ddcee1d5e693c3871f0d2b3843dd3f1f8f7b1e6 SHA256 3f6f893f68ab4a86d49de69fa864d561a68edd1bf62e157a23235c743b8d4717
+EBUILD ruby-fcgi-0.8.7-r1.ebuild 954 RMD160 5cc3c738393d539ba2b34288a6cb7da8248c67e7 SHA1 880fb200da98e7297ef2767b2371d3ba736c61e7 SHA256 0c04b592f1d92cb397f8407843f646e1f6584fc8c801f0d03b59970217653507
 EBUILD ruby-fcgi-0.8.7.ebuild 875 RMD160 3963227dd0cc8770333aba6a57305f325098d610 SHA1 a81def7f5e7efdd0359024d3346b987a919fd895 SHA256 03ec7a81d61c3c9aa97c617c94929742ee333112032792d6bac9e980c41586e8
-MISC ChangeLog 3362 RMD160 8762636acc571d9fe36cc0b87e9fe207e05e8e3a SHA1 eb6b086b9c1efdb4285700b0304989c64d7f9073 SHA256 2eb6dc01c6737ada867294e816ab394eb5017cf55e6a4193387c1e69429031f5
+MISC ChangeLog 3537 RMD160 5230d45840bbf2a0768dcb7e84f89bff7c236293 SHA1 9644d70598a034f6584862b1c86a026ccf8f5c9f SHA256 4361addc51ff37e6c44235bebb2864e4b8b400bf81068f372b6787a894270fa7
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkoHKqQACgkQk3qunHEll7NYdACgkNXL+s9fg08hO1fQAgyjYKTr
+J5YAoKMAwY3wYs0SoN/QlCyincwt/lm8
+=flTv
+-----END PGP SIGNATURE-----
diff --git a/dev-ruby/ruby-fcgi/files/ruby-fcgi-0.8.7-19compat.patch b/dev-ruby/ruby-fcgi/files/ruby-fcgi-0.8.7-19compat.patch
new file mode 100644
index 000000000000..c444fa05742b
--- /dev/null
+++ b/dev-ruby/ruby-fcgi/files/ruby-fcgi-0.8.7-19compat.patch
@@ -0,0 +1,78 @@
+Patch for Ruby 1.9 compatibility, backport from upstream SVN.
+
+--- ext/fcgi/fcgi.c	2006-06-25 06:06:42.000000000 +0200
++++ ext/fcgi/fcgi.c.r47	2008-12-02 10:37:47.000000000 +0100
+@@ -17,6 +17,16 @@
+ #include "fcgiapp.h"
+ #endif
+ 
++#ifndef RARRAY_PTR
++#define RARRAY_LEN(ary) (RARRAY(ary)->len)
++#define RARRAY_PTR(ary) (RARRAY(ary)->ptr)
++#endif
++
++#ifndef RSTRING_PTR
++#define RSTRING_LEN(str) (RSTRING(str)->len)
++#define RSTRING_PTR(str) (RSTRING(str)->ptr)
++#endif
++
+ static VALUE cFCGI;
+ static VALUE eFCGIError;
+ static VALUE cFCGIStream;
+@@ -222,7 +232,7 @@
+   rb_secure(4);
+   Data_Get_Struct(self, FCGX_Stream, stream);
+   str = rb_obj_as_string(str);
+-  len = FCGX_PutStr(RSTRING(str)->ptr, RSTRING(str)->len, stream);
++  len = FCGX_PutStr(RSTRING_PTR(str), RSTRING_LEN(str), stream);
+   if (len == EOF) CHECK_STREAM_ERROR(stream);
+   return INT2NUM(len);
+ }
+@@ -271,8 +281,8 @@
+   VALUE tmp;
+   int i;
+ 
+-  for (i=0; i<RARRAY(ary)->len; i++) {
+-    tmp = RARRAY(ary)->ptr[i];
++  for (i=0; i<RARRAY_LEN(ary); i++) {
++    tmp = RARRAY_PTR(ary)[i];
+     if (rb_inspecting_p(tmp)) {
+       tmp = rb_str_new2("[...]");
+     }
+@@ -305,7 +315,7 @@
+     }
+     line = rb_obj_as_string(line);
+     fcgi_stream_write(out, line);
+-    if (RSTRING(line)->ptr[RSTRING(line)->len-1] != '\n') {
++    if (RSTRING_PTR(line)[RSTRING_LEN(line)-1] != '\n') {
+       fcgi_stream_write(out, rb_default_rs);
+     }
+   }
+@@ -379,7 +389,7 @@
+     rb_str_cat(str, buff, strlen(buff));
+     if (strchr(buff, '\n')) break;
+   }
+-  if (RSTRING(str)->len > 0)
++  if (RSTRING_LEN(str) > 0)
+     return str;
+   else
+     return Qnil;
+@@ -507,7 +517,8 @@
+ 
+ 
+ 
+-void Init_fcgi() {
++void Init_fcgi()
++{
+   
+   FCGX_Init();
+   
+@@ -517,7 +528,7 @@
+   rb_define_singleton_method(cFCGI, "each", fcgi_s_each, 0);
+   rb_define_singleton_method(cFCGI, "each_request", fcgi_s_each, 0);
+   rb_define_singleton_method(cFCGI, "is_cgi?", fcgi_s_iscgi, 0);
+-  rb_define_method(cFCGI, "in",  fcgi_in, 0);
++  rb_define_method(cFCGI, "in",  fcgi_in,  0);
+   rb_define_method(cFCGI, "out", fcgi_out, 0);
+   rb_define_method(cFCGI, "err", fcgi_err, 0);
+   rb_define_method(cFCGI, "env", fcgi_env, 0);
diff --git a/dev-ruby/ruby-fcgi/ruby-fcgi-0.8.7-r1.ebuild b/dev-ruby/ruby-fcgi/ruby-fcgi-0.8.7-r1.ebuild
new file mode 100644
index 000000000000..ac65cc128bd5
--- /dev/null
+++ b/dev-ruby/ruby-fcgi/ruby-fcgi-0.8.7-r1.ebuild
@@ -0,0 +1,34 @@
+# 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 $
+
+inherit ruby
+
+DESCRIPTION="FastCGI library for Ruby"
+HOMEPAGE="http://rubyforge.org/projects/fcgi/"
+SRC_URI="mirror://rubyforge/fcgi/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+LICENSE="Ruby"
+
+DEPEND="dev-libs/fcgi"
+RDEPEND="${DEPEND}"
+
+IUSE=""
+
+USE_RUBY="ruby18 ruby19"
+PATCHES=( "${FILESDIR}/${P}-19compat.patch" )
+
+# Use a custom src_install instead of the default one in ruby.eclass
+# because the one in ruby.eclass does not include setting the prefix
+# for the installation step.
+
+src_install() {
+	RUBY_ECONF="${RUBY_ECONF} ${EXTRA_ECONF}"
+
+	${RUBY} install.rb install --prefix="${D}" "$@" \
+		${RUBY_ECONF} || die "install.rb install failed"
+
+	cd "${S}"
+	dodoc ChangeLog README README.signals
+}