Don't trust what upstream states, ruby-fcgi-0.8.9 does not work with Ruby 1.9, so prefer the original fcgi gem, and port that to fakegem.

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

4 files changed, 53 insertions, 60 deletions

diff --git a/dev-ruby/ruby-fcgi/ChangeLog b/dev-ruby/ruby-fcgi/ChangeLog
index 83eecc64755e..921624236b58 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-fcgi/ChangeLog,v 1.31 2010/02/01 10:51:20 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-fcgi/ChangeLog,v 1.32 2010/02/01 11:29:40 flameeyes Exp $
+
+*ruby-fcgi-0.8.7-r3 (01 Feb 2010)
+
+  01 Feb 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  +ruby-fcgi-0.8.7-r3.ebuild, -ruby-fcgi-0.8.9.ebuild:
+  Don't trust what upstream states, ruby-fcgi-0.8.9 does not work with Ruby
+  1.9, so prefer the original fcgi gem, and port that to fakegem.
 
 *ruby-fcgi-0.8.9 (01 Feb 2010)
 
diff --git a/dev-ruby/ruby-fcgi/Manifest b/dev-ruby/ruby-fcgi/Manifest
index 3836da91909a..bf56ead15dfb 100644
--- a/dev-ruby/ruby-fcgi/Manifest
+++ b/dev-ruby/ruby-fcgi/Manifest
@@ -3,16 +3,15 @@ Hash: SHA1
 
 AUX ruby-fcgi-0.8.7-19compat.patch 2161 RMD160 4f2cfc14be6b2dfbb944e4191be4151833727c2e SHA1 42c48d926e7a64e59b0fbb26e462ed87361f3b3b SHA256 28f2e2fd9c83ef92372e52aa64ed7ddab4708cac948274e002d5c6cef3b0d80c
 DIST ruby-fcgi-0.8.7.tar.gz 19206 RMD160 c52e55fa75b8ee3371d6bc92130eb056173205ed SHA1 724d01553d35738268b13a93df1b5bb01f2d2b81 SHA256 b899273796471363931cee9ee41bbb3cb340c69fa8f25f056687fc7b5b03caa7
-DIST ruby-fcgi-0.8.9.gem 26112 RMD160 257fc03e6751a8937985b38b90fd6a4f925974e0 SHA1 5d24c08d5939c237ea55ff7183d96d0f61d4ce99 SHA256 142e88893fea8ea9e391712fd7b1cbc3d50744e0468f94f12da028f28a73fb47
 EBUILD ruby-fcgi-0.8.7-r2.ebuild 1287 RMD160 66545d418d0540764e15d0d8b7fd296a6c2af95e SHA1 7582611e5359109b3c0b7d4f33b458c2018bb37b SHA256 4a62a7a08b358a93ec6ad32b0e23bdb939aab25942d38c8d91d59b807aaed6cc
+EBUILD ruby-fcgi-0.8.7-r3.ebuild 875 RMD160 f34e633141ac5e21c68eb00989d68d98c116c547 SHA1 84ed9fb8869f3ffd1021b07d9aec34828f5e19f2 SHA256 1bd1b017387d077eaaa56fcdc4e122a972550a36b5538c76856baeab09c57ede
 EBUILD ruby-fcgi-0.8.7.ebuild 875 RMD160 3963227dd0cc8770333aba6a57305f325098d610 SHA1 a81def7f5e7efdd0359024d3346b987a919fd895 SHA256 03ec7a81d61c3c9aa97c617c94929742ee333112032792d6bac9e980c41586e8
