gentoo resync : 15.12.2019

18 files changed, 110 insertions, 37 deletions

diff --git a/dev-lisp/Manifest.gz b/dev-lisp/Manifest.gz
index e501c26b5320..f61b4504a791 100644
--- a/dev-lisp/Manifest.gz
+++ b/dev-lisp/Manifest.gz
diff --git a/dev-lisp/abcl/Manifest b/dev-lisp/abcl/Manifest
index 09350e8c2cd8..80a0d412ed89 100644
--- a/dev-lisp/abcl/Manifest
+++ b/dev-lisp/abcl/Manifest
@@ -1,3 +1,3 @@
 DIST abcl-src-1.5.0.tar.gz 1187678 BLAKE2B 4c6993ab90d6fe12e93bf185ecdc16dd5c69ff5c65881e74db51ba9a8167e3a3de4b25ff9971084e92499f654aacec2a07757d100a5977944076476d47c17438 SHA512 d56c23a82103dfebb3361903af096f923738008e551f3b5e07e00f0423c8ade0b07a388b7834b5d79d9191863b38db2c17fa27bffd848d7cba88d6bb67e32db3
-EBUILD abcl-1.5.0.ebuild 816 BLAKE2B 622259ea3ddb2021630255dbad99de08c89d984fab4c4e6bc5de93a76369f087c30800b53e47f519d91f3f701a4e542331565b31a7d0d744e9dedb1796e7d36b SHA512 4b61bd1d66e585cf1e967080280e36831276274e566fab38f492052441e202016fd7f601abfbe24a272ac3b30c6b0c569633a6b578a3715bec00a3bbf78d564a
+EBUILD abcl-1.5.0.ebuild 786 BLAKE2B 1f34923c3287dd474d33d30f22cc160c55fa39e129255236c9956b95d18d536f48b062799bcdc5f6476cec3f427388cf77110c857bd363e496b61f32cabc4f1f SHA512 9f6d3e7e298d798531bca0cf5f943b44dafa9a903a693f6edbbc7195b1300acc80c9ecffb47630eada7d63f4afa417ba54d8ef01b0cbc263dda10a7a42af3708
 MISC metadata.xml 509 BLAKE2B 484256eac69bd0c0bf0bffadc8513a1f9f7c90e22db8a45d3008517936aad0f00d028ab97987c954c3cd086c0e0824bba3969a24d1c544be47c2221f817bd5cc SHA512 7216031e2c4c73c0d0bcf4b454cfa7d859dc21cd6d1000792357dcda973e6ea78917d06077b283d0ed19bda53c01917fcccd562fab5770499b9cfae4dace1ef5
