gentoo resync : 19.05.2018

12 files changed, 15 insertions, 484 deletions

diff --git a/dev-lisp/Manifest.gz b/dev-lisp/Manifest.gz
index d1fbb387fdb3..357fe68f6b5d 100644
--- a/dev-lisp/Manifest.gz
+++ b/dev-lisp/Manifest.gz
diff --git a/dev-lisp/clozurecl/Manifest b/dev-lisp/clozurecl/Manifest
index 4996f26018f6..1274efbde68a 100644
--- a/dev-lisp/clozurecl/Manifest
+++ b/dev-lisp/clozurecl/Manifest
@@ -1,16 +1,7 @@
-AUX ccl-1.11-glibc-2.26.patch 1532 BLAKE2B d1f3d73b589990f96583ecfd7454929f79c0c43a21cd495a35dd5d57769a661444276769ef32e22bdbd20c433fc5e3eeca28936bc3fe2cca74ccbdf4d014256d SHA512 b1522eb84d84187c826075814bb0f663fe78fb61a14b010e2c2033b388809a9626aa3be26ac9d6ad84d81ca66581589363559e31ef6122379ba9e4d41d6c6961
-AUX ccl-format.patch 4281 BLAKE2B 50b25c6369f8db45e66344ceeb482af88b3e7d6a665112ac96f3a228e0867a8da0b42031bd1124006f4bdb17391824397aa347d47e22427bcba983fe837a296e SHA512 61bc053d0b7bdfcb9d81fd472e2569bb3d2805f87afff57855ba5a86f745141190b1804067628d2e70ec399585a66289c10fdaf3ffdc81bd2b442b1873c75e1a
-DIST ccl-1.11-darwinx86.tar.gz 152989219 BLAKE2B 73a1ceed3ff1a22d76f593fb35a850c8c449cec7646368cd306a2c63ae85e22e02a6d604dc115e3e0a02f69a0fd6b8e29721c5e58704101779bf6a6924a48741 SHA512 21107ab0cf6f5abee21fc561680eb722fbb0a0515ea99a1d02be091a85519b1a91444317d92117ad509a25dca97adaba9b2d8026a7214f58aa03172ada2ea340
-DIST ccl-1.11-linuxarm.tar.gz 23044178 BLAKE2B 509fbf0bd83a41d8115b87f4b79db799e063fb9f2dd21e58db24ec065101e6946315442104feaa61b1175c80ccaf5f5926fc73c2a3a87d4c3e5ba659269a644d SHA512 b8034569f0c47106107fee6bd859051052d43c3bcd625a1956eae467ef0225425d5429678e3584136adc929ccfbbe4b800bffa66ea758cd2b734aa3ed55a9dda
-DIST ccl-1.11-linuxx86.tar.gz 42482877 BLAKE2B d1a6977d7dd934c77db4dd0deb2ab53a85c0d118037e147ced09027578e5356770145da317f1887a8d7d25309b146864a62f54b0d5e841470c86da99c38cbd4b SHA512 34008654fd3ceca55a33413a768c398395141e26b9ea09204739ca7e998fdbe94ab92507eda14cf9bcbb9f76e6c3cae3006d7f2c9f48749c66e1f1281febb409
-DIST ccl-1.11-solarisx86.tar.gz 46926817 BLAKE2B 15c960cf16d16dd5fb7c7c2f2401a244c0fcba4cb92bdd9d72c6b16a572bc464999bbe503c37e6fd343bfe1883d4612efe9de4be38313c22dc406f65489ee0b2 SHA512 f35df9e9c7644331a0f6b77e7b0a6f0b2e297f6249ef7a669932ab6685ca426f87423faf01c64cc1f7eb7fcd0dd4fb7c0d70d039bbcadca5d9201b0a348a36be
 DIST ccl-1.11.5-darwinx86.tar.gz 100515656 BLAKE2B d9ae52f7d0c481211fdf53bf6bb4bb65a66ab60bf1c3548e9f2d502e60906163121a85330e547d15e3d4bcb6ad47564e86dd93b4228a9391558463347011990f SHA512 1016ab9672839d1303809e9f5b849cf36dc300963672dfa5888b75f6dadee3106cd6f1375e544437a92c7307dc8639e423e12663ca157b851925d0e82f0cd4b7
 DIST ccl-1.11.5-linuxarm.tar.gz 40288609 BLAKE2B 5217de314e6c59e5bbee7d5608b4e92088fb57dc0d8a90454ec4653c1710857748776d9a7ee2e89e86613f64fc028aca324ea5cb3bc7eb5e9bc582e2b50766cf SHA512 0305baa66263a2182ba8deb02837287ffb6c1472987d4953caa8839cad6503815ded7fe6bfde72a823b90d3ff86322602ee3d0934e179fb2418e3b049f55be4e
 DIST ccl-1.11.5-linuxx86.tar.gz 50652181 BLAKE2B 2ed6e747a72816c6f79f58715261c41a1c3b98fa84ef4ee82ca5683383741777a46a566c7884d7fdc3dcd2e5959dab2f3fde9432945a4dc73bcece8f741ed753 SHA512 b6c16d9bba27a901f942237ed42d6b3e832910951270820a2a3d61afe2a8e7f59d383c854382cfcaa0bf8253c8d624be66d905b4170211ea39a106ca85b9a23d
 DIST ccl-1.11.5-solarisx86.tar.gz 59139069 BLAKE2B db1a904dd4e794127e7c966a9734aa92bb0415520a6af35d92008fd785004bd2ea04deb66f600b1d1dd60c0b95519e86d412b208878aaa6c2f9f8c05a27efe38 SHA512 4ae7cee7e35de41ab20d79e073b12b6bd98a23beea95c0de7d882a1f4e1ea3f9f3162844df0578aeeadb671d30a0a488092ee93b35245c693051a4ab9193fc5b
 DIST ccl.html 962003 BLAKE2B fc95ec5abbea7c2f5f247293691a5c5a7eddaa049156c38766ec9df4d1920fdee902c89db976cc6687535aef5ddda3c672b62156bf0f61b6369ade548dcb0141 SHA512 0cb9ee8f7eb6007e08241a0797519ff3bfc3d3adc0b5ac86e6a2e9e8b2e316fc421bea3b04159decc0a2b37ff7098147e25266946cc3c1ac367b93e4821a8b64
