Patching tests which fail on some systems: bug #486552, thanks to Danis S. <ssoqboss@gmail.com>; bug #468482, thanks to Eckard Brauer <ecki@intershop.de> and Juergen Rose <rose@rz.uni-potsdam.de>

Package-Manager: portage-2.2.8/cvs/Linux i686
Manifest-Sign-Key: 0x3AFFCE974D34BD8C!

5 files changed, 71 insertions, 13 deletions

diff --git a/dev-lisp/sbcl/ChangeLog b/dev-lisp/sbcl/ChangeLog
index f4321de0fc94..0945d62a7b55 100644
--- a/dev-lisp/sbcl/ChangeLog
+++ b/dev-lisp/sbcl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lisp/sbcl
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/ChangeLog,v 1.198 2013/12/12 10:06:13 nimiux Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/ChangeLog,v 1.199 2014/01/11 11:09:50 grozin Exp $
+
+  11 Jan 2014; Andrey Grozin <grozin@gentoo.org> sbcl-1.1.14.ebuild,
+  +files/bsd-sockets-test.patch, +files/concurrency-test.patch:
+  Patching tests which fail on some systems: bug #486552, thanks to Danis S.
+  <ssoqboss@gmail.com>; bug #468482, thanks to Eckard Brauer
+  <ecki@intershop.de> and Juergen Rose <rose@rz.uni-potsdam.de>
 
   12 Dec 2013; Chema Alonso <nimiux@gentoo.org> sbcl-1.1.12.ebuild:
   Revoke stable for amd64 wrt bug #485632
diff --git a/dev-lisp/sbcl/Manifest b/dev-lisp/sbcl/Manifest
index 4e2bc654eb95..52ee5fbb51eb 100644
--- a/dev-lisp/sbcl/Manifest
+++ b/dev-lisp/sbcl/Manifest
@@ -1,6 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX bsd-sockets-test.patch 748 SHA256 e23fff91524c4a5c12e5e6b088c9b9785ea86854690583b44118f4ed56fa423d SHA512 d46e08c92d8bf98095762b1a8601c9f9292ea41f55f0089f7fd150977b9cacdf7edd9340fab4242a9c100d7023bd7f12e4dd492c435bbdb2d849a6aba6907e42 WHIRLPOOL 435ac6780f8412fe982acc75902e577f9ff266ce05b14f629e70492a115f1bba5e84d9787fff9a595a549b7fb4e275bdfbd4a5c6701872d9641383663aceb6c7
+AUX concurrency-test.patch 924 SHA256 363aa5f82c4c238df4459deb345d63185c7a3bc557880831d628753af8b48a13 SHA512 831860e23a430959de1833c542cee546d68d62cdb7ca10a45f338b35cf37b4521036eb721ac5a06747ab2f018b3fea7b47d5a25f1f52d669e41ea17716698462 WHIRLPOOL f55031d3b0483d942fa3267dc2f6c51227bc65d3e461b8bc70bc1b2fae694f8e5e82ed1bef53daf6ef4ace6bd6e56866ffbc4713f315c049419d1aca9d9c9a28
 AUX gentoo-fix_install_man.patch 399 SHA256 7e3e3f84be6d4dae51953825daaf26d8fe1482fd2f4e9d017297dd8ef55ebe47 SHA512 bc5118ddf2fd851dcabf773cc7443fa0d3f5a5b83715173110f9164c631faaf8c2d6b247f7ac205da23bb388ff459eba228deeaa2a45202870b7f97376564030 WHIRLPOOL abc43631045e56b9d373c3966eb1d2f5575d258db239e6f1f9a2247492fcb0aab8d000ece39c504aeec5462f7e0ce7e6efc3a215e5776fa64d460b20c0f52a21
 AUX gentoo-fix_linux-os-c.patch 418 SHA256 50b310b3d72b380b91828730a5539638decb6a4df6d28f93dff84ddad824b2ae SHA512 1c78d991c8685b8beeb41cfb3d79aafab4ffa08a36adba7741faefc1a66be3d5ab73efbce43d4d0424cdb86946997a945799fe42a4df44a9b8823a8b7d401f84 WHIRLPOOL a106afda17d6cf67a5c41a6f0b71e0bc44131eaaa5b07ba2d6afb332a8d70b4c5a0892f30904db7992732d1c560ade735bc8ab2572d3be5bffa91ee8c7633640
 AUX gentoo-fix_nopie_for_hardened_toolchain.patch 1122 SHA256 80cdbc63648c2ea84bb4cd33815b7332bdca9a6101caab130705f0ef2bc078a4 SHA512 95dd9f7ccfc7ce274d84f71b1a2ab3ffb39dd5d8000ff52d9b154a0e5d7bb2cc7eea394c05adbcf050073becfe789d94abed72ce56bc494a64199e9e7cb9c7d1 WHIRLPOOL 45bb11865fbbd95f3fda806e339cf3097168732dcbc5e2f23770a49a8e7415a14262c1a9c217c4b431ffb247f74776956447d9494e2a7be35ca60928a788da99
