Gave the distfile a more unique name. Added a patch to no longer test uninportant random data causing tests to unnecessarly fail, all test pass multiple times. Removed QA warning.

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

4 files changed, 92 insertions, 15 deletions

diff --git a/net-proxy/swiftiply/ChangeLog b/net-proxy/swiftiply/ChangeLog
index b337d0740cd4..58fd4f1e56bb 100644
--- a/net-proxy/swiftiply/ChangeLog
+++ b/net-proxy/swiftiply/ChangeLog
@@ -1,6 +1,13 @@
 # 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.4 2013/05/02 18:39:03 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/swiftiply/ChangeLog,v 1.5 2013/05/02 19:24:32 tomwij Exp $
+
+  02 May 2013; Tom Wijsman <TomWij@gentoo.org>
+  +files/swiftiply-0.6.4-test-http-headers-order-fix.patch,
+  swiftiply-0.6.4.ebuild:
+  Gave the distfile a more unique name. Added a patch to no longer test
+  uninportant random data causing tests to unnecessarly fail, all test pass
+  multiple times. Removed QA warning.
 
   02 May 2013; Tom Wijsman <TomWij@gentoo.org>
   +files/swiftiply-0.6.4-cache-base-mixin-fix.patch, swiftiply-0.6.4.ebuild:
diff --git a/net-proxy/swiftiply/Manifest b/net-proxy/swiftiply/Manifest
index 1426cc977b75..a733aadc4215 100644
--- a/net-proxy/swiftiply/Manifest
+++ b/net-proxy/swiftiply/Manifest
@@ -3,18 +3,19 @@ Hash: SHA256
 
 AUX swiftiply-0.6.4-cache-base-mixin-fix.patch 419 SHA256 c594be03e46721ea04423ea43998de1fe0adc2fe79175df176c6f766c86db9af SHA512 6898424fe0cc9cd3293245f4fbaa3904827f3129fb5804915f0d11ce65de51e104214cd192daff64b7fcbd611b9b32c22c9cc513f94930e47aeec77f0f1b7655 WHIRLPOOL d813efd8ce834e1ccf4f38d9f8c5ed1cb61e622e1573da94dd79c0557abcb86308245d5d1588c7ef79c673129a7482d8252705ffec9cac9fcacedb9e7103a272
 AUX swiftiply-0.6.4-test-deque-fix.patch 539 SHA256 c5c519cc228fdb335900e0c8bfcae9c7c11b49e03042b33e0e8efb03064e12f7 SHA512 2d6b3bf31b6f74255c982e9410b95de417af921e1108dc96097e3eb9bbb41dcd6c9dcfa49bfab74fb6303bab53e9cf9c3187974de13c97a02a92913db76c523c WHIRLPOOL 8ba06e84c00438195f6440c16ca5a20c90c12e7207f506f4de25a5c97df09715eab5b53e632d32a1516195e6ef306caebb5b624f43a727b835bcf5d7cc031902