-EBUILD ruby-fcgi-0.8.9.ebuild 1449 RMD160 d7de03940bf03e799864a3fb28aff2d7e0eead93 SHA1 3197291c2575fde3bf55e1c64b43b11077ba0a28 SHA256 ea24d140173d5f19ed1d7a49a81700e14b8b53a6fc65befe37f28c55865aeb39
-MISC ChangeLog 4205 RMD160 2cac1a08376c073445405c11dc328489536b66ac SHA1 87ab58d73355f2a0e641d34babb43eb26927c59b SHA256 60c764d0ba0f2d0e8e0c470395cafa32562fa08d09da9c92d3719deeb00bb95d
+MISC ChangeLog 4494 RMD160 ead8e481a2cc300e8de4136194411b96256794aa SHA1 ebb959f4277f989bda5dbd27944b4791d76a269b SHA256 de553393590ac804fcb6712c4f28b67f052061065cf541f80841c59e9ffa383d
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEUEARECAAYFAktmsjcACgkQAiZjviIA2XjR4wCY24HzCz1uYmx3a0tapXtiRYyP
-MQCgscAn7A7WkgdVryyXZKgoCbPJ5+M=
-=S+Cy
+iEYEARECAAYFAktmuzIACgkQAiZjviIA2XiiggCeJ3+VR9WXPBOy+8NJJBGAbhHl
+6CcAn1YZuIbZSNEflwu9wruSHt3QDKY7
+=jGfa
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/ruby-fcgi/ruby-fcgi-0.8.7-r3.ebuild b/dev-ruby/ruby-fcgi/ruby-fcgi-0.8.7-r3.ebuild
new file mode 100644
index 000000000000..468c7275e282
--- /dev/null
+++ b/dev-ruby/ruby-fcgi/ruby-fcgi-0.8.7-r3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2010 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-r3.ebuild,v 1.1 2010/02/01 11:29:40 flameeyes Exp $
+
+EAPI=2
+USE_RUBY="ruby18 ruby19 jruby"
+
+RUBY_FAKEGEM_NAME="${PN/ruby-/}"
+
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="README README.signals ChangeLog"
+
+inherit ruby-fakegem eutils
+
+DESCRIPTION="FastCGI library for Ruby"
+HOMEPAGE="http://rubyforge.org/projects/fcgi/"
+SRC_URI="mirror://rubyforge/fcgi/${P}.tar.gz"
+
+KEYWORDS="~amd64"
+LICENSE="Ruby"
+
+DEPEND="dev-libs/fcgi"
+RDEPEND="${DEPEND}"
+
+IUSE=""
+SLOT="0"
+
+each_ruby_compile() {
+	case ${RUBY} in
+		*ruby18)
+			pushd ext/fcgi
+			${RUBY} extconf.rb || die "extconf failed"
+			emake || die "emake ext failed"
+			popd
+			cp ext/fcgi/fcgi.so lib || die
+			;;
+	esac
+}
diff --git a/dev-ruby/ruby-fcgi/ruby-fcgi-0.8.9.ebuild b/dev-ruby/ruby-fcgi/ruby-fcgi-0.8.9.ebuild
deleted file mode 100644
index c15b6037ccf0..000000000000
--- a/dev-ruby/ruby-fcgi/ruby-fcgi-0.8.9.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2010 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.9.ebuild,v 1.1 2010/02/01 10:51:20 flameeyes Exp $
-
-EAPI=2
-
-USE_RUBY="ruby18 ruby19"
-
-RUBY_FAKEGEM_TASK_DOC="rdoc"
-
-# there are not tests, the only file is a moot fake file
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README README.signals ChangeLog"
-
-inherit ruby-fakegem
-
-DESCRIPTION="FastCGI library for Ruby. Forked version."
-HOMEPAGE="http://github.com/saks/fcgi"
-
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-LICENSE="Ruby"
-
-DEPEND="dev-libs/fcgi"
-RDEPEND="${DEPEND}"
-
-IUSE=""
-SLOT="0"
-
-each_ruby_compile() {
-	pushd ext/fcgi
-	${RUBY} extconf.rb || die "extconf failed"
-	emake || die "emake ext failed"
-	popd
-}
-
-each_ruby_install() {
-	each_fakegem_install
-
-	ruby_fakegem_newins ext/fcgi/fcgi.so lib/fcgi.so
-}
-
-pkg_postinst() {
-	elog "Starting from ruby-fcgi-0.8.9 the dev-ruby/ruby-fcgi package installs"
-	elog "the ruby-fcgi gem rather than the previous fcgi gem."
-	elog "This is a forked version that is compatible with Ruby 1.9 and provides"
-	elog "proper documentation infrastructure that we can make use of."
-	elog ""
-	elog "If you have any reason to prefer the original fcgi gem, you should"
-	elog "let us know on the bugzilla (http://bugs.gentoo.org/) and we'll see"
-	elog "to add the other gem as an alternative."
-}