@@ -26,17 +28,25 @@ EBUILD sbcl-1.0.55-r2.ebuild 6230 SHA256 02574bec1fb07d17dd604daa7c4279a5125d0e9
 EBUILD sbcl-1.1.10.ebuild 6789 SHA256 3526bd647f352d15b55a0500c1218cf813d18534c6f5050b7bf55945a17ee306 SHA512 18e63a4d101533c82c7057f5de72dd000fed03d643df98a5405634300b158b78360878822eb2518b2803ac45280c8922b878bcde6f987372caced689c7426e7b WHIRLPOOL a5aaf72387404ebce876e51755166306b3ff093fa539b65d7520eed7764e569d778c9300c351608507a0ef2d877d66306f5047dc60dbebac4a9f4e4db3c202c1
 EBUILD sbcl-1.1.11.ebuild 6784 SHA256 6c13a6a71e0dab20b7a9bba4befb00fefe5ad45b8bac7f1658f4864dba9df602 SHA512 5f29862a34e49b2fe746795c7c12a005670509ad437ec5a302546fae59c928e3d5275fb0bef200d418eeb50fb0f225ecc77d1d21311686c252f5eca00d9e660a WHIRLPOOL fe1033fb3d87bc6449627026a26855636949d6e2bba00889a719d81fe0e0b637620c1db7e690c0a260fe0d13fd78e675345558501ebdc593f6da714b3217a997
 EBUILD sbcl-1.1.12.ebuild 6784 SHA256 47bb8bb75f94a9b7e54a184e100db79e7d440caad96b542873a0a6736d043e5c SHA512 49b483291e4c8e207fff4eafa31c883d65294239dd1f3e559d122fd0cd498998a378aa76aba914a6acf964acb7b9c428f19c2a704cdb0311f52890dc808e514f WHIRLPOOL 978b5e3bd8da569e3162acc59eb86553f38201fe221c3831977085834bc1248a5f7d6d6edb11e0dbafb863acae5e207ff0477b57e3b4600796fb876d264b94b4
