Fixed building of the fastfilereader extension. Added necessary dev-ruby/cgi_multipart_eof_fix and www-servers/mongrel dependencies. Made testing phase empty since there is no Rakefile.

Package-Manager: portage-2.1.11.59/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

5 files changed, 74 insertions, 24 deletions

diff --git a/net-proxy/swiftiply/ChangeLog b/net-proxy/swiftiply/ChangeLog
index 23c255c1f6f3..5931940230ac 100644
--- a/net-proxy/swiftiply/ChangeLog
+++ b/net-proxy/swiftiply/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-proxy/swiftiply
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/swiftiply/ChangeLog,v 1.1 2013/03/31 15:21:44 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/swiftiply/ChangeLog,v 1.2 2013/03/31 17:11:45 tomwij Exp $
+
+*swiftiply-0.6.1.1-r1 (31 Mar 2013)
+
+  31 Mar 2013; Tom Wijsman <TomWij@gentoo.org>
+  +files/swiftiply-0.6.1.1-ffr-stderror.patch, +swiftiply-0.6.1.1-r1.ebuild,
+  -swiftiply-0.6.1.1.ebuild:
+  Fixed building of the fastfilereader extension. Added necessary dev-
+  ruby/cgi_multipart_eof_fix and www-servers/mongrel dependencies. Made testing
+  phase empty since there is no Rakefile.
 
 *swiftiply-0.6.1.1 (31 Mar 2013)
 
diff --git a/net-proxy/swiftiply/Manifest b/net-proxy/swiftiply/Manifest
index f2e2218b537c..da9032117caa 100644
--- a/net-proxy/swiftiply/Manifest
+++ b/net-proxy/swiftiply/Manifest
@@ -1,4 +1,5 @@
+AUX swiftiply-0.6.1.1-ffr-stderror.patch 311 SHA256 f4797530fb6235de850380518d0644ff33623bc263ba9bd3807816d85c0ae79f SHA512 bf53c5126b0b23b659cf173f343d59d012cfb023231def5b16634d2e02ccc2f5ec66dc6dd2a57ef8d5841ba694176af5d89040bd42b1ad43cab0ecf9f45d44d3 WHIRLPOOL de80f0e0bf9a7d0330e3df774bee93f31aead6fa16de71d17f5700c4a769b953a9a124a01091e8fdb089aa923141a2f95650d720bd0735f706d95739f8b0e0f1
 DIST swiftiply-0.6.1.1.gem 52736 SHA256 415a6404eb2517e6e8cd970bf0ac4d50e8e5bd3cfc75f144038b1ca84e2cc71e SHA512 ce440e23ade2adab3bb518e97d625a159c988a86aee0871421076fa4698fdfe93a115532664834be23435438d8f62ba12ae3ca6bf4639f9e0ca1d1c142f062ff WHIRLPOOL a7b619910ffc89cc4eaa89ce77b7aac988c6987d7bbce372965873b3598da446168a4a1720527150a3338083b533f915b1c3b758b7fee49834188978b22c5501
-EBUILD swiftiply-0.6.1.1.ebuild 597 SHA256 eb44a988dfcc9e0f95d298d4eaba75f68aee62fa90bdf455f4effe4c30d34992 SHA512 9178d6bd54b28afca1dc6f9769c2f8134df667d58455dfa16eb84cf7b794150be9ffd934b405011ad26363f6bd2a6d2b186744775938faa7f5c4006c81f1f636 WHIRLPOOL 05be90dcb4e13ac7c753b0f358b8640a9988fc0201243368f5e4a8eaec8ae94c7800c259eace8a0757f03fd544f8ef2b134a1e477327d8f41f57908223e20d15
-MISC ChangeLog 472 SHA256 2b36e42d3c98eda84c726b638c7c8e0690f4668609ff4f0a7692859e2f8e0dc6 SHA512 dc07798a0168810200588259c597e11725f3d06d8f998cc404c3ab4a528f23259ab74192a51abb2cadc2116e48a63fdae0c44af6adf29ac3e7130a5cd5a0e66d WHIRLPOOL fd2cfdba7d6bd3a79980f41c4e64646027b8b64e7c4a26f83c2447c6df8ea451519cf1e4adfe3fc0ba236493f54f1276d3188627df087c767284855f19f5cc91
+EBUILD swiftiply-0.6.1.1-r1.ebuild 1243 SHA256 b08276c967607e1f3e805e8e0ca917a26dfc089bc46d70aff863f0b1db1e64f9 SHA512 24a3cfc3bf9d31ea0f58467e0d47b00024a05ffd4ca1b2223655bfd96e7f11ee3ed92890e6bd73f90924893c2ac5aef9e1fc3369d8f01930cca6a359c28290c8 WHIRLPOOL e91c997b954daf9e8522151b910d37c5596a25a7e1061961661d738005dbee9a23bf89c4bf00b2ee394d0f1740aaf6362c11a842b5002334c73a25b72a39143d
+MISC ChangeLog 856 SHA256 4aebf7b374be63a55ddb265fa80ec2f78d124f8ddcab455ddbc95555e9bc5e0d SHA512 f8e5b1d286d41a09ac7bb6cc8ce149f152642af908ccdf81fb299a61594638ebb0de56a3825fdf65c3ed9c33d97fae1e4ed69542e16f8e2c48d81a1155673afd WHIRLPOOL a4341a8fed706b80cdcad0a4d13317bf68a96fdc86007d8620e6291beb3c008b1a5fa59c118b34c3c6b7a55a25609f97dd5e821af66076eb6304c88cbee52f95
 MISC metadata.xml 257 SHA256 0cc36071e7f8656cf33aabe253d0ffb8427111e4722de11e7ec72f7a20f1836b SHA512 5c982ff605ed691eb6d9ef88d0f199b72be9a505ce5e4e642dbf8a69cc65a036d3708e567ade3f262084c4c81c6ea5649716d72de069384e60544fccd070d829 WHIRLPOOL e378536005aa9a700370b249717abd8b66ac062f4fbf27dac2bc9cc074239cda9fcafe59f36a3505d20cbf3f9e2243ac74488db2d26acd027c1d9c39b6b89bdd