diff --git a/dev-lisp/abcl/abcl-1.5.0.ebuild b/dev-lisp/abcl/abcl-1.5.0.ebuild
index 6cb5cefcfec9..e044eb611f12 100644
--- a/dev-lisp/abcl/abcl-1.5.0.ebuild
+++ b/dev-lisp/abcl/abcl-1.5.0.ebuild
@@ -30,5 +30,5 @@ src_compile() {
 src_install() {
 	java-pkg_dojar dist/abcl.jar
 	java-pkg_dolauncher ${PN} --java_args "-server -Xrs" --main org.armedbear.lisp.Main
-	dodoc README || die "Can't install README"
+	dodoc README
 }
diff --git a/dev-lisp/asdf/Manifest b/dev-lisp/asdf/Manifest
index 396c0d48bc69..f91fdae529b5 100644
--- a/dev-lisp/asdf/Manifest
+++ b/dev-lisp/asdf/Manifest
@@ -3,8 +3,8 @@ 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 1136 BLAKE2B 983ecadd2a3d49d523d20ccc91a311fd634663c54e240802e88280711b1e83bc40cf2d5a8a5ee9db6ca339d23e78abe64be23a3f53ee44000f30ee843184f5b0 SHA512 40f2823eb5bb0d54907b10f5cd9b3b9a73afea614ff49f9f1ea1c3bb3c350f092bbbffe85e051c2e21bf4c4ee2186889c2e3876a12a9d47cc5d44190ee12ba47
-EBUILD asdf-3.3.1.ebuild 1308 BLAKE2B 54b301b57efd26260595832c141837aa3dce1a6b7fd6a0f40338b756801401e161694f1194be0f94f79ff2bc7f3b449df6e159a84fbf6e4d8e1bf2f7b1689f6c SHA512 1455ea2aac7af52856c84f19646a782ef469e68999746ad0b83d207aaa33b97c2d21be67e28939ce9a87da7d7a8b72da5db3aacf4a856b00f6dafa4467a3646c
-EBUILD asdf-3.3.2-r1.ebuild 1357 BLAKE2B e8cceb2c5916ef5a8a56ca8588caebfdbc186511621ca204ab90b3d4dec6c8f72bcf43a23f42b6c732559944701eaee441de7fe9f482881521d14411adcdefa0 SHA512 d49565fb6aa92933af6e52343ed8c014a680373499c802ecb2ac15e1bd18c34dab5afb55c8df62c1b34a773cf57f581c4aed30acc35f1eec8897f0b1402742e1
-EBUILD asdf-3.3.2.ebuild 1321 BLAKE2B a35727fd7619c5ab761bb034a5ad839eef0aee947b1a94eb5adbad099f7724f38d75d31a55bd372d19c5b4d52996f3470802f8a691e254fecff28c4272aa2173 SHA512 e849a7c753d751e82b3d317dd1b77c7225c592e86d8e21e6245b27c88beb564eeef7453048d1f99493609ebe80501fe14509d8415dee1d4fb3003eb7914ea9d5
+EBUILD asdf-3.1.5.ebuild 1123 BLAKE2B 651d16a02bd3777b7497a97fcbd7561e10a0fbe9a9f12f745067048046b3516c5e7ce6a14460ba262229088bc0c1d9738afd330b34eb65f8b8c1e9e65d1868cd SHA512 f3140e449746cadccd0b97904040bba8fd66c652ed56b081a73a9710e7ba6b9a6af51e40f87f1894e3b9a9ec1e2d4396d70fb094de0f1fe21d31dcfc5e70ab22
+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
 MISC metadata.xml 261 BLAKE2B 161dea7ab371cbcbc08b8aac63e402f9fe994c08d55f2291360e900bf73e21f2c2ea67b6fcc3cb000f1cef03d1c41c6d2e5e16dd06d6916ec90d4e54a1ba3dd7 SHA512 fb754c4ed3579db5dbe303197a05647b7cfab0a3fe47fd2140d5f77641be752d10ccf49a9c267406a0f3ba3dcda8831f778b9596d723f65aff10142bfad60d3d
diff --git a/dev-lisp/asdf/asdf-3.1.5.ebuild b/dev-lisp/asdf/asdf-3.1.5.ebuild
index 8a067789c189..dc7f9224a2e2 100644
--- a/dev-lisp/asdf/asdf-3.1.5.ebuild
+++ b/dev-lisp/asdf/asdf-3.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,12 +10,10 @@ HOMEPAGE="http://common-lisp.net/project/asdf/"
 SRC_URI="http://common-lisp.net/project/${PN}/archives/${P}.tar.gz"
 
 LICENSE="MIT"
-SLOT="0"
+SLOT="0/${PVR}"
 KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="doc"
 
-SLOT="0/${PVR}"
-
 DEPEND="!dev-lisp/cl-${PN}
 		!<dev-lisp/asdf-2.33-r3
 		doc? ( virtual/texi2dvi )"
diff --git a/dev-lisp/asdf/asdf-3.3.1.ebuild b/dev-lisp/asdf/asdf-3.3.1.ebuild
index 41961826139a..aed7e6593218 100644
--- a/dev-lisp/asdf/asdf-3.3.1.ebuild
+++ b/dev-lisp/asdf/asdf-3.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,12 +10,10 @@ HOMEPAGE="http://common-lisp.net/project/asdf/"
 SRC_URI="http://common-lisp.net/project/${PN}/archives/${P}.tar.gz"
 
 LICENSE="MIT"
-SLOT="0"
+SLOT="0/${PVR}"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="doc"
 
-SLOT="0/${PVR}"
-
 DEPEND="!dev-lisp/cl-${PN}
 		!<dev-lisp/asdf-2.33-r3
 		doc? ( virtual/texi2dvi )"
diff --git a/dev-lisp/asdf/asdf-3.3.2-r1.ebuild b/dev-lisp/asdf/asdf-3.3.2-r1.ebuild
index 74e4ab625579..20b72a58ce0f 100644
--- a/dev-lisp/asdf/asdf-3.3.2-r1.ebuild
+++ b/dev-lisp/asdf/asdf-3.3.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,11 +10,10 @@ HOMEPAGE="http://common-lisp.net/project/asdf/"
 SRC_URI="http://common-lisp.net/project/${PN}/archives/${P}.tar.gz"
 
 LICENSE="MIT"
-SLOT="0"
+SLOT="0/${PVR}"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="doc test"
-
-SLOT="0/${PVR}"
+RESTRICT="!test? ( test )"
 
 DEPEND="!dev-lisp/cl-${PN}
 		!<dev-lisp/asdf-2.33-r3
diff --git a/dev-lisp/asdf/asdf-3.3.2.ebuild b/dev-lisp/asdf/asdf-3.3.2.ebuild
index 54c65a46a31f..24b35b0d2403 100644
--- a/dev-lisp/asdf/asdf-3.3.2.ebuild
+++ b/dev-lisp/asdf/asdf-3.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,12 +10,10 @@ HOMEPAGE="http://common-lisp.net/project/asdf/"
 SRC_URI="http://common-lisp.net/project/${PN}/archives/${P}.tar.gz"
 
 LICENSE="MIT"
-SLOT="0"
+SLOT="0/${PVR}"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="doc"
 
-SLOT="0/${PVR}"
-
 DEPEND="!dev-lisp/cl-${PN}
 		!<dev-lisp/asdf-2.33-r3
 		doc? ( virtual/texi2dvi )"
diff --git a/dev-lisp/c2ffi/Manifest b/dev-lisp/c2ffi/Manifest
index 94e0149fc234..3b5b5404e779 100644
--- a/dev-lisp/c2ffi/Manifest
+++ b/dev-lisp/c2ffi/Manifest
@@ -1,2 +1,5 @@
-EBUILD c2ffi-8.0.0.9999.ebuild 420 BLAKE2B d61f069a42debda210f3677ef5114e84ed7e9aeb72a4f1cc23f1e457280f35df834664fd3a96a58d4d35f30167fb293b0f277584b2356e329a057747994d41da SHA512 cf493464a8afbbdf964df0933dc61d9dabcbbcc12254b3c63d68908192f80f2551a64660b5b76bd9df8be98a61a812f91d894b839c4e31a7fe24f0e8378b4984
+AUX c2ffi-9.0.0.20191017-fix-lib-location.patch 1382 BLAKE2B 93f11c43da622cf4bf9e5ee495117ff8613720af543bbfe9ff2e70b4893f86c26aaa5880c8cdba1ee283b3a7e81a5584218427129dce1debd9a58879f56d65e6 SHA512 21556242a0efdbf7bad98ac624ae5854aa7527cfa00a6ccb7cae4af08d2ead7328aa637bdfb8d3637d133b7de2d6110e6096d7766010f039b017d63b7994f46d
+DIST c2ffi-9.0.0.20191017.tar.gz 35139 BLAKE2B a080f2cf7743aab630365fd305c106ada0318afb24093508c7667d8d702ec8dfd95a0ea9f54233a3a4b4c9b411e2f4aba5dacf7b2f35f1545b7ca63e765a7e55 SHA512 7a4743d89f431fd9ca42808358bdde03bbd85fc56f3350fddc94532c524ce373989671e706fadeb03eb240a81fb3f418176169acbf3ccd0f0f0c595d0f697832
+EBUILD c2ffi-9.0.0.20191017.ebuild 606 BLAKE2B 4e70b22a69be7691fd14d5fdb3758a5faa8fc2d6dfefb7cc0fa43a234487d3affcf1039033564535a65655a5c79ec5cdffc17687b82bc4449f32d66e37045bb0 SHA512 33f38a53aab0f89e0e8c3a7c4dc28ab23c8a403330e1806b22caeafc8e2e53f4dd61952d69250e6aed02e4d58818a5bcb7afb0d31094e301fd29c0b394168be1
+EBUILD c2ffi-9.0.0.9999.ebuild 498 BLAKE2B de121239dfcf89d7999063b85c32aa4400414df1df26fa0e51b60351d7f49cf333de22c9580fea7473c14b20b21daaa7aff202ac949d4a396f2c1fbf7e4b0f4d SHA512 18fc4778afaa607e68be7e8bf18a6575bdfe80b176b4ce77f50305f6962f65e35c772fc8594215dfc6ef79d6715881647f8e8f159a41c999fd57671a26a9e160
 MISC metadata.xml 421 BLAKE2B 2df9693805f6968df30c8df0dbb1578c11b064b5f3b23f96321832c7551dbc751ebaeb81845147a7526f891b658aaaff8efeea185b239576e2885d3606944e87 SHA512 7bf517258ecbdf98192c055c451fe16315b34ac8875528b0fac4e844c15f2a4656d2252a88bbb642b54bc608a21d83af158cb5e6872b46e70d7c32f557b83de1
diff --git a/dev-lisp/c2ffi/c2ffi-9.0.0.20191017.ebuild b/dev-lisp/c2ffi/c2ffi-9.0.0.20191017.ebuild
new file mode 100644
index 000000000000..4f2748bb7f4c
--- /dev/null
+++ b/dev-lisp/c2ffi/c2ffi-9.0.0.20191017.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils llvm
+
+MY_COMMIT="15fda06de0bad97bf91f5590f7f24623eab2f580"
+
+DESCRIPTION="Clang-based FFI wrapper generator for Common Lisp"
+HOMEPAGE="https://github.com/rpav/c2ffi"
+SRC_URI="https://github.com/rpav/c2ffi/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="sys-devel/clang:9=
+	sys-devel/llvm:9=
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/c2ffi-${MY_COMMIT}"
+
+PATCHES=( "${FILESDIR}"/${PN}-9.0.0.20191017-fix-lib-location.patch )
diff --git a/dev-lisp/c2ffi/c2ffi-8.0.0.9999.ebuild b/dev-lisp/c2ffi/c2ffi-9.0.0.9999.ebuild
index 52bbf27c3bde..34977fe7f69d 100644
--- a/dev-lisp/c2ffi/c2ffi-8.0.0.9999.ebuild
+++ b/dev-lisp/c2ffi/c2ffi-9.0.0.9999.ebuild
@@ -3,18 +3,20 @@
 
 EAPI=7
 
-inherit cmake-utils git-r3
+inherit cmake-utils git-r3 llvm
 
 DESCRIPTION="Clang-based FFI wrapper generator for Common Lisp"
 HOMEPAGE="https://github.com/rpav/c2ffi"
 EGIT_REPO_URI="https://github.com/rpav/c2ffi.git"
-EGIT_BRANCH="llvm-8.0.0"
+EGIT_BRANCH="llvm-9.0.0"
 
 LICENSE="LGPL-2.1"
-SLOT="8"
+SLOT="0"
 IUSE=""
 
-DEPEND="sys-devel/clang:8
-	sys-devel/llvm:8
+DEPEND="sys-devel/clang:9=
+	sys-devel/llvm:9=
 "
 RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-9.0.0.20191017-fix-lib-location.patch )
