gentoo resync : 05.02.2020

10 files changed, 268 insertions, 6 deletions

diff --git a/dev-lisp/Manifest.gz b/dev-lisp/Manifest.gz
index 5f871d1d4102..affebec91924 100644
--- a/dev-lisp/Manifest.gz
+++ b/dev-lisp/Manifest.gz
diff --git a/dev-lisp/asdf/Manifest b/dev-lisp/asdf/Manifest
index f91fdae529b5..c1515d2bcd9c 100644
--- a/dev-lisp/asdf/Manifest
+++ b/dev-lisp/asdf/Manifest
@@ -3,7 +3,7 @@ AUX source-registry.conf 138 BLAKE2B 1adc9396d0d23b361c52d70b1c10d7f5e031776b1a5
 DIST asdf-3.1.5.tar.gz 400359 BLAKE2B 586a66799a37259694baa673f2849e183fac5fedfe5ff5c92529d47fc0954d40b48bbc095db926b9ea2214b551729c269d0925e4396a52310b72fd5f21842f49 SHA512 937d45eabea0853cd1b2e78e84cf33e7b55065857ffcf49fd87ccd60e21ae09c6dc7ab3649d48b37aeb1beaeeaf6c816e5ce035f0283707105296fb976044516
 DIST asdf-3.3.1.tar.gz 479255 BLAKE2B 5161b79741a52721eaa4da80a61bbe51e924967ecb744a087fdcbd99407abcc42faf39eafe6d30af7dd8af751a80caaf23e93ce42aa5f584123a1e8b528cc613 SHA512 bf5efec4518eb5312ce743c0fbe60c587bebfe26c36c833c163d67bf8631e18eeb293f2185e547f6be10da061a17f024d9f4a3a0808727d7b9b3a7d7a0faf133
 DIST asdf-3.3.2.tar.gz 482616 BLAKE2B 860728720ccb02debee6a826d8b27bfd8f5fea3daa529ecfc8d2f5564c77340a38582ccbccf4f311c644bdeccd7348004690929185aa70c3dc0f6b4124616df8 SHA512 f8e065383d6e82754c87d309a8b500ad213e09d1375792fd475eb169d9f880d97b26072e608046d61c83512645781cded09dcff22052e214e8e3639f2a978c74
-EBUILD asdf-3.1.5.ebuild 1123 BLAKE2B 651d16a02bd3777b7497a97fcbd7561e10a0fbe9a9f12f745067048046b3516c5e7ce6a14460ba262229088bc0c1d9738afd330b34eb65f8b8c1e9e65d1868cd SHA512 f3140e449746cadccd0b97904040bba8fd66c652ed56b081a73a9710e7ba6b9a6af51e40f87f1894e3b9a9ec1e2d4396d70fb094de0f1fe21d31dcfc5e70ab22
+EBUILD asdf-3.1.5.ebuild 1124 BLAKE2B f94617b0ecb5d6fba89354d857bae7bd30ecdcaddb3b3c48fc7364f308866700f28e66cf0af22340febf4bb7e062a374b2717178abad7302b4762b08dcef54c1 SHA512 320c3126059d0ca618d863081e478fd6be89f68994adbca6900ba602d5903c97148168b1c3a683e65cb44720b8b02a103ea7207476dccd8e3dc50a5513356d67
 EBUILD asdf-3.3.1.ebuild 1295 BLAKE2B df596766643d63b5a1e66768d5cd6264db799f7badf79d49debabf6c3551674f5169623b57dfe9f9144d4fb7cd6041a481d73b0e7d2a93783eb89eacd6284641 SHA512 fc95ab2d072f9dd84880ac194256c88a57e77bfe2a33689e060cf10e6bc900774c3b471e53a8ec7e02bba77c3a31f38d90b85901280f6155c616435175e139cf
 EBUILD asdf-3.3.2-r1.ebuild 1371 BLAKE2B 4ed425253bb06fb8750c656b2c52f943a999043624839d9aecef52f4791cfde951ca61869d3668b2b60c87543c94251af2261c953979256cff1ddb084adcf39f SHA512 84be7904ca18574d3bdc873487693ddf359c154445ec62028500f8b7b8eb771aaf7e6dccfa41d2616cb71f42c5faf90006b474cb820466cb64ab402e79d4517d
 EBUILD asdf-3.3.2.ebuild 1308 BLAKE2B 344474e430e46c3057ae62de199deee499410cb17a2717e4e501228bf42249a17b3aee3f1cd0551d84e29ba9693997ca0b4c5563e79e356a87670d520a69aa9f SHA512 769a9bd72c6bd53524182bbd160cbcad6030f5882dfd326088da46d364215773cd398c7ad220da01360abcb8db19a965d802a388ff87da5c4d54856b487f1694