-EBUILD sbcl-1.1.14.ebuild 6766 SHA256 d7207414cb9a14300366fc7a74fce8a7532311522d3272f572f70f45b2c9928f SHA512 49e4f60fe66513c9fda02abb0bc2a8c7f78c7056b4a65a0afa5956f929b03268f6cafcf6be822e70f00e914015e8e00ba25ec76f3bc0fbb03588238347cf9a4b WHIRLPOOL b77c306baeec4d4c78e4094b7a9febaadce29aaf44e8384b655f2346a0ebe275faa851af3ac6b0e5d5bb97b34c94885423837537b247682dd707056b105148b0
-MISC ChangeLog 53024 SHA256 6efe35ea4265a213cbafbfc6affc6745798a5d12ff728f6fc5af005194f7ed0e SHA512 e78ddc670ab8c45f9ec501f545029c825b8afaecc3d9364a28679c02cc15c3a21b03aaa9610f397fde349546d66c97977039bf6dedcd3ce52e4a2bc237b356a1 WHIRLPOOL f81678409a6612ed5a30e597666b70b946484b2a0f02f80b457352641fc181de65528f9ecfeab9aff0e7cfb1af29b1c68b59b9515785ae8d5d5193a8bd6c79ed
+EBUILD sbcl-1.1.14.ebuild 6886 SHA256 6590b2fc6bfab1d9b8f1cf280e72a01d1419ad4bf439319add534b271c747e83 SHA512 4b81f167cdc61ef4f0116f6a6fa95ce50a2e4909c81ed8e97a045bdca41babca8249742d7f6139439cd208aefb55c0781b3c258ab017d98bc58f7b0f29a9b4bd WHIRLPOOL 2ff2c18ef1c3a6d322b2f342a6f320043fbb2861555dbfb0e02692ebc830a323a4c95da0976af91b1633227c4f1362a77ba3ffd069e4e85edab1f8e6efe7ce46
+MISC ChangeLog 53360 SHA256 19b1a847104d3fd5704b576a33e83f9d71adabce1ac8f363a24aed2407a8da7c SHA512 31166225ca41806933ad3e7a3d01b992a46abbea127145574ccf1cd71881f0c3dc4c677c56f9d4bc2efbd797c4ec391758173a90f9f2723e16e1ffd0638d2460 WHIRLPOOL 18377e99df10977f11e2680866790022d97320eadcaec792cd87612541b37fcf00a268826874066cd36f41c3902e6a4b166ed87a74a5216101020603ef39e8c0
 MISC metadata.xml 1676 SHA256 17fb0c325844368c649a311f15fbb53a87e5ef987021c52424ffa647745101f3 SHA512 54f12b8385602a6f26b35bb63cbfb0414788e899bc2f5240f60ce249d8ac914c1e236b8d66cee893eac1c3602661869a4333223fa4ce043bd284bde51fa99512 WHIRLPOOL 90a7306f698aa56ab618874f1d325bd3bb789961675d4b0728744abff152bfb6e8cb7303c3cc063782e0411ce27551527c313b404846dadbe2638c5ea086e2f1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSqYrSAAoJEA2sAkrWKOU2CeoIAI4LoTo3Rt8pIsjii2V4jKj6
-1RjSyS6QbRA8gsbt31dHOce5f4mCGZNDyae2//Af4dTBYnGAiJiPCSnUwdOugLvD
-q5c6rYIdPw2qPxR9ioV/RQORcJVJ2gQ1IRia3rJZFfcE3JqnbERFvFhvyvwJt/uv
-riAOzXgz1Vur+ObQRaDPnruDdCwkKGIS1usKl9e6MlUYBYP5fljoQSOS84rdESR9
-OwMz76kBl1Dyd9FAccTLh0yz8MsFawA1kqVYmnAWyT+J2kMSDEjHMPMw1DCPwoCb
-kVIyptI9c+7d57pCObf10lY1SHPET8nBl7q8LteFdM6Q/cCo2L9bXKbVYlD8WZU=
-=f9wt
+iQJ8BAEBCABmBQJS0SSpXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwOEM0RURGNjY5QzVBNjMwRkU3REVCOTQz
+QUZGQ0U5NzREMzRCRDhDAAoJEDr/zpdNNL2MCf4P/0M4qU2XEiLAGEBpA1VMnekb
+dr4Q5KGI5iQLsHm7Nnuy+mrHu1MVIePhcKkNbjUVJRhrVJ1f5WzS6lV844JbpJ4Z
+KbVnLrknDc/qE9DAefx5XiIyvyeAJACoyX57Vo0oWAgMzfc5CEo7FggOl96Gkh1b
+YUgy2i4ZH3CCqKLeL4SYrZt+yebPQRwMxSdMM7Qh3lj1zIHxTFdf5RNwi3eA/Axj
+KicsO58swg5yxDuO/THNkOrWjFrcb/Y0/vCdJoa5Ko3ATEKqCKyqT/0lCuFpRQ0g
+Y5QDSdoRdRw/dW687zFLEWAApmjyI2+KPBX2J/WBHpSTBhMaHi59Uf9IqLyOAqK2
+A8x8pRQZNFrXEUJbnpOqOTI991BwCWd47KX9b6OcUnNWFMkaFwwhR8qw7yKR60Ik
+hCJaJ7MTY7y+weHLyKQzyzWuloDZRtxFzLi7MPuIy1bTXwHfN9LDcBnJNAUiQJEw
+SA6ipwuH7kOXunXDkxO3sjLhHBcdUuJM2LwstMPrauVF+mX/gfFGtGTWDqyzveV1
+w20qaOTKQgAYbOfQ752Pylh0M+eGdDXkYGxzoXJFu8yHlIF/jLiFeZKrycbTbJbn
+485SG9cO8x1jB6raLpFurBk0rwURJ+SgtPAzOEm7rOvGmjbBeh9nUYGTTTZzcPZJ
+8AAUAmuXIJ8MAgj4au7V
+=UxM4
 -----END PGP SIGNATURE-----
