Adding a missing patch (#533158)

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

3 files changed, 45 insertions, 16 deletions

diff --git a/dev-lisp/sbcl/ChangeLog b/dev-lisp/sbcl/ChangeLog
index b4304d2e4477..a8dacece49f5 100644
--- a/dev-lisp/sbcl/ChangeLog
+++ b/dev-lisp/sbcl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lisp/sbcl
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/ChangeLog,v 1.211 2014/12/20 15:37:16 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/ChangeLog,v 1.212 2014/12/22 10:43:49 grozin Exp $
+
+  22 Dec 2014; Andrey Grozin <grozin@gentoo.org>
+  +files/concurrency-test-1.2.6.patch:
+  Adding a missing patch (#533158)
 
 *sbcl-1.2.6 (20 Dec 2014)
 
diff --git a/dev-lisp/sbcl/Manifest b/dev-lisp/sbcl/Manifest
index 46ad0d66dc37..e65b59196c5f 100644
--- a/dev-lisp/sbcl/Manifest
+++ b/dev-lisp/sbcl/Manifest
@@ -4,6 +4,7 @@ Hash: SHA256
 AUX bsd-sockets-test-1.2.6.patch 6152 SHA256 a29bf2e5d78039fe778a70dd4e16e0540523a20306c2bedbfa413bd5f9ac1693 SHA512 6f9f2acf70adf83d0506ba29607afb7bcf87559d78424db85117c228c4250b4789bf0ad4642fa68e2cba381445b25193ec8e7ea2b6d9762453cfd3d92ddf70ea WHIRLPOOL 54539c429a22d19388fa22d17676a43bda04f218d5e1a33cfacb670fe5e19b92190d3a272a4a1ef98368b4436150e0e44bd767b42cdbaaa420400ed6aff8fe99
 AUX bsd-sockets-test-1.2.patch 803 SHA256 5fd1abd8992903e60b1f6fe19dcd1b7ce7c7cb57fcfede8830f1d5d264ea3b07 SHA512 07199deb9315f749ea7998d8990cc5f73833d80cef16de77c0bcafb24eb79eb2c2495d0768100b9322c21a70949463b0fe007e15b45ef248e1c74ebd6365b733 WHIRLPOOL 43ca5ea5bfb24ad30033184a0d0e31a86688da9b3ae879f448aafdcae6ded6ca0091e48c89cfc8314903ba7ac368e32496f7c384471c0fec8686f16b3b9fed96
 AUX bsd-sockets-test.patch 748 SHA256 e23fff91524c4a5c12e5e6b088c9b9785ea86854690583b44118f4ed56fa423d SHA512 d46e08c92d8bf98095762b1a8601c9f9292ea41f55f0089f7fd150977b9cacdf7edd9340fab4242a9c100d7023bd7f12e4dd492c435bbdb2d849a6aba6907e42 WHIRLPOOL 435ac6780f8412fe982acc75902e577f9ff266ce05b14f629e70492a115f1bba5e84d9787fff9a595a549b7fb4e275bdfbd4a5c6701872d9641383663aceb6c7
+AUX concurrency-test-1.2.6.patch 1069 SHA256 1892dd13befdf551b346b1a17d1f3765b1a1024c62d3a725e6ab8af929b04021 SHA512 6969cec62ee9ee0ecb2aff34c854f51fd93b52f768ed1e1bf7cb3686c370c6e6b1d0691159b5d404f8d5e12e90a1447e6098ed83b0bb1ff4dc7f454f7052ec53 WHIRLPOOL e67e5eaafb44e4cd45812a4716b8d237e2316f0c280fc09ccb06117b0f91866fed4e6d49073fd727bf21b6e29836ede2b2edd6cd49a311275247c2140a3d3293
 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
@@ -31,24 +32,24 @@ EBUILD sbcl-1.1.18.ebuild 6963 SHA256 b6977411bdadb9057d185ebea9a4ee5b2b7ff19d54
 EBUILD sbcl-1.2.2.ebuild 6976 SHA256 a10e756c7b49c4e68f7ec836016e8a2a689bbf32067da5546b200abcb991b107 SHA512 f7213131256d3715137daa07bc067400f02f6e2296e210c57d8c28622b8c83bce25689e6316366ae0c79f811df65ab3af7f33f85355126b29babda6324ca2e12 WHIRLPOOL d4e8b251fe028c7488ca186826307e4fa79a07126aa9f2421a8489e63bf0cd2200a7ec2dbc21dda884236c90e9daf4c302641275c4027c8b584e6cc8d0b19fd2
 EBUILD sbcl-1.2.4.ebuild 6976 SHA256 658bc0c6080c6d0ddd2e32121ff2fa5f0dc7ff0152e7ce3ddc5eac323a1e0a8f SHA512 5e6ac63fefe0b2ea6cda9d610e26d99e06b4537e9e8f508ef89d180c919087841f8fb75481d8e92da9a659237c54fd5640f5c61ecafbd651b41f680c78b39def WHIRLPOOL 803c875ed620f58428446ae96ec59eba3ad9dbf8983c23ca455bd67e78534274da22667fd6eac67c98a8bb357f6c1dbaa971414b851ae625e676ae85620427b6
 EBUILD sbcl-1.2.6.ebuild 6890 SHA256 7225e7405718576b49c79817a64c897bc7dc1926606d088d20883bf4c37d15aa SHA512 c4759650831c7d7556414eab8e683460345d61bd14c4ac8bfcc6c127ac8f1f8f0ed83fb0168149c2f454787a956145c20384b2177ad72a54e4172ac2a48448f9 WHIRLPOOL 4970001c7f0a08dfcf6e6c7e605f9728f191e130a6d5333334bef3009305c48b919cffcd9a570ddac5bfbce80d1c8ff2ad3348d0efef8d42083370be7a3e465c
-MISC ChangeLog 55974 SHA256 618889217f7cf9913cdef4289ac7ec29d5f56af893c2908f4c4bd069ced46c39 SHA512 c7bc64e9953aa642d4cda4ffc1c9d531861394f0f8c53ee25ff716525613c4e29b180c27c523c6bb0f424f84e4aee1a0351fe7ec9361727ec911d21d60a295b8 WHIRLPOOL 9b0fcd01e8a404e1d183ab018e7df545fba17fe5d79fc8b75ad04165fe342610ace9058595e384bc89e72f7dc02c145f45e32a3d34e2544693ea42952e1751ba
+MISC ChangeLog 56098 SHA256 c4b889b9b7156928a89e7275357a8e53c195c45432a35c355208cc7e0f055521 SHA512 66c076f7fd0268c43ba3a318a04e217bab43982fa159e873f11e6cd823df51031865389f0d25ffd69bf6869416c945b199b37803c654aad6beeeded4655ad9b0 WHIRLPOOL 93ee216e818f638655b4efc88e5cf4a5f5081eb8496fd39cddb3693caeef5f40199ab9ecd91885667e62b45cb4f19ee9c99b6bf0c8a309f20d72c57b0239ae67
 MISC metadata.xml 1676 SHA256 17fb0c325844368c649a311f15fbb53a87e5ef987021c52424ffa647745101f3 SHA512 54f12b8385602a6f26b35bb63cbfb0414788e899bc2f5240f60ce249d8ac914c1e236b8d66cee893eac1c3602661869a4333223fa4ce043bd284bde51fa99512 WHIRLPOOL 90a7306f698aa56ab618874f1d325bd3bb789961675d4b0728744abff152bfb6e8cb7303c3cc063782e0411ce27551527c313b404846dadbe2638c5ea086e2f1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJUlZWpXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUl/OvXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwOEM0RURGNjY5QzVBNjMwRkU3REVCOTQz
-QUZGQ0U5NzREMzRCRDhDAAoJEDr/zpdNNL2M8v8P/ivFjDLXIey3GATfHXEPoNYT
-AMJcvqy9xu1tnG9BMwzDj879G2keFCJmlA6GY6dlIUD28Q0WDZWpNo8Ksw3Ql7Wh
-Qg7u9+A7Jl5+i0WqK4UPXXPb9URYmpmvUq3OyCOyLZx32HU5y3mu4hcLoE4mRnJP
-zxnsYKu+RlWYONvDRdtiRciF5WbMMfD/UbFfzTzajPAQoccsv4Gfeb7/8BrVmusi
-1OX1vuPAuC2CK8twsKP0LklOinJpP8BUoG56NyWqQdqoPBYwiDf/3nQyaEWOBWu8
-t2NgXMtfPfvAxfyDbJPQmNcRqD+OsA5LxTzyW49z2MoelkZTmqppEzvq37cdEckQ
-O2+kkq+lJhPfrajau1VEJFs4zYTT2D0IOCfEnDxBr7oHJtl1FU6nFdXnCAnBkyc9
-vMKl7lvScEqJ7++SfWy0jsBjytYDswZR2eUvk/Sy0t8Zx1lSJ44Tu6jM12G0qao/
-yhmAJN/TBo4nOFK2bIqzu5IA0CV914K5YP50JipF0rPCu9U4PUUK7S66incrYkzr
-X+c3ht4zt27fW0WJ9Nf8DQKQNtnRNAYxfGshzaVRb+UTjDbAKjZXHQZZM8Deu3W3
-ytjKKrnggMHZfIshFJaRyx21Xq6T4M0L2V8PUSlxd/AZrnc3R2KjylozAcsDPrd7
-/KQeRXIMNoA4+5IEyJ3R
-=ZBBO
+QUZGQ0U5NzREMzRCRDhDAAoJEDr/zpdNNL2Mk2UQAImX7FsDy2poeTh9klKaSwb1
+0p8z7B8AWQrne2MK/Ep/5C7hVLgeOU14Uz2h9n1vi1BdFbmR0dK/fO2ovnq+guHX
+HyXCxQUNQyevjrslUrB3gYd5qgV34QZ3A4PDlJhGhQZUhf5GAKcY7PAGE+ENsCqZ
+/nNr9uZClkYU/PaP5vXDt+Uuo1JMbgQ+jZdoMYcP7y2bJF/8ewK0/hCfMlnnfDop
+kxmFYahIWBj1XZL23+G89tSBiNQKNCB7qxrQB655cc/hmpJXBM6l8SfNJc7PhL+n
+tjDQ2d39TgUIq9tQlVE9eE/ThXC6mBNu6p/JFVPtD6rDkPfFq+gpi+/lU+s3qGwC
+SqQgXWlm+6+RzcsNE7hvVtpmJmQ9vK3IZYsctCTZKaR02U9dmqv4Lt2OMzTJzxV/
+xum9j/zF/rpqkbBW7x9Fw5EUuj63m5IiIvG7cOaZVbw3uM6NNnoZwnx7xLkKMZqD
+Kvw/j2HdJiy15THqkyYJL5lpK3nXiYjPnrO0tMikV9dczpGop29oqSuvkAET3JHE
+pTnpb+liwoNn7YLjNTi7iuHqiv8zlmJjQpcCqHU4ZcONppF1P5APndsy9G4pxJG6
+CkRkf13/0O2HuAi2AgW3lBRuOvRcNXo/urHoCnnD5xgJAjby3I5LXUFBG/8C+tU7
+w6AKA6v5pkSkGeXcJ+Jl
+=gYmN
 -----END PGP SIGNATURE-----
diff --git a/dev-lisp/sbcl/files/concurrency-test-1.2.6.patch b/dev-lisp/sbcl/files/concurrency-test-1.2.6.patch
new file mode 100644
index 000000000000..b85fc168ed0e
--- /dev/null
+++ b/dev-lisp/sbcl/files/concurrency-test-1.2.6.patch
@@ -0,0 +1,24 @@
+diff -Nuar a/contrib/sb-concurrency/tests/test-frlock.lisp b/contrib/sb-concurrency/tests/test-frlock.lisp
+--- a/contrib/sb-concurrency/tests/test-frlock.lisp	2014-11-29 19:56:58.000000000 +0100
++++ b/contrib/sb-concurrency/tests/test-frlock.lisp	2014-12-16 23:52:18.569947139 +0100
+@@ -22,9 +22,9 @@
+   #+openbsd 0.01
+   #-openbsd 0.0001)
+ 
+-(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 (/ 1 *minimum-sleep*))
++                          (writer-count 10) (write-count 5000)
+                           (outer-write-pause *minimum-sleep*) (inner-write-pause 0))
+     (let ((rw (make-frlock))
+           (a 0)
+@@ -87,7 +87,7 @@
+ #+sb-thread
+ (deftest* (frlock.1 :fails-on :win32)
+     (handler-case
+-        (sb-ext:with-timeout 60 (test-frlocks))
++        (sb-ext:with-timeout 240 (test-frlocks))
+       (sb-ext:timeout (c)
+         (error "~A" c)))
+   nil