diff --git a/dev-lisp/asdf/asdf-3.1.5.ebuild b/dev-lisp/asdf/asdf-3.1.5.ebuild
index dc7f9224a2e2..7319edbf6901 100644
--- a/dev-lisp/asdf/asdf-3.1.5.ebuild
+++ b/dev-lisp/asdf/asdf-3.1.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://common-lisp.net/project/${PN}/archives/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PVR}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="doc"
 
 DEPEND="!dev-lisp/cl-${PN}
diff --git a/dev-lisp/clisp/Manifest b/dev-lisp/clisp/Manifest
index 8950df34c71c..6c285b8df25a 100644
--- a/dev-lisp/clisp/Manifest
+++ b/dev-lisp/clisp/Manifest
@@ -8,5 +8,5 @@ DIST clisp-2.49.92.tar.bz2 9055207 BLAKE2B 6cf331eb9f99f62579e35469e2d01cae06608
 DIST clisp-2.49.tar.bz2 8091011 BLAKE2B e034c581b8100837b34d0adf1ef45bd667272d062945875175958178b4ef5b11e899dfb76505eb8cb51fca6101c11a9f21fb2cc9a78a3c0f82b06166211434f7 SHA512 eef66fc85199a2c283b616db61bf67ff103eeb0f19fa907da48994dc790b6f5f8d0c74fb3bd723c6b827c0ff3cfd89fa6ba67934fc669ed5d5249044b5140d81
 EBUILD clisp-2.49-r9.ebuild 4238 BLAKE2B ff86f053328cf35a316be36309f43f881ae8490a866bdd0d00cf663f9fac6677824a2f5178f666966b0bcf24ab92aef09f9813f84b60bd1b9559ad7bcc72e8a2 SHA512 270ea4dac37edee7eaba10549e9cc126b622808951af59f84ac3955b83db6bc041475a7a5c83b394236e89ea74437324ef66f7e54821823a8d5ca143a3b5c9f2
 EBUILD clisp-2.49.90.ebuild 4045 BLAKE2B 382cf51c99663621a8c118d384c09fb6e490f986d65922558a2d5a998ed5204d9768ffc2a5a4963f6e8176b7f5ec1bfbbde9fd7e86275a54cd4a039bbe6c310f SHA512 5cb44922365a74b9451491baa2fe7f87be4d80323cd6601a65ed2f9d4f293e947df1af18dffce9404328a6702e162482b1d8a537d51f2fbb7f2f48780cfc6d1e
-EBUILD clisp-2.49.92.ebuild 4025 BLAKE2B d8916965223e77393d07c12a27518f888a5e0d3d232f3467f937dcbf632bb6c38729db318452ff455d9d8d333bcc96e9505c5ecfa57f0f971817af101d2f3ef9 SHA512 84dd8fd35257f3eec31b0e223744eededa8502b9c857a1500bd27c09ac09e7533b4f2e77315ba0f895110ecc2395ebd8378e49f81d20507fdcab6bbccf2d5d28
+EBUILD clisp-2.49.92.ebuild 4026 BLAKE2B 87d24f0aca29071ae682bd65335395428cb86bf066a7655090cb214d63469033998901bcfc6a9d44206327a1e378be940d3d447e5b6a2c2f865985b4243783c2 SHA512 e1ee3b779ee0c7901a9c81f3b7e2dcf9317db17606a93c36dab3cfeedb88e33a1c0840c607d51773ef619dd0e4fdef633eb2f313ce24da9af5dae126acd9abbd
 MISC metadata.xml 1240 BLAKE2B f64eb9d2b7885fb771d0bd455c3551191ef85c17ef036686ae213058fa9ae3f87f8dab5dab7d6c89c66dbb883c89f0624009ced645a05f40463f22560802c581 SHA512 8b40fdaba20939478eb982350eed9480df6ac8a48885ceb4e04da9d4bfd77e3c8451f96d2745ce4baff5d4e16db5363d81a66c50a364046f921a47478d563b49