-DIST 0.6.4.tar.gz 84807 SHA256 a65d3fee5ac320af8190a7ca8ac2e63e42f62c31b1806e98c38dd164972ae8f7 SHA512 0255d891b85162f993d707d4bbe977b9aeaed5baf144c53dc3cdc938b69fc9f4a184b6805f71a70ed8561adf0826aa8c1c8c0347523b33795d8d05c84bd12e84 WHIRLPOOL 166975d2e808489689e0ef3aabddd9fd9c1c591fd14a6d65625985c50b2a59b1df92d6ae61062f6d383fad6b0515aff920cb6bfbca4330473c41b48d72a64f7f
-EBUILD swiftiply-0.6.4.ebuild 1481 SHA256 665735172a228a0ed292297b50786b641bdf1fd2444a2bc9380104e4073258a7 SHA512 6464c196c7d83c84ed3afeef6508234c190b87559eecc5aeda5dd1d09a162bc43470c2b22dc5024ecc201ac244607c843655fe04e3c8fa55c3ac065a607b8ef9 WHIRLPOOL 3c73d9ee498dee89df43d2ee9e34107c94e39284185c759c83b1ec95a7fc37b0faec194b3a16ebead77242096b2e9bbd37d44f79071e86fd7f40f28c10901640
-MISC ChangeLog 1450 SHA256 62f46788f096d12d83b0f984e65775ddfd4f9cb96a8464fb5ccfe47b3fad549d SHA512 307e5886b859a29c06e8466612b6e7756ebda39e3200163e170bd7f3bbdb12fdee70a79bb1233ddd0ceb02bf9f44136db853f1e6382546a9312de33779563eb2 WHIRLPOOL 0c0c9d2deccdb3b17154d99e45b655b51c87906876ad8c78e60e09341fa19bb44ed487d9bb5a2155acc2b59189621d441051b75d60c92db07e3740005b6418fb
+AUX swiftiply-0.6.4-test-http-headers-order-fix.patch 2731 SHA256 c41334522d23d06a338052820d83636534ce54dd9c32c3b4e88ff43fc7176903 SHA512 2f6aaa97fa86bba000b45f7ba219354dd89259f5ca7f49a7017a96e7e22f44aebb4fe3d91bb96d576ebb93f16fc43f15f07ed0a8fc4ce22e581e2b3dc3a75907 WHIRLPOOL 64210e0df0b7cd3d3ebd3d0dda2dff8dd3900d556afdf899977ec32f9363177b59b4c62f3bc1bdddc8775b4bb362465e2d245a508be8125436829cdfcb4e6e98
+DIST swiftiply-0.6.4.tar.gz 84807 SHA256 a65d3fee5ac320af8190a7ca8ac2e63e42f62c31b1806e98c38dd164972ae8f7 SHA512 0255d891b85162f993d707d4bbe977b9aeaed5baf144c53dc3cdc938b69fc9f4a184b6805f71a70ed8561adf0826aa8c1c8c0347523b33795d8d05c84bd12e84 WHIRLPOOL 166975d2e808489689e0ef3aabddd9fd9c1c591fd14a6d65625985c50b2a59b1df92d6ae61062f6d383fad6b0515aff920cb6bfbca4330473c41b48d72a64f7f
+EBUILD swiftiply-0.6.4.ebuild 1616 SHA256 1865e5d732a2db8426baaa3ad8e36b38bcb15689bd25b54899d8eed3e446ffd6 SHA512 660f2c3a9dc98bb1f1360724f30ca8aaba69db1a395d71042cb70f4008840e77e584911165329d69b4dce770eb844e3fe902251d852626dd131266ceb9edc276 WHIRLPOOL df77c6a76e39ace05b043698f0566c2de1eebcab12542094667af32226d4ed246eef403f193c102b9387096b2b448529e4af5f7eb85757a0a04bcc45544b1a51
+MISC ChangeLog 1770 SHA256 9e7f203d6635f2e81434cda9545305f875ba809a5cf936e25f1d6cc14c6ea63a SHA512 f46bf5d869e0d3ecae2504223e955215a12ff8ee1a2bb03741bd8e20b35f9175f7de147ffa744166ffae8f3df05c837da222de59d8ece244cc8ed90fd86eca24 WHIRLPOOL 84a5f97b34b7aaa0c6a3905e5e12c8c16f6db2e2a409dfe7f48028d27c6827b5e3762299ea55dcff82945ebf06cbca22f1d16125fe18b66cf1740a5136cf0c19
 MISC metadata.xml 257 SHA256 0cc36071e7f8656cf33aabe253d0ffb8427111e4722de11e7ec72f7a20f1836b SHA512 5c982ff605ed691eb6d9ef88d0f199b72be9a505ce5e4e642dbf8a69cc65a036d3708e567ade3f262084c4c81c6ea5649716d72de069384e60544fccd070d829 WHIRLPOOL e378536005aa9a700370b249717abd8b66ac062f4fbf27dac2bc9cc074239cda9fcafe59f36a3505d20cbf3f9e2243ac74488db2d26acd027c1d9c39b6b89bdd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRgrJ2AAoJEJWyH81tNOV9KBEH+gNDgdJFR5KsRje15CFtU0R4