-EBUILD clozurecl-1.11-r1.ebuild 2703 BLAKE2B ed1b25828a838ba671c943040d9a41c9d61826b1e9b3e45c45d93bb032b80eaf93f4a18c4085c7a1fd59cd20f66c6c02aa10914531e4c44b66fd792a35904514 SHA512 c6995ba3ffeed8b8a2584b6b76a907104097314f28ad8cf536a176de0ec16e7e82e3641d7d64f43efa76a685e47ffe187fe5f97b89f604c5966e72f393eef33a
-EBUILD clozurecl-1.11-r2.ebuild 3291 BLAKE2B 42228949acb214ab92d2a53ceecc82a89b2b893149e4bcde1c33e06bf2f77063760e4c1f5cd8e3cfdb25fc3eb3ac0830c4b3a2d0c0d8f589c197962b9f191633 SHA512 6d6b62b08c9a81a82a1c75ace997409eaa48644cac79b9eee90e117d22324594b3a0f57d842393085f4ef43969bac6032768a4f0ef20f98fbd10fe523f67b765
-EBUILD clozurecl-1.11-r3.ebuild 3432 BLAKE2B 1a8f3e332865a6b78a1799f151dc07ba8b77e57dad9f91edd2dd01a1120f83979b0d3af7117626c117ece71605960b4cdb3115421bd52ec604b7cdb55802eb54 SHA512 e65afe0b3d77cde76976cdfefdde3426925e0e029afa8506dc7af08f320231e72f6f0765d2936ed671af809007192cb67ecdbf2bf7ca73cea3b874d29c427dfc
-EBUILD clozurecl-1.11.5.ebuild 3234 BLAKE2B 85f96173fb3fa97fde6a17d93ecd6410c7f0639bcc71b127cab7ed7e1f5d32e9fe5f2e1a2fbfb0ce00a96e49e3e7922153070802c3526ef93364c367bb293e4f SHA512 7e7a45fc4cb75f7791dda88fe32ff7ab9cdd7ed16456f0153d4ccd6d89b34d213c07877cb2a2e7643baeb3cb1c2daf8bff5c353d3d5ec278110089fd257dc2de
+EBUILD clozurecl-1.11.5.ebuild 3233 BLAKE2B 721bb2bf8c358aa27bfd21e5a057979f7a43510772ece6abfe4d396bca710e3e75f92fac51be9020590e7b1cb56e834dafb99e45bb28112a04ace088fe98299d SHA512 83e18a90a1bd20cc7d29eebde24b5e7cc44181978b656a3ebfbc9c27e11cc82bfcf50a4f05c68d98741b229f0903d9c6b947ce7b2b04c29222a4556b6e869a9d
 MISC metadata.xml 370 BLAKE2B 413aa932df7c52eb916d4e60093bb86eebbc6a6d5c87fe5987bd4731bc982eb707fa3e827bb659f047d9ae8ad89ae0585aac60e04d0a24ff5ac61c49833789ad SHA512 d961c24b6532aa9e5b8a2727b3ada479743434549a9aaf9ac9c7cdd4d2414a4ba078fd153537afd0daa940eb435fcfb7852bed594ad807f5bbc62a99b8503d12