diff --git a/dev-lisp/clisp/clisp-2.49.92.ebuild b/dev-lisp/clisp/clisp-2.49.92.ebuild
index 1b7e846f3137..3c3f3da5116d 100644
--- a/dev-lisp/clisp/clisp-2.49.92.ebuild
+++ b/dev-lisp/clisp/clisp-2.49.92.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="2/8"
-KEYWORDS="alpha amd64 ia64 ppc ~sparc x86"
+KEYWORDS="~alpha amd64 ia64 ppc ~sparc x86"
 IUSE="hyperspec X berkdb dbus fastcgi gdbm gtk +pcre postgres +readline svm -threads +unicode +zlib"
 # "jit" disabled ATM
 
diff --git a/dev-lisp/sbcl/Manifest b/dev-lisp/sbcl/Manifest
index ba2665d201e4..6df817d1784c 100644
--- a/dev-lisp/sbcl/Manifest
+++ b/dev-lisp/sbcl/Manifest
@@ -2,6 +2,7 @@ AUX bsd-sockets-test-1.2.11.patch 14240 BLAKE2B c9b9989c6dc484ba72877e5cfd4b69de
 AUX concurrency-test-1.2.6.patch 1069 BLAKE2B a802300284267942da91ba205ce1a002da3731a7220b0b10fa77b8c347636ee2c2660b590bb18af565a083fb2235b9d3eafd66ba8796d6b7357d032403fb6115 SHA512 6969cec62ee9ee0ecb2aff34c854f51fd93b52f768ed1e1bf7cb3686c370c6e6b1d0691159b5d404f8d5e12e90a1447e6098ed83b0bb1ff4dc7f454f7052ec53
 AUX concurrency-test-1.3.15.patch 967 BLAKE2B 220bdd3ac1c40d2921440fb1ea67ec99f7766b6c33d014be57201502ed122c8cf12875be0ccd5c74fa14d0280a5ece8f63100971eca2f9ffb7a35dac1b7f17b2 SHA512 628429eacd8c513190229260fcfc8ce403072fb7b4bade10c3b65e30a3fc60f1057b018b7043590a205626f3e2f05b244ffd48afa864911d350d37aa84eb1a98
 AUX concurrency-test-1.5.3.patch 944 BLAKE2B 834a87327b4f414ed71b059416b7a76b6657a7696c4dd5daa9d2f72009e0593d9e77914240e02a79e2ff2fc2d5763f3fab1f80ba9e5bc98447a88e7497ec8a9c SHA512 f1ce896ce87878b054b5ea6a73b0980ddb2ab67cfaad5dd44e1c6fa8b6b67fe9cd4d165271540a136276ba5f327de8f9a1a30d7321406a06b5fc64b85bba21d2
+AUX concurrency-test-2.0.1.patch 587 BLAKE2B 3c7f73f7efe711f400f830cbd53b6448aeba41e14f4b229b0260d62c494ffdf9ef9687d916aa108035b53065598a8a51c92e086509b2cdabb2f6b2a7acb0b718 SHA512 c1223eda1a6e9e40196bc133a6270c9803195257d39637d4622026503774847eb184879025d9029617e8b36074d81c47820c4474ceabcb45b7734deddeeae8ce
 AUX gentoo-fix_install_man.patch 399 BLAKE2B f0f04de59f5ddd69a54fcfa5feb4c8038e7e37c923d8ca93d061b642cd01a39b9d1a0f54b00a8a1fbc654788d0224b4949bf225e97048fc73fa2196969ae3496 SHA512 bc5118ddf2fd851dcabf773cc7443fa0d3f5a5b83715173110f9164c631faaf8c2d6b247f7ac205da23bb388ff459eba228deeaa2a45202870b7f97376564030
 AUX sb-posix-test-1.2.15.patch 1325 BLAKE2B 051500de2167bb963c6b20cf8f57a03e9326e9e8c79ce249fb23aa7f041c62384717d545f2e6aeefac900af9c27f640218543a218bf902081bcec69968108df1 SHA512 79fd75eb5c44630eb6669b1808029420c7031cc1ba367b8687d7433bf0d19016a7912df0ab21c90aa7e709417ec9784c846c7dcefbc1308a059cbd8b3209dd27
 AUX sbcl-1.1.17-gentoo-fix_nopie_for_hardened_toolchain.patch 1024 BLAKE2B 73899d54f3951347f3b1d340f1333fee2480816ae601299bebd3341598d98d7cecee1de246e1084427c97863b66cad8ce4dd88a4a0ef1390871592adce3baca2 SHA512 a09efe91a082fd2bed9dc30652f3e5ed51e416697b7b2fee4d6c5f90db0ecbadca7adf652f532d79869fde9186e9d16855f5fd81321cb2a82e1a158d4cde9e97
