Version bump to 0.6.4 which fixes all compilation errors and most test errors, there is only one failing test remaining.

(Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)

5 files changed, 81 insertions, 62 deletions

diff --git a/net-proxy/swiftiply/ChangeLog b/net-proxy/swiftiply/ChangeLog
index 5931940230ac..69c1538b9a47 100644
--- a/net-proxy/swiftiply/ChangeLog
+++ b/net-proxy/swiftiply/ChangeLog
@@ -1,6 +1,14 @@
 # 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.2 2013/03/31 17:11:45 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/swiftiply/ChangeLog,v 1.3 2013/04/19 20:19:44 tomwij Exp $
+
+*swiftiply-0.6.4 (19 Apr 2013)
+
+  19 Apr 2013; Tom Wijsman <TomWij@gentoo.org>
+  +files/swiftiply-0.6.4-test-deque-fix.patch, +swiftiply-0.6.4.ebuild,
+  -files/swiftiply-0.6.1.1-ffr-stderror.patch, -swiftiply-0.6.1.1-r1.ebuild:
+  Version bump to 0.6.4 which fixes all compilation errors and most test errors,
+  there is only one failing test remaining.
 
 *swiftiply-0.6.1.1-r1 (31 Mar 2013)
 
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
deleted file mode 100644
index d1c263e4de72..000000000000
--- a/net-proxy/swiftiply/files/swiftiply-0.6.1.1-ffr-stderror.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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/files/swiftiply-0.6.4-test-deque-fix.patch b/net-proxy/swiftiply/files/swiftiply-0.6.4-test-deque-fix.patch
new file mode 100644
index 000000000000..1ac9dbd7d8aa
--- /dev/null
+++ b/net-proxy/swiftiply/files/swiftiply-0.6.4-test-deque-fix.patch
@@ -0,0 +1,20 @@
+--- a/test/TC_Deque.rb	2008-09-30 09:59:24.000000000 +0200
++++ b/test/TC_Deque.rb	2013-04-19 22:05:01.010997265 +0200
+@@ -2,14 +2,14 @@
+ require 'external/test_support'
++require 'ext/deque/deque'
+ SwiftcoreTestSupport.set_src_dir
+ require 'rbconfig'
+-require 'swiftcore/deque'
+ 
+ class TC_Deque < Test::Unit::TestCase
+ 	@@testdir = SwiftcoreTestSupport.test_dir(__FILE__)
+ 	
+ 	def setup
+ 		Dir.chdir(@@testdir)
+-		SwiftcoreTestSupport.announce(:proxybag,"ProxyBag")
++		SwiftcoreTestSupport.announce(:deque,"Deque")
+ 	end
+ 
+ 	def teardown
+
diff --git a/net-proxy/swiftiply/swiftiply-0.6.1.1-r1.ebuild b/net-proxy/swiftiply/swiftiply-0.6.1.1-r1.ebuild
deleted file mode 100644
index bf6c3da0c593..000000000000
--- a/net-proxy/swiftiply/swiftiply-0.6.1.1-r1.ebuild
+++ /dev/null
@@ -1,49 +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-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.4.ebuild b/net-proxy/swiftiply/swiftiply-0.6.4.ebuild
new file mode 100644
index 000000000000..e01e08788730
--- /dev/null
+++ b/net-proxy/swiftiply/swiftiply-0.6.4.ebuild
@@ -0,0 +1,52 @@
+# 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.4.ebuild,v 1.1 2013/04/19 20:19:44 tomwij Exp $
+
+EAPI="5"
+
+USE_RUBY="ruby18"
+inherit ruby-ng ruby-fakegem
+
+DESCRIPTION="A clustering proxy server for web applications."
+HOMEPAGE="http://swiftiply.swiftcore.org/"
+SRC_URI="https://github.com/wyhaines/${PN}/archive/${PV}.tar.gz"
+
+LICENSE="Ruby"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-ruby/eventmachine-0.9.0"
+
+RUBY_FAKEGEM_EXTRAINSTALL="src"
+RUBY_PATCHES=( "${FILESDIR}/${P}-test-deque-fix.patch" )
+
+QA_PRESTRIPPED="usr/lib/fastfilereaderext.so
+	usr/lib32/fastfilereaderext.so
+	usr/lib64/fastfilereaderext.so"
+
+each_ruby_configure() {
+	cd ext/deque || die 'No deque directory.'
+	ruby extconf.rb || die 'Failed to configure deque.'
+}
+
+each_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 || die 'Failed to setup.'
+
+	cd ext/deque
+	emake
+}
+
+each_ruby_install() {
+	all_fakegem_install
+
+	dolib ext/deque/deque.so ext/fastfilereader/fastfilereaderext.so
+}
+
+each_ruby_test() {
+	ruby test/TC_Deque.rb || die "Test Case [Deque] failed."
+	ruby test/TC_ProxyBag.rb || die "Test Case [ProxyBag] failed."
+	ruby test/TC_Swiftiply.rb || die "Test Case [Swiftiply] failed."
+}