-eHvf/Drs8UiO2EB+mhLBuzlVXNmV7fz5Vg0EgeiBoJyr1dMQj4AmwQzwZtpNwYNI
-if0E5yuSt7AVn6vmy/qNeK6Z8HlGGT9H4/hhKtQ0RBHH0a/S72D66SyNgo33A8Gm
-ZLqARJSYx2kdRAchQQZ72dErsMDzIpc5bhK7X9kC0znKrrdzQDt2z3/LBI1xdiDH
-4F6V6c1TfKvW+ftDhPDws5ci7gl+4GmSjQI3kb/NImFGUjUIXb+6Dv6LYKHqj8vA
-laqSuLyiXcVn90Kwx66PmFnmBKsY34shXeo2llzvswKt1Eks6WJNPB6H1AO9LcI=
-=jis9
+iQEcBAEBCAAGBQJRgr0eAAoJEJWyH81tNOV91QQIAK75D9WFikHMF12tWccqNuHt
+e9Itn7iAEZXs/LoUxJy/+EUuKH3CA7HiLebf2/RDRk5CFCCZn1Q30Fo/RolQFdBi
+h49lHPCExGI0gKJHMTPInSpw+O07x2cyTvh0Q4Fkacjy66Axmy4PizKOGWnIpGXn
+cmZQswqcey1lSoHiKRVuu0S4DRMuJJvGP/LMiP6IhqtH1DYjnMBfVOd0Nvgt330L
+XOAWqyXUQj5NTNWoy+SN+qlW3f+H/Afhu+WdsVM3/dguj35xnhGbXpz9MzPZ+R37
+saxbJgFwPzlks1zq+RAm7e7DFuXTmjyE+tYx8LGVjQRlWje+LZye4+QrC2mEMYY=
+=JXyA
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/swiftiply/files/swiftiply-0.6.4-test-http-headers-order-fix.patch b/net-proxy/swiftiply/files/swiftiply-0.6.4-test-http-headers-order-fix.patch
new file mode 100644
index 000000000000..fa996e279508
--- /dev/null
+++ b/net-proxy/swiftiply/files/swiftiply-0.6.4-test-http-headers-order-fix.patch
@@ -0,0 +1,64 @@
+--- a/test/TC_Swiftiply.rb	2013-05-02 21:00:13.053613758 +0200
++++ b/test/TC_Swiftiply.rb	2013-05-02 21:07:21.803575787 +0200
+@@ -534,28 +534,28 @@
+ 		

+ 		# Normal request

+ 		response = get_url('127.0.0.1',29998,'/xyzzy')

+-		assert_equal("GET /xyzzy HTTP/1.1\r\nAccept: */*\r\nHost: 127.0.0.1:29998\r\n\r\n",response.body)

++		assert_equal("GET /xyzzy HTTP/1.1",response.body[0..18])

+ 		

+ 		# With query string params.

+ 		response = get_url('127.0.0.1',29998,'/foo/bar/bam?Q=1234')

+-		assert_equal("GET /foo/bar/bam?Q=1234 HTTP/1.1\r\nAccept: */*\r\nHost: 127.0.0.1:29998\r\n\r\n",response.body)

++		assert_equal("GET /foo/bar/bam?Q=1234 HTTP/1.1",response.body[0..31])

+ 

+ 		# POST request

+ 		response = post_url('127.0.0.1',29998,'/xyzzy')

+-		assert_equal("POST /xyzzy HTTP/1.1\r\nAccept: */*\r\nHost: 127.0.0.1:29998\r\n\r\n",response.body)

++		assert_equal("POST /xyzzy HTTP/1.1",response.body[0..19])

+ 		

+ 		# And another verb; different verbs should be irrelevant

+ 		response = delete_url('127.0.0.1',29998,'/xyzzy')

+-		assert_equal("DELETE /xyzzy HTTP/1.1\r\nAccept: */*\r\n",response.body[0..36])

++		assert_equal("DELETE /xyzzy HTTP/1.1",response.body[0..21])

+ 		

+ 		# A non-matching hostname, to trigger default handling