@@ -36,10 +37,13 @@ DIST sbcl-1.5.8-source.tar.bz2 6409837 BLAKE2B cb503ee1db82f2e1a9c123b9b6b5052b2
 DIST sbcl-1.5.8-x86-64-linux-binary.tar.bz2 10145219 BLAKE2B aeccd48a5448e334d6cf3ca4e067ac23943256c2a729ff24b6b3c332c6c70c108b68a6903193a403176d4fbf4804c9f22add615e29fa09022f84b0190a429454 SHA512 d733929775be6fe5d46fd5b11c808eae89172a5a8694f1c2a7927cc364419529292d70f6902731f4c7822c85708555382de31b605440493bb281ccef552daf6c
 DIST sbcl-2.0.0-source.tar.bz2 6457217 BLAKE2B ae09d4d80ca7100fb412be570126918612eb5a3f27a8c17ced4e0c555d105f3180999f2663ea86910dda9d812d4297cceb8d7c43d5084d20902839e1f23bc739 SHA512 e458e11af6703d8cff973cf5167866b93fe5f6e1b2df3cbf0c1beb014eef2d737d83fc9cde5745d476ef5397a2c9b4b4148d2b77ebbcec13e0f284b2e0900906
 DIST sbcl-2.0.0-x86-64-linux-binary.tar.bz2 10196560 BLAKE2B 161d53df96817a50606ffc6a5ad502a94a1aa622e0a45c17c4ff4148deafb2e1db560aacd33b1198eb6fd3bc462b320e01d4925097bec3954f9d6ce564a2b1f5 SHA512 23d3974656a33ae0cfce340e2fbdd60a4e595353e7cc6e75dbab0242d7baaa30d677d1163d4440e953cd7f859fc737b073055b68fbeb2e57e3542a0133d7648f
+DIST sbcl-2.0.1-source.tar.bz2 6466983 BLAKE2B f040fb288f5b7adb8a7f56aae60a37e38034c2fed958b1361f473096769367b0a10a76a0e45380e6dcf3b4bd2c1038957448f70eede38b04c228a14e3afc1fc2 SHA512 1d92589033e123c21377f820dbc22e27f2610a372c5545799bec7c247795ba4b8b65102c7fe739f4a15a84579ec72f63fb9f4b197db5c6da1f8d59bd35966bea
+DIST sbcl-2.0.1-x86-64-linux-binary.tar.bz2 10151722 BLAKE2B 445fcaa5a6f1c2a7a7d80dd28d1126c33437af2a59dadd25cbbe9ca4e12488a985e78aa12095fda8e38e21dceca77a0e1bca0949133b0ac2666d4367bf881f68 SHA512 1d24981b42c5d91f6037ad6fed782786bbc75edcb2f125a6d5b793448d00c211af515f56b6dd70a68bd33ea7174fd1d96ef9ab353c96905835b6299dcb170f47
 EBUILD sbcl-1.3.11.ebuild 8382 BLAKE2B 7df1cb22c53debbc4f972fd230bd4cef1132f234946a06309d6bedb3bc9a8c51b582ccd2e671895bc270985e3ce82b4aa56ef21a4a31ca1b91e98318e560f2b4 SHA512 d6b00cc75cc3bc55be589d4e7690469e1ae8d8c00174ec67d83eff42f977e0840a97c22550be732ce0335b38d38b0429f0a47d9cf4de25402d91ea7814c3c351
 EBUILD sbcl-1.4.9.ebuild 8663 BLAKE2B 1e8a9d0fe96a4640e7b69b55c087884bd084ab2dd1ca2ce57eede21e7c4b0b7ca91174ff1f2ba6abf565bd3c485e06ec0de7678104dd56d72b60eee35bdf5152 SHA512 db38534d9f54e92ae630f87751cbd7150ba1f6dac79df203df432b0edddb61a4ed8096d471e05f011cfc6be68b12777a1cc624927c35e0942c6bea2ce0c10e91
 EBUILD sbcl-1.5.6.ebuild 8665 BLAKE2B 66fbdd47246e85e15ea1bf9f06f7c11586c5641adce831357bdbf9ce7ee250c12f1046042bd21e7311bb3052946fcfd883e8e7da85b6af15cc892c31379fc5e1 SHA512 591142f451b6a12eaadc1a4c24c38a6217c0d59e3fcc99dbf21341e5983eee582d892ea8d40cc4e586715cfa0b78688c1ebffdcf1d984fee51927f1f03679484
 EBUILD sbcl-1.5.7.ebuild 8665 BLAKE2B 66fbdd47246e85e15ea1bf9f06f7c11586c5641adce831357bdbf9ce7ee250c12f1046042bd21e7311bb3052946fcfd883e8e7da85b6af15cc892c31379fc5e1 SHA512 591142f451b6a12eaadc1a4c24c38a6217c0d59e3fcc99dbf21341e5983eee582d892ea8d40cc4e586715cfa0b78688c1ebffdcf1d984fee51927f1f03679484
 EBUILD sbcl-1.5.8.ebuild 8665 BLAKE2B e28462c9fa65b1616e8b434146a83bee5a01ce077bb8e9b2ab582472a75b48f7f350b161552124d5280c055f81d863a778f1af8f2c9f3f844a00ccc4ba62d7d3 SHA512 aa5198704835cad195399db80eca0a777444610d658104808be79e11d0fad39abd9f5eb0d2a74e9b0becced839f8384294cc2987e5528074cbe24bc8c879732c
 EBUILD sbcl-2.0.0.ebuild 8665 BLAKE2B 8e6080aed9f552aa2f8d4da3753d2c8d2737126344ef968265fd64f5b219d7a36780a2731905fd753d03de340f94434be6f661c5830cc8aa13be6b0867738b10 SHA512 e0e38b890d6499d17e736092c68b2a024099ca23d5a54d1446acc7c0212988f9da15f3f72c1ecd93ba474e3ebed3f09aad627458f8f320d98f1d7e439b9cc055
