Version bump; remove old versions.

(Portage version: 2.1.2-r9)

11 files changed, 42 insertions, 145 deletions

diff --git a/dev-ruby/ruby-fcgi/ChangeLog b/dev-ruby/ruby-fcgi/ChangeLog
index f59502c86ac1..b749a0c0d536 100644
--- a/dev-ruby/ruby-fcgi/ChangeLog
+++ b/dev-ruby/ruby-fcgi/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-ruby/ruby-fcgi
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-fcgi/ChangeLog,v 1.17 2007/02/22 01:10:49 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-fcgi/ChangeLog,v 1.18 2007/03/06 12:59:22 graaff Exp $
+
+*ruby-fcgi-0.8.7 (06 Mar 2007)
+
+  06 Mar 2007; Hans de Graaff <graaff@gentoo.org>
+  -files/ruby-fcgi-leak.patch, -files/ruby-fcgi-sigabrt.patch,
+  -ruby-fcgi-0.8.4.ebuild, -ruby-fcgi-0.8.5-r1.ebuild,
+  +ruby-fcgi-0.8.7.ebuild:
+  Version bump; remove old versions and patches.
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/dev-ruby/ruby-fcgi/files/digest-ruby-fcgi-0.8.4 b/dev-ruby/ruby-fcgi/files/digest-ruby-fcgi-0.8.4
deleted file mode 100644
index 454e7eff78c2..000000000000
--- a/dev-ruby/ruby-fcgi/files/digest-ruby-fcgi-0.8.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 52f2bf1e2676f405a2a38c80133ed7ee ruby-fcgi-0.8.4.tar.gz 15283
-RMD160 cf75b2cfaca8dd08740e0a363521fa395f92a6ea ruby-fcgi-0.8.4.tar.gz 15283
-SHA256 6f1c63d16f196810a9003a645d24cfbe0117831f8d3340b508c83261461371d8 ruby-fcgi-0.8.4.tar.gz 15283
diff --git a/dev-ruby/ruby-fcgi/files/digest-ruby-fcgi-0.8.5 b/dev-ruby/ruby-fcgi/files/digest-ruby-fcgi-0.8.5
deleted file mode 100644
index dc5b1a34c235..000000000000
--- a/dev-ruby/ruby-fcgi/files/digest-ruby-fcgi-0.8.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 896007e727153c6d05c380dd2d7fb109 ruby-fcgi-0.8.5.tar.gz 15483
-RMD160 87f4462f25705f3c4b0825bb83bf792ae0d63f9e ruby-fcgi-0.8.5.tar.gz 15483
-SHA256 8d5ad21c06083ed29ec6b6c9e7476d6cba8c01dfca633a613783454f4aa26359 ruby-fcgi-0.8.5.tar.gz 15483
diff --git a/dev-ruby/ruby-fcgi/files/digest-ruby-fcgi-0.8.5-r1 b/dev-ruby/ruby-fcgi/files/digest-ruby-fcgi-0.8.5-r1
deleted file mode 100644
index dc5b1a34c235..000000000000
--- a/dev-ruby/ruby-fcgi/files/digest-ruby-fcgi-0.8.5-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 896007e727153c6d05c380dd2d7fb109 ruby-fcgi-0.8.5.tar.gz 15483
-RMD160 87f4462f25705f3c4b0825bb83bf792ae0d63f9e ruby-fcgi-0.8.5.tar.gz 15483
-SHA256 8d5ad21c06083ed29ec6b6c9e7476d6cba8c01dfca633a613783454f4aa26359 ruby-fcgi-0.8.5.tar.gz 15483
diff --git a/dev-ruby/ruby-fcgi/files/digest-ruby-fcgi-0.8.7 b/dev-ruby/ruby-fcgi/files/digest-ruby-fcgi-0.8.7
new file mode 100644
index 000000000000..e3d0eb042c40
--- /dev/null
+++ b/dev-ruby/ruby-fcgi/files/digest-ruby-fcgi-0.8.7
@@ -0,0 +1,3 @@
+MD5 fe4d4a019785e8108668a3e81a5df5e1 ruby-fcgi-0.8.7.tar.gz 19206
+RMD160 c52e55fa75b8ee3371d6bc92130eb056173205ed ruby-fcgi-0.8.7.tar.gz 19206
+SHA256 b899273796471363931cee9ee41bbb3cb340c69fa8f25f056687fc7b5b03caa7 ruby-fcgi-0.8.7.tar.gz 19206
diff --git a/dev-ruby/ruby-fcgi/files/ruby-fcgi-leak.patch b/dev-ruby/ruby-fcgi/files/ruby-fcgi-leak.patch
deleted file mode 100644
index 09acc768d1e8..000000000000
--- a/dev-ruby/ruby-fcgi/files/ruby-fcgi-leak.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- ext/fcgi/fcgi.c.orig	2003-08-27 20:28:35.000000000 +0900
-+++ ext/fcgi/fcgi.c	2005-02-01 16:57:39.741372024 +0900
-@@ -37,6 +37,12 @@
-   rb_gc_mark(data->env);
- }
- 
-+static void fcgi_free_req(fcgi_data *data)
-+{
-+  free(data->req);
-+  free(data);
-+}
-+
- static VALUE fcgi_s_accept(VALUE self)
- {
-   int status;
-@@ -64,7 +70,7 @@
-     VALUE obj,key, value;
-     char *pkey,*pvalue;
-     
--    obj = Data_Make_Struct(self, fcgi_data, fcgi_mark, 0, data);
-+    obj = Data_Make_Struct(self, fcgi_data, fcgi_mark, fcgi_free_req, data);
-     data->req = req;
-     data->in  = Data_Wrap_Struct(cFCGIStream, 0, 0, req->in);
-     data->out = Data_Wrap_Struct(cFCGIStream, 0, 0, req->out);
-@@ -379,7 +385,10 @@
-     buff = ALLOC_N(char, 16384);
-     n = FCGX_GetStr(buff, 16384, stream);
-     CHECK_STREAM_ERROR(stream);
--    if (n == 0) return Qnil;
-+    if (n == 0) {
-+      free(buff);
-+      return  Qnil;
-+    }
-     str = rb_str_new(buff, n);
-     OBJ_TAINT(str);
-     
-@@ -389,9 +398,11 @@
-       if (n > 0) {
-         rb_str_cat(str, buff, n);
-       } else {
-+        free(buff);
-         return Qnil;
-       }
-     }
-+    free(buff);
-     return str;
-   }
- 
-@@ -404,9 +415,11 @@
-   if (n > 0) {
-     str = rb_str_new(buff, n);
-     OBJ_TAINT(str);
-+    free(buff);
-     return str;
-   }
-   else {
-+    free(buff);
-     return Qnil;
-   }
- }
diff --git a/dev-ruby/ruby-fcgi/files/ruby-fcgi-sigabrt.patch b/dev-ruby/ruby-fcgi/files/ruby-fcgi-sigabrt.patch
deleted file mode 100644
index 9548893eb4e2..000000000000
--- a/dev-ruby/ruby-fcgi/files/ruby-fcgi-sigabrt.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ext/fcgi/fcgi.c.orig	2003-08-27 20:28:35.000000000 +0900
-+++ ext/fcgi/fcgi.c	2005-02-01 16:57:39.741372024 +0900
-@@ -4,6 +4,7 @@
-  * Copyright (C) 2002 MoonWolf <moonwolf@moonwolf.com>
-  */
- 
-+#include <errno.h>
- #include <stdio.h>
- #include <sys/types.h>
- #include <unistd.h>
-@@ -155,7 +156,8 @@
-   int err = FCGX_GetError(stream);\
-   if (err) {\
-     if (err > 0) {\
--      rb_sys_fail(0);\
-+      errno=err;\
-+      rb_sys_fail(strerror(err));\
-     }\
-     else {\
-       switch (err) {\
diff --git a/dev-ruby/ruby-fcgi/ruby-fcgi-0.8.4.ebuild b/dev-ruby/ruby-fcgi/ruby-fcgi-0.8.4.ebuild
deleted file mode 100644
index 7d4ea85b39b4..000000000000
--- a/dev-ruby/ruby-fcgi/ruby-fcgi-0.8.4.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2005 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.4.ebuild,v 1.3 2005/02/01 08:04:44 usata Exp $
-
-inherit ruby
-
-DESCRIPTION="FastCGI library for Ruby"
-HOMEPAGE="http://raa.ruby-lang.org/list.rhtml?name=fcgi"
-SRC_URI="http://www.moonwolf.com/ruby/archive/${P}.tar.gz"
-
-USE_RUBY="ruby16 ruby18 ruby19"
-KEYWORDS="~x86 ~ppc"
-LICENSE="Ruby"
-
-DEPEND="dev-libs/fcgi"
-
-IUSE=""
diff --git a/dev-ruby/ruby-fcgi/ruby-fcgi-0.8.5-r1.ebuild b/dev-ruby/ruby-fcgi/ruby-fcgi-0.8.5-r1.ebuild
deleted file mode 100644
index 2183e88070e1..000000000000
--- a/dev-ruby/ruby-fcgi/ruby-fcgi-0.8.5-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2005 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.5-r1.ebuild,v 1.5 2005/11/13 22:54:48 weeve Exp $
-
-inherit ruby
-
-DESCRIPTION="FastCGI library for Ruby"
-HOMEPAGE="http://raa.ruby-lang.org/list.rhtml?name=fcgi"
-SRC_URI="http://www.moonwolf.com/ruby/archive/${P}.tar.gz"
-
-USE_RUBY="ruby16 ruby18 ruby19"
-KEYWORDS="~amd64 ppc sparc x86"
-LICENSE="Ruby"
-
-DEPEND="dev-libs/fcgi"
-
-IUSE=""
-
-PATCHES="${FILESDIR}/${PN}-leak.patch ${FILESDIR}/${PN}-sigabrt.patch"
diff --git a/dev-ruby/ruby-fcgi/ruby-fcgi-0.8.5.ebuild b/dev-ruby/ruby-fcgi/ruby-fcgi-0.8.5.ebuild
deleted file mode 100644
index 50544a7067bc..000000000000
--- a/dev-ruby/ruby-fcgi/ruby-fcgi-0.8.5.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2005 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.5.ebuild,v 1.1 2005/02/01 08:04:44 usata Exp $
-
-inherit ruby
-
-DESCRIPTION="FastCGI library for Ruby"
-HOMEPAGE="http://raa.ruby-lang.org/list.rhtml?name=fcgi"
-SRC_URI="http://www.moonwolf.com/ruby/archive/${P}.tar.gz"
-
-USE_RUBY="ruby16 ruby18 ruby19"
-KEYWORDS="~x86 ~ppc"
-LICENSE="Ruby"
-
-DEPEND="dev-libs/fcgi"
-
-IUSE=""
-
-PATCHES="${FILESDIR}/${PN}-sigabrt.patch"
diff --git a/dev-ruby/ruby-fcgi/ruby-fcgi-0.8.7.ebuild b/dev-ruby/ruby-fcgi/ruby-fcgi-0.8.7.ebuild
new file mode 100644
index 000000000000..aca20a4b9a1f
--- /dev/null
+++ b/dev-ruby/ruby-fcgi/ruby-fcgi-0.8.7.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2007 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.ebuild,v 1.1 2007/03/06 12:59:22 graaff Exp $
+
+inherit ruby
+
+DESCRIPTION="FastCGI library for Ruby"
+HOMEPAGE="http://rubyforge.org/projects/fcgi/"
+SRC_URI="http://rubyforge.org/frs/download.php/11368/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
+LICENSE="Ruby"
+
+DEPEND="dev-libs/fcgi"
+
+IUSE=""
+
+
+# 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
+}