+ 		response = get_url('localhost',29998,'/xyzzy')

+-		assert_equal("GET /xyzzy HTTP/1.1\r\nAccept: */*\r\nHost: localhost:29998\r\n\r\n",response.body)

++		assert_equal("GET /xyzzy HTTP/1.1",response.body[0..18])

+ 		

+ 		# A very large url

+ 		u = '/abcdefghijklmnopqrstuvwxyz'*100

+ 		response = get_url('127.0.0.1',29998,u)

+-		assert_equal("GET #{u} HTTP/1.1\r\nAccept: */*\r\nHost: 127.0.0.1:29998\r\n\r\n",response.body)

++		assert_equal("GET #{u} HTTP/1.1",response.body[0..2712])

+ 	end

+ 	

+ 	# Test redeployable requests.

+@@ -596,7 +596,7 @@
+ 		end

+ 

+ 		urlthread.join

+-		assert_equal("GET /slo_gin_fizz HTTP/1.1\r\nAccept: */*\r\nHost: 127.0.0.1:29998\r\n\r\n",response.body)

++		assert_equal("GET /slo_gin_fizz HTTP/1.1",response.body[0..25])

+ 		

+ 		sleep 1

+ 

+@@ -665,7 +665,7 @@
+ 		

+ 		# Normal request

+ 		response = get_url('127.0.0.1',29998,'/xyzzy')

+-		assert_equal("GET /xyzzy HTTP/1.1\r\nAccept: */*\r\nHost: 127.0.0.1:29998\r\n\r\n",response.body)

++		assert_equal("GET /xyzzy HTTP/1.1", response.body[0..18])

+ 	end

+ 

+ 	def test_http_404_error

+@@ -846,7 +846,7 @@
+ 

+ 		# Normal request for a sanity check.

+ 		response = get_url('127.0.0.1',29998,'/xyzzy')

+-		assert_equal("GET /xyzzy HTTP/1.1\r\nAccept: */*\r\nHost: 127.0.0.1:29998\r\n\r\n",response.body)

++		assert_equal("GET /xyzzy HTTP/1.1",response.body[0..18])

+ 		

+ 		# Now rewrite the conf file to be a little different.

+ 		File.open(conf_file,'w+') {|fh| fh.write ConfBase.to_yaml }

diff --git a/net-proxy/swiftiply/swiftiply-0.6.4.ebuild b/net-proxy/swiftiply/swiftiply-0.6.4.ebuild
index 8fc02f2bd81a..f233d8e0899a 100644
--- a/net-proxy/swiftiply/swiftiply-0.6.4.ebuild
+++ b/net-proxy/swiftiply/swiftiply-0.6.4.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2013/05/02 18:39:03 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/swiftiply/swiftiply-0.6.4.ebuild,v 1.3 2013/05/02 19:24:32 tomwij Exp $
 
 EAPI="5"
 
@@ -9,7 +9,7 @@ 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"
+SRC_URI="https://github.com/wyhaines/${PN}/archive/${PV}.tar.gz -> ${PN}-${PV}.tar.gz"
 
 LICENSE="Ruby"
 SLOT="0"
@@ -20,11 +20,16 @@ RDEPEND=">=dev-ruby/eventmachine-0.9.0"
 RUBY_FAKEGEM_EXTRAINSTALL="src"
 RUBY_PATCHES=(
 	"${FILESDIR}/${P}-test-deque-fix.patch"
-	"${FILESDIR}/${P}-cache-base-mixin-fix.patch")
+	"${FILESDIR}/${P}-cache-base-mixin-fix.patch"
+	"${FILESDIR}/${P}-test-http-headers-order-fix.patch"
+)
 
 QA_PRESTRIPPED="usr/lib/fastfilereaderext.so
 	usr/lib32/fastfilereaderext.so
-	usr/lib64/fastfilereaderext.so"
+	usr/lib64/fastfilereaderext.so
+	usr/lib/deque.so
+	usr/lib32/deque.so
+	usr/lib64/deque.so"
 
 each_ruby_configure() {
 	cd ext/deque || die 'No deque directory.'