diff --git a/dev-lisp/clozurecl/clozurecl-1.11-r1.ebuild b/dev-lisp/clozurecl/clozurecl-1.11-r1.ebuild
deleted file mode 100644
index 511c012b7144..000000000000
--- a/dev-lisp/clozurecl/clozurecl-1.11-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib toolchain-funcs
-
-MY_PN=ccl
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Common Lisp implementation, derived from Digitool's MCL product"
-HOMEPAGE="https://ccl.clozure.com/"
-SRC_URI="
-	x86?   ( ftp://ftp.clozure.com/pub/release/${PV}/${MY_P}-linuxx86.tar.gz )
-	amd64? ( ftp://ftp.clozure.com/pub/release/${PV}/${MY_P}-linuxx86.tar.gz )
-	doc? ( https://ccl.clozure.com/docs/ccl.html )"
-	# ppc?   ( ftp://ftp.clozure.com/pub/release/${PV}/${MY_P}-linuxppc.tar.gz )
-	# ppc64? ( ftp://ftp.clozure.com/pub/release/${PV}/${MY_P}-linuxppc.tar.gz )"
-
-LICENSE="LLGPL-2.1"
-SLOT="0"
-# KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND=">=dev-lisp/asdf-2.33-r3:="
-DEPEND="${RDEPEND}
-		!dev-lisp/openmcl"
-
-S="${WORKDIR}"/${MY_PN}
-ENVD="${T}"/50ccl
-
-src_configure() {
-	if use x86; then
-		CCL_RUNTIME=lx86cl; CCL_HEADERS=x86-headers; CCL_KERNEL=linuxx8632
-	elif use amd64; then
-		CCL_RUNTIME=lx86cl64; CCL_HEADERS=x86-headers64; CCL_KERNEL=linuxx8664
-	elif use ppc; then
-		CCL_RUNTIME=ppccl; CCL_HEADERS=headers; CCL_KERNEL=linuxppc
-	elif use ppc64; then
-		CCL_RUNTIME=ppccl64; CCL_HEADERS=headers64; CCL_KERNEL=linuxppc64
-	fi
-}
-
-src_prepare() {
-	default
-	epatch "${FILESDIR}"/ccl-format.patch
-	cp /usr/share/common-lisp/source/asdf/build/asdf.lisp tools/ || die
-}
-
-src_compile() {
-	emake -C lisp-kernel/${CCL_KERNEL} clean
-	emake -C lisp-kernel/${CCL_KERNEL} all CC="$(tc-getCC)"
-
-	unset CCL_DEFAULT_DIRECTORY
-	./${CCL_RUNTIME} -n -b -Q -e '(ccl:rebuild-ccl :full t)' -e '(ccl:quit)' || die "Compilation failed"
-
-	# remove non-owner write permissions on the full-image
-	chmod go-w ${CCL_RUNTIME}{,.image} || die
-
-	esvn_clean
-}
-
-src_install() {
-	local install_dir=/usr/$(get_libdir)/${PN}
-
-	exeinto ${install_dir}
-	# install executable
-	doexe ${CCL_RUNTIME}
-	# install core image
-	cp ${CCL_RUNTIME}.image "${D}"/${install_dir} || die
-	# install optional libraries
-	dodir ${install_dir}/tools
-	cp tools/*fsl "${D}"/${install_dir}/tools || die
-
-	# until we figure out which source files are necessary for runtime
-	# optional features and which aren't, we install all sources
-	find . -type f -name '*fsl' -delete || die
-	rm -f lisp-kernel/${CCL_KERNEL}/*.o || die
-	cp -a compiler level-0 level-1 lib library \
-		lisp-kernel scripts tools xdump contrib \
-		"${D}"/${install_dir} || die
-	cp -a ${CCL_HEADERS} "${D}"/${install_dir} || die
-
-	make_wrapper ccl "${install_dir}/${CCL_RUNTIME}"
-
-	echo "CCL_DEFAULT_DIRECTORY=${install_dir}" > "${ENVD}"
-	doenvd "${ENVD}"
-
-	dodoc doc/release-notes.txt
-	use doc && dodoc "${DISTDIR}"/ccl.html
-	use doc && dodoc -r examples
-}
diff --git a/dev-lisp/clozurecl/clozurecl-1.11-r2.ebuild b/dev-lisp/clozurecl/clozurecl-1.11-r2.ebuild
deleted file mode 100644
index 8c1c342d8706..000000000000
--- a/dev-lisp/clozurecl/clozurecl-1.11-r2.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-MY_PN=ccl
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Common Lisp implementation, derived from Digitool's MCL product"
-HOMEPAGE="https://ccl.clozure.com"
-SRC_URI="
-	x86?   ( ${HOMEPAGE}/ftp/pub/release/${PV}/${MY_P}-linuxx86.tar.gz )
-	amd64? ( ${HOMEPAGE}/ftp/pub/release/${PV}/${MY_P}-linuxx86.tar.gz )
-	arm? ( ${HOMEPAGE}/ftp/pub/release/${PV}/${MY_P}-linuxarm.tar.gz )
-	x86-macos? ( ${HOMEPAGE}/ftp/pub/release/${PV}/${MY_P}-darwinx86.tar.gz )
-	x64-macos? ( ${HOMEPAGE}/ftp/pub/release/${PV}/${MY_P}-darwinx86.tar.gz )
-	x86-solaris? ( ${HOMEPAGE}/ftp/pub/release/${PV}/${MY_P}-solarisx86.tar.gz )
-	x64-solaris? ( ${HOMEPAGE}/ftp/pub/release/${PV}/${MY_P}-solarisx86.tar.gz )
-	doc? ( ${HOMEPAGE}/docs/ccl.html )"
-
-LICENSE="LLGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="doc"
-
-RDEPEND=">=dev-lisp/asdf-2.33-r3:="
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${MY_PN}
-ENVD="${T}/50ccl"
-
-src_configure() {
-	if use x86-macos; then
-		CCL_RUNTIME=dx86cl; CCL_HEADERS=darwin-x86-headers; CCL_KERNEL=darwinx8632
-	elif use x64-macos; then
-		CCL_RUNTIME=dx86cl64; CCL_HEADERS=darwin-x86-headers64; CCL_KERNEL=darwinx8664
-	elif use x86-solaris; then
-		CCL_RUNTIME=sx86cl; CCL_HEADERS=solarisx86-headers; CCL_KERNEL=solarisx86
-	elif use x64-solaris; then
-		CCL_RUNTIME=sx86cl64; CCL_HEADERS=solarisx64-headers; CCL_KERNEL=solarisx64
-	elif use x86; then
-		CCL_RUNTIME=lx86cl; CCL_HEADERS=x86-headers; CCL_KERNEL=linuxx8632
-	elif use amd64; then
-		CCL_RUNTIME=lx86cl64; CCL_HEADERS=x86-headers64; CCL_KERNEL=linuxx8664
-	elif use arm; then
-		CCL_RUNTIME=armcl; CCL_HEADERS=arm-headers; CCL_KERNEL=linuxarm
-	elif use ppc; then
-		CCL_RUNTIME=ppccl; CCL_HEADERS=headers; CCL_KERNEL=linuxppc
-	elif use ppc64; then
-		CCL_RUNTIME=ppccl64; CCL_HEADERS=headers64; CCL_KERNEL=linuxppc64
-	fi
-}
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}/${MY_PN}-format.patch"
-	# https://lists.clozure.com/pipermail/openmcl-devel/2016-September/011399.html
-	sed -i "s/-dynamic/-no_pie/" "${S}/lisp-kernel/darwinx8664/Makefile" || die
-	cp "${EPREFIX}/usr/share/common-lisp/source/asdf/build/asdf.lisp" tools/ || die
-}
-
-src_compile() {
-	emake -C lisp-kernel/${CCL_KERNEL} clean
-	emake -C lisp-kernel/${CCL_KERNEL} all CC="$(tc-getCC)"
-
-	unset CCL_DEFAULT_DIRECTORY
-	./${CCL_RUNTIME} -n -b -Q -e '(ccl:rebuild-ccl :full t)' -e '(ccl:quit)' || die "Compilation failed"
-
-	# remove non-owner write permissions on the full-image
-	chmod go-w ${CCL_RUNTIME}{,.image} || die
-
-	esvn_clean
-}
-
-src_install() {
-	local target_dir="/usr/$(get_libdir)/${PN}"
-	local prefix_dir="${EPREFIX}/${target_dir#/}"
-
-	mkdir -p "${D}/${prefix_dir#/}"
-
-	find . -type f -name '*fsl' -delete || die
-	rm -f lisp-kernel/${CCL_KERNEL}/*.o || die
-	cp -a compiler contrib level-0 level-1 lib library lisp-kernel scripts \
-		tools xdump ${CCL_HEADERS} ${CCL_RUNTIME} ${CCL_RUNTIME}.image \
-		"${D}/${prefix_dir#/}" || die
-
-	echo "CCL_DEFAULT_DIRECTORY=${prefix_dir}" > "${ENVD}"
-	doenvd "${ENVD}"
-
-	dosym "${target_dir}/${CCL_RUNTIME}" /usr/bin/ccl
-	dodoc doc/release-notes.txt
-
-	if use doc ; then
-		dodoc "${DISTDIR}/ccl.html"
-		dodoc -r doc/manual
-		dodoc -r examples
-	fi
-}
diff --git a/dev-lisp/clozurecl/clozurecl-1.11-r3.ebuild b/dev-lisp/clozurecl/clozurecl-1.11-r3.ebuild
deleted file mode 100644
index 5482af1a6e14..000000000000
--- a/dev-lisp/clozurecl/clozurecl-1.11-r3.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-MY_PN=ccl
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Common Lisp implementation, derived from Digitool's MCL product"
-HOMEPAGE="https://ccl.clozure.com"
-SRC_URI="
-	x86?   ( ${HOMEPAGE}/ftp/pub/release/${PV}/${MY_P}-linuxx86.tar.gz )
-	amd64? ( ${HOMEPAGE}/ftp/pub/release/${PV}/${MY_P}-linuxx86.tar.gz )
-	arm? ( ${HOMEPAGE}/ftp/pub/release/${PV}/${MY_P}-linuxarm.tar.gz )
-	x86-macos? ( ${HOMEPAGE}/ftp/pub/release/${PV}/${MY_P}-darwinx86.tar.gz )
-	x64-macos? ( ${HOMEPAGE}/ftp/pub/release/${PV}/${MY_P}-darwinx86.tar.gz )
-	x86-solaris? ( ${HOMEPAGE}/ftp/pub/release/${PV}/${MY_P}-solarisx86.tar.gz )
-	x64-solaris? ( ${HOMEPAGE}/ftp/pub/release/${PV}/${MY_P}-solarisx86.tar.gz )
-	doc? ( ${HOMEPAGE}/docs/ccl.html )"
-
-LICENSE="LLGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="doc"
-
-RDEPEND=">=dev-lisp/asdf-2.33-r3:="
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${MY_PN}
-ENVD="${T}/50ccl"
-
-src_configure() {
-	if use x86-macos; then
-		CCL_RUNTIME=dx86cl; CCL_HEADERS=darwin-x86-headers; CCL_KERNEL=darwinx8632
-	elif use x64-macos; then
-		CCL_RUNTIME=dx86cl64; CCL_HEADERS=darwin-x86-headers64; CCL_KERNEL=darwinx8664
-	elif use x86-solaris; then
-		CCL_RUNTIME=sx86cl; CCL_HEADERS=solarisx86-headers; CCL_KERNEL=solarisx86
-	elif use x64-solaris; then
-		CCL_RUNTIME=sx86cl64; CCL_HEADERS=solarisx64-headers; CCL_KERNEL=solarisx64
-	elif use x86; then
-		CCL_RUNTIME=lx86cl; CCL_HEADERS=x86-headers; CCL_KERNEL=linuxx8632
-	elif use amd64; then
-		CCL_RUNTIME=lx86cl64; CCL_HEADERS=x86-headers64; CCL_KERNEL=linuxx8664
-	elif use arm; then
-		CCL_RUNTIME=armcl; CCL_HEADERS=arm-headers; CCL_KERNEL=linuxarm
-	elif use ppc; then
-		CCL_RUNTIME=ppccl; CCL_HEADERS=headers; CCL_KERNEL=linuxppc
-	elif use ppc64; then
-		CCL_RUNTIME=ppccl64; CCL_HEADERS=headers64; CCL_KERNEL=linuxppc64
-	fi
-}
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}/${MY_PN}-format.patch"
-	# bug #638304 https://github.com/Clozure/ccl/commit/a87d61b88e1f48a563335062668970f7e6290ecf
-	eapply "${FILESDIR}/${MY_P}-glibc-2.26.patch"
-	# https://lists.clozure.com/pipermail/openmcl-devel/2016-September/011399.html
-	sed -i "s/-dynamic/-no_pie/" "${S}/lisp-kernel/darwinx8664/Makefile" || die
-	cp "${EPREFIX}/usr/share/common-lisp/source/asdf/build/asdf.lisp" tools/ || die
-}
-
-src_compile() {
-	emake -C lisp-kernel/${CCL_KERNEL} clean
-	emake -C lisp-kernel/${CCL_KERNEL} all CC="$(tc-getCC)"
-
-	unset CCL_DEFAULT_DIRECTORY
-	./${CCL_RUNTIME} -n -b -Q -e '(ccl:rebuild-ccl :full t)' -e '(ccl:quit)' || die "Compilation failed"
-
-	# remove non-owner write permissions on the full-image
-	chmod go-w ${CCL_RUNTIME}{,.image} || die
-
-	esvn_clean
-}
-
-src_install() {
-	local target_dir="/usr/$(get_libdir)/${PN}"
-	local prefix_dir="${EPREFIX}/${target_dir#/}"
-
-	mkdir -p "${D}/${prefix_dir#/}"
-
-	find . -type f -name '*fsl' -delete || die
-	rm -f lisp-kernel/${CCL_KERNEL}/*.o || die
-	cp -a compiler contrib level-0 level-1 lib library lisp-kernel scripts \
-		tools xdump ${CCL_HEADERS} ${CCL_RUNTIME} ${CCL_RUNTIME}.image \
-		"${D}/${prefix_dir#/}" || die
-
-	echo "CCL_DEFAULT_DIRECTORY=${prefix_dir}" > "${ENVD}"
-	doenvd "${ENVD}"
-
-	dosym "${target_dir}/${CCL_RUNTIME}" /usr/bin/ccl
-	dodoc doc/release-notes.txt
-
-	if use doc ; then
-		dodoc "${DISTDIR}/ccl.html"
-		dodoc -r doc/manual
-		dodoc -r examples
-	fi
-}
diff --git a/dev-lisp/clozurecl/clozurecl-1.11.5.ebuild b/dev-lisp/clozurecl/clozurecl-1.11.5.ebuild
index 331f28c253d5..f67f277c60af 100644
--- a/dev-lisp/clozurecl/clozurecl-1.11.5.ebuild
+++ b/dev-lisp/clozurecl/clozurecl-1.11.5.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc"
 
 RDEPEND=">=dev-lisp/asdf-2.33-r3:="
diff --git a/dev-lisp/clozurecl/files/ccl-1.11-glibc-2.26.patch b/dev-lisp/clozurecl/files/ccl-1.11-glibc-2.26.patch
deleted file mode 100644
index 3a9bdf64e54b..000000000000
--- a/dev-lisp/clozurecl/files/ccl-1.11-glibc-2.26.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -U2 -r ccl.orig/lisp-kernel/platform-linuxx8632.h ccl/lisp-kernel/platform-linuxx8632.h
---- ccl.orig/lisp-kernel/platform-linuxx8632.h	2015-11-07 02:10:11.000000000 +0600
-+++ ccl/lisp-kernel/platform-linuxx8632.h	2017-11-21 23:50:31.630113003 +0700
-@@ -21,5 +21,7 @@
- #define PLATFORM_WORD_SIZE PLATFORM_WORD_SIZE_32
- 
--typedef struct ucontext ExceptionInformation;
-+#include <ucontext.h>
-+
-+typedef ucontext_t ExceptionInformation;
- 
- #define MAXIMUM_MAPPABLE_MEMORY (9U<<28)
-diff -U2 -r ccl.orig/lisp-kernel/platform-linuxx8664.h ccl/lisp-kernel/platform-linuxx8664.h
---- ccl.orig/lisp-kernel/platform-linuxx8664.h	2015-11-07 02:10:11.000000000 +0600
-+++ ccl/lisp-kernel/platform-linuxx8664.h	2017-11-21 23:51:44.693114350 +0700
-@@ -21,5 +21,7 @@
- #define PLATFORM_WORD_SIZE PLATFORM_WORD_SIZE_64
- 
--typedef struct ucontext ExceptionInformation;
-+#include <ucontext.h>
-+
-+typedef ucontext_t ExceptionInformation;
- 
- #define MAXIMUM_MAPPABLE_MEMORY (512L<<30L)
-diff -U2 -r ccl.orig/lisp-kernel/x86-exceptions.c ccl/lisp-kernel/x86-exceptions.c
---- ccl.orig/lisp-kernel/x86-exceptions.c	2015-11-07 02:10:11.000000000 +0600
-+++ ccl/lisp-kernel/x86-exceptions.c	2017-11-21 23:55:00.816117965 +0700
-@@ -1678,5 +1678,5 @@
- 	void  *puc;
- 	siginfo_t info;
--	struct ucontext uc;
-+	ucontext_t uc;
- 	struct _fpstate fpstate;
- 	char retcode[8];
-@@ -2426,5 +2426,5 @@
-      change copy_ucontext().
-   */
--  stack.ss_size -= sizeof(struct ucontext);
-+  stack.ss_size -= sizeof(ucontext_t);
- #endif
-   if (sigaltstack(&stack, NULL) != 0) {
diff --git a/dev-lisp/clozurecl/files/ccl-format.patch b/dev-lisp/clozurecl/files/ccl-format.patch
deleted file mode 100644
index c2df37c2b870..000000000000
--- a/dev-lisp/clozurecl/files/ccl-format.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-diff -r -U1 ccl.orig/lib/format.lisp ccl/lib/format.lisp
---- ccl.orig/lib/format.lisp	2015-11-07 02:10:10.000000000 +0600
-+++ ccl/lib/format.lisp	2015-11-20 22:51:51.736191995 +0600
-@@ -1296,5 +1296,2 @@
-       
--
--
--
- ;;; Given a non-negative floating point number, SCALE-EXPONENT returns a
-@@ -1305,41 +1302,74 @@
- 
--
--(defconstant long-log10-of-2 0.30103d0)
--
--#| 
--(defun scale-exponent (x)
--  (if (floatp x )
--      (scale-expt-aux (abs x) 0.0d0 1.0d0 1.0d1 1.0d-1 long-log10-of-2)
--      (report-bad-arg x 'float)))
--
--#|this is the slisp code that was in the place of the error call above.
--  before floatp was put in place of shortfloatp.
--      ;(scale-expt-aux x (%sp-l-float 0) (%sp-l-float 1) %long-float-ten
--      ;                %long-float-one-tenth long-log10-of-2)))
--|#
--
--; this dies with floating point overflow (?) if fed least-positive-double-float
--
--(defun scale-expt-aux (x zero one ten one-tenth log10-of-2)
--  (let ((exponent (nth-value 1 (decode-float x))))
--    (if (= x zero)
--      (values zero 1)
--      (let* ((e (round (* exponent log10-of-2)))
--             (x (if (minusp e)		;For the end ranges.
--                  (* x ten (expt ten (- -1 e)))
--                  (/ x ten (expt ten (1- e))))))
--        (do ((d ten (* d ten))
--             (y x (/ x d))
--             (e e (1+ e)))
--            ((< y one)
--             (do ((m ten (* m ten))
--                  (z y (* z m))
--                  (e e (1- e)))
--                 ((>= z one-tenth) (values x e)))))))))
--|#
--
--(defun scale-exponent (n)
--  (let ((exp (nth-value 1 (decode-float n))))
--    (values (round (* exp long-log10-of-2)))))
--
-+(defconstant single-float-min-e
-+  (nth-value 1 (decode-float least-positive-single-float)))
-+(defconstant double-float-min-e
-+  (nth-value 1 (decode-float least-positive-double-float)))
-+
-+;;; Adapted from CMUCL.
-+
-+;; This is a modified version of the scale computation from Burger and
-+;; Dybvig's paper "Printing floating-point quickly and accurately."
-+;; We only want the exponent, so most things not needed for the
-+;; computation of the exponent have been removed.  We also implemented
-+;; the floating-point log approximation given in Burger and Dybvig.
-+;; This is very noticeably faster for large and small numbers.  It is
-+;; slower for intermediate sized numbers.
-+(defun accurate-scale-exponent (v)
-+  (declare (type float v))
-+  (if (zerop v)
-+      1
-+      (let ((float-radix 2)		; b
-+	    (float-digits (float-digits v)) ; p
-+	    (min-e
-+	     (etypecase v
-+	       (single-float single-float-min-e)
-+	       (double-float double-float-min-e))))
-+	(multiple-value-bind (f e)
-+	    (integer-decode-float v)
-+	  (let ( ;; FIXME: these even tests assume normal IEEE rounding
-+		;; mode.  I wonder if we should cater for non-normal?
-+		(high-ok (evenp f)))
-+	    ;; We only want the exponent here.
-+	    (labels ((flog (x)
-+		       (declare (type (float (0.0)) x))
-+		       (let ((xd (etypecase x
-+				   (single-float
-+				    (float x 1d0))
-+				   (double-float
-+				    x))))
-+			 (ceiling (- (the (double-float -400d0 400d0)
-+					  (log xd 10d0))
-+				     1d-10))))
-+		     (fixup (r s m+ k)
-+		       (if (if high-ok
-+			       (>= (+ r m+) s)
-+			       (> (+ r m+) s))
-+			   (+ k 1)
-+			   k))
-+		     (scale (r s m+)
-+		       (let* ((est (flog v))
-+			      (scale (the integer (10-to-e (abs est)))))
-+			 (if (>= est 0)
-+			     (fixup r (* s scale) m+ est)
-+			     (fixup (* r scale) s (* m+ scale) est)))))
-+	      (let (r s m+)
-+		(if (>= e 0)
-+		    (let* ((be (expt float-radix e))
-+			   (be1 (* be float-radix)))
-+		      (if (/= f (expt float-radix (1- float-digits)))
-+			  (setf r (* f be 2)
-+				s 2
-+				m+ be)
-+			  (setf r (* f be1 2)
-+				s (* float-radix 2)
-+				m+ be1)))
-+		    (if (or (= e min-e) 
-+			    (/= f (expt float-radix (1- float-digits))))
-+			(setf r (* f 2)
-+			      s (* (expt float-radix (- e)) 2)
-+			      m+ 1)
-+			(setf r (* f float-radix 2)
-+			      s (* (expt float-radix (- 1 e)) 2)
-+			      m+ float-radix)))
-+		(scale r s m+))))))))
- 
-@@ -1922,3 +1952,3 @@
-           (format-error "incompatible values for k and d")))
--      (when (not exp) (setq exp (scale-exponent  number)))
-+      (when (not exp) (setq exp (accurate-scale-exponent (abs number))))
-       AGAIN
diff --git a/dev-lisp/ecls/Manifest b/dev-lisp/ecls/Manifest
index 4fb9e010007d..4d3ae19905ef 100644
--- a/dev-lisp/ecls/Manifest
+++ b/dev-lisp/ecls/Manifest
@@ -1,10 +1,10 @@
 AUX 13.5.1-gc74.patch 1985 BLAKE2B 9b1d45468acd1da5f6b6607e2538855f2e3182d095845a1e0132d8e8e1b755d25569b93d4d1c1ffbc840ec56109295e322c8667045d0ce409771ebb5d85423f2 SHA512 59c5e23773273d84f896373d58d57c251644130a6da8d8a8bcbf7d2a56de1e58339bbd9937806aa054b0334489ff4670dc11e5005f6f86182802d684d86c6f3f
 AUX 13.5.1-headers-gentoo.patch 365 BLAKE2B 85b0f0dd98835d5f4e625a390e92d7e8db48a61cd8d732cdd353babf6d806353e07b72ed7cfac688aef3299a28e7ce35e068db5844a37fa827da68786a202913 SHA512 e3e8c2b871420bf35b0e887b291203f882818e688392f99f22d18dc6da0710d23d38d2f4a02a92bf9a1eda2c3b7fd05b0e4d57d7e885896369ed89c10b0730ad
-AUX 16.1.3-build.patch 341 BLAKE2B 6a3b588010b66b6e060dfa29642bacea08e77e64cb9674c5677da69c3f3d7668e7893a16c67980b6ea87642c9961b475a29aafdf786afb3903ac4a6552164f30 SHA512 0af8f0704e79197a4d7857ae11f20f0086f2e1c3d2578ec613c6ce5df742e35b9676399d8f724528781a530426425a977646ec75b317f01609d17d3a98b04ef4
-AUX 16.1.3-headers-gentoo.patch 446 BLAKE2B db2adc332867435e799e2779fbad5ebb175b247db5de7ab436da6631d31dc8d6059736dbb41be6fd91b0fd8116ee84e361772ae5da29c1448627bbeb07212646 SHA512 a58b39deb9f8577da66216fd6902803019751171e4415149a89bdb72f13a006e5f6d9bede2312521162a0895340c1a1ce756b09bc0a18dccceca3e4c0950a7cb
 AUX README.Gentoo 632 BLAKE2B 3067b3165fb18fb2ef83a70513e73df3a10b94d97920931a15764e1f01d62db5c908fffd9bde06d1cee7b507884470025189aa3e4ab3c2273246071922d95744 SHA512 df0640792271d01f84437645fe8854740b17dd349e36b76711c55f6f4fefa7d2fd810176ece2a25d8cab88192f31a6df38e67dfcb7992857e5d038ad74b11c8a
+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-13.5.1.tgz 9401163 BLAKE2B 441f2ed429f9f508d12fec333aeed7178aedab0e2011c57fbf0c6695747de95e5db6818c5cfc6acd1097804a4cd7bf1dd0ec3e79c04a5b4399d61cefb5179ba7 SHA512 a09f8b824aa78e461d700eefb1a8b68b876e15d49124a397e0b5b58ad73b80f818133a7b8e48ddb83505eea2f9c5fb024de8701b527524004e336e456eb07c84
 DIST ecl-16.1.3.tgz 7459212 BLAKE2B 4f9d6ad2bd92ede4b5b20857b95a48bad5002049e83611865d9cf13e7131adfaad147a31f22f9a3f6a2c06e46db1996aa98135c28b97bf5ef16e17b5eba0dc4b SHA512 5d743f422f6bc24671abf4c739cde8273d08f056906a1ef8aed5145c703b6d52c7fa4b5e0be8c125f32240c20ce053007786bb3ae81cc34d47791f6fae0819c1
 EBUILD ecls-13.5.1-r1.ebuild 2231 BLAKE2B 7bb19af668e153b496feffba346c7cb8829d2c82d230f149c24d42a2800ae9ac9df75c1616b01e5c772c3c442070e83c020c870af98dd89c06b8585094f41d5d SHA512 8542ca9bad0122153931dd949006928d63475669b81c3a17f148c3be1ffe8874586965c0a43fa294b492ff210bdae7f302aa92d2cca9e3fef19a6ceef91c0ed7
-EBUILD ecls-16.1.3.ebuild 2418 BLAKE2B 31b225c1e1a462040de11ae342a330d9519b88507bb157edb39a1cbb1b80954a50cb129113f1f23a3a62ef51f2dd9a0c57810704fe28b8577679cee43058f2bb SHA512 e4ba51270ce279f09fc29574435ddee475d76c4d66b4a57d51a2235eb32da7aae1fbeadf946dcc1af6b67fbde6276b33a82d155ce38ae1213a2aadb55cf7519a
+EBUILD ecls-16.1.3.ebuild 2403 BLAKE2B 0299730c6924ca8167c18172e48c3424dcf26396cf0bb41ac6df700178715cb9799d1e6abdb8e7f18a0cc60c882f61c6c8ec05fe33e153d0cec26416c9fc9556 SHA512 2ec7914ed505ca8955f038c5c3158b33790080915bf3c08583509184ff299dcb63375081e438a9179aa585438141bc913a8cfabe82e8d85c8a3586ad016f8e60
 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 129d07b53568..6b3789c3ed9b 100644
--- a/dev-lisp/ecls/ecls-16.1.3.ebuild
+++ b/dev-lisp/ecls/ecls-16.1.3.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
 inherit eutils multilib
 
 # test phase only works if ecls already installed #516876
@@ -30,6 +31,11 @@ RDEPEND="${CDEPEND}"
 
 S="${WORKDIR}"/${MY_P}
 
+PATCHES=(
+	"${FILESDIR}/${P}-headers-gentoo.patch"
+	"${FILESDIR}/${P}-build.patch"
+)
+
 pkg_setup () {
 	if use gengc || use precisegc ; then
 		ewarn "You have enabled the generational garbage collector or"
@@ -40,8 +46,7 @@ pkg_setup () {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PV}-headers-gentoo.patch
-	epatch "${FILESDIR}"/${PV}-build.patch
+	default
 	cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die
 }
 
@@ -61,8 +66,7 @@ src_configure() {
 		$(use_with threads __thread) \
 		$(use_enable unicode) \
 		$(use_with unicode unicode-names) \
-		$(use_with X x) \
-		$(use_with X clx)
+		$(use_with X x)
 }
 
 src_compile() {
diff --git a/dev-lisp/ecls/files/16.1.3-build.patch b/dev-lisp/ecls/files/ecls-16.1.3-build.patch
index ff7d6cd74d8b..ff7d6cd74d8b 100644
--- a/dev-lisp/ecls/files/16.1.3-build.patch
+++ b/dev-lisp/ecls/files/ecls-16.1.3-build.patch
diff --git a/dev-lisp/ecls/files/16.1.3-headers-gentoo.patch b/dev-lisp/ecls/files/ecls-16.1.3-headers-gentoo.patch
index 10802aa48803..10802aa48803 100644
--- a/dev-lisp/ecls/files/16.1.3-headers-gentoo.patch
+++ b/dev-lisp/ecls/files/ecls-16.1.3-headers-gentoo.patch