diff --git a/dev-lisp/sbcl/files/bsd-sockets-test.patch b/dev-lisp/sbcl/files/bsd-sockets-test.patch
new file mode 100644
index 000000000000..d08fd8610b89
--- /dev/null
+++ b/dev-lisp/sbcl/files/bsd-sockets-test.patch
@@ -0,0 +1,22 @@
+diff -r -U1 sbcl-1.1.14.orig/contrib/sb-bsd-sockets/tests.lisp sbcl-1.1.14/contrib/sb-bsd-sockets/tests.lisp
+--- sbcl-1.1.14.orig/contrib/sb-bsd-sockets/tests.lisp	2013-11-30 21:28:17.000000000 +0700
++++ sbcl-1.1.14/contrib/sb-bsd-sockets/tests.lisp	2014-01-11 20:48:22.762700792 +0700
+@@ -31,10 +31,10 @@
+ ;;; for unknown protocols...
+-#-(and freebsd sb-thread)
+-(deftest get-protocol-by-name/error
+-  (handler-case (get-protocol-by-name "nonexistent-protocol")
+-    (unknown-protocol ()
+-      t)
+-    (:no-error ()
+-      nil))
+-  t)
++;#-(and freebsd sb-thread)
++;(deftest get-protocol-by-name/error
++;  (handler-case (get-protocol-by-name "nonexistent-protocol")
++;    (unknown-protocol ()
++;      t)
++;    (:no-error ()
++;      nil))
++;  t)
+ 
diff --git a/dev-lisp/sbcl/files/concurrency-test.patch b/dev-lisp/sbcl/files/concurrency-test.patch
new file mode 100644
index 000000000000..2c97488cc3d7
--- /dev/null
+++ b/dev-lisp/sbcl/files/concurrency-test.patch
@@ -0,0 +1,16 @@
+diff -r -U1 sbcl-1.1.12.orig/contrib/sb-concurrency/tests/test-frlock.lisp sbcl-1.1.12/contrib/sb-concurrency/tests/test-frlock.lisp
+--- sbcl-1.1.12.orig/contrib/sb-concurrency/tests/test-frlock.lisp	2013-09-30 20:15:42.000000000 +0700
++++ sbcl-1.1.12/contrib/sb-concurrency/tests/test-frlock.lisp	2013-10-14 20:43:05.586366791 +0700
+@@ -19,5 +19,5 @@
+ 
+-(defun test-frlocks (&key (reader-count 100) (read-count 1000000)
++(defun test-frlocks (&key (reader-count 50) (read-count 500000)
+                           (outer-read-pause 0) (inner-read-pause 0)
+-                          (writer-count 10) (write-count 10000)
++                          (writer-count 10) (write-count 5000)
+                           (outer-write-pause 0.0001) (inner-write-pause 0))
+@@ -84,3 +84,3 @@
+     (handler-case
+-        (sb-ext:with-timeout 60 (test-frlocks))
++        (sb-ext:with-timeout 240 (test-frlocks))
+       (sb-ext:timeout (c)
diff --git a/dev-lisp/sbcl/sbcl-1.1.14.ebuild b/dev-lisp/sbcl/sbcl-1.1.14.ebuild
index 0912ced3865d..0788761f1e8c 100644
--- a/dev-lisp/sbcl/sbcl-1.1.14.ebuild
+++ b/dev-lisp/sbcl/sbcl-1.1.14.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/sbcl-1.1.14.ebuild,v 1.1 2013/12/09 18:56:31 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/sbcl-1.1.14.ebuild,v 1.2 2014/01/11 11:09:50 grozin Exp $
 
 EAPI=5
 inherit multilib eutils flag-o-matic pax-utils
@@ -80,6 +80,10 @@ src_unpack() {
 src_prepare() {
 	epatch "${FILESDIR}"/gentoo-fix_install_man.patch
 	epatch "${FILESDIR}"/gentoo-fix_linux-os-c.patch
+	# bug #468482
+	epatch "${FILESDIR}"/concurrency-test.patch
+	# bug #486552
+	epatch "${FILESDIR}"/bsd-sockets-test.patch
 
 	# To make the hardened compiler NOT compile with -fPIE -pie
 	if gcc-specs-pie ; then