diff --git a/dev-lisp/c2ffi/files/c2ffi-9.0.0.20191017-fix-lib-location.patch b/dev-lisp/c2ffi/files/c2ffi-9.0.0.20191017-fix-lib-location.patch
new file mode 100644
index 000000000000..8b09b25aa739
--- /dev/null
+++ b/dev-lisp/c2ffi/files/c2ffi-9.0.0.20191017-fix-lib-location.patch
@@ -0,0 +1,49 @@
+From 3a496f89064de85af04ce101918c2ec5cebf7846 Mon Sep 17 00:00:00 2001
+From: Harald Judt <h.judt@gmx.at>
+Date: Fri, 8 Nov 2019 10:35:02 +0100
+Subject: Fix CLANG and LLVM libraries not found
+
+This commit gets the build working again here on Gentoo.
+
+Adding LLVM_LIBRARY_DIRS fixes the CLANG libs not found error.
+
+Adding llvm_map_components_to_libnames fixes LLMV not found error.
+---
+ CMakeLists.txt | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 99dbe4b..f93b9b3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -39,6 +39,15 @@ target_include_directories(c2ffi PUBLIC
+   ${LLVM_INCLUDE_DIRS}
+   ${SOURCE_ROOT}/src/include
+   )
++target_link_directories(c2ffi PUBLIC
++  ${LLVM_LIBRARY_DIRS}
++)
++message(STATUS "LLVM_LIBRARY_DIRS=${LLVM_LIBRARY_DIRS}")
++
++llvm_map_components_to_libnames(llvm_libs core support mcparser bitreader profiledata)
++
++message(STATUS "llvm_libs=${llvm_libs}")
++
+ target_link_libraries(c2ffi PUBLIC
+   clangFrontendTool
+   clangFrontend
+@@ -64,10 +73,9 @@ target_link_libraries(c2ffi PUBLIC
+   clangIndex
+   clangToolingCore
+   clangTooling
++  ${llvm_libs}
+   )
+ 
+-llvm_config(c2ffi USE_SHARED core support mcparser bitreader profiledata)
+-
+ set(APP_BIN_DIR "${CMAKE_BINARY_DIR}/bin")
+ set_target_properties(c2ffi PROPERTIES
+   RUNTIME_OUTPUT_DIRECTORY "${APP_BIN_DIR}"
+-- 
+2.23.0
+
diff --git a/dev-lisp/cmucl/Manifest b/dev-lisp/cmucl/Manifest
index 20c6443cad1a..8b98ca94c0fd 100644
--- a/dev-lisp/cmucl/Manifest
+++ b/dev-lisp/cmucl/Manifest
@@ -4,5 +4,5 @@ AUX cmuclrc 305 BLAKE2B 1943c5ca8f43ce890e37949fa71cbeb24a5f849c827b3e05ec240ce2
 AUX site-init.lisp.in 1839 BLAKE2B d4bd6da1c3d0902b96af4abac48f981f21d4494f3da6dab9d398c3af873c4fbf23a6c9cda878099a522787875e3882fc635859253769f56d6275721bea0a7853 SHA512 374e5acf970b1bd26d2318b678cba509296f2356a4672648f8522387c216288e8f43b514004b0d0c98da5d03a5db10435d5f42f57db88c916691eb4ae93f126a
 DIST cmucl-21c-x86-linux.tar.bz2 11127872 BLAKE2B b9089a40b4a0738f9faccdfddb7b33256a561a07cedc3ef9b3ec7afddbbb9de493c2ffb9af4a8d6b6ce70ef857576870901a6b7a607f52bdaf8a0f53ddd2d07e SHA512 9097220aef612aa3d8367a86a86dc62d86d918190d2688f6e90d415c9f9d881f97f0829e9d310f700b014821d30bf5a15f7a05cdb9201c9deab10a7231e0bcb6
 DIST cmucl-src-21c.tar.bz2 6947775 BLAKE2B 828075c71ddf459d09076199af4a02f2294063bd9ef0beb6d4bcbb473dd0ff8cfdff7faa9416f640e125603301fa37c73a280db597bf4301c22fbe88c4cc2dbb SHA512 98ea0516b71af7c6f92b5f67f6c1545949fcd1dc95e1238a989c1c2858a75e2751e5eb765b29812ad5cc5de015333787dac2a63a9ddea9bb83cfd72fef6794f4
-EBUILD cmucl-21c.ebuild 3010 BLAKE2B 531d2db1b0f1b1c96eb2a43c49e76ae75c2fa6c3a611b558c539f5d136484683e0c50e22305820786b14963144531ede1a98a6dd62aba29f9f8395b05ac77447 SHA512 946baf5f68faf88410816aca55859b69256c12b4a9524c8736a773429e240febfae906c98e11a0ab0444c0358d67da85d14e4fea41a51a6960134d133e12d35b
+EBUILD cmucl-21c.ebuild 2975 BLAKE2B 1b187434125f86c2559de866c96e4d245d53f1b4cd0552615491ce33d7fd8acdaa1f7b94970f9a1a541dee17569e3addf13ad462ed1e691ee571876b0f0ae724 SHA512 1974c81bdba8f17ed1ee425d8d3f11d4ee3ce4f2b161e77f5ce47e71fc80e56bf980bb6400cc1d6bb6bfd5d49c659b7d98358caa8600f78c1128f8ef3663197f
 MISC metadata.xml 1392 BLAKE2B b301abf6448e0cd35a3dfc4c500666daabddc0d76c5b9f544963f19e8296e8a194cbc8bcdc542279ee120ab3b68d01af6626c76bb631cb12aaf41cbfc97c3759 SHA512 7e5316859890925b1e197d93339ea13067dd72a3e8d450163ea23d73656c9d203ccbbb731e762fa9def713f1debf610377620a1a2f9939e38d067b2f8e960551
diff --git a/dev-lisp/cmucl/cmucl-21c.ebuild b/dev-lisp/cmucl/cmucl-21c.ebuild
index 1970e290a1c6..0de64d060786 100644
--- a/dev-lisp/cmucl/cmucl-21c.ebuild
+++ b/dev-lisp/cmucl/cmucl-21c.ebuild
@@ -98,7 +98,7 @@ src_install() {
 		> "${D}"/usr/$(get_libdir)/cmucl/site-init.lisp \
 		|| die "Cannot fix site-init.lisp"
 	insinto /etc/common-lisp
-	doins "${FILESDIR}"/cmuclrc || die "Failed to install cmuclrc"
+	doins "${FILESDIR}"/cmuclrc
 
 	# Documentation
 	dodoc doc/cmucl/README
diff --git a/dev-lisp/ecls/Manifest b/dev-lisp/ecls/Manifest
index 25c581b0617f..bdeaf6841fbe 100644
--- a/dev-lisp/ecls/Manifest
+++ b/dev-lisp/ecls/Manifest
@@ -2,5 +2,5 @@ AUX README.Gentoo 632 BLAKE2B 3067b3165fb18fb2ef83a70513e73df3a10b94d97920931a15
 AUX ecls-16.1.3-build.patch 341 BLAKE2B 6a3b588010b66b6e060dfa29642bacea08e77e64cb9674c5677da69c3f3d7668e7893a16c67980b6ea87642c9961b475a29aafdf786afb3903ac4a6552164f30 SHA512 0af8f0704e79197a4d7857ae11f20f0086f2e1c3d2578ec613c6ce5df742e35b9676399d8f724528781a530426425a977646ec75b317f01609d17d3a98b04ef4
 AUX ecls-16.1.3-headers-gentoo.patch 446 BLAKE2B db2adc332867435e799e2779fbad5ebb175b247db5de7ab436da6631d31dc8d6059736dbb41be6fd91b0fd8116ee84e361772ae5da29c1448627bbeb07212646 SHA512 a58b39deb9f8577da66216fd6902803019751171e4415149a89bdb72f13a006e5f6d9bede2312521162a0895340c1a1ce756b09bc0a18dccceca3e4c0950a7cb
 DIST ecl-16.1.3.tgz 7459212 BLAKE2B 4f9d6ad2bd92ede4b5b20857b95a48bad5002049e83611865d9cf13e7131adfaad147a31f22f9a3f6a2c06e46db1996aa98135c28b97bf5ef16e17b5eba0dc4b SHA512 5d743f422f6bc24671abf4c739cde8273d08f056906a1ef8aed5145c703b6d52c7fa4b5e0be8c125f32240c20ce053007786bb3ae81cc34d47791f6fae0819c1
-EBUILD ecls-16.1.3.ebuild 2406 BLAKE2B 95287ef8109fd47d030d46fed47bf0205ea4344cca2edeb177220ad751bbbf6be3240089ef49e2f2a5f6e75aea7cfef7a0b96873bf93e1dda17f104032b577d5 SHA512 fd4bfaeed4bb257724e33d105d499fc19f8d760a98ff8989eb08c540553c929ddb7478e644255bb1f1c5f239057d2666f1f6904d470b283d9c0234bf6767b9ed
+EBUILD ecls-16.1.3.ebuild 2349 BLAKE2B c2bd0ecf0755c0d4d7e59f5fee591ca66720258bf2fe462e0330cbb2ce10791105bc9f06a684819161a780fe9acb1c8490d6fecc2a409f14a215a27bc5ae5d42 SHA512 1b9079ad106996014983ff26c9f5e309f295377155d92d57acbe56b048a1b0983a3504b131a94071c3a8a2b6f9f304708d919ff4aadc76be825a8c233c7ac2b7
 MISC metadata.xml 901 BLAKE2B 96892af45b0d5c6b7c0e0ee20010ce7ac068a25d024d31f2dae1acd730aaa62f7589f322d7ad0ade27a03cdae7eeef5297adcd9fb821ca67d4e1ba88de1c2a17 SHA512 15403f25533646601eb454946599d1d97353038286df0d075f923b598fe44047e525745a33f7e3dbc15fee717d6311abbe546371ecbc4c9df347771dd5c007e9
diff --git a/dev-lisp/ecls/ecls-16.1.3.ebuild b/dev-lisp/ecls/ecls-16.1.3.ebuild
index d0b75dd9dd39..294b95487e82 100644
--- a/dev-lisp/ecls/ecls-16.1.3.ebuild
+++ b/dev-lisp/ecls/ecls-16.1.3.ebuild
@@ -81,11 +81,11 @@ src_compile() {
 	fi
 
 	#parallel make fails
-	emake -j1 || die "Compilation failed"
+	emake -j1
 }
 
 src_install () {
-	emake DESTDIR="${D}" install || die "Installation failed"
+	emake DESTDIR="${D}" install
 
 	dodoc README.md CHANGELOG
 	dodoc "${FILESDIR}"/README.Gentoo
diff --git a/dev-lisp/sbcl/Manifest b/dev-lisp/sbcl/Manifest
index 214492060c59..c32d3419093f 100644
--- a/dev-lisp/sbcl/Manifest
+++ b/dev-lisp/sbcl/Manifest
@@ -29,14 +29,14 @@ DIST sbcl-1.4.2-arm64-linux-binary.tar.bz2 10578821 BLAKE2B 1cd25c548be0f1b7ec01
 DIST sbcl-1.4.3-x86-linux-binary.tar.bz2 10227185 BLAKE2B 6d77c4f4177cbdb72fb9bab0da5bd91e0aa8deafffd238818a2551332f0ab246715d9489b5c1156f3481aa7fb79d161a988404620fc09fe86ff927543a1ee678 SHA512 41cd63d61dd7c46370341dce39a362287a23b528bfebe8e5571614aeefdea03d318207d25562e995db9ccedb6c1f50ea4d66627721f0fd9486e99440126e6a38
 DIST sbcl-1.4.8-x86-64-linux-binary.tar.bz2 10353701 BLAKE2B 5b56f46fbdb87f015ed1fe103b6caaf43d2d424b45e2574e306b3d3cbc3c7bdfa48847a2e6d7d819e6bf4b59fa02ea01f9ce6b023802ae6f91fc7f56e5a260de SHA512 f3cb3c30dec1b7e6ac0c1b67de26192723871f8a8d543a41d7c4d04b0813fd7da1043433237b648a2c23f73169fe38f2ec3a3c2bd412eb4c9d36ed929c40f27d
 DIST sbcl-1.4.9-source.tar.bz2 6051607 BLAKE2B 8abcaf73233ea1a23d47987b16554636dcf94acfbc7ab731f0730fdb4a8176593fb3ab52d9b25b3dd56753cd984f7e0eddb1585a142eb7ad1aa5e3e03d7b0ca9 SHA512 e0248f460f9737d47653dd520732062d2637813b550df356ecc90aa6d21fbdd74f03182d1e890c09c1da742f7d57b4fbd04a4e6dc36999aca51bb6c2952ac236
-DIST sbcl-1.5.3-source.tar.bz2 6343923 BLAKE2B c7b04fbba5563270037d3abcc3c4a2def210721cf7fcf8da9a3133f8079fb4a512b01f32c47d22c9abce27f917350ef9cbaacd897a32a30c5f74ee55db91191e SHA512 022af0fa74701c530d98816b0696f5db4e8fc9a47b10fad17952239f77f160a1bc6791bf2f18e02ddbe249ab379d458ee8cee817f66dbc26dcbbcc855cd3ee21
-DIST sbcl-1.5.3-x86-64-linux-binary.tar.bz2 9920503 BLAKE2B e22750a5258c6a31378487ed20410d689c05792f906d37d73501ccbeac236f1296479ca2dec2d1ad40e38a00a3e3f3ff27a352e96932d89a76b426734bca0213 SHA512 9ff183529cfeec6ab7a1b5fb9f727463ad497333d1f6a75d1501c251d19e0510490743ddd8a3075d73854160fa5c07ce9b6e29011c6991a7851ba35593b0c735
 DIST sbcl-1.5.6-source.tar.bz2 6370992 BLAKE2B f2b374c9870eda8b7f40e7c66dec8888167fcd17ead6c42cd07acd2f35684f150ab907a95eb2be8e84b741fad8d69bc7f2c10a8de8e568f8705baa0a91c951de SHA512 5adeb4c694d41c08c780d5f0ed2e0f4c830ea74fdb7b345813b1cd616a0b310c2394f4727b6f5a75b04bd0dda92ee774298bef7225253e7d325e8f83bc645320
 DIST sbcl-1.5.6-x86-64-linux-binary.tar.bz2 10131687 BLAKE2B f921b0c0b292f213eb1447b3e533f24ba15bb58c0be00bea3a0cb1dcadc91ed9a648b6452b535fdd189cdb3af7141e554c055748249084c36e7f523ea8f44b8c SHA512 4d270deb04b22cd22caec3086de4b9cb13e9529c33f2e0579baf2c0b00b98d07c16a22997849ea77650ff56a0b844fd5fa750929639481df2820badf12c2a112
 DIST sbcl-1.5.7-source.tar.bz2 6438048 BLAKE2B d7036d6ac6abdd433e112ae9bd59ad00447c45edd064cd863b609d21b99896c7a435b3a0cc82fe0d5ef842c0156d134e690c4363667f4c9b57b49cbfbc24a0e0 SHA512 8dde1b0d400f93fed085f6b6c33b057c3dec4dfa83afb7431384add6628cb2f910cba006b2579cea547685aeb79fade5ad576b0a42e4f7e1f6c0c3f26acf226e
+DIST sbcl-1.5.8-source.tar.bz2 6409837 BLAKE2B cb503ee1db82f2e1a9c123b9b6b5052b23167c8a76039f12afee580be058a0b78a51eade541f7e2beab5566204af147c8cd1dab25ef0fff381cf298ba758aee5 SHA512 20966035e878a1f6aa9b0acf20eb88087d5cd604d65ae90f43bbfa3d2d40afa46864daabf45d8c6ecbbd429e876279c891d6e3d9344f2972f611a4f9b2eec8f4
+DIST sbcl-1.5.8-x86-64-linux-binary.tar.bz2 10145219 BLAKE2B aeccd48a5448e334d6cf3ca4e067ac23943256c2a729ff24b6b3c332c6c70c108b68a6903193a403176d4fbf4804c9f22add615e29fa09022f84b0190a429454 SHA512 d733929775be6fe5d46fd5b11c808eae89172a5a8694f1c2a7927cc364419529292d70f6902731f4c7822c85708555382de31b605440493bb281ccef552daf6c
 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.3.ebuild 8665 BLAKE2B 1b7c9a542bdc395cb8c5d869b005e261276043abe1a87e9f5fba10e65413e54dcceb0e4e918e8a2cfce63d04ca174b40029d3c572ab9df83e29f5a9377fb10da SHA512 fd58ffa6aa58ee8b3bd059317e4ccd4728150b09073b1b11d66b27c58e50a837d06d80148ef4c440c71e036dd5bfc8dbf44f32711badfa6cd57366b554093288
 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
 MISC metadata.xml 1312 BLAKE2B a03042bd9d39465fe7ae45d6b749571fc4d22cf9d7f81d3cd498b155729576ec1f2ddec03c2c662ecb23abfd19a627ba2cbe9798960009e998a8823902062118 SHA512 3c4463de4a8871ab56fe74c286977fda3037e953d5fa26162d07976efa00b0d99bc98295435a7c5233c43b27369e31eb5d1c0b4c66600477a307aa1a7a322e1c
diff --git a/dev-lisp/sbcl/sbcl-1.5.3.ebuild b/dev-lisp/sbcl/sbcl-1.5.8.ebuild
index 35e36b9e41a6..c6e5b4f22a5e 100644
--- a/dev-lisp/sbcl/sbcl-1.5.3.ebuild
+++ b/dev-lisp/sbcl/sbcl-1.5.8.ebuild
@@ -7,7 +7,7 @@ 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=1.5.3
+BV_AMD64=1.5.8
 BV_PPC=1.2.7
 BV_SPARC=1.0.28
 BV_ALPHA=1.0.28