diff --git a/net-proxy/swiftiply/files/swiftiply-0.6.1.1-ffr-stderror.patch b/net-proxy/swiftiply/files/swiftiply-0.6.1.1-ffr-stderror.patch
new file mode 100644
index 000000000000..d1c263e4de72
--- /dev/null
+++ b/net-proxy/swiftiply/files/swiftiply-0.6.1.1-ffr-stderror.patch
@@ -0,0 +1,12 @@
+--- a/ext/fastfilereader/mapper.cpp	2013-03-31 18:07:09.938898478 +0200
++++ b/ext/fastfilereader/mapper.cpp	2013-03-31 18:08:40.822223762 +0200
+@@ -32,7 +32,9 @@
+ #include <errno.h>
+ 
+ #include <iostream>
++#include "unistd.h"
+ #include <string>
++#include <cstring>
+ #include <stdexcept>
+ using namespace std;
+ 
diff --git a/net-proxy/swiftiply/swiftiply-0.6.1.1-r1.ebuild b/net-proxy/swiftiply/swiftiply-0.6.1.1-r1.ebuild
new file mode 100644
index 000000000000..bf6c3da0c593
--- /dev/null
+++ b/net-proxy/swiftiply/swiftiply-0.6.1.1-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/swiftiply/swiftiply-0.6.1.1-r1.ebuild,v 1.1 2013/03/31 17:11:45 tomwij Exp $
+
+EAPI="5"
+
+USE_RUBY="ruby18"
+inherit ruby-ng ruby-fakegem
+
+MY_COMPANY="swiftcore"
+DESCRIPTION="A clustering proxy server for web applications."
+HOMEPAGE="http://${PN}.${MY_COMPANY}.org/"
+SRC_URI="http://${PN}.${MY_COMPANY}.org/files/${P}.gem"
+
+LICENSE="Ruby"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-ruby/cgi_multipart_eof_fix
+	>=dev-ruby/eventmachine-0.9.0
+	www-servers/mongrel"
+
+RUBY_FAKEGEM_EXTRAINSTALL="src"
+RUBY_PATCHES=( "${FILESDIR}"/swiftiply-0.6.1.1-ffr-stderror.patch )
+
+QA_PRESTRIPPED="usr/lib/fastfilereaderext.so
+	usr/lib32/fastfilereaderext.so
+	usr/lib64/fastfilereaderext.so"
+
+all_ruby_compile() {
+	sed -i '/build_ext/q' setup.rb || die 'Rewrite of extension build script failed.'
+	echo '}' >> setup.rb || die 'Rewrite of extension build script failed.'
+
+	ruby setup.rb
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	# Conflict with www-servers/mongrel.
+	rm "${ED}"/usr/bin/mongrel_rails
+
+	dolib ext/fastfilereader/fastfilereaderext.so
+}
+
+# There is no rakefile, don't test.
+src_test() {
+	:
+}
diff --git a/net-proxy/swiftiply/swiftiply-0.6.1.1.ebuild b/net-proxy/swiftiply/swiftiply-0.6.1.1.ebuild
deleted file mode 100644
index a0798d8f956a..000000000000
--- a/net-proxy/swiftiply/swiftiply-0.6.1.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/swiftiply/swiftiply-0.6.1.1.ebuild,v 1.1 2013/03/31 15:21:44 tomwij Exp $
-
-EAPI="5"
-
-USE_RUBY="ruby18 ruby19"
-inherit ruby-ng ruby-fakegem
-
-MY_COMPANY="swiftcore"
-DESCRIPTION="A clustering proxy server for web applications."
-HOMEPAGE="http://${PN}.${MY_COMPANY}.org/"
-SRC_URI="http://${PN}.${MY_COMPANY}.org/files/${P}.gem"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=">=dev-ruby/eventmachine-0.9.0"
-
-RUBY_FAKEGEM_EXTRAINSTALL="src"