+EBUILD sbcl-2.0.1.ebuild 8665 BLAKE2B 77b499d14ad3e51ef6b233ad2465946d4df6be50ef1c3b9e8ddcac2693b98d5dfc22446a73ff641014e52b17b21c1e71a638c9a228a3e310671c79fe2b140929 SHA512 59f6478d2e4db2d7609bda1f3a10c3d62fe46e03ee54c7ad0a0316318441871c5ecc62292c7cfa7d6999cf34cc1af8400af852db3d2debc1d5779c6a65f02457
 MISC metadata.xml 1312 BLAKE2B a03042bd9d39465fe7ae45d6b749571fc4d22cf9d7f81d3cd498b155729576ec1f2ddec03c2c662ecb23abfd19a627ba2cbe9798960009e998a8823902062118 SHA512 3c4463de4a8871ab56fe74c286977fda3037e953d5fa26162d07976efa00b0d99bc98295435a7c5233c43b27369e31eb5d1c0b4c66600477a307aa1a7a322e1c
diff --git a/dev-lisp/sbcl/files/concurrency-test-2.0.1.patch b/dev-lisp/sbcl/files/concurrency-test-2.0.1.patch
new file mode 100644
index 000000000000..e0a36a8b3a25
--- /dev/null
+++ b/dev-lisp/sbcl/files/concurrency-test-2.0.1.patch
@@ -0,0 +1,12 @@
+diff -r -U3 sbcl-2.0.1.orig/contrib/sb-concurrency/tests/test-frlock.lisp sbcl-2.0.1/contrib/sb-concurrency/tests/test-frlock.lisp
+--- sbcl-2.0.1.orig/contrib/sb-concurrency/tests/test-frlock.lisp	2020-01-27 04:26:30.000000000 +0700
++++ sbcl-2.0.1/contrib/sb-concurrency/tests/test-frlock.lisp	2020-01-30 21:53:57.750913923 +0700
+@@ -88,7 +88,7 @@
+ #+sb-thread
+ (deftest* (frlock.1)
+     (handler-case
+-        (sb-ext:with-timeout 40
++        (sb-ext:with-timeout 240
+           (test-frlocks #+win32 :outer-write-pause #+win32 t ))
+       (sb-ext:timeout (c)
+         (error "~A" c)))
diff --git a/dev-lisp/sbcl/sbcl-2.0.1.ebuild b/dev-lisp/sbcl/sbcl-2.0.1.ebuild
new file mode 100644
index 000000000000..05eaaf6192ed
--- /dev/null
+++ b/dev-lisp/sbcl/sbcl-2.0.1.ebuild
@@ -0,0 +1,246 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib eutils flag-o-matic pax-utils
+
+#same order as http://www.sbcl.org/platform-table.html
+BV_X86=1.4.3
+BV_AMD64=2.0.1
+BV_PPC=1.2.7
+BV_SPARC=1.0.28
+BV_ALPHA=1.0.28
+BV_ARM=1.4.11
+BV_ARM64=1.4.2
+BV_X86_MACOS=1.1.6
+BV_X64_MACOS=1.2.11
+BV_PPC_MACOS=1.0.47
+BV_X86_SOLARIS=1.2.7
+BV_X64_SOLARIS=1.2.7
+BV_SPARC_SOLARIS=1.0.23
+
+DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp"
+HOMEPAGE="http://sbcl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
+	x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
+	amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 )
+	ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 )
+	sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 )
+	alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 )
+	arm? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 )
+	arm64? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM64}-arm64-linux-binary.tar.bz2 )
+	x86-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_MACOS}-x86-darwin-binary.tar.bz2 )
+	x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 )
+	ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 )
+	x86-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_SOLARIS}-x86-solaris-binary.tar.bz2 )
+	x64-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 )
+	sparc-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC_SOLARIS}-sparc-solaris-binary.tar.bz2 )"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="debug doc source +threads +unicode pax_kernel zlib"
+
+CDEPEND=">=dev-lisp/asdf-3.1:="
+DEPEND="${CDEPEND}
+		doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )
+		pax_kernel? ( sys-apps/elfix )"
+RDEPEND="${CDEPEND}
+		!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )"
+
+# Disable warnings about executable stacks, as this won't be fixed soon by upstream
+QA_EXECSTACK="usr/bin/sbcl"
+
+CONFIG="${S}/customize-target-features.lisp"
+ENVD="${T}/50sbcl"
+
+# Prevent ASDF from using the system libraries
+CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)"
+ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)"
+
+usep() {
+	use ${1} && echo "true" || echo "false"
+}
+
+sbcl_feature() {
+	echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}"
+}
+
+sbcl_apply_features() {
+	sed 's/^X//' > "${CONFIG}" <<-'EOF'
+	(lambda (list)
+	X  (flet ((enable  (x) (pushnew x list))
+	X         (disable (x) (setf list (remove x list))))
+	EOF
+	if use x86 || use amd64; then
+		sbcl_feature "$(usep threads)" ":sb-thread"
+	fi
+	sbcl_feature "true" ":sb-ldb"
+	sbcl_feature "false" ":sb-test"
+	sbcl_feature "$(usep unicode)" ":sb-unicode"
+	sbcl_feature "$(usep zlib)" ":sb-core-compression"
+	sbcl_feature "$(usep debug)" ":sb-xref-for-internals"
+	sed 's/^X//' >> "${CONFIG}" <<-'EOF'
+	X    )
+	X  list)
+	EOF
+	cat "${CONFIG}"
+}
+
+src_unpack() {
+	unpack ${A}
+	mv sbcl-*-* sbcl-binary || die
+	cd "${S}"
+}
+
+src_prepare() {
+	# bug #468482
+	eapply "${FILESDIR}"/concurrency-test-2.0.1.patch
+	# bugs #486552, #527666, #517004
+	eapply "${FILESDIR}"/${PN}-1.4.0-bsd-sockets-test.patch
+	# bugs #560276, #561018
+	eapply "${FILESDIR}"/sb-posix-test-1.2.15.patch
+
+	eapply "${FILESDIR}"/${PN}-1.2.11-solaris.patch
+	eapply "${FILESDIR}"/${PN}-1.4.0-verbose-build.patch
+
+	eapply_user
+
+	# Make sure the *FLAGS variables are sane.
+	# sbcl needs symbols in resulting binaries, so building with the -s linker flag will fail.
+	strip-unsupported-flags
+	filter-flags -fomit-frame-pointer -Wl,-s
+	filter-ldflags -s
+
+	# original bugs #526194, #620532
+	# this broke no-pie default builds, c.f. bug #632670
+	# Pass CFLAGS down by appending our value, to let users override
+	# the default values.
+	# Keep passing LDFLAGS down via the LINKFLAGS variable.
+	sed -e "s@\(CFLAGS += -g .*\)\$@\1 ${CFLAGS}@" \
+		-e "s@LINKFLAGS += -g\$@LINKFLAGS += ${LDFLAGS}@" \
+		-i src/runtime/GNUmakefile || die
+
+	sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \
+		-i make-config.sh || die
+
+	# Use installed ASDF version
+	cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die
+	# Avoid installation of ASDF info page. See bug #605752
+	sed '/INFOFILES/s/asdf.info//' -i doc/manual/Makefile || die
+
+	use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk
+
+	# Some shells(such as dash) don't have "time" as builtin
+	# and we don't want to DEPEND on sys-process/time
+	sed "s,^time ,," -i make.sh || die
+	sed "s,/lib,/$(get_libdir),g" -i install.sh || die
+	# #define SBCL_HOME ...
+	sed "s,/usr/local/lib,${EPREFIX}/usr/$(get_libdir),g" -i src/runtime/runtime.c || die
+	# change location of /etc/sbclrc ...
+	sed  "s,/etc/sbclrc,${EPREFIX}/etc/sbclrc,g" -i src/code/toplevel.lisp || die
+
+	find . -type f -name .cvsignore -delete
+}
+
+src_configure() {
+	# customizing SBCL version as per
+	# http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup
+	echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr
+
+	# applying customizations
+	sbcl_apply_features
+}
+
+src_compile() {
+	local bindir="${WORKDIR}"/sbcl-binary
+
+	if use pax_kernel ; then
+		# To disable PaX on hardened systems
+		pax-mark -mr "${bindir}"/src/runtime/sbcl
+
+		# Hack to disable PaX on second GENESIS stage
+		sed -i -e '/^[ \t]*echo \/\/doing warm init - compilation phase$/a\    paxmark.sh -mr \.\/src\/runtime\/sbcl' \
+			"${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime"
+	fi
+
+	# clear the environment to get rid of non-ASCII strings, see bug #174702
+	# set HOME for paludis
+	env - HOME="${T}" PATH="${PATH}" \
+		CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \
+		CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \
+		GNUMAKE=make ./make.sh \
+		"sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \
+		|| die "make failed"
+
+	# need to set HOME because libpango(used by graphviz) complains about it
+	if use doc; then
+		env - HOME="${T}" PATH="${PATH}" \
+			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
+			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
+			make -C doc/manual info html || die "Cannot build manual"
+		env - HOME="${T}" PATH="${PATH}" \
+			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
+			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
+			make -C doc/internals info html || die "Cannot build internal docs"
+	fi
+}
+
+src_test() {
+	ewarn "Unfortunately, it is known that some tests fail eg."
+	ewarn "run-program.impure.lisp. This is an issue of the upstream's"
+	ewarn "development and not of Gentoo's side. Please, before filing"
+	ewarn "any bug(s) search for older submissions. Thank you."
+	time ( cd tests && sh run-tests.sh )
+}
+
+src_install() {
+	# install system-wide initfile
+	dodir /etc/
+	sed 's/^X//' > "${ED}"/etc/sbclrc <<-EOF
+	;;; The following is required if you want source location functions to
+	;;; work in SLIME, for example.
+	X
+	(setf (logical-pathname-translations "SYS")
+	X      '(("SYS:SRC;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/src/**/*.*")
+	X        ("SYS:CONTRIB;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/**/*.*")))
+	X
+	;;; Setup ASDF2
+	(load "${EPREFIX}/etc/common-lisp/gentoo-init.lisp")
+	EOF
+
+	# Install documentation
+	unset SBCL_HOME
+	INSTALL_ROOT="${ED}/usr" LIB_DIR="${EPREFIX}/usr/$(get_libdir)" DOC_DIR="${ED}/usr/share/doc/${PF}" \
+		sh install.sh || die "install.sh failed"
+
+	# bug #517008
+	pax-mark -mr "${D}"/usr/bin/sbcl
+
+	# rm empty directories lest paludis complain about this
+	find "${ED}" -empty -type d -exec rmdir -v {} +
+
+	if use doc; then
+		dodoc -r doc/internals/sbcl-internals
+
+		doinfo doc/manual/*.info*
+		doinfo doc/internals/sbcl-internals.info
+
+		docinto internals-notes
+		dodoc doc/internals-notes/*
+	else
+		rm -Rv "${ED}/usr/share/doc/${PF}" || die
+	fi
+
+	# install the SBCL source
+	if use source; then
+		./clean.sh
+		cp -av src "${ED}/usr/$(get_libdir)/sbcl/" || die
+	fi
+
+	# necessary for running newly-saved images
+	echo "SBCL_HOME=${EPREFIX}/usr/$(get_libdir)/${PN}" > "${ENVD}"
+	echo "SBCL_SOURCE_ROOT=${EPREFIX}/usr/$(get_libdir)/${PN}/src" >> "${ENVD}"
+	doenvd "${ENVD}"
+}
diff --git a/dev-lisp/uiop/Manifest b/dev-lisp/uiop/Manifest
index 787639f544e7..9c8d915e2022 100644
--- a/dev-lisp/uiop/Manifest
+++ b/dev-lisp/uiop/Manifest
@@ -1,7 +1,7 @@
 DIST asdf-3.1.5.tar.gz 400359 BLAKE2B 586a66799a37259694baa673f2849e183fac5fedfe5ff5c92529d47fc0954d40b48bbc095db926b9ea2214b551729c269d0925e4396a52310b72fd5f21842f49 SHA512 937d45eabea0853cd1b2e78e84cf33e7b55065857ffcf49fd87ccd60e21ae09c6dc7ab3649d48b37aeb1beaeeaf6c816e5ce035f0283707105296fb976044516
 DIST asdf-3.3.1.tar.gz 479255 BLAKE2B 5161b79741a52721eaa4da80a61bbe51e924967ecb744a087fdcbd99407abcc42faf39eafe6d30af7dd8af751a80caaf23e93ce42aa5f584123a1e8b528cc613 SHA512 bf5efec4518eb5312ce743c0fbe60c587bebfe26c36c833c163d67bf8631e18eeb293f2185e547f6be10da061a17f024d9f4a3a0808727d7b9b3a7d7a0faf133
 DIST uiop-3.3.2.tar.gz 98207 BLAKE2B a003fabde2ee66244e48caa5ae319fb7ce872dc72cdb8f66c39cfa97a5fc5307de667b48a403432cc3c5cf3d8bfa2e3d330ee91b6251add532ec462d0c4c1d29 SHA512 3af6bfc7d0aa6ee102d3d9cbef3277026d9d7ac4811f6c966b4a9f84ab1e0f128822bddcf8b221288a3c895fc5be377f0ae907e2a08f38e6b09f36e5b4635ecc
-EBUILD uiop-3.1.5.ebuild 884 BLAKE2B b065886d1584fe4619656585052a601bbb66a2a7873ea4f4ed2a3e46186d428551745398bcf8e1efd9e2b3b2045ce34d618b269674370e66a9b82f33bcee9476 SHA512 7c3d2beb186769971aa6b13f6253dd1dff378a997c03f56e4d0a98f2113c8dfddf6997a1a29a59b71cbaf691cbee9041c45422ce75e09ee75bc00e4d0c4b0914
+EBUILD uiop-3.1.5.ebuild 885 BLAKE2B 9d76d81ee1029b2abe35eefa283ea50b5b16e5aea85de6da355af3fe877132213c114427e70d441467304241001d832b508adc0606ca461b37ab92c6c3360081 SHA512 9ad9fb880437da4581793256923113a66746f28860dab057c5f0ab4fed8586fdfebce25c186634af99379a7819fe409a8f2872e144fd07e80dbb2beee1c1668f
 EBUILD uiop-3.3.1.ebuild 809 BLAKE2B 085a8819b62018aeea1a6b98ea4793fcfd83c2d873cff66f8e82a40ecbef6001f3d08154d68d81a37ae19b1f6da4081a47ea38b4573ef248e534ada50c92cddf SHA512 7ca137a6496e41b7a1c8ffdc99990aab7d54bb20887357f23422f4411d32a50c9eb299e1e86bdbf118063a1bbe182f5d889efbe7b5bae65db8f07a8dbdc9aadc
 EBUILD uiop-3.3.2.ebuild 482 BLAKE2B 68493530c82eeef0110606aa4b0326bf8023c25dad52e78865c3c4a335088f96eac4a25353292d8f4ecf45247270c77ff97ecba566184d8e85796ccb78bd3ba6 SHA512 f07905e014e586ad7367869239bdcffae70ba2cc48c7e1c59251f199ca4c0cc7ed2a2b1ff7bb576c1c09272c4b0ee1dcb61329958459112917fbe09eae1b006d
 MISC metadata.xml 261 BLAKE2B 161dea7ab371cbcbc08b8aac63e402f9fe994c08d55f2291360e900bf73e21f2c2ea67b6fcc3cb000f1cef03d1c41c6d2e5e16dd06d6916ec90d4e54a1ba3dd7 SHA512 fb754c4ed3579db5dbe303197a05647b7cfab0a3fe47fd2140d5f77641be752d10ccf49a9c267406a0f3ba3dcda8831f778b9596d723f65aff10142bfad60d3d
diff --git a/dev-lisp/uiop/uiop-3.1.5.ebuild b/dev-lisp/uiop/uiop-3.1.5.ebuild
index 597cdb26d9bd..7a94ca7f8116 100644
--- a/dev-lisp/uiop/uiop-3.1.5.ebuild
+++ b/dev-lisp/uiop/uiop-3.1.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://common-lisp.net/project/asdf/archives/asdf-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="~dev-lisp/asdf-${PV}"